From 3aa78386ca5959ccd27214b1fb5f3287fb8e03ea Mon Sep 17 00:00:00 2001 From: yalh76 Date: Fri, 14 Jan 2022 22:34:13 +0100 Subject: [PATCH] Apply last example_ynh --- conf/nginx.conf | 39 ++++++++++++++++++++------------------- doc/DISCLAIMER.md | 9 ++++----- manifest.json | 4 ++-- scripts/remove | 16 ++++++++-------- scripts/restore | 8 -------- 5 files changed, 34 insertions(+), 42 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 50323b9..2a8a496 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,24 +1,25 @@ location __PATH__ { - - proxy_pass https://127.0.0.1:__PORT__/; - proxy_redirect off; - #Proxy Settings - proxy_redirect off; - proxy_set_header Host $host:$server_port; #this redirects the link without port no - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_pass https://127.0.0.1:__PORT__/; + proxy_redirect off; - proxy_max_temp_file_size 0; - proxy_connect_timeout 90; - proxy_send_timeout 90; - proxy_read_timeout 90; - proxy_buffer_size 128k; - proxy_buffers 32 32k; - proxy_busy_buffers_size 256k; - proxy_temp_file_write_size 256k; + #Proxy Settings + proxy_redirect off; + proxy_set_header Host $host:$server_port; #this redirects the link without port no + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - # Include SSOWAT user panel. - include conf.d/yunohost_panel.conf.inc; - more_clear_input_headers 'Accept-Encoding'; + proxy_max_temp_file_size 0; + proxy_connect_timeout 90; + proxy_send_timeout 90; + proxy_read_timeout 90; + proxy_buffer_size 128k; + proxy_buffers 32 32k; + proxy_busy_buffers_size 256k; + proxy_temp_file_write_size 256k; + + more_clear_input_headers 'Accept-Encoding'; + + # Include SSOWAT user panel. + include conf.d/yunohost_panel.conf.inc; } diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index 7510d4d..51d68e7 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -1,5 +1,4 @@ -* Other infos that people should be aware of, such as: - * This app has **root** access which can change core things in the system, thus **breaking the YunoHost**. Use it carefully and read the [documents](https://doxfer.webmin.com/Webmin/Main_Page) two times before changing values. - * Only **root** (system user) can connect - * Webmin will **update itself** when system updates are run. So no need to **run upgrade script** once installed. - * Only **user** given permission at time of the installation can **access** the Webmin +* This app has **root** access which can change core things in the system, thus **breaking the YunoHost**. Use it carefully and read the [documents](https://doxfer.webmin.com/Webmin/Main_Page) two times before changing values. +* Only **root** (system user) can connect +* Webmin will **update itself** when system updates are run. So no need to **run upgrade script** once installed. +* Only **user** given permission at time of the installation can **access** the Webmin diff --git a/manifest.json b/manifest.json index 10f653a..4eb9a5b 100644 --- a/manifest.json +++ b/manifest.json @@ -19,14 +19,14 @@ "email": "anmol@datamol.org" }, "requirements": { - "yunohost": ">= 4.2.3" + "yunohost": ">= 4.3.0" }, "multi_instance": false, "services": [ "nginx" ], "arguments": { - "install" : [ + "install": [ { "name": "domain", "type": "domain" diff --git a/scripts/remove b/scripts/remove index bc5f213..33ade03 100644 --- a/scripts/remove +++ b/scripts/remove @@ -42,14 +42,6 @@ ynh_systemd_action --service_name=$app --action="stop" --line_match="Stopped LSB systemctl disable $app.service --quiet systemctl daemon-reload -#================================================= -# REMOVE DEPENDENCIES -#================================================= -ynh_script_progression --message="Removing dependencies..." - -# Remove metapackage and its dependencies -ynh_exec_warn_less ynh_remove_app_dependencies - #================================================= # REMOVE NGINX CONFIGURATION #================================================= @@ -58,6 +50,14 @@ ynh_script_progression --message="Removing NGINX web server configuration..." # Remove the dedicated NGINX config ynh_remove_nginx_config +#================================================= +# REMOVE DEPENDENCIES +#================================================= +ynh_script_progression --message="Removing dependencies..." + +# Remove metapackage and its dependencies +ynh_exec_warn_less ynh_remove_app_dependencies + #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/restore b/scripts/restore index e4a7bb6..2938727 100755 --- a/scripts/restore +++ b/scripts/restore @@ -32,14 +32,6 @@ path_url=$(ynh_app_setting_get --app=$app --key=path) admin=$(ynh_app_setting_get --app=$app --key=admin) port=$(ynh_app_setting_get --app=$app --key=port) -#================================================= -# CHECK IF THE APP CAN BE RESTORED -#================================================= -ynh_script_progression --message="Validating restoration parameters..." - -ynh_webpath_available --domain=$domain --path_url=$path_url \ - || ynh_die --message="Path not available: ${domain}${path_url}" - #================================================= # STANDARD RESTORATION STEPS #=================================================