diff --git a/assets/runtime/config/gitlab-pages/config b/assets/runtime/config/gitlab-pages/config index 40978609..c27dffb4 100644 --- a/assets/runtime/config/gitlab-pages/config +++ b/assets/runtime/config/gitlab-pages/config @@ -4,5 +4,7 @@ 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://127.0.0.1:8080{{GITLAB_RELATIVE_URL_ROOT}} api-secret-key={{GITLAB_INSTALL_DIR}}/.gitlab_pages_secret +log-verbose={{GITLAB_PAGES_LOG_VERBOSE}} +namespace-in-path={{GITLAB_PAGES_NAMESPACE_IN_PATH}} diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index f828dd6f..81ea4f07 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -410,6 +410,7 @@ production: &base artifacts_server: {{GITLAB_PAGES_ARTIFACTS_SERVER}} # Set to false if you want to disable online view of HTML artifacts external_http: {{GITLAB_PAGES_EXTERNAL_HTTP}} # If defined, enables custom domain support in GitLab Pages external_https: {{GITLAB_PAGES_EXTERNAL_HTTPS}} # If defined, enables custom domain and certificate support in GitLab Pages + namespace_in_path: {{GITLAB_PAGES_NAMESPACE_IN_PATH}} # File that contains the shared secret key for verifying access for gitlab-pages. # Default is '.gitlab_pages_secret' relative to Rails.root (i.e. root of the GitLab app). diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 14e0ccc1..c5c3c687 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -617,6 +617,8 @@ GITLAB_PAGES_ACCESS_CLIENT_ID=${GITLAB_PAGES_ACCESS_CLIENT_ID:-} GITLAB_PAGES_ACCESS_CLIENT_SECRET=${GITLAB_PAGES_ACCESS_CLIENT_SECRET:-} GITLAB_PAGES_ACCESS_REDIRECT_URI=${GITLAB_PAGES_ACCESS_REDIRECT_URI:-} GITLAB_PAGES_NGINX_PROXY=${GITLAB_PAGES_NGINX_PROXY:-true} +GITLAB_PAGES_NAMESPACE_IN_PATH=${GITLAB_PAGES_NAMESPACE_IN_PATH:-false} +GITLAB_PAGES_LOG_VERBOSE=${GITLAB_PAGES_LOG_VERBOSE:-false} ## Gitaly GITALY_CLIENT_PATH=${GITALY_CLIENT_PATH:-$GITLAB_GITALY_INSTALL_DIR} diff --git a/assets/runtime/functions b/assets/runtime/functions index 67750f2f..8710c54c 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -2153,6 +2153,8 @@ if [[ ${GITLAB_PAGES_ACCESS_CONTROL} == true ]]; then GITLAB_PAGES_ACCESS_REDIRECT_URI \ GITLAB_PAGES_ACCESS_SECRET \ GITLAB_PAGES_ACCESS_CONTROL_SERVER \ + GITLAB_PAGES_NAMESPACE_IN_PATH \ + GITLAB_PAGES_LOG_VERBOSE \ GITLAB_INSTALL_DIR if [[ -n ${GITLAB_PAGES_ARTIFACTS_SERVER_URL} ]]; then @@ -2162,6 +2164,9 @@ if [[ ${GITLAB_PAGES_ACCESS_CONTROL} == true ]]; then fi else update_template ${GITLAB_PAGES_CONFIG} \ + GITLAB_RELATIVE_URL_ROOT \ + GITLAB_PAGES_NAMESPACE_IN_PATH \ + GITLAB_PAGES_LOG_VERBOSE \ GITLAB_INSTALL_DIR exec_as_git sed -i "/{{GITLAB_PAGES_ACCESS_CLIENT_ID}}/d" ${GITLAB_PAGES_CONFIG}