X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=0470b644b5fe0751c9b5ef8d7442a9e77c70c475;hb=e3552ebafacf4e63fd4a97c331066022b7017d56;hp=dec3162d6d6a3c2873145bd169c42806a77c7ff4;hpb=03ca468e0bdcc5c8ee4828fd3c320fe9e5f66c52;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index dec3162d6..0470b644b 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -1,5 +1,12 @@
+# = Class: apache2
+#
+# Standard apache config debian.org hosts
+#
+# == Sample Usage:
+#
+#   include apache2
+#
 class apache2 {
-
 	package { 'apache2':
 		ensure => installed,
 	}
@@ -11,6 +18,15 @@ class apache2 {
 
 	apache2::module { 'info': }
 	apache2::module { 'status': }
+	apache2::module { 'headers': }
+
+	package { 'libapache2-mod-macro':
+		ensure => installed
+	}
+
+	apache2::module { 'macro':
+		require => Package['libapache2-mod-macro']
+	}
 
 	apache2::site { '00-default':
 		site     => 'default-debian.org',
@@ -25,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'),
 	}
@@ -45,10 +73,12 @@ class apache2 {
 		source => 'puppet:///modules/apache2/server-status',
 	}
 
+	apache2::config { 'puppet-ssl-macros':
+		source => 'puppet:///modules/apache2/puppet-ssl-macros',
+	}
+
 	file { '/etc/apache2/sites-available/common-ssl.inc':
-		source => 'puppet:///modules/apache2/common-ssl.inc',
-		require => Package['apache2'],
-		notify  => Service['apache2'],
+		ensure => absent,
 	}
 
 	file { '/etc/logrotate.d/apache2':
@@ -64,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': }