From 46c165db4d06e4c735a4bbe66c5c006c22d842b8 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 24 Nov 2011 16:19:30 +0200 Subject: [PATCH] removed dublicate includes --- bin/v_add_sys_user | 3 --- bin/v_change_sys_config_value | 2 +- bin/v_del_sys_user | 1 - bin/v_restart_cron | 4 +--- bin/v_restart_dns | 2 -- bin/v_upd_sys_ip | 3 --- bin/v_upd_sys_rrd | 1 - bin/v_upd_sys_rrd_ftp | 1 - bin/v_upd_sys_rrd_httpd | 1 - bin/v_upd_sys_rrd_ssh | 1 - bin/v_upd_sys_user_bill | 3 --- bin/v_upd_sys_vesta | 1 - 12 files changed, 2 insertions(+), 21 deletions(-) diff --git a/bin/v_add_sys_user b/bin/v_add_sys_user index 8b800a26..590bac6e 100755 --- a/bin/v_add_sys_user +++ b/bin/v_add_sys_user @@ -40,9 +40,6 @@ is_package_valid "$package" # Action # #----------------------------------------------------------# -# Importing main config -source $V_CONF/vesta.conf - # Parsing package data package_data=$(cat $V_PKG/$package.pkg) diff --git a/bin/v_change_sys_config_value b/bin/v_change_sys_config_value index b04770ed..7cf04251 100755 --- a/bin/v_change_sys_config_value +++ b/bin/v_change_sys_config_value @@ -39,7 +39,7 @@ fi #----------------------------------------------------------# # Updating conf -sed -i "s/$key=.*/$key='$value'/g" /tmp/vesta.conf +sed -i "s/$key=.*/$key='$value'/g" $V_CONF/vesta.conf #----------------------------------------------------------# diff --git a/bin/v_del_sys_user b/bin/v_del_sys_user index 8ed3b294..74568992 100755 --- a/bin/v_del_sys_user +++ b/bin/v_del_sys_user @@ -15,7 +15,6 @@ source $V_FUNC/shared.func source $V_FUNC/domain.func source $V_FUNC/db.func source $V_FUNC/ip.func -source $V_CONF/vesta.conf #----------------------------------------------------------# diff --git a/bin/v_restart_cron b/bin/v_restart_cron index cd998041..ab585305 100755 --- a/bin/v_restart_cron +++ b/bin/v_restart_cron @@ -15,9 +15,7 @@ crond() { } # Parsing config / or just source config -cron_system=$(grep 'CRON_SYSTEM=' $V_CONF/vesta.conf | cut -f 2 -d \' ) - -if [ "$cron_system" = 'crond' ]; then +if [ "$CRON_SYSTEM" = 'crond' ]; then crond fi diff --git a/bin/v_restart_dns b/bin/v_restart_dns index ca04685b..159363d6 100755 --- a/bin/v_restart_dns +++ b/bin/v_restart_dns @@ -5,8 +5,6 @@ # Importing variables source /etc/profile.d/vesta.sh source $VESTA/conf/vesta.conf -source $VESTA/conf/vars.conf -source $V_CONF/vesta.conf bind() { /etc/init.d/named reload >/dev/null 2>&1 diff --git a/bin/v_upd_sys_ip b/bin/v_upd_sys_ip index 7aab79ea..cda6a866 100755 --- a/bin/v_upd_sys_ip +++ b/bin/v_upd_sys_ip @@ -49,9 +49,6 @@ ip_list=$(/sbin/ifconfig |grep 'inet addr:'|cut -f 2 -d :|\ # Get vesta registered ip list vesta_ip_list=$(ls $V_IPS/) -# Importing main config -source $V_CONF/vesta.conf - # Defining config paths conf='/etc/httpd/conf.d/vesta.conf' nconf='/etc/nginx/conf.d/vesta_ip.conf' diff --git a/bin/v_upd_sys_rrd b/bin/v_upd_sys_rrd index 7de8f8f6..fd9d4588 100755 --- a/bin/v_upd_sys_rrd +++ b/bin/v_upd_sys_rrd @@ -13,7 +13,6 @@ source /etc/profile.d/vesta.sh # Importing variables source $VESTA/conf/vars.conf source $V_CONF/vesta.conf -source $V_CONF/vesta.conf source $V_FUNC/shared.func # Another workaround for cron enviroment diff --git a/bin/v_upd_sys_rrd_ftp b/bin/v_upd_sys_rrd_ftp index 7a603329..d6873ca9 100755 --- a/bin/v_upd_sys_rrd_ftp +++ b/bin/v_upd_sys_rrd_ftp @@ -13,7 +13,6 @@ rrd_grid=${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M} # Importing variables source $VESTA/conf/vars.conf source $V_CONF/vesta.conf -source $V_CONF/vesta.conf #----------------------------------------------------------# diff --git a/bin/v_upd_sys_rrd_httpd b/bin/v_upd_sys_rrd_httpd index 2d41e11f..a8a5714e 100755 --- a/bin/v_upd_sys_rrd_httpd +++ b/bin/v_upd_sys_rrd_httpd @@ -13,7 +13,6 @@ rrd_grid=${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M} # Importing variables source $VESTA/conf/vars.conf source $V_CONF/vesta.conf -source $V_CONF/vesta.conf source $V_FUNC/shared.func source $V_FUNC/domain.func diff --git a/bin/v_upd_sys_rrd_ssh b/bin/v_upd_sys_rrd_ssh index eca98a16..6c61ba94 100755 --- a/bin/v_upd_sys_rrd_ssh +++ b/bin/v_upd_sys_rrd_ssh @@ -13,7 +13,6 @@ rrd_grid=${3-MINUTE:30:HOUR:1:HOUR:4:0:%H:%M} # Importing variables source $VESTA/conf/vars.conf source $V_CONF/vesta.conf -source $V_CONF/vesta.conf #----------------------------------------------------------# diff --git a/bin/v_upd_sys_user_bill b/bin/v_upd_sys_user_bill index 9c4d3f35..0b957f39 100755 --- a/bin/v_upd_sys_user_bill +++ b/bin/v_upd_sys_user_bill @@ -40,9 +40,6 @@ fi # Action # #----------------------------------------------------------# -# Importing main config -source $V_CONF/vesta.conf - # Creating user_list if [ -z "$user" ]; then user_list=$(ls $V_USERS/) diff --git a/bin/v_upd_sys_vesta b/bin/v_upd_sys_vesta index 62ccb86d..1cb0e7fc 100755 --- a/bin/v_upd_sys_vesta +++ b/bin/v_upd_sys_vesta @@ -19,7 +19,6 @@ source /etc/profile.d/vesta.sh source $VESTA/conf/vars.conf source $V_CONF/vesta.conf source $V_FUNC/shared.func -source $V_CONF/vesta.conf #----------------------------------------------------------#