X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Fftp_upload.pp;h=75bd56856ec6f25f6f928907d2f9f991e627ba9e;hb=20ed04591aed4343ee7457336ae054bbb0343a87;hp=3bccb3dbfd4ba050811908d321fcf27ea3301a27;hpb=5e67279c82e87394c04bcf2cf8ff34a35f017ef5;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/ftp_upload.pp b/modules/roles/manifests/ftp_upload.pp
index 3bccb3dbf..75bd56856 100644
--- a/modules/roles/manifests/ftp_upload.pp
+++ b/modules/roles/manifests/ftp_upload.pp
@@ -1,5 +1,9 @@
 class roles::ftp_upload {
-	vsftpd::site { 'ftp-upload':
-		source => 'puppet:///modules/roles/ftp_upload/vsftpd.conf'
-	}
+  vsftpd::site { 'ftp-upload':
+    banner     => 'ftp.upload.debian.org FTP server',
+    logfile    => '/var/log/ftp/vsftpd-ftp.upload.debian.org.log',
+    writable   => true,
+    chown_user => dak-unpriv,
+    root       => '/srv/upload.debian.org/ftp',
+  }
 }