fix for broken unsuspend

This commit is contained in:
Serghey Rodin 2013-02-26 12:07:05 +02:00
commit 5a73b73b3b
2 changed files with 9 additions and 5 deletions

View file

@ -56,6 +56,9 @@ for nameserver in ${ns//,/ };do
i=$((i + 1)) i=$((i + 1))
done done
# Remove old user's zone
sed -i "/\/$user\/conf\/dns/d" /etc/named.conf
# Starting loop # Starting loop
for domain in $(search_objects 'dns' 'DOMAIN' "*" 'DOMAIN'); do for domain in $(search_objects 'dns' 'DOMAIN' "*" 'DOMAIN'); do
# Defining variables # Defining variables
@ -89,13 +92,13 @@ for domain in $(search_objects 'dns' 'DOMAIN' "*" 'DOMAIN'); do
# Bind config check # Bind config check
nconf='/etc/named.conf' nconf='/etc/named.conf'
if [ "$SUSPENDED" = 'yes' ]; then if [ "$SUSPENDED" = 'yes' ]; then
rm_string=$(grep -n /etc/namedb/$domain.db $nconf | cut -d : -f 1) rm_string=$(grep -n /etc/namedb/$domain.db $nconf | cut -d : -f 1)
if [ ! -z "$rm_string" ]; then if [ ! -z "$rm_string" ]; then
sed -i "$rm_string d" $nconf sed -i "$rm_string d" $nconf
fi fi
suspended_dns=$((suspended_dns + 1)) suspended_dns=$((suspended_dns + 1))
else else
if [ -z "$(grep /$domain.db $nconf)" ]; then if [ -z "$(grep /$domain.db $nconf)" ]; then
named="zone \"$domain_idn\" {type master; file" named="zone \"$domain_idn\" {type master; file"
named="$named \"$HOMEDIR/$user/conf/dns/$domain.db\";};" named="$named \"$HOMEDIR/$user/conf/dns/$domain.db\";};"
echo "$named" >> /etc/named.conf echo "$named" >> /etc/named.conf

View file

@ -37,9 +37,10 @@ is_object_suspended 'dns' 'DOMAIN' "$domain"
#----------------------------------------------------------# #----------------------------------------------------------#
# Adding zone in named.conf # Adding zone in named.conf
named="zone \"$domain_idn\" {type master; file" #named="zone \"$domain_idn\" {type master; file"
named="$named \"$HOMEDIR/$user/conf/dns/$domain.db\";};" #named="$named \"$HOMEDIR/$user/conf/dns/$domain.db\";};"
echo "$named" >> /etc/named.conf #echo "$named" >> /etc/named.conf
#----------------------------------------------------------# #----------------------------------------------------------#
# Vesta # # Vesta #