X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=d4f7b84a76bd80f2d1a3829fe8e106df24e2fdd5;hb=6e15bf83682748c31c4d369b960d88078bd474f0;hp=b0c9d7a1df3b26a1e621b28fa54387ee8292841d;hpb=91642b6c1f029a63b1d0f609690382831aa4b5c4;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index b0c9d7a1d..d4f7b84a7 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -29,9 +29,13 @@ node default {
     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 }
@@ -39,54 +43,62 @@ node default {
     case $kvmdomain {
         "true":    { package { acpid: ensure => installed } }
     }
+    case $mptraid {
+        "true":    { include "raidmpt" }
+    }
 
     case $mta {
         "exim4":   {
              case extractnodeinfo($nodeinfo, 'heavy_exim') {
-                  "true":  { include exim::mx }
+                  'true':  { include exim::mx }
                   default: { include exim }
              }
         }
     }
 
     case extractnodeinfo($nodeinfo, 'muninmaster') {
-        "true": {
-                      include munin-node::master
-        }
+        true: { include munin-node::master }
     }
 
     case extractnodeinfo($nodeinfo, 'nagiosmaster') {
-        "true": {
-                      include nagios::server
-        }
-        default: {
-		      include nagios::client
-	}
+        true:    { include nagios::server }
+        default: { include nagios::client }
     }
 
     case $apache2 {
          "true":  {
               case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
-                     "true":  { include apache2::security_mirror }
+                     true:    { include apache2::security_mirror }
                      default: { include apache2 }
               }
          }
     }
 
     case extractnodeinfo($nodeinfo, 'buildd') {
-         "true":  { include buildd }
+         'true':  {
+             include buildd
+         }
     }
 
     case $hostname {
         klecker,ravel,senfl,orff: { include named::secondary }
+        geo1,geo2,geo3:           { include named::geodns }
+        bartok,franck,liszt,master,ries,samosa,schein,spohr,steffani:   { include named::recursor }
     }
 
-    case $hostname {
-        logtest01,geo1: { include ferm }
+    case $kernel {
+        Linux: {
+            include ferm
+            include ferm::per-host
+        }
     }
+
     case $hostname {
-        geo1,geo2,geo3: { include named::geodns }
+        beethoven,ravel,spohr: {
+            include nfs-server
+        }
     }
+
     case $brokenhosts {
         "true":    { include hosts }
     }
@@ -96,4 +108,9 @@ node default {
     case $portforwarder_user_exists {
         "true":    { include portforwarder }
     }
+    include samhain
 }
+
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4: