Updating $group to use the same convention as $wwwuser.

efroese · Jul 12, 2012 · baefda8 · baefda8
1 parent 2899c17
commit baefda8
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
@@ -9,7 +9,7 @@
   $cgibin=true,
   $user="",
   $admin="",
-  $group="root",
+  $group="",
   $mode=2570,
   $aliases=[],
   $enable_default=true,
@@ -25,6 +25,11 @@
     default => $user,
   }
 
+  $wwwgroup = $group ? {
+    ""      => $apache::params::group,
+    default => $group,
+  }
+
   # used in ERB templates
   $wwwroot = $apache::params::root
 
@@ -94,7 +99,7 @@
           "" => $wwwuser,
           default => $admin,
         },
-        group  => $group,
+        group  => $wwwgroup,
         mode   => $mode,
         seltype => $::operatingsystem ? {
           redhat => "httpd_config_t",
@@ -107,7 +112,7 @@
       file { "${apache::params::root}/${name}/htdocs":
         ensure => directory,
         owner  => $wwwuser,
-        group  => $group,
+        group  => $wwwgroup,
         mode   => $mode,
         seltype => $::operatingsystem ? {
           redhat => "httpd_sys_content_t",
@@ -142,7 +147,7 @@
           default => undef, # don't manage this directory unless under $root/$name
         },
         owner  => $wwwuser,
-        group  => $group,
+        group  => $wwwgroup,
         mode   => $mode,
         seltype => $::operatingsystem ? {
           redhat => "httpd_sys_script_exec_t",
@@ -208,7 +213,7 @@
       file {"${apache::params::root}/${name}/private":
         ensure  => directory,
         owner   => $wwwuser,
-        group   => $group,
+        group   => $wwwgroup,
         mode    => $mode,
         seltype => $::operatingsystem ? {
           redhat => "httpd_sys_content_t",