X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fsecurity_master.pp;h=365f3b09252fd0ce7812e3d175b6bfa9e193bfc6;hb=eb75e4c9f48bb7bd2208466d29895a3d82e80b50;hp=6c511b3b05de7763efe7a3a64917ba6d6e61815f;hpb=9cbb76c701a14f58844ec54dcee53734fed33210;p=mirror%2Fdsa-puppet.git diff --git a/modules/roles/manifests/security_master.pp b/modules/roles/manifests/security_master.pp index 6c511b3b0..365f3b092 100644 --- a/modules/roles/manifests/security_master.pp +++ b/modules/roles/manifests/security_master.pp @@ -1,15 +1,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/', + ssl::service { 'security-master.debian.org': + notify => Exec['service apache2 reload'], + key => true, + tlsaport => [443, 1873], } rsync::site { 'security_master': - source => 'puppet:///modules/roles/security_master/rsyncd.conf', - max_clients => 100, + source => 'puppet:///modules/roles/security_master/rsyncd.conf', + # Needs to be at least twice the number of direct mirrors (currently 15) plus some spare + max_clients => 50, + sslname => 'security-master.debian.org', } }