summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAriejan de Vroom <ariejan@ariejan.net>2012-03-23 01:00:52 -0700
committerAriejan de Vroom <ariejan@ariejan.net>2012-03-23 01:00:52 -0700
commit6af33483fc9050f4990a96495c95da3d94fdf364 (patch)
treecb57ed308cec875df51a18ef0581f1743f378ce7
parentfa8219e0a753e642a6f1dbdfc010d01ae8a949ee (diff)
parente6153beda8527c7246565ff7deae93c766d6d2cb (diff)
downloadgitlab-ce-6af33483fc9050f4990a96495c95da3d94fdf364.tar.gz
Merge pull request #576 from sxua/master
Need to replace If statement with try_files in nginx.conf
-rw-r--r--doc/installation.md14
1 files changed, 5 insertions, 9 deletions
diff --git a/doc/installation.md b/doc/installation.md
index 823bd483ad6..615efd270a5 100644
--- a/doc/installation.md
+++ b/doc/installation.md
@@ -220,15 +220,11 @@ Edit /etc/nginx/nginx.conf. Add next code to **http** section:
server {
listen 80;
server_name mygitlab.com;
-
- location / {
-
- root /home/gitlab/gitlab/public;
-
- if (!-f $request_filename) {
- proxy_pass http://gitlab;
- break;
- }
+ root /home/gitlab/gitlab/public;
+ try_files $uri $uri/index.html $uri.html @gitlab;
+
+ location @gitlab {
+ proxy_pass http://gitlab;
}
}