diff --git a/assets/runtime/config/gitlab-pages/config b/assets/runtime/config/gitlab-pages/config index 8b0edb60..40978609 100644 --- a/assets/runtime/config/gitlab-pages/config +++ b/assets/runtime/config/gitlab-pages/config @@ -4,3 +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 +api-secret-key={{GITLAB_INSTALL_DIR}}/.gitlab_pages_secret diff --git a/assets/runtime/functions b/assets/runtime/functions index c0561674..cd5f501f 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -752,6 +752,12 @@ gitlab_configure_secrets() { exec_as_git openssl rand -base64 -out "${workhorse_secret}" 32 chmod 600 "${workhorse_secret}" fi + + local pages_secret="${GITLAB_INSTALL_DIR}/.gitlab_pages_secret" + if [[ ! -f "${pages_secret}" ]]; then + exec_as_git openssl rand -base64 -out "${pages_secret}" 32 + chmod 600 "${pages_secret}" + fi } gitlab_configure_sidekiq() { @@ -1786,7 +1792,8 @@ if [[ ${GITLAB_PAGES_ACCESS_CONTROL} == true ]]; then GITLAB_PAGES_ACCESS_CLIENT_SECRET \ GITLAB_PAGES_ACCESS_REDIRECT_URI \ GITLAB_PAGES_ACCESS_SECRET \ - GITLAB_PAGES_ACCESS_CONTROL_SERVER + GITLAB_PAGES_ACCESS_CONTROL_SERVER \ + GITLAB_INSTALL_DIR if [[ -n ${GITLAB_PAGES_ARTIFACTS_SERVER_URL} ]]; then update_template ${GITLAB_PAGES_CONFIG} GITLAB_PAGES_ARTIFACTS_SERVER_URL