diff --git a/conf/nginx.conf b/conf/nginx.conf index 92fac4e..24c8aa3 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -2,13 +2,8 @@ location __PATH__/ { # Path to source - alias __FINALPATH__/ ; + alias __FINALPATH__/; - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - index index.php; client_max_body_size 128M; diff --git a/manifest.json b/manifest.json index 7e5902f..133a4d9 100644 --- a/manifest.json +++ b/manifest.json @@ -3,8 +3,8 @@ "id": "chuwiki", "packaging_format": 1, "description": { - "en": "A simple, fast and flexible wiki.", - "fr": "Un wiki simple, rapide et flexible." + "en": "Simple, fast and flexible wiki", + "fr": "Wiki simple, rapide et flexible" }, "version": "2.0~ynh2", "url": "http://chuwiki.genezys.net/", @@ -23,7 +23,7 @@ "url": "https://stylix58.netlify.app/" }, "requirements": { - "yunohost": ">= 4.2.4" + "yunohost": ">= 11.0.9" }, "multi_instance": true, "services": [ diff --git a/scripts/upgrade b/scripts/upgrade index abd4457..0f6dfef 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -81,7 +81,7 @@ then ynh_secure_remove --file="$final_path" #Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" #--keep="$final_path/configuration.ini" + ynh_setup_source --dest_dir="$final_path" #--keep="configuration.ini" # Copy the admin saved settings from tmp directory to final config path cp -a "$tmpdir/configuration.ini" "$final_path/configuration.ini"