udd -> hiera role; explicitly include apache2

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

diff --git a/modules/roles/manifests/ports_master.pp b/modules/roles/manifests/ports_master.pp
index 6bc184d..5fb48ba 100644 (file)
--- a/modules/roles/manifests/ports_master.pp
+++ b/modules/roles/manifests/ports_master.pp
@@ -1,33 +1,21 @@
 class roles::ports_master {
-       rsync::site { 'ports-master':
-               source      => 'puppet:///modules/roles/ports_master/rsyncd.conf',
-               max_clients => 100,
-               sslname     => 'ports-master.debian.org',
-       }
+  rsync::site { 'ports-master':
+    source      => 'puppet:///modules/roles/ports_master/rsyncd.conf',
+    # Needs to be at least number of direct mirrors plus some spare
+    max_clients => 50,
+    sslname     => 'ports-master.debian.org',
+  }
 
-       ssl::service { 'ports-master.debian.org':
-               key => true,
-       }
+  ssl::service { 'ports-master.debian.org':
+    key => true,
+  }
 
-       include ferm::ftp_conntrack
-
-       vsftpd::site { 'ports-master':
-               banner         => 'ports-master.debian.org FTP server',
-               logfile        => '/var/log/ftp/vsftpd-ports-master.debian.org.log',
-               writable       => true,
-               writable_other => true,
-               chown_user     => mini-dak-unpriv,
-               root           => '/srv/ports-master.debian.org/ftp.upload',
-       }
-
-       if $bind6 {
-               vsftpd::site { 'ports-master-v6':
-                       banner         => 'ports-master.debian.org FTP server',
-                       logfile        => '/var/log/ftp/vsftpd-ports-master.debian.org.log',
-                       writable       => true,
-                       writable_other => true,
-                       chown_user     => mini-dak-unpriv,
-                       root           => '/srv/ports-master.debian.org/ftp.upload',
-               }
-       }
+  vsftpd::site { 'ports-master':
+    banner         => 'ports-master.debian.org FTP server',
+    logfile        => '/var/log/ftp/vsftpd-ports-master.debian.org.log',
+    writable       => true,
+    writable_other => true,
+    chown_user     => mini-dak-unpriv,
+    root           => '/srv/ports-master.debian.org/ftp.upload',
+  }
 }