X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=1dfbe96a769bfeb382040b082425a38f2eab02d1;hb=115c498105ac5624f3655195927c09f02706f77e;hp=c392a270bd786520de2e8699d33286319200c239;hpb=5581d1ce1ee3ea09e6e7740f575cb19104e62c4f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index c392a270b..1dfbe96a7 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -65,6 +65,7 @@ if restrict_ssh.include?(@hostname) then
 	end
 	if scope.function_has_role(['debian_mirror']) or
 	   scope.function_has_role(['security_mirror']) or
+	   scope.function_has_role(['debug_mirror']) or
 	   scope.function_has_role(['historical_mirror']) or
 	   scope.function_has_role(['syncproxy']) then
 		ssh4allowed << '$HOST_MIRRORMASTER_V4'
@@ -90,12 +91,16 @@ if restrict_ssh.include?(@hostname) then
 		ssh4allowed << '$HOST_PORTSMASTER_V4'
 		ssh6allowed << '$HOST_PORTSMASTER_V6'
 	end
+	if scope.function_has_role(['debug_mirror']) then
+		ssh4allowed << '$HOST_FTPMASTER_V4'
+		ssh6allowed << '$HOST_FTPMASTER_V6'
+	end
 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(' ')});"