X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fports_master.pp;h=f7fe2b80e5f699767930065e2d724df19af367f8;hb=69e48f13d90588d81f1513e0e0155008ae82b287;hp=d714d7cb9e7db7d1d281d9eaaf4b4543577fa2f7;hpb=7d6e269f856bec92bc3cc44ea3d386069a9a7bab;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/ports_master.pp b/modules/roles/manifests/ports_master.pp
index d714d7cb9..f7fe2b80e 100644
--- a/modules/roles/manifests/ports_master.pp
+++ b/modules/roles/manifests/ports_master.pp
@@ -11,7 +11,7 @@ class roles::ports_master {
 
 	include ferm::ftp_conntrack
 
-	vsftpd::site { 'ports-master':
+	vsftpd::site_systemd { 'ports-master':
 		banner         => 'ports-master.debian.org FTP server',
 		logfile        => '/var/log/ftp/vsftpd-ports-master.debian.org.log',
 		writable       => true,
@@ -19,15 +19,4 @@ class roles::ports_master {
 		chown_user     => mini-dak-unpriv,
 		root           => '/srv/ports-master.debian.org/ftp.upload',
 	}
-
-	if $bind6 {
-		vsftpd::site { 'ports-master-v6':
-			banner         => 'ports-master.debian.org FTP server',
-			logfile        => '/var/log/ftp/vsftpd-ports-master.debian.org.log',
-			writable       => true,
-			writable_other => true,
-			chown_user     => mini-dak-unpriv,
-			root           => '/srv/ports-master.debian.org/ftp.upload',
-		}
-	}
 }