github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-19 21:04:07 -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 if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then
mkdir $V_USERS/$user/cert 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_traff $user" >> $V_QUEUE/traffic.pipe
echo "v_upd_web_domains_disk $user" >> $V_QUEUE/disk.pipe echo "v_upd_web_domains_disk $user" >> $V_QUEUE/disk.pipe
fi 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'" v_str="$v_str NGINX='' NGINX_EXT='' SUSPEND='no' DATE='$V_DATE'"
# Registering domain # 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 # Adding task to the vesta pipe
restart_schedule 'web' 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 del_web_domain
# Checking last ssl 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 if [ "$ssl_dom" -eq '0' ]; then
sed -i "s/ Include /#Include /" $V_HOME/$user/conf/httpd.conf sed -i "s/ Include /#Include /" $V_HOME/$user/conf/httpd.conf
fi fi
# Checking last domain # 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 if [ "$domains" -eq '0' ]; then
conf='/etc/httpd/conf.d/vesta.conf' conf='/etc/httpd/conf.d/vesta.conf'
line=$(grep -n "$V_HOME/$user/conf/httpd.conf" $conf | cut -f 1 -d : ) 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 # Checking last nginx domain
conf='/etc/nginx/conf.d/vesta_users.conf' 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=''") last_snginx=$(echo "$last_nginx" | grep -v "SSL_CERT=''")
if [ -z "$last_snginx" ]; then if [ -z "$last_snginx" ]; then
sline=$(grep -n "$V_HOME/$user/conf/snginx.conf" $conf | cut -f 1 -d : ) 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' '' update_web_domain_value '$SSL_CERT' ''
# Checking last ssl domain # 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' main_conf='/etc/httpd/conf.d/vesta.conf'
conf="$V_HOME/$user/conf/shttpd.conf" conf="$V_HOME/$user/conf/shttpd.conf"
if [ -z "$ssl_dom" ]; then if [ -z "$ssl_dom" ]; then
@ -83,7 +83,7 @@ fi
decrease_user_value "$user" '$U_WEB_SSL' decrease_user_value "$user" '$U_WEB_SSL'
# Checking cert parents # Checking cert parents
conf="$V_USERS/$user/web_domains.conf" conf="$V_USERS/$user/web.conf"
field='$DOMAIN' field='$DOMAIN'
search_string="SSL_CERT='$cert'" search_string="SSL_CERT='$cert'"
cert_parents=$(dom_clear_search) cert_parents=$(dom_clear_search)

2
bin/v_list_web_domain
View file

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

2
bin/v_list_web_domains_elog
View file

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

2
bin/v_list_web_domains_nginx
View file

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

2
bin/v_list_web_domains_ssl
View file

@ -35,7 +35,7 @@ is_user_valid
#----------------------------------------------------------# #----------------------------------------------------------#
# Defining config # Defining config
conf="$V_USERS/$user/web_domains.conf" conf="$V_USERS/$user/web.conf"
# Defining fileds to select # Defining fileds to select
fields='$DOMAIN $SSL $SSL_HOME $SSL_CERT' 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 # Defining config
conf="$V_USERS/$user/web_domains.conf" conf="$V_USERS/$user/web.conf"
# Defining fileds to select # Defining fileds to select
fields='$DOMAIN $STATS $STATS_AUTH' fields='$DOMAIN $STATS $STATS_AUTH'

2
bin/v_rebuild_web_domains
View file

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

2
bin/v_suspend_web_domains
View file

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

2
bin/v_unsuspend_web_domains
View file

@ -36,7 +36,7 @@ is_user_valid
#----------------------------------------------------------# #----------------------------------------------------------#
# Defining config # Defining config
conf="$V_USERS/$user/web_domains.conf" conf="$V_USERS/$user/web.conf"
# Defining fileds to select # Defining fileds to select
field='$DOMAIN' 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='' U_DISK_WEB_DOMAINS=''
# Defining config # Defining config
conf="$V_USERS/$user/web_domains.conf" conf="$V_USERS/$user/web.conf"
# Defining fileds to select # Defining fileds to select
field='$DOMAIN' field='$DOMAIN'

2
bin/v_upd_web_domains_disk
View file

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

2
bin/v_upd_web_domains_traff
View file

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

2
func/cert_func.sh
View file

@ -65,7 +65,7 @@ is_cert_valid() {
is_cert_used() { is_cert_used() {
# Parsing config # Parsing config
check_cert=$(grep "SSL_CERT='$cert'" $V_USERS/$user/web_domains.conf) check_cert=$(grep "SSL_CERT='$cert'" $V_USERS/$user/web.conf)
# Checking result # Checking result
if [ ! -z "$check_cert" ]; then if [ ! -z "$check_cert" ]; then

16
func/domain_func.sh
View file

@ -63,10 +63,10 @@ is_dns_domain_free() {
is_web_domain_free() { is_web_domain_free() {
search_dom=${1-$domain} search_dom=${1-$domain}
# Parsing domain values # Parsing domain values
check_domain=$(grep -F "IN='$search_dom'" $V_USERS/$user/web_domains.conf) check_domain=$(grep -F "IN='$search_dom'" $V_USERS/$user/web.conf)
# Parsing alias values # Parsing alias values
check_alias=$(grep -F 'ALIAS=' $V_USERS/$user/web_domains.conf | \ check_alias=$(grep -F 'ALIAS=' $V_USERS/$user/web.conf | \
awk -F "ALIAS=" '{print $2}' | \ awk -F "ALIAS=" '{print $2}' | \
cut -f 2 -d \' | \ cut -f 2 -d \' | \
sed -e "s/,/\n/g" | \ sed -e "s/,/\n/g" | \
@ -94,7 +94,7 @@ is_dns_domain_valid() {
is_web_domain_valid() { is_web_domain_valid() {
# Parsing domain values # Parsing domain values
check_domain=$(grep -F "DOMAIN='$domain'" $V_USERS/$user/web_domains.conf) check_domain=$(grep -F "DOMAIN='$domain'" $V_USERS/$user/web.conf)
# Checking result # Checking result
if [ -z "$check_domain" ]; then if [ -z "$check_domain" ]; then
@ -288,7 +288,7 @@ get_web_domain_value() {
key="$1" key="$1"
# Parsing domains # Parsing domains
string=$( grep "DOMAIN='$domain'" $V_USERS/$user/web_domains.conf ) string=$( grep "DOMAIN='$domain'" $V_USERS/$user/web.conf )
# Parsing key=value # Parsing key=value
for keys in $string; do for keys in $string; do
@ -325,7 +325,7 @@ update_web_domain_value() {
value="$2" value="$2"
# Defining conf # Defining conf
conf="$V_USERS/$user/web_domains.conf" conf="$V_USERS/$user/web.conf"
# Parsing conf # Parsing conf
domain_str=$(grep -n "DOMAIN='$domain'" $conf) domain_str=$(grep -n "DOMAIN='$domain'" $conf)
@ -386,7 +386,7 @@ is_web_domain_key_empty() {
key="$1" key="$1"
# Parsing domains # Parsing domains
string=$( grep "DOMAIN='$domain'" $V_USERS/$user/web_domains.conf ) string=$( grep "DOMAIN='$domain'" $V_USERS/$user/web.conf )
# Parsing key=value # Parsing key=value
for keys in $string; do for keys in $string; do
@ -419,7 +419,7 @@ is_web_domain_value_exist() {
key="$1" key="$1"
# Parsing domains # Parsing domains
string=$( grep "DOMAIN='$domain'" $V_USERS/$user/web_domains.conf ) string=$( grep "DOMAIN='$domain'" $V_USERS/$user/web.conf )
# Parsing key=value # Parsing key=value
for keys in $string; do for keys in $string; do
@ -483,7 +483,7 @@ del_dns_domain() {
} }
del_web_domain() { del_web_domain() {
conf="$V_USERS/$user/web_domains.conf" conf="$V_USERS/$user/web.conf"
# Parsing domains # Parsing domains
string=$( grep -n "DOMAIN='$domain'" $conf | cut -f 1 -d : ) string=$( grep -n "DOMAIN='$domain'" $conf | cut -f 1 -d : )

2
func/ip_func.sh
View file

@ -188,7 +188,7 @@ decrease_ip_value() {
new_web=$((current_web - 1)) new_web=$((current_web - 1))
# -1 user # -1 user
check_ip=$(grep $sip $V_USERS/$user/web_domains.conf |wc -l) check_ip=$(grep $sip $V_USERS/$user/web.conf |wc -l)
if [ "$check_ip" -lt 2 ]; then if [ "$check_ip" -lt 2 ]; then
new_usr=$(echo "$current_usr" |\ new_usr=$(echo "$current_usr" |\
sed -e "s/,/\n/g"|\ sed -e "s/,/\n/g"|\

12
func/shared_func.sh
View file

@ -440,7 +440,7 @@ is_package_full() {
web_domain() { web_domain() {
# Checking zero domains # Checking zero domains
domain_number=$(wc -l $V_USERS/$user/web_domains.conf|cut -f 1 -d ' ') domain_number=$(wc -l $V_USERS/$user/web.conf|cut -f 1 -d ' ')
# Comparing current val with conf # Comparing current val with conf
val=$(grep '^WEB_DOMAINS=' $V_USERS/$user/user.conf|cut -f 2 -d \' ) val=$(grep '^WEB_DOMAINS=' $V_USERS/$user/user.conf|cut -f 2 -d \' )
@ -453,7 +453,7 @@ is_package_full() {
web_alias() { web_alias() {
# Parsing aliases # Parsing aliases
alias_nmb=$(grep "DOMAIN='$domain'" $V_USERS/$user/web_domains.conf|\ alias_nmb=$(grep "DOMAIN='$domain'" $V_USERS/$user/web.conf|\
awk -F "ALIAS=" '{print $2}' | cut -f 2 -d \' |\ awk -F "ALIAS=" '{print $2}' | cut -f 2 -d \' |\
sed -e "s/,/\n/g" | wc -l ) sed -e "s/,/\n/g" | wc -l )
@ -476,7 +476,7 @@ is_package_full() {
fi fi
# Checking domains # Checking domains
domain_nmb=$(grep "SSL='yes'" $V_USERS/$user/web_domains.conf | wc -l) domain_nmb=$(grep "SSL='yes'" $V_USERS/$user/web.conf | wc -l)
# Comparing current val with conf # Comparing current val with conf
if [ "$domain_nmb" -ge "$val" ]; then if [ "$domain_nmb" -ge "$val" ]; then
echo "Error: Upgrade package" echo "Error: Upgrade package"
@ -1198,9 +1198,9 @@ get_usr_disk() {
size=$((size + dir_usage)) size=$((size + dir_usage))
# Checking web # Checking web
if [ -f "$V_USERS/$user/web_domains.conf" ]; then if [ -f "$V_USERS/$user/web.conf" ]; then
# Using tricky way to parse configs # Using tricky way to parse configs
disk_usage=$(grep 'U_DISK=' $V_USERS/$user/web_domains.conf |\ disk_usage=$(grep 'U_DISK=' $V_USERS/$user/web.conf |\
awk -F "U_DISK='" '{print $2}'|cut -f 1 -d "'") awk -F "U_DISK='" '{print $2}'|cut -f 1 -d "'")
for disk in $disk_usage; do for disk in $disk_usage; do
size=$((size + disk)) size=$((size + disk))
@ -1232,7 +1232,7 @@ get_usr_disk() {
get_usr_traff() { get_usr_traff() {
size='0' size='0'
conf='web_domains.conf' conf='web.conf'
# Checking web # Checking web
if [ -f "$V_USERS/$user/$conf" ]; then if [ -f "$V_USERS/$user/$conf" ]; then