From e9d71f1635dd83b00b1667dbbbdbce8da0058bc7 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 04 Jan 2011 08:43:42 -0500
Subject: [PATCH] Fixed: FS#1455 - disable vhost on secondary ISPConfig server does not work
---
server/plugins-available/apache2_plugin.inc.php | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index fbdfd73..7fb2ab5 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -1262,13 +1262,10 @@
*/
$fn = substr($file, 0, strlen($file) - strlen('.htdigest'));
$output .= "\n";
-<<<<<<< .working
- $output .= " Alias /" . $fn . ' ' . $webdavRoot . '/' . $fn . "\n";
- $output .= " <Location /" . $fn . ">\n";
-=======
+ // $output .= " Alias /" . $fn . ' ' . $webdavRoot . '/' . $fn . "\n";
+ // $output .= " <Location /" . $fn . ">\n";
$output .= " Alias /webdav/" . $fn . ' ' . $webdavRoot . '/' . $fn . "\n";
$output .= " <Location /webdav/" . $fn . ">\n";
->>>>>>> .merge-right.r2129
$output .= " DAV On\n";
$output .= " AuthType Digest\n";
$output .= " AuthName \"" . $fn . "\"\n";
--
Gitblit v1.9.1