Try different file names, to see if that pleases puppet

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

diff --git a/manifests/site.pp b/manifests/site.pp
index ce1ddaf681c208e6e42ce93a571927f08c00745c..6123122491d6661c7e8a7f66b40a7a283110f8fe 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,12 +10,10 @@ File {
 }
 
 Exec {
-       noop => true,
        path => '/usr/bin:/usr/sbin:/bin:/sbin'
 }
 
 Service {
-       noop       => true,
        hasrestart => true,
        hasstatus  => true,
 }
@@ -30,7 +26,6 @@ node default {
        include ssh
        include debian-org
        include monit
-       include apt-keys
        include ntp
        include ntpdate
        include ssl
@@ -38,13 +33,24 @@ node default {
        include hardware
        include nagios::client
        include resolv
+       include roles
+       include unbound
 
-       if $::hostname in [finzi,fano,fasch,field] {
-               include kfreebsd
+       if $::hostname in [pasquini,tristano] {
+               include ganeti2
+       }
+
+       if $::hostname == 'dinis' {
+               include bacula::director
        }
 
-       if $::kvmdomain {
-               include acpi
+       if $::kernel == Linux {
+               include linux
+               if $::kvmdomain {
+                       include acpi
+               }
+       } elsif $::kernel == 'GNU/kFreeBSD' {
+               include kfreebsd
        }
 
        if $::mta == 'exim4' {
@@ -53,68 +59,20 @@ 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] {
                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] {
@@ -146,14 +104,4 @@ node default {
        if $::spamd {
                munin::check { 'spamassassin': }
        }
-
-       if $::vsftpd {
-               package { 'logtail':
-                       ensure => installed
-               }
-               munin::check { 'vsftpd': }
-               munin::check { 'ps_vsftpd':
-                       script => 'ps_'
-               }
-       }
 }