all are moved over

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 18e237725243f0cbf1eab1380fb31c077b932e8b..3cb7b30ba6951ce9e02669782c64bec049d69be8 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -33,12 +33,15 @@ node default {
        include hardware
        include nagios::client
        include resolv
+       include roles
 
        if $::hostname in [pasquini,tristano] {
                include ganeti2
        }
 
-       if $::hostname in [finzi,fano,fasch,field] {
+       if $::kernel == Linux {
+               include linux
+       } elsif $::kernel == 'GNU/kFreeBSD' {
                include kfreebsd
        }
 
@@ -52,7 +55,7 @@ node default {
                } else {
                        include exim
                }
-       } elsif $::hostname == 'bendel' {
+       } else {
                include postfix
        }
 
@@ -60,42 +63,6 @@ node default {
                include unbound
        }
 
-       if getfromhash($site::nodeinfo, 'puppetmaster') {
-               include puppetmaster
-       }
-
-       if getfromhash($site::nodeinfo, 'muninmaster') {
-               include munin::master
-       }
-
-       if getfromhash($site::nodeinfo, 'nagiosmaster') {
-               include nagios::server
-       }
-
-       if getfromhash($site::nodeinfo, 'buildd') {
-               include buildd
-       }
-
-       if $::hostname in [chopin,franck,morricone,bizet] {
-               include roles::dakmaster
-       }
-
-       if getfromhash($site::nodeinfo, 'apache2_security_mirror') {
-               include roles::security_mirror
-       }
-
-       if getfromhash($site::nodeinfo, 'apache2_www_mirror') {
-               include roles::www_mirror
-       }
-
-       if getfromhash($site::nodeinfo, 'apache2_backports_mirror') {
-               include roles::backports_mirror
-       }
-
-       if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {
-               include roles::ftp-upcoming_mirror
-       }
-
        if $::apache2 {
                include apache2
        }
@@ -112,12 +79,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
        }
@@ -147,14 +108,4 @@ node default {
        if $::spamd {
                munin::check { 'spamassassin': }
        }
-
-       if $::vsftpd {
-               package { 'logtail':
-                       ensure => installed
-               }
-               munin::check { 'vsftpd': }
-               munin::check { 'ps_vsftpd':
-                       script => 'ps_'
-               }
-       }
 }