Merge pull request #131 from webdevops/feature/130-json-nginx-dev-fix

htuscher · web-flow · commit 74b4994b02ba · 2016-09-10T11:08:35.000+02:00
Add default try_file to nginx no caching location
diff --git a/docker/nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/02-dev.conf
@@ -1,4 +1,6 @@
 location ~* <WEB_NO_CACHE_PATTERN> {
     expires    off;
     add_header Cache-Control private;
+    
+    try_files $uri $uri/ /<DOCUMENT_INDEX>?$query_string;
 }
diff --git a/docker/nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/02-dev.conf
@@ -1,4 +1,6 @@
 location ~* <WEB_NO_CACHE_PATTERN> {
     expires    off;
     add_header Cache-Control private;
+    
+    try_files $uri $uri/ /<DOCUMENT_INDEX>?$query_string;
 }
diff --git a/docker/nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/02-dev.conf
@@ -1,4 +1,6 @@
 location ~* <WEB_NO_CACHE_PATTERN> {
     expires    off;
     add_header Cache-Control private;
+    
+    try_files $uri $uri/ /<DOCUMENT_INDEX>?$query_string;
 }
diff --git a/docker/nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/02-dev.conf
@@ -1,4 +1,6 @@
 location ~* <WEB_NO_CACHE_PATTERN> {
     expires    off;
     add_header Cache-Control private;
+    
+    try_files $uri $uri/ /<DOCUMENT_INDEX>?$query_string;
 }
diff --git a/docker/nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/02-dev.conf
@@ -1,4 +1,6 @@
 location ~* <WEB_NO_CACHE_PATTERN> {
     expires    off;
     add_header Cache-Control private;
+    
+    try_files $uri $uri/ /<DOCUMENT_INDEX>?$query_string;
 }
diff --git a/docker/nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/02-dev.conf
@@ -1,4 +1,6 @@
 location ~* <WEB_NO_CACHE_PATTERN> {
     expires    off;
     add_header Cache-Control private;
+    
+    try_files $uri $uri/ /<DOCUMENT_INDEX>?$query_string;
 }
diff --git a/docker/nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/02-dev.conf
@@ -1,4 +1,6 @@
 location ~* <WEB_NO_CACHE_PATTERN> {
     expires    off;
     add_header Cache-Control private;
+    
+    try_files $uri $uri/ /<DOCUMENT_INDEX>?$query_string;
 }
diff --git a/docker/nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/02-dev.conf
@@ -1,4 +1,6 @@
 location ~* <WEB_NO_CACHE_PATTERN> {
     expires    off;
     add_header Cache-Control private;
+    
+    try_files $uri $uri/ /<DOCUMENT_INDEX>?$query_string;
 }
diff --git a/docker/nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/02-dev.conf
@@ -1,4 +1,6 @@
 location ~* <WEB_NO_CACHE_PATTERN> {
     expires    off;
     add_header Cache-Control private;
+    
+    try_files $uri $uri/ /<DOCUMENT_INDEX>?$query_string;
 }
diff --git a/docker/nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/02-dev.conf
@@ -1,4 +1,6 @@
 location ~* <WEB_NO_CACHE_PATTERN> {
     expires    off;
     add_header Cache-Control private;
+    
+    try_files $uri $uri/ /<DOCUMENT_INDEX>?$query_string;
 }
diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/02-dev.conf
@@ -1,4 +1,6 @@
 location ~* <WEB_NO_CACHE_PATTERN> {
     expires    off;
     add_header Cache-Control private;
+    
+    try_files $uri $uri/ /<DOCUMENT_INDEX>?$query_string;
 }
diff --git a/docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/02-dev.conf
@@ -1,4 +1,6 @@
 location ~* <WEB_NO_CACHE_PATTERN> {
     expires    off;
     add_header Cache-Control private;
+    
+    try_files $uri $uri/ /<DOCUMENT_INDEX>?$query_string;
 }
diff --git a/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/02-dev.conf
@@ -1,4 +1,6 @@
 location ~* <WEB_NO_CACHE_PATTERN> {
     expires    off;
     add_header Cache-Control private;
+    
+    try_files $uri $uri/ /<DOCUMENT_INDEX>?$query_string;
 }
diff --git a/docker/php-nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/02-dev.conf
@@ -1,4 +1,6 @@
 location ~* <WEB_NO_CACHE_PATTERN> {
     expires    off;
     add_header Cache-Control private;
+    
+    try_files $uri $uri/ /<DOCUMENT_INDEX>?$query_string;
 }
diff --git a/docker/php-nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/02-dev.conf
@@ -1,4 +1,6 @@
 location ~* <WEB_NO_CACHE_PATTERN> {
     expires    off;
     add_header Cache-Control private;
+    
+    try_files $uri $uri/ /<DOCUMENT_INDEX>?$query_string;
 }
diff --git a/docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/02-dev.conf
@@ -1,4 +1,6 @@
 location ~* <WEB_NO_CACHE_PATTERN> {
     expires    off;
     add_header Cache-Control private;
+    
+    try_files $uri $uri/ /<DOCUMENT_INDEX>?$query_string;
 }
diff --git a/docker/php-nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/02-dev.conf
@@ -1,4 +1,6 @@
 location ~* <WEB_NO_CACHE_PATTERN> {
     expires    off;
     add_header Cache-Control private;
+    
+    try_files $uri $uri/ /<DOCUMENT_INDEX>?$query_string;
 }
diff --git a/docker/php-nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/02-dev.conf
@@ -1,4 +1,6 @@
 location ~* <WEB_NO_CACHE_PATTERN> {
     expires    off;
     add_header Cache-Control private;
+    
+    try_files $uri $uri/ /<DOCUMENT_INDEX>?$query_string;
 }
diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/02-dev.conf
@@ -1,4 +1,6 @@
 location ~* <WEB_NO_CACHE_PATTERN> {
     expires    off;
     add_header Cache-Control private;
+    
+    try_files $uri $uri/ /<DOCUMENT_INDEX>?$query_string;
 }
diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/02-dev.conf
@@ -1,4 +1,6 @@
 location ~* <WEB_NO_CACHE_PATTERN> {
     expires    off;
     add_header Cache-Control private;
+    
+    try_files $uri $uri/ /<DOCUMENT_INDEX>?$query_string;
 }
diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/02-dev.conf
@@ -1,4 +1,6 @@
 location ~* <WEB_NO_CACHE_PATTERN> {
     expires    off;
     add_header Cache-Control private;
+    
+    try_files $uri $uri/ /<DOCUMENT_INDEX>?$query_string;
 }
diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/02-dev.conf
@@ -1,4 +1,6 @@
 location ~* <WEB_NO_CACHE_PATTERN> {
     expires    off;
     add_header Cache-Control private;
+    
+    try_files $uri $uri/ /<DOCUMENT_INDEX>?$query_string;
 }
diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/02-dev.conf
@@ -1,4 +1,6 @@
 location ~* <WEB_NO_CACHE_PATTERN> {
     expires    off;
     add_header Cache-Control private;
+    
+    try_files $uri $uri/ /<DOCUMENT_INDEX>?$query_string;
 }
diff --git a/provisioning/nginx-dev/general/etc/nginx/vhost.common.d/02-dev.conf b/provisioning/nginx-dev/general/etc/nginx/vhost.common.d/02-dev.conf
@@ -1,4 +1,6 @@
 location ~* <WEB_NO_CACHE_PATTERN> {
     expires    off;
     add_header Cache-Control private;
+    
+    try_files $uri $uri/ /<DOCUMENT_INDEX>?$query_string;
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`location ~* <WEB_NO_CACHE_PATTERN> {`
`2`	`2`	`expires off;`
`3`	`3`	`add_header Cache-Control private;`
	`4`	`+`
	`5`	`+ try_files $uri $uri/ /<DOCUMENT_INDEX>?$query_string;`
`4`	`6`	`}`