And listen for www.backports.org on our static apaches as well

[dsa-puppet.git] / modules / roles / manifests / backports_master.pp

diff --git a/modules/roles/manifests/backports_master.pp b/modules/roles/manifests/backports_master.pp
index 38a055a0d8f5c7be8848f02b99cb57dd937503f0..a6c85737e6dfcf3faa88b7a4b78786375bf4bc80 100644 (file)
--- a/modules/roles/manifests/backports_master.pp
+++ b/modules/roles/manifests/backports_master.pp
@@ -2,28 +2,16 @@ class roles::backports_master {
 
        include roles::backports_mirror
 
-       $bind = $::hostname ? {
-               default => '',
-       }
-
-       $bind6 = $::hostname ? {
-               default => '',
-       }
-
-       $logfile = '/var/log/ftp/vsftpd-backports-master.debian.org.log'
-
        vsftpd::site { 'backports':
-               content => template('roles/backports_master/vsftpd.conf.erb'),
-               logfile => $logfile,
-               bind    => $bind,
+               banner     => 'backports-master.debian.org FTP server',
+               logfile    => '/var/log/ftp/vsftpd-backports-master.debian.org.log',
+               writable   => true,
+               chown_user => dak-unpriv,
+               root       => '/srv/backports-upload',
        }
 
-       if $bind6 {
-               vsftpd::site { 'backports-v6':
-                       source  => template('roles/backports_mirror/vsftpd.conf.erb'),
-                       logfile => $logfile,
-                       bind    => $bind6,
-               }
+       rsync::site { 'backports_master':
+               source        => 'puppet:///modules/roles/backports_master/rsyncd.conf',
+               max_clients => 100,
        }
-
 }