X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=8aacde987b9aee411ab36bb095904b85d941b24a;hb=66d60da21f12709b55a7a819434eeec2959588aa;hp=4f07934cb081a915933b4f4f61320528527c9be1;hpb=3c6ec3bea56f171d8864c0c8eb04680477e40c7b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 4f07934cb..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') {
@@ -157,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':
@@ -186,8 +184,12 @@ class apache2 {
 		notify  => Exec['service apache2 reload'],
 	}
 
-	file { '/etc/cron.d/puppet-export-scheduled-shutdown':
-		source	=> 'puppet:///modules/apache2/cron-export-scheduled-shutdown',
+	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',