diff options
| author | Michael Scherer <misc@mageia.org> | 2010-11-21 23:23:59 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2010-11-21 23:23:59 +0000 |
| commit | 188e8001bf436c16d1257e65c7f6de52269eae76 (patch) | |
| tree | 83cfa92661293030febae07c3d164b5c1cde0a18 | |
| parent | 88d77d90ddc1566ab544cc2d82053fc5d5c1f84d (diff) | |
| download | puppet-188e8001bf436c16d1257e65c7f6de52269eae76.tar puppet-188e8001bf436c16d1257e65c7f6de52269eae76.tar.gz puppet-188e8001bf436c16d1257e65c7f6de52269eae76.tar.bz2 puppet-188e8001bf436c16d1257e65c7f6de52269eae76.tar.xz puppet-188e8001bf436c16d1257e65c7f6de52269eae76.zip | |
- move apache requirement in the blog class ( so we do not forget it )
- since apache::mod_php implie apache::base, remove redundant include
| -rw-r--r-- | manifests/nodes.pp | 2 | ||||
| -rw-r--r-- | modules/blog/manifests/init.pp | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/manifests/nodes.pp b/manifests/nodes.pp index 8287c717..1a2ac33b 100644 --- a/manifests/nodes.pp +++ b/manifests/nodes.pp @@ -111,8 +111,6 @@ node champagne { # include default_mageia_server timezone::timezone { "Europe/Paris": } - include apache::base - include apache::mod_php include blog } diff --git a/modules/blog/manifests/init.pp b/modules/blog/manifests/init.pp index 4778af10..ab7f9ec0 100644 --- a/modules/blog/manifests/init.pp +++ b/modules/blog/manifests/init.pp @@ -9,15 +9,13 @@ class blog { ensure => installed } + include apache::mod_php + package { 'php-mysql': ensure => installed } - service { mysqld: - ensure => running, - subscribe => Package["mysql"], - } - + file { "check_new-blog-post": path => "/usr/local/bin/check_new-blog-post.sh", ensure => present, |