Revision

44

Author

misc

Date

2010-10-27 17:51:23 +0200 (Wed, 27 Oct 2010)

Log Message

- correctly manage timezone on server 

Modified Paths

• puppet/manifests/common.pp
• puppet/manifests/nodes.pp
• puppet/modules/timezone/manifests/init.pp

Diff

--- puppet/manifests/common.pp	2010-10-27 15:21:48 UTC (rev 43)
+++ puppet/manifests/common.pp	2010-10-27 15:51:23 UTC (rev 44)
@@ -63,6 +63,8 @@
 }
 
 class default_mageia_server {
+    include timezone
+
 # to include later
     include openssh
 #   include puppet

--- puppet/manifests/nodes.pp	2010-10-27 15:21:48 UTC (rev 43)
+++ puppet/manifests/nodes.pp	2010-10-27 15:51:23 UTC (rev 44)
@@ -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 @@
 
 # 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 @@
 
 # gandi-vm
 node krampouezh {
-    #timezone { "Europe/Paris": }
 	include default_mageia_server
     include bind::bind_slave
+    timezone::timezone { "Europe/Paris": }
 }
 
 node champagne {

--- puppet/modules/timezone/manifests/init.pp	2010-10-27 15:21:48 UTC (rev 43)
+++ puppet/modules/timezone/manifests/init.pp	2010-10-27 15:51:23 UTC (rev 44)
@@ -1,6 +1,8 @@
 
 class timezone {
-    file { "/etc/localtime": 
-        ensure => "/usr/share/zoneinfo/$name" 
+    define timezone() {
+        file { "/etc/localtime": 
+            ensure => "/usr/share/zoneinfo/$name" 
+        }
     }
 }