X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fsecurity_mirror.pp;h=603c3c7907da2022ecd1a6d232201092c12633b3;hb=2342f47256402a4e54d83cd32ce14302bab00c94;hp=3e818074b8a3dfe40b24e1cf7a00e44b16a01ca3;hpb=d6d82456f161ec0816d971dd5f6722c1b12fb7e9;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp
index 3e818074b..603c3c790 100644
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -37,13 +37,12 @@ class roles::security_mirror {
 	}
 
 	if has_role('security_mirror_no_ftp') {
-		vsftpd::site_systemd { 'security':
+		vsftpd::site { 'security':
 			ensure => absent,
 			root   => '/nonexistent',
 		}
 	} else {
-		include ferm::ftp_conntrack
-		vsftpd::site_systemd { 'security':
+		vsftpd::site { 'security':
 			banner       => 'security.debian.org FTP server (vsftpd)',
 			logfile      => '/var/log/ftp/vsftpd-security.debian.org.log',
 			max_clients  => 200,
@@ -52,7 +51,7 @@ class roles::security_mirror {
 		}
 	}
 
-	rsync::site_systemd { 'security':
+	rsync::site { 'security':
 		source      => 'puppet:///modules/roles/security_mirror/rsyncd.conf',
 		max_clients => 100,
 		binds       => $binds,