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

Added variables for user and group to apache configs, commented out UserDir.

Browse source
This commit is contained in:
Ossi Salmi 2009-12-01 16:25:31 +02:00 • committed by Timo Mkinen
parent 95d3d822d6
commit 9c853fa445
3 changed files with 40 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
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 apache
Group apache
User <%= httpd_user %>
Group <%= httpd_group %>
### Section 2: 'Main' server configuration
#
@ -306,7 +306,7 @@ DocumentRoot "/srv/www/http/<%= fqdn %>"
#
# This should be changed to whatever you set DocumentRoot to.
#
<Directory "/srv/www/http/*">
<Directory "/srv/www/http">
#
# Possible values for the Options directive are "None", "All",
@ -355,7 +355,9 @@ DocumentRoot "/srv/www/http/<%= fqdn %>"
# of a username on the system (depending on home directory
# permissions).
#
UserDir disable
# puppet note: commented to make it possible to configure UserDir via
# included config. UserDir is disabled by default since apache 2.1.14.
#UserDir disable
#
# To enable requests to /~user/ to serve the user's public_html

10
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
Group httpsd
User <%= httpsd_user %>
Group <%= httpsd_group %>
### Section 2: 'Main' server configuration
#
@ -306,7 +306,7 @@ DocumentRoot "/srv/www/https/<%= fqdn %>"
#
# This should be changed to whatever you set DocumentRoot to.
#
<Directory "/srv/www/https/*">
<Directory "/srv/www/https">
#
# Possible values for the Options directive are "None", "All",
@ -355,7 +355,9 @@ DocumentRoot "/srv/www/https/<%= fqdn %>"
# of a username on the system (depending on home directory
# permissions).
#
UserDir disable
# puppet note: commented to make it possible to configure UserDir via
# included config. UserDir is disabled by default since apache 2.1.14.
#UserDir disable
#
# To enable requests to /~user/ to serve the user's public_html