Default user and group

diff --git a/manifests/init.pp b/manifests/init.pp
index b1e88133562f91f317c7369fceadc00e05196a64..b144191afc23811f13961e04311ecea922ddc643 100644 (file)
--- 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 63c4b6a8b2edde53215e412336ff9af48cb27c0d..0fc143b1900824b3156de956e184dc7c4e707fb5 100644 (file)
--- 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 122beee18b8a4b67f1ecbdb5ed0a0b7ff150c55a..886b305845c889cef078147913c43915d48ea4d5 100644 (file)
--- 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