From e34c476ea120680fa45909bac7f09f7af3f06b49 Mon Sep 17 00:00:00 2001
From: Alan McNea <amcnea@dailyrx.com>
Date: Tue, 5 Nov 2013 19:32:49 +0000
Subject: [PATCH] Added DirectoryIndex, UseCanonicalName, and
 VirtualDocumentRoot properties to standard.tmpl

---
 apache/vhosts/standard.tmpl | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/apache/vhosts/standard.tmpl b/apache/vhosts/standard.tmpl
index cf212cf..3d3f50b 100644
--- a/apache/vhosts/standard.tmpl
+++ b/apache/vhosts/standard.tmpl
@@ -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 = {