X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=c392a270bd786520de2e8699d33286319200c239;hb=44e62e7e78c90b21f9c273f4e6bc604e5604a640;hp=7ebd7e2c0a9c276863c88111b44da86243d93667;hpb=b0f7178bb636c0186e57c5a3070ed7dd23cac378;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 7ebd7e2c0..c392a270b 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -7,7 +7,7 @@
 nodeinfo = scope.lookupvar('site::nodeinfo')
 out = []
 
-restricted_purposes = ['kvm host', 'central syslog server', 'puppet master', 'jumphost', 'buildd']
+restricted_purposes = ['kvm host', 'central syslog server', 'puppet master', 'jumphost', 'buildd', 'static-mirror', 'anycast mirror']
 restrict_ssh = %w{tchaikovsky draghi adayevskaya}
 
 if (nodeinfo['ldap'].has_key?('purpose')) then
@@ -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
@@ -59,6 +63,33 @@ if restrict_ssh.include?(@hostname) then
 		ssh4allowed << '$HOST_STATICMASTER_V4'
 		ssh6allowed << '$HOST_STATICMASTER_V6'
 	end
+	if scope.function_has_role(['debian_mirror']) or
+	   scope.function_has_role(['security_mirror']) or
+	   scope.function_has_role(['historical_mirror']) or
+	   scope.function_has_role(['syncproxy']) then
+		ssh4allowed << '$HOST_MIRRORMASTER_V4'
+		ssh6allowed << '$HOST_MIRRORMASTER_V6'
+	end
+	if scope.function_has_role(['debian_mirror']) or
+	   scope.function_has_role(['syncproxy']) then
+		ssh4allowed << '$HOST_SYNCPROXY_V4'
+		ssh6allowed << '$HOST_SYNCPROXY_V6'
+	end
+	if scope.function_has_role(['security_mirror']) or
+	   scope.function_has_role(['syncproxy']) then
+		ssh4allowed << '$HOST_SECMASTER_V4'
+		ssh6allowed << '$HOST_SECMASTER_V6'
+	end
+	if scope.function_has_role(['historical_mirror']) then
+		ssh4allowed << '$HOST_ARCHIVEMASTER_V4'
+		ssh6allowed << '$HOST_ARCHIVEMASTER_V6'
+	end
+	if scope.function_has_role(['syncproxy']) then
+		ssh4allowed << '$HOST_FTPMASTER_V4'
+		ssh6allowed << '$HOST_FTPMASTER_V6'
+		ssh4allowed << '$HOST_PORTSMASTER_V4'
+		ssh6allowed << '$HOST_PORTSMASTER_V6'
+	end
 end
 ssh4allowed.length == 0 and ssh4allowed << '0.0.0.0/0'
 ssh6allowed.length == 0 and ssh6allowed << '::/0'