Browse Source

Added DirectoryIndex, UseCanonicalName, and VirtualDocumentRoot properties to standard.tmpl

tags/v0.37.4
Alan McNea 11 years ago
parent
commit
e34c476ea1
1 changed files with 8 additions and 0 deletions
  1. +8
    -0
      apache/vhosts/standard.tmpl

+ 8
- 0
apache/vhosts/standard.tmpl View File

@@ -9,11 +9,15 @@

'ServerAdmin': site.get('ServerAdmin', 'webmaster@{0}'.format(sitename)),

'DirectoryIndex': site.get('DirectoryIndex'),
'UseCanonicalName': site.get('UseCanonicalName'),

'LogLevel': site.get('LogLevel', 'warn'),
'ErrorLog': site.get('ErrorLog', '{0}/{1}-error.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)),
'VirtualDocumentRoot': site.get('VirtualDocumentRoot'),

'Directory_default': '{0}/{1}'.format(map.wwwdir, sitename),
'Directory': {
@@ -30,11 +34,15 @@

{% if site.get('ServerAdmin') != False %}ServerAdmin {{ vals.ServerAdmin }}{% endif %}

{% if site.get('DirectoryIndex') %}DirectoryIndex {{ vals.DirectoryIndex }}{% endif %}
{% if site.get('UseCanonicalName') %}UseCanonicalName {{ vals.UseCanonicalName }}{% endif %}

{% if site.get('LogLevel') != False %}LogLevel {{ vals.LogLevel }}{% endif %}
{% if site.get('ErrorLog') != False %}ErrorLog {{ vals.ErrorLog }}{% endif %}
{% if site.get('CustomLog') != False %}CustomLog {{ vals.CustomLog }}{% endif %}

{% if site.get('DocumentRoot') != False %}DocumentRoot {{ vals.DocumentRoot }}{% endif %}
{% if site.get('VirtualDocumentRoot') %}VirtualDocumentRoot {{ vals.VirtualDocumentRoot }}{% endif %}

{% for path, dir in site.get('Directory', {}).items() %}
{% set dvals = {

Loading…
Cancel
Save