diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-08-09 17:41:20 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-08-09 17:41:20 +0000 |
| commit | eaf5cc9907b5463a147a902827f7c98ade9bd1c6 (patch) | |
| tree | ba80e72e509869f15e9cbe5599c457c4f64beba7 /lib | |
| parent | 420d835e5fb41e1c3291a814f807b555b24646ca (diff) | |
| parent | 94d9b545db0dda59020f00cfc17bb7f9d1e4e5a2 (diff) | |
| download | gitlab-ce-eaf5cc9907b5463a147a902827f7c98ade9bd1c6.tar.gz | |
Merge branch 'fix-gitlab-pages-cache-config' into 'master'
Fix proxy config in Gitlab Pages nginx examples
See merge request !13375
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/support/nginx/gitlab-pages | 5 | ||||
| -rw-r--r-- | lib/support/nginx/gitlab-pages-ssl | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lib/support/nginx/gitlab-pages b/lib/support/nginx/gitlab-pages index d9746c5c1aa..875c8bcbf3c 100644 --- a/lib/support/nginx/gitlab-pages +++ b/lib/support/nginx/gitlab-pages @@ -18,8 +18,11 @@ server { proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; + + proxy_cache off; + # The same address as passed to GitLab Pages: `-listen-proxy` - proxy_pass http://localhost:8090/; + proxy_pass http://localhost:8090/; } # Define custom error pages diff --git a/lib/support/nginx/gitlab-pages-ssl b/lib/support/nginx/gitlab-pages-ssl index a1ccf266835..62ed482e2bf 100644 --- a/lib/support/nginx/gitlab-pages-ssl +++ b/lib/support/nginx/gitlab-pages-ssl @@ -67,8 +67,11 @@ server { proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; + + proxy_cache off; + # The same address as passed to GitLab Pages: `-listen-proxy` - proxy_pass http://localhost:8090/; + proxy_pass http://localhost:8090/; } # Define custom error pages |