Add Pages -artifacts-server and -artifacts-server-timeout support to Omnibus

Closes #2747 (closed)

changed milestone to %10.1

This can be pushed back to %10.1 now

added 101 commits

• 70de580a...c19d9a7b - 99 commits from branch master
• c68a51aa - Add -artifacts-server and -artifacts-server-timeout support to Omnibus
• 3dd9a20b - Add CHANGELOG

Compare with previous version

changed title from Add -artifacts-server and -artifacts-server-timeout support to Omnibus to Add Pages -artifacts-server and -artifacts-server-timeout support to Omnibus

resolved all discussions

OK, I think this is done now.

artifacts_server can be set to false to disable this new functionality. artifacts_server_url can be set to a custom value if desired, but if left null it defaults to external_url + '/api/v4'

config/gitlab.yml gets pages:\n artifacts_server added as a boolean.

In the GitLab CE MR, we'll need to check that pages: enabled and this new value. If so, we can construct the URL in the same way we currently construct group URLs.

@ibaum can you review?

assigned to @ibaum

added In review label

external_url handles the relative_url_root, doesn't it?

assigned to @nick.thomas

resolved all discussions

Thanks @ibaum. One more look?

assigned to @ibaum

I think this looks good. Passing to DJ for final review.

approved this merge request

assigned to @twk3

marked as a Work In Progress

Let's hold off on merging this for now as we look for an answer to https://gitlab.com/gitlab-org/gitlab-ce/issues/34102#note_40898222

added 66 commits

• e8c7cdb7...85b26990 - 64 commits from branch master
• df200513 - Add -artifacts-server and -artifacts-server-timeout support to Omnibus
• e922a66e - Add CHANGELOG

Compare with previous version

resolved all discussions

OK, it doesn't look like our alterations to the Pages daemon in https://gitlab.com/gitlab-org/gitlab-pages/issues/83 will require any changes to omnibus.

We should still hold off on merging this until after a new Pages release has been made and gitlab has been updated to use it, though, as it introduces a new configuration option that is on by default - so the recipes will break if run with gitlab-pages < 0.6

unmarked as a Work In Progress

New Pages release has been integrated into GitLab CE: https://gitlab.com/gitlab-org/gitlab/ce/merge_requests/14630 so this is safe to merge for %10.1

@marin can you take on maintainer review since @twk3 is on hols?

assigned to @marin

Merge conflicts /o\ resolved

added 11 commits

• d916268f...5c7244c0 - 9 commits from branch master
• f012e839 - Add -artifacts-server and -artifacts-server-timeout support to Omnibus
• 77d3abf6 - Add CHANGELOG

Compare with previous version

approved this merge request

merged

mentioned in commit 188def96