From d7858ef0dba8130ab90da0b1e7336f607aeadbca Mon Sep 17 00:00:00 2001 From: Fabian Wilkens Date: Sun, 9 May 2021 14:50:38 +0200 Subject: [PATCH] Remove unnecessary --others-var --- scripts/change_url | 10 ++-------- scripts/install | 15 +++------------ scripts/upgrade | 15 +++------------ 3 files changed, 8 insertions(+), 32 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index 5aad8f4..0658c9f 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -97,10 +97,7 @@ then domain="$old_domain" path_url="$new_path" # Create a dedicated nginx config - ynh_add_nginx_config "\ - port \ - access_domain\ - " + ynh_add_nginx_config fi # Change the domain for nginx @@ -154,10 +151,7 @@ domain=$new_domain path_url=$new_path # Create a dedicated fail2ban config touch "/var/log/$app/$app.log" -ynh_add_fail2ban_config --use_template --others_var="\ - domain \ - path_url \ - " +ynh_add_fail2ban_config --use_template #================================================= # GENERIC FINALISATION diff --git a/scripts/install b/scripts/install index ab66bb0..ce9c3d4 100755 --- a/scripts/install +++ b/scripts/install @@ -105,10 +105,7 @@ ynh_setup_source --dest_dir="$final_path/live" ynh_script_progression --message="Configuring nginx web server..." --weight=3 # Create a dedicated nginx config -ynh_add_nginx_config "\ - port \ - access_domain \ - " +ynh_add_nginx_config #================================================= # CREATE DEDICATED USER @@ -210,10 +207,7 @@ done ynh_script_progression --message="Configuring a systemd service..." --weight=4 # Create a dedicated systemd config -ynh_add_systemd_config --others_var="\ - port \ - RBENV_ROOT \ -" +ynh_add_systemd_config #================================================= # STORE THE CONFIG FILE CHECKSUM @@ -268,10 +262,7 @@ ynh_script_progression --message="Configuring fail2ban..." --weight=1 # Create a dedicated fail2ban config touch "/var/log/$app/$app.log" -ynh_add_fail2ban_config --use_template --others_var="\ - domain \ - path_url \ - " +ynh_add_fail2ban_config --use_template #================================================= # SETUP SSOWAT diff --git a/scripts/upgrade b/scripts/upgrade index bffd043..a87e860 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -204,10 +204,7 @@ fi ynh_script_progression --message="Upgrading nginx web server configuration..." --weight=1 # Create a dedicated nginx config -ynh_add_nginx_config "\ - port \ - access_domain \ - " +ynh_add_nginx_config #================================================= # UPGRADE DEPENDENCIES @@ -310,10 +307,7 @@ done ynh_script_progression --message="Upgrading systemd configuration..." --weight=1 # Create a dedicated systemd config -ynh_add_systemd_config --others_var="\ - port \ - RBENV_ROOT \ -" +ynh_add_systemd_config #================================================= # STORE THE CONFIG FILE CHECKSUM @@ -365,10 +359,7 @@ ynh_script_progression --message="Reconfiguring fail2ban..." --weight=1 # Create a dedicated fail2ban config touch "/var/log/$app/$app.log" -ynh_add_fail2ban_config --use_template --others_var="\ - domain \ - path_url \ - " +ynh_add_fail2ban_config --use_template #================================================= # START SYSTEMD SERVICE