X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fdefs.conf.erb;h=d4f8615186425000c77f71928f12bff3e3584d8c;hb=65d8cb87fffc6f75d7f7808f1e78ac16ef7145a8;hp=af5c387c08b6601d81694e91ff2174b0cee61f7d;hpb=78ef1b173d407c24cffdf7996e1e847dbfe269c9;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index af5c387c0..d4f861518 100644
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -24,7 +24,7 @@
   allnodeinfo = scope.lookupvar('site::allnodeinfo')
   roles = scope.lookupvar('site::roles')
 
-  %w{mailrelay nagiosmaster extranrpeclient muninmaster dbmaster static_mirror static_source static_master dns_geo postgres_backup_server}.each do |role|
+  %w{mailrelay nagiosmaster extranrpeclient muninmaster dbmaster static_mirror static_source static_master dns_geo postgres_backup_server syncproxy security_master ftp_master historical_master ports_master mirrormaster}.each do |role|
     rolehost[role] = []
     roles[role].each do |node|
         next unless allnodeinfo.has_key?(node) and allnodeinfo[node].has_key?('ipHostNumber')
@@ -66,12 +66,32 @@
 @def $HOST_STATIC_V4 = (<%= scope.function_filter_ipv4([rolehost['static_mirror'] + rolehost['static_source'] + rolehost['static_master']]).uniq.join(' ') %>);
 @def $HOST_STATIC_V6 = (<%= scope.function_filter_ipv6([rolehost['static_mirror'] + rolehost['static_source'] + rolehost['static_master']]).uniq.join(' ') %>);
 
+@def $HOST_FTPMASTER_V4 = (<%= scope.function_filter_ipv4([rolehost['ftp_master']]).uniq.join(' ') %>);
+@def $HOST_FTPMASTER_V6 = (<%= scope.function_filter_ipv6([rolehost['ftp_master']]).uniq.join(' ') %>);
+@def $HOST_SECMASTER_V4 = (<%= scope.function_filter_ipv4([rolehost['security_master']]).uniq.join(' ') %>);
+@def $HOST_SECMASTER_V6 = (<%= scope.function_filter_ipv6([rolehost['security_master']]).uniq.join(' ') %>);
+@def $HOST_PORTSMASTER_V4 = (<%= scope.function_filter_ipv4([rolehost['ports_master']]).uniq.join(' ') %>);
+@def $HOST_PORTSMASTER_V6 = (<%= scope.function_filter_ipv6([rolehost['ports_master']]).uniq.join(' ') %>);
+@def $HOST_ARCHIVEMASTER_V4 = (<%= scope.function_filter_ipv4([rolehost['historical_master']]).uniq.join(' ') %>);
+@def $HOST_ARCHIVEMASTER_V6 = (<%= scope.function_filter_ipv6([rolehost['historical_master']]).uniq.join(' ') %>);
+@def $HOST_MIRRORMASTER_V4 = (<%= scope.function_filter_ipv4([rolehost['mirrormaster']]).uniq.join(' ') %>);
+@def $HOST_MIRRORMASTER_V6 = (<%= scope.function_filter_ipv6([rolehost['mirrormaster']]).uniq.join(' ') %>);
+@def $HOST_SYNCPROXY_V4 = (<%= scope.function_filter_ipv4([rolehost['syncproxy']]).uniq.join(' ') %>);
+@def $HOST_SYNCPROXY_V6 = (<%= scope.function_filter_ipv6([rolehost['syncproxy']]).uniq.join(' ') %>);
+#                                             syncproxy.au           syncproxy2.eu              syncproxy3.eu           syncproxy4.eu
+@def $HOST_SYNCPROXY_V4 = ($HOST_SYNCPROXY_V4 150.203.164.60         130.89.148.10              5.153.231.9             217.196.149.237);
+@def $HOST_SYNCPROXY_V6 = ($HOST_SYNCPROXY_V6 2001:388:1034:2900::3c 2001:67c:2564:a119::148:10 2001:41c8:1000:21::21:9 2a02:16a8:dc41:100::237);
+#                                             syncproxy.cna                syncproxy.na syncproxy2.wna   syncproxy3.wna
+@def $HOST_SYNCPROXY_V4 = ($HOST_SYNCPROXY_V4 128.101.240.216              128.31.0.64  149.20.4.16      209.87.16.40);
+@def $HOST_SYNCPROXY_V6 = ($HOST_SYNCPROXY_V6 2607:ea00:101:3c0b::1deb:216              2001:4f8:1:c::16 2607:f8f0:614:1::1274:40);
+
 @def $HOST_DNS_GEO_V4 = (<%= scope.function_filter_ipv4([rolehost['dns_geo']]).uniq.join(' ') %>);
 @def $HOST_DNS_GEO_V6 = (<%= scope.function_filter_ipv6([rolehost['dns_geo']]).uniq.join(' ') %>);
 @def $HOST_EASYDNS_V4 = (64.68.200.91);
 @def $HOST_RCODE0_V4 = (83.136.34.0/27);
 @def $HOST_RCODE0_V6 = (2A02:850:8::/47);
-@def $HOST_NETNOD_V4 = (192.71.80.0/24 192.36.144.222 192.36.144.218);
+@def $HOST_NETNOD_V4 = (192.71.80.0/24 192.36.144.222 192.36.144.218 194.146.105.24 194.146.105.25);
+@def $HOST_NETNOD_V6 = (2a01:3f0:0:27::24 2a01:3f0:0:28::25);
 
 <%
 def getfastlyranges()
@@ -113,10 +133,6 @@ end
 @def $zobel   = ($zobel 88.99.108.200/29); # buri, dag, ...
 @def $luca    = ();
 @def $luca    = ($luca 162.210.192.22);  # jump snafu.emyr.net
-@def $luca    = ($luca 162.210.192.56);  # jump pebkac.emyr.net
-@def $luca    = ($luca 137.82.37.25);    # jump eye.iun.ubc.ca
-@def $luca    = ($luca 50.67.21.146);    # home
-@def $luca    = ($luca 142.103.249.101); # work
 @def $tfheen   = ();
 @def $tfheen   = ($tfheen 178.255.151.162); # vuizook
 @def $jcristau = ();
@@ -140,6 +156,7 @@ end
 @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 $jcristau6  = (2a01:e35:2e14:a6b0::/64); # home