X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=manifests%2Fsite.pp;h=6f50f2486f9b2459d30645680dab2716f6aaa317;hb=00e517d7263eeacf248ef66f4863ae2bff1197e8;hp=f834f809548ab40e249bdac7549e8a53faab2242;hpb=00284858e6fcbb461e1561d8212a45e73399be60;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index f834f8095..6f50f2486 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -14,70 +14,80 @@ 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")
+
     include munin-node
     include sudo
+    include ssh
     include debian-org
     include monit
     include apt-keys
-
-    $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
+    include ntp
 
     include motd
     include samhain
 
     case $smartarraycontroller {
         "true":    { include debian-proliant }
-        default: {}
+    }
+    case $kvmdomain {
+        "true":    { package { acpid: ensure => installed } }
     }
 
     case $mta {
         "exim4":   {
-             case $hostname {
-                  powell:  { include exim::mx }
+             case extractnodeinfo($nodeinfo, 'heavy_exim') {
+                  true:    { include exim::mx }
                   default: { include exim }
              }
         }
-        default:   {}
     }
 
+    case extractnodeinfo($nodeinfo, 'muninmaster') {
+        true: { include munin-node::master }
+    }
 
-    case $hostname {
-        spohr: {
-                      include nagios::server
-        }
-        default: {
-		      include nagios::client
-	}
+    case extractnodeinfo($nodeinfo, 'nagiosmaster') {
+        true:    { include nagios::server }
+        default: { include nagios::client }
     }
 
     case $apache2 {
-        "true":    { case $hostname {
-                        carver,rore,draghi,tartini,samosa,duarte,piatti:  { include apache2 }
-                        default:   {}
-                   } }
-        default: {}
+         "true":  {
+              case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
+                     true:    { include apache2::security_mirror }
+                     default: { include apache2 }
+              }
+         }
     }
 
-    case $hostname {
-        ancina,arcadelt,argento,brahms,goedel,goetz,lafayette,malo,murphy,praetorius,puccini,paer:
-                   { include buildd }
-        default:   {}
+    case extractnodeinfo($nodeinfo, 'buildd') {
+         true:  { include buildd }
     }
 
-# maybe wait for rietz to be upgraded to lenny
-#    case $hostname {
-#        rietz,raff,klecker:
-#                   { include named-secondary }
-#        default:   {}
-#    }
+    case $hostname {
+        klecker,ravel,senfl,orff: { include named::secondary }
+        geo1,geo2,geo3:           { include named::geodns }
+        bartok:                   { include named::recursor }
+    }
 
     case $hostname {
-        geo1,geo2,geo3:
-                   { include geodns }
-        default:   {}
+        logtest01,geo1,geo2,geo3,bartok: { include ferm }
     }
-}
 
-node penalosa inherits default {
-    include hosts
+    case $brokenhosts {
+        "true":    { include hosts }
+    }
+    case $hoster {
+        "ubcece", "darmstadt", "ftcollins", "grnet":  { include resolv }
+    }
+    case $portforwarder_user_exists {
+        "true":    { include portforwarder }
+    }
 }