Merge pull request #77 from YunoHost-Apps/beta-23

Beta 23

README.md

@@ -40,7 +40,7 @@ Castopod is currently in beta but already quite stable and used by podcasters ar
 - Multi-user: add contributors and set roles
 - i18n support: translated in English, French & Polish with more to come!
 
-**Shipped version:** 1.0.0-99~ynh2
+**Shipped version:** 1.0.0-103~ynh1 *(:warning: This is the `beta-23` branch. The [`master` branch](https://github.com/YunoHost-Apps/castopod_ynh/tree/master) used in the catalog is currently on version 1.0.0-99\~ynh2.)*
 
 
 **Demo:** https://podcast.podlibre.org/@podlibre_fr

README_fr.md

@@ -40,7 +40,7 @@ Castopod is currently in beta but already quite stable and used by podcasters ar
 - Multi-user: add contributors and set roles
 - i18n support: translated in English, French & Polish with more to come!
 
-**Version incluse :** 1.0.0-99~ynh2
+**Version incluse :** 1.0.0-103~ynh1 *(:warning: Il s'agit de la branche `beta-23`. La [branche `master`](https://github.com/YunoHost-Apps/castopod_ynh/tree/master) utilisée dans le catalogue est actuellement en 1.0.0-99\~ynh2.)*
 
 
 **Démo :** https://podcast.podlibre.org/@podlibre_fr

conf/app.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://code.castopod.org/adaures/castopod/uploads/e997234d358aed3f7b0178bd8994e013/castopod-1.0.0-beta.19.zip
+SOURCE_URL=https://code.castopod.org/adaures/castopod/uploads/c6085e0c8a152dc07028852a736eede8/castopod-1.0.0-beta.23.zip
-SOURCE_SUM=2c19ef3dfb940d4deb610e160a03043b1cd83bc422095f83972533c0e1fe2eb0
+SOURCE_SUM=115ee8908e44a57b977058e36a04b5de5d4b807e76d99745e447d53458aeeb1d
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true

manifest.json

@@ -6,7 +6,7 @@
         "en": "Hosting platform made for podcasters",
         "fr": "Plateforme d'hébergement conçue pour les podcasteurs"
     },
-    "version": "1.0.0-99~ynh2",
+    "version": "1.0.0-103~ynh1",
     "url": "https://castopod.org/",
     "upstream": {
         "license": "GPL-3.0-only",

scripts/install

@@ -93,14 +93,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..." --weight=1
-
-# Create a dedicated NGINX config
-ynh_add_nginx_config
-
 #=================================================
 # PHP-FPM CONFIGURATION
 #=================================================
@@ -109,6 +101,14 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=1
 # Create a dedicated PHP-FPM config
 ynh_add_fpm_config --usage=low --footprint=low
 
+#=================================================
+# NGINX CONFIGURATION
+#=================================================
+ynh_script_progression --message="Configuring NGINX web server..." --weight=1
+
+# Create a dedicated NGINX config
+ynh_add_nginx_config
+
 #=================================================
 # SPECIFIC SETUP
 #=================================================

scripts/restore

@@ -43,16 +43,11 @@ fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage)
 #=================================================
 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
 #=================================================
@@ -72,6 +67,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..." --weight=1
+
+# Define and install dependencies
+ynh_install_app_dependencies $pkg_dependencies
+
 #=================================================
 # RESTORE THE PHP-FPM CONFIGURATION
 #=================================================
@@ -80,12 +83,11 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weig
 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
 #=================================================
-# REINSTALL DEPENDENCIES
+# RESTORE THE NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Reinstalling dependencies..." --weight=1
+ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1
 
-# Define and install dependencies
+ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
-ynh_install_app_dependencies $pkg_dependencies
 
 #=================================================
 # RESTORE THE MYSQL DATABASE

scripts/upgrade

@@ -83,13 +83,6 @@ if ynh_legacy_permissions_exists; then
 	ynh_app_setting_delete --app=$app --key=is_public
 fi
 
-#=================================================
-# UPGRADE DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Upgrading dependencies..." --weight=1
-
-ynh_install_app_dependencies $pkg_dependencies
-
 #=================================================
 # CREATE DEDICATED USER
 #=================================================
@@ -127,12 +120,11 @@ then
 fi
 
 #=================================================
-# NGINX CONFIGURATION
+# UPGRADE DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=10
+ynh_script_progression --message="Upgrading dependencies..." --weight=1
 
-# Create a dedicated NGINX config
+ynh_install_app_dependencies $pkg_dependencies
-ynh_add_nginx_config
 
 #=================================================
 # PHP-FPM CONFIGURATION
@@ -142,6 +134,14 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2
 # Create a dedicated PHP-FPM config
 ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint
 
+#=================================================
+# NGINX CONFIGURATION
+#=================================================
+ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=10
+
+# Create a dedicated NGINX config
+ynh_add_nginx_config
+
 #=================================================
 # CONFIGURE CASTOPOD
 #=================================================