Commit 2dd9949f authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch 'master' into fl-update-axios-docs

* master:
  Tidy up the documentation of Gitlab HA/Gitlab Application
  Make sure two except won't overwrite each other
parents 08949a18 29323730
......@@ -80,10 +80,14 @@ stages:
except:
- /(^qa[\/-].*|.*-qa$)/
.except-docs-and-qa: &except-docs-and-qa
except:
- /(^docs[\/-].*|.*-docs$)/
- /(^qa[\/-].*|.*-qa$)/
.rspec-metadata: &rspec-metadata
<<: *dedicated-runner
<<: *except-docs
<<: *except-qa
<<: *except-docs-and-qa
<<: *pull-cache
stage: test
script:
......@@ -121,8 +125,7 @@ stages:
.spinach-metadata: &spinach-metadata
<<: *dedicated-runner
<<: *except-docs
<<: *except-qa
<<: *except-docs-and-qa
<<: *pull-cache
stage: test
script:
......@@ -222,8 +225,7 @@ review-docs-cleanup:
# Retrieve knapsack and rspec_flaky reports
retrieve-tests-metadata:
<<: *tests-metadata-state
<<: *except-docs
<<: *except-qa
<<: *except-docs-and-qa
stage: prepare
cache:
key: tests_metadata
......@@ -378,8 +380,7 @@ spinach-mysql 3 4: *spinach-metadata-mysql
.rake-exec: &rake-exec
<<: *dedicated-runner
<<: *except-docs
<<: *except-qa
<<: *except-docs-and-qa
<<: *pull-cache
<<: *ruby-static-analysis
stage: test
......@@ -443,8 +444,7 @@ ee_compat_check:
# DB migration, rollback, and seed jobs
.db-migrate-reset: &db-migrate-reset
<<: *dedicated-runner
<<: *except-docs
<<: *except-qa
<<: *except-docs-and-qa
<<: *pull-cache
stage: test
script:
......@@ -466,8 +466,7 @@ db:check-schema-pg:
.migration-paths: &migration-paths
<<: *dedicated-runner
<<: *except-docs
<<: *except-qa
<<: *except-docs-and-qa
<<: *pull-cache
stage: test
variables:
......@@ -494,8 +493,7 @@ migration:path-mysql:
.db-rollback: &db-rollback
<<: *dedicated-runner
<<: *except-docs
<<: *except-qa
<<: *except-docs-and-qa
<<: *pull-cache
stage: test
script:
......@@ -512,8 +510,7 @@ db:rollback-mysql:
.db-seed_fu: &db-seed_fu
<<: *dedicated-runner
<<: *except-docs
<<: *except-qa
<<: *except-docs-and-qa
<<: *pull-cache
stage: test
variables:
......@@ -541,8 +538,7 @@ db:seed_fu-mysql:
# Frontend-related jobs
gitlab:assets:compile:
<<: *dedicated-runner
<<: *except-docs
<<: *except-qa
<<: *except-docs-and-qa
<<: *pull-cache
stage: test
dependencies: []
......@@ -564,8 +560,7 @@ gitlab:assets:compile:
karma:
<<: *dedicated-runner
<<: *except-docs
<<: *except-qa
<<: *except-docs-and-qa
<<: *pull-cache
<<: *use-pg
stage: test
......@@ -619,8 +614,7 @@ qa:internal:
coverage:
<<: *dedicated-runner
<<: *except-docs
<<: *except-qa
<<: *except-docs-and-qa
<<: *pull-cache
stage: post-test
services: []
......@@ -639,8 +633,7 @@ coverage:
lint:javascript:report:
<<: *dedicated-runner
<<: *except-docs
<<: *except-qa
<<: *except-docs-and-qa
<<: *pull-cache
stage: post-test
dependencies:
......@@ -699,8 +692,7 @@ cache gems:
gitlab_git_test:
<<: *dedicated-runner
<<: *except-docs
<<: *except-qa
<<: *except-docs-and-qa
<<: *pull-cache
variables:
SETUP_DB: "false"
......
# Configuring GitLab for HA
Assuming you have already configured a database, Redis, and NFS, you can
Assuming you have already configured a [database](database.md), [Redis](redis.md), and [NFS](nfs.md), you can
configure the GitLab application server(s) now. Complete the steps below
for each GitLab application server in your environment.
......@@ -56,8 +56,7 @@ for each GitLab application server in your environment.
high_availability['mountpoint'] = '/var/opt/gitlab/git-data'
# Disable components that will not be on the GitLab application server
postgresql['enable'] = false
redis['enable'] = false
roles ['application_role']
# PostgreSQL connection details
gitlab_rails['db_adapter'] = 'postgresql'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment