From: Peter Palfrader Date: Wed, 10 Jun 2015 08:37:56 +0000 (+0200) Subject: Do not mask vsftpd.service in each site X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=0c141a0dc77091e2a77473d82f70bb0cfd88c442;p=mirror%2Fdsa-puppet.git Do not mask vsftpd.service in each site --- diff --git a/modules/vsftpd/manifests/init.pp b/modules/vsftpd/manifests/init.pp index 7f0be8fc8..876e8654b 100644 --- a/modules/vsftpd/manifests/init.pp +++ b/modules/vsftpd/manifests/init.pp @@ -18,6 +18,14 @@ class vsftpd { notify => Service['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 } @@ -42,5 +50,4 @@ class vsftpd { Package['debian.org'] ] } - } diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp index 9cdacde0d..f8a71a0fb 100644 --- a/modules/vsftpd/manifests/site.pp +++ b/modules/vsftpd/manifests/site.pp @@ -48,12 +48,5 @@ 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'] }