try to order these a bit

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 54ed6528471689ca7c14819daf0f5fc6a6bb5a56..9c714a5c3e0cdb23840ec384ba1e7322f959aaef 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1,5 +1,6 @@
 Package {
-       require => File['/etc/apt/apt.conf.d/local-recommends']
+       require => File['/etc/apt/apt.conf.d/local-recommends'],
+       stage   => deploy_infra
 }
 
 File {
@@ -33,12 +34,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 +56,7 @@ node default {
                } else {
                        include exim
                }
-       } elsif $::hostname == 'bendel' {
+       } else {
                include postfix
        }
 
@@ -60,42 +64,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 +80,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 +110,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,ravel] {
                include vsftpd
        }
 }