Merge branch 'fix-gitlab-pages-cache-config' into 'master'

Fix proxy config in Gitlab Pages nginx examples See merge request !13375

Merge branch 'fix-gitlab-pages-cache-config' into 'master'
eaf5cc99 · Grzegorz Bizon · 420d835e · 94d9b545 · eaf5cc99 · eaf5cc99
Commit eaf5cc99 authored Aug 09, 2017 by Grzegorz Bizon
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

gitlab-pages lib/support/nginx/gitlab-pages +4 -1

gitlab-pages-ssl lib/support/nginx/gitlab-pages-ssl +4 -1

No files found.
--- 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

--- 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