X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian_org%2Fmanifests%2Fapt_restricted.pp;h=e51776f7467a1e2ef911bba67aab325b27c297e1;hb=f109896bf9fdedba3e650a838c6f78f545082abf;hp=86d8561301ae8f09a083c02a88da6f490472bf10;hpb=2556124d53a7f3cf725a53b9dab821036e144b6b;p=mirror%2Fdsa-puppet.git diff --git a/modules/debian_org/manifests/apt_restricted.pp b/modules/debian_org/manifests/apt_restricted.pp index 86d856130..e51776f74 100644 --- a/modules/debian_org/manifests/apt_restricted.pp +++ b/modules/debian_org/manifests/apt_restricted.pp @@ -1,7 +1,16 @@ class debian_org::apt_restricted { - site::aptrepo { 'db.debian.org.restricted': - url => 'http://db.debian.org/debian-admin', - suite => '${::lsbdistcodename}-restricted', + base::aptrepo { 'db.debian.org.restricted': + url => 'https://db.debian.org/debian-admin', + suite => "${::lsbdistcodename}-restricted", components => 'non-free', } + + @@concat::fragment { "debian_org::apt_restricted::apache-acl::host::${name}": + tag => 'debian_org::apt_restricted::apache-acl', + target => '/etc/apache2/conf-available/puppet-restricted-acl.conf', + content => @("EOF"), + # ${::fqdn} + Require ip ${ $base::public_addresses.join(' ') } + | EOF + } }