X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=5fa11d405db8d258cd276a83464c24629567d85b;hb=06f9a20372d9023517b87780bb5a411a37d0c4b0;hp=8aacde987b9aee411ab36bb095904b85d941b24a;hpb=bedd29e6a7b4c3539e37d23c9025898fb1f9311c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 8aacde987..5fa11d405 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -105,10 +105,8 @@ class apache2 {
 		apache2::module { 'mpm_prefork': ensure => absent }
 		apache2::module { 'mpm_worker': }
 	}
-	if versioncmp($::lsbmajdistrelease, '7') > 0 {
-		file { '/etc/apache2/mods-available/mpm_worker.conf':
-			content => template('apache2/mpm_worker.erb'),
-		}
+	file { '/etc/apache2/mods-available/mpm_worker.conf':
+		content => template('apache2/mpm_worker.erb'),
 	}
 
 	file { '/etc/apache2/sites-available/common-ssl.inc':
@@ -154,7 +152,7 @@ class apache2 {
 	}
 
 	if (! has_role('apache_not_public')) {
-		if $::hostname in [beach,buxtehude,picconi,pkgmirror-csail] {
+		if has_role('apache_ratelimited') {
 			include apache2::dynamic
 		} else {
 			@ferm::rule { 'dsa-http':
@@ -162,13 +160,13 @@ class apache2 {
 				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))'
+			}
 		}
 	}