saltstack-formulas/apache-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #136 from abehling/master

Browse Source 
RedHat: Added configurable variables, Fixed bug if vhostdir is something diff…
This commit is contained in:
Forrest 2016-05-10 09:51:47 -07:00
commit 4567cc3870
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
apache/files/RedHat/apache-2.4.config.jinja
View File

@ -1,3 +1,4 @@
{% from "apache/map.jinja" import apache with context %}
# #
# This is the main Apache HTTP server configuration file. It contains the # This is the main Apache HTTP server configuration file. It contains the
# configuration directives that give the server its instructions. # configuration directives that give the server its instructions.
@ -116,7 +117,7 @@ ServerAdmin root@localhost
# documents. By default, all requests are taken from this directory, but # documents. By default, all requests are taken from this directory, but
# symbolic links and aliases may be used to point to other locations. # symbolic links and aliases may be used to point to other locations.
# #
DocumentRoot "/var/www/html" DocumentRoot "{{ apache.wwwdir }}"
# #
# Relax access to content within /var/www. # Relax access to content within /var/www.
@ -128,7 +129,7 @@ DocumentRoot "/var/www/html"
</Directory> </Directory>
# Further relax access to the default document root: # Further relax access to the default document root:
<Directory "/var/www/html"> <Directory "{{ apache.wwwdir }}">
# #
# Possible values for the Options directive are "None", "All", # Possible values for the Options directive are "None", "All",
# or any combination of: # or any combination of:
@ -179,7 +180,7 @@ DocumentRoot "/var/www/html"
# logged here. If you *do* define an error logfile for a <VirtualHost> # logged here. If you *do* define an error logfile for a <VirtualHost>
# container, that host's errors will be logged there and not here. # container, that host's errors will be logged there and not here.
# #
ErrorLog "logs/error_log" ErrorLog "{{ apache.logdir }}/error_log"
# #
# LogLevel: Control the number of messages logged to the error_log. # LogLevel: Control the number of messages logged to the error_log.
@ -217,7 +218,7 @@ LogLevel warn
# If you prefer a logfile with access, agent, and referer information # If you prefer a logfile with access, agent, and referer information
# (Combined Logfile Format) you can use the following directive. # (Combined Logfile Format) you can use the following directive.
# #
CustomLog "logs/access_log" combined CustomLog "{{ apache.logdir }}/access_log" combined
</IfModule> </IfModule>
<IfModule alias_module> <IfModule alias_module>
@ -357,5 +358,8 @@ EnableSendfile on
# Supplemental configuration # Supplemental configuration
# #
# Load config files in the "/etc/httpd/conf.d" directory, if any. # Load config files in the "/etc/httpd/conf.d" directory, if any.
IncludeOptional conf.d/*.conf IncludeOptional {{ apache.confdir }}/*.conf
IncludeOptional vhosts.d/*.conf {% if apache.vhostdir != apache.confdir %}
IncludeOptional {{ apache.vhostdir }}/*.conf
{% endif %}