X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=8e4a77ac332759f66c66d6608d4892c68c1a3a1b;hb=df11d54a271217ab177aab7e1fac339a8478e130;hp=f75f0f87943468e91863492fbaee6ea67825d921;hpb=293e30c707a09ba192111b8c4a98442caac5e191;p=dsa-puppet.git diff --git a/manifests/site.pp b/manifests/site.pp index f75f0f87..8e4a77ac 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -29,23 +29,32 @@ 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,bertali,boito] { + 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; + } - if $::hostname in [berlioz, biber, draghi] { - include bacula::client + file { '/etc/bacula/bconsole.conf': + ensure => absent; + } } if $::hostname == 'beethoven' { @@ -77,7 +86,7 @@ node default { include apache2 } - if $::hostname in [ravel,senfl,orff,draghi,diamond] { + if $::hostname in [ravel,senfl,orff,draghi,diamond,rietz] { include named::authoritative } elsif $::hostname in [geo1,geo2,geo3] { include named::geodns @@ -87,10 +96,14 @@ node default { include dacs } - if $::hostname in [beethoven,duarte,spohr,stabile,beach] { + if $::hostname in [beethoven,spohr,stabile,beach,glinka,milanollo] { include nfs-server } + if $::hostname == 'vieuxtemps' { + include varnish + } + if $::brokenhosts { include hosts } @@ -99,17 +112,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 + } + } }