X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fports_master.pp;h=c0f71e686f0b0ed45213bed19eff70990eaafb41;hb=d0f5d088b88902979760c97ab31fd8cba677296b;hp=f7fe2b80e5f699767930065e2d724df19af367f8;hpb=5a376dd9e2986cd0b8c5c481f4c2e276b521798f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/ports_master.pp b/modules/roles/manifests/ports_master.pp
index f7fe2b80e..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,9 +9,7 @@ class roles::ports_master {
 		key => true,
 	}
 
-	include ferm::ftp_conntrack
-
-	vsftpd::site_systemd { 'ports-master':
+	vsftpd::site { 'ports-master':
 		banner         => 'ports-master.debian.org FTP server',
 		logfile        => '/var/log/ftp/vsftpd-ports-master.debian.org.log',
 		writable       => true,