move logic out of main manifest

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 77007e1..75bac4c 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
        }
 
@@ -112,12 +114,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
        }