retire oyens

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 7f7b885..988dd79 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -26,8 +26,7 @@ node default {
        include ssh
        include debian-org
        include monit
-       include ntp
-       include ntpdate
+       include time
        include ssl
        include hardware
        include nagios::client
@@ -40,6 +39,7 @@ node default {
        include dsa_lvm
        include grub
        include multipath
+       include popcon
        if $::lsbdistcodename == squeeze {
                include roles::udldap::client
        } else {
@@ -49,7 +49,7 @@ 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-enc2bl1,ubc-enc2bl2,ubc-enc2bl9,ubc-enc2bl10] {
+       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] {
                include ganeti2
        }
 
@@ -89,19 +89,13 @@ node default {
        }
 
        if $::apache2 {
-               if !($::hostname in [oyens]) {
-                       include apache2
-               }
+               include apache2
        }
 
        if $::hostname in [geo1,geo2,geo3] {
                include named::geodns
        }
 
-       #if $::hostname in [diabelli,nono,tchaikovsky] {
-       #       include dacs
-       #}
-
        if $::hostname in [buxtehude,glinka,milanollo,lw01,lw02,lw03,lw04,senfter,gretchaninov] {
                include nfs-server
        }