lib/pvl/hosts/zone: use service bind9 reload instead of rndc
authorTero Marttila <tero.marttila@aalto.fi>
Tue, 03 Mar 2015 11:41:32 +0200
changeset 712 97fa1b086b36
parent 711 36b87b9e6af4
child 713 d5e2d1d9716a
lib/pvl/hosts/zone: use service bind9 reload instead of rndc
lib/pvl/hosts/zone.sh
--- a/lib/pvl/hosts/zone.sh	Tue Mar 03 11:41:17 2015 +0200
+++ b/lib/pvl/hosts/zone.sh	Tue Mar 03 11:41:32 2015 +0200
@@ -5,10 +5,7 @@
 ZONES_INCLUDE="$SRV/var/zones"
 
 NAMED_CHECKZONE=/usr/sbin/named-checkzone
-
-RNDC=/usr/sbin/rndc
-RNDC_KEY=/etc/bind/rndc.key
-
+NAMED_SERVICE=bind9
 
 ## Generate forward zone from hosts hosts using pvl.hosts-forward
 #
@@ -174,14 +171,9 @@
         $NAMED_CHECKZONE $origin $zone
 }
 
-# set by do_reload_zone if zone data has actually been reloaded
-RELOAD_ZONES=
-
 ## Load update zonefiles into bind:
 #
 #   reload_zones    
-#
-# Invokes `rndc reload`, showing its output.
 function reload_zones {
     if [ "$UPDATE_RELOAD" = 1 ]; then
         log_force "Reload zones"
@@ -191,28 +183,14 @@
         
         return
     
-    elif [ ! -e "$RNDC" ]; then
-        warn "Skip with missing RNDC: $RNDC"
-        
-        return
-
-    elif [ ! -e "$RNDC_KEY" ]; then
-        warn "Skip with missing RNDC_KEY: $RNDC_KEY"
+    elif ! service_status $NAMED_SERVICE; then
+        log_skip "named not running; did not restart"
 
         return
-
-    elif [ ! -r $RNDC_KEY ]; then
-        error "Permission denied for RNDC_KEY: $RNDC_KEY"
-
-        return 1
-
+ 
     else
         log_apply "Reload zones"
     fi
 
-    cmd_indent "        rndc: " \
-        $RNDC reload
-
-    # set flag for dhcp
-    RELOAD_ZONES=1
+    service_reload $NAMED_SERVICE
 }