From 64db2f6f83ea61933f3f638635c6a2cd46cac4ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 31 Aug 2024 09:22:40 +0200 Subject: [PATCH] cleaning --- manifest.toml | 2 +- scripts/backup | 7 +------ scripts/install | 30 ++++++++++-------------------- scripts/remove | 6 ++---- scripts/restore | 6 ++---- scripts/upgrade | 29 ++++++----------------------- 6 files changed, 22 insertions(+), 58 deletions(-) diff --git a/manifest.toml b/manifest.toml index ddfc480..dbfc765 100644 --- a/manifest.toml +++ b/manifest.toml @@ -18,7 +18,7 @@ userdoc = "https://github.com/prasathmani/tinyfilemanager" code = "https://github.com/prasathmani/tinyfilemanager" [integration] -yunohost = ">= 11.2.18" +yunohost = ">= 11.2.29" helpers_version = "2.1" architectures = "all" multi_instance = true diff --git a/scripts/backup b/scripts/backup index 36a5181..a0da375 100755 --- a/scripts/backup +++ b/scripts/backup @@ -1,6 +1,5 @@ #!/bin/bash -# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers @@ -19,15 +18,11 @@ ynh_backup "$install_dir" ynh_backup "$data_dir" #================================================= -# BACKUP THE NGINX CONFIGURATION +# SYSTEM CONFIGURATION #================================================= ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# BACKUP THE PHP-FPM CONFIGURATION -#================================================= - ynh_backup "/etc/php/$php_version/fpm/pool.d/$app.conf" #================================================= diff --git a/scripts/install b/scripts/install index 406c964..e97fbca 100755 --- a/scripts/install +++ b/scripts/install @@ -10,41 +10,31 @@ ynh_app_setting_set --key=php_upload_max_filesize --value=10G #================================================= timezone="$(cat /etc/timezone)" -# passhash=php hash.php $password #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= ynh_script_progression "Setting up source files..." -# Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx "$install_dir" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R $app:www-data "$install_dir" -# rename tinyfilemanager to index mv $install_dir/tinyfilemanager.php $install_dir/index.php #================================================= -# PHP-FPM CONFIGURATION +# APP INITIAL CONFIGURATION #================================================= -ynh_script_progression "Configuring PHP-FPM..." - -# Create a dedicated PHP-FPM config -ynh_config_add_phpfpm - -# Create a dedicated NGINX config -ynh_config_add_nginx - -#================================================= -# ADD A CONFIGURATION -#================================================= -ynh_script_progression "Adding $app's configuration..." +ynh_script_progression "Adding $app's configuration files..." ynh_config_add --template="config.php" --destination="$install_dir/config.php" -#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod 600 "$install_dir/config.php" -#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown $app:$app "$install_dir/config.php" +#================================================= +# SYSTEM CONFIGURATION +#================================================= +ynh_script_progression "Adding system configurations related to $app..." + +ynh_config_add_phpfpm + +ynh_config_add_nginx #================================================= # END OF SCRIPT diff --git a/scripts/remove b/scripts/remove index 0201b35..ee9c6ec 100755 --- a/scripts/remove +++ b/scripts/remove @@ -4,14 +4,12 @@ source _common.sh source /usr/share/yunohost/helpers #================================================= -# REMOVE NGINX CONFIGURATION +# REMOVE SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression "Removing NGINX web server configuration..." +ynh_script_progression "Removing system configurations related to $app..." -# Remove the dedicated NGINX config ynh_config_remove_nginx -# Remove the dedicated PHP-FPM config ynh_config_remove_phpfpm #================================================= diff --git a/scripts/restore b/scripts/restore index 7d9b37b..190bc83 100755 --- a/scripts/restore +++ b/scripts/restore @@ -11,8 +11,6 @@ ynh_script_progression "Restoring the app main directory..." ynh_restore "$install_dir" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx "$install_dir" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R $app:www-data "$install_dir" #================================================= # RESTORE THE DATA DIRECTORY #================================================= @@ -23,9 +21,9 @@ ynh_restore "$data_dir" chown -R $app:www-data "$data_dir" #================================================= -# RESTORE THE PHP-FPM CONFIGURATION +# RESTORE SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression "Restoring the PHP-FPM configuration..." +ynh_script_progression "Restoring system configurations related to $app..." ynh_restore "/etc/php/$php_version/fpm/pool.d/$app.conf" diff --git a/scripts/upgrade b/scripts/upgrade index 0b15d04..9d00ea5 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -14,42 +14,25 @@ timezone="$(cat /etc/timezone)" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +ynh_script_progression "Upgrading source files..." -# FIXME: this is still supported but the recommendation is now to *always* re-setup the app sources wether or not the upstream sources changed -if ynh_app_upstream_version_changed -then - ynh_script_progression "Upgrading source files..." +ynh_setup_source --dest_dir="$install_dir" - # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" -fi - -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx "$install_dir" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R $app:www-data "$install_dir" #================================================= -# PHP-FPM CONFIGURATION +# REAPPLY SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression "Upgrading PHP-FPM configuration..." +ynh_script_progression "Upgrading system configurations related to $app..." -# Create a dedicated PHP-FPM config ynh_config_add_phpfpm -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression "Upgrading NGINX web server configuration..." - -# Create a dedicated NGINX config ynh_config_add_nginx #================================================= # UPDATE A CONFIG FILE #================================================= -ynh_script_progression "Updating configuration..." -ynh_config_add --template="config.php" --destination="$install_dir/config.php" +ynh_script_progression "Updating $app's configuration files..." -#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod 600 "$install_dir/config.php" -#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown $app:$app "$install_dir/config.php" +ynh_config_add --template="config.php" --destination="$install_dir/config.php" #================================================= # END OF SCRIPT