fix make.sh (and hostfile)

dns/h2n

@@ -459,7 +459,7 @@ sub FIXUP {
     $RespUser =~ s/\.\././g;			# Strip any ".."'s to "."
 
     # Clean up nameservers
-    if (!defined(@Servers)) {
+    if (!@Servers) {
 	print STDERR "No -s option specified.  Assuming \"-s $Host.$Domain\"\n";
 	push(@Servers, "$Host.$Domain.");
     } else {
@@ -750,7 +750,7 @@ sub PARSEARGS {
 	$i++;
     }
     
-    if (!defined(@Networks) || $Domain eq "") {
+    if (!@Networks || $Domain eq "") {
 	print STDERR "Must specify one -d and at least one -n.\n";
 	print STDERR "I give up ... sorry.\n";
 	exit(1);

dns/hostfiles/routers

@@ -11,7 +11,7 @@
 10.205.253.8 tristor
 10.205.253.9 kalium
 10.205.253.13 hemelvaart
-10.205.253.10 beckers
+10.205.253.10 beckers #wfc
 10.205.253.11 gwl
 10.205.253.12 dwk
-10.205.253.13 sn1
+10.205.253.13 sn1 #hemelvaart???

dns/hostfiles/transfernet

@@ -8,7 +8,7 @@
 
 # Nieuw Vennep vlan12
 # 10.205.255.0/29
-10.205.255.0  acta_nv_net29
+10.205.255.0  acta-nv-net29
 10.205.255.1  stanleyh-acta-nieuwvennep
 10.205.255.2  something-acta-nieuwvennep 
 10.205.255.3  nothing 
@@ -19,29 +19,29 @@
 
 # WG (Wilhelmina Gasthuis) vlan13
 # 10.205.255.8/29
-10.205.255.8  acta_wg_net29
-10.205.255.9  acta_wg_stanleyh
-10.205.255.10 acta_wg_radio-acta
-10.205.255.11 acta_wg_radio-wg
-10.205.255.12 acta_wg_kalium-acta-wg
-10.205.255.13 acta_wg_duja
-10.205.255.14 acta_wg_nothing
-10.205.255.15 acta_wg_broadcast
+10.205.255.8  acta-wg-net29
+10.205.255.9  acta-wg-stanleyh
+10.205.255.10 acta-wg-radio-acta
+10.205.255.11 acta-wg-radio-wg
+10.205.255.12 acta-wg-kalium-acta-wg
+10.205.255.13 acta-wg-duja
+10.205.255.14 acta-wg-nothing
+10.205.255.15 acta-wg-broadcast
 
 # ACTA East vlan11
 # 10.205.255.16/29
-10.205.255.16 acta_east_net29
-10.205.255.17 acta_east_stanley
-10.205.255.18 acta_east_radio-acta
-10.205.255.19 acta_east_kalium
+10.205.255.16 acta-east-net29
+10.205.255.17 acta-east-stanley
+10.205.255.18 acta-east-radio-acta
+10.205.255.19 acta-east-kalium
 10.205.255.20 nothing-acta-east
 10.205.255.21 nothing-acta-east
 10.205.255.22 nothing-acta-east
-10.205.255.22 acta_east_broadcast
+10.205.255.22 acta-east-broadcast
 
 # ADM vlan 9
 # 10.205.255.24/29
-10.205.255.24 acta_adm_net29
+10.205.255.24 acta-adm-net29
 10.205.255.25 stanleyh-acta-adm
 10.205.255.26 radio-acta-acta-adm
 10.205.255.27 radio-adm-acta
@@ -54,7 +54,7 @@
 # 10.205.255.32/29
 10.205.255.32 net29-acta-antwerp
 10.205.255.33 kalium-acta-antwerp
-10.205.255.34 old_kalium_address_do_not_use
+10.205.255.34 old-kalium-address-do-not-use
 10.205.255.35 antwerp-omnitik #AS4661 
 10.205.255.36 stanleyh
 10.205.255.37 nothing
@@ -77,7 +77,7 @@
 10.205.255.48 net29-acta-techinc
 10.205.255.49 kalium-acta-techinc
 10.205.255.50 techinc-router
-10.205.255.51 old_kalium_do_not_use
+10.205.255.51 old-kalium-do-not-use
 10.205.255.52 stanley
 10.205.255.53 nothing
 10.205.255.54 nothing
@@ -88,37 +88,37 @@
 # access225.wfc.amsw.nl
 # 10.205.255.56/29 
 10.205.255.56 net29-acta-wfc
-10.205.255.57 acta_wfc-kalium #wfc.rtr-tec-01.amsw.nl
-10.205.255.58 acta_wfc-stanleyh #wfc.rtr-tec-02.amsw.nl
-10.205.255.59 acta_wfc-radio-acta #clientwfc.tec.amsw.nl
-10.205.255.60 acta_wfc-radio-wfc
-10.205.255.61 acta_wfc-router-wfc #access225.rtr-wfc-01.amsw.nl
+10.205.255.57 acta-wfc-kalium #wfc.rtr-tec-01.amsw.nl
+10.205.255.58 acta-wfc-stanleyh #wfc.rtr-tec-02.amsw.nl
+10.205.255.59 acta-wfc-radio-acta #clientwfc.tec.amsw.nl
+10.205.255.60 acta-wfc-radio-wfc
+10.205.255.61 acta-wfc-router-wfc #access225.rtr-wfc-01.amsw.nl
 10.205.255.62 nothing
-10.205.255.63 acta_wfc-broadcast
+10.205.255.63 acta-wfc-broadcast
 
 # DWK -> GWL vlan?
 # access294.dwk.amsw.nl
 # 10.205.255.64/29
 10.205.255.64 net29-dwk-gwl
-10.205.255.65 dwk_gwl-router-gwl #dwk.rtr-gwl-01.amsw.nl
-10.205.255.66 dwk_gwl-radio-gwl
-10.205.255.67 dwk_gwl-radio-dwk #access294.dwk.amsw.nl
-10.205.255.68 dwk_gwl-router-dwk #access294.rtr-dwk-01.amsw.nl
+10.205.255.65 dwk-gwl-router-gwl #dwk.rtr-gwl-01.amsw.nl
+10.205.255.66 dwk-gwl-radio-gwl
+10.205.255.67 dwk-gwl-radio-dwk #access294.dwk.amsw.nl
+10.205.255.68 dwk-gwl-router-dwk #access294.rtr-dwk-01.amsw.nl
 10.205.255.69 nothing
 10.205.255.70 nothing
-10.205.255.71 dwk_gwl-broadcast
+10.205.255.71 dwk-gwl-broadcast
 
 
 # WFC -> GWL vlan?
 # 10.205.255.72/29
 10.205.255.72 net29-wfc-gwl
-10.205.255.73 wfc_gwl-router-wfc
-10.205.255.74 wfc_gwl-radio-wfc
-10.205.255.75 wfc_gwl-radio-gwl
-10.205.255.76 wfc_gwl-router-gwl
+10.205.255.73 wfc-gwl-router-wfc
+10.205.255.74 wfc-gwl-radio-wfc
+10.205.255.75 wfc-gwl-radio-gwl
+10.205.255.76 wfc-gwl-router-gwl
 10.205.255.77 nothing
 10.205.255.78 nothing
-10.205.255.79 wfc_gwl-broadcast
+10.205.255.79 wfc-gwl-broadcast
 
 # WFC -> LAG vlan?
 # 10.205.255.80/29
@@ -129,5 +129,5 @@
 10.205.255.84 nothing
 10.205.255.85 nothing
 10.205.255.86 nothing
-10.205.255.87 wfc_lag-broadcast
+10.205.255.87 wfc-lag-broadcast
 

dns/make.sh

@@ -33,8 +33,8 @@ make_zone () {
     -m 10:mail.$zone_name \
     -n $subnet      \
     -h 10.205.253.1   \
-    -v 8 -y           \
     -s 10.205.253.1   \
+    -v 8 -y           \
     -H $HFD/$hostfile    \
     -u wireless-amsterdam@lists.puscii.nl   \
     -M -t