X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=8be585bfa2b5b2f7fa8fd2d9cc11b591a645a707;hb=b11eec4b0fc6407dab648c714f970ae3e6b11a96;hp=082b8631ccf5252eeab193e18c66271be3fa35b9;hpb=2ddafbd75b7bde2fac3e5293b824c727c5b3105a;p=dsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 082b8631..8be585bf 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,24 +18,59 @@ 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',
-		template => 'apache2/default-debian.org.erb',
+		content  => template('apache2/default-debian.org.erb'),
 	}
 
 	apache2::site { '000-default':
 		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':
 		source => 'puppet:///modules/apache2/security',
 	}
 
+	apache2::config { 'logformat-privacy':
+		source => 'puppet:///modules/apache2/logformat-privacy',
+	}
+
 	apache2::config { 'local-serverinfo':
 		source => 'puppet:///modules/apache2/local-serverinfo',
 	}
@@ -37,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':
@@ -56,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': }
@@ -64,20 +127,7 @@ class apache2 {
 		script => 'ps_',
 	}
 
-	if $php5 {
-		package { 'php5-suhosin':
-			ensure  => installed,
-			require => Package['apache2'],
-		}
-
-		file { '/etc/php5/conf.d/suhosin.ini':
-			source  => 'puppet:///modules/apache2/suhosin.ini',
-			require => Package['php5-suhosin'],
-			notify  => Service['apache2'],
-		}
-	}
-
-	if $::hostname in [busoni,duarte,holter,lindberg,master,powell] {
+	if $::hostname in [beach,buxtehude,picconi,pkgmirror-1and1] {
 		include apache2::dynamic
 	} else {
 		@ferm::rule { 'dsa-http':
@@ -93,4 +143,11 @@ class apache2 {
 		description     => 'Allow web access',
 		rule            => '&SERVICE(tcp, (http https))'
 	}
+
+	exec { 'service apache2 reload':
+		path        => '/usr/bin:/usr/sbin:/bin:/sbin',
+		command     => 'service apache2 reload',
+		refreshonly => true,
+		require =>  Package['apache2'],
+	}
 }