Changeset 8599 for 2.0

Timestamp:

Oct 31, 2010, 3:26:55 AM (14 years ago)

Author:

rick

Message:

• More standard: all now uses a dot at the end.

• Better reload: not every time, but only when done checking.

• More robust: it failed on empty files for example.

• Code cleanup: removed stale newlines and added/moved variables around.

Location:

2.0/nanobsd/nanobsd/files/usr/local

Files:

• etc/mararc (modified) (1 diff)
• sbin/fetchzone.sh (modified) (3 diffs, 1 prop)

2.0/nanobsd/nanobsd/files/usr/local/etc/mararc

@@ -10 +10 @@
 #csv2["example.com."] = "db.example.com"
 
-csv2["wleiden.net."] = "db.wleiden.net"
+csv2["wleiden.net."] = "db.wleiden.net."
 csv2["16.172.in-addr.arpa."] = "db.16.172.in-addr.arpa."
 csv2["17.172.in-addr.arpa."] = "db.17.172.in-addr.arpa."

2.0/nanobsd/nanobsd/files/usr/local/sbin/fetchzone.sh

@@ -1 +1 @@
 #!/bin/sh
+# $Id$
+#
+# Wireless Leiden specific configuration to fetch DNS zones 
+# used by MaraDNS
+# 
 
-# Set some vars
-ZONES="wleiden.net 16.172.in-addr.arpa. 17.172.in-addr.arpa. 
+# Updates of $ZONES we are going to fetch from the $SERVER every $IDLE seconds
+ZONES="wleiden.net. 16.172.in-addr.arpa. 17.172.in-addr.arpa. 
 18.172.in-addr.arpa. 19.172.in-addr.arpa. 20.172.in-addr.arpa.
 21.172.in-addr.arpa. 22.172.in-addr.arpa. 23.172.in-addr.arpa.
@@ -8 +13 @@
 27.172.in-addr.arpa. 28.172.in-addr.arpa. 29.172.in-addr.arpa.
 30.172.in-addr.arpa. 31.172.in-addr.arpa."
+SERVER=172.16.4.46
+IDLE=3600
 
-SERVER=195.169.86.131
-APP=/usr/local/bin/fetchzone
 LOGFILE=/var/log/fetchzone.log
 PIDFILE=/var/run/fetchzone.pid
-IDLE=3600
+### END OF USER CONFIGURABLE VARIABLES ###
+
 
 # Create logging service
@@ -23 +29 @@
 PID=$$
 echo ${PID} > ${PIDFILE}
-
-# Tell logfile that I am starting
 log "[INFO] Fetchzone starting with PID: $PID"
 
-# Make sure I never die
+# Make me a deamon script
 while [ true ]; do 
 
+  CHANGED_ZONES=""
   # Run through multiple zones
-  for ZONE in ${ZONES}
-  do
-
+  for ZONE in ${ZONES}; do
     # (re) Set some extra vars
-    TMPFILE=/tmp/dns-${ZONE}.tmp
+    TMPFILE=/tmp/dns-tmp-${ZONE}
     REALFILE=/usr/local/etc/maradns/db.${ZONE}
     # Execute Fetchzone
-    ${APP} ${ZONE} ${SERVER} > ${TMPFILE}
+    /usr/local/bin/fetchzone ${ZONE} ${SERVER} > ${TMPFILE}
   
     # Did Fetchzone exit unhappy
-    if [ $? -eq 0 ]; then
-  
-      # Are there any changes?
-      COMM=`comm -23 ${TMPFILE} ${REALFILE} 2>&1`
-      if [ -n "$COMM" ]; then
-  
-        # If there are any changes copy tmp to realfile
-        log "[INFO] Changes found"
-        cp ${TMPFILE} ${REALFILE}
-  
-        # Maradns requires a restart to load new zonefile
-        /usr/local/etc/rc.d/maradns restart
-  
-      fi
-    else
-  
+    if [ $? -ne 0 ]; then
       # Something went wrong lets log it
-      log "[ERROR] Errors found in fetchzone query"
+      log "[ERROR] [$ZONE] Errors found in fetchzone query"
+      continue
     fi
 
+    # Are there any changes, we need to put active?
+    diff -Nq ${TMPFILE} ${REALFILE}
+    if [ $? -eq 1 ]; then
+      log "[INFO] [$ZONE] Changes found"
+      cp ${TMPFILE} ${REALFILE}
+      CHANGED_ZONES="$CHANGED_ZONES $ZONE"
+    fi
   done
 
-  # Lets go to sleep
+  # Maradns requires a restart to load new zonefile
+  if [ -n "$CHANGED_ZONES" ]; then
+    log "[INFO] `/usr/local/etc/rc.d/maradns restart`"
+  fi
+
+  # Next run in $IDLE seconds
   sleep ${IDLE}
 done