From 7b10e62e1c56e3dccd56e691c2f53a6017910cea Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Wed, 9 Mar 2011 14:02:45 +0200
Subject: [PATCH] Fixed apache user and group handing on Ubuntu

---
 apache/manifests/init.pp             | 27 +++++++++++++++------------
 apache/templates/apache2.envvars.erb |  5 +++--
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/apache/manifests/init.pp b/apache/manifests/init.pp
index 8f1f4c8..0634da1 100644
--- a/apache/manifests/init.pp
+++ b/apache/manifests/init.pp
@@ -5,6 +5,21 @@ import "redhat.pp"
 #
 class apache::common {
 
+    case $operatingsystem {
+        debian,ubuntu: {
+            if ! $httpd_user {
+                $user = "www-data"
+            } else {
+                $user = $httpd_user
+            }
+            if ! $httpd_group {
+                $group = "www-data"
+            } else {
+                $group = $httpd_group
+            }
+        }
+    }
+
     if $apache_datadir {
         file { "${apache_datadir}":
             ensure => directory,
@@ -90,16 +105,6 @@ class apache::server inherits apache::common {
 
     case $operatingsystem {
         debian,ubuntu: {
-            if ! $httpd_user {
-                $user = "www-data"
-            } else {
-                $user = $httpd_user
-            }
-            if ! $httpd_group {
-                $group = "www-data"
-            } else {
-                $group = $httpd_group
-            }
             include apache::debian::server
         }
         centos,fedora: {
@@ -194,8 +199,6 @@ class apache::sslserver inherits apache::common {
 
     case $operatingsystem {
         debian,ubuntu: {
-            $user = "www-data"
-            $group = "www-data"
             include apache::debian::sslserver
         }
         centos,fedora: {
diff --git a/apache/templates/apache2.envvars.erb b/apache/templates/apache2.envvars.erb
index c187ebd..cf44a6c 100644
--- a/apache/templates/apache2.envvars.erb
+++ b/apache/templates/apache2.envvars.erb
@@ -3,9 +3,10 @@
 # Since there is no sane way to get the parsed apache2 config in scripts, some
 # settings are defined via environment variables and then used in apache2ctl,
 # /etc/init.d/apache2, /etc/logrotate.d/apache2, etc.
-export APACHE_RUN_USER=<%= scope.lookupvar('apache::server::user') %>
-export APACHE_RUN_GROUP=<%= scope.lookupvar('apache::server::group') %>
+export APACHE_RUN_USER=<%= scope.lookupvar('apache::common::user') %>
+export APACHE_RUN_GROUP=<%= scope.lookupvar('apache::common::group') %>
 export APACHE_PID_FILE=/var/run/apache2.pid
+export APACHE_RUN_DIR=/var/run/apache2
 
 ## The locale used by some modules like mod_dav
 export LANG=C