lint fixes for the linux module

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 931c6d0..f6bce78 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -19,97 +19,51 @@ Service {
 }
 
 node default {
-       include site
-       include munin
-       include syslog-ng
-       include sudo
-       include ssh
-       include debian-org
-       include monit
-       include ntp
-       include ntpdate
-       include ssl
-       include motd
-       include hardware
-       include nagios::client
-       include resolv
-       include roles
-       include unbound
+       # we really should rename this one
+       include deprecated
+       include base
 
-       if $::hostname in [pasquini,tristano,bertali,boito] {
-               include ganeti2
-       }
-
-       if $::hostname == 'dinis' {
-               include bacula::director
-       }
+       # this is magic: it will include whatever classes says we should
+       # include, based on the value of the "classes" array
+       hiera_include('classes')
 
-       if $::hostname in [berlioz] {
-               include bacula::client
+       include roles::pubsub::client
+       class { 'roles::udldap::client':
+               ensure => absent
        }
 
-       if $::hostname == 'beethoven' {
-               include bacula::storage
+       if getfromhash($deprecated::nodeinfo, 'ganeti') {
+               include ganeti2
        }
 
-       if $::kernel == Linux {
+       if $::kernel == 'Linux' {
                include linux
-               if $::kvmdomain {
-                       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
+               include acpi
        }
 
-       if $::hostname in [ravel,senfl,orff,draghi,diamond] {
-               include named::authoritative
-       } elsif $::hostname in [geo1,geo2,geo3] {
-               include named::geodns
-       }
-
-       if $::hostname in [diabelli,nono,spohr] {
-               include dacs
-       }
-
-       if $::hostname in [beethoven,duarte,spohr,stabile,beach] {
-               include nfs-server
+       if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,lw09,lw10,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 $::spamd {
+               munin::check { 'spamassassin': }
        }
 
-       if ($::postgres84 or $::postgres90) {
-               include postgres
+       if $::hostname == 'pkgmirror-csail' {
+               include varnish_pkgmirror
        }
 
-       if $::spamd {
-               munin::check { 'spamassassin': }
+       if $::apache2 {
+               if ! defined(Class['apache2']) {
+                       fail('We have apache installed but no role pulled it in.')
+               }
        }
 }