X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Fsecurity_upload.pp;h=c972d417fcf3e59fe1c7f1ff9066e85a276d4cc8;hb=5798c1ac4a2c2bd8737087b515d0eb4869482576;hp=bdab84f9b900c39634720046e256ff2753cbb64f;hpb=fd8ca6e26ac1706c5eccde4789362206daa0ff4a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/security_upload.pp b/modules/roles/manifests/security_upload.pp
index bdab84f9b..c972d417f 100644
--- a/modules/roles/manifests/security_upload.pp
+++ b/modules/roles/manifests/security_upload.pp
@@ -1,8 +1,25 @@
 class roles::security_upload {
-	file { '/srv/security.upload.debian.org':
-		ensure	=> directory,
-		mode	=> '2755',
-		owner	=> dak,
-		group	=> debadmin,
-	}
+  file { '/srv/security.upload.debian.org':
+    ensure => directory,
+    mode   => '2755',
+    owner  => dak,
+    group  => debadmin,
+  }
+
+  file { '/etc/ssh/userkeys/dak':
+    ensure => present,
+    mode   => '0644',
+    owner  => dak,
+    group  => debadmin,
+  }
+
+  vsftpd::site { 'security-upload':
+    banner     => 'ftp.security.upload.debian.org FTP server',
+    logfile    => '/var/log/ftp/vsftpd-security.upload.debian.org.log',
+    writable   => true,
+    readable   => false,
+    listable   => false,
+    chown_user => dak-unpriv,
+    root       => '/srv/security.upload.debian.org/ftp',
+  }
 }