X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=ef2d699c479184cf8decb7cb108d1446d9f8a221;hb=7984058350a8bc8d4a4c185903c6ef58f36fbc42;hp=856696f931c36a0c009e670a8bd558f5512fc3c8;hpb=0b1ec2d7f59d27596ebc1f2ecf30a900dbdad7da;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 856696f93..ef2d699c4 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -14,76 +14,151 @@ Exec {
 }
 
 node default {
-    $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
+    $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")
+    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 ssl
 
     include motd
-    include samhain
+
+    case $hostname {
+        finzi,fano,fasch,field:    { include kfreebsd }
+    }
 
     case $smartarraycontroller {
         "true":    { include debian-proliant }
-        default: {}
+    }
+    case $kvmdomain {
+        "true": {
+            package { acpid: ensure => installed }
+            case getfromhash($nodeinfo, 'squeeze') {
+                true:  { package { acpi-support-base: ensure => installed } }
+            }
+        }
+    }
+    case $mptraid {
+        "true":    { include "raidmpt" }
     }
 
     case $mta {
         "exim4":   {
-             case extractnodeinfo($nodeinfo, 'heavy_exim') {
-                  "true":  { include exim::mx }
+             case getfromhash($nodeinfo, 'heavy_exim') {
+                  true:  { include exim::mx }
                   default: { include exim }
              }
         }
-        default:   {}
     }
 
+    case getfromhash($nodeinfo, 'puppetmaster') {
+        true: { include puppetmaster }
+    }
+
+    case getfromhash($nodeinfo, 'muninmaster') {
+        true: { include munin-node::master }
+    }
+
+    case getfromhash($nodeinfo, 'nagiosmaster') {
+        true:    { include nagios::server }
+        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
+         }
+    }
+
+    case $rsyncd {
+         "true": { include rsyncd-log }
+    }
+
+
+    case getfromhash($nodeinfo, 'buildd') {
+         true:  {
+             include buildd
+         }
+    }
+
+    case $hostname {
+        klecker,ravel,senfl,orff,draghi: { include named::authoritative }
+        geo1,geo2,geo3:                  { include named::geodns }
+        liszt:                           { include named::recursor }
+    }
+    case $hostname {
+        franck,master,lobos,samosa,spohr,widor:   { include unbound }
+    }
+    case getfromhash($nodeinfo, 'squeeze') {
+        true:  { include unbound }
+    }
+    include resolv
+
+    case $kernel {
+        Linux: {
+            include ferm
+            include ferm::per-host
+            case $rsyncd {
+                "true": { include ferm::rsync }
+            }
+        }
+    }
+
+    case $hostname {
+        beethoven,duarte,ravel,spohr,stabile: {
+            include nfs-server
+        }
+    }
+
+    case $brokenhosts {
+        "true":    { include hosts }
+    }
+    case $portforwarder_user_exists {
+        "true":    { include portforwarder }
+    }
+
+    include samhain
+
+    case $hostname {
+        byrd,schuetz,tchaikovsky: {
+            include krb
+        }
+        draghi,quantz: {
+            include krb
+            include afs
+        }
+        lamb,locke,rautavaara,rietz: {
+            include krb
+            include afs::server
+        }
+    }
 
     case $hostname {
-        spohr: {
-                      include nagios::server
+        chopin,geo3,soler,wieck: {
+            include debian-radvd
         }
-        default: {
-		      include nagios::client
-	}
-    }
-
-     case extractnodeinfo($nodeinfo, 'apache2_defaultconfig') {
-          "true":  { include apache2 }
-           default: { }
-     }
-
-     case extractnodeinfo($nodeinfo, 'buildd') {
-          "true":  { include buildd }
-           default: { }
-     }
-     case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
-          "true":  { include apache2::security_mirror }
-           default: { }
-     }
-
-
-# maybe wait for rietz to be upgraded to lenny
-#    case $hostname {
-#        rietz,raff,klecker:
-#                   { include named-secondary }
-#        default:   {}
-#    }
-
-     case $hostname {
-         geo1,geo2,geo3:
-                    {
-                      include geodns
-                      include ntp::server
-                    }
-         default:   {
-                    }
-     }
-     case $brokenhosts {
-         "true":    { include hosts }
-         default:   {}
-     }
+    }
+
+    case $kernel {
+        Linux: { include entropykey }
+    }
+
 }
+
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4: