From ac3c6e91ccb34aba54840da7f32cfc7c51f6ffb2 Mon Sep 17 00:00:00 2001
From: Stephen Gran <steve@lobefin.net>
Date: Mon, 23 Apr 2012 11:59:18 +0100
Subject: [PATCH] add vsftpd::site for backports

Signed-off-by: Stephen Gran <steve@lobefin.net>
---
 manifests/site.pp                             |  2 +-
 .../roles/files/backports_mirror/vsftpd.conf  | 23 +++++++++++++++++++
 modules/roles/manifests/backports_mirror.pp   |  5 ++++
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 modules/roles/files/backports_mirror/vsftpd.conf

diff --git a/manifests/site.pp b/manifests/site.pp
index f82655b9a..2b7949b67 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -144,7 +144,7 @@ node default {
 		munin::check { 'spamassassin': }
 	}
 
-	if $::hostname in [chopin,franck,kassia,klecker,morricone,ravel,bizet] {
+	if $::hostname in [chopin,franck,kassia,klecker,ravel] {
 		include vsftpd
 	}
 }
diff --git a/modules/roles/files/backports_mirror/vsftpd.conf b/modules/roles/files/backports_mirror/vsftpd.conf
new file mode 100644
index 000000000..cbabef1c2
--- /dev/null
+++ b/modules/roles/files/backports_mirror/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/manifests/backports_mirror.pp b/modules/roles/manifests/backports_mirror.pp
index d8f49307b..e7ccf58e3 100644
--- a/modules/roles/manifests/backports_mirror.pp
+++ b/modules/roles/manifests/backports_mirror.pp
@@ -10,4 +10,9 @@ class roles::backports_mirror {
 	}
 
 	apache2::module { 'rewrite': }
+
+	class { 'vsftpd::site':
+		source => 'puppet:///modules/roles/backports_mirror/vsftpd.conf'
+	}
+
 }
-- 
2.20.1