reorganize vsftp::site

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

diff --git a/modules/roles/manifests/ftp.pp b/modules/roles/manifests/ftp.pp
index 294cea36d12ec2ef8928bd70ab005ed36c318eb9..0ae4254e569390e21cbb326151ab1380acc56e38 100644 (file)
--- a/modules/roles/manifests/ftp.pp
+++ b/modules/roles/manifests/ftp.pp
@@ -1,22 +1,32 @@
 class roles::ftp {
 
        $bind = $::hostname ? {
+               kassia  => '::ffff:130.89.149.226',
+               klecker => '::ffff:130.89.148.12',
                default => '',
        }
 
        $bind6 = $::hostname ? {
+               kassia  => '2001:610:1908:a000::149:226',
+               klecker => '2001:610:1908:b000::148:12',
                default => '',
        }
 
        vsftpd::site { 'ftp':
-               source => 'puppet:///modules/roles/ftp/vsftpd.conf',
-               bind   => $bind,
+               banner       => 'ftp.debian.org FTP server',
+               logfile      => '/var/log/ftp/vsftpd-ftp.debian.org.log',
+               bind         => $bind,
+               max_clients  => 200,
+               root         => '/srv/ftp.debian.org/ftp.root',
        }
 
        if $bind6 {
-               vsftpd::site { 'security-v6':
-                       source => 'puppet:///modules/roles/security_mirror/vsftpd.conf',
-                       bind   => $bind6,
+               vsftpd::site { 'ftp-v6':
+                       banner       => 'ftp.debian.org FTP server',
+                       logfile      => '/var/log/ftp/vsftpd-ftp.debian.org.log',
+                       bind         => $bind6,
+                       max_clients  => 200,
+                       root         => '/srv/ftp.debian.org/ftp.root',
                }
        }
 }