X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=73970da0ab6e5a1945111e072aff0d8ae48d3b13;hb=d0c098685b92334a611a0c596a35f538b95ead47;hp=f82aa46e2adfa568d9f0e55c9985cff43bbd8b6d;hpb=5925b1e6166943117456ab1613fa5dc016c97840;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index f82aa46e2..73970da0a 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -4,11 +4,11 @@
 ##
 
 <%=
-nodeinfo = scope.lookupvar('site::nodeinfo')
+nodeinfo = scope.lookupvar('deprecated::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 static-master-grnet-01}
+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|
@@ -45,14 +45,6 @@ if should_restrict 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