X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=42cc20fc1a2b332d57ac1542f69242c6a5e7a2d3;hb=83d4d78d784e5d53a9df5d5df6f5b785d10fbab0;hp=086e97b430cc2d2405a9ce6d2dd44f867fa5afda;hpb=e18b9584e45c1a842cc8ad9926a30ab7faefd976;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 086e97b43..bff051e41 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -16,19 +16,18 @@ Exec {
 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")
+    $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
@@ -41,71 +40,144 @@ node default {
         "true":    { include debian-proliant }
     }
     case $kvmdomain {
-        "true":    { package { acpid: ensure => installed } }
+        "true": {
+            case $debarchitecture {
+                kfreebsd-amd64,kfreebsd-i386: {
+                }
+                default: {
+                    package { acpid: ensure => installed }
+                    case $lsbdistcodename {
+                        'lenny':    { }
+                        default:    { package { acpi-support-base: ensure => installed } }
+                    }
+                }
+            }
+        }
     }
     case $mptraid {
         "true":    { include "raidmpt" }
     }
+    case $productname {
+        "PowerEdge 2850": { include megactl }
+    }
 
     case $mta {
         "exim4":   {
-             case extractnodeinfo($nodeinfo, 'heavy_exim') {
-                  'true':  { include exim::mx }
+             case getfromhash($nodeinfo, 'heavy_exim') {
+                  true:  { include exim::mx }
                   default: { include exim }
              }
         }
     }
 
-    case extractnodeinfo($nodeinfo, 'muninmaster') {
+    case getfromhash($nodeinfo, 'puppetmaster') {
+        true: { include puppetmaster }
+    }
+
+    case getfromhash($nodeinfo, 'muninmaster') {
         true: { include munin-node::master }
     }
 
-    case extractnodeinfo($nodeinfo, 'nagiosmaster') {
+    case getfromhash($nodeinfo, 'nagiosmaster') {
         true:    { include nagios::server }
         default: { include nagios::client }
     }
 
     case $apache2 {
          "true":  {
-              case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
+              case getfromhash($nodeinfo, 'apache2_security_mirror') {
                      true:    { include apache2::security_mirror }
-                     default: { include apache2 }
               }
+              case getfromhash($nodeinfo, 'apache2_www_mirror') {
+                     true:    { include apache2::www_mirror }
+              }
+              case getfromhash($nodeinfo, 'apache2_backports_mirror') {
+                     true:    { include apache2::backports_mirror }
+              }
+              case getfromhash($nodeinfo, 'apache2_ftp-upcoming_mirror') {
+                     true:    { include apache2::ftp-upcoming_mirror }
+              }
+              include apache2
          }
     }
 
-    case extractnodeinfo($nodeinfo, 'buildd') {
-         'true':  {
+    case $rsyncd {
+         "true": { include rsyncd-log }
+    }
+
+
+    case getfromhash($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 }
+        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 }
+    }
+    case $lsbdistcodename {
+        'lenny':    { }
+        default:    { include unbound }
+    }
+    include resolv
+
+    case $kernel {
+        Linux: {
+            include ferm
+            include ferm::per-host
+            case $rsyncd {
+                "true": { include ferm::rsync }
+            }
+        }
     }
 
     case $hostname {
-        cilea,luchesi,merikanto,paganini,rautavaara,sibelius,spohr: {}
-        default: {
-             case $kernel {
-                 Linux: {
-                     include ferm
-                 }
-             }
-         }
+        beethoven,duarte,ravel,spohr,stabile: {
+            include nfs-server
+        }
     }
-    include ferm::per-host
 
     case $brokenhosts {
         "true":    { include hosts }
     }
-    case $hoster {
-        "ubcece", "darmstadt", "ftcollins", "grnet":  { include resolv }
+    case $hostname {
+        harris: {
+            include hosts::special
+        }
     }
     case $portforwarder_user_exists {
         "true":    { 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
+        }
+    }
+
+    case $kernel {
+        Linux: { include entropykey }
+    }
+    if $::postgres84 == "true" {
+        include postgres
+    } elsif $::postgres90 == "true" {
+        include postgres
+    }
 }
+
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4: