X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian_org%2Fmanifests%2Fapt_restricted.pp;h=1bfe0e47623d9332b7196aa53e9ce94427016471;hb=d35901de191a3a9d7a4143cdec8263b6fc5e14b5;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..1bfe0e476 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::${::fqdn}":
+		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
+	}
 }