From 18fa2e2b8bcf10091fdc8e2079a1ff76c173ec84 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Fri, 02 May 2014 06:40:23 -0400
Subject: [PATCH] Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5
---
server/mods-available/web_module.inc.php | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/server/mods-available/web_module.inc.php b/server/mods-available/web_module.inc.php
index c31aa67..666e845 100644
--- a/server/mods-available/web_module.inc.php
+++ b/server/mods-available/web_module.inc.php
@@ -217,6 +217,11 @@
} else {
exec($app->system->getinitcommand($daemon, 'reload').' 2>&1', $retval['output'], $retval['retval']);
}
+
+ // 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){
+ exec('nginx -t 2>&1', $retval['output'], $retval['retval']);
+ }
return $retval;
}
--
Gitblit v1.9.1