add vsftpd::site for backports

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

diff --git a/manifests/site.pp b/manifests/site.pp
index f82655b9aa49e4c0059c94b46e122f13280f09c1..2b7949b67f0152bef84955354ada9aafc539323f 100644 (file)
--- 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 (file)
index 0000000..cbabef1
--- /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 d8f49307b2bc0013dedd6e818d3bdfefc2e7a467..e7ccf58e3bf6ee6cb707967739c3343c05c2237c 100644 (file)
--- 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'
+       }
+
 }