X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=a02ad66055e48ea2b1791635e101cba709e33096;hb=6ce2aaa8c4bc079dd726c4d1c8b2519a51fb2da3;hp=091e769bdc195b8248ee0d70b12f35accb25f626;hpb=13e495c55be6f08f72739620b0dcbff2b9635474;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 091e769bd..a02ad6605 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 {
@@ -98,10 +98,6 @@ node default {
 		include named::geodns
 	}
 
-	#if $::hostname in [diabelli,nono,tchaikovsky] {
-	#	include dacs
-	#}
-
 	if $::hostname in [buxtehude,glinka,milanollo,lw01,lw02,lw03,lw04,senfter,gretchaninov] {
 		include nfs-server
 	}