diff --git a/conf/nginx.conf b/conf/nginx.conf index 1785e97..9f677b0 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,12 +1,6 @@ #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; location __PATH__/ { - # Force usage of https - - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - proxy_pass http://127.0.0.1:__PORT__/; proxy_set_header Host $host; proxy_buffering off; diff --git a/manifest.json b/manifest.json index 4af7864..34641d9 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,7 @@ "email": "kload@kload.fr" }, "requirements": { - "yunohost": ">= 4.2.4" + "yunohost": ">= 4.3.0" }, "multi_instance": false, "services": [ @@ -24,8 +24,7 @@ "install": [ { "name": "domain", - "type": "domain", - "example": "domain.org" + "type": "domain" }, { "name": "path", diff --git a/scripts/change_url b/scripts/change_url index d11404b..8f117b1 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -68,7 +68,7 @@ fi #================================================= # STOP SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Stopping shellinabox..." +ynh_script_progression --message="Stopping shellinabox..." --weight=1 ynh_systemd_action --service_name=shellinabox --action=stop diff --git a/scripts/install b/scripts/install index 205ed3f..431ed01 100644 --- a/scripts/install +++ b/scripts/install @@ -75,8 +75,7 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Configuring shellinabox..." --weight=2 -cp ../conf/shellinabox /etc/default/shellinabox -ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_file="/etc/default/shellinabox" +ynh_add_config --template="../conf/shellinabox" --destination="/etc/default/shellinabox" # Allow the service to log in syslog ynh_replace_string --match_string=" -- -q --background" --replace_string=" -- --background" --target_file="/etc/init.d/shellinabox" @@ -84,25 +83,19 @@ systemctl daemon-reload ynh_systemd_action --service_name=shellinabox --action=restart -#================================================= -# STORE THE CHECKSUM OF THE CONFIG FILE -#================================================= - -# Calculate and store the config file checksum into the app settings -ynh_store_file_checksum --file="/etc/default/shellinabox" - #================================================= # GENERIC FINALIZATION #================================================= # ADVERTISE SERVICE IN ADMIN PANEL #================================================= +ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app +yunohost service add $app --description="Web based AJAX terminal emulator" #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." +ynh_script_progression --message="Reloading NGINX web server..." --weight=2 ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/remove b/scripts/remove index 93df963..1574ba4 100644 --- a/scripts/remove +++ b/scripts/remove @@ -42,7 +42,7 @@ ynh_package_autopurge shellinabox #================================================= # REMOVE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Removing NGINX web server configuration..." +ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1 # Remove the dedicated nginx config ynh_remove_nginx_config diff --git a/scripts/restore b/scripts/restore index 1d248bd..0a86e13 100644 --- a/scripts/restore +++ b/scripts/restore @@ -27,14 +27,6 @@ domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) 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 #================================================= @@ -70,15 +62,16 @@ ynh_systemd_action --service_name=shellinabox --action=restart #================================================= # ADVERTISE SERVICE IN ADMIN PANEL #================================================= +ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app +yunohost service add $app --description="Web based AJAX terminal emulator" #================================================= # GENERIC FINALIZATION #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/upgrade b/scripts/upgrade index c3b5993..8d33bb3 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -67,34 +67,24 @@ ynh_install_app_dependencies $pkg_dependencies #================================================= ynh_script_progression --message="Upgrading shellinabox configuration..." --weight=4 -# Verify the checksum and backup the file if it's different -ynh_backup_if_checksum_is_different --file="/etc/default/shellinabox" - -cp ../conf/shellinabox /etc/default/shellinabox -ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_file="/etc/default/shellinabox" +ynh_add_config --template="../conf/shellinabox" --destination="/etc/default/shellinabox" ynh_replace_string --match_string=" -- -q --background" --replace_string=" -- --background" --target_file="/etc/init.d/shellinabox" systemctl daemon-reload ynh_systemd_action --service_name=shellinabox --action=restart -#================================================= -# STORE THE CHECKSUM OF THE CONFIG FILE -#================================================= - -# Calculate and store the config file checksum into the app settings -ynh_store_file_checksum --file="/etc/default/shellinabox" - #================================================= # ADVERTISE SERVICE IN ADMIN PANEL #================================================= +ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app +yunohost service add $app --description="Web based AJAX terminal emulator" #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload