X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Fports-master.pp;h=9efae9547e469c4bb608ae4e248d43d885819701;hb=4ca2318f824159566042e9ad02045d8f5f5d2baa;hp=62746adb14d2defac88ba426bab349bfac4f79de;hpb=725369f4e2a86e4589ac40276a9c1289b1baad71;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/ports-master.pp b/modules/roles/manifests/ports-master.pp
index 62746adb1..9efae9547 100644
--- a/modules/roles/manifests/ports-master.pp
+++ b/modules/roles/manifests/ports-master.pp
@@ -9,13 +9,25 @@ class roles::ports-master {
 		key => true,
 	}
 
-	file { '/etc/rsyncd':
-		ensure => 'directory'
+	include ferm::ftp_conntrack
+
+	vsftpd::site { 'ports-master':
+		banner         => 'ports-master.debian.org FTP server',
+		logfile        => '/var/log/ftp/vsftpd-ports-master.debian.org.log',
+		writable       => true,
+		writable_other => true,
+		chown_user     => mini-dak-unpriv,
+		root           => '/srv/ports-master.debian.org/ftp.upload',
 	}
 
-	file { '/etc/rsyncd/debian.secrets':
-		owner => 'root',
-		group => 'mirroradm',
-		mode => 0660,
+	if $bind6 {
+		vsftpd::site { 'ports-master-v6':
+			banner         => 'ports-master.debian.org FTP server',
+			logfile        => '/var/log/ftp/vsftpd-ports-master.debian.org.log',
+			writable       => true,
+			writable_other => true,
+			chown_user     => mini-dak-unpriv,
+			root           => '/srv/ports-master.debian.org/ftp.upload',
+		}
 	}
 }