summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-08-17 13:05:40 -0300
committerSilvio Rhatto <rhatto@riseup.net>2015-08-17 13:05:40 -0300
commit3e438b927c091187971e78a9c6dc151f76f2c4ed (patch)
tree545414d428e90a327c0a247a4fb28d607f07cbf7
parent4384492539dd9a76d8c9b9a16a19e156e2ad13a9 (diff)
downloadpuppet-apache-3e438b927c091187971e78a9c6dc151f76f2c4ed.tar.gz
puppet-apache-3e438b927c091187971e78a9c6dc151f76f2c4ed.tar.bz2
Default user and group
-rw-r--r--manifests/init.pp2
-rw-r--r--templates/apache2.conf.erb.jessie4
-rw-r--r--templates/apache2.conf.erb.wheezy4
3 files changed, 6 insertions, 4 deletions
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