From d0f5d088b88902979760c97ab31fd8cba677296b Mon Sep 17 00:00:00 2001
From: Bastian Blank <bastian.blank@credativ.de>
Date: Tue, 11 Apr 2017 14:40:55 +0200
Subject: [PATCH] Rename vsftpd::site_systemd to vsftpd::site

---
 modules/roles/manifests/ftp.pp                        | 2 +-
 modules/roles/manifests/ftp_upload.pp                 | 2 +-
 modules/roles/manifests/ports_master.pp               | 2 +-
 modules/roles/manifests/security_master.pp            | 2 +-
 modules/roles/manifests/security_mirror.pp            | 4 ++--
 modules/vsftpd/manifests/{site_systemd.pp => site.pp} | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename modules/vsftpd/manifests/{site_systemd.pp => site.pp} (98%)

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_systemd.pp b/modules/vsftpd/manifests/site.pp
similarity index 98%
rename from modules/vsftpd/manifests/site_systemd.pp
rename to modules/vsftpd/manifests/site.pp
index 27a75be2d..543332515 100644
--- a/modules/vsftpd/manifests/site_systemd.pp
+++ b/modules/vsftpd/manifests/site.pp
@@ -1,4 +1,4 @@
-define vsftpd::site_systemd (
+define vsftpd::site (
 	$root,
 	$binds=['[::]'],
 	$chown_user='',
-- 
2.20.1