add ftp.d.o role

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 8355c6947380d22dfb92524d15a3ba094821b681..19359263f4f61c2b5dcdd355ed54f224f97fa54a 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -94,6 +94,10 @@ node default {
                include roles::backports_mirror
        }
 
+       if getfromhash($site::nodeinfo, 'ftp.d.o') {
+               include roles::ftp
+       }
+
        if $::hostname in [bizet,morricone] {
                include roles::backports_master
        }
@@ -148,7 +152,7 @@ node default {
                munin::check { 'spamassassin': }
        }
 
-       if $::hostname in [chopin,franck,kassia,klecker,ravel] {
+       if $::hostname in [chopin,franck,ravel] {
                include vsftpd
        }
 }

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 6b7bf5bc016c577a7f5f7f8f3cdff7ddeeab1c05..a986a466e1c531e3a3152526b5c1da4e367f8dd4 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -147,6 +147,9 @@ services:
     - busoni.debian.org
   dbmaster:
     - draghi.debian.org
+  ftp.d.o:
+    - kassia.debian.org
+    - klecker.debian.org
   mailrelay:
     - kokkonen.debian.org
     - merikanto.debian.org

diff --git a/modules/roles/files/ftp/vsftpd.conf b/modules/roles/files/ftp/vsftpd.conf
new file mode 100644 (file)
index 0000000..d5c6bf2
--- /dev/null
+++ b/modules/roles/files/ftp/vsftpd.conf
@@ -0,0 +1,15 @@
+ftpd_banner=ftp.debian.org FTP server
+
+anonymous_enable=YES
+dirmessage_enable=YES
+connect_from_port_20=NO
+setproctitle_enable=YES
+ls_recurse_enable=NO
+xferlog_enable=YES
+xferlog_file=/var/log/ftp/vsftpd-ftp.debian.org.log
+
+secure_chroot_dir=/var/run/vsftpd
+pam_service_name=vsftpd
+
+anon_root=/srv/ftp.debian.org/ftp.root
+

diff --git a/modules/roles/manifests/ftp.pp b/modules/roles/manifests/ftp.pp
new file mode 100644 (file)
index 0000000..27c4480
--- /dev/null
+++ b/modules/roles/manifests/ftp.pp
@@ -0,0 +1,5 @@
+class roles::ftp {
+       vsftpd::site { 'ftp':
+               source => 'puppet:///modules/roles/ftp/vsftpd.conf'
+       }
+}