Changeset 10185 in hybrid for branches/releng-9.0/nanobsd/files/tools

Timestamp:

Mar 17, 2012, 11:51:28 AM (13 years ago)

Author:

richardvm

Message:

firewall and portal fixes

File:

• branches/releng-9.0/nanobsd/files/tools/wl-config (modified) (9 diffs)

branches/releng-9.0/nanobsd/files/tools/wl-config

@@ -1 +1 @@
 #!/bin/sh
-# Wireless Leiden proxy config-update script for FreeBSD 8.0 (nanobsd)
+# Wireless Leiden config-update script for FreeBSD 8.0 (nanobsd)
 # Based on the 'API' of Jasper
-# Rick van der Zwet ; Richard van Mansom
+# Rick van der Zwet
 # XXX: TODO, some proper error checking for fetch
 
-BASEURL="http://132.229.112.21/config/iris/proxy/FreeBSD/8.0-RELEASE/g_list.pl"
+
+# Slow connection = no connection
+HTTP_TIMEOUT=3
+
+
+check_access() {
+  # Direct Access - Internal IP 
+  BASEURL="http://172.16.4.46/wleiden/config/"
+  # Connectivity check
+  fetch -o /dev/null -q $BASEURL > /dev/null && return
+  echo "# WARN: Fetch via internal $BASEURL failed"
+  
+  # Direct Access - External DNS
+  BASEURL="http://132.229.112.21/wleiden/config/"
+  fetch -o /dev/null -q $BASEURL > /dev/null && return
+  echo "# CRIT: Fetch via external $BASEURL failed"
+
+  exit 1
+}
+check_access
+
 
 # Default config to fetch
-CONFIG=`hostname -s | tr '[A-Z]' '[a-z]'`
+CONFIG=`hostname -s`
 
 # Determine it's statup and running location and some other hints
 # Skip named.conf as it not planned in current release
-FILES="authorized_keys rc.conf.local resolv.conf"
+FILES="authorized_keys dnsmasq.conf rc.conf.local resolv.conf wleiden.yaml"
 file_details() {
   case "$1" in 
@@ -20 +40 @@
      FILE_HINT=""
    ;;
+  'dnsmasq.conf')
+     STARTUP_LOC="/cfg/local/${FILE}"
+     RUNNING_LOC="/etc/local/${FILE}"
+     FILE_HINT="/usr/local/etc/rc.d/dnsmasq restart"
+   ;;
+  'named.conf')
+     STARTUP_LOC="/cfg/namedb/${FILE}"
+     RUNNING_LOC="/etc/namedb/${FILE}"
+     FILE_HINT="/etc/rc.d/named restart"
+   ;;
   'rc.conf.local')
      STARTUP_LOC="/cfg/${FILE}"
@@ -30 +60 @@
      FILE_HINT=""
    ;;
+   'wleiden.yaml')
+     STARTUP_LOC="/cfg/local/${FILE}"
+     RUNNING_LOC="/etc/local/${FILE}"
+     FILE_HINT=""
+   ;;
   esac
 }
@@ -36 +71 @@
         (
         echo "Usage: $0 [-bn] [-c <config>] [-m <all|startup|testing|running>]"
-        echo "  -b              batch mode, no user input"
-        echo "  -c <config>     default configuration to fetch"
-        echo "  -n              do not mount config partition"
-        echo "  -m all          copy config files to running & config partition [default]"
-        echo "  -m startup      copy config files to config partition"
-        echo "  -m testing      do not copy config files"
-        echo "  -m running      copy config files to running partition"
-        echo "  -m hack         copy  running files to config partition"
+        echo "  -b          = batch mode, no user input"
+        echo "  -c <config> = default configuration to fetch"
+        echo "  -n          = do not mount config partition"
+        echo "  -m all      = copy config files to running & config partition [default]"
+        echo "  -m startup  = copy config files to config partition"
+        echo "  -m testing  = do not copy config files"
+        echo "  -m running  = copy config files to running partition"
+        echo "  -m hack     = copy running files to config partition"
         ) 1>&2
         exit 2
@@ -80 +115 @@
   
   if [ "${OPT_RUNNING}" -eq 1 ]; then
-    echo "INFO: Storing new config files in running configuration"
+    echo "# INFO: Storing new config files in running configuration"
   fi
   
   if [ "${OPT_STARTUP}" -eq 1 ]; then
-    echo "INFO: Storing new config files in startup configuration"
+    echo "# INFO: Storing new config files in startup configuration"
   fi
   
   if [ "${OPT_HACK}" -eq 1 ]; then
-    echo "WARN: Copy running configuration to startup configuration"
-    echo "WARN: Please do mind to document/mention this changes somewhere"
+    echo "# WARN: Copy running configuration to startup configuration"
+    echo "# WARN: Please do mind to document/mention this changes somewhere"
   fi
 
@@ -107 +142 @@
   else 
      echo "WARNING: Input '${INPUT}' is not valid, some hints..."
-     grep "${INPUT}" ${TMPDIR}/node_list.txt
+     grep -i "${INPUT}" ${TMPDIR}/node_list.txt
      return 1
   fi  
@@ -158 +193 @@
   SOURCE=$1
   TARGET=$2
-  diff -q ${SOURCE} ${TARGET} >/dev/null 2>/dev/null
+  diff -I '^# Generated at ' ${SOURCE} ${TARGET} 2>/dev/null
   if [ $? -ne 0 ]; then
     mkdir -p `dirname ${TARGET}` || exit 1
@@ -200 +235 @@
     file_details ${FILE}
   
-    echo "INFO: Working on file: '${FILE}'"
+    echo "# INFO: Working on file: '${FILE}'"
     # Copy file boot location
     if [ ${OPT_STARTUP} -eq 1 ]; then
@@ -210 +245 @@
       copy_file ${FRESH_LOC} ${RUNNING_LOC}
       if [ $? -eq 0 ]; then
-        echo "INFO: '${FILE}' changed"  
+        echo "# INFO: '${FILE}' changed"  
         if [ -n "${FILE_HINT}" ]; then
-          echo "INFO: For instant activate: ${FILE_HINT}"
+          echo "# INFO: For instant activate: ${FILE_HINT}"
           echo ""
         fi