X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fftp_upload.pp;h=75bd56856ec6f25f6f928907d2f9f991e627ba9e;hb=d37aae2f20083c472de30925ff3e16a692408a11;hp=abcc6bbd22082c62d9cea8c7f95ba1becf4d5d2b;hpb=ca0302fc180922a0843bd5f25fae104f14dff374;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/ftp_upload.pp b/modules/roles/manifests/ftp_upload.pp
index abcc6bbd2..75bd56856 100644
--- a/modules/roles/manifests/ftp_upload.pp
+++ b/modules/roles/manifests/ftp_upload.pp
@@ -1,24 +1,9 @@
 class roles::ftp_upload {
-
-	$bind = $::hostname ? {
-		default => '',
-	}
-
-	$bind6 = $::hostname ? {
-		default => '',
-	}
-
-	vsftpd::site { 'ftp-upload':
-		source  => 'puppet:///modules/roles/ftp_upload/vsftpd.conf',
-		logfile => '/var/log/ftp/vsftpd-ftp.upload.debian.org.log',
-		bind    => $bind,
-	}
-
-	if $bind6 {
-		vsftpd::site { 'ftp-upload-v6':
-			source  => 'puppet:///modules/roles/security_mirror/vsftpd.conf',
-			logfile => '/var/log/ftp/vsftpd-ftp.upload.debian.org.log',
-			bind    => $bind6,
-		}
-	}
+  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',
+  }
 }