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

diff --git a/manifests/site.pp b/manifests/site.pp
index 9b3aa43b5..28a443c29 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -21,13 +21,12 @@ Service {
 node default {
 	include site
 	include munin
-	include syslog-ng
+	include syslog_ng
 	include sudo
 	include ssh
-	include debian-org
+	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 {
@@ -69,7 +69,7 @@ node default {
 		include bacula::storage
 	}
 
-	if $::kernel == Linux {
+	if $::kernel == 'Linux' {
 		include linux
 		include acpi
 	} elsif $::kernel == 'GNU/kFreeBSD' {
@@ -89,16 +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 [buxtehude,glinka,milanollo,lw01,lw02,lw03,lw04,senfter,gretchaninov] {
+	if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,senfter,gretchaninov] {
 		include nfs-server
 	}
 
@@ -115,7 +113,7 @@ node default {
 	}
 
 	if $::hostname in [geo3,wieck] {
-		include debian-org::radvd
+		include debian_org::radvd
 	}
 
 	if ($::postgres) {
@@ -126,10 +124,7 @@ node default {
 		munin::check { 'spamassassin': }
 	}
 
-	if $::hoster {
-		if $::hoster in [ynic] {
-			include lldp
-		}
+	if $::hostname == 'pkgmirror-csail' {
+		include varnish
 	}
 }
-