From 80a05c3bbf3710d10b0a4ba75afaa69720ba167f Mon Sep 17 00:00:00 2001
From: Joshua Tauberer <jt@occams.info>
Date: Tue, 19 Aug 2014 12:07:54 +0000
Subject: [PATCH] short_open_tag=Off was mistakenly left in the earlier merge
 (was a fix for my old autodiscover.php but not needed with z-push), also
 regrouping the nginx directive to be near the rest of Z-Push

---
 conf/nginx.conf | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index af28173..29f5008 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -58,14 +58,6 @@ server {
 		fastcgi_pass php-fpm;
 	}
 
-	# Microsoft Exchange autodiscover.xml for email
-	location /autodiscover/autodiscover.xml {
-		include fastcgi_params;
-		fastcgi_param SCRIPT_FILENAME /usr/local/lib/z-push/autodiscover/autodiscover.php;
-		fastcgi_param PHP_VALUE "short_open_tag=Off";
-		fastcgi_pass php-fpm;
-	}
-
 	# Z-Push (Microsoft Exchange ActiveSync)
 	location /Microsoft-Server-ActiveSync {
 		include /etc/nginx/fastcgi_params;
@@ -74,6 +66,12 @@ server {
 		fastcgi_read_timeout 630;
 		fastcgi_pass php-fpm;
 	}
+	location /autodiscover/autodiscover.xml {
+		include fastcgi_params;
+		fastcgi_param SCRIPT_FILENAME /usr/local/lib/z-push/autodiscover/autodiscover.php;
+		fastcgi_pass php-fpm;
+	}
+
 
 	# ADDITIONAL DIRECTIVES HERE
 }