X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fports_master.pp;h=c0f71e686f0b0ed45213bed19eff70990eaafb41;hb=71a60ee9dcabd1eee84c55092fac7826e4142459;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..c0f71e686 100644
--- a/modules/roles/manifests/ports_master.pp
+++ b/modules/roles/manifests/ports_master.pp
@@ -1,5 +1,5 @@
 class roles::ports_master {
-	rsync::site_systemd { 'ports-master':
+	rsync::site { 'ports-master':
 		source      => 'puppet:///modules/roles/ports_master/rsyncd.conf',
 		max_clients => 100,
 		sslname     => 'ports-master.debian.org',
@@ -9,8 +9,6 @@ class roles::ports_master {
 		key => true,
 	}
 
-	include ferm::ftp_conntrack
-
 	vsftpd::site { 'ports-master':
 		banner         => 'ports-master.debian.org FTP server',
 		logfile        => '/var/log/ftp/vsftpd-ports-master.debian.org.log',
@@ -19,15 +17,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',
-		}
-	}
 }