projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove exploratory code for now
[mirror/dsa-puppet.git]
/
modules
/
ferm
/
templates
/
defs.conf.erb
diff --git
a/modules/ferm/templates/defs.conf.erb
b/modules/ferm/templates/defs.conf.erb
index
bd1d41d
..
00aebf2
100644
(file)
--- a/
modules/ferm/templates/defs.conf.erb
+++ b/
modules/ferm/templates/defs.conf.erb
@@
-87,10
+87,11
@@
@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_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_EASYDNS_V4 = (64.68.200.91
205.210.42.80
);
@def $HOST_RCODE0_V4 = (83.136.34.0/27);
@def $HOST_RCODE0_V6 = (2A02:850:8::/47);
@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()
<%
def getfastlyranges()
@@
-109,7
+110,6
@@
end
@def $HOST_DEBIAN = ($HOST_DEBIAN_V4 $HOST_DEBIAN_V6);
@def $HOST_DEBIAN = ($HOST_DEBIAN_V4 $HOST_DEBIAN_V6);
-@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 = ();
@def $weasel = ($weasel 86.59.118.144/28); # debian@sil
@def $weasel = ($weasel 86.59.21.32/29); # anguilla1
@@
-132,21
+132,16
@@
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 $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 $tfheen = ();
@def $tfheen = ($tfheen 178.255.151.162); # vuizook
+@def $tfheen = ($tfheen 51.174.0.0/15); # Altibox
@def $jcristau = ();
@def $jcristau = ();
-@def $jcristau = ($jcristau 82.2
25.74.107
/32); # home
+@def $jcristau = ($jcristau 82.2
55.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 $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 $DSA_IPS = ($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 $weasel6 = ();
@def $weasel6 = ($weasel6 2001:826:408::/48); # unisbg
@def $weasel6 = ($weasel6 2001:858:10f::/48); # anguilla
@@
-159,12
+154,15
@@
end
@def $zobel6 = ($zobel6 2003:5b:203b::/48); # credativ DTAG v6
@def $zobel6 = ($zobel6 2a01:4f8:10a:1504::/64); # buri, dag, ....
@def $luca6 = ();
@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 = ();
@def $tfheen6 = ($tfheen6 2a02:20c8:2640::/64); # vuizook
-@def $jcristau6 = (2a01:e35:2e14:a6b0::/64); # home
+@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 $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 $DSA_V6_IPS = ($weasel6 $zobel6 $luca6 $tfheen6 $jcristau6 $master6);
@def $USER_christoph = ();
#@def $USER_christoph = ($USER_christoph 212.114.250.148/31);
@def $USER_christoph = ();
#@def $USER_christoph = ($USER_christoph 212.114.250.148/31);