X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fdefs.conf.erb;h=fc7e114d2134522dda558b6e9b9b1cd6dd9248ef;hb=a47c22e58d6502bb314e9fca3814fae1cadc62e5;hp=82ca5f5bd519989e885248a0a71f2541f04c90e6;hpb=06f8e083701d1c0886668573295fa2dc7bb7980c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index 82ca5f5bd..fc7e114d2 100644
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -15,28 +15,96 @@
  proto (tcp udp) mod state state (NEW) dport $port ACCEPT;
 }
 
-@def $HOST_NAGIOS = (<%=
+@def $HOST_NAGIOS_V4 = (<%=
   nagii = []
   localinfo.keys.sort.each do |node|
-      if localinfo[node]['nagiosmaster'] == "true"
-            nagii << keyinfo[node][0]['ipHostNumber']
-              end
+      if localinfo[node]['nagiosmaster']
+          keyinfo[node][0]['ipHostNumber'].each do |ip|
+             next if ip =~ /:/
+             nagii << ip
+          end
+      end
   end
 
   nagii.join(' ')
 %>);
 
-@def $HOST_MUNIN  = (<%=
+@def $HOST_NAGIOS_V6 = (<%=
+  nagii = []
+  localinfo.keys.sort.each do |node|
+      if localinfo[node]['nagiosmaster']
+          keyinfo[node][0]['ipHostNumber'].each do |ip|
+             next if ip =~ /\./
+             nagii << ip
+          end
+      end
+  end
+
+  nagii.join(' ')
+%>);
+
+@def $HOST_NAGIOS = ( $HOST_NAGIOS_V4 $HOST_NAGIOS_V6 );
+
+@def $HOST_MUNIN_V4 = (<%=
   munins = []
   localinfo.keys.sort.each do |node|
-      if localinfo[node]['muninmaster'] == "true"
-            munins << keyinfo[node][0]['ipHostNumber']
-              end
+      if localinfo[node]['muninmaster']
+          keyinfo[node][0]['ipHostNumber'].each do |ip|
+             next if ip =~ /:/
+             munins << ip
+          end
+      end
   end
 
   munins.join(' ')
 %>);
 
+@def $HOST_MUNIN_V6 = (<%=
+  munins = []
+  localinfo.keys.sort.each do |node|
+      if localinfo[node]['muninmaster']
+          keyinfo[node][0]['ipHostNumber'].each do |ip|
+             next if ip =~ /\./
+             munins << ip
+          end
+      end
+  end
+
+  munins.join(' ')
+%>);
+
+@def $HOST_MUNIN = ( $HOST_MUNIN_V4 $HOST_MUNIN_V6 );
+
+@def $HOST_DB_V6  = (<%=
+  dbs = []
+  localinfo.keys.sort.each do |node|
+      if localinfo[node]['dbmaster']
+          keyinfo[node][0]['ipHostNumber'].each do |ip|
+             next if ip =~ /\./
+             dbs << ip
+          end
+      end
+  end
+
+  dbs.join(' ')
+%>);
+
+@def $HOST_DB_V4 = (<%=
+  dbs = []
+  localinfo.keys.sort.each do |node|
+      if localinfo[node]['dbmaster']
+          keyinfo[node][0]['ipHostNumber'].each do |ip|
+             next if ip =~ /:/
+             dbs << ip
+          end
+      end
+  end
+
+  dbs.join(' ')
+%>);
+
+@def $HOST_DB = ($HOST_DB_V4 $HOST_DB_V6);
+
 @def $sgran   = (91.103.132.24/29);
 @def $weasel  = ();
 @def $weasel  = ($weasel 86.59.118.144/28); # debian@sil