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

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 985620fa5..8aacde987 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -153,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':