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

Merge pull request #118 from opdude/feature/add-fields

Browse Source 
Added Timeout and LimitRequestsFields to vhosts
This commit is contained in:
alxwr 2017-02-01 23:12:13 +01:00 committed by GitHub
commit 217b6caa64
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apache/vhosts/standard.tmpl
View File

@ -23,6 +23,9 @@
'DocumentRoot': site.get('DocumentRoot', '{0}/{1}'.format(map.wwwdir, sitename)), 'DocumentRoot': site.get('DocumentRoot', '{0}/{1}'.format(map.wwwdir, sitename)),
'VirtualDocumentRoot': site.get('VirtualDocumentRoot'), 'VirtualDocumentRoot': site.get('VirtualDocumentRoot'),
'Timeout': site.get('Timeout'),
'LimitRequestFields': site.get('LimitRequestFields'),
'Directory_default': '{0}/{1}'.format(map.wwwdir, sitename), 'Directory_default': '{0}/{1}'.format(map.wwwdir, sitename),
'Directory': { 'Directory': {
'Options': '-Indexes +FollowSymLinks', 'Options': '-Indexes +FollowSymLinks',
@ -55,6 +58,9 @@
{% if site.get('DocumentRoot') != False -%}DocumentRoot {{ vals.DocumentRoot }}{% endif %} {% if site.get('DocumentRoot') != False -%}DocumentRoot {{ vals.DocumentRoot }}{% endif %}
{% if site.get('VirtualDocumentRoot') -%}VirtualDocumentRoot {{ vals.VirtualDocumentRoot }}{% endif %} {% if site.get('VirtualDocumentRoot') -%}VirtualDocumentRoot {{ vals.VirtualDocumentRoot }}{% endif %}
{% if site.get('Timeout') != False %}Timeout {{ vals.Timeout }}{% endif %}
{% if site.get('LimitRequestFields') %}LimitRequestFields {{ vals.LimitRequestFields }}{% endif %}
{%- if site.get('SSLCertificateFile') %} {%- if site.get('SSLCertificateFile') %}
SSLEngine on SSLEngine on
SSLCertificateFile {{ site.SSLCertificateFile }} SSLCertificateFile {{ site.SSLCertificateFile }}