X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=97e962abe1ca4db8ae9ede116665ef00f85c3b43;hb=d86d9ae66df267a773e231227bf4f08da88c46ad;hp=55d18f819bf5313391c9200101b170852458e3ba;hpb=2bac5cd16d08f76d19b66c40d386009c24e87b76;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 55d18f819..97e962abe 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -41,6 +41,7 @@ node default {
 	include multipath
 	include popcon
 	include portforwarder
+	include postgres
 
 	if $::lsbdistcodename == squeeze {
 		include roles::udldap::client
@@ -99,7 +100,7 @@ node default {
 	}
 
 	if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,senfter,gretchaninov] {
-		include nfs-server
+		include nfs_server
 	}
 
 	if $::brokenhosts {
@@ -114,10 +115,6 @@ node default {
 		include debian_org::radvd
 	}
 
-	if ($::postgres) {
-		include postgres
-	}
-
 	if $::spamd {
 		munin::check { 'spamassassin': }
 	}