X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=f040683ca4b69dbbcea06111eb9df48c95f6b925;hb=d7475f90c56697e9589e1386ced135498df68c81;hp=4f44fafdba07ccc30ceb0c566614e8fcd8b02d49;hpb=0b858fe727190d506abce238bd9a1a32a689ac33;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 4f44fafdb..f040683ca 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -17,11 +17,9 @@ 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")
+    $ldapall   = allnodeinfo("sshRSAHostKey", "ipHostNumber", "mXRecord")
     notice("hoster for ${fqdn} is ${hoster}")
 
-    $mxinfo   = allnodeinfo("mXRecord")
-
     include munin-node
     include sudo
     include ssh
@@ -29,6 +27,7 @@ node default {
     include monit
     include apt-keys
     include ntp
+    include ssl
 
     include motd
 
@@ -42,11 +41,14 @@ 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 }
              }
         }
@@ -71,17 +73,28 @@ node default {
     }
 
     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:                   { include named::recursor }
+        bartok,franck,liszt,master,samosa,schein,spohr,steffani:   { include named::recursor }
+    }
+
+    case $kernel {
+        Linux: {
+            include ferm
+            include ferm::per-host
+        }
     }
 
     case $hostname {
-        logtest01,geo1,geo2,geo3,bartok: { include ferm }
+        beethoven,ravel,spohr: {
+            include nfs-server
+        }
     }
 
     case $brokenhosts {
@@ -95,3 +108,7 @@ node default {
     }
     include samhain
 }
+
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4: