X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fdefs.conf.erb;h=2e3f23d6d264a5035f93e4c059f4e9f7742a3ef2;hb=f77499d4ba53abb8e56b1923d25fb1b828e46328;hp=de43f76342fa9a742c6550bab6e83db5c7290ea1;hpb=6f10c816da4e6a1b8e917214f0bcb9001602523c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index de43f7634..2e3f23d6d 100644
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -24,7 +24,7 @@
   allnodeinfo = scope.lookupvar('deprecated::allnodeinfo')
   roles = scope.lookupvar('deprecated::roles')
 
-  %w{nagiosmaster postgres_backup_server}.each do |role|
+  %w{postgres_backup_server}.each do |role|
     rolehost[role] = []
     roles[role].each do |node|
         next unless allnodeinfo.has_key?(node) and allnodeinfo[node].has_key?('ipHostNumber')
@@ -41,10 +41,6 @@
   dbs.flatten!
 %>
 
-@def $HOST_NAGIOS_V4 = (<%= scope.function_filter_ipv4([rolehost['nagiosmaster']]).uniq.join(' ') %>);
-@def $HOST_NAGIOS_V6 = (<%= scope.function_filter_ipv6([rolehost['nagiosmaster']]).uniq.join(' ') %>);
-@def $HOST_NAGIOS = ( $HOST_NAGIOS_V4 $HOST_NAGIOS_V6 );
-
 @def $HOST_PGBACKUPHOST_V4 = (<%= scope.function_filter_ipv4([rolehost['postgres_backup_server']]).uniq.join(' ') %>);
 @def $HOST_PGBACKUPHOST_V6 = (<%= scope.function_filter_ipv6([rolehost['postgres_backup_server']]).uniq.join(' ') %>);
 @def $HOST_PGBACKUPHOST = ( $HOST_PGBACKUPHOST_V4 $HOST_PGBACKUPHOST_V6 );
@@ -73,8 +69,10 @@ end
 @def $weasel  = ($weasel 86.59.30.32/28); # anguilla2
 @def $weasel  = ($weasel 213.235.231.192/26); # sil-noreply
 @def $weasel  = ($weasel 141.201.0.0/16); # uni salzburg
-@def $weasel  = ($weasel 62.99.152.176/28); # campus sbg
 @def $weasel  = ($weasel 194.118.0.0/16 62.46.0.0/15); # A1 Telekom
+@def $weasel  = ($weasel 2001:826:408::/48); # unisbg
+@def $weasel  = ($weasel 2001:858:10f::/48); # anguilla
+
 @def $zobel   = ();
 @def $zobel   = ($zobel 87.139.82.80/32); # exit.credativ.com
 @def $zobel   = ($zobel 87.193.134.192/27); # credativ qsc
@@ -87,48 +85,32 @@ end
 @def $zobel   = ($zobel 195.49.152.0/22); # DG-i AS
 @def $zobel   = ($zobel 194.187.64.0/22); # DG-i AS
 @def $zobel   = ($zobel 88.99.108.200/29); # buri, dag, ...
+@def $zobel   = ($zobel 2001:6f8:1215::/48); # baldur
+@def $zobel   = ($zobel 2001:6f8:928::/48); # WS2
+@def $zobel   = ($zobel 2a01:198:549::/48); # WGS20
+@def $zobel   = ($zobel 2a01:198:6b2::/48); # AdS20
+@def $zobel   = ($zobel 2a02:158::/32);     # DG-i AS
+@def $zobel   = ($zobel 2003:5b:203b::/48); # credativ DTAG v6
+@def $zobel   = ($zobel 2a01:4f8:10a:1504::/64); # buri, dag, ....
+
 @def $luca    = ();
 @def $luca    = ($luca 162.210.192.22);  # jump snafu.emyr.net
+@def $luca    = ($luca 2604:9a00:2010:a041:4:ffff:a2d2:c016); # jump snafu.emyr.net
+
 @def $tfheen   = ();
 @def $tfheen   = ($tfheen 178.255.151.162); # vuizook
 @def $tfheen   = ($tfheen 51.174.0.0/15); # Altibox
+@def $tfheen   = ($tfheen 2a02:20c8:2640::/64); # vuizook
+@def $tfheen   = ($tfheen 2a01:798::/29); # Altibox
+
 @def $jcristau = ();
 @def $jcristau = ($jcristau 82.255.47.115/32); # home
 @def $jcristau = ($jcristau 62.210.122.202/32); # topinambour
-@def $master   = (82.195.75.110); # master.debian.org
-@def $people   = (5.153.231.30); # paradis.debian.org
-@def $DSA_IPS = ($weasel $zobel $luca $tfheen $jcristau $master $people);
-
-@def $weasel6    = ();
-@def $weasel6    = ($weasel6 2001:826:408::/48); # unisbg
-@def $weasel6    = ($weasel6 2001:858:10f::/48); # anguilla
-@def $zobel6     = ();
-@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 $zobel6     = ($zobel6 2a02:158::/32);     # DG-i AS
-@def $zobel6     = ($zobel6 2003:5b:203b::/48); # credativ DTAG v6
-@def $zobel6     = ($zobel6 2a01:4f8:10a:1504::/64); # buri, dag, ....
-@def $luca6      = ();
-@def $luca6      = ($luca6 2604:9a00:2010:a041:4:ffff:a2d2:c016); # jump snafu.emyr.net
-@def $tfheen6    = ();
-@def $tfheen6    = ($tfheen6 2a02:20c8:2640::/64); # vuizook
-@def $tfheen6    = ($tfheen6 2a01:798::/29); # Altibox
-@def $jcristau6  = ();
-@def $jcristau6  = ($jcristau6 2a01:e35:2ff2:f730::/61); # home
-@def $jcristau6  = ($jcristau6 2001:bc8:3f1d::/48); # topinambour
-@def $master6    = (2001:41b8:202:deb:216:36ff:fe40:4001); # master.debian.org
-@def $DSA_V6_IPS = ($weasel6 $zobel6 $luca6 $tfheen6 $jcristau6 $master6);
-
-@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 209.87.16.60); # wuiet
-@def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 97.107.116.29); # master
-@def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 82.195.75.110); # new-master
+@def $jcristau = ($jcristau 2a01:e35:2ff2:f730::/61); # home
+@def $jcristau = ($jcristau 2001:bc8:3f1d::/48); # topinambour
+
+@def $master   = (82.195.75.110 2001:41b8:202:deb:216:36ff:fe40:4001); # master.debian.org
+@def $people   = (5.153.231.30 2001:41c8:1000:21::21:30); # paradis.debian.org
+@def $draghi   = (82.195.75.106 2001:41b8:202:deb:1a1a:0:52c3:4b6a); # draghi.debian.org
+
+@def $DSA_IPS = ($weasel $zobel $luca $tfheen $jcristau $master $people $draghi);