aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-01-21 11:50:28 -0200
committerSilvio Rhatto <rhatto@riseup.net>2010-01-21 11:50:28 -0200
commit98f4d52829cd41f0b738a655afbbf57c9831b288 (patch)
tree1350b7b10d1c7064aedbfd4c59c474a09ea9c654
parent74c243846e6631829b3f6218c65326ff83a8cb4e (diff)
downloadpuppet-nodo-98f4d52829cd41f0b738a655afbbf57c9831b288.tar.gz
puppet-nodo-98f4d52829cd41f0b738a655afbbf57c9831b288.tar.bz2
Enhanced time config for nodo::server
-rw-r--r--manifests/init.pp7
1 files changed, 6 insertions, 1 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index da844c0..6f05dd3 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -68,7 +68,6 @@ class nodo {
class nodo::server inherits nodo {
include syslog-ng
- include ntpdate
include firewall
include vserver::host
include initramfs
@@ -76,6 +75,12 @@ class nodo::server inherits nodo {
include sysctl
include ups
+ # Time configuration
+ case $ntpdate {
+ false: { include timezone }
+ default: { include ntpdate }
+ }
+
# DNS resolver
$resolvconf_domain = "$domain"
$resolvconf_search = "$fqdn"