lint fixes for the linux module

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

diff --git a/manifests/site.pp b/manifests/site.pp
index ce1ddaf..f6bce78 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1,10 +1,8 @@
 Package {
-       noop    => true,
        require => File['/etc/apt/apt.conf.d/local-recommends']
 }
 
 File {
-       noop   => true,
        owner  => root,
        group  => root,
        mode   => '0444',
@@ -12,148 +10,60 @@ File {
 }
 
 Exec {
-       noop => true,
        path => '/usr/bin:/usr/sbin:/bin:/sbin'
 }
 
 Service {
-       noop       => true,
        hasrestart => true,
        hasstatus  => true,
 }
 
 node default {
-       include site
-       include munin
-       include syslog-ng
-       include sudo
-       include ssh
-       include debian-org
-       include monit
-       include apt-keys
-       include ntp
-       include ntpdate
-       include ssl
-       include motd
-       include hardware
-       include nagios::client
-       include resolv
+       # we really should rename this one
+       include deprecated
+       include base
 
-       if $::hostname in [finzi,fano,fasch,field] {
-               include kfreebsd
-       }
-
-       if $::kvmdomain {
-               include acpi
-       }
-
-       if $::mta == 'exim4' {
-               if getfromhash($site::nodeinfo, 'heavy_exim') {
-                       include exim::mx
-               } 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
-       }
+       # this is magic: it will include whatever classes says we should
+       # include, based on the value of the "classes" array
+       hiera_include('classes')
 
-       if getfromhash($site::nodeinfo, 'apache2_www_mirror') {
-               include roles::www_mirror
+       include roles::pubsub::client
+       class { 'roles::udldap::client':
+               ensure => absent
        }
 
-       if getfromhash($site::nodeinfo, 'apache2_backports_mirror') {
-               include roles::backports_mirror
-       }
-
-       if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {
-               include roles::ftp-upcoming_mirror
-       }
-
-       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] {
-               include named::geodns
-       } elsif $::hostname == 'liszt' {
-               include named::recursor
+       if getfromhash($deprecated::nodeinfo, 'ganeti') {
+               include ganeti2
        }
 
        if $::kernel == 'Linux' {
-               include ferm
-               include ferm::per-host
-               include entropykey
-       }
-
-       if $::hostname in [diabelli,nono,spohr] {
-               include dacs
+               include linux
+               include acpi
        }
 
-       if $::hostname in [beethoven,duarte,spohr,stabile] {
-               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
-       }
-
-       include samhain
-
-       if $::hostname in [chopin,geo3,soler,wieck] {
-               include debian-org::radvd
-       }
-
-       if ($::postgres84 or $::postgres90) {
-               include postgres
+       if $::samhain {
+               include samhain
        }
 
        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_pkgmirror
+       }
+
+       if $::apache2 {
+               if ! defined(Class['apache2']) {
+                       fail('We have apache installed but no role pulled it in.')
                }
        }
 }