[icinga-checkins] icinga.org: icingaweb2/feature/generate-webserver-config-6120: Setup/ Webserver: Fix nginx static file resolve issue

git at icinga.org git at icinga.org
Fri Nov 7 12:03:38 CET 2014


Module: icingaweb2
Branch: feature/generate-webserver-config-6120
Commit: 8583be040c7424af1db830b3386e37cc9e910c13
URL:    https://git.icinga.org/?p=icingaweb2.git;a=commit;h=8583be040c7424af1db830b3386e37cc9e910c13

Author: Marius Hein <marius.hein at netways.de>
Date:   Fri Nov  7 12:02:48 2014 +0100

Setup/Webserver: Fix nginx static file resolve issue

refs #6738

---

 library/Icinga/Web/Setup/Webserver/Nginx.php |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Web/Setup/Webserver/Nginx.php b/library/Icinga/Web/Setup/Webserver/Nginx.php
index decd7dd..97d539e 100644
--- a/library/Icinga/Web/Setup/Webserver/Nginx.php
+++ b/library/Icinga/Web/Setup/Webserver/Nginx.php
@@ -25,10 +25,10 @@ location ~ ^{webPath}/index\.php(.*)$ {
   fastcgi_param SCRIPT_FILENAME {publicPath}/index.php;
 }
 
-location ~ ^{webPath} {
+location ~ ^{webPath}(.+)? {
   alias {publicPath};
   index index.php;
-  try_files $uri $uri/ {webPath}/index.php$is_args$args;
+  try_files $1 $uri $uri/ {webPath}/index.php$is_args$args;
 }
 EOD;
     }



More information about the icinga-checkins mailing list