tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Migrated $httpd_user, $httpd_group, $httpsd_user and $httpsd_group variables to use format $apache::server::{user,group} and $apache::sslserver::{user,group}.

Browse source
This commit is contained in:
Timo Mkinen 2011-02-25 11:46:57 +02:00
parent 61b1501079
commit e3b6cca7a4
5 changed files with 38 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apache/templates/apache2.envvars.erb
View file

@ -3,8 +3,8 @@
# 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=<%= httpd_user %>
export APACHE_RUN_GROUP=<%= httpd_group %>
export APACHE_RUN_USER=<%= scope.lookupvar('apache::server::user') %>
export APACHE_RUN_GROUP=<%= scope.lookupvar('apache::server::group') %>
export APACHE_PID_FILE=/var/run/apache2.pid
## The locale used by some modules like mod_dav

4
apache/templates/httpd.conf.erb
View file

@ -230,8 +230,8 @@ Include conf.http.d/*.conf
# when the value of (unsigned)Group is above 60000;
# don't use Group #-1 on these systems!
#
User <%= httpd_user %>
Group <%= httpd_group %>
User <%= scope.lookupvar('apache::server::user') %>
Group <%= scope.lookupvar('apache::server::group') %>
### Section 2: 'Main' server configuration
#

4
apache/templates/httpsd.conf.erb
View file

@ -230,8 +230,8 @@ Include conf.https.d/*.conf
# when the value of (unsigned)Group is above 60000;
# don't use Group #-1 on these systems!
#
User <%= httpsd_user %>
Group <%= httpsd_group %>
User <%= scope.lookupvar('apache::sslserver::user') %>
Group <%= scope.lookupvar('apache::sslserver::group') %>
### Section 2: 'Main' server configuration
#