From 516650cd9d3b474423bc6e997a87afdc6cf1ff4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 17 Dec 2023 23:15:51 +0100 Subject: [PATCH] cleaning --- scripts/install | 8 +++----- scripts/upgrade | 11 ++--------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/scripts/install b/scripts/install index ab58531..2d4f205 100644 --- a/scripts/install +++ b/scripts/install @@ -28,10 +28,8 @@ chown -R $app:www-data "$install_dir" #================================================= ynh_script_progression --message="Configuring PHP-FPM..." --weight=2 -# Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=low --footprint=low +ynh_add_fpm_config -# Create a dedicated NGINX config ynh_add_nginx_config #================================================= @@ -72,7 +70,7 @@ ynh_secure_remove --file="$install_dir/populate.sql" #================================================= ynh_script_progression --message="Adding a configuration file..." -ynh_add_config --template="../conf/settings.php" --destination="$install_dir/includes/config/settings.php" +ynh_add_config --template="settings.php" --destination="$install_dir/includes/config/settings.php" #================================================= # CREATE TP.CONFIG.PHP FILE @@ -92,7 +90,7 @@ ynh_script_progression --message="Creating a saltkey..." saltkey=$(ynh_string_random --length=32) mkdir /etc/$app/ -ynh_add_config --template="../conf/sk.php" --destination="/etc/$app/sk.php" +ynh_add_config --template="sk.php" --destination="/etc/$app/sk.php" chown -R $app /etc/$app/ chmod 750 /etc/$app/ diff --git a/scripts/upgrade b/scripts/upgrade index e234b92..bcf2652 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -44,15 +44,8 @@ chown -R $app:www-data "$install_dir" #================================================= ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 -# Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=low --footprint=low +ynh_add_fpm_config -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 - -# Create a dedicated NGINX config ynh_add_nginx_config #================================================= @@ -81,7 +74,7 @@ echo ");" >> $tp_config_file #================================================= ynh_script_progression --message="Updating a configuration file..." -ynh_add_config --template="../conf/settings.php" --destination="$install_dir/includes/config/settings.php" +ynh_add_config --template="settings.php" --destination="$install_dir/includes/config/settings.php" if [ "$upgrade_type" == "UPGRADE_APP" ] then