Try different file names, to see if that pleases puppet

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 19359263f4f61c2b5dcdd355ed54f224f97fa54a..6123122491d6661c7e8a7f66b40a7a283110f8fe 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -33,93 +33,46 @@ node default {
        include hardware
        include nagios::client
        include resolv
+       include roles
+       include unbound
 
        if $::hostname in [pasquini,tristano] {
                include ganeti2
        }
 
+       if $::hostname == 'dinis' {
+               include bacula::director
+       }
+
        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
-       }
-
-       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, 'ftp.d.o') {
-               include roles::ftp
-       }
-
-       if $::hostname in [bizet,morricone] {
-               include roles::backports_master
-       }
-
-       if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {
-               include roles::ftp-upcoming_mirror
+       } else {
+               include exim
        }
 
        if $::apache2 {
                include apache2
        }
 
-       if $::rsyncd {
-               include rsyncd-log
-       }
-
        if $::hostname in [ravel,senfl,orff,draghi,diamond] {
                include named::authoritative
        } elsif $::hostname in [geo1,geo2,geo3] {
                include named::geodns
-       } elsif $::hostname == 'liszt' {
-               include named::recursor
        }
 
        if $::hostname in [diabelli,nono,spohr] {
@@ -151,8 +104,4 @@ node default {
        if $::spamd {
                munin::check { 'spamassassin': }
        }
-
-       if $::hostname in [chopin,franck,ravel] {
-               include vsftpd
-       }
 }