allow ssh to geo[123] from orff

[dsa-puppet.git] / modules / ferm / templates / me.conf.erb

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 0ff422b3772640ad94d0738719def20499574346..f1f9ad15e782de578000e793663dc4c3df3388ee 100644 (file)
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -20,12 +20,17 @@ if %w{lebrun schroeder}.include?(hostname) then
        out << '@def $KIBI = ( 88.164.242.219 );'
        ssh4allowed << '$CARNET'
        ssh4allowed << '$KIBI'
-       ssh4allowed << '82.195.75.84' # nott.ayous.org, HE (builddadm)
+       ssh4allowed << '70.103.162.29' # master
+       ssh4allowed << '82.195.75.84'  # nott.ayous.org, HE (builddadm)
 end
 if %w{bartok beethoven}.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
+end
 ssh4allowed.length == 0 and ssh4allowed << '0.0.0.0/0'
 ssh6allowed.length == 0 and ssh6allowed << '::/0'