Skip to content
Snippets Groups Projects
Commit 183c476b authored by Falko Timme's avatar Falko Timme
Browse files

- Added check for the apps vhost to find out if the default PHP-FPM pool uses... 

- Added check for the apps vhost to find out if the default PHP-FPM pool uses port 9000 or the socket /var/run/php5-fpm.sock.
parent 5a3b0bad
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
install/lib/installer_base.lib.php
+ 10
− 0
View file @ 183c476b
...@@ -1555,6 +1555,16 @@ class installer_base { ...@@ -1555,6 +1555,16 @@ class installer_base {
//$content = str_replace('{fpm_port}', ($conf['nginx']['php_fpm_start_port']+1), $content); //$content = str_replace('{fpm_port}', ($conf['nginx']['php_fpm_start_port']+1), $content);
$content = str_replace('{fpm_socket}', $fpm_socket, $content); $content = str_replace('{fpm_socket}', $fpm_socket, $content);
$content = str_replace('{cgi_socket}', $cgi_socket, $content); $content = str_replace('{cgi_socket}', $cgi_socket, $content);
if(file_exists('/var/run/php5-fpm.sock')){
$use_tcp = '#';
$use_socket = '';
} else {
$use_tcp = '';
$use_socket = '#';
}
$content = str_replace('{use_tcp}', $use_tcp, $content);
$content = str_replace('{use_socket}', $use_socket, $content);
wf($vhost_conf_dir.'/apps.vhost', $content); wf($vhost_conf_dir.'/apps.vhost', $content);
......
install/tpl/nginx_apps.vhost.master
+ 4
− 2
View file @ 183c476b
...@@ -41,7 +41,8 @@ server { ...@@ -41,7 +41,8 @@ server {
root /usr/share/; root /usr/share/;
include /etc/nginx/fastcgi_params; include /etc/nginx/fastcgi_params;
# To access phpMyAdmin, the default user (like www-data on Debian/Ubuntu) must be used # To access phpMyAdmin, the default user (like www-data on Debian/Ubuntu) must be used
fastcgi_pass 127.0.0.1:9000; {use_tcp}fastcgi_pass 127.0.0.1:9000;
{use_socket}fastcgi_pass unix:/var/run/php5-fpm.sock;
fastcgi_index index.php; fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_buffer_size 128k; fastcgi_buffer_size 128k;
...@@ -66,7 +67,8 @@ server { ...@@ -66,7 +67,8 @@ server {
root /usr/share/; root /usr/share/;
include /etc/nginx/fastcgi_params; include /etc/nginx/fastcgi_params;
# To access SquirrelMail, the default user (like www-data on Debian/Ubuntu) must be used # To access SquirrelMail, the default user (like www-data on Debian/Ubuntu) must be used
fastcgi_pass 127.0.0.1:9000; {use_tcp}fastcgi_pass 127.0.0.1:9000;
{use_socket}fastcgi_pass unix:/var/run/php5-fpm.sock;
fastcgi_index index.php; fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_buffer_size 128k; fastcgi_buffer_size 128k;
......
server/conf/nginx_apps.vhost.master
+ 4
− 2
View file @ 183c476b
...@@ -41,7 +41,8 @@ server { ...@@ -41,7 +41,8 @@ server {
root /usr/share/; root /usr/share/;
include /etc/nginx/fastcgi_params; include /etc/nginx/fastcgi_params;
# To access phpMyAdmin, the default user (like www-data on Debian/Ubuntu) must be used # To access phpMyAdmin, the default user (like www-data on Debian/Ubuntu) must be used
fastcgi_pass 127.0.0.1:9000; {use_tcp}fastcgi_pass 127.0.0.1:9000;
{use_socket}fastcgi_pass unix:/var/run/php5-fpm.sock;
fastcgi_index index.php; fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_buffer_size 128k; fastcgi_buffer_size 128k;
...@@ -66,7 +67,8 @@ server { ...@@ -66,7 +67,8 @@ server {
root /usr/share/; root /usr/share/;
include /etc/nginx/fastcgi_params; include /etc/nginx/fastcgi_params;
# To access SquirrelMail, the default user (like www-data on Debian/Ubuntu) must be used # To access SquirrelMail, the default user (like www-data on Debian/Ubuntu) must be used
fastcgi_pass 127.0.0.1:9000; {use_tcp}fastcgi_pass 127.0.0.1:9000;
{use_socket}fastcgi_pass unix:/var/run/php5-fpm.sock;
fastcgi_index index.php; fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_buffer_size 128k; fastcgi_buffer_size 128k;
......
server/plugins-available/apps_vhost_plugin.inc.php
+ 9
− 0
View file @ 183c476b
...@@ -141,6 +141,15 @@ class apps_vhost_plugin { ...@@ -141,6 +141,15 @@ class apps_vhost_plugin {
//$content = str_replace('{fpm_port}', $web_config['php_fpm_start_port']+1, $content); //$content = str_replace('{fpm_port}', $web_config['php_fpm_start_port']+1, $content);
$content = str_replace('{fpm_socket}', $fpm_socket, $content); $content = str_replace('{fpm_socket}', $fpm_socket, $content);
$content = str_replace('{cgi_socket}', $cgi_socket, $content); $content = str_replace('{cgi_socket}', $cgi_socket, $content);
if(file_exists('/var/run/php5-fpm.sock')){
$use_tcp = '#';
$use_socket = '';
} else {
$use_tcp = '';
$use_socket = '#';
}
$content = str_replace('{use_tcp}', $use_tcp, $content);
$content = str_replace('{use_socket}', $use_socket, $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% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment