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

diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp
index 9b85cb5f6..054153332 100644
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -1,10 +1,20 @@
 class roles::security_mirror {
+	$rsync_bind = $::hostname ? {
+		mirror-isc => '149.20.20.19',
+		default    => '',
+	}
+	$rsync_bind6 = $::hostname ? {
+		mirror-isc => '2001:4f8:8:36::1deb:19',
+		default    => '',
+	}
 
+	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',
@@ -15,5 +25,7 @@ class roles::security_mirror {
 	rsync::site { 'security':
 		source      => 'puppet:///modules/roles/security_mirror/rsyncd.conf',
 		max_clients => 100,
+		bind        => $rsync_bind,
+		bind6       => $rsync_bind6,
 	}
 }