X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=manifests%2Fsite.pp;h=c671af50842f97190fbffc705979506ecc428d76;hb=836eff39ec561176cd00cc2d7b4e66e9668a25ee;hp=9b3aa43b584fa759bf6e3e6549c4f330fc485b3f;hpb=3a36bb2220e5f0d420a23f1de07152cbea63a897;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 9b3aa43b5..c671af508 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
@@ -40,6 +39,7 @@ node default {
 	include dsa_lvm
 	include grub
 	include multipath
+	include popcon
 	if $::lsbdistcodename == squeeze {
 		include roles::udldap::client
 	} else {
@@ -89,9 +89,7 @@ node default {
 	}
 
 	if $::apache2 {
-		if !($::hostname in [oyens]) {
-			include apache2
-		}
+		include apache2
 	}
 
 	if $::hostname in [geo1,geo2,geo3] {
@@ -131,5 +129,8 @@ node default {
 			include lldp
 		}
 	}
-}
 
+	if $::hostname == 'pkgmirror-csail' {
+		include varnish
+	}
+}