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
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 scope.function_has_role(['static_master']) then