X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fbackports_master.pp;h=98f927e864e89de27c9a86d27afe6a102266b99f;hb=7c585ebe7158441bac0b23c73b3727437d06e9a1;hp=68ac31404766e734a418107d7874d787cc62c790;hpb=ca0302fc180922a0843bd5f25fae104f14dff374;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/backports_master.pp b/modules/roles/manifests/backports_master.pp
index 68ac31404..98f927e86 100644
--- a/modules/roles/manifests/backports_master.pp
+++ b/modules/roles/manifests/backports_master.pp
@@ -2,26 +2,16 @@ class roles::backports_master {
 
 	include roles::backports_mirror
 
-	$bind = $::hostname ? {
-		default => '',
-	}
-
-	$bind6 = $::hostname ? {
-		default => '',
-	}
-
 	vsftpd::site { 'backports':
-		source  => 'puppet:///modules/roles/backports_master/vsftpd.conf',
-		logfile => '/var/log/ftp/vsftpd-backports-master.debian.org.log',
-		bind    => $bind,
+		banner     => 'backports-master.debian.org FTP server',
+		logfile    => '/var/log/ftp/vsftpd-backports-master.debian.org.log',
+		writable   => true,
+		chown_user => dak,
+		root       => '/srv/backports-upload',
 	}
 
-	if $bind6 {
-		vsftpd::site { 'backports-v6':
-			source  => 'puppet:///modules/roles/security_mirror/vsftpd.conf',
-			logfile => '/var/log/ftp/vsftpd-backports-master.debian.org.log',
-			bind    => $bind6,
-		}
+	rsync::site { 'backports_master':
+		source        => 'puppet:///modules/roles/backports_master/rsyncd.conf',
+		max_clients => 100,
 	}
-
 }