From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 7 Sep 2019 16:18:52 +0000 (+0200)
Subject: no longer need to manually whitelist adayevskaya on denis
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=44ca89ff8860b3b34fa65541a99fcfe72c732f9e;p=mirror%2Fdsa-puppet.git

no longer need to manually whitelist adayevskaya on denis
---

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 779a8b513..a1754e8e5 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -44,12 +44,6 @@ if restrict_ssh.include?(@hostname) then
 		ssh4allowed << %w{$HOST_DEBIAN_V4}
 		ssh6allowed << %w{$HOST_DEBIAN_V6}
 	end
-	if scope.function_has_role(['dns_primary']) then
-		ssh4allowed << "82.195.75.75" # adayevskaya
-		ssh6allowed << "2001:41b8:202:deb:1b1b::75" # adayevskaya
-		#ssh4allowed << "$HOST_DNS_GEO_V4"
-		#ssh6allowed << "$HOST_DNS_GEO_V6"
-	end
 
 	if scope.function_has_role(['static_master']) then
 		ssh4allowed << '$HOST_STATIC_V4'