From a66a1bfc6fab8f90b496453d05fdc7723f2bc72f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 28 Nov 2021 12:53:57 +0100 Subject: [PATCH 1/2] 4.3 --- conf/app.src | 7 ++----- conf/nginx.conf | 6 ------ manifest.json | 4 ++-- scripts/_common.sh | 4 +--- scripts/install | 2 +- scripts/restore | 5 +---- scripts/upgrade | 2 +- 7 files changed, 8 insertions(+), 22 deletions(-) diff --git a/conf/app.src b/conf/app.src index b9fcb1f..ca8a4e4 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,3 @@ -SOURCE_URL=https://codeberg.org/zot/zap/archive/8f08b200fd6c410c88a3f24248da55185721ccf1.tar.gz -SOURCE_SUM=82eab96306b2c4fb1d2dfcded5ccbc9adfc0f3f82695bd2459aff9b35e71ff21 +SOURCE_URL=https://codeberg.org/zot/zap/archive/078714b9dde991d02f8cce1183ce357d96405558.tar.gz +SOURCE_SUM=6159da945fe504bffe23f80d299bfe3e146a9d9df76412f5bea6d1d415516d34 SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR= -SOURCE_FILENAME= - diff --git a/conf/nginx.conf b/conf/nginx.conf index a4c8c5f..77fe6f9 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -3,11 +3,6 @@ location __PATH__/ { alias __FINALPATH__/; - # Force https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - if (!-e $request_filename) { rewrite ^(.*)$ /index.php?req=$1; } @@ -64,5 +59,4 @@ location __PATH__/ { location ~ /util { deny all; } - } diff --git a/manifest.json b/manifest.json index 4b72798..a2e6806 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Ethical fediverse server alternative", "fr": "serveur fedverse éthique" }, - "version": "21.10.21~ynh1", + "version": "21.11.28~ynh1", "url": "https://zotlabs.com/zap/", "upstream": { "license": "MIT", @@ -18,7 +18,7 @@ "name": "" }, "requirements": { - "yunohost": ">= 4.2.4" + "yunohost": ">= 4.3.0" }, "multi_instance": true, "services": [ diff --git a/scripts/_common.sh b/scripts/_common.sh index b21e9bf..c654c01 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,9 +7,7 @@ # dependencies used by the app YNH_PHP_VERSION="7.3" -extra_php_dependencies="php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-pgsql php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-gd" -# dependencies used by the app -pkg_dependencies="postgresql postgresql-contrib" +pkg_dependencies="postgresql postgresql-contrib php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-pgsql php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-gd" #================================================= # EXPERIMENTAL HELPERS diff --git a/scripts/install b/scripts/install index 8deae1c..114ece7 100755 --- a/scripts/install +++ b/scripts/install @@ -205,7 +205,7 @@ ynh_add_nginx_config ynh_script_progression --message="Configuring PHP-FPM..." # Create a dedicated php-fpm config -ynh_add_fpm_config --package="$extra_php_dependencies" +ynh_add_fpm_config #================================================= # CRON JOB CONFIGURATION diff --git a/scripts/restore b/scripts/restore index be3c019..2c9b96b 100755 --- a/scripts/restore +++ b/scripts/restore @@ -38,8 +38,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= ynh_script_progression --message="Validating restoration parameters..." -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 @@ -96,8 +95,6 @@ fi ynh_script_progression --message="Restoring PHP-FPM configuration..." ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" -# Recreate a dedicated php-fpm config -ynh_add_fpm_config --package="$extra_php_dependencies" #================================================= # RESTORE THE CRON FILE diff --git a/scripts/upgrade b/scripts/upgrade index ebbcb46..3e42f49 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -162,7 +162,7 @@ ynh_add_nginx_config ynh_script_progression --message="Upgrading PHP-FPM configuration..." # Create a dedicated php-fpm config -ynh_add_fpm_config --package="$extra_php_dependencies" +ynh_add_fpm_config ### Verify the checksum of a file, stored by `ynh_store_file_checksum` in the install script. ### And create a backup of this file if the checksum is different. So the file will be backed up if the admin had modified it. From 6fe6502e3d6b455cb088971b15cf1e58e3711875 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sun, 28 Nov 2021 11:54:02 +0000 Subject: [PATCH 2/2] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0937632..c2424c1 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Compatible with **Mastodon**, **Pleroma**, **Pixelfed**, **Friendica**, **Hubzil - **Extend** : Change or upgrade your software functionality as desired by installing additional features from addons and- the free app collection. -**Shipped version:** 21.10.21~ynh1 +**Shipped version:** 21.11.28~ynh1 diff --git a/README_fr.md b/README_fr.md index 2f40855..952986b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -26,7 +26,7 @@ Compatible with **Mastodon**, **Pleroma**, **Pixelfed**, **Friendica**, **Hubzil - **Extend** : Change or upgrade your software functionality as desired by installing additional features from addons and- the free app collection. -**Version incluse :** 21.10.21~ynh1 +**Version incluse :** 21.11.28~ynh1