aboutsummaryrefslogtreecommitdiffstats
path: root/manifests
diff options
context:
space:
mode:
authorDamien Lallement <dams@mageia.org>2010-11-18 09:50:40 +0000
committerDamien Lallement <dams@mageia.org>2010-11-18 09:50:40 +0000
commit1a23c364be65596297d6e98e35ab6c8efdde63ac (patch)
tree163e9ac505cf55736e93e2a0057c08fe21519249 /manifests
parentc3a0e668bec66f847b107e7abc1ff1c215ee3b87 (diff)
downloadpuppet-1a23c364be65596297d6e98e35ab6c8efdde63ac.tar
puppet-1a23c364be65596297d6e98e35ab6c8efdde63ac.tar.gz
puppet-1a23c364be65596297d6e98e35ab6c8efdde63ac.tar.bz2
puppet-1a23c364be65596297d6e98e35ab6c8efdde63ac.tar.xz
puppet-1a23c364be65596297d6e98e35ab6c8efdde63ac.zip
Merge two modules: mysql and blog
Diffstat (limited to 'manifests')
-rw-r--r--manifests/nodes.pp3
1 files changed, 1 insertions, 2 deletions
diff --git a/manifests/nodes.pp b/manifests/nodes.pp
index 5c0cb46a..b758d5f2 100644
--- a/manifests/nodes.pp
+++ b/manifests/nodes.pp
@@ -111,10 +111,9 @@ node champagne {
# - setup blog
#
include default_mageia_server
+ timezone::timezone { "Europe/Paris": }
include apache::base
include apache::mod_php
- include mysql
- timezone::timezone { "Europe/Paris": }
include blog
}