do not run an authority on draghi

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 23d8668def058084bf809d4dc1870917d3b62626..ab6fd7dc66a8265d5a0c54883a4fd1e6a073161a 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -29,18 +29,22 @@ 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,byrd,clementi] {
+       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 {
@@ -53,7 +57,7 @@ node default {
                }
        }
 
-       if $::hostname == 'beethoven' {
+       if $::hostname == 'backuphost' {
                include bacula::storage
        }
 
@@ -82,17 +86,20 @@ node default {
                include apache2
        }
 
-       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
        }
+       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,spohr,stabile,beach] {
+       if $::hostname in [stabile,beach,glinka,milanollo,rautavaara] {
                include nfs-server
        }
 
@@ -108,7 +115,9 @@ node default {
                include portforwarder
        }
 
-       include samhain
+       if $::samhain {
+               include samhain
+       }
 
        if $::hostname in [chopin,geo3,soler,wieck] {
                include debian-org::radvd
@@ -122,7 +131,7 @@ node default {
                munin::check { 'spamassassin': }
        }
 
-        if $::hoster {
+       if $::hoster {
                if $::hoster in [ynic] {
                        include lldp
                }