From 81336c79f1cc36dbce25e299a502159b9b1ae457 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 22 Apr 2021 00:08:13 +0200 Subject: [PATCH 1/2] 1.18.3 --- README.md | 2 +- README_fr.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- scripts/install | 10 ++-------- 5 files changed, 7 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index f8d0464..0128b91 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.18.2 +**Shipped version:** 1.18.3 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 88f609f..67109a4 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.18.2 +**Version incluse :** 1.18.3 ## Captures d’écran diff --git a/conf/app.src b/conf/app.src index 47c9478..2fabc25 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/backdrop/backdrop/releases/download/1.18.2/backdrop.zip -SOURCE_SUM=dc067c1608d5135882762112217f39a84534d9d24c5191d1ade6012d55082fde +SOURCE_URL=https://github.com/backdrop/backdrop/releases/download/1.18.3/backdrop.zip +SOURCE_SUM=fb82cb6020db15954ed23976c513d3d0f713aa1c77759be065106e4f57b2999b SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 1ed7a68..2308e47 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.18.2~ynh1", + "version": "1.18.3~ynh1", "url": "https://backdropcms.org/", "license": "GPL-2.0", "maintainer": { diff --git a/scripts/install b/scripts/install index 7df3f20..3709717 100644 --- a/scripts/install +++ b/scripts/install @@ -96,15 +96,9 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= ynh_script_progression --message="Configuring Backdrop..." --weight=1 -cp ../conf/settings.example.php "$final_path/settings.php" +salt="$(ynh_string_random --length=30)" -# Change variables in ttrss configuration -ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$final_path/settings.php" -ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$final_path/settings.php" -ynh_replace_string --match_string="__SALT__" --replace_string="$(ynh_string_random --length=30)" --target_file="$final_path/settings.php" - -# Recalculate and store the config file checksum into the app settings -ynh_store_file_checksum --file="$final_path/settings.php" +ynh_add_config --template="../conf/settings.example.php" --destination="$final_path/settings.php" #================================================= # SECURE FILES AND DIRECTORIES From 055806b8f89dbec3502d443571540fd308730cc0 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 23 Apr 2021 11:25:08 +0200 Subject: [PATCH 2/2] Fix --- scripts/install | 10 ++++++++-- scripts/upgrade | 45 ++++++++++++++++----------------------------- 2 files changed, 24 insertions(+), 31 deletions(-) diff --git a/scripts/install b/scripts/install index 3709717..7df3f20 100644 --- a/scripts/install +++ b/scripts/install @@ -96,9 +96,15 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= ynh_script_progression --message="Configuring Backdrop..." --weight=1 -salt="$(ynh_string_random --length=30)" +cp ../conf/settings.example.php "$final_path/settings.php" -ynh_add_config --template="../conf/settings.example.php" --destination="$final_path/settings.php" +# Change variables in ttrss configuration +ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$final_path/settings.php" +ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$final_path/settings.php" +ynh_replace_string --match_string="__SALT__" --replace_string="$(ynh_string_random --length=30)" --target_file="$final_path/settings.php" + +# Recalculate and store the config file checksum into the app settings +ynh_store_file_checksum --file="$final_path/settings.php" #================================================= # SECURE FILES AND DIRECTORIES diff --git a/scripts/upgrade b/scripts/upgrade index 2416282..69a1bf9 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -81,35 +81,6 @@ ynh_system_user_create --username=$app --home_dir="$final_path" # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Upgrading source files..." --weight=7 - - ynh_setup_source --dest_dir="$final_path" -fi - -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2 - -# Create a dedicated NGINX config -ynh_add_nginx_config - -#================================================= -# PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 - -# Create a dedicated PHP-FPM config -ynh_add_fpm_config --package="$extra_php_dependencies" - -#================================================= -# SPECIFIC UPGRADE -#================================================= -# CONFIGURE BACKDROP -#================================================= - if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Reconfiguring Backdrop..." --weight=2 @@ -133,6 +104,22 @@ then ynh_secure_remove --file="$tmpdir" fi +#================================================= +# NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2 + +# Create a dedicated NGINX config +ynh_add_nginx_config + +#================================================= +# PHP-FPM CONFIGURATION +#================================================= +ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 + +# Create a dedicated PHP-FPM config +ynh_add_fpm_config --package="$extra_php_dependencies" + #================================================= # GENERIC FINALIZATION #=================================================