X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=21d35483bd542e2cc9eea43c31279bd0ff669880;hb=63e0a5078377b8f3e6296e9181136fa5776e357e;hp=75f0d5c46dec3f278ba62cb758f917eaea4bbd08;hpb=006fb25822a165c786fc5452f1aa3e10d642e4aa;p=mirror%2Fdsa-puppet.git diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb index 75f0d5c46..21d35483b 100644 --- a/modules/ferm/templates/me.conf.erb +++ b/modules/ferm/templates/me.conf.erb @@ -7,7 +7,7 @@ nodeinfo = scope.lookupvar('site::nodeinfo') out = [] -restricted_purposes = ['kvm host', 'central syslog server', 'puppet master', 'jumphost'] +restricted_purposes = ['kvm host', 'central syslog server', 'puppet master', 'jumphost', 'buildd', 'static-mirror', 'anycast mirror'] restrict_ssh = %w{tchaikovsky draghi adayevskaya} if (nodeinfo['ldap'].has_key?('purpose')) then @@ -59,6 +59,33 @@ if restrict_ssh.include?(@hostname) then ssh4allowed << '$HOST_STATICMASTER_V4' ssh6allowed << '$HOST_STATICMASTER_V6' end + if scope.function_has_role(['debian_mirror']) or + scope.function_has_role(['security_mirror']) or + scope.function_has_role(['historical_mirror']) or + scope.function_has_role(['syncproxy']) then + ssh4allowed << '$HOST_MIRRORMASTER_V4' + ssh6allowed << '$HOST_MIRRORMASTER_V6' + end + if scope.function_has_role(['debian_mirror']) or + scope.function_has_role(['syncproxy']) then + ssh4allowed << '$HOST_SYNCPROXY_V4' + ssh6allowed << '$HOST_SYNCPROXY_V6' + end + if scope.function_has_role(['security_mirror']) or + scope.function_has_role(['syncproxy']) then + ssh4allowed << '$HOST_SECMASTER_V4' + ssh6allowed << '$HOST_SECMASTER_V6' + end + if scope.function_has_role(['historical_mirror']) then + ssh4allowed << '$HOST_ARCHIVEMASTER_V4' + ssh6allowed << '$HOST_ARCHIVEMASTER_V6' + end + if scope.function_has_role(['syncproxy']) then + ssh4allowed << '$HOST_FTPMASTER_V4' + ssh6allowed << '$HOST_FTPMASTER_V6' + ssh4allowed << '$HOST_PORTSMASTER_V4' + ssh6allowed << '$HOST_PORTSMASTER_V6' + end end ssh4allowed.length == 0 and ssh4allowed << '0.0.0.0/0' ssh6allowed.length == 0 and ssh6allowed << '::/0'