X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=a817428fdcffb325e023a5659fc8814fa7bb69f2;hb=0487f3da2230709f8381b1160b6c7e06a88b2887;hp=0ff422b3772640ad94d0738719def20499574346;hpb=eb79bc2cb169a244edbc5fcc7d0ecba49339346c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 0ff422b37..a817428fd 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -6,7 +6,7 @@
 <%=
 out = []
 
-restrict_ssh = %w{lebrun logtest01 geo1 geo2 geo3 bartok beethoven tchaikovsky schroeder heininen handel}
+restrict_ssh = %w{lebrun logtest01 geo1 geo2 geo3 bartok beethoven tchaikovsky schroeder heininen handel lotti}
 
 ssh4allowed = []
 ssh6allowed = []
@@ -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'