apache: disable SSLv3 support

[mirror/dsa-puppet.git] / modules / apache2 / manifests / init.pp

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index ae9f894..3d49ce8 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -1,3 +1,11 @@
+# = Class: apache2
+#
+# Standard apache config debian.org hosts
+#
+# == Sample Usage:
+#
+#   include apache2
+#
 class apache2 {
        package { 'apache2':
                ensure => installed,
@@ -33,6 +41,20 @@ class apache2 {
                ensure => absent,
        }
 
+       if has_role('buildd_master') {
+               $memlimit = 192 * 1024 * 1024
+       } elsif has_role('buildd_ports_master') {
+               $memlimit = 192 * 1024 * 1024
+       } elsif has_role('nagiosmaster') {
+               $memlimit = 96 * 1024 * 1024
+       } elsif has_role('packagesqamaster') {
+               $memlimit = 192 * 1024 * 1024
+       } elsif has_role('nm') {
+               $memlimit = 96 * 1024 * 1024
+       } else {
+               $memlimit = 32 * 1024 * 1024
+       }
+
        apache2::config { 'resource-limits':
                content => template('apache2/resource-limits.erb'),
        }
@@ -57,6 +79,10 @@ class apache2 {
                source => 'puppet:///modules/apache2/puppet-ssl-macros',
        }
 
+       apache2::config { 'puppet-config':
+               source => 'puppet:///modules/apache2/puppet-config',
+       }
+
        file { '/etc/apache2/sites-available/common-ssl.inc':
                ensure => absent,
        }