From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 17 Aug 2015 16:05:40 +0000 (-0300)
Subject: Default user and group
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=3e438b927c091187971e78a9c6dc151f76f2c4ed;p=puppet-apache.git

Default user and group
---

diff --git a/manifests/init.pp b/manifests/init.pp
index b1e8813..b144191 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -40,6 +40,8 @@ class apache(
   $remote_addr    = false,
   $http_port      = '80',
   $https_port     = '443',
+  $default_user   = 'www-data',
+  $default_group  = 'www-data',
 ) {
 
   include ssl
diff --git a/templates/apache2.conf.erb.jessie b/templates/apache2.conf.erb.jessie
index 63c4b6a..0fc143b 100644
--- a/templates/apache2.conf.erb.jessie
+++ b/templates/apache2.conf.erb.jessie
@@ -123,8 +123,8 @@ KeepAliveTimeout 15
     MaxRequestsPerChild   0
 </IfModule>
 
-User www-data
-Group www-data
+User <%= default_user %>
+Group <%= default_group %>
 
 #
 # AccessFileName: The name of the file to look for in each directory
diff --git a/templates/apache2.conf.erb.wheezy b/templates/apache2.conf.erb.wheezy
index 122beee..886b305 100644
--- a/templates/apache2.conf.erb.wheezy
+++ b/templates/apache2.conf.erb.wheezy
@@ -123,8 +123,8 @@ KeepAliveTimeout 15
     MaxRequestsPerChild   0
 </IfModule>
 
-User www-data
-Group www-data
+User <%= default_user %>
+Group <%= default_group %>
 
 #
 # AccessFileName: The name of the file to look for in each directory