From 5e3f60d42b089dd49fa4946cadb6f6c4b1b5fd00 Mon Sep 17 00:00:00 2001
From: Alexander Klimov <alexander.klimov@netways.de>
Date: Wed, 10 Sep 2014 11:38:10 +0200
Subject: [PATCH] Module `apache': add user `apache'

refs #6842
---
 .vagrant-puppet/modules/apache/manifests/init.pp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/.vagrant-puppet/modules/apache/manifests/init.pp b/.vagrant-puppet/modules/apache/manifests/init.pp
index e328ff95f..ed60b838f 100644
--- a/.vagrant-puppet/modules/apache/manifests/init.pp
+++ b/.vagrant-puppet/modules/apache/manifests/init.pp
@@ -13,20 +13,28 @@
 #   include apache
 #
 class apache {
-
   $apache = $::operatingsystem ? {
     /(Debian|Ubuntu)/ => 'apache2',
     /(RedHat|CentOS|Fedora)/ => 'httpd'
   }
 
+  $user = $::operatingsystem ? {
+    /(Debian|Ubuntu)/ => 'www-data',
+    /(RedHat|CentOS|Fedora)/ => 'apache'
+  }
+
   package { $apache:
     ensure => installed,
-    alias  => 'apache'
+    alias  => 'apache',
   }
 
   service { $apache:
     ensure  => running,
     alias   => 'apache',
-    require => Package['apache']
+    require => Package['apache'],
+  }
+
+  user { $user:
+    alias => 'apache',
   }
 }