X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=be829182f8a14dac865beb054c7dc2a05cf61713;hb=f1965deb432304e45a773ad38b832ce8fd8a7f2b;hp=73c0809ee51d1935f3c24c2bbe46f72107977b2e;hpb=d5aa695b724a15c751b4347d6ed894c371fb01db;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 73c0809ee..be829182f 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -9,7 +9,7 @@ nodeinfo = scope.lookupvar('site::nodeinfo')
 out = []
 
 restricted_purposes = ['kvm host', 'central syslog server', 'puppet master', 'jumphost']
-restrict_ssh = %w{lebrun geo1 geo2 geo3 beethoven tchaikovsky schroeder draghi adayevskaya}
+restrict_ssh = %w{lebrun geo1 geo2 geo3 beethoven tchaikovsky schroeder draghi adayevskaya denis}
 
 if (nodeinfo['ldap'].has_key?('purpose')) then
 	nodeinfo['ldap']['purpose'].each do |purp|
@@ -35,9 +35,10 @@ if restrict_ssh.include?(hostname) then
 		ssh4allowed << '$HOST_DEBIAN_V4'
 		ssh6allowed << '$HOST_DEBIAN_V6'
 	end
-	if %w{unger}.include?(hostname) then
-		ssh4allowed << '$UNGER_SSH_ACCESS'  # Ganneff
-		ssh6allowed << '$UNGER_SSH6_ACCESS' # Ganneff, but more address space
+
+	if %w{adayevskaya}.include?(hostname) then
+		ssh4allowed << %w{$HOST_MAILRELAY_V4}
+		ssh6allowed << %w{$HOST_MAILRELAY_V6}
 	end
 
 	if nodeinfo['static_master'] then