Merge remote-tracking branch 'origin/master' into staging

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

diff --git a/manifests/site.pp b/manifests/site.pp
index fc283db..f4494e6 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -55,15 +55,13 @@ node default {
                }
        }
 
-       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,bm-bl9,bm-bl10,bm-bl11,bm-bl12,bm-bl13,bm-bl14,csail-node01,csail-node02,grnet-node01,grnet-node02,ubc-enc2bl01,ubc-enc2bl02,ubc-enc2bl09,ubc-enc2bl10,conova-node01,conova-node02] {
+       if $::hostname in [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,csail-node01,csail-node02,grnet-node01,grnet-node02,ubc-enc2bl01,ubc-enc2bl02,ubc-enc2bl09,ubc-enc2bl10,conova-node01,conova-node02] {
                include ganeti2
        }
 
        if $::kernel == 'Linux' {
                include linux
                include acpi
-       } elsif $::kernel == 'GNU/kFreeBSD' {
-               include kfreebsd
        }
 
        if $::mta == 'exim4' {
@@ -86,7 +84,7 @@ node default {
                include named::geodns
        }
 
-       if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,senfter,gretchaninov,sibelius] {
+       if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,lw09,lw10,senfter,gretchaninov,sibelius] {
                include nfs_server
        }
 
@@ -107,6 +105,6 @@ node default {
        }
 
        if $::hostname == 'pkgmirror-csail' {
-               include varnish
+               include varnish_pkgmirror
        }
 }