X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=0470b644b5fe0751c9b5ef8d7442a9e77c70c475;hb=1806a0c50edb73954c614b9ad5921a125eab08d4;hp=a4e14cadac171ed25ee951ae7873e089f412db4c;hpb=42b6a399089afa8becb49d8fe573e61502c80f36;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index a4e14cada..0470b644b 100644
--- 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,18 @@ class apache2 {
 		ensure => absent,
 	}
 
+	if has_role('buildd_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'),
 	}
@@ -74,6 +94,11 @@ class apache2 {
 		content => template('apache2/default-index.html'),
 	}
 
+	file { '/var/log/apache2/.nobackup':
+		mode    => '0644',
+		content => '',
+	}
+
 	munin::check { 'apache_accesses': }
 	munin::check { 'apache_processes': }
 	munin::check { 'apache_volume': }