Maybe this will put the exim config, including firewall config, back onto hosts.

[dsa-puppet.git] / manifests / site.pp

diff --git a/manifests/site.pp b/manifests/site.pp
index 3aa5990985c37b4d78987b6c29701b2953db822e..c3a3657c35f92c1a53c9cf77e3135f999a4163e9 100644 (file)
--- 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,26 +42,23 @@ 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
                } else {
                        include exim
                }
-       } else {
+       } elsif $::mta == 'postfix' {
                include postfix
-       }
-
-       if $::lsbdistcodename != 'lenny' {
-               include unbound
+       } else {
+               include exim
        }
 
        if $::apache2 {
@@ -75,8 +73,6 @@ node default {
                include named::authoritative
        } elsif $::hostname in [geo1,geo2,geo3] {
                include named::geodns
-       } elsif $::hostname == 'liszt' {
-               include named::recursor
        }
 
        if $::hostname in [diabelli,nono,spohr] {
@@ -108,8 +104,4 @@ node default {
        if $::spamd {
                munin::check { 'spamassassin': }
        }
-
-       if $::hostname in [chopin,franck,ravel] {
-               include vsftpd
-       }
 }