diff options
Diffstat (limited to 'manifests')
-rw-r--r-- | manifests/defines/permissions.pp | 46 | ||||
-rw-r--r-- | manifests/defines/vhost_varieties.pp | 2 |
2 files changed, 27 insertions, 21 deletions
diff --git a/manifests/defines/permissions.pp b/manifests/defines/permissions.pp index 32d2ebb..14f9146 100644 --- a/manifests/defines/permissions.pp +++ b/manifests/defines/permissions.pp @@ -1,28 +1,32 @@ -define apache::file::rw() { - file{$name: - mode => 660, - recurse => true +define apache::file::rw( + $owner = root, + $group = 0, + $mode = 0660 +) { + apache::file{$name: + owner => $owner, + group => $group, + mode => $mode, } } - -define apache::file::readonly() { - apache::file::r{$name:} -} -define apache::file::r() { - file{$name: - mode => 640, - recurse => true, +define apache::file::readonly( + $owner = root, + $group = 0, + $mode = 0640 +) { + apache::file{$name: + owner => $owner, + group => $group, + mode => $mode, } } - -define apache::dir::rw( - $uid = 'absent', - $gid = 'uid' -){ +define apache::file( + $owner = root, + $group = 0, + $mode = 0640 +) { file{$name: - ensure => directory, - mode => 0770, + recurse => true, + owner => $owner, group => $group, mode => $mode; } - selinux::dir::rw{$name:} } - diff --git a/manifests/defines/vhost_varieties.pp b/manifests/defines/vhost_varieties.pp index 985699e..93bb3ab 100644 --- a/manifests/defines/vhost_varieties.pp +++ b/manifests/defines/vhost_varieties.pp @@ -245,6 +245,8 @@ define apache::vhost::php::joomla( "$documentroot/templates", "$documentroot/cache", "$documentroot/administrator/cache" ]: + owner => $documentroot_owner, + group => $documentroot_group, require => Git::Clone["git_clone_$name"], } } |