try to rolify dns

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 2f6d8b3af98f0c092a4d28aa6e19753c0b30c5fb..eecf27cd6768e3529a98a41521b0d25b196c6dd4 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -57,7 +57,7 @@ node default {
                }
        }
 
-       if $::hostname == 'beethoven' {
+       if $::hostname == 'backuphost' {
                include bacula::storage
        }
 
@@ -86,20 +86,15 @@ node default {
                include apache2
        }
 
-       if $::hostname in [ravel,senfl,orff,draghi,diamond,rietz] {
-               include named::authoritative
-       } elsif $::hostname in [geo1,geo2,geo3] {
+       if $::hostname in [geo1,geo2,geo3] {
                include named::geodns
        }
-       if $::hostname in [orff] {
-               include dnsextras::entries
-       }
 
        if $::hostname in [diabelli,nono] {
                include dacs
        }
 
-       if $::hostname in [beethoven,stabile,beach,glinka,milanollo,rautavaara] {
+       if $::hostname in [stabile,beach,glinka,milanollo,rautavaara] {
                include nfs-server
        }