From eb557ec6777965c6ad7bfc1ab5932cb196a20fc2 Mon Sep 17 00:00:00 2001 From: navanchauhan Date: Thu, 7 Jul 2022 13:50:48 +0530 Subject: [PATCH 1/7] fix --- check_process | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/check_process b/check_process index 82e81ae..0156254 100644 --- a/check_process +++ b/check_process @@ -11,12 +11,11 @@ ; Checks pkg_linter=1 setup_sub_dir=1 - setup_root=0 + setup_root=1 setup_nourl=0 setup_private=1 setup_public=1 upgrade=1 - #upgrade=1 from_commit=CommitHash backup_restore=1 multi_instance=1 change_url=1 @@ -24,6 +23,6 @@ Email= Notification=none ;;; Upgrade options - ; commit=CommitHash - name=Name and date of the commit. - manifest_arg=domain=DOMAIN&path=PATH&is_public=1&language=fr&admin=USER&password=pass&port=666& + ; commit= + name= + manifest_arg=domain=DOMAIN&path=PATH&is_public=1&port=8080& From 4f3a0ec75508015cbe1191413d53cf31062630aa Mon Sep 17 00:00:00 2001 From: Navan Chauhan Date: Thu, 7 Jul 2022 22:33:45 +0530 Subject: [PATCH 2/7] fix nginx --- conf/nginx.conf | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index adbea7f..0131d53 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,15 +1,4 @@ #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; location __PATH__/ { - - proxy_pass https://127.0.0.1:__PORT__/; - proxy_redirect off; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Host $server_name; - - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; + alias __FINAL_PATH_WWW__; } From cf55fffc8f38225d64d17a097e8cf5d7304e89c2 Mon Sep 17 00:00:00 2001 From: Navan Chauhan Date: Thu, 7 Jul 2022 22:36:23 +0530 Subject: [PATCH 3/7] bump manifest --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 102af46..76c4e3a 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "A modern IRC server (daemon/ircd) written in Go", "fr": "A modern IRC server (daemon/ircd) written in Go" }, - "version": "2.10.0~ynh1", + "version": "2.10.0~ynh2", "url": "https://ergo.chat/", "upstream": { "license": "MIT", From caca3ebf3902bea354ef26a883e27dd8e5b7c95e Mon Sep 17 00:00:00 2001 From: Navan Chauhan Date: Thu, 7 Jul 2022 22:57:50 +0530 Subject: [PATCH 4/7] fix --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 0131d53..092c967 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,4 +1,4 @@ #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; location __PATH__/ { - alias __FINAL_PATH_WWW__; + alias __FINAL_PATH_WWW__/help; } From 350891417b7dccc3a6d39c4959fa2d26883ac36b Mon Sep 17 00:00:00 2001 From: Navan Chauhan Date: Thu, 7 Jul 2022 23:03:34 +0530 Subject: [PATCH 5/7] fix --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 092c967..78db6c9 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,4 +1,4 @@ #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; location __PATH__/ { - alias __FINAL_PATH_WWW__/help; + alias __FINAL_PATH_WWW__/help/; } From ea6e6e186fe75ba203d82d5cb689abbe778b07a5 Mon Sep 17 00:00:00 2001 From: Navan Chauhan Date: Fri, 8 Jul 2022 10:24:16 +0530 Subject: [PATCH 6/7] add variable --- scripts/change_url | 1 + scripts/upgrade | 1 + 2 files changed, 2 insertions(+) diff --git a/scripts/change_url b/scripts/change_url index 85f4573..6a35a8e 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -28,6 +28,7 @@ ynh_script_progression --message="Loading installation settings..." --time --wei # Needed for helper "ynh_add_nginx_config" final_path=$(ynh_app_setting_get --app=$app --key=final_path) +final_path_www=$(ynh_app_setting_get --app=$app --key=final_path_www) port=$(ynh_app_setting_get --app=$app --key=port) #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 097c441..59a7396 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -19,6 +19,7 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) +final_path_www=$(ynh_app_setting_get --app=$app --key=final_path_www) port=$(ynh_app_setting_get --app=$app --key=port) secure_port=$(ynh_app_setting_get --app=$app --key=secure_port) From f244354d3b470596d7acabe5be0b3d50dfca90be Mon Sep 17 00:00:00 2001 From: Navan Chauhan Date: Fri, 8 Jul 2022 11:40:39 +0530 Subject: [PATCH 7/7] fix --- check_process | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_process b/check_process index 0156254..39f00fc 100644 --- a/check_process +++ b/check_process @@ -13,7 +13,7 @@ setup_sub_dir=1 setup_root=1 setup_nourl=0 - setup_private=1 + setup_private=0 setup_public=1 upgrade=1 backup_restore=1