X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=a5c0ced31f68847e157ffcabfe87d7cdc15fa375;hb=ef6096766cebab114509587d10d16afb39bd15b1;hp=bce16e630acccd5f622355a7065e6c3a8a659b7d;hpb=56dbe9f44ab159f71b3ef8fa4dece96cd6845ae3;p=dsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index bce16e63..a5c0ced3 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -38,6 +38,7 @@ node default {
 	include bacula::client
 	include autofs
 	include lvm
+	include grub
 	include multipath
 	if $::lsbdistcodename == squeeze {
 		include roles::udldap::client
@@ -90,7 +91,9 @@ node default {
 	}
 
 	if $::apache2 {
-		include apache2
+		if !($::hostname in [oyens]) {
+			include apache2
+		}
 	}
 
 	if $::hostname in [geo1,geo2,geo3] {
@@ -135,3 +138,4 @@ node default {
 		}
 	}
 }
+