summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2019-08-09 06:48:12 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2019-08-09 06:48:12 +0000
commita577123003d1401bc3998030ab92c976dd2d5651 (patch)
tree55fcc9e1245e84d2291d204ff6129e7a946a26fc
parent6fef117f0bc90d43aaecd463b7b4ed9f71117a94 (diff)
parentf253097ea44c09f947033eded89298215eef10c4 (diff)
downloadgitlab-ce-a577123003d1401bc3998030ab92c976dd2d5651.tar.gz
Merge branch '65700-document-max-replication-slots-pg-ha' into 'master'
Add max_replication_slots to PG HA documentation Closes #65700 See merge request gitlab-org/gitlab-ce!31534
-rw-r--r--changelogs/unreleased/65700-document-max-replication-slots-pg-ha.yml5
-rw-r--r--doc/administration/high_availability/database.md1
2 files changed, 6 insertions, 0 deletions
diff --git a/changelogs/unreleased/65700-document-max-replication-slots-pg-ha.yml b/changelogs/unreleased/65700-document-max-replication-slots-pg-ha.yml
new file mode 100644
index 00000000000..bacc3f5fc11
--- /dev/null
+++ b/changelogs/unreleased/65700-document-max-replication-slots-pg-ha.yml
@@ -0,0 +1,5 @@
+---
+title: Add max_replication_slots to PG HA documentation
+merge_request: 31534
+author:
+type: other
diff --git a/doc/administration/high_availability/database.md b/doc/administration/high_availability/database.md
index f7a1f425b40..7c9e02d889e 100644
--- a/doc/administration/high_availability/database.md
+++ b/doc/administration/high_availability/database.md
@@ -327,6 +327,7 @@ When installing the GitLab package, do not supply `EXTERNAL_URL` value.
postgresql['sql_user_password'] = 'POSTGRESQL_PASSWORD_HASH'
# Replace X with value of number of db nodes + 1
postgresql['max_wal_senders'] = X
+ postgresql['max_replication_slots'] = X
# Replace XXX.XXX.XXX.XXX/YY with Network Address
postgresql['trust_auth_cidr_addresses'] = %w(XXX.XXX.XXX.XXX/YY)