From: Stephen Gran <steve@lobefin.net>
Date: Thu, 26 Apr 2012 07:58:46 +0000 (+0100)
Subject: add ftp_upload role
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=780ac895583acf302fa1e62f51aa98ff47a4cbff;p=mirror%2Fdsa-puppet.git

add ftp_upload role

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 19359263f..bb8f2c2e3 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -98,6 +98,10 @@ node default {
 		include roles::ftp
 	}
 
+	if getfromhash($site::nodeinfo, 'ftp.upload.d.o') {
+		include roles::ftp_upload
+	}
+
 	if $::hostname in [bizet,morricone] {
 		include roles::backports_master
 	}
diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index a986a466e..dcd0a4df4 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -150,6 +150,9 @@ services:
   ftp.d.o:
     - kassia.debian.org
     - klecker.debian.org
+  ftp.upload.d.o:
+    - franck.debian.org
+    - ravel.debian.org
   mailrelay:
     - kokkonen.debian.org
     - merikanto.debian.org
diff --git a/modules/roles/files/ftp_upload/vsftpd.conf b/modules/roles/files/ftp_upload/vsftpd.conf
new file mode 100644
index 000000000..e55f32e3f
--- /dev/null
+++ b/modules/roles/files/ftp_upload/vsftpd.conf
@@ -0,0 +1,22 @@
+ftpd_banner=ftp.upload.debian.org FTP server
+
+listen=YES
+max_clients=100
+
+anonymous_enable=YES
+dirmessage_enable=YES
+connect_from_port_20=NO
+setproctitle_enable=YES
+ls_recurse_enable=NO
+xferlog_enable=YES
+
+secure_chroot_dir=/var/run/vsftpd
+pam_service_name=vsftpd
+
+anon_root=/srv/upload.debian.org/ftp
+write_enable=YES
+anon_umask=027
+anon_upload_enable=YES
+chown_uploads=YES
+chown_username=dak
+
diff --git a/modules/roles/ftp_upload.pp b/modules/roles/ftp_upload.pp
new file mode 100644
index 000000000..3bccb3dbf
--- /dev/null
+++ b/modules/roles/ftp_upload.pp
@@ -0,0 +1,5 @@
+class roles::ftp_upload {
+	vsftpd::site { 'ftp-upload':
+		source => 'puppet:///modules/roles/ftp_upload/vsftpd.conf'
+	}
+}