X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fdefs.conf.erb;h=dff45ac59ae6e537151e76032bc60f34a4148a2b;hb=384b3bd519a037007025532f2e8cd3c6d51bb1db;hp=2771f61f1a05c81bf561bdaa4e52a13bb3bb2389;hpb=535237cf6c30f48ab5202c165a5537253e818266;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index 2771f61f1..dff45ac59 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 );
@@ -114,7 +110,7 @@ end
 @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 $people   = (209.87.16.67 2607:f8f0:614:1::1274:67); # 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);