X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=decec23e68ff61e06cf50032fa8e6ac264603a9a;hb=b98ca19d555504c1b3909da4b2680e0041d7dd3e;hp=b1abe28de68a1a26346343be8bc13fb048b31018;hpb=d2f6024df26f737b3ab6528499142e0c2c4b3318;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index b1abe28de..decec23e6 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -32,29 +32,35 @@ class apache2 {
 		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('buildd_master') {
-		$memlimit = 192 * 1024 * 1024
-	} elsif has_role('buildd_ports_master') {
-		$memlimit = 192 * 1024 * 1024
-	} elsif has_role('nagiosmaster') {
-		$memlimit = 96 * 1024 * 1024
-	} elsif has_role('packagesqamaster') {
-		$memlimit = 192 * 1024 * 1024
-	} elsif has_role('nm') {
-		$memlimit = 96 * 1024 * 1024
-	} elsif has_role('udd') {
+	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 = 32 * 1024 * 1024
+		$memlimit = 192 * 1024 * 1024
 	}
 
 	apache2::config { 'resource-limits':
@@ -81,6 +87,10 @@ 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'),
 	}
@@ -103,7 +113,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',
 	}
@@ -112,6 +122,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 => '',
@@ -125,7 +139,7 @@ class apache2 {
 		script => 'ps_',
 	}
 
-	if $::hostname in [beach,buxtehude,picconi,pkgmirror-1and1] {
+	if $::hostname in [beach,buxtehude,picconi,pkgmirror-1and1,pkgmirror-csail] {
 		include apache2::dynamic
 	} else {
 		@ferm::rule { 'dsa-http':
@@ -141,4 +155,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'],
+	}
 }