And setup ferm, 2

[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 6992537..365f3b0 100644 (file)
--- a/modules/roles/manifests/security_master.pp
+++ b/modules/roles/manifests/security_master.pp
@@ -1,26 +1,14 @@
 class roles::security_master {
-
-       $bind = $::hostname ? {
-               default => '',
-       }
-
-       $bind6 = $::hostname ? {
-               default => '',
-       }
-
-       $logfile = '/var/log/ftp/vsftpd-security-master.debian.org.log'
-
-       vsftpd::site { 'security':
-               content => template('roles/security_master/vsftpd.conf.erb'),
-               logfile => $logfile,
-               bind    => $bind,
+       ssl::service { 'security-master.debian.org':
+               notify   => Exec['service apache2 reload'],
+               key      => true,
+               tlsaport => [443, 1873],
        }
 
-       if $bind6 {
-               vsftpd::site { 'security-v6':
-                       content => template('roles/security_master/vsftpd.conf.erb'),
-                       logfile => $logfile,
-                       bind    => $bind6,
-               }
+       rsync::site { 'security_master':
+               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',
        }
 }