Merge pull request #109 from YunoHost-Apps/testing

Testing

manifest.toml

@@ -19,8 +19,11 @@ code = "https://gitlab.com/mojo42/Jirafeau"
 yunohost = ">= 11.2"
 architectures = "all"
 multi_instance = false
+
 ldap = false
+
 sso = false
+
 disk = "50M"
 ram.build = "50M"
 ram.runtime = "50M"
@@ -52,6 +55,7 @@ ram.runtime = "50M"
         [resources.sources.main]
         url = "https://gitlab.com/mojo42/Jirafeau/-/archive/4.5.0/Jirafeau-4.5.0.tar.gz"
         sha256 = "cc164f086b65c810cefc0eb26bffa6718a12a56ea94b7717d7eba8281d6c66ac"
+        autoupdate.strategy = "latest_gitlab_tag"
 
     [resources.system_user]
 

scripts/change_url

@@ -29,4 +29,4 @@ ynh_replace_string --match_string="\$cfg\['web_root'\] = .*" --replace_string="\
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Change of URL completed for Jirafeau" --last
+ynh_script_progression --message="Change of URL completed for $app" --last

scripts/install

@@ -50,11 +50,6 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=2
 # Create a dedicated PHP-FPM config
 ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint
 
-#=================================================
-# NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Configuring NGINX web server..."
-
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
@@ -70,7 +65,7 @@ else
 	jirafeau_path="$path"
 fi
 
-ynh_add_config --template="../conf/config.local.php" --destination="$install_dir/lib/config.local.php"
+ynh_add_config --template="config.local.php" --destination="$install_dir/lib/config.local.php"
 
 chmod 400 "$install_dir/lib/config.local.php"
 chown $app:$app "$install_dir/lib/config.local.php"
@@ -80,7 +75,7 @@ chown $app:$app "$install_dir/lib/config.local.php"
 #=================================================
 ynh_script_progression --message="Configuring the cron file..." --weight=2
 
-ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app"
+ynh_add_config --template="cron" --destination="/etc/cron.d/$app"
 
 chown root: "/etc/cron.d/$app"
 chmod 644 "/etc/cron.d/$app"
@@ -89,4 +84,4 @@ chmod 644 "/etc/cron.d/$app"
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Installation of Jirafeau completed" --last
+ynh_script_progression --message="Installation of $app completed" --last

scripts/remove

@@ -17,21 +17,9 @@ ynh_script_progression --message="Removing NGINX web server configuration..." --
 # Remove the dedicated NGINX config
 ynh_remove_nginx_config
 
-#=================================================
-# REMOVE PHP-FPM CONFIGURATION
-#=================================================
-ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=2
-
 # Remove the dedicated PHP-FPM config
 ynh_remove_fpm_config
 
-#=================================================
-# SPECIFIC REMOVE
-#=================================================
-# REMOVE VARIOUS FILES
-#=================================================
-ynh_script_progression --message="Removing various files..." --weight=1
-
 # Remove a cron file
 ynh_secure_remove --file="/etc/cron.d/$app"
 

scripts/restore

@@ -37,20 +37,10 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weig
 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
 # Recreate a dedicated php-fpm config
-ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --phpversion=$phpversion
-
-#=================================================
-# RESTORE THE NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1
+ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint
 
 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
-#=================================================
-# RESTORE VARIOUS FILES
-#=================================================
-ynh_script_progression --message="Restoring various files..." --weight=1
-
 ynh_restore_file --origin_path="/etc/cron.d/$app"
 chown root: "/etc/cron.d/$app"
 chmod 644 "/etc/cron.d/$app"

scripts/upgrade

@@ -70,24 +70,12 @@ chown -R $app:www-data "$install_dir"
 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=2
+ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint
 
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
-#=================================================
-# SPECIFIC UPGRADE
-#=================================================
-# SET THE CRON FILE
-#=================================================
-ynh_script_progression --message="Configuring the cron file..." --weight=1
-
-ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app"
+ynh_add_config --template="cron" --destination="/etc/cron.d/$app"
 chown root: "/etc/cron.d/$app"
 chmod 644 "/etc/cron.d/$app"