ordering fixups

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 54ed6528471689ca7c14819daf0f5fc6a6bb5a56..8355c6947380d22dfb92524d15a3ba094821b681 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -38,7 +38,9 @@ node default {
                include ganeti2
        }
 
-       if $::hostname in [finzi,fano,fasch,field] {
+       if $::kernel == Linux {
+               include linux
+       } elsif $::kernel == 'GNU/kFreeBSD' {
                include kfreebsd
        }
 
@@ -52,7 +54,7 @@ node default {
                } else {
                        include exim
                }
-       } elsif $::hostname == 'bendel' {
+       } else {
                include postfix
        }
 
@@ -92,6 +94,10 @@ node default {
                include roles::backports_mirror
        }
 
+       if $::hostname in [bizet,morricone] {
+               include roles::backports_master
+       }
+
        if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {
                include roles::ftp-upcoming_mirror
        }
@@ -112,12 +118,6 @@ node default {
                include named::recursor
        }
 
-       if $::kernel == 'Linux' {
-               include ferm
-               include ferm::per-host
-               include entropykey
-       }
-
        if $::hostname in [diabelli,nono,spohr] {
                include dacs
        }
@@ -148,7 +148,7 @@ node default {
                munin::check { 'spamassassin': }
        }
 
-       if $::hostname in [chopin,franck,gluck,kassia,klecker,lobos,morricone,ravel,saens,schein,santoro,steffani,villa,wieck,bizet] {
+       if $::hostname in [chopin,franck,kassia,klecker,ravel] {
                include vsftpd
        }
 }