Commit 22bef49d authored by Marius Burkard's avatar Marius Burkard
Browse files

Merge branch '6181-fix-fpm-socket-dir' into 'develop'

6181-fix-fpm-socket-dir:  Fix socket dir for additional php versions

Closes #6181

See merge request !1490
parents ba63092b e3bd768e
Pipeline #9434 passed with stage
in 14 seconds
......@@ -1649,7 +1649,7 @@ class apache2_plugin {
$custom_php_fpm_ini_dir = $tmp_php['php_fpm_ini_dir'];
$custom_php_fpm_init_script = $tmp_php['php_fpm_init_script'];
$custom_php_fpm_pool_dir = $tmp_php['php_fpm_pool_dir'];
$custom_php_fpm_socket_dir = $tmp_php['custom_php_fpm_socket_dir'];
$custom_php_fpm_socket_dir = $tmp_php['php_fpm_socket_dir'];
if(substr($custom_php_fpm_ini_dir, -1) != '/') $custom_php_fpm_ini_dir .= '/';
}
}
......@@ -1661,7 +1661,7 @@ class apache2_plugin {
$custom_php_fpm_ini_dir = $tmp_php['php_fpm_ini_dir'];
$custom_php_fpm_init_script = $tmp_php['php_fpm_init_script'];
$custom_php_fpm_pool_dir = $tmp_php['php_fpm_pool_dir'];
$custom_php_fpm_socket_dir = $tmp_php['custom_php_fpm_socket_dir'];
$custom_php_fpm_socket_dir = $tmp_php['php_fpm_socket_dir'];
if(substr($custom_php_fpm_ini_dir, -1) != '/') $custom_php_fpm_ini_dir .= '/';
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment