Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
7ba31486
Commit
7ba31486
authored
Feb 17, 2019
by
Merve
Committed by
Evan Read
Feb 17, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Doc: change IP addresses
parent
df03c939
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
26 deletions
+26
-26
doc/administration/geo/disaster_recovery/index.md
doc/administration/geo/disaster_recovery/index.md
+3
-3
doc/administration/geo/replication/database.md
doc/administration/geo/replication/database.md
+14
-14
doc/administration/geo/replication/database_source.md
doc/administration/geo/replication/database_source.md
+9
-9
No files found.
doc/administration/geo/disaster_recovery/index.md
View file @
7ba31486
...
...
@@ -243,10 +243,10 @@ and after that you also need two extra steps.
##
# Primary and Secondary addresses
# - replace '1
.2.3.4' with the primary public or VPC address
# - replace '
5.6.7.8' with the secondary public or VPC address
# - replace '1
98.51.100.1' with the public or VPC address of your Geo primary node
# - replace '
198.51.100.2' with the public or VPC address of your Geo secondary node
##
postgresql['md5_auth_cidr_addresses'] = ['1
.2.3.4/32', '5.6.7.8
/32']
postgresql['md5_auth_cidr_addresses'] = ['1
98.51.100.1/32', '198.51.100.2
/32']
# Every secondary server needs to have its own slot so specify the number of secondary nodes you're going to have
postgresql['max_replication_slots'] = 1
...
...
doc/administration/geo/replication/database.md
View file @
7ba31486
...
...
@@ -45,8 +45,8 @@ The following guide assumes that:
replicating from), running Omnibus' PostgreSQL (or equivalent version), and
you have a new
**secondary**
server set up with the same versions of the OS,
PostgreSQL, and GitLab on all nodes.
-
The IP of the
**primary**
server for our examples
will be
`1.2.3.4
`
, whereas the
**secondary**
node's IP
will be
`5.6.7.8
`
. Note that the
**primary**
and
**secondary**
servers
-
The IP of the
**primary**
server for our examples
is
`198.51.100.1
`
, whereas the
**secondary**
node's IP
is
`198.51.100.2
`
. Note that the
**primary**
and
**secondary**
servers
**must**
be able to communicate over these addresses. More on this in the
guide below.
...
...
@@ -170,16 +170,16 @@ There is an [issue where support is being discussed](https://gitlab.com/gitlab-o
##
## Primary address
## - replace '1
.2.3.4' with the primary public or VPC address
## - replace '1
98.51.100.1' with the public or VPC address of your Geo primary node
##
postgresql['listen_address'] = '1
.2.3.4
'
postgresql['listen_address'] = '1
98.51.100.1
'
##
# Primary and Secondary addresses
# - replace '1
.2.3.4' with the primary public or VPC address
# - replace '
5.6.7.8' with the secondary public or VPC address
# - replace '1
98.51.100.1' with the public or VPC address of your Geo primary node
# - replace '
198.51.100.2' with the public or VPC address of your Geo secondary node
##
postgresql['md5_auth_cidr_addresses'] = ['1
.2.3.4/32','5.6.7.8
/32']
postgresql['md5_auth_cidr_addresses'] = ['1
98.51.100.1/32','198.51.100.2
/32']
##
## Replication settings
...
...
@@ -199,7 +199,7 @@ There is an [issue where support is being discussed](https://gitlab.com/gitlab-o
1.
Optional: If you want to add another
**secondary**
node, the relevant setting would look like:
```ruby
postgresql['md5_auth_cidr_addresses'] = ['1
.2.3.4/32', '5.6.7.8/32','9.10.11.12
/32']
postgresql['md5_auth_cidr_addresses'] = ['1
98.51.100.1/32', '198.51.100.2/32','198.51.100.3
/32']
```
You may also want to edit the `wal_keep_segments` and `max_wal_senders` to
...
...
@@ -274,7 +274,7 @@ There is an [issue where support is being discussed](https://gitlab.com/gitlab-o
1.
[
Check TCP connectivity
][
rake-maintenance
]
to the
**primary**
node's PostgreSQL server:
```sh
gitlab-rake gitlab:tcp_check[1
.2.3.4
,5432]
gitlab-rake gitlab:tcp_check[1
98.51.100.1
,5432]
```
NOTE: **Note**:
...
...
@@ -305,7 +305,7 @@ There is an [issue where support is being discussed](https://gitlab.com/gitlab-o
1.
Test that the
`gitlab-psql`
user can connect to the
**primary**
node's database:
```sh
sudo -u gitlab-psql /opt/gitlab/embedded/bin/psql --list -U gitlab_replicator -d "dbname=gitlabhq_production sslmode=verify-ca" -W -h 1
.2.3.4
sudo -u gitlab-psql /opt/gitlab/embedded/bin/psql --list -U gitlab_replicator -d "dbname=gitlabhq_production sslmode=verify-ca" -W -h 1
98.51.100.1
```
When prompted enter the password you set in the first step for the
...
...
@@ -333,10 +333,10 @@ There is an [issue where support is being discussed](https://gitlab.com/gitlab-o
##
## Secondary address
## - replace '
5.6.7.8' with the secondary public or VPC address
## - replace '
198.51.100.2' with the public or VPC address of your Geo secondary node
##
postgresql['listen_address'] = '
5.6.7.8
'
postgresql['md5_auth_cidr_addresses'] = ['
5.6.7.8
/32']
postgresql['listen_address'] = '
198.51.100.2
'
postgresql['md5_auth_cidr_addresses'] = ['
198.51.100.2
/32']
##
## Database credentials password (defined previously in primary node)
...
...
@@ -399,7 +399,7 @@ data before running `pg_basebackup`.
Using the same slot name between two secondaries will break PostgreSQL replication.
```sh
gitlab-ctl replicate-geo-database --slot-name=secondary_example --host=1
.2.3.4
gitlab-ctl replicate-geo-database --slot-name=secondary_example --host=1
98.51.100.1
```
When prompted, enter the _plaintext_ password you set up for the `gitlab_replicator`
...
...
doc/administration/geo/replication/database_source.md
View file @
7ba31486
...
...
@@ -39,8 +39,8 @@ The following guide assumes that:
replicating from), running PostgreSQL 9.6 or later, and
you have a new
**secondary**
server set up with the same versions of the OS,
PostgreSQL, and GitLab on all nodes.
-
The IP of the
**primary**
server for our examples
will be
`1.2.3.4
`
, whereas the
**secondary**
node's IP
will be
`5.6.7.8
`
. Note that the
**primary**
and
**secondary**
servers
-
The IP of the
**primary**
server for our examples
is
`198.51.100.1
`
, whereas the
**secondary**
node's IP
is
`198.51.100.2
`
. Note that the
**primary**
and
**secondary**
servers
**must**
be able to communicate over these addresses. These IP addresses can either
be public or private.
...
...
@@ -137,7 +137,7 @@ There is an [issue where support is being discussed](https://gitlab.com/gitlab-o
(for Debian/Ubuntu that would be
`/etc/postgresql/9.x/main/postgresql.conf`
):
```
listen_address = '1
.2.3.4
'
listen_address = '1
98.51.100.1
'
wal_level = hot_standby
max_wal_senders = 5
min_wal_size = 80MB
...
...
@@ -171,19 +171,19 @@ There is an [issue where support is being discussed](https://gitlab.com/gitlab-o
`/etc/postgresql/9.x/main/pg_hba.conf`
):
```sh
host all all 1
.2.3.4
/32 md5
host replication gitlab_replicator
5.6.7.8
/32 md5
host all all 1
98.51.100.1
/32 md5
host replication gitlab_replicator
198.51.100.2
/32 md5
```
Where `1
.2.3.4` is the public IP address of the **primary** server, and `5.6.7.8
`
Where `1
98.51.100.1` is the public IP address of the **primary** server, and `198.51.100.2
`
the public IP address of the **secondary** one. If you want to add another
secondary, add one more row like the replication one and change the IP
address:
```sh
host all all 1
.2.3.4
/32 md5
host replication gitlab_replicator
5.6.7.8
/32 md5
host replication gitlab_replicator 1
1.22.33.44
/32 md5
host all all 1
98.51.100.1
/32 md5
host replication gitlab_replicator
198.51.100.2
/32 md5
host replication gitlab_replicator 1
98.51.100.3
/32 md5
```
1.
Restart PostgreSQL for the changes to take effect.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment