X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=e1a58173891dd399e972ea87a471a7f0e7b3ba71;hb=c02f18b096dd06fa157608342d609f24434631db;hp=1bf1279ad3b9665854925e3368b12cb330493f20;hpb=ed86c64f1ea3a523b560eb698a66cb1969c84a0c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 1bf1279ad..e1a581738 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -29,7 +29,7 @@ should_restrict = restrict_ssh.include?(@hostname)
 end
 
 
-if restrict_ssh.include?(@hostname) then
+if should_restrict then
 	ssh4allowed << %w{$DSA_IPS    $HOST_NAGIOS_V4 $HOST_MUNIN_V4 $HOST_DB_V4}
 	ssh6allowed << %w{$DSA_V6_IPS $HOST_NAGIOS_V6 $HOST_MUNIN_V6 $HOST_DB_V6}
 
@@ -44,16 +44,6 @@ if restrict_ssh.include?(@hostname) then
 		ssh4allowed << %w{$HOST_DEBIAN_V4}
 		ssh6allowed << %w{$HOST_DEBIAN_V6}
 	end
-	if scope.function_has_role(['puppetmaster']) then
-		ssh4allowed << "5.153.231.5" # adayevskaya
-		ssh6allowed << "2001:41c8:1000:21::21:5" # adayevskaya
-	end
-	if scope.function_has_role(['dns_primary']) then
-		ssh4allowed << "5.153.231.5" # adayevskaya
-		ssh6allowed << "2001:41c8:1000:21::21:5" # adayevskaya
-		#ssh4allowed << "$HOST_DNS_GEO_V4"
-		#ssh6allowed << "$HOST_DNS_GEO_V6"
-	end
 
 	if scope.function_has_role(['static_master']) then
 		ssh4allowed << '$HOST_STATIC_V4'