Changeset 8101 for 2.0/nanobsd

Timestamp:

May 30, 2010, 4:31:58 PM (14 years ago)

Author:

richardvm

Message:

Fixed reverse dns, no arpa zones where loaded

Location:

2.0/nanobsd/nanobsd/files/usr/local

Files:

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

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

@@ -11 +11 @@
 
 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."
+csv2["18.172.in-addr.arpa."] = "db.18.172.in-addr.arpa."
+csv2["19.172.in-addr.arpa."] = "db.19.172.in-addr.arpa."
+csv2["20.172.in-addr.arpa."] = "db.20.172.in-addr.arpa."
+csv2["21.172.in-addr.arpa."] = "db.21.172.in-addr.arpa."
+csv2["22.172.in-addr.arpa."] = "db.22.172.in-addr.arpa."
+csv2["23.172.in-addr.arpa."] = "db.23.172.in-addr.arpa."
+csv2["24.172.in-addr.arpa."] = "db.24.172.in-addr.arpa."
+csv2["25.172.in-addr.arpa."] = "db.25.172.in-addr.arpa."
+csv2["26.172.in-addr.arpa."] = "db.26.172.in-addr.arpa."
+csv2["27.172.in-addr.arpa."] = "db.27.172.in-addr.arpa."
+csv2["28.172.in-addr.arpa."] = "db.28.172.in-addr.arpa."
+csv2["29.172.in-addr.arpa."] = "db.29.172.in-addr.arpa."
+csv2["30.172.in-addr.arpa."] = "db.30.172.in-addr.arpa."
+csv2["31.172.in-addr.arpa."] = "db.31.172.in-addr.arpa."
 
 # The address this DNS server runs on.  If you want to bind 

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

@@ -2 +2 @@
 
 # Set some vars
-ZONE=wleiden.net
+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.
+24.172.in-addr.arpa. 25.172.in-addr.arpa. 26.172.in-addr.arpa.
+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=195.169.86.131
 APP=/usr/local/bin/fetchzone
-TMPFILE=/tmp/dns-${ZONE}.tmp
-REALFILE=/usr/local/etc/maradns/db.${ZONE}
 LOGFILE=/var/log/fetchzone.log
 PIDFILE=/var/run/fetchzone.pid
@@ -20 +24 @@
 echo ${PID} > ${PIDFILE}
 
-# No zone file to compare with, so lets make a dummy
-touch ${REALFILE}
-
 # Tell logfile that I am starting
 log "[INFO] Fetchzone starting with PID: $PID"
@@ -29 +30 @@
 while [ true ]; do 
 
-  # Execute Fetchzone
-  ${APP} ${ZONE} ${SERVER} > ${TMPFILE}
+  # Run through multiple zones
+  for ZONE in ${ZONES}
+  do
 
-  # Did Fetchzone exit unhappy
-  if [ $? -eq 0 ]; then
+    # (re) Set some extra vars
+    TMPFILE=/tmp/dns-${ZONE}.tmp
+    REALFILE=/usr/local/etc/maradns/db.${ZONE}
+    # Execute Fetchzone
+    ${APP} ${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
+  
+      # Something went wrong lets log it
+      log "[ERROR] Errors found in fetchzone query"
+    fi
 
-    # Are there any changes?
-    COMM=`comm -23 ${TMPFILE} ${REALFILE}`
-    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
-
-    # Something went wrong lets log it
-    log "[ERROR] Errors found in fetchzone query"
-  fi
+  done
 
   # Lets go to sleep
   sleep ${IDLE}
 done
+