X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fdefs.conf.erb;h=6c2d182fb485540901c8ecc73765483ed6ef5319;hb=d665197bdd18c8ef6a59c466f162de630eb9218d;hp=a68420977033a766f66edceb590074bd2ce03c91;hpb=d7475f90c56697e9589e1386ced135498df68c81;p=dsa-puppet.git

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index a6842097..6c2d182f 100644
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -19,7 +19,7 @@
   mailrelay = []
   localinfo.keys.sort.each do |node|
       if localinfo[node]['mailrelay']
-          ldapall[node]['ipHostNumber'].each do |ip|
+          keyinfo[node]['ipHostNumber'].each do |ip|
              next if ip =~ /:/
              mailrelay << ip
           end
@@ -33,7 +33,7 @@
   mailrelay = []
   localinfo.keys.sort.each do |node|
       if localinfo[node]['mailrelay']
-          ldapall[node]['ipHostNumber'].each do |ip|
+          keyinfo[node]['ipHostNumber'].each do |ip|
              next if ip =~ /\./
              mailrelay << ip
           end
@@ -49,7 +49,7 @@
   nagii = []
   localinfo.keys.sort.each do |node|
       if localinfo[node]['nagiosmaster'] or localinfo[node]['extranrpeclient']
-          ldapall[node]['ipHostNumber'].each do |ip|
+          keyinfo[node]['ipHostNumber'].each do |ip|
              next if ip =~ /:/
              nagii << ip
           end
@@ -63,7 +63,7 @@
   nagii = []
   localinfo.keys.sort.each do |node|
       if localinfo[node]['nagiosmaster'] or localinfo[node]['extranrpeclient']
-          ldapall[node]['ipHostNumber'].each do |ip|
+          keyinfo[node]['ipHostNumber'].each do |ip|
              next if ip =~ /\./
              nagii << ip
           end
@@ -79,7 +79,7 @@
   munins = []
   localinfo.keys.sort.each do |node|
       if localinfo[node]['muninmaster']
-          ldapall[node]['ipHostNumber'].each do |ip|
+          keyinfo[node]['ipHostNumber'].each do |ip|
              next if ip =~ /:/
              munins << ip
           end
@@ -93,7 +93,7 @@
   munins = []
   localinfo.keys.sort.each do |node|
       if localinfo[node]['muninmaster']
-          ldapall[node]['ipHostNumber'].each do |ip|
+          keyinfo[node]['ipHostNumber'].each do |ip|
              next if ip =~ /\./
              munins << ip
           end
@@ -109,7 +109,7 @@
   dbs = []
   localinfo.keys.sort.each do |node|
       if localinfo[node]['dbmaster']
-          ldapall[node]['ipHostNumber'].each do |ip|
+          keyinfo[node]['ipHostNumber'].each do |ip|
              next if ip =~ /\./
              dbs << ip
           end
@@ -123,7 +123,7 @@
   dbs = []
   localinfo.keys.sort.each do |node|
       if localinfo[node]['dbmaster']
-          ldapall[node]['ipHostNumber'].each do |ip|
+          keyinfo[node]['ipHostNumber'].each do |ip|
              next if ip =~ /:/
              dbs << ip
           end
@@ -137,9 +137,9 @@
 
 @def $HOST_DEBIAN_V4 = (<%=
   dbs = []
-  ldapall.keys.sort.each do |node|
-      next unless ldapall[node].has_key?('ipHostNumber')
-      ldapall[node]['ipHostNumber'].each do |ip|
+  keyinfo.keys.sort.each do |node|
+      next unless keyinfo[node].has_key?('ipHostNumber')
+      keyinfo[node]['ipHostNumber'].each do |ip|
          next if ip =~ /:/
          dbs << ip
       end
@@ -150,9 +150,9 @@
 
 @def $HOST_DEBIAN_V6  = (<%=
   dbs = []
-  ldapall.keys.sort.each do |node|
-      next unless ldapall[node].has_key?('ipHostNumber')
-      ldapall[node]['ipHostNumber'].each do |ip|
+  keyinfo.keys.sort.each do |node|
+      next unless keyinfo[node].has_key?('ipHostNumber')
+      keyinfo[node]['ipHostNumber'].each do |ip|
          next if ip =~ /\./
          dbs << ip
       end
@@ -169,7 +169,7 @@
 @def $weasel  = ($weasel 86.59.21.32/29); # anguilla1
 @def $weasel  = ($weasel 86.59.30.32/28); # anguilla2
 @def $weasel  = ($weasel 141.201.27.0/24); # came
-@def $weasel  = ($weasel 62.99.152.178); # argos.campus-sbg
+@def $weasel  = ($weasel 62.99.152.176/28); # campus sbg
 @def $zobel   = ();
 @def $zobel   = ($zobel 87.139.82.80/32); # exit.credativ.com
 @def $zobel   = ($zobel 87.193.134.192/27); # credativ qsc
@@ -186,6 +186,7 @@
 @def $zobel6     = ($zobel6 2001:6f8:1215::/48); # baldur
 @def $zobel6     = ($zobel6 2001:6f8:928::/48); # WS2 
 @def $zobel6     = ($zobel6 2a01:198:549::/48); # WGS20
+@def $zobel6     = ($zobel6 2a01:198:6b2::/48); # AdS20
 @def $luca6      = ();
 @def $DSA_V6_IPS = ($sgran6 $weasel6 $zobel6 $luca6);
 
@@ -194,6 +195,8 @@
 @def $USER_kibi = ($USER_kibi 88.164.242.219); # home.ikibiki.org
 @def $USER_kibi = ($USER_kibi 82.244.158.68); # @parents'
 @def $USER_aurel32 = ();
-@def $USER_aurel32 = ($USER_aurel32 88.191.82.174); # hall.aurel32.net
+@def $USER_aurel32 = ($USER_aurel32 88.191.126.93); # hall.aurel32.net
 @def $USER_aurel32 = ($USER_aurel32 82.232.2.251); # farad.aurel32.net
-@def $FREEBSD_SSH_ACCESS = ($DSA_IPS $USER_kibi $USER_aurel32);
+@def $FREEBSD_SSH_ACCESS = ();
+@def $FREEBSD_SSH_ACCESS = ($FREEBSD_SSH_ACCESS $DSA_IPS $USER_kibi $USER_aurel32);
+@def $FREEBSD_SSH_ACCESS = ($FREEBSD_SSH_ACCESS 194.177.211.200); # grieg