diff options
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/defines/configuration.pp | 9 | ||||
| -rw-r--r-- | manifests/defines/vhost_varieties.pp | 2 | ||||
| -rw-r--r-- | manifests/init.pp | 3 |
3 files changed, 9 insertions, 5 deletions
diff --git a/manifests/defines/configuration.pp b/manifests/defines/configuration.pp index 19b56ee..4705414 100644 --- a/manifests/defines/configuration.pp +++ b/manifests/defines/configuration.pp @@ -66,9 +66,10 @@ define apache::vhost::webdir( $ensure = present, $path = 'absent', $owner = root, - $group = 0, - $documentroot_owner = apache, - $documentroot_group = 0, + $group = apache, + $mode = 0640, + $documentroot_owner = root, + $documentroot_group = apache, $documentroot_mode = 0640, $documentroot_recurse = false ){ @@ -123,7 +124,7 @@ define apache::vhost::webdir( default: { file{"$real_path": ensure => directory, - owner => $owner, group => $group, mode => '0755'; + owner => $owner, group => $group, mode => $mode; } file{"$documentroot": ensure => directory, diff --git a/manifests/defines/vhost_varieties.pp b/manifests/defines/vhost_varieties.pp index 3fe557b..ea34555 100644 --- a/manifests/defines/vhost_varieties.pp +++ b/manifests/defines/vhost_varieties.pp @@ -87,7 +87,7 @@ define apache::vhost::php::standard( $path = 'absent', $template_mode = 'php', $owner = root, - $group = 0, + $group = apache, $documentroot_owner = apache, $documentroot_group = 0, $documentroot_mode = 0750, diff --git a/manifests/init.pp b/manifests/init.pp index 1316bf1..90a84a0 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -88,6 +88,9 @@ class apache::package inherits apache::base { File['vhosts_dir']{ require => Package[apache], } + File['config_dir']{ + require => Package[apache], + } Service['apache']{ require => Package[apache], } |