add cache headers to security

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

diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp
index 5e3ee78fbfb0203c4518ef7b69fc4a8521f4bcbf..0bad766f5c08ac85fbdc5a947396df8864a89342 100644 (file)
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -1,30 +1,20 @@
 class roles::security_mirror {
 
+       include apache2::cache
        apache2::site { '010-security.debian.org':
                site   => 'security.debian.org',
-               config => 'puppet:///modules/roles/security_mirror/security.debian.org'
-       }
-
-       $bind = $::hostname ? {
-               default => '',
-       }
-
-       $bind6 = $::hostname ? {
-               default => '',
+               source => 'puppet:///modules/roles/security_mirror/security.debian.org'
        }
 
        vsftpd::site { 'security':
-               source  => 'puppet:///modules/roles/security_mirror/vsftpd.conf',
-               logfile => '/var/log/ftp/vsftpd-security.debian.org.log',
-               bind    => $bind,
+               banner       => 'security.debian.org FTP server (vsftpd)',
+               logfile      => '/var/log/ftp/vsftpd-security.debian.org.log',
+               max_clients  => 200,
+               root         => '/srv/ftp.root/',
        }
 
-       if $bind6 {
-               vsftpd::site { 'security-v6':
-                       source  => 'puppet:///modules/roles/security_mirror/vsftpd.conf',
-                       logfile => '/var/log/ftp/vsftpd-security.debian.org.log',
-                       bind    => $bind6,
-               }
+       rsync::site { 'security':
+               source      => 'puppet:///modules/roles/security_mirror/rsyncd.conf',
+               max_clients => 100,
        }
-
 }