git01 - correct caching

diff --git a/customer/pixelpark/git01.pixelpark.com.yaml b/customer/pixelpark/git01.pixelpark.com.yaml
index bcac44bd4a20fd32d4299371cd55cb656bb7ef62..9a236a846061b818708a9433dc582d450630e538 100644 (file)
--- a/customer/pixelpark/git01.pixelpark.com.yaml
+++ b/customer/pixelpark/git01.pixelpark.com.yaml
@@ -9,6 +9,10 @@ nginx::config::proxy_cache_keys_zone: 'gitlab:10m'
 nginx::config::proxy_cache_levels: '1:2'
 nginx::config::proxy_cache_max_size: '1g'
 nginx::config::proxy_cache_path: 'proxy_cache'
+nginx::nginx_upstreams:
+  gitlab-workhorse:
+    members:
+      - unix:/var/opt/gitlab/gitlab-workhorse/socket
 nginx::nginx_vhosts:
   gitlab:
     server_name:
@@ -18,7 +22,6 @@ nginx::nginx_vhosts:
     ssl_cert: /etc/pki/tls/certs/wildcard.pixelpark.com-cert.pem
     ssl_key: /etc/pki/tls/private/wildcard.pixelpark.com-key.pem
     rewrite_to_https: true
-    proxy: http://unix:/var/opt/gitlab/gitlab-workhorse/socket
     proxy_set_header:
       - 'X-Forwarded-Proto "https"'
       - 'X-Forwarded-For $proxy_add_x_forwarded_for'
@@ -32,11 +35,20 @@ nginx::nginx_vhosts:
       '422': '/422.html'
       '500': '/500.html'
       '502': '/502.html'
+      '503': '/502.html'
     locations:
       error-pages:
         www_root: /opt/gitlab/embedded/service/gitlab-rails/public/
         internal: true
-        location: '~ ^/(404|422|500|502)\.html$'
+        location: '~ ^/(404|422|500|502|504)\.html$'
+      assets:
+        location: /assets
+        proxy_cache: on
+        proxy: http://gitlab-workhorse
+      root:
+        location: /
+        proxy: http://gitlab-workhorse
+        proxy_cache: off
   gitlab-registry:
     server_name:
       - registry.pixelpark.com