paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Nginx] Fix EAS

master
André Peters 2018-02-13 09:09:41 +01:00
parent 52449afdc0
commit 21e8edae43
4 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -3,8 +3,7 @@ data/conf/sogo/sieve.creds
data/conf/dovecot/dovecot-master.passwd data/conf/dovecot/dovecot-master.passwd
mailcow.conf mailcow.conf
mailcow.conf_backup mailcow.conf_backup
data/conf/nginx/listen*active data/conf/nginx/*active
data/conf/nginx/server_name.active
data/conf/postfix/sql data/conf/postfix/sql
data/conf/dovecot/sql data/conf/dovecot/sql
data/conf/nextcloud-*.bak data/conf/nextcloud-*.bak

19
data/conf/nginx/site.conf
View File

@ -7,13 +7,6 @@ map $http_x_forwarded_proto $client_req_scheme {
https https; https https;
} }
server {
listen 80 default_server;
listen [::]:80 default_server;
include /etc/nginx/conf.d/server_name.active;
return 301 https://$host$request_uri;
}
server { server {
include /etc/nginx/mime.types; include /etc/nginx/mime.types;
charset utf-8; charset utf-8;
@ -50,7 +43,7 @@ server {
set_real_ip_from 10.0.0.0/8; set_real_ip_from 10.0.0.0/8;
set_real_ip_from 172.16.0.0/12; set_real_ip_from 172.16.0.0/12;
set_real_ip_from 192.168.0.0/16; set_real_ip_from 192.168.0.0/16;
set_real_ip_from fd00::/8; set_real_ip_from fc00::/7;
real_ip_header X-Forwarded-For; real_ip_header X-Forwarded-For;
real_ip_recursive on; real_ip_recursive on;
@ -108,7 +101,7 @@ server {
} }
location ^~ /Microsoft-Server-ActiveSync { location ^~ /Microsoft-Server-ActiveSync {
proxy_pass http://sogo:20000/SOGo/Microsoft-Server-ActiveSync; include /etc/nginx/conf.d/sogo_eas.active;
proxy_connect_timeout 1000; proxy_connect_timeout 1000;
proxy_next_upstream timeout error; proxy_next_upstream timeout error;
proxy_send_timeout 1000; proxy_send_timeout 1000;
@ -130,7 +123,7 @@ server {
} }
location ^~ /SOGo { location ^~ /SOGo {
proxy_pass http://sogo:20000; include /etc/nginx/conf.d/sogo.active;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
@ -232,7 +225,7 @@ server {
set_real_ip_from 10.0.0.0/8; set_real_ip_from 10.0.0.0/8;
set_real_ip_from 172.16.0.0/12; set_real_ip_from 172.16.0.0/12;
set_real_ip_from 192.168.0.0/16; set_real_ip_from 192.168.0.0/16;
set_real_ip_from fd00::/8; set_real_ip_from fc00::/7;
real_ip_header X-Forwarded-For; real_ip_header X-Forwarded-For;
real_ip_recursive on; real_ip_recursive on;
@ -290,7 +283,7 @@ server {
} }
location ^~ /Microsoft-Server-ActiveSync { location ^~ /Microsoft-Server-ActiveSync {
proxy_pass http://sogo:20000/SOGo/Microsoft-Server-ActiveSync; include /etc/nginx/conf.d/templates/sogo_eas.template;
proxy_connect_timeout 1000; proxy_connect_timeout 1000;
proxy_next_upstream timeout error; proxy_next_upstream timeout error;
proxy_send_timeout 1000; proxy_send_timeout 1000;
@ -312,7 +305,7 @@ server {
} }
location ^~ /SOGo { location ^~ /SOGo {
proxy_pass http://sogo:20000; include /etc/nginx/conf.d/sogo.active;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Host $http_host; proxy_set_header Host $http_host;

1
data/conf/nginx/templates/sogo.template 100644
View File

@ -0,0 +1 @@
proxy_pass http://${IPV4_NETWORK}.248:20000;

1
data/conf/nginx/templates/sogo_eas.template 100644
View File

@ -0,0 +1 @@
proxy_pass http://${IPV4_NETWORK}.248:20000/SOGo/Microsoft-Server-ActiveSync;