X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=87b7d00372ce3a0a0acd6d4425add604126e20f7;hb=0c6f34ec54ca6b4ae390547b7b423e23545511ca;hp=21d35483bd542e2cc9eea43c31279bd0ff669880;hpb=30f5ef8dda3079eb5a7073cdb0cdaab5c6b15964;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 21d35483b..87b7d0037 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -44,6 +44,10 @@ 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
@@ -90,8 +94,8 @@ end
 ssh4allowed.length == 0 and ssh4allowed << '0.0.0.0/0'
 ssh6allowed.length == 0 and ssh6allowed << '::/0'
 
-out << "@def $SSH_SOURCES    = (#{ssh4allowed.join(' ')});"
-out << "@def $SSH_V6_SOURCES = (#{ssh6allowed.join(' ')});"
+out << "@def $SSH_SOURCES    = ( $SSH_SOURCES    #{ssh4allowed.join(' ')});"
+out << "@def $SSH_V6_SOURCES = ( $SSH_V6_SOURCES #{ssh6allowed.join(' ')});"