X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fftp_upload.pp;h=75bd56856ec6f25f6f928907d2f9f991e627ba9e;hb=4fbf65ed9df4af4b96dd2ef63bdef21f10f01a49;hp=56126068c0289b3cc55e6e5483b1a779591c5c97;hpb=963cd75a0593d779ff19090aab82ec22fbb6f971;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/ftp_upload.pp b/modules/roles/manifests/ftp_upload.pp
index 56126068c..75bd56856 100644
--- a/modules/roles/manifests/ftp_upload.pp
+++ b/modules/roles/manifests/ftp_upload.pp
@@ -1,22 +1,9 @@
 class roles::ftp_upload {
-
-	include ferm::ftp_conntrack
-
-	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',
-	}
-
-	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-unpriv,
-			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',
+  }
 }