variable assignment does not clone string...

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

diff --git a/manifests/site.pp b/manifests/site.pp
index e25c134661c2f1a9dafff2b92799cc72db6e4dff..3ccacfe0b76384534e76921fb5b41f77c9d50582 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -38,6 +38,7 @@ node default {
        include bacula::client
        include autofs
        include lvm
+       include grub
        include multipath
        if $::lsbdistcodename == squeeze {
                include roles::udldap::client
@@ -48,7 +49,7 @@ node default {
                }
        }
 
-       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,csail-node01,csail-node02,grnet-node01,grnet-node02] {
+       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
        }
 
@@ -90,7 +91,9 @@ node default {
        }
 
        if $::apache2 {
-               include apache2
+               if !($::hostname in [oyens]) {
+                       include apache2
+               }
        }
 
        if $::hostname in [geo1,geo2,geo3] {
@@ -101,7 +104,7 @@ node default {
        #       include dacs
        #}
 
-       if $::hostname in [stabile,beach,glinka,milanollo,rautavaara,lw01,lw02,lw03,lw04] {
+       if $::hostname in [beach,glinka,milanollo,lw01,lw02,lw03,lw04] {
                include nfs-server
        }
 
@@ -117,7 +120,7 @@ node default {
                include samhain
        }
 
-       if $::hostname in [chopin,geo3,soler,wieck] {
+       if $::hostname in [chopin,geo3,wieck] {
                include debian-org::radvd
        }
 
@@ -135,3 +138,4 @@ node default {
                }
        }
 }
+