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

diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp
index 5f59d26b1..9b85cb5f6 100644
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -2,27 +2,18 @@ class roles::security_mirror {
 
 	apache2::site { '010-security.debian.org':
 		site   => 'security.debian.org',
-		config => 'puppet:///modules/roles/security_mirror/security.debian.org'
-	}
-
-	$bind = $::hostname ? {
-		default => '',
-	}
-
-	$bind6 = $::hostname ? {
-		default => '',
+		source => 'puppet:///modules/roles/security_mirror/security.debian.org'
 	}
 
 	vsftpd::site { 'security':
-		source => 'puppet:///modules/roles/security_mirror/vsftpd.conf',
-		bind   => $bind,
+		banner       => 'security.debian.org FTP server (vsftpd)',
+		logfile      => '/var/log/ftp/vsftpd-security.debian.org.log',
+		max_clients  => 200,
+		root         => '/srv/ftp.root/',
 	}
 
-	if $bind6 {
-		vsftpd::site { 'security-v6':
-			source => 'puppet:///modules/roles/security_mirror/vsftpd.conf',
-			bind   => $bind6,
-		}
+	rsync::site { 'security':
+		source      => 'puppet:///modules/roles/security_mirror/rsyncd.conf',
+		max_clients => 100,
 	}
-
 }