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