From dead5ccaf44e679d4eb938e12673ea1217f23675 Mon Sep 17 00:00:00 2001
From: vogelor <vogelor@ispconfig3>
Date: Sat, 26 Mar 2011 14:09:16 -0400
Subject: [PATCH] The "old" monitoring-module and the "new" rescue-module needed some function twice. So i created a tool-object containing these functions
---
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