From 291870c182f35cca511d5411fdeaeeedad84468b Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Mon, 24 Jun 2013 16:59:04 +0300
Subject: [PATCH] replaced static definition for dns server

---
 bin/v-add-dns-domain       | 20 ++++++++++++++++++--
 bin/v-delete-dns-domain    | 11 ++++++++++-
 bin/v-rebuild-dns-domain   | 11 ++++++++++-
 bin/v-rebuild-dns-domains  | 11 ++++++++++-
 bin/v-suspend-dns-domain   |  3 ---
 bin/v-unsuspend-dns-domain |  4 ----
 6 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/bin/v-add-dns-domain b/bin/v-add-dns-domain
index f384f160f..fe6117fdb 100755
--- a/bin/v-add-dns-domain
+++ b/bin/v-add-dns-domain
@@ -117,16 +117,32 @@ dns_rec="$dns_rec DATE='$DATE'"
 echo "$dns_rec" >> $USER_DATA/dns.conf
 chmod 660 $USER_DATA/dns.conf
 
+# Get dns config path
+if [ -e '/etc/named.conf' ]; then
+    dns_conf='/etc/named.conf'
+fi
+
+if [ -e '/etc/bind/named.conf' ]; then
+    dns_conf='/etc/bind/named.conf'
+fi
+
 # Adding zone in named.conf
 named="zone \"$domain_idn\" {type master; file"
 named="$named \"$HOMEDIR/$user/conf/dns/$domain.db\";};"
-echo "$named" >> /etc/named.conf
+echo "$named" >> $dns_conf
 
 # Updating domain dns zone
 update_domain_zone
 
+# Set permissions
+if [ "$DNS_SYSTEM" = 'named' ]; then
+    dns_group='named'
+else
+    dns_group='bind'
+fi
+
 chmod 640 $conf
-chown root:named $conf
+chown root:$dns_group $conf
 
 # dns-cluster
 if [ ! -z "$DNS_CLUSTER" ]; then
diff --git a/bin/v-delete-dns-domain b/bin/v-delete-dns-domain
index fb362571e..f4b9fb7e6 100755
--- a/bin/v-delete-dns-domain
+++ b/bin/v-delete-dns-domain
@@ -40,8 +40,17 @@ is_object_unsuspended 'dns' 'DOMAIN' "$domain"
 
 records=$(wc -l $USER_DATA/dns/$domain.conf | cut -f 1 -d ' ')
 
+# Get dns config path
+if [ -e '/etc/named.conf' ]; then
+    dns_conf='/etc/named.conf'
+fi
+
+if [ -e '/etc/bind/named.conf' ]; then
+    dns_conf='/etc/bin/named.conf'
+fi
+
 # Deleting domain in named.conf
-sed -i "/\/$user\/conf\/dns\/$domain.db\"/d" /etc/named.conf
+sed -i "/\/$user\/conf\/dns\/$domain.db\"/d" $dns_conf
 rm -f $HOMEDIR/$user/conf/dns/$domain.db
 
 # dns-cluster
diff --git a/bin/v-rebuild-dns-domain b/bin/v-rebuild-dns-domain
index a53171bbd..64d95c864 100755
--- a/bin/v-rebuild-dns-domain
+++ b/bin/v-rebuild-dns-domain
@@ -50,8 +50,17 @@ for nameserver in ${ns//,/ };do
     i=$((i + 1))
 done
 
+# Get dns config path
+if [ -e '/etc/named.conf' ]; then
+    dns_conf='/etc/named.conf'
+fi
+
+if [ -e '/etc/bind/named.conf' ]; then
+    dns_conf='/etc/bin/named.conf'
+fi
+
 # Remove old user's zone
-sed -i "/\/$user\/conf\/dns/d" /etc/named.conf
+sed -i "/\/$user\/conf\/dns/d" $dns_conf
 
 # Starting loop
 rebuild_dns_domain_conf
diff --git a/bin/v-rebuild-dns-domains b/bin/v-rebuild-dns-domains
index dcfe2b1f6..e12cf3adf 100755
--- a/bin/v-rebuild-dns-domains
+++ b/bin/v-rebuild-dns-domains
@@ -48,8 +48,17 @@ for nameserver in ${ns//,/ };do
     i=$((i + 1))
 done
 
+# Get dns config path
+if [ -e '/etc/named.conf' ]; then
+    dns_conf='/etc/named.conf'
+fi
+
+if [ -e '/etc/bind/named.conf' ]; then
+    dns_conf='/etc/bin/named.conf'
+fi
+
 # Remove old user's zone
-sed -i "/\/$user\/conf\/dns/d" /etc/named.conf
+sed -i "/\/$user\/conf\/dns/d" $dns_conf
 
 # Starting loop
 for domain in $(search_objects 'dns' 'DOMAIN' "*" 'DOMAIN'); do
diff --git a/bin/v-suspend-dns-domain b/bin/v-suspend-dns-domain
index 059b65325..f0fa5f40f 100755
--- a/bin/v-suspend-dns-domain
+++ b/bin/v-suspend-dns-domain
@@ -36,9 +36,6 @@ is_object_unsuspended 'dns' 'DOMAIN' "$domain"
 #                       Action                             #
 #----------------------------------------------------------#
 
-# Deleting domain from named.conf
-#sed -i "/\/$domain.db\"/d" /etc/named.conf
-
 
 #----------------------------------------------------------#
 #                       Vesta                              #
diff --git a/bin/v-unsuspend-dns-domain b/bin/v-unsuspend-dns-domain
index f850ad7cd..0dae8d56a 100755
--- a/bin/v-unsuspend-dns-domain
+++ b/bin/v-unsuspend-dns-domain
@@ -36,10 +36,6 @@ is_object_suspended 'dns' 'DOMAIN' "$domain"
 #                       Action                             #
 #----------------------------------------------------------#
 
-# Adding zone in named.conf
-#named="zone \"$domain_idn\" {type master; file"
-#named="$named \"$HOMEDIR/$user/conf/dns/$domain.db\";};"
-#echo "$named" >> /etc/named.conf
 
 
 #----------------------------------------------------------#