X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fports-master.pp;h=9efae9547e469c4bb608ae4e248d43d885819701;hb=4ca2318f824159566042e9ad02045d8f5f5d2baa;hp=363907641eeaed23a23a21277c9725522208965c;hpb=278da0874ce9bde5a53ca945338bd1641777a3c5;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/ports-master.pp b/modules/roles/manifests/ports-master.pp
index 363907641..9efae9547 100644
--- a/modules/roles/manifests/ports-master.pp
+++ b/modules/roles/manifests/ports-master.pp
@@ -9,16 +9,6 @@ class roles::ports-master {
 		key => true,
 	}
 
-	file { '/etc/rsyncd':
-		ensure => 'directory'
-	}
-
-	file { '/etc/rsyncd/debian.secrets':
-		owner => 'root',
-		group => 'mirroradm',
-		mode => 0660,
-	}
-
 	include ferm::ftp_conntrack
 
 	vsftpd::site { 'ports-master':
@@ -27,7 +17,7 @@ class roles::ports-master {
 		writable       => true,
 		writable_other => true,
 		chown_user     => mini-dak-unpriv,
-		root           => '/srv/ports-master.debian.org/ftp/incoming',
+		root           => '/srv/ports-master.debian.org/ftp.upload',
 	}
 
 	if $bind6 {
@@ -37,7 +27,7 @@ class roles::ports-master {
 			writable       => true,
 			writable_other => true,
 			chown_user     => mini-dak-unpriv,
-			root           => '/srv/ports-master.debian.org/ftp/incoming',
+			root           => '/srv/ports-master.debian.org/ftp.upload',
 		}
 	}
 }