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

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index a1754e8e5..d7360c573 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -8,7 +8,7 @@ nodeinfo = scope.lookupvar('site::nodeinfo')
 out = []
 
 restricted_purposes = ['kvm host', 'ganeti/kvm host', 'central syslog server', 'puppet master', 'jumphost', 'buildd', 'static-mirror', 'anycast mirror']
-restrict_ssh = %w{tchaikovsky draghi adayevskaya}
+restrict_ssh = %w{tchaikovsky draghi adayevskaya static-master-grnet-01 static-master-ubc-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}
 
@@ -45,14 +45,6 @@ if restrict_ssh.include?(@hostname) then
 		ssh6allowed << %w{$HOST_DEBIAN_V6}
 	end
 
-	if scope.function_has_role(['static_master']) then
-		ssh4allowed << '$HOST_STATIC_V4'
-		ssh6allowed << '$HOST_STATIC_V6'
-	elsif scope.function_has_role(['static_source']) or
-	      scope.function_has_role(['static_mirror']) 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(['debug_mirror']) or