Commit 3cc6756b authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

gitlab: update SlapOS'ify configuration.

- Fix artifacts path key in gitlab.yml.erb
  https://gitlab.com/gitlab-org/omnibus-gitlab/commit/c29c1a5d

- Do not serve anything via nginx as we have workhorse
  https://gitlab.com/gitlab-org/omnibus-gitlab/commit/ac390aba
parent cb4b3ab6
...@@ -249,7 +249,7 @@ md5sum = 14c5632182d830c03f7788c85d6f4da1 ...@@ -249,7 +249,7 @@ md5sum = 14c5632182d830c03f7788c85d6f4da1
[gitlab.yml.in] [gitlab.yml.in]
<= download-template <= download-template
md5sum = 8f1c52ed223ee2c2d07c6c79bcd2f6c0 md5sum = 7f48727ab64f1a6f3854420fa0434889
[instance-gitlab.cfg.in] [instance-gitlab.cfg.in]
<= download-file <= download-file
...@@ -261,7 +261,7 @@ md5sum = a56a44e96f65f5ed20211bb6a54279f4 ...@@ -261,7 +261,7 @@ md5sum = a56a44e96f65f5ed20211bb6a54279f4
[nginx-gitlab-http.conf.in] [nginx-gitlab-http.conf.in]
<= download-template <= download-template
md5sum = be7ddd26b0b0196fde8d699e50e84b2f md5sum = 405dd5aa5703425a50c01dfe62f3a28b
[nginx.conf.in] [nginx.conf.in]
<= download-template <= download-template
......
...@@ -124,7 +124,7 @@ production: &base ...@@ -124,7 +124,7 @@ production: &base
artifacts: artifacts:
enabled: <%= @artifacts_enabled %> enabled: <%= @artifacts_enabled %>
# The location where Build Artifacts are stored (default: shared/artifacts). # The location where Build Artifacts are stored (default: shared/artifacts).
storage_path: <%= @artifacts_path %> path: <%= @artifacts_path %>
#} #}
{# we do not support LFS {# we do not support LFS
......
...@@ -66,7 +66,6 @@ server { ...@@ -66,7 +66,6 @@ server {
server_name {{ fqdn }}; server_name {{ fqdn }};
server_tokens off; ## Don't show the nginx version number, a security best practice 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 ## Increase this if you want to upload large attachments
## Or if you want to accept large git objects over http ## Or if you want to accept large git objects over http
...@@ -135,6 +134,15 @@ server { ...@@ -135,6 +134,15 @@ server {
proxy_pass http://gitlab-workhorse; 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 {# we don't support custom nginx configs
<%= @custom_gitlab_server_config %> <%= @custom_gitlab_server_config %>
#} #}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment