diff --git a/conf/nginx.conf b/conf/nginx.conf index 9f7f927..2ec6fac 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,11 +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; - } - uwsgi_param SCRIPT_NAME '__PATH_NO_ROOT__'; include uwsgi_params; uwsgi_modifier1 30; diff --git a/manifest.json b/manifest.json index 478f4f3..4094d6f 100644 --- a/manifest.json +++ b/manifest.json @@ -22,7 +22,7 @@ "email": "opi@zeropi.net" }, "requirements": { - "yunohost": ">= 4.2.4" + "yunohost": ">= 4.3.0" }, "multi_instance": false, "services": [ diff --git a/scripts/install b/scripts/install index 2c6f59c..0da2b87 100644 --- a/scripts/install +++ b/scripts/install @@ -101,7 +101,6 @@ pip3 install --requirement $final_path/requirements-ynh.txt --no-cache-dir ynh_script_progression --message="Configuring Searx..." --weight=2 secret_key=$(ynh_string_random) - ynh_add_config --template="../conf/settings.yml" --destination="$final_path/searx/settings.yml" #================================================= diff --git a/scripts/restore b/scripts/restore index 6e6a996..bdf1d59 100755 --- a/scripts/restore +++ b/scripts/restore @@ -34,8 +34,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=2 -test ! -d $final_path \ - || ynh_die --message="There is already a directory: $final_path " +test ! -d $final_path || ynh_die --message="There is already a directory: $final_path " #================================================= # STANDARD RESTORE STEPS diff --git a/scripts/upgrade b/scripts/upgrade index 740e104..bf271b8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -83,7 +83,7 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading source files..." --weight=3 -# Create a temporary directory + # Create a temporary directory tmpdir="$(mktemp -d)" # Backup the config file in the temp dir @@ -97,7 +97,6 @@ then # Remove the tmp directory securely ynh_secure_remove --file="$tmpdir" - fi #================================================= @@ -138,7 +137,6 @@ pip3 install --requirement $final_path/requirements-ynh.txt --upgrade # ynh_script_progression --message="Configuring Searx..." --weight=2 # secret_key=$(ynh_string_random) - # ynh_add_config --template="../conf/settings.yml" --destination="$final_path/searx/settings.yml" #=================================================