diff options
| author | mh <mh@immerda.ch> | 2009-05-22 23:35:54 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2009-05-22 23:35:54 +0200 |
| commit | c7c8436428e553f21e315e4dd14005980de7946d (patch) | |
| tree | 9b81c5f037ad72f3fe6f4550a94997f50758cce9 | |
| parent | fbb3cb7dcd8406f085e80f3f11fa873b55bd5073 (diff) | |
we can now decide wether we'd like to manage webdir or the docroot, will be necessary for mediawiki stuff
| -rw-r--r-- | manifests/vhost/php/standard.pp | 9 | ||||
| -rw-r--r-- | manifests/vhost/php/webapp.pp | 4 | ||||
| -rw-r--r-- | manifests/vhost/webdir.pp | 5 |
3 files changed, 15 insertions, 3 deletions
diff --git a/manifests/vhost/php/standard.pp b/manifests/vhost/php/standard.pp index 4e5873f..fcca6cd 100644 --- a/manifests/vhost/php/standard.pp +++ b/manifests/vhost/php/standard.pp @@ -10,6 +10,8 @@ define apache::vhost::php::standard( $domainalias = 'absent', $server_admin = 'absent', $path = 'absent', + $manage_webdir = true, + $manage_docroot = true, $template_mode = 'php', $owner = root, $group = apache, @@ -46,16 +48,19 @@ define apache::vhost::php::standard( run_uid => $run_uid, } - # create webdir - ::apache::vhost::webdir{$name: + if $manage_webdir { + # create webdir + ::apache::vhost::webdir{$name: ensure => $ensure, path => $path, owner => $owner, group => $group, run_mode => $run_mode, + manage_docroot => $manage_docroot, documentroot_owner => $documentroot_owner, documentroot_group => $documentroot_group, documentroot_mode => $documentroot_mode, + } } # create vhost configuration file diff --git a/manifests/vhost/php/webapp.pp b/manifests/vhost/php/webapp.pp index 04fd29c..9989986 100644 --- a/manifests/vhost/php/webapp.pp +++ b/manifests/vhost/php/webapp.pp @@ -10,6 +10,8 @@ define apache::vhost::php::webapp( $domainalias = 'absent', $server_admin = 'absent', $path = 'absent', + $manage_webdir = true, + $manage_docroot = true, $template_mode, $owner = root, $group = 0, @@ -75,6 +77,8 @@ define apache::vhost::php::webapp( domainalias => $domainalias, server_admin => $server_admin, path => $path, + manage_webdir => $manage_webdir, + manage_docroot => $manage_docroot, template_mode => $template_mode, owner => $owner, group => $group, diff --git a/manifests/vhost/webdir.pp b/manifests/vhost/webdir.pp index b3b53f9..5f6a238 100644 --- a/manifests/vhost/webdir.pp +++ b/manifests/vhost/webdir.pp @@ -6,6 +6,7 @@ define apache::vhost::webdir( $group = apache, $mode = 0640, $run_mode = 'normal', + $manage_docroot = true, $documentroot_owner = root, $documentroot_group = apache, $documentroot_mode = 0640, @@ -91,10 +92,12 @@ define apache::vhost::webdir( ensure => directory, owner => $real_owner, group => $real_group, mode => $real_mode; } - file{"$documentroot": + if $manage_docroot { + file{"$documentroot": ensure => directory, recurse => $documentroot_recurse, owner => $real_documentroot_owner, group => $real_documentroot_group, mode => $documentroot_mode; + } } file{"$logdir": ensure => directory, |