No longer configure apache just because it is installed. Instead, fail if it is...

diff --git a/manifests/site.pp b/manifests/site.pp
index 29ac94f..e939261 100644 (file)
--- 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.')
+               }
+       }
 }