Add /srv/security.upload.d.o on suchon

[mirror/dsa-puppet.git] / modules / roles / manifests / security_mirror.pp

diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp
index 3e81807..603c3c7 100644 (file)
--- 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,