Changeset 1315

Timestamp:

11/26/04 00:44:45 (8 years ago)

Author:

anonymous

Message:

clarify named restart code
use conf instead of meaning i variable name

File:

• trunk/slavedns (modified) (5 diffs)

trunk/slavedns

@@ -7 +7 @@
 BINDDIR=/etc/bind/slavedns
 BINDINCLUDE=/etc/bind/slavedns.conf
+
+#NAMED9=/usr/pkg/etc/rc.d/named9 # BIND9 on NetBSD
+#NAMED8=/etc/rc.d/named # BIND8 on NetBSD/FreeBSD/OpenBSD
+NAMED8=/etc/init.d/named # BIND8 on some Linux
+NAMED9=/etc/init.d/named9 # BIND9 on some Linux
+#NAMED8=/etc/init.d/bind # BIND8 on other Linux
+#NAMED9=/etc/init.d/bind9 # BIND9 on other Linux
+
+NAMED="${NAMED8} ${NAMED9}"
 
 CreateBindConf() {
@@ -35 +44 @@
 rm -f ${BINDINCLUDE}.temp
 
-for i in `ls | grep -v slavedns.conf | grep -v '~$' `
+for conf in `ls | grep -v slavedns.conf | grep -v '~$' `
 do
   # HOST LOGIN PASSWORD MASTERIP
@@ -43 +52 @@
   PASSWORD=""
   SSL=""
-  . ./$i
+  . ./${conf}
   if [ -z "$HOST" -o -z "$LOGIN" -o -z "$PASSWORD" -o -z "$MASTERIP" ]
   then
-      echo "error in the config file '$i'" >&2
+      echo "error in the config file '${conf}'" >&2
   else
       if [ "$SSL" ] 
@@ -54 +63 @@
           PROTOCOL="http"
       fi
-      touch ${CACHEDIR}/${i}
-      rm -f ${CACHEDIR}/${i}.temp
-      wget ${PROTOCOL}://${HOST}/admin/domlist.php --http-user ${LOGIN} --http-passwd ${PASSWORD} -O ${CACHEDIR}/${i}.temp -t 1 -T 5 2>/dev/null
-      if [ -s "${CACHEDIR}/${i}.temp" ]
+      touch ${CACHEDIR}/${conf}
+      rm -f ${CACHEDIR}/${conf}.temp
+      wget ${PROTOCOL}://${HOST}/admin/domlist.php --http-user ${LOGIN} --http-passwd ${PASSWORD} -O ${CACHEDIR}/${conf}.temp -t 1 -T 5 2>/dev/null
+      if [ -s "${CACHEDIR}/${conf}.temp" ]
       then
           # If the slave file has changed, synchronize it.
-          if diff ${CACHEDIR}/${i}.temp ${CACHEDIR}/${i} -q &>/dev/null
+          if diff ${CACHEDIR}/${conf}.temp ${CACHEDIR}/${conf} -q &>/dev/null
           then
-              echo -n "no change found for '$i'"
+              echo -n "no change found for '${conf}'"
           else
-              echo -n "change detected for '$i', applying"
-              cp -f ${CACHEDIR}/${i}.temp ${CACHEDIR}/${i}
+              echo -n "change detected for '${conf}', applying"
+              cp -f ${CACHEDIR}/${conf}.temp ${CACHEDIR}/${conf}
               # Now parse the slave file and send it to /etc/bind/slavedns
-              CreateBindConf ${i} 
+              CreateBindConf ${conf} 
               RELOAD="YES"
           fi
       else
-          echo "Error: downloaded file for '$i' has zero size" >&2
+          echo "Error: downloaded file for '${conf}' has zero size" >&2
       fi
   fi
@@ -79 +88 @@
 then
     mv -f ${BINDINCLUDE}.temp ${BINDINCLUDE}
-    if [ -e "/etc/init.d/bind" ]
-    then
-        /etc/init.d/bind reload
-    fi
-    if [ -e "/etc/init.d/bind9" ]
-    then
-        /etc/init.d/bind9 reload
-    fi
+    for script in $NAMED
+    do
+      if [ -x $script ]
+      then
+          ${script} reload
+      fi
+    done
 fi