github/vesta
1
0
Fork 0
mirror of https://github.com/serghey-rodin/vesta.git synced 2025-08-19 04:50:46 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

optimized domain function usage

Browse source
This commit is contained in:
Serghey Rodin 2012-02-29 15:18:01 +02:00
commit b4775368cb
3 changed files with 10 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

13
bin/v_delete_dns_domain
View file

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
# info: delite dns domain # info: delete dns domain
# options: user domain # options: user domain
# #
# The function for deleting DNS domain. By deleting it all records will also be # The function for deleting DNS domain. By deleting it all records will also be
@ -49,9 +49,10 @@ is_domain_valid 'dns'
# Action # # Action #
#----------------------------------------------------------# #----------------------------------------------------------#
# Get template name # Get domain values
tpl_name=$(get_domain_value 'dns' '$TPL') tpl_name=$(get_domain_value 'dns' '$TPL')
old_ip=$(get_domain_value 'dns' '$IP') old_ip=$(get_domain_value 'dns' '$IP')
records=$(wc -l $V_USERS/$user/dns/$domain|cut -f 1 -d ' ')
# Deleting domain in named.conf # Deleting domain in named.conf
rm_string=$(grep -n /conf/dns/$domain.db $named_conf |cut -d : -f 1) rm_string=$(grep -n /conf/dns/$domain.db $named_conf |cut -d : -f 1)
@ -68,11 +69,13 @@ fi
# Vesta # # Vesta #
#----------------------------------------------------------# #----------------------------------------------------------#
# Deleting domain
sed -i "/DOMAIN='$domain'/ d" $V_USERS/$user/dns.conf
rm -f $V_USERS/$user/dns/$domain
# Decreasing domain value # Decreasing domain value
decrease_user_value "$user" '$U_DNS_DOMAINS' decrease_user_value "$user" '$U_DNS_DOMAINS'
decrease_user_value "$user" '$U_DNS_RECORDS' "$records"
# Deleting domain
del_dns_domain
# Adding task to the vesta pipe # Adding task to the vesta pipe
restart_schedule 'dns' restart_schedule 'dns'

2
bin/v_delete_web_domain
View file

@ -115,7 +115,7 @@ rm -f /var/log/httpd/domains/$domain.error*
#----------------------------------------------------------# #----------------------------------------------------------#
# Deleting domain # Deleting domain
del_web_domain sed -i "/DOMAIN='$domain'/ d" $V_USERS/$user/web.conf
# Checking last ssl domain # Checking last ssl domain
ssl_dom=$(grep "SSL='yes'" $V_USERS/$user/web.conf | wc -l) ssl_dom=$(grep "SSL='yes'" $V_USERS/$user/web.conf | wc -l)

30
func/domain.func
View file

@ -40,7 +40,7 @@ is_domain_suspended() {
# Checking result # Checking result
if [ ! -z "$check_domain" ]; then if [ ! -z "$check_domain" ]; then
echo "Error: domain suspended" echo "Error: domain $domain is suspended"
log_event 'debug' "$E_SUSPENDED $V_EVENT" log_event 'debug' "$E_SUSPENDED $V_EVENT"
exit $E_SUSPENDED exit $E_SUSPENDED
fi fi
@ -409,34 +409,6 @@ del_web_config() {
sed -i "$top_line,$bottom_line d" $conf sed -i "$top_line,$bottom_line d" $conf
} }
del_dns_domain() {
conf="$V_USERS/$user/dns.conf"
# Parsing domains
string=$( grep -n "DOMAIN='$domain'" $conf | cut -f 1 -d : )
if [ -z "$string" ]; then
echo "Error: parse error"
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
sed -i "$string d" $conf
rm -f $V_USERS/$user/dns/$domain
}
del_web_domain() {
conf="$V_USERS/$user/web.conf"
# Parsing domains
string=$( grep -n "DOMAIN='$domain'" $conf | cut -f 1 -d : )
if [ -z "$string" ]; then
echo "Error: parse error"
log_event 'debug' "$E_PARSING $V_EVENT"
exit $E_PARSING
fi
sed -i "$string d" $conf
}
dom_clear_search(){ dom_clear_search(){
# Defining delimeter # Defining delimeter
IFS=$'\n' IFS=$'\n'