retire oyens

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 41d88df..988dd79 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -26,18 +26,30 @@ node default {
        include ssh
        include debian-org
        include monit
-       include ntp
-       include ntpdate
+       include time
        include ssl
-       include motd
        include hardware
        include nagios::client
        include resolv
        include roles
+       include motd
        include unbound
        include bacula::client
+       include autofs
+       include dsa_lvm
+       include grub
+       include multipath
+       include popcon
+       if $::lsbdistcodename == squeeze {
+               include roles::udldap::client
+       } else {
+               include roles::pubsub::client
+               class { 'roles::udldap::client':
+                       ensure => absent
+               }
+       }
 
-       if $::hostname in [pasquini,tristano,bertali,boito,byrd,clementi] {
+       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
        }
 
@@ -53,15 +65,13 @@ node default {
                }
        }
 
-       if $::hostname == 'beethoven' {
+       if $::hostname == 'storace' {
                include bacula::storage
        }
 
        if $::kernel == Linux {
                include linux
-               if $::kvmdomain {
-                       include acpi
-               }
+               include acpi
        } elsif $::kernel == 'GNU/kFreeBSD' {
                include kfreebsd
        }
@@ -82,17 +92,11 @@ node default {
                include apache2
        }
 
-       if $::hostname in [ravel,senfl,orff,draghi,diamond] {
-               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 [beethoven,spohr,stabile,beach] {
+       if $::hostname in [buxtehude,glinka,milanollo,lw01,lw02,lw03,lw04,senfter,gretchaninov] {
                include nfs-server
        }
 
@@ -104,9 +108,11 @@ node default {
                include portforwarder
        }
 
-       include samhain
+       if $::samhain {
+               include samhain
+       }
 
-       if $::hostname in [chopin,geo3,soler,wieck] {
+       if $::hostname in [geo3,wieck] {
                include debian-org::radvd
        }
 
@@ -118,7 +124,10 @@ node default {
                munin::check { 'spamassassin': }
        }
 
-       if $::hoster in [ynic] {
-               include lldp
+       if $::hoster {
+               if $::hoster in [ynic] {
+                       include lldp
+               }
        }
 }
+