gitlab: Merge in upstream config updates

This does almost(*) only pure merge. We will slaposify / adjust config
and corresponding md5sum in the following patches.

(*) option to enable/disable HTTP/2 was in the same line as other nginx
    already jinja2'ified listen options.

    As already noted in f6f97d72 we are going to always support HTTP/2,
    that's why we do not merge-in upstream change only to through it away in
    the following patch.

software/gitlab/template/gitlab.yml.in

@@ -124,7 +124,7 @@ production: &base
   artifacts:
     enabled: <%= @artifacts_enabled %>
     # The location where Build Artifacts are stored (default: shared/artifacts).
-    storage_path: <%= @artifacts_path %>
+    path: <%= @artifacts_path %>
   #}
 
   {# we do not support LFS
@@ -223,6 +223,7 @@ production: &base
     enabled: false
     {# just disabled
     enabled: <%= @ldap_enabled %>
+    sync_time: <%= @ldap_sync_time %>
   <% if @ldap_servers.any? %>
     servers:
     <% @ldap_servers.each do |provider_id, settings| %>

software/gitlab/template/nginx-gitlab-http.conf.in

@@ -66,7 +66,6 @@ server {
 
   server_name {{ fqdn }};
   server_tokens off; ## Don't show the nginx version number, a security best practice
-  root {{ gitlab_work.location }}/public;
 
   ## Increase this if you want to upload large attachments
   ## Or if you want to accept large git objects over http
@@ -135,6 +134,15 @@ server {
     proxy_pass http://gitlab-workhorse;
   }
 
+  error_page 404 /404.html;
+  error_page 422 /422.html;
+  error_page 500 /500.html;
+  error_page 502 /502.html;
+  location ~ ^/(404|422|500|502)\.html$ {
+    root {{ gitlab_work.location }}/public;
+    internal;
+  }
+
   {# we don't support custom nginx configs
   <%= @custom_gitlab_server_config %>
   #}

software/gitlab/template/nginx.conf.in

@@ -41,6 +41,9 @@ http {
 
   include {{ nginx_mime_types }};
 
+  proxy_cache_path <%= @proxy_cache_path %>;
+  proxy_cache <%= @proxy_cache %>;
+
   include {{ nginx_gitlab_http_conf }};
 
   {# we don't need: ci, pages, mattermost