Merge branch 'master' into 'master'

Marius Cramer

2015-10-23 831dd0a0f913fced0cb0df645cfe0348170798d0

 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;