X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fbackports_master.pp;h=44c5d44962fdbca3f640ac148a0213a324d17db9;hb=2ddafbd75b7bde2fac3e5293b824c727c5b3105a;hp=f9443b0ee47533f95bbe0f1057bc50c754415936;hpb=3bdba330fd5120b6a8e2f624d5ba72d08ded558c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/backports_master.pp b/modules/roles/manifests/backports_master.pp
index f9443b0ee..44c5d4496 100644
--- a/modules/roles/manifests/backports_master.pp
+++ b/modules/roles/manifests/backports_master.pp
@@ -2,28 +2,11 @@ class roles::backports_master {
 
 	include roles::backports_mirror
 
-	$bind = $::hostname ? {
-		default => '',
-	}
-
-	$bind6 = $::hostname ? {
-		default => '',
-	}
-
-	$logfile = '/var/log/ftp/vsftpd-backports-master.debian.org.log'
-
 	vsftpd::site { 'backports':
-		content => template('roles/backports_master/vsftpd.conf.erb'),
-		logfile => $logfile,
-		bind    => $bind,
-	}
-
-	if $bind6 {
-		vsftpd::site { 'backports-v6':
-			content => template('roles/backports_mirror/vsftpd.conf.erb'),
-			logfile => $logfile,
-			bind    => $bind6,
-		}
+		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',
 	}
-
 }