Merge remote-tracking branch 'waldi/vsftpd-systemd-upload'

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

diff --git a/modules/roles/manifests/ftp_upload.pp b/modules/roles/manifests/ftp_upload.pp
index 5612606..7b80fb8 100644 (file)
--- a/modules/roles/manifests/ftp_upload.pp
+++ b/modules/roles/manifests/ftp_upload.pp
@@ -2,21 +2,11 @@ class roles::ftp_upload {
 
        include ferm::ftp_conntrack
 
-       vsftpd::site { 'ftp-upload':
+       vsftpd::site_systemd { 'ftp-upload':
                banner     => 'ftp.upload.debian.org FTP server',
                logfile    => '/var/log/ftp/vsftpd-ftp.upload.debian.org.log',
                writable   => true,
                chown_user => dak-unpriv,
                root       => '/srv/upload.debian.org/ftp',
        }
-
-       if $bind6 {
-               vsftpd::site { 'ftp-upload-v6':
-                       banner     => 'ftp.upload.debian.org FTP server',
-                       logfile    => '/var/log/ftp/vsftpd-ftp.upload.debian.org.log',
-                       writable   => true,
-                       chown_user => dak-unpriv,
-                       root       => '/srv/upload.debian.org/ftp',
-               }
-       }
 }