X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=ad4d018a0f1d5713db4fc487071b77cdd74086f8;hb=cd8b45777420b9afac1c9b5e2659d0146c2a023d;hp=baba96b6aae25c7f2347a246b8f84e2b0d188299;hpb=9cae311f853478a6ccc343d9567dccfbccdb16af;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index baba96b6a..ad4d018a0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -27,6 +27,7 @@ node default {
     include monit
     include apt-keys
     include ntp
+    include ntpdate
     include ssl
 
     include motd
@@ -45,8 +46,9 @@ node default {
                 }
                 default: {
                     package { acpid: ensure => installed }
-                    case getfromhash($nodeinfo, 'squeeze') {
-                        true:  { package { acpi-support-base: ensure => installed } }
+                    case $lsbdistcodename {
+                        'lenny':    { }
+                        default:    { package { acpi-support-base: ensure => installed } }
                     }
                 }
             }
@@ -111,7 +113,7 @@ node default {
     }
 
     case $hostname {
-        klecker,ravel,senfl,orff,draghi,diamond: { include named::authoritative }
+        ravel,senfl,orff,draghi,diamond: { include named::authoritative }
         geo1,geo2,geo3:                          { include named::geodns }
         liszt:                                   { include named::recursor }
     }
@@ -134,6 +136,10 @@ node default {
         }
     }
 
+    case $hostname {
+        diabelli,rossini,spohr: { include dacs }
+    }
+
     case $hostname {
         beethoven,duarte,ravel,spohr,stabile: {
             include nfs-server
@@ -164,7 +170,11 @@ node default {
     case $kernel {
         Linux: { include entropykey }
     }
-
+    if $::postgres84 == "true" {
+        include postgres
+    } elsif $::postgres90 == "true" {
+        include postgres
+    }
 }
 
 # vim:set et: