external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2026-04-01 21:27:22 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into owncloud (php5-fpm)

Browse Source
This commit is contained in:
Joshua Tauberer
2014-08-12 13:30:55 +00:00
parent 791e68a3af 0eceb2012f
commit c9bf57eacd
5 changed files with 25 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
conf/nginx.conf
View File

@@ -1,6 +1,4 @@
## NOTE: This file is automatically generated by Mail-in-a-Box.
## Do not edit this file. It will be replaced each time
## Mail-in-a-Box needs up update the web configuration.
## $HOSTNAME
# Redirect all HTTP to HTTPS.
server {
@@ -43,7 +41,7 @@ server {
fastcgi_split_path_info ^/mail(/.*)()$;
fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME /usr/local/lib/roundcubemail/$fastcgi_script_name;
fastcgi_pass unix:/tmp/php-fastcgi.www-data.sock;
fastcgi_pass php-fpm;
client_max_body_size 20M;
}
@@ -85,21 +83,21 @@ server {
location = /.well-known/webfinger {
include fastcgi_params;
fastcgi_param SCRIPT_FILENAME /usr/local/bin/mailinabox-webfinger.php;
fastcgi_pass unix:/tmp/php-fastcgi.www-data.sock;
fastcgi_pass php-fpm;
}
# Microsoft Exchange autodiscover.xml for email
location /autodiscover/autodiscover.xml {
include fastcgi_params;
fastcgi_param SCRIPT_FILENAME /usr/local/bin/mailinabox-exchange-autodiscover.php;
fastcgi_pass unix:/tmp/php-fastcgi.www-data.sock;
fastcgi_pass php-fpm;
}
# Z-Push (Microsoft Exchange ActiveSync)
location /Microsoft-Server-ActiveSync {
include /etc/nginx/fastcgi_params;
fastcgi_param SCRIPT_FILENAME /usr/local/lib/z-push/index.php;
fastcgi_pass unix:/tmp/php-fastcgi.www-data.sock;
fastcgi_pass php-fpm;
}
# ADDITIONAL DIRECTIVES HERE