From 51a7173ff33621ad8f203107d559fc495c91e756 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Wed, 2 May 2012 08:20:20 +0100 Subject: [PATCH] some manifest tidy Signed-off-by: Stephen Gran --- manifests/site.pp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index 593be680..acde9e39 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -34,6 +34,7 @@ node default { include nagios::client include resolv include roles + include unbound if $::hostname in [pasquini,tristano] { include ganeti2 @@ -41,14 +42,13 @@ node default { if $::kernel == Linux { include linux + if $::kvmdomain { + include acpi + } } elsif $::kernel == 'GNU/kFreeBSD' { include kfreebsd } - if $::kvmdomain { - include acpi - } - if $::mta == 'exim4' { if getfromhash($site::nodeinfo, 'heavy_exim') { include exim::mx @@ -59,8 +59,6 @@ node default { include postfix } - include unbound - if $::apache2 { include apache2 } -- 2.39.2