From: Bastian Blank <bastian.blank@credativ.de>
Date: Tue, 11 Apr 2017 12:40:55 +0000 (+0200)
Subject: Rename vsftpd::site_systemd to vsftpd::site
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=d0f5d088b88902979760c97ab31fd8cba677296b;hp=46efb1d7284108553bc312019338f574a940030e;p=mirror%2Fdsa-puppet.git

Rename vsftpd::site_systemd to vsftpd::site
---

diff --git a/modules/roles/manifests/ftp.pp b/modules/roles/manifests/ftp.pp
index 9c6e802d3..452c4597c 100644
--- a/modules/roles/manifests/ftp.pp
+++ b/modules/roles/manifests/ftp.pp
@@ -6,7 +6,7 @@ class roles::ftp {
 		default => [ '[::]' ],
 	}
 
-	vsftpd::site_systemd { 'ftp':
+	vsftpd::site { 'ftp':
 		banner       => 'ftp.debian.org FTP server',
 		logfile      => '/var/log/ftp/vsftpd-ftp.debian.org.log',
 		binds        => $binds,
diff --git a/modules/roles/manifests/ftp_upload.pp b/modules/roles/manifests/ftp_upload.pp
index c3f5cbc11..39e40d7c0 100644
--- a/modules/roles/manifests/ftp_upload.pp
+++ b/modules/roles/manifests/ftp_upload.pp
@@ -1,5 +1,5 @@
 class roles::ftp_upload {
-	vsftpd::site_systemd { 'ftp-upload':
+	vsftpd::site { 'ftp-upload':
 		banner     => 'ftp.upload.debian.org FTP server',
 		logfile    => '/var/log/ftp/vsftpd-ftp.upload.debian.org.log',
 		writable   => true,
diff --git a/modules/roles/manifests/ports_master.pp b/modules/roles/manifests/ports_master.pp
index 15fd5e4c0..c0f71e686 100644
--- a/modules/roles/manifests/ports_master.pp
+++ b/modules/roles/manifests/ports_master.pp
@@ -9,7 +9,7 @@ class roles::ports_master {
 		key => true,
 	}
 
-	vsftpd::site_systemd { 'ports-master':
+	vsftpd::site { 'ports-master':
 		banner         => 'ports-master.debian.org FTP server',
 		logfile        => '/var/log/ftp/vsftpd-ports-master.debian.org.log',
 		writable       => true,
diff --git a/modules/roles/manifests/security_master.pp b/modules/roles/manifests/security_master.pp
index 6349f3f86..aa92103c6 100644
--- a/modules/roles/manifests/security_master.pp
+++ b/modules/roles/manifests/security_master.pp
@@ -5,7 +5,7 @@ class roles::security_master {
 		tlsaport => [443, 1873],
 	}
 
-	vsftpd::site_systemd { 'security':
+	vsftpd::site { 'security':
 		banner     => 'security-master.debian.org FTP server (vsftpd)',
 		logfile    => '/var/log/ftp/vsftpd-security-master.debian.org.log',
 		writable   => true,
diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp
index 1a8f5a219..603c3c790 100644
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -37,12 +37,12 @@ class roles::security_mirror {
 	}
 
 	if has_role('security_mirror_no_ftp') {
-		vsftpd::site_systemd { 'security':
+		vsftpd::site { 'security':
 			ensure => absent,
 			root   => '/nonexistent',
 		}
 	} else {
-		vsftpd::site_systemd { 'security':
+		vsftpd::site { 'security':
 			banner       => 'security.debian.org FTP server (vsftpd)',
 			logfile      => '/var/log/ftp/vsftpd-security.debian.org.log',
 			max_clients  => 200,
diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp
new file mode 100644
index 000000000..543332515
--- /dev/null
+++ b/modules/vsftpd/manifests/site.pp
@@ -0,0 +1,87 @@
+define vsftpd::site (
+	$root,
+	$binds=['[::]'],
+	$chown_user='',
+	$writable=false,
+	$writable_other=false,
+	$banner="${name} FTP Server",
+	$max_clients=100,
+	$logfile="/var/log/ftp/vsftpd-${name}.debian.org.log",
+	$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'),
+		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'
+	}
+	munin::conf { "vsftpd-${name}":
+		ensure  => $ensure,
+		content => template('vsftpd/munin.erb')
+	}
+}
diff --git a/modules/vsftpd/manifests/site_systemd.pp b/modules/vsftpd/manifests/site_systemd.pp
deleted file mode 100644
index 27a75be2d..000000000
--- a/modules/vsftpd/manifests/site_systemd.pp
+++ /dev/null
@@ -1,87 +0,0 @@
-define vsftpd::site_systemd (
-	$root,
-	$binds=['[::]'],
-	$chown_user='',
-	$writable=false,
-	$writable_other=false,
-	$banner="${name} FTP Server",
-	$max_clients=100,
-	$logfile="/var/log/ftp/vsftpd-${name}.debian.org.log",
-	$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'),
-		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'
-	}
-	munin::conf { "vsftpd-${name}":
-		ensure  => $ensure,
-		content => template('vsftpd/munin.erb')
-	}
-}