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 28a443c..6b8be82 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -40,6 +40,13 @@ node default {
        include grub
        include multipath
        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 {
@@ -49,31 +56,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] {
+       if getfromhash($site::nodeinfo, 'ganeti') {
                include ganeti2
        }
 
-       if $::hostname == 'dinis' {
-               include bacula::director
-       } else {
-               package { 'bacula-console':
-                       ensure => purged;
-               }
-
-               file { '/etc/bacula/bconsole.conf':
-                       ensure => absent;
-               }
-       }
-
-       if $::hostname == 'storace' {
-               include bacula::storage
-       }
-
        if $::kernel == 'Linux' {
                include linux
                include acpi
-       } elsif $::kernel == 'GNU/kFreeBSD' {
-               include kfreebsd
        }
 
        if $::mta == 'exim4' {
@@ -96,18 +85,14 @@ node default {
                include named::geodns
        }
 
-       if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,senfter,gretchaninov] {
-               include nfs-server
+       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
        }
@@ -116,15 +101,11 @@ node default {
                include debian_org::radvd
        }
 
-       if ($::postgres) {
-               include postgres
-       }
-
        if $::spamd {
                munin::check { 'spamassassin': }
        }
 
        if $::hostname == 'pkgmirror-csail' {
-               include varnish
+               include varnish_pkgmirror
        }
 }