newline

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 0695176a96a7f48e711045ff3324056263cc060c..c3f57bbe4776e83fbfde938c6be752ac0c7999fd 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -48,7 +48,7 @@ node default {
                }
        }
 
-       if $::hostname in [pasquini,tristano,bertali,boito,ubc-bl8,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 +90,9 @@ node default {
        }
 
        if $::apache2 {
-               include apache2
+               if !($::hostname in [oyens]) {
+                       include apache2
+               }
        }
 
        if $::hostname in [geo1,geo2,geo3] {
@@ -135,3 +137,4 @@ node default {
                }
        }
 }
+