X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fvsftpd%2Fmanifests%2Fsite_systemd.pp;h=789c5665ee2293f2044f9b50608d6b9346300d8b;hb=9f88565cb9882258e5033b3c349a50f9732eecbd;hp=ced51d49febf1a8db196306ac60c39ab0e1f506e;hpb=cbbf3d951acc209b7db47940b2b49f205f3e5650;p=mirror%2Fdsa-puppet.git

diff --git a/modules/vsftpd/manifests/site_systemd.pp b/modules/vsftpd/manifests/site_systemd.pp
index ced51d49f..789c5665e 100644
--- a/modules/vsftpd/manifests/site_systemd.pp
+++ b/modules/vsftpd/manifests/site_systemd.pp
@@ -10,6 +10,7 @@ define vsftpd::site_systemd (
 	$ensure=present,
 ) {
 	include vsftpd
+	include ferm::ftp_conntrack
 
 	case $ensure {
 		present,absent: {}
@@ -26,6 +27,8 @@ define vsftpd::site_systemd (
 		absent  => false,
 	}
 
+	$ftpsite = $name
+
 	$fname = "/etc/vsftpd-${name}.conf"
 
 	file { $fname:
@@ -69,6 +72,7 @@ define vsftpd::site_systemd (
 			Exec['systemctl daemon-reload'],
 			File["/etc/systemd/system/vsftpd-${name}@.service"],
 			File["/etc/systemd/system/vsftpd-${name}.socket"],
+			Service['xinetd'],
 		],
 		provider => systemd,
 	}