X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fftp_upload.pp;h=75bd56856ec6f25f6f928907d2f9f991e627ba9e;hb=f1c1f8989e7404dbb5139855407b647544179c14;hp=89fe6428d887fd416742e47e0677d96247cb4542;hpb=b0dd1aa9d67bc92d097c1ad23f42bbedd173b756;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/ftp_upload.pp b/modules/roles/manifests/ftp_upload.pp
index 89fe6428d..75bd56856 100644
--- a/modules/roles/manifests/ftp_upload.pp
+++ b/modules/roles/manifests/ftp_upload.pp
@@ -1,20 +1,9 @@
 class roles::ftp_upload {
-
-	vsftpd::site { 'ftp-upload':
-		banner     => 'ftp.upload.debian.org FTP server',
-		logfile    => '/var/log/ftp/vsftpd-ftp.upload.debian.org.log',
-		writable   => true,
-		chown_user => dak,
-		root       => '/srv/upload.debian.org/ftp',
-	}
-
-	if $bind6 {
-		vsftpd::site { 'ftp-upload-v6':
-			banner     => 'ftp.upload.debian.org FTP server',
-			logfile    => '/var/log/ftp/vsftpd-ftp.upload.debian.org.log',
-			writable   => true,
-			chown_user => dak,
-			root       => '/srv/upload.debian.org/ftp',
-		}
-	}
+  vsftpd::site { 'ftp-upload':
+    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',
+  }
 }