X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fdefs.conf.erb;h=5251421fdc02e9a328c4510a3c7ef8ae5e443440;hb=b9cf1fb14dce8941d0277db81a5d60eaa88a45c5;hp=5e794e1f43632824946f7bb1228e7a7db19fcacf;hpb=a9b05e712ef230583469d5bd0d88d8318d034a8d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index 5e794e1f4..5251421fd 100644
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -21,9 +21,9 @@
 
 @def $HOST_MAILRELAY_V4 = (<%=
   mailrelay = []
-  localinfo.keys.sort.each do |node|
-      if localinfo[node]['mailrelay']
-          allnodeinfo[node]['ipHostNumber'].each do |ip|
+  scope.lookupvar('site::localinfo').keys.sort.each do |node|
+      if scope.lookupvar('site::localinfo')[node]['mailrelay']
+          scope.lookupvar('site::allnodeinfo')[node]['ipHostNumber'].each do |ip|
              next if ip =~ /:/
              mailrelay << ip
           end
@@ -35,9 +35,9 @@
 
 @def $HOST_MAILRELAY_V6 = (<%=
   mailrelay = []
-  localinfo.keys.sort.each do |node|
-      if localinfo[node]['mailrelay']
-          allnodeinfo[node]['ipHostNumber'].each do |ip|
+  scope.lookupvar('site::localinfo').keys.sort.each do |node|
+      if scope.lookupvar('site::localinfo')[node]['mailrelay']
+          scope.lookupvar('site::allnodeinfo')[node]['ipHostNumber'].each do |ip|
              next if ip =~ /\./
              mailrelay << ip
           end
@@ -51,9 +51,9 @@
 
 @def $HOST_NAGIOS_V4 = (<%=
   nagii = []
-  localinfo.keys.sort.each do |node|
-      if localinfo[node]['nagiosmaster'] or localinfo[node]['extranrpeclient']
-          allnodeinfo[node]['ipHostNumber'].each do |ip|
+  scope.lookupvar('site::localinfo').keys.sort.each do |node|
+      if scope.lookupvar('site::localinfo')[node]['nagiosmaster'] or scope.lookupvar('site::localinfo')[node]['extranrpeclient']
+          scope.lookupvar('site::allnodeinfo')[node]['ipHostNumber'].each do |ip|
              next if ip =~ /:/
              nagii << ip
           end
@@ -65,9 +65,9 @@
 
 @def $HOST_NAGIOS_V6 = (<%=
   nagii = []
-  localinfo.keys.sort.each do |node|
-      if localinfo[node]['nagiosmaster'] or localinfo[node]['extranrpeclient']
-          allnodeinfo[node]['ipHostNumber'].each do |ip|
+  scope.lookupvar('site::localinfo').keys.sort.each do |node|
+      if scope.lookupvar('site::localinfo')[node]['nagiosmaster'] or scope.lookupvar('site::localinfo')[node]['extranrpeclient']
+          scope.lookupvar('site::allnodeinfo')[node]['ipHostNumber'].each do |ip|
              next if ip =~ /\./
              nagii << ip
           end
@@ -81,9 +81,9 @@
 
 @def $HOST_MUNIN_V4 = (<%=
   munins = []
-  localinfo.keys.sort.each do |node|
-      if localinfo[node]['muninmaster']
-          allnodeinfo[node]['ipHostNumber'].each do |ip|
+  scope.lookupvar('site::localinfo').keys.sort.each do |node|
+      if scope.lookupvar('site::localinfo')[node]['muninmaster']
+          scope.lookupvar('site::allnodeinfo')[node]['ipHostNumber'].each do |ip|
              next if ip =~ /:/
              munins << ip
           end
@@ -95,9 +95,9 @@
 
 @def $HOST_MUNIN_V6 = (<%=
   munins = []
-  localinfo.keys.sort.each do |node|
-      if localinfo[node]['muninmaster']
-          allnodeinfo[node]['ipHostNumber'].each do |ip|
+  scope.lookupvar('site::localinfo').keys.sort.each do |node|
+      if scope.lookupvar('site::localinfo')[node]['muninmaster']
+          scope.lookupvar('site::allnodeinfo')[node]['ipHostNumber'].each do |ip|
              next if ip =~ /\./
              munins << ip
           end
@@ -111,9 +111,9 @@
 
 @def $HOST_DB_V6  = (<%=
   dbs = []
-  localinfo.keys.sort.each do |node|
-      if localinfo[node]['dbmaster']
-          allnodeinfo[node]['ipHostNumber'].each do |ip|
+  scope.lookupvar('site::localinfo').keys.sort.each do |node|
+      if scope.lookupvar('site::localinfo')[node]['dbmaster']
+          scope.lookupvar('site::allnodeinfo')[node]['ipHostNumber'].each do |ip|
              next if ip =~ /\./
              dbs << ip
           end
@@ -125,9 +125,9 @@
 
 @def $HOST_DB_V4 = (<%=
   dbs = []
-  localinfo.keys.sort.each do |node|
-      if localinfo[node]['dbmaster']
-          allnodeinfo[node]['ipHostNumber'].each do |ip|
+  scope.lookupvar('site::localinfo').keys.sort.each do |node|
+      if scope.lookupvar('site::localinfo')[node]['dbmaster']
+          scope.lookupvar('site::allnodeinfo')[node]['ipHostNumber'].each do |ip|
              next if ip =~ /:/
              dbs << ip
           end
@@ -141,9 +141,9 @@
 
 @def $HOST_DEBIAN_V4 = (<%=
   dbs = []
-  allnodeinfo.keys.sort.each do |node|
-      next unless allnodeinfo[node].has_key?('ipHostNumber')
-      allnodeinfo[node]['ipHostNumber'].each do |ip|
+  scope.lookupvar('site::allnodeinfo').keys.sort.each do |node|
+      next unless scope.lookupvar('site::allnodeinfo')[node].has_key?('ipHostNumber')
+      scope.lookupvar('site::allnodeinfo')[node]['ipHostNumber'].each do |ip|
          next if ip =~ /:/
          dbs << ip
       end
@@ -154,9 +154,9 @@
 
 @def $HOST_DEBIAN_V6  = (<%=
   dbs = []
-  allnodeinfo.keys.sort.each do |node|
-      next unless allnodeinfo[node].has_key?('ipHostNumber')
-      allnodeinfo[node]['ipHostNumber'].each do |ip|
+  scope.lookupvar('site::allnodeinfo').keys.sort.each do |node|
+      next unless scope.lookupvar('site::allnodeinfo')[node].has_key?('ipHostNumber')
+      scope.lookupvar('site::allnodeinfo')[node]['ipHostNumber'].each do |ip|
          next if ip =~ /\./
          dbs << ip
       end
@@ -179,8 +179,12 @@
 @def $zobel   = ($zobel 87.139.82.80/32); # exit.credativ.com
 @def $zobel   = ($zobel 87.193.134.192/27); # credativ qsc
 @def $zobel   = ($zobel 78.47.2.104/29); # baldur, bragi, saga
+@def $zobel   = ($zobel 92.198.42.24/29); # DG-i Office
+@def $zobel   = ($zobel 93.94.128.0/21);  # DG-i AS
+@def $zobel   = ($zobel 195.49.152.0/22); # DG-i AS
+@def $zobel   = ($zobel 194.187.64.0/22); # DG-i AS
 @def $luca    = (64.71.152.109);
-@def $paravoid = (83.212.9.72); # faidon.noc.grnet.gr
+@def $paravoid = (62.217.125.135); # scrooge.tty.gr
 @def $tfheen   = ();
 @def $tfheen   = ($tfheen 194.31.39.0/26); # office network
 @def $tfheen   = ($tfheen 195.159.200.122); # home
@@ -197,8 +201,9 @@
 @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 $zobel6     = ($zobel6 2a02:158::/32);     # DG-i AS
 @def $luca6      = ();
-@def $paravoid6  = (2001:648:2340:1:225:64ff:fea4:8590); # faidon.noc.grnet.gr
+@def $paravoid6  = (2001:648:2ffc:113:dcdb:eeff:fe5c:182b); # scrooge.tty.gr
 @def $tfheen6    = ();
 @def $tfheen6    = ($tfheen6 2a02:c0:1013:1::/64); # Office
 @def $tfheen6    = ($tfheen6 2001:840:f000:4007::/64); # Home, link
@@ -207,9 +212,16 @@
 
 @def $USER_christoph = ();
 @def $USER_christoph = ($USER_christoph 212.114.250.148/31);
+@def $USER_christoph = ($USER_christoph 128.111.48.6/32); # U of Cal at Santa Barbara, until 2013-03
 @def $USER_aurel32 = ();
 @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 $USER_joerg   = ();
+@def $USER_joerg   = ($USER_joerg 213.146.108.160/29);
+@def $USER_joerg   = ($USER_joerg 46.4.205.32);
+@def $USER_joerg6  = ();
+@def $USER_joerg6  = ($USER_joerg6 2a02:248:1005::/48);
+@def $USER_joerg6  = ($USER_joerg6 2a01:4f8:131:1520::6667);
 
 @def $BUILDD_SSH_ACCESS = ();
 @def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 194.177.211.200); # grieg
@@ -218,3 +230,7 @@
 @def $FREEBSD_SSH_ACCESS = ();
 @def $FREEBSD_SSH_ACCESS = ($FREEBSD_SSH_ACCESS $DSA_IPS $BUILDD_SSH_ACCESS);
 @def $FREEBSD_SSH_ACCESS = ($FREEBSD_SSH_ACCESS $USER_christoph $USER_aurel32); # buildd admins
+@def $UNGER_SSH_ACCESS = ();
+@def $UNGER_SSH_ACCESS = ($UNGER_SSH_ACCESS $USER_joerg);
+@def $UNGER_SSH6_ACCESS = ();
+@def $UNGER_SSH6_ACCESS = ($UNGER_SSH6_ACCESS $USER_joerg6);