- correctly manage timezone on server

3 files changed, 11 insertions, 7 deletions

diff --git a/manifests/common.pp b/manifests/common.pp
index d33d6a9f..f62cfee4 100644
--- a/manifests/common.pp
+++ b/manifests/common.pp
@@ -63,6 +63,8 @@ class default_ssh_root_key {
 }
 
 class default_mageia_server {
+    include timezone
+
 # to include later
     include openssh
 #   include puppet
diff --git a/manifests/nodes.pp b/manifests/nodes.pp
index 783d9172..5758ca82 100644
--- a/manifests/nodes.pp
+++ b/manifests/nodes.pp
@@ -1,7 +1,7 @@
 # svn, big important server
 node valstar {
     include default_mageia_server
-    #timezone { "Europe/Paris": }
+    timezone::timezone { "Europe/Paris": }
     include rsyncd
     include mirror
 
@@ -39,22 +39,22 @@ node valstar {
 
 # web apps
 node alamut {
-    #timezone { "Europe/Paris": }
 	include default_mageia_server
     include bind::bind_master
     bind::zone_master { "mageia.org": }
     bind::zone_master { "mageia.fr": } 
+    timezone::timezone { "Europe/Paris": }
 }
 
 # buildnode
 node jonund {
-    #timezone { "Europe/Paris": }
 	include default_mageia_server
+    timezone::timezone { "Europe/Paris": }
 }
 
 node ecosse {
-    #timezone { "Europe/Paris": }
 	include default_mageia_server
+    timezone::timezone { "Europe/Paris": }
 }
 
 
@@ -65,9 +65,9 @@ node fiona {
 
 # gandi-vm
 node krampouezh {
-    #timezone { "Europe/Paris": }
 	include default_mageia_server
     include bind::bind_slave
+    timezone::timezone { "Europe/Paris": }
 }
 
 node champagne {
diff --git a/modules/timezone/manifests/init.pp b/modules/timezone/manifests/init.pp
index 5703b04f..0f33093a 100644
--- a/modules/timezone/manifests/init.pp
+++ b/modules/timezone/manifests/init.pp
@@ -1,6 +1,8 @@
 
 class timezone {
-    file { "/etc/localtime": 
-        ensure => "/usr/share/zoneinfo/$name" 
+    define timezone() {
+        file { "/etc/localtime": 
+            ensure => "/usr/share/zoneinfo/$name" 
+        }
     }
 }