From 5545f1869f43c821afae81fb0e240813e1b62d7c Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 17 Feb 2014 07:34:04 -0500
Subject: [PATCH] Changed Options directives to be compatible with apache 2.4

---
 server/conf/vhost.conf.master |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index 271d3fd..2e90dde 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -57,7 +57,7 @@
 		</IfModule>
 
 		<Directory {tmpl_var name='web_document_root_www'}>
-				Options FollowSymLinks
+				Options +FollowSymLinks
 				AllowOverride <tmpl_var name='allow_override'>
 				<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
 				Require all granted
@@ -85,7 +85,7 @@
 </tmpl_if>
 		</Directory>
 		<Directory {tmpl_var name='web_document_root'}>
-				Options FollowSymLinks
+				Options +FollowSymLinks
 				AllowOverride <tmpl_var name='allow_override'>
 				<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
 				Require all granted

--
Gitblit v1.9.1