Move all roles from local.yaml to hiera

[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 73c0809ee51d1935f3c24c2bbe46f72107977b2e..7e84414b06d9569c0d64007abd60166bcba13f47 100644 (file)
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -5,11 +5,11 @@
 
 <%=
 nodeinfo = scope.lookupvar('site::nodeinfo')
-
+has_role = scope.function_has_role
 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,15 +35,20 @@ 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_DEBIAN_V4}
+               ssh6allowed << %w{$HOST_DEBIAN_V6}
+       end
+       if %w{denis}.include?(hostname) then
+               ssh4allowed << "5.153.231.5" # adayevskaya
+               ssh6allowed << "2001:41c8:1000:21::21:5" # adayevskaya
        end
 
-       if nodeinfo['static_master'] then
+       if has_role('static_master') then
                ssh4allowed << '$HOST_STATIC_V4'
                ssh6allowed << '$HOST_STATIC_V6'
-       elsif nodeinfo['static_source'] or nodeinfo['static_mirror'] then
+       elsif has_role('static_source') or has_role('static_mirror') then
                ssh4allowed << '$HOST_STATICMASTER_V4'
                ssh6allowed << '$HOST_STATICMASTER_V6'
        end