diff options
author | mh <mh@immerda.ch> | 2008-11-07 19:08:47 +0000 |
---|---|---|
committer | mh <mh@immerda.ch> | 2008-11-07 19:08:47 +0000 |
commit | 810ef4fe78b9648d8275d8418533f96f8b997447 (patch) | |
tree | 37ae12ba28463d509390be2c1a28084e8e26e8d3 /manifests | |
parent | a79550e32e532fa53ce1913c5433638836952e5c (diff) |
root-owner of webhost have to be root, the webroot_dir have to be writeable by the user
Diffstat (limited to 'manifests')
-rw-r--r-- | manifests/defines.pp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/manifests/defines.pp b/manifests/defines.pp index 044103e..b4e9357 100644 --- a/manifests/defines.pp +++ b/manifests/defines.pp @@ -388,6 +388,7 @@ define apache::gentoo::module( define apache::vhost::webhostdir( $path = 'absent', $owner = root, + $user_owner = root, $group = 0, $mode = 0640, $apache_user = apache, @@ -433,9 +434,13 @@ define apache::vhost::webhostdir( default: { $real_apache_group = $apache_default_group } } - file{ [ "$real_path", "$documentroot" ] : + file{"$real_path": ensure => directory, - owner => $owner, group => $real_apache_group, mode => $mode; + owner => $owner, group => $real_apache_group, mode => '0750'; + } + file{"$documentroot": + ensure => directory, + owner => $user_owner, group => $real_apache_group, mode => $mode; } # the logdir must be writeable by the apache and the user |