update firewalls regarding dns

[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 7e84414b06d9569c0d64007abd60166bcba13f47..c3df480b05ce1a616863533304ecc4cf0e67561d 100644 (file)
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -5,7 +5,6 @@
 
 <%=
 nodeinfo = scope.lookupvar('site::nodeinfo')
-has_role = scope.function_has_role
 out = []
 
 restricted_purposes = ['kvm host', 'central syslog server', 'puppet master', 'jumphost']
@@ -23,7 +22,7 @@ ssh4allowed = []
 ssh6allowed = []
 
 if restrict_ssh.include?(hostname) then
-       ssh4allowed  << %w{$DSA_IPS   $HOST_NAGIOS_V4 $HOST_MUNIN_V4 $HOST_DB_V4}
+       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
@@ -40,15 +39,18 @@ if restrict_ssh.include?(hostname) then
                ssh4allowed << %w{$HOST_DEBIAN_V4}
                ssh6allowed << %w{$HOST_DEBIAN_V6}
        end
-       if %w{denis}.include?(hostname) then
+       if scope.function_has_role(['dns_primary']) then
                ssh4allowed << "5.153.231.5" # adayevskaya
                ssh6allowed << "2001:41c8:1000:21::21:5" # adayevskaya
+               ssh4allowed << "$HOST_DNS_SECONDARY_V4"
+               ssh6allowed << "$HOST_DNS_SECONDARY_V6"
        end
 
-       if has_role('static_master') then
+       if scope.function_has_role(['static_master']) then
                ssh4allowed << '$HOST_STATIC_V4'
                ssh6allowed << '$HOST_STATIC_V6'
-       elsif has_role('static_source') or has_role('static_mirror') then
+       elsif scope.function_has_role(['static_source']) or
+             scope.function_has_role(['static_mirror']) then
                ssh4allowed << '$HOST_STATICMASTER_V4'
                ssh6allowed << '$HOST_STATICMASTER_V6'
        end