X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fdefs.conf.erb;h=5f6a1413fe16f00325f610549762dbe38b41ff5f;hb=a39a00241c07209c62054237980142c1269237cb;hp=bc603b7e214ac8ed6b9ba14ba8c31f072dd7369c;hpb=8467acd82ff1d92e9825361d717721bd3b38e26f;p=dsa-puppet.git

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index bc603b7e..5f6a1413 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_secondary}.each do |role|
+  %w{mailrelay nagiosmaster extranrpeclient muninmaster dbmaster static_mirror static_source static_master dns_geo}.each do |role|
     rolehost[role] = []
     roles[role].each do |node|
         rolehost[role] << allnodeinfo[node]['ipHostNumber']
@@ -61,10 +61,11 @@
 @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_SECONDARY_V4 = (<%= scope.function_filter_ipv4([rolehost['dns_secondary']]).uniq.join(' ') %>);
-@def $HOST_DNS_SECONDARY_V6 = (<%= scope.function_filter_ipv6([rolehost['dns_secondary']]).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_DEBIAN_V4 = (<%= scope.function_filter_ipv4([dbs]).uniq.join(' ') %>);
 @def $HOST_DEBIAN_V6 = (<%= scope.function_filter_ipv6([dbs]).uniq.join(' ') %>);
@@ -93,8 +94,11 @@
 @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.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);
@@ -113,8 +117,9 @@
 @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);
@@ -130,7 +135,6 @@
 @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