Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet

[mirror/dsa-puppet.git] / manifests / site.pp

diff --git a/manifests/site.pp b/manifests/site.pp
index 0cd1940..bff051e 100644 (file)
--- 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
@@ -112,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 }
     }
@@ -144,6 +145,11 @@ node default {
     case $brokenhosts {
         "true":    { include hosts }
     }
+    case $hostname {
+        harris: {
+            include hosts::special
+        }
+    }
     case $portforwarder_user_exists {
         "true":    { include portforwarder }
     }
@@ -165,7 +171,11 @@ node default {
     case $kernel {
         Linux: { include entropykey }
     }
-
+    if $::postgres84 == "true" {
+        include postgres
+    } elsif $::postgres90 == "true" {
+        include postgres
+    }
 }
 
 # vim:set et: