X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;fp=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=6bd95df6b13bd5003a085339050de27e3f69fc2d;hb=a4f1af760e5f48eace1070239af4c01b1676e0b1;hp=072c2c08a413eb4b28d05145011adeef84d72797;hpb=050a7a1b6b8de2ad9b3964f1a0b855e8ae3a660b;p=mirror%2Fdsa-puppet.git diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb index 072c2c08a..6bd95df6b 100644 --- a/modules/ferm/templates/me.conf.erb +++ b/modules/ferm/templates/me.conf.erb @@ -41,14 +41,6 @@ if should_restrict then ssh6allowed << %w{$HOST_DEBIAN_V6} 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' - ssh6allowed << '$HOST_MIRRORMASTER_V6' - end if scope.function_has_role(['debian_mirror']) or scope.function_has_role(['syncproxy']) then ssh4allowed << '$HOST_SYNCPROXY_V4'