diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-21 06:09:03 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-21 06:09:03 +0000 |
| commit | 25c07d7230471a8cc7062e83662a300fb4902fce (patch) | |
| tree | 801312092a7062aa2afbef142dbea04115ebae53 /doc/update | |
| parent | e1e342d79bcc1f72829cc6d1642f5e7d76750e75 (diff) | |
| download | gitlab-ce-25c07d7230471a8cc7062e83662a300fb4902fce.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/update')
| -rw-r--r-- | doc/update/mysql_to_postgresql.md | 4 | ||||
| -rw-r--r-- | doc/update/upgrading_postgresql_using_slony.md | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/update/mysql_to_postgresql.md b/doc/update/mysql_to_postgresql.md index fb1335acd7d..4be8210f376 100644 --- a/doc/update/mysql_to_postgresql.md +++ b/doc/update/mysql_to_postgresql.md @@ -142,7 +142,7 @@ new PostgreSQL one: sudo -u gitlab-psql pgloader commands.load ``` -1. Once the migration finishes, you should see a summary table that looks like +1. After the migration finishes, you should see a summary table that looks like the following: ```plaintext @@ -243,7 +243,7 @@ new PostgreSQL one: sudo -u postgres pgloader commands.load ``` -1. Once the migration finishes, you should see a summary table that looks like +1. After the migration finishes, you should see a summary table that looks like the following: ```plaintext diff --git a/doc/update/upgrading_postgresql_using_slony.md b/doc/update/upgrading_postgresql_using_slony.md index c5dd6cf16b7..c9f8f83749c 100644 --- a/doc/update/upgrading_postgresql_using_slony.md +++ b/doc/update/upgrading_postgresql_using_slony.md @@ -40,7 +40,7 @@ If you're not using the Omnibus GitLab package you may have to adjust the paths `pg_dump` and the PostgreSQL installation directory to match the paths of your configuration. -Once the structure dump is generated we also need to generate a dump for the +After the structure dump is generated we also need to generate a dump for the `schema_migrations` table. This table doesn't have any primary keys and as such can't be replicated easily by Slony. To generate this dump run the following command on your active database server: @@ -210,7 +210,7 @@ this output, don't just append it below it. The result looks like this: ] ``` -Once you have the configuration file generated you must install it on both the +After you have the configuration file generated you must install it on both the old and new database. To do so, place it in `/var/opt/gitlab/postgresql/slony/slon_tools.conf` (for which we created the directory earlier on). @@ -218,7 +218,7 @@ directory earlier on). Now that the configuration file is in place we can _finally_ start replicating our database. First we must set up the schema in our new database. To do so make sure that the SQL files we generated earlier can be found in the `/tmp` -directory of the new server. Once these files are in place start a `psql` +directory of the new server. After these files are in place start a `psql` session on this server: ```shell |