X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fvsftpd%2Fmanifests%2Fsite.pp;h=352ca688cc506dc367c5a4e8e1ef8b83c3b5fb73;hb=825e27050780ecccd54fb81d9d8f0ce7a3395caf;hp=98cca97764bd1ac5b11d2316783df6324fb943ad;hpb=5979bb4b6bfcaa4ba61723b82a38f5ccfd4b4fb7;p=mirror%2Fdsa-puppet.git

diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp
index 98cca9776..352ca688c 100644
--- a/modules/vsftpd/manifests/site.pp
+++ b/modules/vsftpd/manifests/site.pp
@@ -1,35 +1,83 @@
 define vsftpd::site (
 	$root,
-	$bind='',
+	$binds=['[::]'],
 	$chown_user='',
 	$writable=false,
 	$writable_other=false,
+	$readable=true,
+	$listable=true,
 	$banner="${name} FTP Server",
 	$max_clients=100,
 	$logfile="/var/log/ftp/vsftpd-${name}.debian.org.log",
-	$ensure=present
-){
-
+	$ensure=present,
+) {
 	include vsftpd
+	include ferm::ftp_conntrack
 
 	case $ensure {
 		present,absent: {}
 		default: { fail ( "Invald ensure `$ensure' for $name" ) }
 	}
 
+	$ensure_service = $ensure ? {
+		present => running,
+		absent  => stopped,
+	}
+
+	$ensure_enable = $ensure ? {
+		present => true,
+		absent  => false,
+	}
+
 	$ftpsite = $name
 
 	$fname = "/etc/vsftpd-${name}.conf"
 
 	file { $fname:
 		ensure  => $ensure,
-		content => template('vsftpd/vsftpd.conf.erb')
+		content => template('vsftpd/vsftpd.conf.erb'),
+		owner   => 'root',
+		group   => 'root',
+		mode    => '0444',
 	}
 
 	file { "/etc/logrotate.d/vsftpd-${name}":
 		ensure => absent
 	}
 
+	file { "/etc/systemd/system/vsftpd-${name}@.service":
+		ensure  => $ensure,
+		content => template('vsftpd/systemd-vsftpd.service.erb'),
+		owner   => 'root',
+		group   => 'root',
+		mode    => '0444',
+		require => File[$fname],
+		notify  => Exec['systemctl daemon-reload'],
+	}
+
+	file { "/etc/systemd/system/vsftpd-${name}.socket":
+		ensure  => $ensure,
+		content => template('vsftpd/systemd-vsftpd.socket.erb'),
+		owner   => 'root',
+		group   => 'root',
+		mode    => '0444',
+		notify  => [
+			Exec['systemctl daemon-reload'],
+			Service["vsftpd-${name}.socket"],
+		],
+	}
+
+	service { "vsftpd-${name}.socket":
+		ensure   => $ensure_service,
+		enable   => $ensure_enable,
+		require  => [
+			Exec['systemctl daemon-reload'],
+			File["/etc/systemd/system/vsftpd-${name}@.service"],
+			File["/etc/systemd/system/vsftpd-${name}.socket"],
+		],
+		provider => systemd,
+	}
+
 	munin::check { "vsftpd-${name}":
 		ensure => $ensure,
 		script => 'vsftpd'
@@ -38,19 +86,4 @@ define vsftpd::site (
 		ensure  => $ensure,
 		content => template('vsftpd/munin.erb')
 	}
-
-	# We don't need a firewall rule because it's added in vsftp.pp
-	xinetd::service { "vsftpd-${name}":
-		ensure      => $ensure,
-		bind        => $bind,
-		id          => "${name}-ftp",
-		server      => '/usr/sbin/vsftpd',
-		service     => 'ftp',
-		server_args => $fname,
-		ferm        => false,
-		instances   => $max_clients,
-		require     => File[$fname]
-	}
-
-	Service['vsftpd']->Service['xinetd']
 }