X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=manifests%2Fsite.pp;h=f57efd2daa95eeba2bb152474211f2fad8f76538;hb=13ac49fbe5218c5f66d04312625e9a492500ae8c;hp=d8d74907a10d2a3680a478e613ec0a698de8670a;hpb=9ea014717bb5a43ef416e03ad07fbe544fb7cbbc;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index d8d74907a..f57efd2da 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -14,58 +14,79 @@ 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 samhain
+    include apt-keys
+    include ntp
 
-    $nodeinfo = nodeinfo($fqdn, "/home/sgran/local.yaml")
-    notice($nodeinfo.class)
-    notice($nodeinfo)
+    include motd
+    include samhain
 
     case $smartarraycontroller {
         "true":    { include debian-proliant }
-        default: {}
+    }
+    case $kvmdomain {
+        "true":    { package { acpid: ensure => installed } }
     }
 
     case $mta {
-        "exim4":   { include exim }
-        default:   {}
+        "exim4":   {
+             case extractnodeinfo($nodeinfo, 'heavy_exim') {
+                  true:    { include exim::mx }
+                  default: { include exim }
+             }
+        }
     }
 
+    case extractnodeinfo($nodeinfo, 'muninmaster') {
+        true: { include munin-node::master }
+    }
 
-    case $hostname {
-        spohr: {
-                      include nagios::server
-                      include motd::new
-        }
-        default: {
-		      include nagios::client
-                      include motd
-	}
+    case extractnodeinfo($nodeinfo, 'nagiosmaster') {
+        true:    { include nagios::server }
+        default: { include nagios::client }
     }
 
     case $apache2 {
-        "true":    { case $hostname {
-                        carver,rore,tartini:  { include apache2 }
-                        default:   {}
-                   } }
-        default: {}
+         "true":  {
+              case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
+                     true:    { include apache2::security_mirror }
+                     default: { include apache2 }
+              }
+         }
+    }
+
+    case extractnodeinfo($nodeinfo, 'buildd') {
+         true:  { include buildd }
     }
 
     case $hostname {
-        ancina,brahms,goedel,goetz,lafayette,malo,praetorius,puccini:
-                   { include buildd }
-        default:   {}
+        klecker,ravel,senfl,orff: { include named::secondary }
+        geo1,geo2,geo3:           { include named::geodns }
     }
+
     case $hostname {
-        geo1,geo2,geo3:
-                   { include geodns }
-        default:   {}
+        logtest01,geo1,geo2,geo3: { 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 }
+    }
 }