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 diff --git a/assets/runtime/functions b/assets/runtime/functions index 4a3759a68..68e46dabb 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -2113,6 +2113,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 \ @@ -2127,6 +2128,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}