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

diff --git a/manifests/site.pp b/manifests/site.pp
index 3681c3614..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
@@ -40,6 +39,7 @@ node default {
 	include dsa_lvm
 	include grub
 	include multipath
+	include popcon
 	if $::lsbdistcodename == squeeze {
 		include roles::udldap::client
 	} else {
@@ -49,7 +49,7 @@ node default {
 		}
 	}
 
-	if $::hostname in [ubc-bl7,ubc-bl3,ubc-bl2,ubc-bl6,ubc-bl8,ubc-bl4,byrd,clementi,czerny,bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,csail-node01,csail-node02,grnet-node01,grnet-node02] {
+	if $::hostname in [ubc-bl7,ubc-bl3,ubc-bl2,ubc-bl6,ubc-bl8,ubc-bl4,byrd,clementi,czerny,bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,bm-bl9,bm-bl10,bm-bl11,bm-bl12,bm-bl13,bm-bl14,csail-node01,csail-node02,grnet-node01,grnet-node02,ubc-enc2bl01,ubc-enc2bl02,ubc-enc2bl09,ubc-enc2bl10] {
 		include ganeti2
 	}
 
@@ -89,20 +89,14 @@ node default {
 	}
 
 	if $::apache2 {
-		if !($::hostname in [oyens]) {
-			include apache2
-		}
+		include apache2
 	}
 
 	if $::hostname in [geo1,geo2,geo3] {
 		include named::geodns
 	}
 
-	#if $::hostname in [diabelli,nono,tchaikovsky] {
-	#	include dacs
-	#}
-
-	if $::hostname in [buxtehude,glinka,milanollo,lw01,lw02,lw03,lw04] {
+	if $::hostname in [buxtehude,glinka,milanollo,lw01,lw02,lw03,lw04,senfter,gretchaninov] {
 		include nfs-server
 	}
 
@@ -130,10 +124,7 @@ node default {
 		munin::check { 'spamassassin': }
 	}
 
-	if $::hoster {
-		if $::hoster in [ynic] {
-			include lldp
-		}
+	if $::hostname == 'pkgmirror-csail' {
+		include varnish
 	}
 }
-