X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=b4f44c26e379cf9e90a692a4e77820b9f0c82578;hb=6047b4170980bbcad7f4015c954a9d061b5c4324;hp=e9ca319243a0cf36562da22a7cb83ebbcbb46420;hpb=a76d22733a5fa5f9847083d16a3c9dbf6a03ddf1;p=dsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index e9ca3192..b4f44c26 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -15,11 +15,9 @@ Exec {
 
 node default {
     $localinfo = yamlinfo('*', "/etc/puppet/modules/debian-org/misc/local.yaml")
-    $nodeinfo  = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
-    $hosterinfo = whohosts($nodeinfo, "/etc/puppet/modules/debian-org/misc/hoster.yaml")
-    $allnodeinfo = allnodeinfo("sshRSAHostKey ipHostNumber", "purpose")
-    $mxinfo    = allnodeinfo("mXRecord")
-    notice("hoster for ${fqdn} is ${hosterinfo}")
+    $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
@@ -29,44 +27,43 @@ node default {
     include monit
     include apt-keys
     include ntp
+    include ntpdate
     include ssl
-
     include motd
 
-    case $hostname {
+    case $::hostname {
         finzi,fano,fasch,field:    { include kfreebsd }
     }
 
-    case $smartarraycontroller {
-        "true":    { include debian-proliant }
+    if $::smartarraycontroller {
+        include debian-proliant
     }
-    case $kvmdomain {
-        "true": {
-            package { acpid: ensure => installed }
-            case getfromhash($nodeinfo, 'squeeze') {
-                true:  { package { acpi-support-base: ensure => installed } }
-            }
-        }
+
+    if $::productname == 'PowerEdge 2850' {
+        include megactl
     }
-    case $mptraid {
-        "true":    { include "raidmpt" }
+
+    if $::mptraid {
+        include raidmpt
     }
 
-    case $mta {
-        "exim4":   {
-             case getfromhash($nodeinfo, 'heavy_exim') {
-                  true:  { include exim::mx }
-                  default: { include exim }
-             }
+    if $::kvmdomain {
+        include acpi
+    }
+
+    if $::mta == 'exim4' {
+        case getfromhash($nodeinfo, 'heavy_exim') {
+             true:  { include exim::mx }
+             default: { include exim }
         }
     }
 
-    case getfromhash($nodeinfo, 'puppetmaster') {
-        true: { include puppetmaster }
+    if getfromhash($nodeinfo, 'puppetmaster') {
+        include puppetmaster
     }
 
-    case getfromhash($nodeinfo, 'muninmaster') {
-        true: { include munin-node::master }
+    if getfromhash($nodeinfo, 'muninmaster') {
+        include munin-node::master
     }
 
     case getfromhash($nodeinfo, 'nagiosmaster') {
@@ -74,92 +71,93 @@ node default {
         default: { include nagios::client }
     }
 
-    case $apache2 {
-         "true":  {
-              case getfromhash($nodeinfo, 'apache2_security_mirror') {
-                     true:    { include apache2::security_mirror }
-              }
-              case getfromhash($nodeinfo, 'apache2_www_mirror') {
-                     true:    { include apache2::www_mirror }
-              }
-              include apache2
+    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
     }
 
-    case $rsyncd {
-         "true": { include rsyncd-log }
+    if $::rsyncd {
+        include rsyncd-log
     }
 
 
-    case getfromhash($nodeinfo, 'buildd') {
-         true:  {
-             include buildd
-         }
+    if getfromhash($nodeinfo, 'buildd') {
+        include buildd
     }
 
-    case $hostname {
-        klecker,ravel,senfl,orff,draghi: { include named::authoritative }
+    case $::hostname {
+        ravel,senfl,orff,draghi,diamond: { include named::authoritative }
         geo1,geo2,geo3:                  { include named::geodns }
-        franck,liszt,master,samosa,spohr,widor:   { include named::recursor }
+        liszt:                           { include named::recursor }
     }
-    case $hostname {
-        ries:   {
-            include unbound
-            $runs_local_resolver = true
-        }
-        default: {
-            $runs_local_resolver = false
-        }
+
+    case $::hostname {
+        franck,master,lobos,samosa,spohr,widor:   { include unbound }
+    }
+
+    if $::lsbdistcodename != 'lenny' {
+        include unbound
     }
-    case getfromhash($hosterinfo, 'nameservers') {
-        false:      {}
-        default:    { include resolv }
+
+    include resolv
+
+    if $::kernel == 'Linux' {
+        include ferm
+        include ferm::per-host
     }
 
-    case $kernel {
-        Linux: {
-            include ferm
-            include ferm::per-host
-            case $rsyncd {
-                "true": { include ferm::rsync }
-            }
-        }
+    case $::hostname {
+        diabelli,nono,spohr: { include dacs }
     }
 
-    case $hostname {
-        beethoven,ravel,spohr,stabile: {
+    case $::hostname {
+        beethoven,duarte,spohr,stabile: {
             include nfs-server
         }
     }
 
-    case $brokenhosts {
-        "true":    { include hosts }
+    if $::brokenhosts {
+        include hosts
     }
-    case $portforwarder_user_exists {
-        "true":    { include portforwarder }
+
+    if $::portforwarder_user_exists {
+        include portforwarder
     }
 
     include samhain
 
-    case $hostname {
-        byrd,schuetz,tchaikovsky: {
-            include krb
-        }
-        draghi,quantz: {
+    case $::hostname {
+        byrd,schuetz,tchaikovsky,draghi,quantz,lamb,locke,rautavaara,rietz: {
             include krb
-            include afs
-        }
-        lamb,locke,rautavaara,rietz: {
-            include krb
-            include afs::server
         }
     }
 
-    case $hostname {
+    case $::hostname {
         chopin,geo3,soler,wieck: {
             include debian-radvd
         }
-   }
+    }
+
+    if $::kernel == 'Linux' {
+        include entropykey
+    }
+
+    if $::postgres84 == "true" {
+        include postgres
+    } elsif $::postgres90 == "true" {
+        include postgres
+    }
 }
 
 # vim:set et: