cleaning

conf/ffprobe.patch

@@ -1,13 +0,0 @@
-diff --git a/vendor/lychee-org/php-exif/lib/PHPExif/Adapter/FFprobe.php b/vendor/lychee-org/php-exif/lib/PHPExif/Adapter/FFprobe.php
-index 9ececfe..106eadd 100644
---- a/vendor/lychee-org/php-exif/lib/PHPExif/Adapter/FFprobe.php
-+++ b/vendor/lychee-org/php-exif/lib/PHPExif/Adapter/FFprobe.php
-@@ -40,7 +40,7 @@ class FFprobe extends AdapterAbstract
-      *
-      * @var string
-      */
--    protected string $toolPath = '';
-+    protected string $toolPath = '/usr/bin/ffprobe';
-
-     /**
-      * @var string-e

conf/user.css.example

@@ -1,23 +0,0 @@
-/* Disable the 'zoom' animation while browsing pictures */
-#imageview #image {
-  transition: none !important;
-  animation-name: none !important;
-  animation-duration: 0 !important;
-}
-
-/* Hide smart albums */
-/*
-[data-id="0"] { display:none; }
-[data-id="s"] { display:none; }
-[data-id="f"] { display:none; }
-[data-id="r"] { display:none; }
-*/
-
-/* Make the diadnostic font bigger */
-.settings_view p, .settings_view a, .settings_view input,
-.sharing_view p, .sharing_view a, .sharing_view input,  .sharing_view option,
-.users_view p, .users_view a, .users_view input, .users_view option,
-.logs_diagnostics_view pre {
-    font-size: 12pt;
-    line-height: 14pt;
-}

scripts/install

@@ -13,10 +13,6 @@ source /usr/share/yunohost/helpers
 # RETRIEVE ARGUMENTS FROM THE MANIFEST
 #=================================================
 
-fpm_footprint="low"
-fpm_free_footprint=0
-fpm_usage="low"
-
 timezone="$(cat /etc/timezone)"
 
 #=================================================
@@ -27,14 +23,6 @@ ynh_script_progression --message="Installing dependencies..." --weight=7
 # Install Nodejs
 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
 
-#=================================================
-# STORE SETTINGS FROM MANIFEST
-#=================================================
-
-ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint
-ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint
-ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage
-
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
@@ -55,7 +43,7 @@ chmod -R 755 $data_dir
 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
+ynh_add_fpm_config
 
 # Create a dedicated NGINX config
 ynh_add_nginx_config
@@ -110,10 +98,10 @@ pushd $install_dir
 	php$phpversion artisan config:cache -n
 popd
 
-# Setup custom user.css file
+chmod 750 "$install_dir"
-ynh_add_config --template="user.css.example" --destination="$install_dir/public/dist/user.css"
+chmod 750 "$install_dir/bootstrap/cache"
-chmod 750 "$install_dir/public/dist/user.css"
+chmod -R o-rwx "$install_dir"
-chown $app:$app "$install_dir/public/dist/user.css"
+chown -R $app:www-data "$install_dir"
 
 #=================================================
 # END OF SCRIPT

scripts/restore

@@ -46,7 +46,7 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..."
 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
+ynh_add_fpm_config
 
 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 

scripts/upgrade

@@ -15,31 +15,6 @@ source /usr/share/yunohost/helpers
 
 upgrade_type=$(ynh_check_app_version_changed)
 
-#=================================================
-# STANDARD UPGRADE STEPS
-#=================================================
-# ENSURE DOWNWARD COMPATIBILITY
-#=================================================
-ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
-
-# If fpm_footprint doesn't exist, create it
-if [ -z "${fpm_footprint:-}" ]; then
-    fpm_footprint=low
-    ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint
-fi
-
-# If fpm_free_footprint doesn't exist, create it
-if [ -z "${fpm_free_footprint:-}" ]; then
-    fpm_free_footprint=0
-    ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint
-fi
-
-# If fpm_usage doesn't exist, create it
-if [ -z "${fpm_usage:-}" ]; then
-    fpm_usage=low
-    ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage
-fi
-
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
@@ -49,13 +24,12 @@ then
 	ynh_script_progression --message="Upgrading source files..." --weight=4
 
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$install_dir" --keep=".env public/dist/user.css"
+	ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep=".env"
 fi
 
 chmod 750 "$install_dir/bootstrap/cache"
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
-chmod -R 755 $data_dir
 
 #=================================================
 # UPGRADE DEPENDENCIES
@@ -71,7 +45,7 @@ ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
 ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint
+ynh_add_fpm_config
 
 # Create a dedicated NGINX config
 ynh_add_nginx_config
@@ -81,12 +55,12 @@ ynh_add_nginx_config
 #=================================================
 # UPDATE A CONFIG FILE
 #=================================================
-#ynh_script_progression --message="Updating a configuration file..."
+ynh_script_progression --message="Updating a configuration file..."
 
-#ynh_add_config --template=".env.example" --destination="$install_dir/.env"
+ynh_add_config --template=".env.example" --destination="$install_dir/.env"
 
-#chmod 400 "$install_dir/.env"
+chmod 400 "$install_dir/.env"
-#chown $app:$app "$install_dir/.env"
+chown $app:$app "$install_dir/.env"
 
 #=================================================
 # INSTALL APP WITH COMPOSER