X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=f82aa46e2adfa568d9f0e55c9985cff43bbd8b6d;hb=5925b1e6166943117456ab1613fa5dc016c97840;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..f82aa46e2 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -7,8 +7,8 @@
 nodeinfo = scope.lookupvar('site::nodeinfo')
 out = []
 
-restricted_purposes = ['kvm host', 'central syslog server', 'puppet master', 'jumphost', 'buildd', 'static-mirror', 'anycast mirror']
-restrict_ssh = %w{tchaikovsky draghi adayevskaya}
+restricted_purposes = ['kvm host', 'ganeti/kvm host', 'central syslog server', 'puppet master', 'jumphost', 'buildd', 'static-mirror', 'anycast mirror']
+restrict_ssh = %w{tchaikovsky draghi adayevskaya static-master-grnet-01}
 
 if (nodeinfo['ldap'].has_key?('purpose')) then
 	nodeinfo['ldap']['purpose'].each do |purp|
@@ -29,7 +29,7 @@ should_restrict = restrict_ssh.include?(@hostname)
 end
 
 
-if restrict_ssh.include?(@hostname) then
+if should_restrict then
 	ssh4allowed << %w{$DSA_IPS    $HOST_NAGIOS_V4 $HOST_MUNIN_V4 $HOST_DB_V4}
 	ssh6allowed << %w{$DSA_V6_IPS $HOST_NAGIOS_V6 $HOST_MUNIN_V6 $HOST_DB_V6}
 
@@ -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 << "5.153.231.5" # adayevskaya
-		ssh6allowed << "2001:41c8:1000:21::21:5" # adayevskaya
-		#ssh4allowed << "$HOST_DNS_GEO_V4"
-		#ssh6allowed << "$HOST_DNS_GEO_V6"
-	end
 
 	if scope.function_has_role(['static_master']) then
 		ssh4allowed << '$HOST_STATIC_V4'
@@ -61,6 +55,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'
@@ -86,12 +81,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(' ')});"