aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2011-02-23 16:47:15 +0000
committerMichael Scherer <misc@mageia.org>2011-02-23 16:47:15 +0000
commit0f0f987a310f673d1d0ac3cfa103aa2318104eec (patch)
treefbe4d2b4e49fd3aaa9401288a511359f27bd12ad /modules
parent4f505f7404ec719b1c06895b3d04b21dd6b3d63e (diff)
downloadpuppet-0f0f987a310f673d1d0ac3cfa103aa2318104eec.tar
puppet-0f0f987a310f673d1d0ac3cfa103aa2318104eec.tar.gz
puppet-0f0f987a310f673d1d0ac3cfa103aa2318104eec.tar.bz2
puppet-0f0f987a310f673d1d0ac3cfa103aa2318104eec.tar.xz
puppet-0f0f987a310f673d1d0ac3cfa103aa2318104eec.zip
fix previous try to have a array of directories writable by apache
Diffstat (limited to 'modules')
-rw-r--r--modules/phpbb/manifests/init.pp21
1 files changed, 12 insertions, 9 deletions
diff --git a/modules/phpbb/manifests/init.pp b/modules/phpbb/manifests/init.pp
index 8373952e..9ac8f562 100644
--- a/modules/phpbb/manifests/init.pp
+++ b/modules/phpbb/manifests/init.pp
@@ -65,6 +65,16 @@ class phpbb {
}
}
+ define apache_writable_dir() {
+ file { "$forums_dir/$lang/phpBB/$name":
+ ensure => directory,
+ owner => apache,
+ group => root,
+ mode => 755,
+ require => Exec["git_clone $lang"],
+ }
+ }
+
# TODO find a way to avoid all the phpbb::base prefix
define instance() {
include phpbb::base
@@ -95,17 +105,10 @@ class phpbb {
# list found by reading ./install/install_install.php
# end of check_server_requirements ( 2 loops )
- $writable_dir = ['cache',
+ apache_writable_dir { ['cache',
'images/avatars/upload',
'files',
- 'store',
- ]
- file { "$forums_dir/$lang/phpBB/$writable_dir":
- ensure => directory,
- owner => apache,
- group => root,
- mode => 755,
- require => Exec["git_clone $lang"],
+ 'store' ]:
}
file { "$forums_dir/$lang/phpBB/config.php":