Merge remote-tracking branch 'waldi/managed-rsyncd-ports-master'

[mirror/dsa-puppet.git] / modules / roles / manifests / ports-master.pp

diff --git a/modules/roles/manifests/ports-master.pp b/modules/roles/manifests/ports-master.pp
index 3639076..9efae95 100644 (file)
--- 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',
                }
        }
 }