X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fsecurity_mirror.pp;h=ac66599f852785705571e57d652e9c81e6b5fde8;hb=cdce3c38b881b97127970246371b344148a3d8bd;hp=9b85cb5f6c54d26f51ca7cd1e3140eb6b3e35916;hpb=650335318c9021ace96b0cb6d49a13c1a472271f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp
index 9b85cb5f6..ac66599f8 100644
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -1,10 +1,12 @@
 class roles::security_mirror {
 
+	include apache2::cache
 	apache2::site { '010-security.debian.org':
 		site   => 'security.debian.org',
-		source => 'puppet:///modules/roles/security_mirror/security.debian.org'
+		content => template('roles/security_mirror/security.debian.org.erb')
 	}
 
+	include ferm::ftp_conntrack
 	vsftpd::site { 'security':
 		banner       => 'security.debian.org FTP server (vsftpd)',
 		logfile      => '/var/log/ftp/vsftpd-security.debian.org.log',