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

Fixed bugs in standard.tmpl

Browse Source
This commit is contained in:
Alan McNea 2013-11-05 19:32:03 +00:00
parent f1cff2dd22
commit b51e442440
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apache/vhosts/standard.tmpl
View File

@ -11,7 +11,7 @@
'LogLevel': site.get('LogLevel', 'warn'), 'LogLevel': site.get('LogLevel', 'warn'),
'ErrorLog': site.get('ErrorLog', '{0}/{1}-error.log'.format(map.logdir, sitename)), '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)), 'DocumentRoot': site.get('DocumentRoot', '{0}/{1}'.format(map.wwwdir, sitename)),
@ -40,8 +40,8 @@
{% set dvals = { {% set dvals = {
'Options': dir.get('Options', vals.Directory.Options), 'Options': dir.get('Options', vals.Directory.Options),
'Order': dir.get('Order', vals.Directory.Order), 'Order': dir.get('Order', vals.Directory.Order),
'Allow': dir.get('Order', vals.Directory.Allow), 'Allow': dir.get('Allow', vals.Directory.Allow),
'AllowOverride': dir.get('Order', vals.Directory.AllowOverride), 'AllowOverride': dir.get('AllowOverride', vals.Directory.AllowOverride),
} %} } %}
{% if path == 'default' %}{% set path = vals.Directory_default %}{% endif %} {% if path == 'default' %}{% set path = vals.Directory_default %}{% endif %}