diff options
| author | Michael Scherer <misc@mageia.org> | 2010-10-27 15:51:23 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2010-10-27 15:51:23 +0000 |
| commit | 18f0f9231535d8d8d164432bdc3b6f7902d69303 (patch) | |
| tree | 018d4ed4ba9bf6a1a1cb84233db5f060b815e8ff /manifests | |
| parent | 76389d9559581277ab2b3c58f357f07e7adfdeba (diff) | |
| download | puppet-18f0f9231535d8d8d164432bdc3b6f7902d69303.tar puppet-18f0f9231535d8d8d164432bdc3b6f7902d69303.tar.gz puppet-18f0f9231535d8d8d164432bdc3b6f7902d69303.tar.bz2 puppet-18f0f9231535d8d8d164432bdc3b6f7902d69303.tar.xz puppet-18f0f9231535d8d8d164432bdc3b6f7902d69303.zip | |
- correctly manage timezone on server
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/common.pp | 2 | ||||
| -rw-r--r-- | manifests/nodes.pp | 10 |
2 files changed, 7 insertions, 5 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 { |