X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fsecurity_mirror.pp;h=a2d5aeef3d4e48c5ef18675c72eaed71f6b9a1dd;hb=1ab297e177f78afa9ae4ff44ba3110fbec30beee;hp=04a0d7faddf647019532d0919d770d246ead4125;hpb=5e199891f346b162798dc59c128a08d1ad0d7fbf;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp
index 04a0d7fad..a2d5aeef3 100644
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -1,4 +1,6 @@
 class roles::security_mirror {
+	include roles::archvsync_base
+
 	$rsync_bind = $::hostname ? {
 		mirror-anu => '150.203.164.61',
 		mirror-isc => '149.20.4.14',
@@ -20,7 +22,14 @@ class roles::security_mirror {
 		default => undef,
 	}
 
-	include apache2::cache
+	file { '/srv/mirrors/debian-security':
+		ensure => link,
+		target => '../ftp.root/debian-security',
+	}
+
+	include apache2::expires
+	include apache2::rewrite
+
 	apache2::site { '010-security.debian.org':
 		site   => 'security.debian.org',
 		content => template('roles/security_mirror/security.debian.org.erb')
@@ -51,7 +60,6 @@ class roles::security_mirror {
 		bind6       => $rsync_bind6,
 	}
 
-
 	$onion_v4_addr = $::hostname ? {
 		mirror-anu => '150.203.164.61',
 		mirror-isc => '149.20.4.14',