X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=2f4f1291b8420b9fed56dd6c77b7e001824a12c2;hb=1ef5305a212a75308012f5a29a64223ea04ca5cd;hp=086e97b430cc2d2405a9ce6d2dd44f867fa5afda;hpb=e18b9584e45c1a842cc8ad9926a30ab7faefd976;p=dsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 086e97b4..a382663e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1,111 +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'
+}
+
+Service {
+	hasrestart => true,
+	hasstatus  => true,
 }
 
 node default {
-    $localinfo = yamlinfo('*', "/etc/puppet/modules/debian-org/misc/local.yaml")
-    $nodeinfo  = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
-    $hoster    = whohosts($nodeinfo, "/etc/puppet/modules/debian-org/misc/hoster.yaml")
-    $keyinfo   = allnodeinfo("sshRSAHostKey", "ipHostNumber")
-    notice("hoster for ${fqdn} is ${hoster}")
-
-    $mxinfo   = allnodeinfo("mXRecord")
-
-    include munin-node
-    include sudo
-    include ssh
-    include debian-org
-    include monit
-    include apt-keys
-    include ntp
-    include ssl
-
-    include motd
-
-    case $hostname {
-        finzi,fano,fasch,field:    { include kfreebsd }
-    }
-
-    case $smartarraycontroller {
-        "true":    { include debian-proliant }
-    }
-    case $kvmdomain {
-        "true":    { package { acpid: ensure => installed } }
-    }
-    case $mptraid {
-        "true":    { include "raidmpt" }
-    }
-
-    case $mta {
-        "exim4":   {
-             case extractnodeinfo($nodeinfo, 'heavy_exim') {
-                  'true':  { include exim::mx }
-                  default: { include exim }
-             }
-        }
-    }
-
-    case extractnodeinfo($nodeinfo, 'muninmaster') {
-        true: { include munin-node::master }
-    }
-
-    case extractnodeinfo($nodeinfo, 'nagiosmaster') {
-        true:    { include nagios::server }
-        default: { include nagios::client }
-    }
-
-    case $apache2 {
-         "true":  {
-              case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
-                     true:    { include apache2::security_mirror }
-                     default: { include apache2 }
-              }
-         }
-    }
-
-    case extractnodeinfo($nodeinfo, 'buildd') {
-         'true':  {
-             include buildd
-         }
-    }
-
-    case $hostname {
-        klecker,ravel,senfl,orff: { include named::secondary }
-        geo1,geo2,geo3:           { include named::geodns }
-        bartok,schein,steffani,ries,franck,liszt,master,spohr:   { include named::recursor }
-    }
-
-    case $hostname {
-        cilea,luchesi,merikanto,paganini,rautavaara,sibelius,spohr: {}
-        default: {
-             case $kernel {
-                 Linux: {
-                     include ferm
-                 }
-             }
-         }
-    }
-    include ferm::per-host
-
-    case $brokenhosts {
-        "true":    { include hosts }
-    }
-    case $hoster {
-        "ubcece", "darmstadt", "ftcollins", "grnet":  { include resolv }
-    }
-    case $portforwarder_user_exists {
-        "true":    { include portforwarder }
-    }
-    include samhain
+	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': }
+	}
 }