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

---
 install/tpl/apache_ispconfig.vhost.master |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/install/tpl/apache_ispconfig.vhost.master b/install/tpl/apache_ispconfig.vhost.master
index f3b32c0..7067cda 100644
--- a/install/tpl/apache_ispconfig.vhost.master
+++ b/install/tpl/apache_ispconfig.vhost.master
@@ -18,7 +18,7 @@
     DocumentRoot /var/www/ispconfig/
     SuexecUserGroup ispconfig ispconfig
     <Directory /var/www/ispconfig/>
-      Options -Indexes FollowSymLinks MultiViews +ExecCGI
+      Options -Indexes +FollowSymLinks +MultiViews +ExecCGI
       AllowOverride AuthConfig Indexes Limit Options FileInfo
       AddHandler fcgid-script .php
       FCGIWrapper /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter .php
@@ -35,7 +35,7 @@
     AddType application/x-httpd-php .php
     <Directory /usr/local/ispconfig/interface/web>
       # php_admin_value open_basedir "/usr/local/ispconfig/interface:/usr/share:/tmp"
-      Options FollowSymLinks
+      Options +FollowSymLinks
       AllowOverride None
       Order allow,deny
       Allow from all

--
Gitblit v1.9.1