do not run an authority on draghi

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 19359263f4f61c2b5dcdd355ed54f224f97fa54a..ab6fd7dc66a8265d5a0c54883a4fd1e6a073161a 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -29,107 +29,84 @@ node default {
        include ntp
        include ntpdate
        include ssl
-       include motd
        include hardware
        include nagios::client
        include resolv
+       include roles
+       include motd
+       include unbound
+       include bacula::client
+       include autofs
+       include lvm
+       include multipath
 
-       if $::hostname in [pasquini,tristano] {
+       if $::hostname in [pasquini,tristano,bertali,boito,rossini,salieri,dijkstra,luchesi,byrd,clementi,czerny,bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,bm-bl9,bm-bl10,bm-bl11,bm-bl12,bm-bl13,bm-bl14] {
                include ganeti2
        }
 
+
+       if $::hostname == 'dinis' {
+               include bacula::director
+       } else {
+               package { 'bacula-console':
+                       ensure => purged;
+               }
+
+               file { '/etc/bacula/bconsole.conf':
+                       ensure => absent;
+               }
+       }
+
+       if $::hostname == 'backuphost' {
+               include bacula::storage
+       }
+
        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] {
+       if $::hostname in [ravel,senfl,orff,diamond,rietz,denis] {
                include named::authoritative
        } elsif $::hostname in [geo1,geo2,geo3] {
                include named::geodns
-       } elsif $::hostname == 'liszt' {
-               include named::recursor
+       }
+       if $::hostname in [orff, denis] {
+               include dnsextras::entries
        }
 
-       if $::hostname in [diabelli,nono,spohr] {
+       if $::hostname in [diabelli,nono] {
                include dacs
        }
 
-       if $::hostname in [beethoven,duarte,spohr,stabile] {
+       if $::hostname in [stabile,beach,glinka,milanollo,rautavaara] {
                include nfs-server
        }
 
+       if $::hostname == 'vieuxtemps' {
+               include varnish
+       }
+
        if $::brokenhosts {
                include hosts
        }
@@ -138,13 +115,15 @@ node default {
                include portforwarder
        }
 
-       include samhain
+       if $::samhain {
+               include samhain
+       }
 
        if $::hostname in [chopin,geo3,soler,wieck] {
                include debian-org::radvd
        }
 
-       if ($::postgres84 or $::postgres90) {
+       if ($::postgres) {
                include postgres
        }
 
@@ -152,7 +131,9 @@ node default {
                munin::check { 'spamassassin': }
        }
 
-       if $::hostname in [chopin,franck,ravel] {
-               include vsftpd
+       if $::hoster {
+               if $::hoster in [ynic] {
+                       include lldp
+               }
        }
 }