From 05348aff5408ffa4652a6606341b2260dda6950b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 27 Aug 2022 21:52:03 +0200 Subject: [PATCH 1/5] 4.2.0 --- manifest.json | 10 ++++++---- scripts/install | 16 ++++++++-------- scripts/restore | 24 +++++++++++------------- scripts/upgrade | 16 ++++++++-------- 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/manifest.json b/manifest.json index 2db5e7f..4c2641c 100644 --- a/manifest.json +++ b/manifest.json @@ -3,9 +3,10 @@ "id": "joomla", "packaging_format": 1, "description": { - "en": "A content management system." + "en": "Content management system", + "fr": "Système de gestion de contenu libre" }, - "version": "4.1.5~ynh1", + "version": "4.2.0~ynh1", "url": "https://www.joomla.org", "upstream": { "license": "GPL-2.0-only", @@ -19,7 +20,7 @@ "email": "anmol@datamol.org" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.0.9" }, "multi_instance": true, "services": [ @@ -52,7 +53,8 @@ "name": "password", "type": "password", "help": { - "en": "Password must be longer than 8 characters." + "en": "Password must be longer than 8 characters.", + "fr": "Le mot de passe doit comporter plus de 8 caractères." } } ] diff --git a/scripts/install b/scripts/install index 1873023..891d84d 100644 --- a/scripts/install +++ b/scripts/install @@ -95,14 +95,6 @@ chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring NGINX web server..." - -# Create a dedicated NGINX config -ynh_add_nginx_config - #================================================= # PHP-FPM CONFIGURATION #================================================= @@ -112,6 +104,14 @@ ynh_script_progression --message="Configuring PHP-FPM..." ynh_add_fpm_config phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +#================================================= +# NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Configuring NGINX web server..." + +# Create a dedicated NGINX config +ynh_add_nginx_config + #================================================= # SPECIFIC SETUP #================================================= diff --git a/scripts/restore b/scripts/restore index e29d747..b184317 100644 --- a/scripts/restore +++ b/scripts/restore @@ -41,13 +41,6 @@ test ! -d $final_path \ #================================================= # STANDARD RESTORATION STEPS -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the NGINX web server configuration..." - -ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" - #================================================= # RECREATE THE DEDICATED USER #================================================= @@ -67,6 +60,14 @@ chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" +#================================================= +# REINSTALL DEPENDENCIES +#================================================= +ynh_script_progression --message="Reinstalling dependencies..." + +# Define and install dependencies +ynh_install_app_dependencies $pkg_dependencies + #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= @@ -75,14 +76,11 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" #================================================= -# SPECIFIC RESTORATION +# RESTORE THE NGINX CONFIGURATION #================================================= -# REINSTALL DEPENDENCIES -#================================================= -ynh_script_progression --message="Reinstalling dependencies..." +ynh_script_progression --message="Restoring the NGINX web server configuration..." -# Define and install dependencies -ynh_install_app_dependencies $pkg_dependencies +ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # RESTORE THE MYSQL DATABASE diff --git a/scripts/upgrade b/scripts/upgrade index 57ec1b1..b1465b2 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -101,14 +101,6 @@ chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." - -# Create a dedicated NGINX config -ynh_add_nginx_config - #================================================= # UPGRADE DEPENDENCIES #================================================= @@ -124,6 +116,14 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." # Create a dedicated PHP-FPM config ynh_add_fpm_config +#================================================= +# NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Upgrading NGINX web server configuration..." + +# Create a dedicated NGINX config +ynh_add_nginx_config + #================================================= # SPECIFIC UPGRADE #================================================= From aa996082f9c2dafcde169e3390325830654830e9 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 27 Aug 2022 19:52:09 +0000 Subject: [PATCH 2/5] Auto-update README --- README.md | 3 ++- README_fr.md | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c420a5e..4d835aa 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,8 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Joomla! is a free and open-source content management system (CMS) for publishing web content. Over the years Joomla! has won several awards. It is built on a model–view–controller web application framework that can be used independently of the CMS that allows you to build powerful online applications. -**Shipped version:** 4.1.5~ynh1 +**Shipped version:** 4.2.0~ynh1 + ## Screenshots diff --git a/README_fr.md b/README_fr.md index ffb76a5..f1258ba 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,8 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Joomla! is a free and open-source content management system (CMS) for publishing web content. Over the years Joomla! has won several awards. It is built on a model–view–controller web application framework that can be used independently of the CMS that allows you to build powerful online applications. -**Version incluse :** 4.1.5~ynh1 +**Version incluse :** 4.2.0~ynh1 + ## Captures d'écran From 972ced21ac13d37afb9e9f484cfb3527bf124ab1 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 27 Aug 2022 19:53:16 +0000 Subject: [PATCH 3/5] Auto-update README --- README.md | 1 - README_fr.md | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8608171..4d835aa 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,6 @@ Joomla! is a free and open-source content management system (CMS) for publishing **Shipped version:** 4.2.0~ynh1 - ## Screenshots ![Screenshot of Joomla](./doc/screenshots/screenshot.jpg) diff --git a/README_fr.md b/README_fr.md index 880a432..f1258ba 100644 --- a/README_fr.md +++ b/README_fr.md @@ -20,6 +20,7 @@ Joomla! is a free and open-source content management system (CMS) for publishing **Version incluse :** 4.2.0~ynh1 + ## Captures d'écran ![Capture d'écran de Joomla](./doc/screenshots/screenshot.jpg) From 03b7a54fbee7a0c2477daa4622cfd13d0bf0c3b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 27 Aug 2022 21:57:46 +0200 Subject: [PATCH 4/5] Update app.src --- conf/app.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/app.src b/conf/app.src index 9d36487..b7e2512 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/joomla/joomla-cms/releases/download/4.1.5/Joomla_4.1.5-Stable-Full_Package.tar.gz -SOURCE_SUM=59471fca3e372d7db75ba01fd4ebb986f2c1838f851fbf753c3e6319ffb8d5bb +SOURCE_URL=https://github.com/joomla/joomla-cms/releases/download/4.2.0/Joomla_4.2.0-Stable-Full_Package.tar.gz +SOURCE_SUM=b428a5ad13f3c9e465b6a8a855e5a16bea29321e1978da5a3af8f5787addae57 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false From 864a4bc981a630054c4bfd409e6c872ca087beb4 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 28 Aug 2022 13:40:09 +0200 Subject: [PATCH 5/5] n need to force bullseye --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index cf830d4..17ce958 100644 --- a/manifest.json +++ b/manifest.json @@ -21,7 +21,7 @@ "email": "anmol@datamol.org" }, "requirements": { - "yunohost": ">= 11.0.9" + "yunohost": ">= 4.3.0" }, "multi_instance": true, "services": [