X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=cd4f1f7bdcb7099cff15c4367627e398331f42a1;hb=d5860b0cc2d81d2332b8035b1a279a7fafda4890;hp=a475f63ce4805ec240cf16afbf0006004f6d4d22;hpb=86777266162465bdecda9e835fa79171368046e1;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index a475f63ce..cd4f1f7bd 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -1,3 +1,11 @@
+# = Class: apache2
+#
+# Standard apache config debian.org hosts
+#
+# == Sample Usage:
+#
+#   include apache2
+#
 class apache2 {
 	package { 'apache2':
 		ensure => installed,
@@ -10,28 +18,44 @@ class apache2 {
 
 	apache2::module { 'info': }
 	apache2::module { 'status': }
-
-	package { 'libapache2-mod-macro':
-		ensure => installed
-	}
-
-	apache2::module { 'macro':
-		require => Package['libapache2-mod-macro']
-	}
+	apache2::module { 'headers': }
+	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,
 	}
 
+	apache2::config { 'serve-cgi-bin':
+		ensure => absent,
+	}
+
 	apache2::config { 'ressource-limits':
 		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'),
 	}
@@ -52,6 +76,28 @@ class apache2 {
 		source => 'puppet:///modules/apache2/server-status',
 	}
 
+	apache2::config { 'puppet-ssl-macros':
+		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',
+	}
+
+	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':
 		ensure => absent,
 	}
@@ -60,7 +106,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',
 	}
@@ -69,6 +115,15 @@ 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 => '',
+	}
+
 	munin::check { 'apache_accesses': }
 	munin::check { 'apache_processes': }
 	munin::check { 'apache_volume': }
@@ -77,7 +132,7 @@ class apache2 {
 		script => 'ps_',
 	}
 
-	if $::hostname in [beach,buxtehude,picconi,pkgmirror-1and1] {
+	if $::hostname in [beach,buxtehude,picconi,pkgmirror-csail] {
 		include apache2::dynamic
 	} else {
 		@ferm::rule { 'dsa-http':
@@ -93,4 +148,16 @@ 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'],
+	}
+
+	apache2::config { 'puppet-ssl-key-pins':
+		content => template('apache2/ssl-key-pins.erb'),
+		notify  => Exec['service apache2 reload'],
+	}
 }