X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fsecurity_upload.pp;h=120879536e5ffbccf4f8aed844eda7bd60303866;hb=5cd6ab3007177c08f4b95ee5ffbf3e792798c614;hp=4197940dca7729efd40dca6bb53c2d665329d2d0;hpb=bba910ec4bec3ffd6149d4cfc2c42cbfcbca2250;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/security_upload.pp b/modules/roles/manifests/security_upload.pp
index 4197940dc..120879536 100644
--- a/modules/roles/manifests/security_upload.pp
+++ b/modules/roles/manifests/security_upload.pp
@@ -6,11 +6,24 @@ class roles::security_upload {
 		group	=> debadmin,
 	}
 
+	file { '/etc/ssh/userkeys/dak':
+		ensure  => present,
+		mode    => '644',
+		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',
 	}
+	vsftpd::site { 'ftp-upload':
+		root   => irrelevant,
+		ensure => absent,
+	}
 }