From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 23 Sep 2019 06:03:27 +0000 (+0200)
Subject: No longer configure apache just because it is installed.  Instead, fail if it is... 
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=c56631a320fac180d4bc296e5fe60a07634e43fb

No longer configure apache just because it is installed.  Instead, fail if it is installed but not pulled in by puppet
---

diff --git a/manifests/site.pp b/manifests/site.pp
index 29ac94ff4..e939261b4 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -41,10 +41,6 @@ node default {
 		include acpi
 	}
 
-	if $::apache2 {
-		include apache2
-	}
-
 	if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,lw09,lw10,senfter,gretchaninov,sibelius] {
 		include nfs_server
 	}
@@ -68,4 +64,10 @@ node default {
 	if $::hostname == 'pkgmirror-csail' {
 		include varnish_pkgmirror
 	}
+
+	if $::apache2 {
+		if ! defined(Class['apache2']) {
+			fail('We have apache installed but no role pulled it in.')
+		}
+	}
 }