From b51e442440cdba683d9cd590f03212d8ed43374a Mon Sep 17 00:00:00 2001 From: Alan McNea Date: Tue, 5 Nov 2013 19:32:03 +0000 Subject: [PATCH] Fixed bugs in standard.tmpl --- apache/vhosts/standard.tmpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apache/vhosts/standard.tmpl b/apache/vhosts/standard.tmpl index cb095b6..cf212cf 100644 --- a/apache/vhosts/standard.tmpl +++ b/apache/vhosts/standard.tmpl @@ -11,7 +11,7 @@ 'LogLevel': site.get('LogLevel', 'warn'), 'ErrorLog': site.get('ErrorLog', '{0}/{1}-error.log'.format(map.logdir, sitename)), - 'CustomLog': site.get('ErrorLog', '{0}/{1}-access.log'.format(map.logdir, sitename)), + 'CustomLog': site.get('CustomLog', '{0}/{1}-access.log'.format(map.logdir, sitename)), 'DocumentRoot': site.get('DocumentRoot', '{0}/{1}'.format(map.wwwdir, sitename)), @@ -40,8 +40,8 @@ {% set dvals = { 'Options': dir.get('Options', vals.Directory.Options), 'Order': dir.get('Order', vals.Directory.Order), - 'Allow': dir.get('Order', vals.Directory.Allow), - 'AllowOverride': dir.get('Order', vals.Directory.AllowOverride), + 'Allow': dir.get('Allow', vals.Directory.Allow), + 'AllowOverride': dir.get('AllowOverride', vals.Directory.AllowOverride), } %} {% if path == 'default' %}{% set path = vals.Directory_default %}{% endif %}