diff options
| author | Marcia Ramos <virtua.creative@gmail.com> | 2018-11-27 16:35:19 +0000 |
|---|---|---|
| committer | Marcia Ramos <virtua.creative@gmail.com> | 2018-11-27 16:35:19 +0000 |
| commit | 8a6c2c97dfd51d619f884f658a115ef148ee490d (patch) | |
| tree | e503f337d148dff4a518f88061122127455be42a | |
| parent | e7baa35e23a67e333e0133dbbc76b1a6f908ebd2 (diff) | |
| parent | 6c6883da4ea4ff379a435d0de27e05dde53a582d (diff) | |
| download | gitlab-ce-8a6c2c97dfd51d619f884f658a115ef148ee490d.tar.gz | |
Merge branch 'docs/skip-auto-reconfigure' into 'master'
Replace deprecated skip-auto-migrations occurrence
Closes #45031
See merge request gitlab-org/gitlab-ce!23326
| -rw-r--r-- | doc/administration/high_availability/gitlab.md | 2 | ||||
| -rw-r--r-- | doc/administration/high_availability/redis.md | 4 | ||||
| -rw-r--r-- | doc/development/db_dump.md | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/administration/high_availability/gitlab.md b/doc/administration/high_availability/gitlab.md index f16ae835ced..2ca860bd763 100644 --- a/doc/administration/high_availability/gitlab.md +++ b/doc/administration/high_availability/gitlab.md @@ -118,7 +118,7 @@ need some extra configuration. gitlab_rails['db_key_base'] = 'bf2e47b68d6cafaef1d767e628b619365becf27571e10f196f98dc85e7771042b9203199d39aff91fcb6837c8ed83f2a912b278da50999bb11a2fbc0fba52964' ``` -1. Run `touch /etc/gitlab/skip-auto-migrations` to prevent database migrations +1. Run `touch /etc/gitlab/skip-auto-reconfigure` to prevent database migrations from running on upgrade. Only the primary GitLab application server should handle migrations. diff --git a/doc/administration/high_availability/redis.md b/doc/administration/high_availability/redis.md index a9ba40c870c..833c1f367dd 100644 --- a/doc/administration/high_availability/redis.md +++ b/doc/administration/high_availability/redis.md @@ -336,7 +336,7 @@ The prerequisites for a HA Redis setup are the following: 1. To prevent database migrations from running on upgrade, run: ``` - sudo touch /etc/gitlab/skip-auto-migrations + sudo touch /etc/gitlab/skip-auto-reconfigure ``` Only the primary GitLab application server should handle migrations. @@ -458,7 +458,7 @@ multiple machines with the Sentinel daemon. 1. To prevent database migrations from running on upgrade, run: ``` - sudo touch /etc/gitlab/skip-auto-migrations + sudo touch /etc/gitlab/skip-auto-reconfigure ``` Only the primary GitLab application server should handle migrations. diff --git a/doc/development/db_dump.md b/doc/development/db_dump.md index e4ff72aa349..97762a62a80 100644 --- a/doc/development/db_dump.md +++ b/doc/development/db_dump.md @@ -13,7 +13,7 @@ large database imports. ``` # On STAGING echo "postgresql['checkpoint_segments'] = 64" | sudo tee -a /etc/gitlab/gitlab.rb -sudo touch /etc/gitlab/skip-auto-migrations +sudo touch /etc/gitlab/skip-auto-reconfigure sudo gitlab-ctl reconfigure sudo gitlab-ctl stop unicorn sudo gitlab-ctl stop sidekiq |