From b3824f120011fa1ab9f882feff5ddfb3512a4093 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 17 Nov 2020 08:57:24 +0100 Subject: [PATCH 1/2] Fix check_process warnings --- check_process | 9 ++++++--- manifest.json | 4 ++-- scripts/change_url | 2 +- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 2 +- 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/check_process b/check_process index d417240..b9e2faf 100644 --- a/check_process +++ b/check_process @@ -2,13 +2,14 @@ ; Manifest domain="domain.tld" (DOMAIN) path="/path" (PATH) + is_public=1 (PUBLIC|public=1|private=0) ; Checks pkg_linter=1 setup_sub_dir=1 setup_root=1 setup_nourl=0 - setup_private=0 - setup_public=0 + setup_private=1 + setup_public=1 upgrade=1 backup_restore=1 multi_instance=1 @@ -21,4 +22,6 @@ Email= Notification=none ;;; Upgrade options - manifest_arg=domain=DOMAIN&path=PATH + ; commit=CommitHash + name=Name and date of the commit. + manifest_arg=domain=DOMAIN&path=PATH&admin=USER&is_public=1& diff --git a/manifest.json b/manifest.json index 333d61c..8e315af 100644 --- a/manifest.json +++ b/manifest.json @@ -6,11 +6,11 @@ "en": "Easy-to-use CMS for building professional websites", "fr": "CMS facile à utiliser pour créer des sites Web professionnels" }, - "version": "1.17.2~ynh1", + "version": "1.17.2~ynh2", "url": "https://backdropcms.org/", "license": "GPL-2.0", "maintainer": { - "name": "", + "name": "eric_G", "email": "" }, "requirements": { diff --git a/scripts/change_url b/scripts/change_url index 980f39d..1ac1ecb 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -24,7 +24,7 @@ app=$YNH_APP_INSTANCE_NAME #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 +ynh_script_progression --message="Loading installation settings..." --weight=1 final_path=$(ynh_app_setting_get --app=$app --key=final_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) diff --git a/scripts/install b/scripts/install index 05531bf..ed28aa3 100644 --- a/scripts/install +++ b/scripts/install @@ -91,7 +91,7 @@ ynh_system_user_create --username=$app ynh_script_progression --message="Configuring PHP-FPM..." --weight=2 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies" +ynh_add_fpm_config --package="$extra_php_dependencies" phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= diff --git a/scripts/restore b/scripts/restore index cc063ae..d3d45ef 100644 --- a/scripts/restore +++ b/scripts/restore @@ -77,7 +77,7 @@ ynh_script_progression --message="Reconfiguring PHP-FPM..." --weight=50 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" -ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION +ynh_add_fpm_config #================================================= # RESTORE THE MYSQL DATABASE diff --git a/scripts/upgrade b/scripts/upgrade index 3ddc979..bcb5a29 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -103,7 +103,7 @@ ynh_system_user_create --username=$app ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies" +ynh_add_fpm_config --package="$extra_php_dependencies" #================================================= # SPECIFIC UPGRADE From c6c4da0a4d2b4d59843a7bef52255589b88f728a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 18 Nov 2020 20:43:09 +0100 Subject: [PATCH 2/2] Upgrade to 1.17.3 --- README.md | 2 +- README_fr.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index c217250..e46dfce 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to Backdrop CMS is a simple, lightweight, and easy-to-use Content Management System for building professional websites. -**Shipped version:** 1.17.2 +**Shipped version:** 1.17.3 ## Screenshots diff --git a/README_fr.md b/README_fr.md index a17acde..745dc4c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -12,7 +12,7 @@ Si vous n’avez pas YunoHost, consultez [le guide](https://yunohost.org/#/insta Backdrop CMS is a simple, lightweight, and easy-to-use Content Management System for building professional websites. -**Version incluse :** 1.17.2 +**Version incluse :** 1.17.3 ## Captures d’écran diff --git a/conf/app.src b/conf/app.src index 394f597..4726dec 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/backdrop/backdrop/releases/download/1.17.2/backdrop.zip -SOURCE_SUM=76851a5b59c4737eec45de4f497b1696f2b7473cc55597fd2c5c2f29934c94a5 +SOURCE_URL=https://github.com/backdrop/backdrop/releases/download/1.17.3/backdrop.zip +SOURCE_SUM=241fef19e16f77523a7095600e2d0b00aa228929a1a534d6df8b4ef43fefaad5 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 8e315af..2143661 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Easy-to-use CMS for building professional websites", "fr": "CMS facile à utiliser pour créer des sites Web professionnels" }, - "version": "1.17.2~ynh2", + "version": "1.17.3~ynh1", "url": "https://backdropcms.org/", "license": "GPL-2.0", "maintainer": {