Do backups of dinis

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 9c714a5c3e0cdb23840ec384ba1e7322f959aaef..218452a84f4215fad0a3cf9d15145055d1eb850b 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1,6 +1,5 @@
 Package {
-       require => File['/etc/apt/apt.conf.d/local-recommends'],
-       stage   => deploy_infra
+       require => File['/etc/apt/apt.conf.d/local-recommends']
 }
 
 File {
@@ -35,56 +34,65 @@ node default {
        include nagios::client
        include resolv
        include roles
+       include unbound
+       include bacula::client
 
-       if $::hostname in [pasquini,tristano] {
+       if $::hostname in [pasquini,tristano,bertali,boito,byrd] {
                include ganeti2
        }
 
+       if $::hostname == 'dinis' {
+               include bacula::director
+       } else {
+               package { 'bacula-console':
+                       ensure => purged;
+               }
+
+               file { '/etc/bacula/bconsole.conf':
+                       ensure => absent;
+               }
+       }
+
+       if $::hostname == 'beethoven' {
+               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
+       } 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] {
                include dacs
        }
 
-       if $::hostname in [beethoven,duarte,spohr,stabile] {
+       if $::hostname in [beethoven,spohr,stabile,beach] {
                include nfs-server
        }
 
@@ -106,11 +114,11 @@ node default {
                include postgres
        }
 
-       if $::spamd {
-               munin::check { 'spamassassin': }
+       if $::hostname in ['berlioz', 'biber', 'diabelli', 'dinis', 'draghi', 'widor', 'wolkenstein'] {
+               @@bacula::node { $::fqdn: }
        }
 
-       if $::hostname in [chopin,franck,ravel] {
-               include vsftpd
+       if $::spamd {
+               munin::check { 'spamassassin': }
        }
 }