sigh, typo

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 07bc8eab7957a7c960cb62410ea9216ccac336a5..4dc9fc99c161bea83db65e0dcea125c7db77799b 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -29,22 +29,42 @@ 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 $::lsbdistcodename == squeeze {
+               include roles::udldap::client
+       } else {
+               include roles::pubsub::client
+               class { 'roles::udldap::client':
+                       ensure => absent
+               }
+       }
 
-       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 == 'beethoven' {
+       if $::hostname == 'backuphost' {
                include bacula::storage
        }
 
@@ -73,20 +93,22 @@ node default {
                include apache2
        }
 
-       if $::hostname in [ravel,senfl,orff,draghi,diamond] {
-               include named::authoritative
-       } elsif $::hostname in [geo1,geo2,geo3] {
+       if $::hostname in [geo1,geo2,geo3] {
                include named::geodns
        }
 
-       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
        }
@@ -95,17 +117,25 @@ 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
        }
 
        if $::spamd {
                munin::check { 'spamassassin': }
        }
+
+       if $::hoster {
+               if $::hoster in [ynic] {
+                       include lldp
+               }
+       }
 }