X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fdefs.conf.erb;h=431b99701eafac77062929406e9160c32be78a2e;hb=cdf648b13dacc11edd25af11c93a67dbe7097743;hp=9b6bc26f5cd3cc79a8b1a39c577e401b5755688d;hpb=adf743f337b2a54c38e9dbe793c0276b8f5416ea;p=dsa-puppet.git diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb index 9b6bc26f..431b9970 100644 --- a/modules/ferm/templates/defs.conf.erb +++ b/modules/ferm/templates/defs.conf.erb @@ -21,17 +21,16 @@ <% rolehost={} - localinfo = scope.lookupvar('site::localinfo') allnodeinfo = scope.lookupvar('site::allnodeinfo') + roles = scope.lookupvar('site::roles') - %w{mailrelay nagiosmaster extranrpeclient muninmaster dbmaster static_mirror static_source static_master}.each do |role| + %w{mailrelay nagiosmaster extranrpeclient muninmaster dbmaster static_mirror static_source static_master dns_geo postgres_backup_server}.each do |role| rolehost[role] = [] - localinfo.keys.sort.each do |node| - if localinfo[node][role] + roles[role].each do |node| + next unless allnodeinfo.has_key?(node) and allnodeinfo[node].has_key?('ipHostNumber') rolehost[role] << allnodeinfo[node]['ipHostNumber'] - end end - rolehost[role].flatten! + rolehost[role].flatten!.sort.uniq end dbs = [] @@ -58,11 +57,22 @@ @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); @@ -78,7 +88,7 @@ @def $zobel = (); @def $zobel = ($zobel 87.139.82.80/32); # exit.credativ.com @def $zobel = ($zobel 87.193.134.192/27); # credativ qsc -@def $zobel = ($zobel 94.79.138.160/29) # credativ Unitiymedia +@def $zobel = ($zobel 94.79.138.160/29); # credativ Unitiymedia @def $zobel = ($zobel 78.47.2.104/29); # baldur, bragi, saga @def $zobel = ($zobel 92.198.42.24/29); # DG-i Office @def $zobel = ($zobel 93.94.128.0/21); # DG-i AS @@ -87,11 +97,13 @@ @def $luca = (64.71.152.109); @def $paravoid = (62.217.125.135); # scrooge.tty.gr @def $tfheen = (); -@def $tfheen = ($tfheen 194.31.39.0/26); # office network @def $tfheen = ($tfheen 195.159.200.122); # home @def $tfheen = ($tfheen 77.40.254.120/29); # home +@def $jcristau = (); +@def $jcristau = ($jcristau 82.225.74.107/32); # home +@def $jcristau = ($jcristau 109.190.188.123/32 109.190.188.138/32 109.190.107.82/32); # office @def $master = (82.195.75.110); # master.debian.org -@def $DSA_IPS = ($sgran $weasel $zobel $luca $paravoid $tfheen $master); +@def $DSA_IPS = ($sgran $weasel $zobel $luca $paravoid $tfheen $jcristau $master); @def $sgran6 = (2001:4b10:100b::/48); @def $sgran6 = ($sgran6 2001:4b10:0000:810b::/64); @@ -107,18 +119,15 @@ @def $luca6 = (); @def $paravoid6 = (2001:648:2ffc:113:dcdb:eeff:fe5c:182b); # scrooge.tty.gr @def $tfheen6 = (); -@def $tfheen6 = ($tfheen6 2a02:c0:1013:1::/64); # Office @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 $master6 = (2001:41b8:202:deb:216:36ff:fe40:4001); # master.debian.org -@def $DSA_V6_IPS = ($sgran6 $weasel6 $zobel6 $luca6 $paravoid6 $tfheen6 $master6); +@def $DSA_V6_IPS = ($sgran6 $weasel6 $zobel6 $luca6 $paravoid6 $tfheen6 $jcristau6 $master6); @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_aurel32 = (); -@def $USER_aurel32 = ($USER_aurel32 88.191.126.93); # hall.aurel32.net -@def $USER_aurel32 = ($USER_aurel32 82.232.2.251); # farad.aurel32.net @def $USER_joerg = (); @def $USER_joerg = ($USER_joerg 213.146.108.160/29); @def $USER_joerg = ($USER_joerg 46.4.205.32); @@ -127,11 +136,9 @@ @def $USER_joerg6 = ($USER_joerg6 2a01:4f8:131:1520::6667); @def $BUILDD_SSH_ACCESS = (); -@def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 194.177.211.200); # grieg @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 206.12.19.5); # ravel @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 $USER_aurel32); # buildd admins +@def $FREEBSD_SSH_ACCESS = ($FREEBSD_SSH_ACCESS $USER_christoph); # buildd admins