exim blacklist: add more recent spammers

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

diff --git a/manifests/site.pp b/manifests/site.pp
index c1cdd53..ba5b9a1 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -19,6 +19,10 @@ Service {
 }
 
 node default {
+       # we really should rename this one
+       include deprecated
+       include base
+
        # this is magic: it will include whatever classes says we should
        # include, based on the value of the "classes" array
        hiera_include('classes')
@@ -28,7 +32,7 @@ node default {
                ensure => absent
        }
 
-       if getfromhash($site::nodeinfo, 'ganeti') {
+       if getfromhash($deprecated::nodeinfo, 'ganeti') {
                include ganeti2
        }
 
@@ -37,22 +41,6 @@ node default {
                include acpi
        }
 
-       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 [buxtehude,milanollo,lw01,lw02,lw03,lw04,lw09,lw10,senfter,gretchaninov,sibelius] {
                include nfs_server
        }
@@ -65,10 +53,6 @@ node default {
                include samhain
        }
 
-       if $::hostname in [geo3,wieck] {
-               include debian_org::radvd
-       }
-
        if $::spamd {
                munin::check { 'spamassassin': }
        }
@@ -76,4 +60,10 @@ node default {
        if $::hostname == 'pkgmirror-csail' {
                include varnish_pkgmirror
        }
+
+       if $::apache2 {
+               if ! defined(Class['apache2']) {
+                       fail('We have apache installed but no role pulled it in.')
+               }
+       }
 }