X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fftp_upload.pp;h=39e40d7c0d98cf72864778b262a2b0dc4abc64a9;hb=fd8ca6e26ac1706c5eccde4789362206daa0ff4a;hp=8bdd2604908b48e81d5361d1a813c723dff80cc4;hpb=ce2faa5e2cedf0a43ecd8c01efc958fe8d2b363f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/ftp_upload.pp b/modules/roles/manifests/ftp_upload.pp
index 8bdd26049..39e40d7c0 100644
--- a/modules/roles/manifests/ftp_upload.pp
+++ b/modules/roles/manifests/ftp_upload.pp
@@ -1,22 +1,9 @@
 class roles::ftp_upload {
-
-	$bind = $::hostname ? {
-		default => '',
-	}
-
-	$bind6 = $::hostname ? {
-		default => '',
-	}
-
 	vsftpd::site { 'ftp-upload':
-		source => 'puppet:///modules/roles/ftp_upload/vsftpd.conf',
-		bind   => $bind,
-	}
-
-	if $bind6 {
-		vsftpd::site { 'security-v6':
-			source => 'puppet:///modules/roles/security_mirror/vsftpd.conf',
-			bind   => $bind6,
-		}
+		banner     => 'ftp.upload.debian.org FTP server',
+		logfile    => '/var/log/ftp/vsftpd-ftp.upload.debian.org.log',
+		writable   => true,
+		chown_user => dak-unpriv,
+		root       => '/srv/upload.debian.org/ftp',
 	}
 }