mirror of
https://github.com/myvesta/vesta
synced 2025-08-20 21:34:12 -07:00
removed dublicate includes
This commit is contained in:
parent
9513f98b04
commit
46c165db4d
12 changed files with 2 additions and 21 deletions
|
@ -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)
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
||||
#----------------------------------------------------------#
|
||||
|
|
|
@ -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
|
||||
|
||||
|
||||
#----------------------------------------------------------#
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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'
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
||||
#----------------------------------------------------------#
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
||||
#----------------------------------------------------------#
|
||||
|
|
|
@ -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/)
|
||||
|
|
|
@ -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
|
||||
|
||||
|
||||
#----------------------------------------------------------#
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue