diff --git a/conf/nginx.conf b/conf/nginx.conf index e6279cf..131d238 100755 --- 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; - } - proxy_pass http://127.0.0.1:__PORT__/; proxy_set_header Host $host; proxy_pass_header Server; diff --git a/manifest.json b/manifest.json index 714554a..3e7ffe0 100755 --- a/manifest.json +++ b/manifest.json @@ -20,7 +20,7 @@ "name": "fflorent" }, "requirements": { - "yunohost": ">= 4.2.4" + "yunohost": ">= 4.3.0" }, "multi_instance": false, "services": [ diff --git a/scripts/restore b/scripts/restore index 4de43ee..7d4a9f0 100755 --- a/scripts/restore +++ b/scripts/restore @@ -35,8 +35,7 @@ datadir=$(ynh_app_setting_get --app=$app --key=datadir) #================================================= 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 RESTORATION STEPS