github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-21 13:54:28 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

renamed web_domains.conf to web.conf

Browse source
This commit is contained in:
Serghey Rodin 2011-08-14 14:53:55 +03:00
commit d708923022
22 changed files with 36 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/v_add_sys_user
View file

@ -118,7 +118,7 @@ echo "v_upd_sys_user_disk $user" >> $V_QUEUE/disk.pipe
if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then
mkdir $V_USERS/$user/cert
touch $V_USERS/$user/web_domains.conf
touch $V_USERS/$user/web.conf
echo "v_upd_web_domains_traff $user" >> $V_QUEUE/traffic.pipe
echo "v_upd_web_domains_disk $user" >> $V_QUEUE/disk.pipe
fi

2
bin/v_add_web_domain
View file

@ -187,7 +187,7 @@ v_str="$v_str SSL_HOME='' SSL_CERT=''"
v_str="$v_str NGINX='' NGINX_EXT='' SUSPEND='no' DATE='$V_DATE'"
# Registering domain
echo "$v_str" >>$V_USERS/$user/web_domains.conf
echo "$v_str" >>$V_USERS/$user/web.conf
# Adding task to the vesta pipe
restart_schedule 'web'

4
bin/v_del_web_domain
View file

@ -101,13 +101,13 @@ rm -rf /var/log/httpd/domains/$domain.error*
del_web_domain
# Checking last ssl domain
ssl_dom=$(grep -v "SSL_CERT=''" $V_USERS/$user/web_domains.conf | wc -l)
ssl_dom=$(grep -v "SSL_CERT=''" $V_USERS/$user/web.conf | wc -l)
if [ "$ssl_dom" -eq '0' ]; then
sed -i "s/ Include /#Include /" $V_HOME/$user/conf/httpd.conf
fi
# Checking last domain
domains=$(wc -l $V_USERS/$user/web_domains.conf|cut -f 1 -d ' ')
domains=$(wc -l $V_USERS/$user/web.conf|cut -f 1 -d ' ')
if [ "$domains" -eq '0' ]; then
conf='/etc/httpd/conf.d/vesta.conf'
line=$(grep -n "$V_HOME/$user/conf/httpd.conf" $conf | cut -f 1 -d : )

2
bin/v_del_web_domain_nginx
View file

@ -77,7 +77,7 @@ update_web_domain_value '$NGINX_EXT' ''
# Checking last nginx domain
conf='/etc/nginx/conf.d/vesta_users.conf'
last_nginx=$(grep -v "NGINX=''" $V_USERS/$user/web_domains.conf)
last_nginx=$(grep -v "NGINX=''" $V_USERS/$user/web.conf)
last_snginx=$(echo "$last_nginx" | grep -v "SSL_CERT=''")
if [ -z "$last_snginx" ]; then
sline=$(grep -n "$V_HOME/$user/conf/snginx.conf" $conf | cut -f 1 -d : )

4
bin/v_del_web_domain_ssl
View file

@ -71,7 +71,7 @@ update_web_domain_value '$SSL_HOME' ''
update_web_domain_value '$SSL_CERT' ''
# Checking last ssl domain
ssl_dom=$(grep -v "SSL_CERT=''" $V_USERS/$user/web_domains.conf)
ssl_dom=$(grep -v "SSL_CERT=''" $V_USERS/$user/web.conf)
main_conf='/etc/httpd/conf.d/vesta.conf'
conf="$V_HOME/$user/conf/shttpd.conf"
if [ -z "$ssl_dom" ]; then
@ -83,7 +83,7 @@ fi
decrease_user_value "$user" '$U_WEB_SSL'
# Checking cert parents
conf="$V_USERS/$user/web_domains.conf"
conf="$V_USERS/$user/web.conf"
field='$DOMAIN'
search_string="SSL_CERT='$cert'"
cert_parents=$(dom_clear_search)

2
bin/v_list_web_domain
View file

@ -36,7 +36,7 @@ is_web_domain_valid
#----------------------------------------------------------#
# Defining config
conf="$V_USERS/$user/web_domains.conf"
conf="$V_USERS/$user/web.conf"
# Defining fileds to select
fields='$DOMAIN $IP $U_DISK $U_BANDWIDTH $TPL $ALIAS $PHP $CGI $ELOG $STATS

2
bin/v_list_web_domains
View file

@ -35,7 +35,7 @@ is_user_valid
#----------------------------------------------------------#
# Defining config
conf="$V_USERS/$user/web_domains.conf"
conf="$V_USERS/$user/web.conf"
# Defining fileds to select
fields='$DOMAIN $IP $U_DISK $U_BANDWIDTH $TPL $ALIAS $PHP $CGI $ELOG $STATS

2
bin/v_list_web_domains_alias
View file

@ -35,7 +35,7 @@ is_user_valid
#----------------------------------------------------------#
# Defining config
conf="$V_USERS/$user/web_domains.conf"
conf="$V_USERS/$user/web.conf"
# Defining fileds to select
fields='$DOMAIN $ALIAS'

2
bin/v_list_web_domains_elog
View file

@ -35,7 +35,7 @@ is_user_valid
#----------------------------------------------------------#
# Defining config
conf="$V_USERS/$user/web_domains.conf"
conf="$V_USERS/$user/web.conf"
# Defining fileds to select
fields='$DOMAIN $ELOG'

2
bin/v_list_web_domains_nginx
View file

@ -35,7 +35,7 @@ is_user_valid
#----------------------------------------------------------#
# Defining config
conf="$V_USERS/$user/web_domains.conf"
conf="$V_USERS/$user/web.conf"
# Defining fileds to select
fields='$DOMAIN $NGINX'

2
bin/v_list_web_domains_ssl
View file

@ -35,7 +35,7 @@ is_user_valid
#----------------------------------------------------------#
# Defining config
conf="$V_USERS/$user/web_domains.conf"
conf="$V_USERS/$user/web.conf"
# Defining fileds to select
fields='$DOMAIN $SSL $SSL_HOME $SSL_CERT'

2
bin/v_list_web_domains_stats
View file

@ -35,7 +35,7 @@ is_user_valid
#----------------------------------------------------------#
# Defining config
conf="$V_USERS/$user/web_domains.conf"
conf="$V_USERS/$user/web.conf"
# Defining fileds to select
fields='$DOMAIN $STATS $STATS_AUTH'

2
bin/v_rebuild_web_domains
View file

@ -40,7 +40,7 @@ is_user_suspended
#----------------------------------------------------------#
# Defining config
conf="$V_USERS/$user/web_domains.conf"
conf="$V_USERS/$user/web.conf"
# Defining search string
search_string="DOMAIN"

2
bin/v_suspend_web_domains
View file

@ -39,7 +39,7 @@ is_user_valid
#----------------------------------------------------------#
# Defining config
conf="$V_USERS/$user/web_domains.conf"
conf="$V_USERS/$user/web.conf"
# Defining fileds to select
field='$DOMAIN'

2
bin/v_unsuspend_web_domains
View file

@ -36,7 +36,7 @@ is_user_valid
#----------------------------------------------------------#
# Defining config
conf="$V_USERS/$user/web_domains.conf"
conf="$V_USERS/$user/web.conf"
# Defining fileds to select
field='$DOMAIN'

2
bin/v_upd_sys_user_bill
View file

@ -58,7 +58,7 @@ for user in $user_list; do
U_DISK_WEB_DOMAINS=''
# Defining config
conf="$V_USERS/$user/web_domains.conf"
conf="$V_USERS/$user/web.conf"
# Defining fileds to select
field='$DOMAIN'

2
bin/v_upd_web_domains_disk
View file

@ -36,7 +36,7 @@ is_user_valid
#----------------------------------------------------------#
# Defining config
conf="$V_USERS/$user/web_domains.conf"
conf="$V_USERS/$user/web.conf"
# Defining fileds to select
field='$DOMAIN'

2
bin/v_upd_web_domains_traff
View file

@ -36,7 +36,7 @@ is_user_valid "$user"
#----------------------------------------------------------#
# Defining config
conf="$V_USERS/$user/web_domains.conf"
conf="$V_USERS/$user/web.conf"
# Defining fileds to select
field='$DOMAIN'