Skip to content

Commit b4f927f

Browse files
authored
Merge pull request #2389 from sue445/gitlab_v14_0_gitlab_pages_secret
Resolved. GitLab Pages doesn't work since GitLab v14.0
2 parents 3e764bf + 73dae28 commit b4f927f

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

assets/runtime/config/gitlab-pages/config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@ auth-redirect-uri={{GITLAB_PAGES_ACCESS_REDIRECT_URI}}
44
auth-secret={{GITLAB_PAGES_ACCESS_SECRET}}
55
gitlab-server={{GITLAB_PAGES_ACCESS_CONTROL_SERVER}}
66
artifacts-server={{GITLAB_PAGES_ARTIFACTS_SERVER_URL}}
7+
internal-gitlab-server=http://localhost:8181
8+
api-secret-key={{GITLAB_INSTALL_DIR}}/.gitlab_pages_secret

assets/runtime/functions

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -752,6 +752,12 @@ gitlab_configure_secrets() {
752752
exec_as_git openssl rand -base64 -out "${workhorse_secret}" 32
753753
chmod 600 "${workhorse_secret}"
754754
fi
755+
756+
local pages_secret="${GITLAB_INSTALL_DIR}/.gitlab_pages_secret"
757+
if [[ ! -f "${pages_secret}" ]]; then
758+
exec_as_git openssl rand -base64 -out "${pages_secret}" 32
759+
chmod 600 "${pages_secret}"
760+
fi
755761
}
756762

757763
gitlab_configure_sidekiq() {
@@ -1786,7 +1792,8 @@ if [[ ${GITLAB_PAGES_ACCESS_CONTROL} == true ]]; then
17861792
GITLAB_PAGES_ACCESS_CLIENT_SECRET \
17871793
GITLAB_PAGES_ACCESS_REDIRECT_URI \
17881794
GITLAB_PAGES_ACCESS_SECRET \
1789-
GITLAB_PAGES_ACCESS_CONTROL_SERVER
1795+
GITLAB_PAGES_ACCESS_CONTROL_SERVER \
1796+
GITLAB_INSTALL_DIR
17901797

17911798
if [[ -n ${GITLAB_PAGES_ARTIFACTS_SERVER_URL} ]]; then
17921799
update_template ${GITLAB_PAGES_CONFIG} GITLAB_PAGES_ARTIFACTS_SERVER_URL

0 commit comments

Comments
 (0)