aboutsummaryrefslogtreecommitdiffstats
path: root/modules/blog/manifests
diff options
context:
space:
mode:
Diffstat (limited to 'modules/blog/manifests')
-rw-r--r--modules/blog/manifests/init.pp33
1 files changed, 18 insertions, 15 deletions
diff --git a/modules/blog/manifests/init.pp b/modules/blog/manifests/init.pp
index 31e034b8..6bdaa33f 100644
--- a/modules/blog/manifests/init.pp
+++ b/modules/blog/manifests/init.pp
@@ -1,14 +1,28 @@
-#TODO:
-# - add the creation of the user 'blog' in puppet
-# - add the user 'blog' to the 'apache' group (usermod -a -G apache blog)
class blog {
+ user { "blog":
+ groups => apache,
+ comment => "This user is used for blog.mageia.org",
+ ensure => present,
+ managehome => true,
+ }
+
include apache::mod_php
include mysql
+ apache::vhost_other_app { "blog-test.$domain":
+ vhost_file => "blog/01_blogs_vhosts.conf",
+ }
package { ['wget','php-mysql']:
ensure => installed
}
+ file { "/var/lib/blog":
+ ensure => directory,
+ owner => blog,
+ group => blog,
+ mode => 644,
+ }
+
file { "check_new-blog-post":
path => "/usr/local/bin/check_new-blog-post.sh",
ensure => present,
@@ -18,20 +32,9 @@ class blog {
content => template("blog/check_new-blog-post.sh")
}
- apache::vhost_other_app { "blog-test.$domain":
- vhost_file => "blog/01_blogs_vhosts.conf",
- }
-
- file { "/var/lib/blog":
- ensure => directory,
- owner => blog,
- group => blog,
- mode => 644,
- }
-
file { "/var/www/html/blog.mageia.org":
ensure => directory,
- owner => apache,
+ owner => blog,
group => blog,
mode => 644,
}