Pull out listen addresses from hiera again

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

diff --git a/modules/roles/manifests/security_master.pp b/modules/roles/manifests/security_master.pp
index 35fb510..a7f8516 100644 (file)
--- a/modules/roles/manifests/security_master.pp
+++ b/modules/roles/manifests/security_master.pp
@@ -6,16 +6,14 @@ class roles::security_master {
        }
 
        vsftpd::site { 'security':
-               banner     => 'security-master.debian.org FTP server (vsftpd)',
-               logfile    => '/var/log/ftp/vsftpd-security-master.debian.org.log',
-               writable   => true,
-               chown_user => dak-unpriv,
-               root       => '/srv/ftp.root/',
+               ensure  => absent,
+               root    => '/nonexistent',
        }
 
-       rsync::site_systemd { 'security_master':
+       rsync::site { 'security_master':
                source      => 'puppet:///modules/roles/security_master/rsyncd.conf',
-               max_clients => 100,
+               # Needs to be at least twice the number of direct mirrors (currently 15) plus some spare
+               max_clients => 50,
                sslname     => 'security-master.debian.org',
        }
 }