Merge pull request #25 from YunoHost-Apps/testing

Upgrade to 4.2.0
2024-09-03 19:26:34 +02:00 · 2022-08-30 20:02:20 +02:00 · 2022-08-30 20:02:20 +02:00 · f8fa3015b4
commit f8fa3015b4
parent da0809552e 400986453e
7 changed files with 42 additions and 39 deletions
--- 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

--- 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

--- 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
--- a/manifest.json
+++ b/manifest.json
@ -3,15 +3,17 @@
    "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",
        "website": "https://www.joomla.org/",
        "admindoc": "https://docs.joomla.org/",
-        "code": "https://github.com/joomla/joomla-cms"
+        "code": "https://github.com/joomla/joomla-cms",
+        "cpe": "cpe:2.3:a:joomla:joomla\\!"
    },
    "license": "GPL-2.0-only",
    "maintainer": {
@ -19,7 +21,7 @@
        "email": "anmol@datamol.org"
    },
    "requirements": {
-        "yunohost": ">= 4.3.0"
+        "yunohost": ">= 11.0.9"
    },
    "multi_instance": true,
    "services": [
@ -52,9 +54,10 @@
                "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."
                }
            }
        ]
    }
-}
+}
--- 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
 #=================================================
--- 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
--- 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
 #=================================================