X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fdefs.conf.erb;h=aafed399a3f55bd617540308aad413c0302248ed;hb=13c2d77963ef63fcf80f1688d692c8aeb92dfe67;hp=d94c62f5368e39a094e6f458faeb9fe2fccc896a;hpb=adb56cc2c65d33cf3a1adb0464a91744728e41d7;p=dsa-puppet.git

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index d94c62f5..aafed399 100644
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -73,12 +73,12 @@
 @def $weasel  = ($weasel 86.59.118.144/28); # debian@sil
 @def $weasel  = ($weasel 86.59.21.32/29); # anguilla1
 @def $weasel  = ($weasel 86.59.30.32/28); # anguilla2
-@def $weasel  = ($weasel 141.201.27.0/24); # came
-@def $weasel  = ($weasel 141.201.123.0/24); # cosy
+@def $weasel  = ($weasel 141.201.0.0/16); # uni salzburg
 @def $weasel  = ($weasel 62.99.152.176/28); # campus sbg
 @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 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
@@ -128,13 +128,10 @@
 
 @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 $UNGER_SSH_ACCESS = ();
-@def $UNGER_SSH_ACCESS = ($UNGER_SSH_ACCESS $USER_joerg);
-@def $UNGER_SSH6_ACCESS = ();
-@def $UNGER_SSH6_ACCESS = ($UNGER_SSH6_ACCESS $USER_joerg6);