From 3ee3c3acb958f5e6528b8b451a755683eb3ba985 Mon Sep 17 00:00:00 2001
From: Emilien Mantel <emilien.mantel@debianiste.org>
Date: Fri, 28 Aug 2015 09:54:43 +0200
Subject: [PATCH] Minor changes in nginx

---
 templates/etc/nginx/sites-available/_base.j2     | 4 +++-
 templates/etc/nginx/sites-available/_dokuwiki.j2 | 2 +-
 templates/etc/nginx/sites-available/_php.j2      | 8 +-------
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/templates/etc/nginx/sites-available/_base.j2 b/templates/etc/nginx/sites-available/_base.j2
index d7f76b2..82c613b 100644
--- a/templates/etc/nginx/sites-available/_base.j2
+++ b/templates/etc/nginx/sites-available/_base.j2
@@ -22,9 +22,11 @@ server {
 	index {{ item.index | default('index.html index.htm') }};
 {% endblock %}
 
+	location / {
 {% block template_try_files %}
-	try_files $uri $uri/ =404;
+		try_files $uri $uri/ =404;
 {% endblock %}
+	}
 
 {% block template_upstream_location %}
 {% endblock %}
diff --git a/templates/etc/nginx/sites-available/_dokuwiki.j2 b/templates/etc/nginx/sites-available/_dokuwiki.j2
index 41afda1..185c5ff 100644
--- a/templates/etc/nginx/sites-available/_dokuwiki.j2
+++ b/templates/etc/nginx/sites-available/_dokuwiki.j2
@@ -5,7 +5,7 @@
 {% endblock %}
 
 {% block template_try_files %}
-	try_files $uri $uri/ @dokuwiki =404;
+		try_files $uri $uri/ @dokuwiki =404;
 {% endblock %}
 
 {% block template_custom_location %}
diff --git a/templates/etc/nginx/sites-available/_php.j2 b/templates/etc/nginx/sites-available/_php.j2
index 6bab456..f5dc23f 100644
--- a/templates/etc/nginx/sites-available/_php.j2
+++ b/templates/etc/nginx/sites-available/_php.j2
@@ -4,7 +4,7 @@
 {% endblock %}
 
 {% block template_try_files %}
-	try_files $uri $uri/ /index.php;
+		try_files $uri $uri/ /index.php;
 {% endblock %}
 
 {% block template_upstream_location %}
@@ -18,11 +18,5 @@
 {% else %}
 		include fastcgi.conf;
 {% endif %}
-
-		# TODO...
-		# Newrelic custom header: https://docs.newrelic.com/docs/apm/other-features/request-queueing/request-queue-server-configuration-examples
-		#fastcgi_param HTTP_X_REQUEST_START "t=${msec}";
-		# Newrelic custom PHP appname: https://docs.newrelic.com/docs/agents/php-agent/configuration/php-directory-ini-settings#perdir-nginx
-		#fastcgi_param PHP_VALUE "newrelic.appname=${host}";
 	}
 {% endblock %}