From 67d81d3f6d367b8ce011b5bf85c566fdb815c6ce Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Mon, 16 Jul 2018 17:31:29 +0200
Subject: [PATCH] Fixed nginx socket path in apps vhost for Ubuntu 18.04.
---
install/lib/installer_base.lib.php | 6 +++---
server/plugins-available/apps_vhost_plugin.inc.php | 5 +++++
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 8a1dcd465..10cfbaf96 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -2135,9 +2135,9 @@ class installer_base {
$content = str_replace('{ssl_comment}', '#', $content);
// Fix socket path on PHP 7 systems
- if(file_exists('/var/run/php/php7.0-fpm.sock')) {
- $content = str_replace('/var/run/php5-fpm.sock', '/var/run/php/php7.0-fpm.sock', $content);
- }
+ if(file_exists('/var/run/php/php7.0-fpm.sock')) $content = str_replace('/var/run/php5-fpm.sock', '/var/run/php/php7.0-fpm.sock', $content);
+ if(file_exists('/var/run/php/php7.1-fpm.sock')) $content = str_replace('/var/run/php5-fpm.sock', '/var/run/php/php7.1-fpm.sock', $content);
+ if(file_exists('/var/run/php/php7.2-fpm.sock')) $content = str_replace('/var/run/php5-fpm.sock', '/var/run/php/php7.2-fpm.sock', $content);
wf($vhost_conf_dir.'/apps.vhost', $content);
diff --git a/server/plugins-available/apps_vhost_plugin.inc.php b/server/plugins-available/apps_vhost_plugin.inc.php
index 88b5aa290..b843e3c8a 100644
--- a/server/plugins-available/apps_vhost_plugin.inc.php
+++ b/server/plugins-available/apps_vhost_plugin.inc.php
@@ -183,6 +183,11 @@ class apps_vhost_plugin {
}
$content = str_replace('{use_tcp}', $use_tcp, $content);
$content = str_replace('{use_socket}', $use_socket, $content);
+
+ // Fix socket path on PHP 7 systems
+ if(file_exists('/var/run/php/php7.0-fpm.sock')) $content = str_replace('/var/run/php5-fpm.sock', '/var/run/php/php7.0-fpm.sock', $content);
+ if(file_exists('/var/run/php/php7.1-fpm.sock')) $content = str_replace('/var/run/php5-fpm.sock', '/var/run/php/php7.1-fpm.sock', $content);
+ if(file_exists('/var/run/php/php7.2-fpm.sock')) $content = str_replace('/var/run/php5-fpm.sock', '/var/run/php/php7.2-fpm.sock', $content);
// PHP-FPM
// Dont just copy over the php-fpm pool template but add some custom settings
--
GitLab