From: Stephen Gran <steve@lobefin.net>
Date: Sat, 28 Apr 2012 14:43:50 +0000 (+0100)
Subject: correct some names
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=a8c4d2e729ba481ab77363b4e9d46aebf307883d;p=mirror%2Fdsa-puppet.git

correct some names

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/roles/manifests/backports_master.pp b/modules/roles/manifests/backports_master.pp
index 507d0ff2e..1e437250e 100644
--- a/modules/roles/manifests/backports_master.pp
+++ b/modules/roles/manifests/backports_master.pp
@@ -16,7 +16,7 @@ class roles::backports_master {
 	}
 
 	if $bind6 {
-		vsftpd::site { 'security-v6':
+		vsftpd::site { 'backports-v6':
 			source => 'puppet:///modules/roles/security_mirror/vsftpd.conf',
 			bind   => $bind6,
 		}
diff --git a/modules/roles/manifests/ftp.pp b/modules/roles/manifests/ftp.pp
index 634473cf8..441c72368 100644
--- a/modules/roles/manifests/ftp.pp
+++ b/modules/roles/manifests/ftp.pp
@@ -16,7 +16,7 @@ class roles::ftp {
 	}
 
 	if $bind6 {
-		vsftpd::site { 'security-v6':
+		vsftpd::site { 'ftp-v6':
 			source => 'puppet:///modules/roles/security_mirror/vsftpd.conf',
 			bind   => $bind6,
 		}
diff --git a/modules/roles/manifests/ftp_upload.pp b/modules/roles/manifests/ftp_upload.pp
index 8bdd26049..326ff5b3d 100644
--- a/modules/roles/manifests/ftp_upload.pp
+++ b/modules/roles/manifests/ftp_upload.pp
@@ -14,7 +14,7 @@ class roles::ftp_upload {
 	}
 
 	if $bind6 {
-		vsftpd::site { 'security-v6':
+		vsftpd::site { 'ftp-upload-v6':
 			source => 'puppet:///modules/roles/security_mirror/vsftpd.conf',
 			bind   => $bind6,
 		}