From 7bce72dd8ffc5a1e072d9d51cd4e40ede7258d3d Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Thu, 07 Apr 2016 12:26:40 -0400
Subject: [PATCH] Fixed: Issue #3693 Choose better default customer numbers for clients of resellers.
---
server/mods-available/web_module.inc.php | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/server/mods-available/web_module.inc.php b/server/mods-available/web_module.inc.php
index 3ba0cfb..6d3e8c1 100644
--- a/server/mods-available/web_module.inc.php
+++ b/server/mods-available/web_module.inc.php
@@ -265,7 +265,8 @@
// @see: https://bugs.launchpad.net/ubuntu/+source/php5/+bug/1242376
if(file_exists('/etc/os-release')) {
$tmp = file_get_contents('/etc/os-release');
- if(preg_match('/^ID=ubuntu/m', $tmp) && preg_match('/^VERSION_ID="14\.04"/m', $tmp)) {
+ //if(preg_match('/^ID=ubuntu/m', $tmp) && preg_match('/^VERSION_ID="14\.04"/m', $tmp)) {
+ if(preg_match('/^ID=ubuntu/m', $tmp) && preg_match('/^VERSION_ID="14\.04"/m', $tmp) && stristr(phpversion(), 'deb.sury.org') === false) {
$initcommand = '/sbin/start-stop-daemon --stop --signal USR2 --quiet --pidfile /var/run/php5-fpm.pid --name php5-fpm';
}
// And the next workaround, php-fpm reloads in centos 7 downt work as well.
--
Gitblit v1.9.1