From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Apr 2016 10:58:46 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
server/conf/nginx_apps.vhost.master | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/server/conf/nginx_apps.vhost.master b/server/conf/nginx_apps.vhost.master
index 2c720b5..1101d19 100644
--- a/server/conf/nginx_apps.vhost.master
+++ b/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;
@@ -106,7 +106,7 @@
location /phpMyAdmin {
rewrite ^/* /phpmyadmin last;
}
-
+
location /squirrelmail {
root /usr/share/;
index index.php index.html index.htm;
@@ -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;
@@ -164,7 +164,6 @@
fastcgi_param CONTENT_TYPE $content_type;
fastcgi_param CONTENT_LENGTH $content_length;
- fastcgi_param SCRIPT_FILENAME $request_filename;
fastcgi_param SCRIPT_NAME $fastcgi_script_name;
fastcgi_param REQUEST_URI $request_uri;
fastcgi_param DOCUMENT_URI $document_uri;
@@ -199,4 +198,4 @@
alias /var/lib/mailman/archives/public;
autoindex on;
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1