Do not mask vsftpd.service in each site

[dsa-puppet.git] / modules / vsftpd / manifests / init.pp

diff --git a/modules/vsftpd/manifests/init.pp b/modules/vsftpd/manifests/init.pp
index 531594fc4db09a94e7d10f3ea84d51b09698b528..876e8654bbd94bfbf66a6ddf6952fa80f46d0b8c 100644 (file)
--- a/modules/vsftpd/manifests/init.pp
+++ b/modules/vsftpd/manifests/init.pp
@@ -18,7 +18,17 @@ class vsftpd {
                notify  => Service['vsftpd']
        }
 
-       munin::check { 'vsftpd': }
+       # Mask the vsftpd service as we are using xinetd
+       file { '/etc/systemd/system/vsftpd.service':
+               ensure => 'link',
+               target => '/dev/null',
+               notify => Exec['systemctl daemon-reload'],
+       }
+
+
+       munin::check { 'vsftpd':
+               ensure => absent
+       }
        munin::check { 'ps_vsftpd':
                script => 'ps_'
        }
@@ -37,8 +47,7 @@ class vsftpd {
                source  => 'puppet:///modules/vsftpd/logrotate.conf',
                require => [
                        Package['vsftpd'],
-                       Package['debian-org']
+                       Package['debian.org']
                ]
        }
-
 }