archive-gh-me/docker-gitlab
1
0
Fork 0
mirror of https://github.com/sameersbn/docker-gitlab.git synced 2026-01-25 14:08:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2389 from sue445/gitlab_v14_0_gitlab_pages_secret

Browse Source 
Resolved. GitLab Pages doesn't work since GitLab v14.0
This commit is contained in:
Sameer Naik 2021-07-26 09:24:50 +05:30 committed by GitHub
commit b4f927f1e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/runtime/config/gitlab-pages/config
View File

@ -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

9
assets/runtime/functions
View File

@ -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