Do not mask vsftpd.service in each site

diff --git a/modules/vsftpd/manifests/init.pp b/modules/vsftpd/manifests/init.pp
index 7f0be8fc83455f9557916d254c3c18bb47959cd5..876e8654bbd94bfbf66a6ddf6952fa80f46d0b8c 100644 (file)
--- 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 9cdacde0d049c69a597e4129186ebe71452ee0ce..f8a71a0fb52d9aa297949593bf0df5af0efb635a 100644 (file)
--- 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']
 }