Merge pull request #31 from YunoHost-Apps/testing

Testing

README.md

@@ -17,7 +17,8 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 Open Source Marketing Automation Software
 
-**Shipped version:** 4.4.0~ynh1
+**Shipped version:** 4.4.3~ynh1 *(:warning: This is the `testing` branch. The [`master` branch](https://github.com/YunoHost-Apps/mautic_ynh/tree/master) used in the catalog is currently on version 4.4.0\~ynh1.)*
+
 
 **Demo:** https://www.mautic.org/demo
 

README_fr.md

@@ -17,7 +17,8 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 Logiciel d'automatisation marketing open source
 
-**Version incluse :** 4.4.0~ynh1
+**Version incluse :** 4.4.3~ynh1 *(:warning: Il s'agit de la branche `testing`. La [branche `master`](https://github.com/YunoHost-Apps/mautic_ynh/tree/master) utilisée dans le catalogue est actuellement en 4.4.0\~ynh1.)*
+
 
 **Démo :** https://www.mautic.org/demo
 

conf/app.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/mautic/mautic/releases/download/4.4.0/4.4.0.zip
-SOURCE_SUM=2c37ca48031015a2f0cd9d8d783fca153f1d73553600319e74387da8e5635a2a
+SOURCE_URL=https://github.com/mautic/mautic/releases/download/4.4.3/4.4.3.zip
+SOURCE_SUM=e4d88ac945867b219df83c37a2ebf6bd093d77d1abf2913f6034ec2a089b65d3
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=false

manifest.json

@@ -6,14 +6,15 @@
         "en": "Open Source Marketing Automation Software",
         "fr": "Logiciel d'automatisation marketing open source"
     },
-    "version": "4.4.0~ynh1",
+    "version": "4.4.3~ynh1",
     "url": "https://www.mautic.org/",
     "upstream": {
         "license": "GPL-3.0-only",
         "website": "https://www.mautic.org/",
         "demo": "https://www.mautic.org/demo",
         "admindoc": "https://docs.mautic.org/en",
-        "code": "https://github.com/mautic/mautic"
+        "code": "https://github.com/mautic/mautic",
+        "cpe": "cpe:2.3:a:acquia:mautic"
     },
     "license": "GPL-3.0-only",
     "maintainer": {
@@ -21,7 +22,7 @@
         "email": ""
     },
     "requirements": {
-        "yunohost": ">= 4.3.0"
+        "yunohost": ">= 11.0.9"
     },
     "multi_instance": true,
     "services": [
@@ -52,4 +53,4 @@
             }
         ]
     }
-}
+}

scripts/install

@@ -91,14 +91,6 @@ chmod -R g+w $final_path/media/files/
 chmod -R g+w $final_path/media/images/
 chmod -R g+w $final_path/translations/
 
-#=================================================
-# NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Configuring NGINX web server..." --weight=1
-
-# Create a dedicated NGINX config
-ynh_add_nginx_config
-
 #=================================================
 # PHP-FPM CONFIGURATION
 #=================================================
@@ -107,6 +99,14 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=1
 # Create a dedicated PHP-FPM config
 ynh_add_fpm_config
 
+#=================================================
+# NGINX CONFIGURATION
+#=================================================
+ynh_script_progression --message="Configuring NGINX web server..." --weight=1
+
+# Create a dedicated NGINX config
+ynh_add_nginx_config
+
 #=================================================
 # SETUP A CRON
 #=================================================

scripts/restore

@@ -40,16 +40,11 @@ timezone="$(cat /etc/timezone)"
 #=================================================
 ynh_script_progression --message="Validating restoration parameters..." --weight=1
 
-test ! -d $final_path || ynh_die --message="There is already a directory: $final_path "
+test ! -d $final_path \
+	|| ynh_die --message="There is already a directory: $final_path "
 
 #=================================================
 # STANDARD RESTORATION STEPS
-#=================================================
-# RESTORE THE NGINX CONFIGURATION
-#=================================================
-
-ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
-
 #=================================================
 # RECREATE THE DEDICATED USER
 #=================================================
@@ -89,6 +84,13 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weig
 
 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
+#=================================================
+# RESTORE THE NGINX CONFIGURATION
+#=================================================
+ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1
+
+ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
+
 #=================================================
 # RESTORE THE MYSQL DATABASE
 #=================================================

scripts/upgrade

@@ -96,14 +96,6 @@ chmod -R g+w $final_path/media/files/
 chmod -R g+w $final_path/media/images/
 chmod -R g+w $final_path/translations/
 
-#=================================================
-# NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=10
-
-# Create a dedicated NGINX config
-ynh_add_nginx_config
-
 #=================================================
 # UPGRADE DEPENDENCIES
 #=================================================
@@ -119,6 +111,14 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2
 # Create a dedicated PHP-FPM config
 ynh_add_fpm_config
 
+#=================================================
+# NGINX CONFIGURATION
+#=================================================
+ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=10
+
+# Create a dedicated NGINX config
+ynh_add_nginx_config
+
 #=================================================
 # RELOAD NGINX
 #=================================================