X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=098b96a66bfd134613d53024a9aa9c444c875f90;hb=5a7c80d8eff8cdd46fd1c03071a72ac2d2d60a11;hp=c06a64117b5b5f8dc8a474e13a343802ceafeb47;hpb=76a45767a4a3388504d2aeea300a8365291f3cce;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index c06a64117..098b96a66 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -26,8 +26,7 @@ node default {
 	include ssh
 	include debian-org
 	include monit
-	include ntp
-	include ntpdate
+	include time
 	include ssl
 	include hardware
 	include nagios::client
@@ -90,9 +89,7 @@ node default {
 	}
 
 	if $::apache2 {
-		if !($::hostname in [oyens]) {
-			include apache2
-		}
+		include apache2
 	}
 
 	if $::hostname in [geo1,geo2,geo3] {
@@ -127,10 +124,7 @@ node default {
 		munin::check { 'spamassassin': }
 	}
 
-	if $::hoster {
-		if $::hoster in [ynic] {
-			include lldp
-		}
+	if $::hostname == 'pkgmirror-csail' {
+		include varnish
 	}
 }
-