Adding $manage_docroot, $owner and $group

diff --git a/manifests/init.pp b/manifests/init.pp
index ac1f934a9512ddf8f5d7408ca2256e2c4edb5230..e921255b1dfda907a5eb128b614a44de2f967b3d 100644 (file)
--- 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,
             }