reorganize vsftp::site

[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 fc19e41a10bcb69b404b358cb1e32add0266423c..9ed98409d57c2f9bc19271e743954a8e17fcc910 100644 (file)
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -5,28 +5,10 @@ class roles::security_mirror {
                config => 'puppet:///modules/roles/security_mirror/security.debian.org'
        }
 
-       $bind = $::hostname ? {
-               default => '',
-       }
-
-       $bind6 = $::hostname ? {
-               default => '',
-       }
-
-       $logfile = '/var/log/ftp/vsftpd-security.debian.org.log'
-
        vsftpd::site { 'security':
-               content => template('roles/security_mirror/vsftpd.conf.erb'),
-               logfile => $logfile,
-               bind    => $bind,
-       }
-
-       if $bind6 {
-               vsftpd::site { 'security-v6':
-                       content => template('roles/security_mirror/vsftpd.conf.erb'),
-                       logfile => $logfile,
-                       bind    => $bind6,
-               }
+               banner       => 'security.debian.org FTP server (vsftpd)',
+               logfile      => '/var/log/ftp/vsftpd-security.debian.org.log',
+               max_clients  => 200,
+               root         => '/srv/ftp.root/',
        }
-
 }