ssl slapd: load hbd backend module, disable db and backend specific config

[mirror/dsa-puppet.git] / modules / ferm / templates / me.conf.erb

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 87b7d00..1bf1279 100644 (file)
--- 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', 'static-mirror', 'anycast mirror']
+restricted_purposes = ['kvm host', 'ganeti/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
@@ -65,6 +65,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'
@@ -90,6 +91,10 @@ 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'