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

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 19400ad6d..8aacde987 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -39,10 +39,6 @@ class apache2 {
 		ensure => absent,
 	}
 
-	apache2::config { 'ressource-limits':
-		ensure => absent,
-	}
-
 	if has_role('udd') {
 		$memlimit = 512 * 1024 * 1024
 	} elsif has_role('dgit_git') {
@@ -97,6 +93,10 @@ class apache2 {
 		source => 'puppet:///modules/apache2/headers',
 	}
 
+	apache2::config { 'disabled-service':
+		source => 'puppet:///modules/apache2/disabled-service',
+	}
+
 	apache2::module { 'mpm_event': ensure => absent }
 	if has_role('apache_prefork') {
 		apache2::module { 'mpm_worker': ensure => absent }
@@ -105,7 +105,7 @@ class apache2 {
 		apache2::module { 'mpm_prefork': ensure => absent }
 		apache2::module { 'mpm_worker': }
 	}
-	if $::lsbmajdistrelease > '7' {
+	if versioncmp($::lsbmajdistrelease, '7') > 0 {
 		file { '/etc/apache2/mods-available/mpm_worker.conf':
 			content => template('apache2/mpm_worker.erb'),
 		}
@@ -132,6 +132,10 @@ class apache2 {
 		content => template('apache2/disabled-index.html'),
 	}
 
+	file { '/var/log/apache2':
+		ensure => directory,
+		mode   => '0755',
+	}
 	file { '/var/log/apache2/.nobackup':
 		mode    => '0644',
 		content => '',
@@ -149,21 +153,23 @@ class apache2 {
 		ensure => installed,
 	}
 
-	if $::hostname in [beach,buxtehude,picconi,pkgmirror-csail] {
-		include apache2::dynamic
-	} else {
-		@ferm::rule { 'dsa-http':
-			prio        => '23',
-			description => 'Allow web access',
-			rule        => '&SERVICE(tcp, (http https))'
+	if (! has_role('apache_not_public')) {
+		if $::hostname in [beach,buxtehude,picconi,pkgmirror-csail] {
+			include apache2::dynamic
+		} else {
+			@ferm::rule { 'dsa-http':
+				prio        => '23',
+				description => 'Allow web access',
+				rule        => '&SERVICE(tcp, (http https))'
+			}
 		}
-	}
 
-	@ferm::rule { 'dsa-http-v6':
-		domain          => '(ip6)',
-		prio            => '23',
-		description     => 'Allow web access',
-		rule            => '&SERVICE(tcp, (http https))'
+		@ferm::rule { 'dsa-http-v6':
+			domain          => '(ip6)',
+			prio            => '23',
+			description     => 'Allow web access',
+			rule            => '&SERVICE(tcp, (http https))'
+		}
 	}
 
 	exec { 'service apache2 reload':
@@ -177,4 +183,15 @@ class apache2 {
 		content => template('apache2/ssl-key-pins.erb'),
 		notify  => Exec['service apache2 reload'],
 	}
+
+	file { '/etc/cron.d/puppet-export-scheduled-shutdown': ensure => absent, }
+	concat::fragment { 'dsa-puppet-stuff--apache-export-shutdown':
+		target => '/etc/cron.d/dsa-puppet-stuff',
+		content  => @(EOF)
+			*/2 * * * * root mkdir -p /run/dsa/shutdown-marker; if dsa-is-shutdown-scheduled; then echo 'system-in-shutdown' > /run/dsa/shutdown-marker/shutdown-in-progress; else rm -f /run/dsa/shutdown-marker/shutdown-in-progress; fi
+			| EOF
+	}
+	apache2::config { 'local-scheduled-shutdown':
+		source	=> 'puppet:///modules/apache2/local-scheduled-shutdown',
+	}
 }