diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2010-01-07 00:56:26 -0200 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2010-01-07 00:56:26 -0200 |
commit | 888f2a36a9fabeaffd055e22a572aeb7a55f75a4 (patch) | |
tree | 975a00f1a5bc098711339bedf79b1d4d568cc1f5 | |
parent | aaf6dec83004d076d78cd8c04e2aeeb22195a3dd (diff) | |
download | puppet-apache-888f2a36a9fabeaffd055e22a572aeb7a55f75a4.tar.gz puppet-apache-888f2a36a9fabeaffd055e22a572aeb7a55f75a4.tar.bz2 |
Adding $manage_docroot, $owner and $group
-rw-r--r-- | manifests/init.pp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index ac1f934..e921255 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -95,7 +95,8 @@ class apache { define site($ensure = present, $docroot = false, $redirect = false, $redirect_match = false, $protocol = 'http', $server_alias = false, $use = false, $ticket = false, - $source = false, $template = 'apache/site.erb', $filename = '') { + $source = false, $template = 'apache/site.erb', $filename = '', + $manage_docroot = true, $owner = "root", $group = "root") { $vhost = $filename ? { '' => "$title", @@ -144,12 +145,12 @@ class apache { case $ensure { 'present': { - if $docroot != false { + if ($docroot != false) and ($manage_docroot == true) { if !defined(File["${docroot}"]) { file { "${docroot}": ensure => present, - owner => root, - group => root, + owner => $owner, + group => $group, mode => 0755, recurse => false, } |