X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=4ce4dde44e5f079ad7ce0eb01f59a2d2148d10f1;hb=6a9da2f1d0bb9e0259b428f4719434467aa7c458;hp=b9382e2606f90e215466b0c42918bd5faffce49a;hpb=87db6fdf68db406ed80a5d6c8bf89e4f4428b365;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index b9382e260..4ce4dde44 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -82,7 +82,7 @@ node default {
 		include apache2
 	}
 
-	if $::hostname in [ravel,senfl,orff,draghi,diamond] {
+	if $::hostname in [ravel,senfl,orff,draghi,diamond,rietz] {
 		include named::authoritative
 	} elsif $::hostname in [geo1,geo2,geo3] {
 		include named::geodns
@@ -108,7 +108,9 @@ node default {
 		include portforwarder
 	}
 
-	include samhain
+	if $::samhain {
+		include samhain
+	}
 
 	if $::hostname in [chopin,geo3,soler,wieck] {
 		include debian-org::radvd
@@ -122,7 +124,7 @@ node default {
 		munin::check { 'spamassassin': }
 	}
 
-        if $::hoster {
+	if $::hoster {
 		if $::hoster in [ynic] {
 			include lldp
 		}