From: Philipp Dallig <philipp.dallig@pixelpark.com>
Date: Mon, 27 Mar 2017 10:25:38 +0000 (+0200)
Subject: pixelpark - git additions
X-Git-Tag: v0.1.0~3390^2~16
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=08b09dd6958835c4bb368fdb1fa63704bf5e9251;p=pixelpark%2Fhiera.git

pixelpark - git additions
---

diff --git a/customer/pixelpark/git01.pixelpark.com.yaml b/customer/pixelpark/git01.pixelpark.com.yaml
index 2db151da..1ef44787 100644
--- a/customer/pixelpark/git01.pixelpark.com.yaml
+++ b/customer/pixelpark/git01.pixelpark.com.yaml
@@ -22,14 +22,8 @@ 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_set_header:
-      - 'X-Forwarded-Proto "https"'
-      - 'X-Forwarded-For $proxy_add_x_forwarded_for'
-      - 'X-Real-IP $remote_addr'
-      - 'Host $host'
-      - 'X-Forwarded-Ssl on'
-    proxy_cache: gitlab
-    client_max_body_size: '250m'
+    client_max_body_size: '250m'#
+    use_default_location: false
     error_pages:
       '404': '/404.html'
       '422': '/422.html'
@@ -43,12 +37,24 @@ nginx::nginx_vhosts:
         location: '~ ^/(404|422|500|502|504)\.html$'
       assets:
         location: /assets
-        proxy_cache: 'on'
+        proxy_cache: gitlab
         proxy: http://gitlab-workhorse
+        proxy_set_header:
+          - 'X-Forwarded-Proto "https"'
+          - 'X-Forwarded-For $proxy_add_x_forwarded_for'
+          - 'X-Real-IP $remote_addr'
+          - 'Host $host'
+          - 'X-Forwarded-Ssl on'
       gitlab-root:
         location: /
         proxy: http://gitlab-workhorse
         proxy_cache: 'off'
+        proxy_set_header:
+          - 'X-Forwarded-Proto "https"'
+          - 'X-Forwarded-For $proxy_add_x_forwarded_for'
+          - 'X-Real-IP $remote_addr'
+          - 'Host $host'
+          - 'X-Forwarded-Ssl on'
   gitlab-registry:
     server_name:
       - registry.pixelpark.com