proxy pass requests to static assets to gitlab unicorn

When relative_url is in used, the links to assets in the `application.css` file to not have the relative_url prefix. To fix this we proxy pass asset requests to the upstream gitlab unicorn. Fixes sameersbn#521
SmallStrawHat · Dec 24, 2015 · cd18eb1 · cd18eb1
1 parent de94d95
commit cd18eb1
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 0 deletions.
diff --git a/assets/runtime/config/nginx/gitlab b/assets/runtime/config/nginx/gitlab
@@ -16,6 +16,10 @@
 ##
 ## See installation.md#using-https for additional HTTPS configuration details.
 
+upstream gitlab {
+  server unix:{{GITLAB_INSTALL_DIR}}/tmp/sockets/gitlab.socket fail_timeout=0;
+}
+
 upstream gitlab-workhorse {
   server unix:{{GITLAB_INSTALL_DIR}}/tmp/sockets/gitlab-workhorse.socket fail_timeout=0;
 }
@@ -60,4 +64,33 @@ server {
 
     proxy_pass http://gitlab-workhorse;
   }
+
+  ## If a static asset file is requested, then proxy passes the request to
+  ## the upsteam (gitlab unicorn).
+  ## As of 8.3.0 gitlab-workhorse does not properly generated the static assets
+  ## when relative_url is used
+  location {{GITLAB_RELATIVE_URL_ROOT__with_trailing_slash}}assets {
+    try_files $uri /index.html $uri.html @gitlab;
+  }
+
+  location @gitlab {
+    ## If you use HTTPS make sure you disable gzip compression
+    ## to be safe against BREACH attack.
+    # gzip off;
+
+    ## https://github.com/gitlabhq/gitlabhq/issues/694
+    ## Some requests take more than 30 seconds.
+    proxy_read_timeout       300;
+    proxy_connect_timeout    300;
+    proxy_redirect           off;
+    proxy_buffering          {{NGINX_PROXY_BUFFERING}};
+
+    proxy_set_header    Host                $http_host;
+    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   {{NGINX_X_FORWARDED_PROTO}};
+    proxy_set_header    X-Frame-Options     SAMEORIGIN;
+
+    proxy_pass http://gitlab;
+  }
 }
diff --git a/assets/runtime/config/nginx/gitlab-ssl b/assets/runtime/config/nginx/gitlab-ssl
@@ -20,6 +20,10 @@
 ##
 ## See installation.md#using-https for additional HTTPS configuration details.
 
+upstream gitlab {
+  server unix:{{GITLAB_INSTALL_DIR}}/tmp/sockets/gitlab.socket fail_timeout=0;
+}
+
 upstream gitlab-workhorse {
   server unix:{{GITLAB_INSTALL_DIR}}/tmp/sockets/gitlab-workhorse.socket fail_timeout=0;
 }
@@ -106,4 +110,33 @@ server {
     proxy_set_header    X-Forwarded-Proto   {{NGINX_X_FORWARDED_PROTO}};
     proxy_pass http://gitlab-workhorse;
   }
+
+  ## If a static asset file is requested, then proxy passes the request to
+  ## the upsteam (gitlab unicorn).
+  ## As of 8.3.0 gitlab-workhorse does not properly generated the static assets
+  ## when relative_url is used
+  location {{GITLAB_RELATIVE_URL_ROOT__with_trailing_slash}}assets {
+    try_files $uri /index.html $uri.html @gitlab;
+  }
+
+  location @gitlab {
+    ## If you use HTTPS make sure you disable gzip compression
+    ## to be safe against BREACH attack.
+    # gzip off;
+
+    ## https://github.com/gitlabhq/gitlabhq/issues/694
+    ## Some requests take more than 30 seconds.
+    proxy_read_timeout       300;
+    proxy_connect_timeout    300;
+    proxy_redirect           off;
+    proxy_buffering          {{NGINX_PROXY_BUFFERING}};
+
+    proxy_set_header    Host                $http_host;
+    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   {{NGINX_X_FORWARDED_PROTO}};
+    proxy_set_header    X-Frame-Options     SAMEORIGIN;
+
+    proxy_pass http://gitlab;
+  }
 }