From 7f924780704b36424bedb68dbfb541ab8f18ae05 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 4 Dec 2020 09:26:21 +0100 Subject: [PATCH 1/5] Cleaning up --- check_process | 2 -- manifest.json | 4 ++++ scripts/change_url | 20 -------------------- scripts/install | 3 --- scripts/upgrade | 7 ------- 5 files changed, 4 insertions(+), 32 deletions(-) diff --git a/check_process b/check_process index b9e2faf..a32958f 100644 --- a/check_process +++ b/check_process @@ -16,8 +16,6 @@ incorrect_path=1 port_already_use=0 change_url=1 -;;; Levels - Level 5=auto ;;; Options Email= Notification=none diff --git a/manifest.json b/manifest.json index 3074016..4d90c36 100644 --- a/manifest.json +++ b/manifest.json @@ -50,6 +50,10 @@ "en": "Is it a public site?", "fr": "Est-ce un site public ?" }, + "help": { + "en": "If enabled, Backdrop will be accessible by people who do not have an account. This can be changed later via the webadmin.", + "fr": "Si cette case est cochée, Backdrop sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin." + }, "default": true } ] diff --git a/scripts/change_url b/scripts/change_url index 1ac1ecb..16fc4d1 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -77,26 +77,6 @@ then ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" fi -#================================================= -# SPECIFIC MODIFICATIONS -#================================================= -# ynh_script_progression --message="Configuring $app..." --weight=1 - -# domain="$new_domain" -# path_url="$new_path" - -# ynh_backup_if_checksum_is_different --file="$final_path/settings.php" - -# cp ../conf/settings.example.php "$final_path/settings.php" - -# # Change domain name in config.php -# ynh_replace_string --match_string="__DBNAME__" --replace_string="$db_name" --target_file="$final_path/settings.php" -# ynh_replace_string --match_string="__DBPWD__" --replace_string="$db_pwd" --target_file="$final_path/settings.php" -# #ynh_replace_string --match_string="__DOMAINPATH__" --replace_string="https://$domain$path_url" --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" - #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/install b/scripts/install index ed28aa3..0536376 100644 --- a/scripts/install +++ b/scripts/install @@ -33,9 +33,6 @@ ynh_script_progression --message="Validating installation parameters..." --weigh final_path=/var/www/$app test ! -e "$final_path" || ynh_die "This path already contains a folder" -# Normalize the url path syntax -path_url=$(ynh_normalize_url_path $path_url) - # Register (book) web path ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url diff --git a/scripts/upgrade b/scripts/upgrade index bcb5a29..83cdf32 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -61,13 +61,6 @@ ynh_clean_setup () { # Exit if an error occurs during the execution of the script ynh_abort_if_errors -#================================================= -# CHECK THE PATH -#================================================= - -# Normalize the URL path syntax -path_url=$(ynh_normalize_url_path --path_url=$path_url) - #================================================= # STANDARD UPGRADE STEPS #================================================= From 23bc4041f21ffb9970f02f1c7db319b3edfd2ba6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 17 Dec 2020 21:28:23 +0100 Subject: [PATCH 2/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7897237..bd163cb 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Backdrop for YunoHost [![Integration level](https://dash.yunohost.org/integration/backdrop.svg)](https://dash.yunohost.org/appci/app/backdrop) ![](https://ci-apps.yunohost.org/ci/badges/backdrop.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/backdrop.maintain.svg) -[![Install Tiny Tiny RSS with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=backdrop) +[![Install Tiny Tiny RSS with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=backdrop) *[Lire ce readme en français.](./README_fr.md)* From 2fb836c54f687ba175b9d65e5cab55138b928c95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 26 Dec 2020 09:35:44 +0100 Subject: [PATCH 3/5] Use SVG badge --- README_fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_fr.md b/README_fr.md index 0877a9d..7745ef8 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,7 +1,7 @@ # Backdrop pour YunoHost [![Integration level](https://dash.yunohost.org/integration/backdrop.svg)](https://dash.yunohost.org/appci/app/backdrop) ![](https://ci-apps.yunohost.org/ci/badges/backdrop.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/backdrop.maintain.svg) -[![Installer Backdrop avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=backdrop) +[![Installer Backdrop avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=backdrop) *[Read this readme in english.](./README.md)* From 9a336ed8d98466eb109a99acc5dbf0554267b404 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 6 Jan 2021 09:23:41 +0100 Subject: [PATCH 4/5] Upgrade to 1.18.0 --- README.md | 4 ++-- README_fr.md | 4 ++-- conf/app.src | 4 ++-- manifest.json | 4 ++-- scripts/restore | 2 +- scripts/upgrade | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 7897237..07b0ce1 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Backdrop for YunoHost [![Integration level](https://dash.yunohost.org/integration/backdrop.svg)](https://dash.yunohost.org/appci/app/backdrop) ![](https://ci-apps.yunohost.org/ci/badges/backdrop.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/backdrop.maintain.svg) -[![Install Tiny Tiny RSS with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=backdrop) +[![Install Tiny Tiny RSS with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=backdrop) *[Lire ce readme en français.](./README_fr.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.4 +**Shipped version:** 1.18.0 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 0877a9d..2909c4b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,7 +1,7 @@ # Backdrop pour YunoHost [![Integration level](https://dash.yunohost.org/integration/backdrop.svg)](https://dash.yunohost.org/appci/app/backdrop) ![](https://ci-apps.yunohost.org/ci/badges/backdrop.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/backdrop.maintain.svg) -[![Installer Backdrop avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=backdrop) +[![Installer Backdrop avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=backdrop) *[Read this readme in english.](./README.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.4 +**Version incluse :** 1.18.0 ## Captures d’écran diff --git a/conf/app.src b/conf/app.src index 090a8eb..6b43eba 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/backdrop/backdrop/releases/download/1.17.4/backdrop.zip -SOURCE_SUM=9e3c9280ad60622638ef603dde56fdc02dab43ae367ff30f8324a45fb555186d +SOURCE_URL=https://github.com/backdrop/backdrop/releases/download/1.18.0-preview/backdrop.zip +SOURCE_SUM=a010ce2265a80c20be68fc7ef6117bf810547ed357302643e1515444e7ed230d SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index f514311..b067173 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.4~ynh2", + "version": "1.18.0~ynh1", "url": "https://backdropcms.org/", "license": "GPL-2.0", "maintainer": { @@ -19,7 +19,7 @@ "multi_instance": true, "services": [ "nginx", - "php7.0-fpm", + "php7.3-fpm", "mysql" ], "arguments": { diff --git a/scripts/restore b/scripts/restore index d3d45ef..66e2a29 100644 --- a/scripts/restore +++ b/scripts/restore @@ -18,7 +18,7 @@ ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading settings..." --weight=1 +ynh_script_progression --message="Loading settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME diff --git a/scripts/upgrade b/scripts/upgrade index 83cdf32..9694d55 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -12,7 +12,7 @@ source /usr/share/yunohost/helpers #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 +ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME @@ -33,7 +33,7 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= -ynh_script_progression --message="Ensuring downward compatibility..." --weight=2 +ynh_script_progression --message="Ensuring downward compatibility..." --weight=2 # If final_path doesn't exist, create it if [ -z "$final_path" ]; then From 2d7431d1c1a5ff1468440181cf36231cb46b80d3 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 16 Jan 2021 08:37:50 +0100 Subject: [PATCH 5/5] Upgrade to 1.18.0 --- conf/app.src | 4 ++-- scripts/install | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/app.src b/conf/app.src index 6b43eba..bb272f4 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/backdrop/backdrop/releases/download/1.18.0-preview/backdrop.zip -SOURCE_SUM=a010ce2265a80c20be68fc7ef6117bf810547ed357302643e1515444e7ed230d +SOURCE_URL=https://github.com/backdrop/backdrop/releases/download/1.18.0/backdrop.zip +SOURCE_SUM=86c9d282ad67c42f68ecef2175d4b9b02b4bf68045f7e27ec6f95844af11b286 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/scripts/install b/scripts/install index 0536376..73f26d8 100644 --- a/scripts/install +++ b/scripts/install @@ -114,8 +114,8 @@ ynh_store_file_checksum --file="$final_path/settings.php" #================================================= # Set permissions to app files -chown -R $app:www-data $final_path -#chown -R $app:www-data $final_path/files +chown -R root: $final_path +chown -R $app:www-data $final_path/files chmod -R 770 $final_path/files #=================================================