From b256f494dfb5766ff0fe2b7dc2a819d197a0c34b Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Mon, 1 Feb 2021 19:00:20 +0200
Subject: [PATCH] Fix Activesync.
Address the issue after shore.co.il was moved to ns4.
---
conf.d/shore.co.il.conf | 11 ++++-------
snippets/{z-push.conf => activesync.conf} | 8 ++++----
2 files changed, 8 insertions(+), 11 deletions(-)
rename snippets/{z-push.conf => activesync.conf} (57%)
diff --git a/conf.d/shore.co.il.conf b/conf.d/shore.co.il.conf
index 76acb31..23853e9 100644
--- a/conf.d/shore.co.il.conf
+++ b/conf.d/shore.co.il.conf
@@ -8,12 +8,9 @@ server {
include snippets/ads-txt.conf;
include snippets/security-txt.conf;
include snippets/www-acme-challenge.conf;
+ include snippets/redirect-www.conf;
+
location = / { return 301 https://$host/blog/; }
- location /repo/ {
- root /var/www/www.shore.co.il/;
- autoindex on;
- }
- include snippets/redirect-https.conf;
}
server {
@@ -25,8 +22,8 @@ server {
include snippets/security-txt.conf;
include snippets/ssl.conf;
include snippets/nextcloud-well-known.conf;
- include snippets/z-push.conf;
+ include snippets/activesync.conf;
+ include snippets/redirect-www.conf;
location = / { return 301 https://www.shore.co.il/blog/; }
- include snippets/redirect-www.conf;
}
diff --git a/snippets/z-push.conf b/snippets/activesync.conf
similarity index 57%
rename from snippets/z-push.conf
rename to snippets/activesync.conf
index ccc2147..c46b913 100644
--- a/snippets/z-push.conf
+++ b/snippets/activesync.conf
@@ -1,19 +1,19 @@
location /AutoDiscover/ {
- proxy_pass https://$z_push$request_uri;
+ proxy_pass https://zpush.shore.co.il$request_uri;
include snippets/proxy-headers.conf;
}
location /Autodiscover/ {
- proxy_pass https://$z_push$request_uri;
+ proxy_pass https://zpush.shore.co.il$request_uri;
include snippets/proxy-headers.conf;
}
location /autodiscover/ {
- proxy_pass https://$z_push$request_uri;
+ proxy_pass https://zpush.shore.co.il$request_uri;
include snippets/proxy-headers.conf;
}
location /Microsoft-Server-ActiveSync {
- proxy_pass https://$z_push$request_uri;
+ proxy_pass https://zpush.shore.co.il$request_uri;
include snippets/proxy-headers.conf;
}
--
GitLab