X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=blobdiff_plain;f=manifests%2Fsite.pp;h=a382663e76ced2230d4a80d25f572506f0fad569;hp=588e9b5557b30a75bdbeef2fad8e25241d8af3f5;hb=1ef5305a212a75308012f5a29a64223ea04ca5cd;hpb=d22c8f1a454daf1468c614d81d5bdfba64e0a124

diff --git a/manifests/site.pp b/manifests/site.pp
index 588e9b55..a382663e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1,163 +1,115 @@
 Package {
-    require => File["/etc/apt/apt.conf.d/local-recommends"]
+	require => File['/etc/apt/apt.conf.d/local-recommends']
 }
 
 File {
-    owner   => root,
-    group   => root,
-    mode    => 444,
-    ensure  => file,
+	owner  => root,
+	group  => root,
+	mode   => '0444',
+	ensure => file,
 }
 
 Exec {
-    path => "/usr/bin:/usr/sbin:/bin:/sbin"
+	path => '/usr/bin:/usr/sbin:/bin:/sbin'
 }
 
-node default {
-    $localinfo = yamlinfo('*', "/etc/puppet/modules/debian-org/misc/local.yaml")
-    $nodeinfo  = nodeinfo($::fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
-    $allnodeinfo = allnodeinfo("sshRSAHostKey ipHostNumber", "purpose mXRecord physicalHost purpose")
-    notice( sprintf("hoster for %s is %s", $::fqdn, getfromhash($nodeinfo, 'hoster', 'name') ) )
-
-    include munin-node
-    include syslog-ng
-    include sudo
-    include ssh
-    include debian-org
-    include monit
-    include apt-keys
-    include ntp
-    include ntpdate
-    include ssl
-    include motd
-
-    case $::hostname {
-        finzi,fano,fasch,field:    { include kfreebsd }
-    }
-
-    if $::smartarraycontroller {
-        include debian-proliant
-    }
-
-    if $::productname == 'PowerEdge 2850' {
-        include megactl
-    }
-
-    if $::mptraid {
-        include raidmpt
-    }
-
-    if $::kvmdomain {
-        include acpi
-    }
-
-    if $::mta == 'exim4' {
-        case getfromhash($nodeinfo, 'heavy_exim') {
-             true:  { include exim::mx }
-             default: { include exim }
-        }
-    }
-
-    if getfromhash($nodeinfo, 'puppetmaster') {
-        include puppetmaster
-    }
-
-    if getfromhash($nodeinfo, 'muninmaster') {
-        include munin-node::master
-    }
-
-    case getfromhash($nodeinfo, 'nagiosmaster') {
-        true:    { include nagios::server }
-        default: { include nagios::client }
-    }
-
-    if $::apache2 {
-         if getfromhash($nodeinfo, 'apache2_security_mirror') {
-                include apache2::security_mirror
-         }
-         if getfromhash($nodeinfo, 'apache2_www_mirror') {
-                include apache2::www_mirror
-         }
-         if getfromhash($nodeinfo, 'apache2_backports_mirror') {
-                include apache2::backports_mirror
-         }
-         if getfromhash($nodeinfo, 'apache2_ftp-upcoming_mirror') {
-                include apache2::ftp-upcoming_mirror
-         }
-         include apache2
-    }
-
-    if $::rsyncd {
-        include rsyncd-log
-    }
-
-
-    if getfromhash($nodeinfo, 'buildd') {
-        include buildd
-    }
-
-    case $::hostname {
-        ravel,senfl,orff,draghi,diamond: { include named::authoritative }
-        geo1,geo2,geo3:                  { include named::geodns }
-        liszt:                           { include named::recursor }
-    }
-
-    case $::hostname {
-        franck,master,lobos,samosa,spohr,widor:   { include unbound }
-    }
-
-    if $::lsbdistcodename != 'lenny' {
-        include unbound
-    }
-
-    include resolv
-
-    if $::kernel == 'Linux' {
-        include ferm
-        include ferm::per-host
-    }
-
-    case $::hostname {
-        diabelli,nono,spohr: { include dacs }
-    }
-
-    case $::hostname {
-        beethoven,duarte,spohr,stabile: {
-            include nfs-server
-        }
-    }
-
-    if $::brokenhosts {
-        include hosts
-    }
-
-    if $::portforwarder_user_exists {
-        include portforwarder
-    }
-
-    include samhain
-
-    case $::hostname {
-        byrd,schuetz,tchaikovsky,draghi,quantz,lamb,locke,rautavaara,rietz: {
-            include krb
-        }
-    }
-
-    case $::hostname {
-        chopin,geo3,soler,wieck: {
-            include debian-radvd
-        }
-    }
-
-    if $::kernel == 'Linux' {
-        include entropykey
-    }
-
-    if ($::postgres84 or $::postgres90) {
-        include postgres
-    }
+Service {
+	hasrestart => true,
+	hasstatus  => true,
 }
 
-# vim:set et:
-# vim:set sts=4 ts=4:
-# vim:set shiftwidth=4:
+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
+
+	if $::hostname in [pasquini,tristano,bertali,boito] {
+		include ganeti2
+	}
+
+	if $::hostname == 'dinis' {
+		include bacula::director
+	}
+
+	if $::hostname in [berlioz, biber] {
+		include bacula::client
+	}
+
+	if $::hostname == 'beethoven' {
+		include bacula::storage
+	}
+
+	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
+	}
+
+	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 $::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 $::spamd {
+		munin::check { 'spamassassin': }
+	}
+}