diff options
| author | mh <mh@immerda.ch> | 2009-05-17 16:32:16 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2009-05-17 16:32:16 +0200 |
| commit | 1db0e1d0eced17f4ca6ff5206bee17a048731552 (patch) | |
| tree | 7196329ba481b6a0da189999764fd4c6b6d6f0f0 | |
| parent | 5f96bd555dc38f563747952bac88ea73fc33333e (diff) | |
fix itk path mode
- if we run itk and use the default path mode (0640) we should use
0644 as mode, so vhosts are able to enter their vhosts...
| -rw-r--r-- | manifests/defines/configuration.pp | 9 | ||||
| -rw-r--r-- | manifests/defines/vhost_varieties.pp | 4 |
2 files changed, 12 insertions, 1 deletions
diff --git a/manifests/defines/configuration.pp b/manifests/defines/configuration.pp index 4705414..f3ae200 100644 --- a/manifests/defines/configuration.pp +++ b/manifests/defines/configuration.pp @@ -68,6 +68,7 @@ define apache::vhost::webdir( $owner = root, $group = apache, $mode = 0640, + $run_mode = 'normal', $documentroot_owner = root, $documentroot_group = apache, $documentroot_mode = 0640, @@ -81,6 +82,12 @@ define apache::vhost::webdir( default => "${path}" } + if ($run_mode == 'itk') and ($mode == '0640'){ + $real_mode = 0644 + } else { + $real_mode = $mode + } + $documentroot = "${real_path}/www" $logdir = "${real_path}/logs" @@ -124,7 +131,7 @@ define apache::vhost::webdir( default: { file{"$real_path": ensure => directory, - owner => $owner, group => $group, mode => $mode; + owner => $owner, group => $group, mode => $real_mode; } file{"$documentroot": ensure => directory, diff --git a/manifests/defines/vhost_varieties.pp b/manifests/defines/vhost_varieties.pp index 7a3e100..ebf9ba6 100644 --- a/manifests/defines/vhost_varieties.pp +++ b/manifests/defines/vhost_varieties.pp @@ -47,6 +47,7 @@ define apache::vhost::static( path => $path, owner => $owner, group => $group, + run_mode => 'normal', documentroot_owner => $documentroot_owner, documentroot_group => $documentroot_group, documentroot_mode => $documentroot_mode, @@ -129,6 +130,7 @@ define apache::vhost::php::standard( path => $path, owner => $owner, group => $group, + run_mode => $run_mode, documentroot_owner => $documentroot_owner, documentroot_group => $documentroot_group, documentroot_mode => $documentroot_mode, @@ -559,6 +561,7 @@ define apache::vhost::webdav( path => $path, owner => $owner, group => $group, + run_mode => $run_mode, documentroot_owner => $documentroot_owner, documentroot_group => $documentroot_group, documentroot_mode => $documentroot_mode, @@ -652,6 +655,7 @@ define apache::vhost::modperl( path => $path, owner => $owner, group => $group, + run_mode => $run_mode, documentroot_owner => $documentroot_owner, documentroot_group => $documentroot_group, documentroot_mode => $documentroot_mode, |