Mask the vsftpd service as we are launching it from xinetd

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

diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp
index 46c805edb7121b35bd2a23f2286dc1bea821da6c..9cdacde0d049c69a597e4129186ebe71452ee0ce 100644 (file)
--- a/modules/vsftpd/manifests/site.pp
+++ b/modules/vsftpd/manifests/site.pp
@@ -29,6 +29,13 @@ define vsftpd::site (
                ensure => absent
        }
 
+       munin::check { "vsftpd-${name}":
+               script => 'vsftpd'
+       }
+       munin::conf { "vsftpd-${name}":
+               content => template('vsftpd/munin.erb')
+       }
+
        # We don't need a firewall rule because it's added in vsftp.pp
        xinetd::service { "vsftpd-${name}":
                bind        => $bind,
@@ -41,5 +48,12 @@ define vsftpd::site (
                require     => File[$fname]
        }
 
+       # 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'],
+       }
+
        Service['vsftpd']->Service['xinetd']
 }