X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=19400ad6dc4fae503f41f2689fb2ed72b8a4d4ee;hb=249b713a08d35bffb1cd52739be6f5808baa5a5f;hp=8be585bfa2b5b2f7fa8fd2d9cc11b591a645a707;hpb=b11eec4b0fc6407dab648c714f970ae3e6b11a96;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 8be585bfa..19400ad6d 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -16,22 +16,20 @@ class apache2 {
 		require => Package['apache2'],
 	}
 
+	apache2::module { 'reqtimeout': }
 	apache2::module { 'info': }
 	apache2::module { 'status': }
 	apache2::module { 'headers': }
-
-	package { 'libapache2-mod-macro':
-		ensure => installed
-	}
-
-	apache2::module { 'macro':
-		require => Package['libapache2-mod-macro']
-	}
+	apache2::module { 'macro': }
 
 	apache2::site { '00-default':
 		site     => 'default-debian.org',
 		content  => template('apache2/default-debian.org.erb'),
 	}
+	apache2::site { 'xx-default-ssl':
+		site     => 'default-debian.org-ssl',
+		content  => template('apache2/default-debian.org-ssl.erb'),
+	}
 
 	apache2::site { '000-default':
 		ensure => absent,
@@ -83,15 +81,31 @@ class apache2 {
 		source => 'puppet:///modules/apache2/puppet-ssl-macros',
 	}
 
+	apache2::config { 'puppet-ftp-macros':
+		source => 'puppet:///modules/apache2/puppet-ftp-macros',
+	}
+
 	apache2::config { 'puppet-config':
 		content => template('apache2/puppet-config.erb'),
 	}
 
 	apache2::config { 'pratchett':
-		source => 'puppet:///modules/apache2/pratchett',
+		ensure => 'absent',
+	}
+
+	apache2::config { 'headers':
+		source => 'puppet:///modules/apache2/headers',
 	}
 
-	if $::lsbmajdistrelease > 7 {
+	apache2::module { 'mpm_event': ensure => absent }
+	if has_role('apache_prefork') {
+		apache2::module { 'mpm_worker': ensure => absent }
+		apache2::module { 'mpm_prefork': }
+	} else {
+		apache2::module { 'mpm_prefork': ensure => absent }
+		apache2::module { 'mpm_worker': }
+	}
+	if $::lsbmajdistrelease > '7' {
 		file { '/etc/apache2/mods-available/mpm_worker.conf':
 			content => template('apache2/mpm_worker.erb'),
 		}
@@ -105,7 +119,7 @@ class apache2 {
 		source => 'puppet:///modules/apache2/apache2.logrotate',
 	}
 
-	file { [ '/srv/www', '/srv/www/default.debian.org', '/srv/www/default.debian.org/htdocs' ]:
+	file { [ '/srv/www', '/srv/www/default.debian.org', '/srv/www/default.debian.org/htdocs', '/srv/www/default.debian.org/htdocs-disabled' ]:
 		ensure  => directory,
 		mode    => '0755',
 	}
@@ -114,6 +128,10 @@ class apache2 {
 		content => template('apache2/default-index.html'),
 	}
 
+	file { '/srv/www/default.debian.org/htdocs-disabled/index.html':
+		content => template('apache2/disabled-index.html'),
+	}
+
 	file { '/var/log/apache2/.nobackup':
 		mode    => '0644',
 		content => '',
@@ -126,8 +144,12 @@ class apache2 {
 	munin::check { 'ps_apache2':
 		script => 'ps_',
 	}
+	# The munin script needs this
+	package { 'libwww-perl':
+		ensure => installed,
+	}
 
-	if $::hostname in [beach,buxtehude,picconi,pkgmirror-1and1] {
+	if $::hostname in [beach,buxtehude,picconi,pkgmirror-csail] {
 		include apache2::dynamic
 	} else {
 		@ferm::rule { 'dsa-http':
@@ -150,4 +172,9 @@ class apache2 {
 		refreshonly => true,
 		require =>  Package['apache2'],
 	}
+
+	apache2::config { 'puppet-ssl-key-pins':
+		content => template('apache2/ssl-key-pins.erb'),
+		notify  => Exec['service apache2 reload'],
+	}
 }