From f765ef06bef510e47c4bd6d15831de08de4e7759 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Thu, 26 Oct 2017 21:47:10 +0200 Subject: [PATCH] Add GITLAB_PAGES_ARTIFACTS_SERVER Signed-off-by: solidnerd --- assets/runtime/config/gitlabhq/gitlab.yml | 1 + assets/runtime/env-defaults | 1 + assets/runtime/functions | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index 474e0330..d9cfe427 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -166,6 +166,7 @@ production: &base host: {{GITLAB_PAGES_DOMAIN}} port: {{GITLAB_PAGES_PORT}} # Set to 443 if you serve the pages with HTTPS https: {{GITLAB_PAGES_HTTPS}} # Set to true if you serve the pages with HTTPS + artifacts_server: {{GITLAB_PAGES_ARTIFACTS_SERVER}} 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 diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 4482a641..09571ee9 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -377,6 +377,7 @@ GITLAB_PAGES_ENABLED=${GITLAB_PAGES_ENABLED:-false} GITLAB_PAGES_DOMAIN=${GITLAB_PAGES_DOMAIN:-"example.com"} GITLAB_PAGES_DIR="${GITLAB_PAGES_DIR:-$GITLAB_SHARED_DIR/pages}" GITLAB_PAGES_PORT=${GITLAB_PAGES_PORT:-80} +GITLAB_PAGES_ARTIFACTS_SERVER=${GITLAB_PAGES_ARTIFACTS_SERVER:-true} GITLAB_PAGES_HTTPS=${GITLAB_PAGES_HTTPS:-false} GITLAB_PAGES_EXTERNAL_HTTP=${GITLAB_PAGES_EXTERNAL_HTTP:-} GITLAB_PAGES_EXTERNAL_HTTPS=${GITLAB_PAGES_EXTERNAL_HTTPS:-} diff --git a/assets/runtime/functions b/assets/runtime/functions index 05268d06..554c5fa7 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -982,7 +982,8 @@ gitlab_configure_pages(){ GITLAB_PAGES_ENABLED \ GITLAB_PAGES_DOMAIN \ GITLAB_PAGES_PORT \ - GITLAB_PAGES_HTTPS + GITLAB_PAGES_HTTPS \ + GITLAB_PAGES_ARTIFACTS_SERVER if [[ -n ${GITLAB_PAGES_EXTERNAL_HTTP} ]]; then update_template ${GITLAB_CONFIG} \