Added Timeout and LimitRequestsFields to vhosts

This commit is contained in:
Daniel Hobley 2016-02-16 11:53:49 +01:00
parent 2320295d09
commit e281a7ba82

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 }}