github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-21 05:44:08 -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
# info: delite dns domain
# info: delete dns domain
# options: user domain
#
# The function for deleting DNS domain. By deleting it all records will also be
@ -49,9 +49,10 @@ is_domain_valid 'dns'
# Action #
#----------------------------------------------------------#
# Get template name
# Get domain values
tpl_name=$(get_domain_value 'dns' '$TPL')
old_ip=$(get_domain_value 'dns' '$IP')
records=$(wc -l $V_USERS/$user/dns/$domain|cut -f 1 -d ' ')
# Deleting domain in named.conf
rm_string=$(grep -n /conf/dns/$domain.db $named_conf |cut -d : -f 1)
@ -68,11 +69,13 @@ fi
# Vesta #
#----------------------------------------------------------#
# Deleting domain
sed -i "/DOMAIN='$domain'/ d" $V_USERS/$user/dns.conf
rm -f $V_USERS/$user/dns/$domain
# Decreasing domain value
decrease_user_value "$user" '$U_DNS_DOMAINS'
# Deleting domain
del_dns_domain
decrease_user_value "$user" '$U_DNS_RECORDS' "$records"
# Adding task to the vesta pipe
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
del_web_domain
sed -i "/DOMAIN='$domain'/ d" $V_USERS/$user/web.conf
# Checking last ssl domain
ssl_dom=$(grep "SSL='yes'" $V_USERS/$user/web.conf | wc -l)