From c9d4ef4e593bde5a12d3eaa19b44ea5829866004 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 05 May 2014 02:25:31 -0400
Subject: [PATCH] Merge branch 'stable-3.0.5' into 'stable-3.0.5'
---
server/mods-available/web_module.inc.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/mods-available/web_module.inc.php b/server/mods-available/web_module.inc.php
index a403b91..666e845 100644
--- a/server/mods-available/web_module.inc.php
+++ b/server/mods-available/web_module.inc.php
@@ -219,8 +219,8 @@
}
// nginx: do a syntax check because on some distributions, the init script always returns 0 - even if the syntax is not ok (how stupid is that?)
- if($web_config['server_type'] == 'nginx' && $retval['retval'] == 0 && is_executable('/usr/sbin/nginx')){
- exec('/usr/sbin/nginx -t 2>&1', $retval['output'], $retval['retval']);
+ if($web_config['server_type'] == 'nginx' && $retval['retval'] == 0){
+ exec('nginx -t 2>&1', $retval['output'], $retval['retval']);
}
return $retval;
}
--
Gitblit v1.9.1