From 74d5e1a58d403fcc4474cec3187cd5f3ca72f12e Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Thu, 08 Aug 2013 03:09:35 -0400
Subject: [PATCH] - Fixed "PHP Notice: Undefined variable: rbl_list in /tmp/ispconfig-3.0.5/install/dist/lib/fedora.lib.php on line 173" - Redirect Apache/nginx/PHP-FPM/BIND restart errors to STDOUT.
---
server/plugins-available/apache2_plugin.inc.php | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 5da8b28..1a5252e 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -1496,24 +1496,30 @@
} else {
// if no output is given, check again
$webserver_binary = '';
- exec('which apache2', $webserver_check_output, $webserver_check_retval);
+ exec('which apache2ctl', $webserver_check_output, $webserver_check_retval);
if($webserver_check_retval == 0){
- $webserver_binary = 'apache2';
+ $webserver_binary = 'apache2ctl';
} else {
unset($webserver_check_output, $webserver_check_retval);
- exec('which httpd2', $webserver_check_output, $webserver_check_retval);
+ exec('which apache2', $webserver_check_output, $webserver_check_retval);
if($webserver_check_retval == 0){
- $webserver_binary = 'httpd2';
+ $webserver_binary = 'apache2';
} else {
unset($webserver_check_output, $webserver_check_retval);
- exec('which httpd', $webserver_check_output, $webserver_check_retval);
+ exec('which httpd2', $webserver_check_output, $webserver_check_retval);
if($webserver_check_retval == 0){
- $webserver_binary = 'httpd';
+ $webserver_binary = 'httpd2';
} else {
unset($webserver_check_output, $webserver_check_retval);
- exec('which apache', $webserver_check_output, $webserver_check_retval);
+ exec('which httpd', $webserver_check_output, $webserver_check_retval);
if($webserver_check_retval == 0){
- $webserver_binary = 'apache';
+ $webserver_binary = 'httpd';
+ } else {
+ unset($webserver_check_output, $webserver_check_retval);
+ exec('which apache', $webserver_check_output, $webserver_check_retval);
+ if($webserver_check_retval == 0){
+ $webserver_binary = 'apache';
+ }
}
}
}
--
Gitblit v1.9.1