From b25f400cd6bc255b01e05ac274f050ba4039a411 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Mon, 21 Dec 2015 05:41:34 -0500
Subject: [PATCH] Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3
---
server/conf/vhost.conf.master | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index bdfc761..ab8430d 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -1,3 +1,4 @@
+<tmpl_hook name='apache2_vhost:header'>
<Directory {tmpl_var name='web_basedir'}/{tmpl_var name='domain'}>
AllowOverride None
@@ -9,8 +10,9 @@
</tmpl_if>
</Directory>
-<tmpl_loop name="vhosts">
+<tmpl_loop name='vhosts'>
<VirtualHost {tmpl_var name='ip_address'}:{tmpl_var name='port'}>
+<tmpl_hook name='apache2_vhost:vhost_header'>
<tmpl_if name='php' op='==' value='suphp'>
DocumentRoot <tmpl_var name='web_document_root'>
</tmpl_else>
@@ -444,5 +446,8 @@
</IfModule>
<tmpl_var name='apache_directives'>
+<tmpl_hook name='apache2_vhost:vhost_footer'>
</VirtualHost>
</tmpl_loop>
+
+<tmpl_hook name='apache2_vhost:footer'>
\ No newline at end of file
--
Gitblit v1.9.1