diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index 053beec5..5e0cc4fb 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -633,7 +633,7 @@ test: path: tmp/tests/pages repositories: storages: - default: + default: path: tmp/tests/repositories/ gitaly_adress: unix:tmp/tests/gitaly/gitaly.socket backup: diff --git a/assets/runtime/functions b/assets/runtime/functions index d7fd1b2e..15979161 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -283,8 +283,8 @@ gitlab_configure_gitaly() { update_template ${GITLAB_CONFIG} \ GITALY_ENABLED \ - GITALY_TOKEN - + GITALY_TOKEN + } gitlab_configure_monitoring() { @@ -869,7 +869,7 @@ gitlab_configure_gravatar() { gitlab_configure_cron_jobs() { echo "Configuring gitlab::cron_jobs..." - + if [[ -n "${GITLAB_PIPELINE_SCHEDULE_WORKER_CRON}" ]]; then update_template ${GITLAB_CONFIG} GITLAB_PIPELINE_SCHEDULE_WORKER_CRON else @@ -1422,10 +1422,10 @@ configure_gitlab() { GITLAB_SHELL_INSTALL_DIR \ GITLAB_DATA_DIR \ GITLAB_REPOS_DIR \ - GITLAB_REPOSITORIES_STORAGES_DEFAULT_FAILURE_COUNT_THRESHOLD \ - GITLAB_REPOSITORIES_STORAGES_DEFAULT_FAILURE_WAIT_TIME \ - GITLAB_REPOSITORIES_STORAGES_DEFAULT_FAILURE_RESET_TIME \ - GITLAB_REPOSITORIES_STORAGES_DEFAULT_STORAGE_TIMEOUT \ + GITLAB_REPOSITORIES_STORAGES_DEFAULT_FAILURE_COUNT_THRESHOLD \ + GITLAB_REPOSITORIES_STORAGES_DEFAULT_FAILURE_WAIT_TIME \ + GITLAB_REPOSITORIES_STORAGES_DEFAULT_FAILURE_RESET_TIME \ + GITLAB_REPOSITORIES_STORAGES_DEFAULT_STORAGE_TIMEOUT \ GITLAB_DOWNLOADS_DIR \ GITLAB_SHARED_DIR \ GITLAB_HOST \