ssh4allowed << %w{$HOST_DEBIAN_V4}
ssh6allowed << %w{$HOST_DEBIAN_V6}
end
+ if scope.function_has_role(['puppetmaster']) then
+ ssh4allowed << "5.153.231.5" # adayevskaya
+ ssh6allowed << "2001:41c8:1000:21::21:5" # adayevskaya
+ end
if scope.function_has_role(['dns_primary']) then
ssh4allowed << "5.153.231.5" # adayevskaya
ssh6allowed << "2001:41c8:1000:21::21:5" # adayevskaya
end
if scope.function_has_role(['debian_mirror']) or
scope.function_has_role(['security_mirror']) or
+ scope.function_has_role(['debug_mirror']) or
scope.function_has_role(['historical_mirror']) or
scope.function_has_role(['syncproxy']) then
ssh4allowed << '$HOST_MIRRORMASTER_V4'
ssh4allowed << '$HOST_PORTSMASTER_V4'
ssh6allowed << '$HOST_PORTSMASTER_V6'
end
+ if scope.function_has_role(['debug_mirror']) then
+ ssh4allowed << '$HOST_FTPMASTER_V4'
+ ssh6allowed << '$HOST_FTPMASTER_V6'
+ end
end
ssh4allowed.length == 0 and ssh4allowed << '0.0.0.0/0'
ssh6allowed.length == 0 and ssh6allowed << '::/0'
-out << "@def $SSH_SOURCES = (#{ssh4allowed.join(' ')});"
-out << "@def $SSH_V6_SOURCES = (#{ssh6allowed.join(' ')});"
+out << "@def $SSH_SOURCES = ( $SSH_SOURCES #{ssh4allowed.join(' ')});"
+out << "@def $SSH_V6_SOURCES = ( $SSH_V6_SOURCES #{ssh6allowed.join(' ')});"