Skip to content
Snippets Groups Projects
Commit 3f35bb34 authored by Kamil Trzciński's avatar Kamil Trzciński
Browse files

Allow to define Pages Status URI

parent 75233c10
No related branches found
No related tags found
No related merge requests found
......@@ -3,6 +3,10 @@
The latest version of this file can be found at the master branch of the
omnibus-gitlab repository.
10.4.1
- Add GitLab pages status page configuration
10.4.0
- Upgrade Ruby version to 2.3.6
......
......@@ -1029,6 +1029,9 @@
##! Configure to expose GitLab Pages on external IP address, serving the HTTPS
# gitlab_pages['external_https'] = []
##! Configure to enable health check endpoint on GitLab Pages
# gitlab_pages['status_uri'] = "/@status"
# gitlab_pages['listen_proxy'] = "localhost:8090"
# gitlab_pages['redirect_http'] = true
# gitlab_pages['use_http2'] = true
......
......@@ -546,6 +546,7 @@
default['gitlab']['gitlab-pages']['use_http2'] = true
default['gitlab']['gitlab-pages']['dir'] = "/var/opt/gitlab/gitlab-pages"
default['gitlab']['gitlab-pages']['log_directory'] = "/var/log/gitlab/gitlab-pages"
default['gitlab']['gitlab-pages']['status_uri'] = nil
default['gitlab']['gitlab-pages']['artifacts_server'] = true
default['gitlab']['gitlab-pages']['artifacts_server_url'] = nil
default['gitlab']['gitlab-pages']['artifacts_server_timeout'] = 10
......
......@@ -33,6 +33,9 @@
\
-pages-domain="<%= node['gitlab']['gitlab-pages']['domain'] %>" \
-pages-root="<%= node['gitlab']['gitlab-pages']['pages_root'] %>" \
<% if node['gitlab']['gitlab-pages']['status_uri'] %>
-pages-status="<%= node['gitlab']['gitlab-pages']['status_uri'] %>" \
<% end %>
\
-redirect-http=<%= node['gitlab']['gitlab-pages']['redirect_http'] %> \
-use-http2=<%= node['gitlab']['gitlab-pages']['use_http2'] %> \
......
......@@ -31,6 +31,7 @@
expect(chef_run).not_to render_file("/opt/gitlab/sv/gitlab-pages/run").with_content(%r{-root-cert})
expect(chef_run).not_to render_file("/opt/gitlab/sv/gitlab-pages/run").with_content(%r{-root-key})
expect(chef_run).not_to render_file("/opt/gitlab/sv/gitlab-pages/run").with_content(%r{-metrics-address})
expect(chef_run).not_to render_file("/opt/gitlab/sv/gitlab-pages/run").with_content(%r{-status-uri})
end
end
......@@ -46,7 +47,8 @@
redirect_http: true,
cert: '/etc/gitlab/pages.crt',
artifacts_server_url: "https://gitlab.elsewhere.com/api/v5",
artifacts_server_timeout: 60
artifacts_server_timeout: 60,
status_uri: '/@status'
}
)
end
......@@ -68,6 +70,7 @@
expect(chef_run).to render_file("/opt/gitlab/sv/gitlab-pages/run").with_content(%r{-root-key})
expect(chef_run).to render_file("/opt/gitlab/sv/gitlab-pages/run").with_content(%r{-artifacts-server="https://gitlab.elsewhere.com/api/v5"})
expect(chef_run).to render_file("/opt/gitlab/sv/gitlab-pages/run").with_content(%r{-artifacts-server-timeout=60})
expect(chef_run).to render_file("/opt/gitlab/sv/gitlab-pages/run").with_content(%r{-pages-status="/@status"})
end
end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment