From: Stephen Gran <steve@lobefin.net>
Date: Mon, 23 Apr 2012 11:02:06 +0000 (+0100)
Subject: vsftpd should only be on master
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=99bb0049d87452ec9ff7a41974a402ae740153cb;p=mirror%2Fdsa-puppet.git

vsftpd should only be on master

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

diff --git a/modules/roles/files/backports_master/vsftpd.conf b/modules/roles/files/backports_master/vsftpd.conf
new file mode 100644
index 000000000..cbabef1c2
--- /dev/null
+++ b/modules/roles/files/backports_master/vsftpd.conf
@@ -0,0 +1,23 @@
+listen_ipv6=yes
+# listen=no means it'll listen on both ipv6 and ipv4 due to net.ipv6.bindv6only=0
+listen=no
+
+anonymous_enable=YES
+write_enable=YES
+anon_root=/srv/backports-upload
+anon_umask=027
+anon_upload_enable=YES
+chown_uploads=YES
+chown_username=dak
+
+xferlog_enable=YES
+xferlog_file=/var/log/ftp/vsftpd-backports-master.debian.org.log
+
+ftpd_banner=backports-master.debian.org FTP server
+secure_chroot_dir=/var/run/vsftpd
+pam_service_name=vsftpd
+setproctitle_enable=YES
+dirmessage_enable=YES
+ls_recurse_enable=NO
+connect_from_port_20=NO
+max_clients=100
diff --git a/modules/roles/files/backports_mirror/vsftpd.conf b/modules/roles/files/backports_mirror/vsftpd.conf
deleted file mode 100644
index cbabef1c2..000000000
--- a/modules/roles/files/backports_mirror/vsftpd.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-listen_ipv6=yes
-# listen=no means it'll listen on both ipv6 and ipv4 due to net.ipv6.bindv6only=0
-listen=no
-
-anonymous_enable=YES
-write_enable=YES
-anon_root=/srv/backports-upload
-anon_umask=027
-anon_upload_enable=YES
-chown_uploads=YES
-chown_username=dak
-
-xferlog_enable=YES
-xferlog_file=/var/log/ftp/vsftpd-backports-master.debian.org.log
-
-ftpd_banner=backports-master.debian.org FTP server
-secure_chroot_dir=/var/run/vsftpd
-pam_service_name=vsftpd
-setproctitle_enable=YES
-dirmessage_enable=YES
-ls_recurse_enable=NO
-connect_from_port_20=NO
-max_clients=100
diff --git a/modules/roles/manifests/backports_master.pp b/modules/roles/manifests/backports_master.pp
new file mode 100644
index 000000000..dcb2af472
--- /dev/null
+++ b/modules/roles/manifests/backports_master.pp
@@ -0,0 +1,8 @@
+class roles::backports_master {
+
+	include roles::backports_mirror
+
+	class { 'vsftpd::site':
+		source => 'puppet:///modules/roles/backports_master/vsftpd.conf'
+	}
+}
diff --git a/modules/roles/manifests/backports_mirror.pp b/modules/roles/manifests/backports_mirror.pp
index e7ccf58e3..2d794859a 100644
--- a/modules/roles/manifests/backports_mirror.pp
+++ b/modules/roles/manifests/backports_mirror.pp
@@ -11,8 +11,4 @@ class roles::backports_mirror {
 
 	apache2::module { 'rewrite': }
 
-	class { 'vsftpd::site':
-		source => 'puppet:///modules/roles/backports_mirror/vsftpd.conf'
-	}
-
 }