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

diff --git a/manifests/site.pp b/manifests/site.pp
index 098b96a66..8e72e7d33 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -21,10 +21,10 @@ 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 time
 	include ssl
@@ -40,6 +40,9 @@ node default {
 	include grub
 	include multipath
 	include popcon
+	include portforwarder
+	include postgres
+
 	if $::lsbdistcodename == squeeze {
 		include roles::udldap::client
 	} else {
@@ -69,7 +72,7 @@ node default {
 		include bacula::storage
 	}
 
-	if $::kernel == Linux {
+	if $::kernel == 'Linux' {
 		include linux
 		include acpi
 	} elsif $::kernel == 'GNU/kFreeBSD' {
@@ -96,7 +99,7 @@ node default {
 		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
 	}
 
@@ -104,20 +107,12 @@ node default {
 		include hosts
 	}
 
-	if $::portforwarder_user_exists {
-		include portforwarder
-	}
-
 	if $::samhain {
 		include samhain
 	}
 
 	if $::hostname in [geo3,wieck] {
-		include debian-org::radvd
-	}
-
-	if ($::postgres) {
-		include postgres
+		include debian_org::radvd
 	}
 
 	if $::spamd {