From: Philipp Dallig <philipp.dallig@pixelpark.com>
Date: Thu, 16 Jun 2016 16:02:25 +0000 (+0200)
Subject: gitlab - more nginx
X-Git-Tag: v0.1.0~4679
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=4d98f608eb95db55b12db84f480c7855d54b712c;p=pixelpark%2Fhiera.git

gitlab - more nginx
---

diff --git a/customer/pixelpark/git01.pixelpark.com.yaml b/customer/pixelpark/git01.pixelpark.com.yaml
index e6faeb18..f03bffad 100644
--- a/customer/pixelpark/git01.pixelpark.com.yaml
+++ b/customer/pixelpark/git01.pixelpark.com.yaml
@@ -8,12 +8,11 @@ nginx::nginx_vhosts:
     server_name:
       - git.pixelpark.com
       - git01.pixelpark.com
-    www_root: /opt/gitlab/embedded/service/gitlab-rails/public/
     ssl: true
     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: unix:/var/opt/gitlab/gitlab-workhorse/socket
+    proxy: http://unix:/var/opt/gitlab/gitlab-workhorse/socket
     proxy_set_header:
       - 'X-Forwarded-Proto "https"'
       - 'X-Forwarded-For $proxy_add_x_forwarded_for'
@@ -21,4 +20,14 @@ nginx::nginx_vhosts:
       - 'Host $host'
       - 'X-Forwarded-Ssl on'
     proxy_cache: gitlab
-    client_max_body_size: '250m'
\ No newline at end of file
+    client_max_body_size: '250m'
+    vhost_cfg_append:
+      'error_page 404': '/404.html'
+      'error_page 422': '/422.html'
+      'error_page 500': '/500.html'
+      'error_page 502': '/502.html'
+    locations:
+      docroot: 
+        www_root: /opt/gitlab/embedded/service/gitlab-rails/public/
+        internal: true
+        location: '~ ^/(404|422|500|502)\.html$'