X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fftp_upload.pp;h=7b80fb8af6aa4a303b77fc41b02fc76ad154ac11;hb=5024ebc9b2c219d411e8a1f50fd7767d8004cb6d;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..7b80fb8af 100644
--- a/modules/roles/manifests/ftp_upload.pp
+++ b/modules/roles/manifests/ftp_upload.pp
@@ -2,21 +2,11 @@ class roles::ftp_upload {
 
 	include ferm::ftp_conntrack
 
-	vsftpd::site { 'ftp-upload':
+	vsftpd::site_systemd { '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',
-		}
-	}
 }