Note that exim contains tracker-specific configuration

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 8162575..ba5b9a1 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -19,71 +19,26 @@ Service {
 }
 
 node default {
-       include site
-       include munin
-       include syslog_ng
-       include sudo
-       include ssh
-       include debian_org
-       include monit
-       include time
-       include ssl
-       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
+       # we really should rename this one
+       include deprecated
+       include base
 
-       if $::lsbdistcodename == squeeze {
-               include roles::udldap::client
-       } else {
-               include roles::pubsub::client
-               class { 'roles::udldap::client':
-                       ensure => absent
-               }
+       # this is magic: it will include whatever classes says we should
+       # include, based on the value of the "classes" array
+       hiera_include('classes')
+
+       include roles::pubsub::client
+       class { 'roles::udldap::client':
+               ensure => absent
        }
 
-       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] {
+       if getfromhash($deprecated::nodeinfo, 'ganeti') {
                include ganeti2
        }
 
        if $::kernel == 'Linux' {
                include linux
                include acpi
-       } elsif $::kernel == 'GNU/kFreeBSD' {
-               include kfreebsd
-       }
-
-       if $::mta == 'exim4' {
-               if getfromhash($site::nodeinfo, 'heavy_exim') {
-                       include exim::mx
-               } else {
-                       include exim
-               }
-       } elsif $::mta == 'postfix' {
-               include postfix
-       } else {
-               include exim
-       }
-
-       if $::apache2 {
-               include apache2
-       }
-
-       if $::hostname in [geo1,geo2,geo3] {
-               include named::geodns
        }
 
        if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,lw09,lw10,senfter,gretchaninov,sibelius] {
@@ -98,15 +53,17 @@ node default {
                include samhain
        }
 
-       if $::hostname in [geo3,wieck] {
-               include debian_org::radvd
-       }
-
        if $::spamd {
                munin::check { 'spamassassin': }
        }
 
        if $::hostname == 'pkgmirror-csail' {
-               include varnish
+               include varnish_pkgmirror
+       }
+
+       if $::apache2 {
+               if ! defined(Class['apache2']) {
+                       fail('We have apache installed but no role pulled it in.')
+               }
        }
 }