X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=3a6050ab7e1a295ecb0484c2ba73c7875651e9a2;hb=cbdfa45eb11f20de2ffb713925b8061a9e09c7ec;hp=16807bb810b5d9a07afcc68890bc5ff5f577a912;hpb=4dc60913c2399b838631eba9c1488b7cb02263b7;p=dsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 16807bb8..3a6050ab 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',
@@ -21,8 +37,30 @@ class apache2 {
 		ensure => absent,
 	}
 
+	apache2::config { 'serve-cgi-bin':
+		ensure => absent,
+	}
+
 	apache2::config { 'ressource-limits':
-		content => template('apache2/ressource-limits.erb'),
+		ensure => absent,
+	}
+
+	if has_role('udd') {
+		$memlimit = 512 * 1024 * 1024
+	} elsif has_role('dgit_git') {
+		$memlimit = 512 * 1024 * 1024
+	} elsif has_role('sso') {
+		$memlimit = 512 * 1024 * 1024
+	} elsif has_role('popcon') {
+		$memlimit = 512 * 1024 * 1024
+	} elsif has_role('qamaster') {
+		$memlimit = 300 * 1024 * 1024
+	} else {
+		$memlimit = 192 * 1024 * 1024
+	}
+
+	apache2::config { 'resource-limits':
+		content => template('apache2/resource-limits.erb'),
 	}
 
 	apache2::config { 'security':
@@ -41,10 +79,26 @@ class apache2 {
 		source => 'puppet:///modules/apache2/server-status',
 	}
 
+	apache2::config { 'puppet-ssl-macros':
+		source => 'puppet:///modules/apache2/puppet-ssl-macros',
+	}
+
+	apache2::config { 'puppet-config':
+		content => template('apache2/puppet-config.erb'),
+	}
+
+	apache2::config { 'pratchett':
+		source => 'puppet:///modules/apache2/pratchett',
+	}
+
+	if $::lsbmajdistrelease > 7 {
+		file { '/etc/apache2/mods-available/mpm_worker.conf':
+			content => template('apache2/mpm_worker.erb'),
+		}
+	}
+
 	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':
@@ -60,6 +114,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': }