diff --git a/README.md b/README.md index 3687af8..bf32a61 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Ergo (formerly known as Oragono) is a modern IRC server written in Go. Its core -**Shipped version:** 2.10.0~ynh1 +**Shipped version:** 2.10.0~ynh2 **Demo:** https://testnet.ergo.chat/ diff --git a/README_fr.md b/README_fr.md index 5c92c8a..d2b347b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -26,7 +26,7 @@ Ergo (formerly known as Oragono) is a modern IRC server written in Go. Its core -**Version incluse :** 2.10.0~ynh1 +**Version incluse :** 2.10.0~ynh2 **Démo :** https://testnet.ergo.chat/ 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 diff --git a/conf/nginx.conf b/conf/nginx.conf index adbea7f..78db6c9 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__/help/; } 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", 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)