Add the certregen::client class to all nodes

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 5f31bc5..6b8be82 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -21,13 +21,12 @@ Service {
 node default {
        include site
        include munin
-       include syslog-ng
+       include syslog_ng
        include sudo
        include ssh
-       include debian-org
+       include debian_org
        include monit
-       include ntp
-       include ntpdate
+       include time
        include ssl
        include hardware
        include nagios::client
@@ -37,37 +36,33 @@ node default {
        include unbound
        include bacula::client
        include autofs
-       include lvm
+       include dsa_lvm
+       include grub
        include multipath
-
-       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,bm-bl9,bm-bl10,bm-bl11,bm-bl12,bm-bl13,bm-bl14] {
-               include ganeti2
-       }
-
-
-       if $::hostname == 'dinis' {
-               include bacula::director
+       include popcon
+       include portforwarder
+       include postgres
+       include haveged
+       include huge_mem
+       include tcp_bbr
+       include certregen::client
+
+       if $::lsbdistcodename == squeeze {
+               include roles::udldap::client
        } else {
-               package { 'bacula-console':
-                       ensure => purged;
-               }
-
-               file { '/etc/bacula/bconsole.conf':
-                       ensure => absent;
+               include roles::pubsub::client
+               class { 'roles::udldap::client':
+                       ensure => absent
                }
        }
 
-       if $::hostname == 'beethoven' {
-               include bacula::storage
+       if getfromhash($site::nodeinfo, 'ganeti') {
+               include ganeti2
        }
 
-       if $::kernel == Linux {
+       if $::kernel == 'Linux' {
                include linux
-               if $::kvmdomain {
-                       include acpi
-               }
-       } elsif $::kernel == 'GNU/kFreeBSD' {
-               include kfreebsd
+               include acpi
        }
 
        if $::mta == 'exim4' {
@@ -86,54 +81,31 @@ node default {
                include apache2
        }
 
-       if $::hostname in [ravel,senfl,orff,draghi,diamond,rietz] {
-               include named::authoritative
-       } elsif $::hostname in [geo1,geo2,geo3] {
+       if $::hostname in [geo1,geo2,geo3] {
                include named::geodns
        }
-       if $::hostname in [orff] {
-               include dnsextras::entries
-       }
 
-       if $::hostname in [diabelli,nono,spohr] {
-               include dacs
-       }
-
-       if $::hostname in [beethoven,spohr,stabile,beach,glinka,milanollo,rautavaara] {
-               include nfs-server
-       }
-
-       if $::hostname == 'vieuxtemps' {
-               include varnish
+       if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,lw09,lw10,senfter,gretchaninov,sibelius] {
+               include nfs_server
        }
 
        if $::brokenhosts {
                include hosts
        }
 
-       if $::portforwarder_user_exists {
-               include portforwarder
-       }
-
        if $::samhain {
                include samhain
        }
 
-       if $::hostname in [chopin,geo3,soler,wieck] {
-               include debian-org::radvd
-       }
-
-       if ($::postgres) {
-               include postgres
+       if $::hostname in [geo3,wieck] {
+               include debian_org::radvd
        }
 
        if $::spamd {
                munin::check { 'spamassassin': }
        }
 
-       if $::hoster {
-               if $::hoster in [ynic] {
-                       include lldp
-               }
+       if $::hostname == 'pkgmirror-csail' {
+               include varnish_pkgmirror
        }
 }