variable assignment does not clone string...

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

diff --git a/manifests/site.pp b/manifests/site.pp
index f1d2e4d4fa7a6dd7f79fc96260b2508fb47ea5a2..3ccacfe0b76384534e76921fb5b41f77c9d50582 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -36,13 +36,21 @@ node default {
        include motd
        include unbound
        include bacula::client
-
-       if $::hostname in [pasquini,tristano,bertali,boito,byrd,clementi,czerny,rossini,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
+       include autofs
+       include lvm
+       include grub
+       include multipath
+       if $::lsbdistcodename == squeeze {
+               include roles::udldap::client
+       } else {
+               include roles::pubsub::client
+               class { 'roles::udldap::client':
+                       ensure => absent
+               }
        }
 
-       if $::hostname in [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 multipath
+       if $::hostname in [ubc-bl7,ubc-bl3,ubc-bl2,ubc-bl6,ubc-bl8,ubc-bl4,byrd,clementi,czerny,bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,csail-node01,csail-node02,grnet-node01,grnet-node02] {
+               include ganeti2
        }
 
        if $::hostname == 'dinis' {
@@ -57,7 +65,7 @@ node default {
                }
        }
 
-       if $::hostname == 'beethoven' {
+       if $::hostname == 'storace' {
                include bacula::storage
        }
 
@@ -83,27 +91,23 @@ node default {
        }
 
        if $::apache2 {
-               include apache2
+               if !($::hostname in [oyens]) {
+                       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 [diabelli,nono,spohr] {
-               include dacs
-       }
+       #if $::hostname in [diabelli,nono,tchaikovsky] {
+       #       include dacs
+       #}
 
-       if $::hostname in [beethoven,spohr,stabile,beach,glinka,milanollo] {
+       if $::hostname in [beach,glinka,milanollo,lw01,lw02,lw03,lw04] {
                include nfs-server
        }
 
-       if $::hostname == 'vieuxtemps' {
-               include varnish
-       }
-
        if $::brokenhosts {
                include hosts
        }
@@ -116,7 +120,7 @@ node default {
                include samhain
        }
 
-       if $::hostname in [chopin,geo3,soler,wieck] {
+       if $::hostname in [chopin,geo3,wieck] {
                include debian-org::radvd
        }
 
@@ -134,3 +138,4 @@ node default {
                }
        }
 }
+