aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2011-07-21 01:46:54 +0000
committerMichael Scherer <misc@mageia.org>2011-07-21 01:46:54 +0000
commit4efd340f7a27c5b40db52d0b0874d303e0f63752 (patch)
tree644e5f2d2f5cb93477a89050a4a3b911941d2a09
parent150e92cb17c034a967fcbfbeb5496e1638f9048b (diff)
downloadpuppet-4efd340f7a27c5b40db52d0b0874d303e0f63752.tar
puppet-4efd340f7a27c5b40db52d0b0874d303e0f63752.tar.gz
puppet-4efd340f7a27c5b40db52d0b0874d303e0f63752.tar.bz2
puppet-4efd340f7a27c5b40db52d0b0874d303e0f63752.tar.xz
puppet-4efd340f7a27c5b40db52d0b0874d303e0f63752.zip
- do not include include timezone in common::default_mageia_server, not needed
- set the timezone for fiona node Patch by Sébastien Kurtzemann
-rw-r--r--deployment/common/manifests/init.pp1
-rw-r--r--manifests/nodes.pp1
2 files changed, 1 insertions, 1 deletions
diff --git a/deployment/common/manifests/init.pp b/deployment/common/manifests/init.pp
index 1502eb75..da661869 100644
--- a/deployment/common/manifests/init.pp
+++ b/deployment/common/manifests/init.pp
@@ -88,7 +88,6 @@ class common {
}
class default_mageia_server_no_smtp {
- include timezone
include shadow
include openssh::server
diff --git a/manifests/nodes.pp b/manifests/nodes.pp
index 3b6d6432..c6a03182 100644
--- a/manifests/nodes.pp
+++ b/manifests/nodes.pp
@@ -156,6 +156,7 @@ node fiona {
# - install the server in datacenter
# - install a backup system
include common::default_mageia_server
+ timezone::timezone { "Europe/Paris": }
}
# gandi-vm