X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fvsftpd%2Fmanifests%2Finit.pp;h=876e8654bbd94bfbf66a6ddf6952fa80f46d0b8c;hb=0c141a0dc77091e2a77473d82f70bb0cfd88c442;hp=7f0be8fc83455f9557916d254c3c18bb47959cd5;hpb=f0bd5528a15b587fa3ffbe566458b1f9325734e0;p=dsa-puppet.git

diff --git a/modules/vsftpd/manifests/init.pp b/modules/vsftpd/manifests/init.pp
index 7f0be8fc..876e8654 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']
 		]
 	}
-
 }