X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=d892a6c3d78515349ceaee30c735bfeed7fbf8b3;hb=a52f9845b97672888a2ceba7b0b11a593f0872f1;hp=9a7dd8b01edacfd9f9078050754fbbd6e0b03a1d;hpb=8467acd82ff1d92e9825361d717721bd3b38e26f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 9a7dd8b01..d892a6c3d 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -23,7 +23,9 @@ ssh6allowed = []
 
 should_restrict = restrict_ssh.include?(hostname)
 %w{dns_primary dns_geo}.each do |role_restrict|
-	if scope.function_has_role([role_restrict]) then should_restrict = true
+	if scope.function_has_role([role_restrict]) then
+		should_restrict = true
+	end
 end
 
 
@@ -48,8 +50,8 @@ if restrict_ssh.include?(hostname) then
 	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"
+		#ssh4allowed << "$HOST_DNS_GEO_V4"
+		#ssh6allowed << "$HOST_DNS_GEO_V6"
 	end
 
 	if scope.function_has_role(['static_master']) then