end
-if restrict_ssh.include?(@hostname) then
+if should_restrict 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}
ssh4allowed << %w{$HOST_DEBIAN_V4}
ssh6allowed << %w{$HOST_DEBIAN_V6}
end
- if classes.include?('roles::puppetmaster') then
- ssh4allowed << "82.195.75.75" # adayevskaya
- ssh6allowed << "2001:41b8:202:deb:1b1b::75" # adayevskaya
- end
- if scope.function_has_role(['dns_primary']) then
- ssh4allowed << "82.195.75.75" # adayevskaya
- ssh6allowed << "2001:41b8:202:deb:1b1b::75" # adayevskaya
- #ssh4allowed << "$HOST_DNS_GEO_V4"
- #ssh6allowed << "$HOST_DNS_GEO_V6"
- end
if scope.function_has_role(['static_master']) then
ssh4allowed << '$HOST_STATIC_V4'