allnodeinfo = scope.lookupvar('deprecated::allnodeinfo')
roles = scope.lookupvar('deprecated::roles')
- %w{mailrelay nagiosmaster muninmaster postgres_backup_server syncproxy security_master ftp_master historical_master ports_master mirrormaster}.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')
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']]).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_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_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_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 2603:400a:ffff:bb8::801f:40 2001:4f8:1:c::16 2607:f8f0:614:1::1274:40);
-
<%
def getfastlyranges()
@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 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
@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 2604:9a00:2010:a041:4:ffff:a2d2:c016); # jump snafu.emyr.net
+
@def $tfheen = ();
@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.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 = ($weasel $zobel $luca $tfheen $jcristau $master $people);
-
-@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 $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 $tfheen6 = ($tfheen6 2a01:798::/29); # Altibox
-@def $jcristau6 = ();
-@def $jcristau6 = ($jcristau6 2a01:e35:2ff2:f730::/61); # 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 = ($weasel6 $zobel6 $luca6 $tfheen6 $jcristau6 $master6);
-
-@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 $BUILDD_SSH_ACCESS = ();
-@def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 209.87.16.60); # 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 $jcristau = ($jcristau 2a01:e35:2ff2:f730::/61); # home
+@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 = (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);
projects / mirror / dsa-puppet.git / blobdiff