X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=5fb46eaf50bfa4c5396e002e8f74611954629c57;hb=00e517d7263eeacf248ef66f4863ae2bff1197e8;hp=3eb7e00f7e0989e7f39a673a537c5daed7a96477;hpb=06b58837a172c84036e6897267f3f96c0923741b;p=dsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 3eb7e00f..6f50f248 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -9,47 +9,85 @@ File {
     ensure  => file,
 }
 
+Exec {
+    path => "/usr/bin:/usr/sbin:/bin:/sbin"
+}
+
 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 samhain
+    include sudo
+    include ssh
     include debian-org
+    include monit
+    include apt-keys
+    include ntp
+
+    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 }
+             }
+        }
     }
 
-    import "nagios"
-    include nagios-client
+    case extractnodeinfo($nodeinfo, 'muninmaster') {
+        true: { include munin-node::master }
+    }
 
-    case $hostname {
-        spohr:     {
-                      import "nagios"
-                      include nagios-server
-                   }
-        default:   {}
+    case extractnodeinfo($nodeinfo, 'nagiosmaster') {
+        true:    { include nagios::server }
+        default: { include nagios::client }
     }
 
     case $apache2 {
-        "true":    { case $hostname {
-                        "carver":  { 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 }
     }
 
-    # test here first
     case $hostname {
-        handel,geo1,geo2,geo3,wieck,brahms,bartok,spohr,sperger,carver,rore,malo,peri,penalosa,praetorius,schein,villa,lobos,steffani,kassia,pergolesi,lafayette,rem,albeniz,goetz,smetana,allegri,puccini,ball,argento,arcadelt,dijkstra,schumann,caballero,voltaire,pescetti,mundy,agricola,goedel,lebrun,mayer,mayr,merulo,morales,murphy,paer,saens,schroeder,spontini,widor,zelenka,agnesi,piatti,powell,samosa,gluck,rietz,unger,tartini,mahler,raff,chopin,ravel,ries:    { include sudo }
-        default:   {}
+        klecker,ravel,senfl,orff: { include named::secondary }
+        geo1,geo2,geo3:           { include named::geodns }
+        bartok:                   { include named::recursor }
     }
-}
 
-node penalosa inherits default {
-    include hosts
+    case $hostname {
+        logtest01,geo1,geo2,geo3,bartok: { include ferm }
+    }
+
+    case $brokenhosts {
+        "true":    { include hosts }
+    }
+    case $hoster {
+        "ubcece", "darmstadt", "ftcollins", "grnet":  { include resolv }
+    }
+    case $portforwarder_user_exists {
+        "true":    { include portforwarder }
+    }
 }