aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--manifests/nodes.pp2
-rw-r--r--modules/blog/manifests/init.pp8
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,