puppetmaster -> wheezy, Pt I

[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 c7581ac5541a7639ca3d98ba8605bc6e80bbde4e..ef88d6b1bcd1a547bda59f9d92db72a789cafc51 100644 (file)
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -189,7 +189,8 @@
 @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 $DSA_IPS = ($sgran $weasel $zobel $luca $paravoid $tfheen);
+@def $master   = (82.195.75.110); # master.debian.org
+@def $DSA_IPS = ($sgran $weasel $zobel $luca $paravoid $tfheen $master);
 
 @def $sgran6     = (2001:4b10:100b::/48);
 @def $sgran6     = ($sgran6 2001:4b10:0000:810b::/64);
@@ -208,11 +209,12 @@
 @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 $DSA_V6_IPS = ($sgran6 $weasel6 $zobel6 $luca6 $paravoid6 $tfheen6);
+@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 $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_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