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

* waldi/vsftpd-systemd-upload:
  Use vsftpd via systemd on security_master
  Use vsftpd via systemd on ftp_upload
  Make sure xinetd is restarted on service removal

diff --git a/modules/roles/manifests/ftp_upload.pp b/modules/roles/manifests/ftp_upload.pp
index 249d49e..7b80fb8 100644 (file)
--- a/modules/roles/manifests/ftp_upload.pp
+++ b/modules/roles/manifests/ftp_upload.pp
@@ -2,7 +2,7 @@ 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,

diff --git a/modules/roles/manifests/security_master.pp b/modules/roles/manifests/security_master.pp
index 35fb510..a31db9f 100644 (file)
--- a/modules/roles/manifests/security_master.pp
+++ b/modules/roles/manifests/security_master.pp
@@ -5,7 +5,7 @@ class roles::security_master {
                tlsaport => [443, 1873],
        }
 
-       vsftpd::site { 'security':
+       vsftpd::site_systemd { 'security':
                banner     => 'security-master.debian.org FTP server (vsftpd)',
                logfile    => '/var/log/ftp/vsftpd-security-master.debian.org.log',
                writable   => true,

diff --git a/modules/xinetd/manifests/service.pp b/modules/xinetd/manifests/service.pp
index 1aee3b9..9924761 100644 (file)
--- a/modules/xinetd/manifests/service.pp
+++ b/modules/xinetd/manifests/service.pp
@@ -19,22 +19,13 @@ define xinetd::service (
        $ensure=present,
        $ferm=true
 ) {
-       case $ensure {
-               present,file: {
-                       include xinetd
-                       file { "/etc/xinetd.d/${name}":
-                               ensure  => $ensure,
-                               content => template('xinetd/service.erb'),
-                               notify  => Service['xinetd'],
-                               require => Package['xinetd'],
-                       }
-               }
-               absent: {
-                       file { "/etc/xinetd.d/${name}":
-                               ensure  => $ensure,
-                       }
-               }
-               default: { fail("Invalid ensure for '$name'") }
+       include xinetd
+
+       file { "/etc/xinetd.d/${name}":
+               ensure  => $ensure,
+               content => template('xinetd/service.erb'),
+               notify  => Service['xinetd'],
+               require => Package['xinetd'],
        }
 
        if $ferm {