From 4bad1e8b6a2b7ed5b1e39378167bd4faa7d26369 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 11 May 2024 12:14:10 +0200 Subject: [PATCH] cleaning --- scripts/_common.sh | 3 +++ scripts/backup | 6 ------ scripts/change_url | 2 +- scripts/install | 7 +------ scripts/remove | 5 ----- scripts/restore | 5 ----- scripts/upgrade | 5 ----- 7 files changed, 5 insertions(+), 28 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 1a7049a..a677a90 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,6 +4,9 @@ # COMMON VARIABLES #================================================= +# PHP version required by FIII Data Importer +YNH_PHP_VERSION="8.3" + # Composer version YNH_COMPOSER_VERSION="2.5.4" diff --git a/scripts/backup b/scripts/backup index db124c0..18f83fe 100755 --- a/scripts/backup +++ b/scripts/backup @@ -33,12 +33,6 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" -#================================================= -# BACKUP VARIOUS FILES -#================================================= - -# ynh_backup --src_path="/etc/cron.d/$app" - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/change_url b/scripts/change_url index 1fbf84a..76d298b 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -33,7 +33,7 @@ ynh_script_progression --message="Modifying a config file..." domain="$new_domain" path="$new_path" -ynh_add_config --template="../conf/.env" --destination="$install_dir/.env" +ynh_add_config --template=".env" --destination="$install_dir/.env" chmod 400 "$install_dir/.env" chown $app "$install_dir/.env" diff --git a/scripts/install b/scripts/install index 0444f81..f6aafa3 100755 --- a/scripts/install +++ b/scripts/install @@ -50,11 +50,6 @@ ynh_script_progression --message="Configuring PHP-FPM..." # 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 @@ -72,7 +67,7 @@ ynh_exec_warn_less ynh_install_composer --phpversion="$phpversion" --workdir="$i #================================================= ynh_script_progression --message="Adding a configuration file..." -ynh_add_config --template="../conf/.env" --destination="$install_dir/.env" +ynh_add_config --template=".env" --destination="$install_dir/.env" chmod 400 "$install_dir/.env" chown $app "$install_dir/.env" diff --git a/scripts/remove b/scripts/remove index c9f5356..2c04d62 100755 --- a/scripts/remove +++ b/scripts/remove @@ -17,11 +17,6 @@ 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..." - # Remove the dedicated PHP-FPM config ynh_remove_fpm_config diff --git a/scripts/restore b/scripts/restore index afa45cb..72e44fb 100755 --- a/scripts/restore +++ b/scripts/restore @@ -27,11 +27,6 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." 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..." - ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 0e0721e..07f7e77 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -69,11 +69,6 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." # 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..." - # Create a dedicated NGINX config ynh_add_nginx_config