diff options
Diffstat (limited to 'doc/administration/geo')
| -rw-r--r-- | doc/administration/geo/disaster_recovery/index.md | 4 | ||||
| -rw-r--r-- | doc/administration/geo/replication/datatypes.md | 1 | ||||
| -rw-r--r-- | doc/administration/geo/replication/external_database.md | 35 | ||||
| -rw-r--r-- | doc/administration/geo/replication/img/geo_node_dashboard.png | bin | 200732 -> 48528 bytes |
4 files changed, 36 insertions, 4 deletions
diff --git a/doc/administration/geo/disaster_recovery/index.md b/doc/administration/geo/disaster_recovery/index.md index 0a5c39665f4..6f417f955ac 100644 --- a/doc/administration/geo/disaster_recovery/index.md +++ b/doc/administration/geo/disaster_recovery/index.md @@ -248,6 +248,10 @@ The data can be removed with the following command: sudo rm -rf /var/opt/gitlab/geo-postgresql ``` +If you have any `geo_secondary[]` configuration options enabled in your `gitlab.rb` +file, these can be safely commented out or removed, and then [reconfigure GitLab](../../restart_gitlab.md#omnibus-gitlab-reconfigure) +for the changes to take effect. + ## Promoting secondary Geo replica in multi-secondary configurations If you have more than one **secondary** node and you need to promote one of them, we suggest you follow diff --git a/doc/administration/geo/replication/datatypes.md b/doc/administration/geo/replication/datatypes.md index a1f511fe2a5..3431df3ed1f 100644 --- a/doc/administration/geo/replication/datatypes.md +++ b/doc/administration/geo/replication/datatypes.md @@ -145,6 +145,7 @@ successfully, you must replicate their data using some other means. | [Maven Repository](../../../user/packages/maven_repository/index.md) | [No](https://gitlab.com/groups/gitlab-org/-/epics/2346) | No | | | [Conan Repository](../../../user/packages/conan_repository/index.md) | [No](https://gitlab.com/groups/gitlab-org/-/epics/2346) | No | | | [NuGet Repository](../../../user/packages/nuget_repository/index.md) | [No](https://gitlab.com/groups/gitlab-org/-/epics/2346) | No | | +| [PyPi Repository](../../../user/packages/pypi_repository/index.md) | [No](https://gitlab.com/groups/gitlab-org/-/epics/2554) | No | | | [External merge request diffs](../../merge_request_diffs.md) | [No](https://gitlab.com/gitlab-org/gitlab/issues/33817) | No | | | Content in object storage | **Yes** | No | | diff --git a/doc/administration/geo/replication/external_database.md b/doc/administration/geo/replication/external_database.md index fd14c100ffb..e305718580e 100644 --- a/doc/administration/geo/replication/external_database.md +++ b/doc/administration/geo/replication/external_database.md @@ -45,13 +45,17 @@ Skip to the [Configure secondary application node](#configure-secondary-applicat The [geo_primary_role](https://docs.gitlab.com/omnibus/roles/#gitlab-geo-roles) configures the **primary** node's database to be replicated by making changes to `pg_hba.conf` and `postgresql.conf`. Make the following configuration changes -manually to your external database configuration: +manually to your external database configuration and ensure that you restart PostgreSQL +afterwards for the changes to take effect: ```plaintext ## ## Geo Primary Role ## - pg_hba.conf ## +host all all <trusted primary IP>/32 md5 +host replication gitlab_replicator <trusted primary IP>/32 md5 +host all all <trusted secondary IP>/32 md5 host replication gitlab_replicator <trusted secondary IP>/32 md5 ``` @@ -60,7 +64,6 @@ host replication gitlab_replicator <trusted secondary IP>/32 md5 ## Geo Primary Role ## - postgresql.conf ## -sql_replication_user = gitlab_replicator wal_level = hot_standby max_wal_senders = 10 wal_keep_segments = 50 @@ -72,8 +75,19 @@ hot_standby = on ### Manually configure the replica database -Make the following configuration changes manually to your `postgresql.conf` -of external replica database: +Make the following configuration changes manually to your `pg_hba.conf` and `postgresql.conf` +of your external replica database and ensure that you restart PostgreSQL afterwards +for the changes to take effect: + +```plaintext +## +## Geo Secondary Role +## - pg_hba.conf +## +host all all <trusted secondary IP>/32 md5 +host replication gitlab_replicator <trusted secondary IP>/32 md5 +host all all <trusted primary IP>/24 md5 +``` ```plaintext ## @@ -145,6 +159,19 @@ outbound rules do not apply to RDS PostgreSQL databases. Therefore, you need to rule to the read-replica's security group allowing any TCP traffic from the tracking database on port 5432. +1. Ensure that your secondary node can communicate with your tracking database by + manually changing the `pg_hba.conf` that is associated with your tracking database. + Remember to restart PostgreSQL afterwards for the changes to take effect: + + ```plaintext + ## + ## Geo Tracking Database Role + ## - pg_hba.conf + ## + host all all <trusted tracking IP>/32 md5 + host all all <trusted secondary IP>/32 md5 + ``` + 1. SSH into a GitLab **secondary** server and login as root: ```shell diff --git a/doc/administration/geo/replication/img/geo_node_dashboard.png b/doc/administration/geo/replication/img/geo_node_dashboard.png Binary files differindex 0d3dc5895af..53ca4767c5b 100644 --- a/doc/administration/geo/replication/img/geo_node_dashboard.png +++ b/doc/administration/geo/replication/img/geo_node_dashboard.png |
