X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fdefs.conf.erb;h=348d08b9aea02b1dcfcbd1a601a7f432c17908f4;hb=60761867cccbfa7f472fb13fdd2d704d4cb32b92;hp=7c53bb90f97d68d00d33b73d18e756f3d9e2e11b;hpb=20959ad142307c25c0ce3dcaccb35f5881560a42;p=mirror%2Fdsa-puppet.git diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb index 7c53bb90f..348d08b9a 100644 --- a/modules/ferm/templates/defs.conf.erb +++ b/modules/ferm/templates/defs.conf.erb @@ -20,19 +20,7 @@ } <% - rolehost={} - 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| - rolehost[role] = [] - roles[role].each do |node| - next unless allnodeinfo.has_key?(node) and allnodeinfo[node].has_key?('ipHostNumber') - rolehost[role] << allnodeinfo[node]['ipHostNumber'] - end - rolehost[role].flatten!.sort.uniq - end - + allnodeinfo = scope.lookupvar('deprecated::allnodeinfo') dbs = [] allnodeinfo.keys.sort.each do |node| next unless allnodeinfo[node].has_key?('ipHostNumber') @@ -41,52 +29,30 @@ dbs.flatten! %> -@def $HOST_MAILRELAY_V4 = (<%= scope.function_filter_ipv4([rolehost['mailrelay']]).uniq.join(' ') %>); -@def $HOST_MAILRELAY_V6 = (<%= scope.function_filter_ipv6([rolehost['mailrelay']]).uniq.join(' ') %>); -@def $HOST_MAILRELAY = ( $HOST_MAILRELAY_V4 $HOST_MAILRELAY_V6 ); - -@def $HOST_NAGIOS_V4 = (<%= scope.function_filter_ipv4([rolehost['nagiosmaster'] + rolehost['extranrpeclient']]).uniq.join(' ') %>); -@def $HOST_NAGIOS_V6 = (<%= scope.function_filter_ipv6([rolehost['nagiosmaster'] + rolehost['extranrpeclient']]).uniq.join(' ') %>); -@def $HOST_NAGIOS = ( $HOST_NAGIOS_V4 $HOST_NAGIOS_V6 ); - -@def $HOST_MUNIN_V4 = (<%= scope.function_filter_ipv4([rolehost['muninmaster']]).uniq.join(' ') %>); -@def $HOST_MUNIN_V6 = (<%= scope.function_filter_ipv6([rolehost['muninmaster']]).uniq.join(' ') %>); -@def $HOST_MUNIN = ( $HOST_MUNIN_V4 $HOST_MUNIN_V6 ); - -@def $HOST_DB_V4 = (<%= scope.function_filter_ipv4([rolehost['dbmaster']]).uniq.join(' ') %>); -@def $HOST_DB_V6 = (<%= scope.function_filter_ipv6([rolehost['dbmaster']]).uniq.join(' ') %>); -@def $HOST_DB = ( $HOST_DB_V4 $HOST_DB_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 ); - -@def $HOST_STATICMASTER_V4 = (<%= scope.function_filter_ipv4([rolehost['static_master']]).uniq.join(' ') %>); -@def $HOST_STATICMASTER_V6 = (<%= scope.function_filter_ipv6([rolehost['static_master']]).uniq.join(' ') %>); -@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_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_DEBIAN_V4 = (<%= scope.function_filter_ipv4([dbs]).uniq.join(' ') %>); -@def $HOST_DEBIAN_V6 = (<%= scope.function_filter_ipv6([dbs]).uniq.join(' ') %>); -@def $HOST_DEBIAN = ($HOST_DEBIAN_V4 $HOST_DEBIAN_V6); +<% +def getfastlyranges() + begin + data = YAML.safe_load(File.open("/srv/puppet.debian.org/puppet-facts/fastly_ranges.yaml").read) + return data['addresses'] + rescue + return [] + end +end +%> +@def $HOST_FASTLY = (<%= getfastlyranges().join(' ') %>); +@def $HOST_DEBIAN = (<%= dbs.uniq.join(' ') %>); -@def $sgran = (91.103.132.24/29 85.158.45.51/32); @def $weasel = (); @def $weasel = ($weasel 86.59.118.144/28); # debian@sil @def $weasel = ($weasel 86.59.21.32/29); # anguilla1 @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); # A1 Telekom +@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 @@ -99,58 +65,32 @@ @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 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 $luca = ($luca 2604:9a00:2010:a041:4:ffff:a2d2:c016); # jump snafu.emyr.net + @def $tfheen = (); -@def $tfheen = ($tfheen 195.159.200.122); # home -@def $tfheen = ($tfheen 77.40.254.120/29); # home +@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.225.74.107/32); # home +@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 = ($sgran $weasel $zobel $luca $tfheen $jcristau $master $people); - -@def $sgran6 = (2001:4b10:100b::/48); -@def $sgran6 = ($sgran6 2001:4b10:0000:810b::/64); -@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 $tfheen6 = (); -@def $tfheen6 = ($tfheen6 2001:840:f000:4007::/64); # Home, link -@def $tfheen6 = ($tfheen6 2001:840:4007::/48); # Home -@def $jcristau6 = (2a01:e35:2e14:a6b0::/64); # 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 = ($sgran6 $weasel6 $zobel6 $luca6 $tfheen6 $jcristau6 $master6); +@def $jcristau = ($jcristau 2a01:e35:2ff2:f730::/61); # home +@def $jcristau = ($jcristau 2001:bc8:3f1d::/48); # topinambour -@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_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 $master = (82.195.75.110 2001:41b8:202:deb:216:36ff:fe40:4001); # master.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 $BUILDD_SSH_ACCESS = (); -@def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 5.153.231.18); # 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 $FREEBSD_SSH_ACCESS = (); -@def $FREEBSD_SSH_ACCESS = ($FREEBSD_SSH_ACCESS $DSA_IPS $BUILDD_SSH_ACCESS); -@def $FREEBSD_SSH_ACCESS = ($FREEBSD_SSH_ACCESS $USER_christoph); # buildd admins +@def $DSA_IPS = ($weasel $zobel $luca $tfheen $jcristau $master $people $draghi);