Use vsftpd::site_systemd on ports_master

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