Skip to content
Snippets Groups Projects
Commit 67d81d3f authored by Till Brehm's avatar Till Brehm
Browse files

Fixed nginx socket path in apps vhost for Ubuntu 18.04.

parent da1e393d
No related branches found
No related tags found
No related merge requests found
...@@ -2135,9 +2135,9 @@ class installer_base { ...@@ -2135,9 +2135,9 @@ class installer_base {
$content = str_replace('{ssl_comment}', '#', $content); $content = str_replace('{ssl_comment}', '#', $content);
// Fix socket path on PHP 7 systems // Fix socket path on PHP 7 systems
if(file_exists('/var/run/php/php7.0-fpm.sock')) { 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);
$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); wf($vhost_conf_dir.'/apps.vhost', $content);
......
...@@ -183,6 +183,11 @@ class apps_vhost_plugin { ...@@ -183,6 +183,11 @@ class apps_vhost_plugin {
} }
$content = str_replace('{use_tcp}', $use_tcp, $content); $content = str_replace('{use_tcp}', $use_tcp, $content);
$content = str_replace('{use_socket}', $use_socket, $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 // PHP-FPM
// Dont just copy over the php-fpm pool template but add some custom settings // Dont just copy over the php-fpm pool template but add some custom settings
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment