add joerg ssh access to unger

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index 9816e89..5d7860a 100644 (file)
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -216,6 +216,12 @@
 @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
+@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 194.177.211.200); # grieg
@@ -224,3 +230,7 @@
 @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);

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 3de244e..86ee156 100644 (file)
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -33,9 +33,9 @@ if %w{beethoven draghi}.include?(hostname) then
        ssh4allowed << '$HOST_DEBIAN_V4'
        ssh6allowed << '$HOST_DEBIAN_V6'
 end
-if %w{geo1 geo2 geo3}.include?(hostname) then
-       ssh4allowed << '194.177.211.209' # orff - master
-       ssh6allowed << '2001:648:2ffc:deb:213:72ff:fe69:e188' # orff - master
+if %w{unger}.include?(hostname) then
+       ssh4allowed << '$UNGER_SSH_ACCESS'  # Ganneff
+       ssh6allowed << '$UNGER_SSH6_ACCESS' # Ganneff, but more address space
 end
 ssh4allowed.length == 0 and ssh4allowed << '0.0.0.0/0'
 ssh6allowed.length == 0 and ssh6allowed << '::/0'