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
include dsa_lvm
include grub
include multipath
+ include popcon
if $::lsbdistcodename == squeeze {
include roles::udldap::client
} else {
include bacula::storage
}
- if $::kernel == Linux {
+ if $::kernel == 'Linux' {
include linux
include acpi
} elsif $::kernel == 'GNU/kFreeBSD' {
}
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] {
+ if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,senfter,gretchaninov] {
include nfs-server
}
}
if $::hostname in [geo3,wieck] {
- include debian-org::radvd
+ include debian_org::radvd
}
if ($::postgres) {
munin::check { 'spamassassin': }
}
- if $::hoster {
- if $::hoster in [ynic] {
- include lldp
- }
+ if $::hostname == 'pkgmirror-csail' {
+ include varnish
}
}
-