diff --git a/conf/app.src b/conf/app.src index 3b4febe..7a7baef 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,7 +1,6 @@ -SOURCE_URL=https://releases.wikimedia.org/mediawiki/1.36/mediawiki-1.36.2.tar.gz -SOURCE_SUM=c7357dde98449c8635134dbd82790660d732592cb02cbff3574361df39fee2d4 +SOURCE_URL=https://releases.wikimedia.org/mediawiki/1.37/mediawiki-1.37.0.tar.gz +SOURCE_SUM=dd1ad227c5bbbc833d851c01727ee8706a39e4aa31e0f49ce45e50257ef9b97f SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= SOURCE_EXTRACT=true diff --git a/conf/nginx.conf b/conf/nginx.conf index 109e474..898b35f 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -7,11 +7,6 @@ location __PATH__/ { # Path to source alias __FINALPATH__/ ; - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - index index.php; try_files $uri $uri/ @rewrite___NAME__; diff --git a/conf/pluggable_auth.src b/conf/pluggable_auth.src index 30be9b0..f8bd863 100644 --- a/conf/pluggable_auth.src +++ b/conf/pluggable_auth.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://extdist.wmflabs.org/dist/extensions/PluggableAuth-REL1_36-087cb4c.tar.gz -SOURCE_SUM=868a7884c38b132e84017f85066d2f870f78d62a21bb9bb9172cc0c4aaaf024d +SOURCE_URL=https://extdist.wmflabs.org/dist/extensions/PluggableAuth-REL1_36-70ed593.tar.gz +SOURCE_SUM=40fcc36ba02195dab2bcdd7ed90f86d6dab9520225678b8d8408510fda753334 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index 3fd2344..26925cb 100644 --- a/manifest.json +++ b/manifest.json @@ -23,7 +23,7 @@ "email": "felix@piedallu.me" }, "requirements": { - "yunohost": ">= 4.2.4" + "yunohost": ">= 4.3.0" }, "multi_instance": true, "services": [ diff --git a/scripts/restore b/scripts/restore index b0c44e5..ca26f5d 100755 --- a/scripts/restore +++ b/scripts/restore @@ -36,8 +36,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=1 -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