make name of zone-conf configurable

diff --git a/conf/settings.sample b/conf/settings.sample
index 143f3b5c11920fa18dcbb7bbed001c0447c1e1df..4fdaa6f15ed0fa2b7331f9445370ca03becd6342 100644 (file)
--- a/conf/settings.sample
+++ b/conf/settings.sample
@@ -2,6 +2,7 @@ signzone=/usr/sbin/dnssec-signzone
 keygen=/usr/bin/dnssec-keygen
 salt_length=32
 resign_days=10
+zoneconf_name="seczone.conf"
 
 num_nameservers=2
 

diff --git a/update-zone-conf.sh b/update-zone-conf.sh
index 5716c8d187918d4127f16eef0d28ecb9e38082f0..24be766ad8bc42d2ec82da7836c081c4e45022c3 100755 (executable)
--- a/update-zone-conf.sh
+++ b/update-zone-conf.sh
@@ -2,11 +2,12 @@
 source `dirname $0`/conf/settings
 cd `dirname $0`
 
-rm -f zones/zone.conf
+rm -f zones/$zoneconf_name
 
+echo "Generating new $zoneconf_name"
 for d in zones/* ; do 
     zone=`basename $d` 
-cat >> zones/zone.conf <<EOF 
+cat >> zones/$zoneconf_name <<EOF 
 zone "$zone." in {
         type master;
         file "$zone.zone.signed";
@@ -19,11 +20,11 @@ done
 for i in `seq $num_nameservers`  ; do 
     ns=ns$i
 
-    echo "running $ns"
+    echo "updating $ns"
     eval ssh_access=\$${ns}_ssh_access
     eval conf_path=\$${ns}_conf_path
     eval rndc_path=\$${ns}_rndc_path
 
-    scp zones/zone.conf $ssh_access:$conf_path
+    scp zones/$zoneconf_name $ssh_access:$conf_path
     ssh $ssh_access  "$rndc_path reload"
 done