puppet 4 foo

[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 d892a6c..627e4bf 100644 (file)
--- 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', 'central syslog server', 'puppet master', 'jumphost']
-restrict_ssh = %w{lebrun beethoven tchaikovsky schroeder draghi adayevskaya}
+restrict_ssh = %w{tchaikovsky draghi adayevskaya}
 
 if (nodeinfo['ldap'].has_key?('purpose')) then
        nodeinfo['ldap']['purpose'].each do |purp|
@@ -21,7 +21,7 @@ end
 ssh4allowed = []
 ssh6allowed = []
 
-should_restrict = restrict_ssh.include?(hostname)
+should_restrict = restrict_ssh.include?(@hostname)
 %w{dns_primary dns_geo}.each do |role_restrict|
        if scope.function_has_role([role_restrict]) then
                should_restrict = true
@@ -29,21 +29,18 @@ should_restrict = restrict_ssh.include?(hostname)
 end
 
 
-if restrict_ssh.include?(hostname) then
+if restrict_ssh.include?(@hostname) 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}
 
-       if %w{lebrun schroeder}.include?(hostname) then
-               out << '@def $CARNET = ( 193.198.184.8/29 161.53.160.133 161.53.160.90 161.53.11.222 161.53.12.134 161.53.12.142 161.53.12.143 );'
-               ssh4allowed << '$CARNET'
-               ssh4allowed << '$BUILDD_SSH_ACCESS'
-       end
-       if %w{beethoven draghi}.include?(hostname) then
+       if %w{draghi}.include?(@hostname) then
                ssh4allowed << '$HOST_DEBIAN_V4'
                ssh6allowed << '$HOST_DEBIAN_V6'
        end
 
-       if %w{adayevskaya}.include?(hostname) then
+       if %w{adayevskaya}.include?(@hostname) then
+                out << '@def $MFL_LOCAL = ( 130.83.226.60 );' # Michael Fladerer
+                ssh4allowed << '$MFL_LOCAL'
                ssh4allowed << %w{$HOST_DEBIAN_V4}
                ssh6allowed << %w{$HOST_DEBIAN_V6}
        end