Merge branch 'zobel-salsa'

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 0089f12..b0bd0f9 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -21,24 +21,46 @@ 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 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
+       include portforwarder
+       include postgres
+       include haveged
+       include huge_mem
+       include tcp_bbr
+
+       if $::lsbdistcodename == squeeze {
+               include roles::udldap::client
+       } else {
+               include roles::pubsub::client
+               class { 'roles::udldap::client':
+                       ensure => absent
+               }
+       }
 
-       if $::hostname in [finzi,fano,fasch,field] {
-               include kfreebsd
+       if $::hostname in [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,conova-node01,conova-node02] {
+               include ganeti2
        }
 
-       if $::kvmdomain {
+       if $::kernel == 'Linux' {
+               include linux
                include acpi
        }
 
@@ -48,107 +70,41 @@ node default {
                } else {
                        include exim
                }
-       }
-
-       if $::lsbdistcodename != 'lenny' {
-               include unbound
-       }
-
-       if getfromhash($site::nodeinfo, 'puppetmaster') {
-               include puppetmaster
-       }
-
-       if getfromhash($site::nodeinfo, 'muninmaster') {
-               include munin::master
-       }
-
-       if getfromhash($site::nodeinfo, 'nagiosmaster') {
-               include nagios::server
-       }
-
-       if getfromhash($site::nodeinfo, 'buildd') {
-               include buildd
-       }
-
-       if $::hostname in [chopin,franck,morricone,bizet] {
-               include roles::dakmaster
-       }
-
-       if getfromhash($site::nodeinfo, 'apache2_security_mirror') {
-               include roles::security_mirror
-       }
-
-       if getfromhash($site::nodeinfo, 'apache2_www_mirror') {
-               include roles::www_mirror
-       }
-
-       if getfromhash($site::nodeinfo, 'apache2_backports_mirror') {
-               include roles::backports_mirror
-       }
-
-       if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {
-               include roles::ftp-upcoming_mirror
+       } elsif $::mta == 'postfix' {
+               include postfix
+       } else {
+               include exim
        }
 
        if $::apache2 {
                include apache2
        }
 
-       if $::rsyncd {
-               include rsyncd-log
-       }
-
-       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
-       } elsif $::hostname == 'liszt' {
-               include named::recursor
-       }
-
-       if $::kernel == 'Linux' {
-               include ferm
-               include ferm::per-host
-               include entropykey
        }
 
-       if $::hostname in [diabelli,nono,spohr] {
-               include dacs
-       }
-
-       if $::hostname in [beethoven,duarte,spohr,stabile] {
-               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
        }
 
-       include samhain
-
-       if $::hostname in [chopin,geo3,soler,wieck] {
-               include debian-org::radvd
-       }
-
-       if ($::postgres84 or $::postgres90) {
-               include postgres
+       if $::hostname in [geo3,wieck] {
+               include debian_org::radvd
        }
 
        if $::spamd {
                munin::check { 'spamassassin': }
        }
 
-       if $::vsftpd {
-               package { 'logtail':
-                       ensure => installed
-               }
-               munin::check { 'vsftpd': }
-               munin::check { 'ps_vsftpd':
-                       script => 'ps_'
-               }
+       if $::hostname == 'pkgmirror-csail' {
+               include varnish
        }
 }