X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=inline;f=manifests%2Fsite.pp;h=f94264caff6ddb649d6ee4ae9a66400e59fbfc7f;hb=e5e7f78687d7435c292dd67d05d97432af514fba;hp=a44821f37898740d05b2852bd27297c92aa99bce;hpb=23f10c8e359298d717decf0da12ec3d6b1907c1f;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index a44821f37..f94264caf 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,18 +113,16 @@ 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 }
     }
     case $hostname {
         franck,master,lobos,samosa,spohr,widor:   { include unbound }
     }
-    case getfromhash($nodeinfo, 'squeeze') {
-        true:  { include unbound }
-    }
-    case getfromhash($nodeinfo, 'wheezy') {
-        true:  { include unbound }
+    case $lsbdistcodename {
+        'lenny':    { }
+        default:    { include unbound }
     }
     include resolv
 
@@ -166,7 +166,11 @@ node default {
     case $kernel {
         Linux: { include entropykey }
     }
-
+    if $::postgres84 == "true" {
+        include postgres
+    } elsif $::postgres90 == "true" {
+        include postgres
+    }
 }
 
 # vim:set et: