ISPConfig3 devel
parent: 3ff9d214 | patch | commit | ignore whitespace
Marius Cramer
2015-10-23 831dd0a0f913fced0cb0df645cfe0348170798d0 
Merge branch 'master' into 'master'

Replace fastcgi_pass unix:/var/run/php5-fpm.sock; with fastcgi_pass unix:{fpm_so…

…cket}; in phpmyadmin and squirrelmail blocks, as they are considered apps and should use the same (apps.sock) listener.

See merge request !236
1 files modified
4 ■■■■■ changed files
server/conf/nginx_apps.vhost.master 4 ●●●●● patch | view | raw | blame | history 
 server/conf/nginx_apps.vhost.master


@@ -90,7 +90,7 @@


                       fastcgi_param   REDIRECT_STATUS         200;


                       # To access phpMyAdmin, the default user (like www-data on Debian/Ubuntu) must be used


                       {use_tcp}fastcgi_pass 127.0.0.1:9000;


                       {use_socket}fastcgi_pass unix:/var/run/php5-fpm.sock;


                       {use_socket}fastcgi_pass unix:{fpm_socket};


                       fastcgi_index index.php;


                       fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;


                       fastcgi_buffer_size 128k;


@@ -140,7 +140,7 @@


                       fastcgi_param   REDIRECT_STATUS         200;


                       # To access SquirrelMail, the default user (like www-data on Debian/Ubuntu) must be used


                       {use_tcp}fastcgi_pass 127.0.0.1:9000;


                       {use_socket}fastcgi_pass unix:/var/run/php5-fpm.sock;


                       {use_socket}fastcgi_pass unix:{fpm_socket};


                       fastcgi_index index.php;


                       fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;


                       fastcgi_buffer_size 128k;