From 242e5180450832243e37c3fe8ee9676581a8f595 Mon Sep 17 00:00:00 2001 From: th-2021 <90853655+th-2021@users.noreply.github.com> Date: Fri, 27 May 2022 15:05:37 +0200 Subject: [PATCH 1/2] support relative gitlab path with pages --- assets/runtime/functions | 2 ++ 1 file changed, 2 insertions(+) diff --git a/assets/runtime/functions b/assets/runtime/functions index b9cbfdc0a..bb8591532 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1922,6 +1922,7 @@ if [[ ${GITLAB_PAGES_ACCESS_CONTROL} == true ]]; then fi update_template ${GITLAB_PAGES_CONFIG} \ + GITLAB_RELATIVE_URL_ROOT \ GITLAB_PAGES_ACCESS_CLIENT_ID \ GITLAB_PAGES_ACCESS_CLIENT_SECRET \ GITLAB_PAGES_ACCESS_REDIRECT_URI \ @@ -1936,6 +1937,7 @@ if [[ ${GITLAB_PAGES_ACCESS_CONTROL} == true ]]; then fi else update_template ${GITLAB_PAGES_CONFIG} \ + GITLAB_RELATIVE_URL_ROOT \ GITLAB_INSTALL_DIR exec_as_git sed -i "/{{GITLAB_PAGES_ACCESS_CLIENT_ID}}/d" ${GITLAB_PAGES_CONFIG} From d9cc864c49edb615a963ab609a812aa6f4ca5657 Mon Sep 17 00:00:00 2001 From: th-2021 <90853655+th-2021@users.noreply.github.com> Date: Fri, 27 May 2022 15:08:09 +0200 Subject: [PATCH 2/2] support relative path with pages --- assets/runtime/config/gitlab-pages/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/runtime/config/gitlab-pages/config b/assets/runtime/config/gitlab-pages/config index 409786090..49f66a6d9 100644 --- a/assets/runtime/config/gitlab-pages/config +++ b/assets/runtime/config/gitlab-pages/config @@ -4,5 +4,5 @@ auth-redirect-uri={{GITLAB_PAGES_ACCESS_REDIRECT_URI}} auth-secret={{GITLAB_PAGES_ACCESS_SECRET}} gitlab-server={{GITLAB_PAGES_ACCESS_CONTROL_SERVER}} artifacts-server={{GITLAB_PAGES_ARTIFACTS_SERVER_URL}} -internal-gitlab-server=http://localhost:8181 +internal-gitlab-server=http://localhost:8181{{GITLAB_RELATIVE_URL_ROOT}} api-secret-key={{GITLAB_INSTALL_DIR}}/.gitlab_pages_secret