Merge branch 'release/1.0.8'

khalwat · khalwat · commit b031eaaedec0 · 2017-08-24T22:09:06.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Nginx-Craft Changelog
 
+## 1.0.8 - 2017.08.24
+### Changed
+* Fixed an issue where the removal of trailing slashes could cause directory URLs to fail with "too many redirects"
+
 ## 1.0.7 - 2017.08.05
 ### Added
 * Added `Referrer-Policy "no-referrer-when-downgrade";` to `security.conf`
diff --git a/forge-example/NginxConfiguration.conf b/forge-example/NginxConfiguration.conf
@@ -55,7 +55,7 @@ server {
 
     # Root directory location handler
     location / {
-        try_files $uri $uri/ /index.php?$query_string;
+        try_files $uri/index.html $uri $uri/ /index.php?$query_string;
     }
 
     # Localized sites, hat tip to Johannes -- https://gist.github.com/johanneslamers/f6d2bc0d7435dca130fc
diff --git a/sites-available/somedomain.com.conf b/sites-available/somedomain.com.conf
@@ -71,7 +71,7 @@ server {
 
     # Root directory location handler
     location / {
-        try_files $uri $uri/ /index.php?$query_string;
+        try_files $uri/index.html $uri $uri/ /index.php?$query_string;
     }
 
     # Localized sites, hat tip to Johannes -- https://gist.github.com/johanneslamers/f6d2bc0d7435dca130fc

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ server {`
`55`	`55`
`56`	`56`	`# Root directory location handler`
`57`	`57`	`location / {`
`58`		`- try_files $uri $uri/ /index.php?$query_string;`
	`58`	`+ try_files $uri/index.html $uri $uri/ /index.php?$query_string;`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`# Localized sites, hat tip to Johannes -- https://gist.github.com/johanneslamers/f6d2bc0d7435dca130fc`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ server {`
`71`	`71`
`72`	`72`	`# Root directory location handler`
`73`	`73`	`location / {`
`74`		`- try_files $uri $uri/ /index.php?$query_string;`
	`74`	`+ try_files $uri/index.html $uri $uri/ /index.php?$query_string;`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`# Localized sites, hat tip to Johannes -- https://gist.github.com/johanneslamers/f6d2bc0d7435dca130fc`