Revert "add apache2-vhost-update sudo entry for atlas, and move check's over from...

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 0cd1940..ad4d018 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 }
     }
@@ -135,6 +136,10 @@ node default {
         }
     }
 
+    case $hostname {
+        diabelli,rossini,spohr: { include dacs }
+    }
+
     case $hostname {
         beethoven,duarte,ravel,spohr,stabile: {
             include nfs-server
@@ -165,7 +170,11 @@ node default {
     case $kernel {
         Linux: { include entropykey }
     }
-
+    if $::postgres84 == "true" {
+        include postgres
+    } elsif $::postgres90 == "true" {
+        include postgres
+    }
 }
 
 # vim:set et: