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

diff --git a/manifests/site.pp b/manifests/site.pp
index c06a64117..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
@@ -70,7 +69,7 @@ node default {
 		include bacula::storage
 	}
 
-	if $::kernel == Linux {
+	if $::kernel == 'Linux' {
 		include linux
 		include acpi
 	} elsif $::kernel == 'GNU/kFreeBSD' {
@@ -90,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
 	}
 
@@ -116,7 +113,7 @@ node default {
 	}
 
 	if $::hostname in [geo3,wieck] {
-		include debian-org::radvd
+		include debian_org::radvd
 	}
 
 	if ($::postgres) {
@@ -127,10 +124,7 @@ node default {
 		munin::check { 'spamassassin': }
 	}
 
-	if $::hoster {
-		if $::hoster in [ynic] {
-			include lldp
-		}
+	if $::hostname == 'pkgmirror-csail' {
+		include varnish
 	}
 }
-