X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=ae9f89487b0209c88656512f2768b9047c118d7c;hb=112de0a1b1673d0bdf4553f8f812a82209617bee;hp=0c15379c85e13446d25580e074709f3163b76a35;hpb=efe9f7a25834c736407891e7a1b0832dba16ba8b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 0c15379c8..ae9f89487 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -1,5 +1,4 @@
 class apache2 {
-
 	package { 'apache2':
 		ensure => installed,
 	}
@@ -11,6 +10,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',
@@ -22,13 +30,21 @@ class apache2 {
 	}
 
 	apache2::config { 'ressource-limits':
-		content => template('apache2/ressource-limits.erb'),
+		ensure => absent,
+	}
+
+	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 +53,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':
@@ -56,6 +74,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 +87,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,beach] {
+	if $::hostname in [beach,buxtehude,picconi,pkgmirror-1and1] {
 		include apache2::dynamic
 	} else {
 		@ferm::rule { 'dsa-http':