From: Paul Wise <pabs@debian.org>
Date: Wed, 10 Jun 2015 02:36:43 +0000 (+0800)
Subject: Mask the vsftpd service as we are launching it from xinetd
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=7ab0c30ced4a46e9f63333eb0043852fed517c1a

Mask the vsftpd service as we are launching it from xinetd
---

diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp
index f8a71a0f..9cdacde0 100644
--- a/modules/vsftpd/manifests/site.pp
+++ b/modules/vsftpd/manifests/site.pp
@@ -48,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']
 }