Merge branch 'mk/update-backup-restore-doc-links' into 'master'

Update backup and restore doc links

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7195

Merged-by: Robert Marshall <[email protected]>
Approved-by: Robert Marshall <[email protected]>
Approved-by: Achilleas Pipinellis <[email protected]>
Co-authored-by: Mike Kozono <[email protected]>

Author: Robert Marshall

README.md

@@ -208,15 +208,15 @@ See [doc/settings/backups.md](doc/settings/backups.md#creating-an-application-ba
 
 ### Restoring an application backup
 
-See [backup restore documentation](https://docs.gitlab.com/ee/raketasks/backup_restore.html#omnibus-installations).
+See [restore documentation](https://docs.gitlab.com/ee/administration/backup_restore/restore_gitlab.html#restore-for-linux-package-installations).
 
 ### Backup and restore using non-packaged database
 
 If you are using non-packaged database see [documentation on using non-packaged database](doc/settings/database.md#using-a-non-packaged-postgresql-database-management-server).
 
 ### Upload backups to remote (cloud) storage
 
-For details check [backup restore document of GitLab CE](https://gitlab.com/gitlab-org/gitlab-foss/blob/966f68b33e1f15f08e383ec68346ed1bd690b59b/doc/raketasks/backup_restore.md#upload-backups-to-remote-cloud-storage).
+For details check [backup documentation](https://docs.gitlab.com/ee/administration/backup_restore/backup_gitlab.html#upload-backups-to-a-remote-cloud-storage).
 
 ## Invoking Rake tasks
 

doc/jihu_edition.md

@@ -64,7 +64,7 @@ To update EE to JH:
 
 - If you installed GitLab using a deb/rpm package:
 
-  1. Take a [backup](https://docs.gitlab.com/ee/raketasks/backup_restore.html#back-up-gitlab).
+  1. Take a [backup](https://docs.gitlab.com/ee/administration/backup_restore/backup_gitlab.html).
   1. Find the currently installed GitLab version:
 
      **For Debian/Ubuntu**

doc/settings/backups.md

@@ -67,7 +67,7 @@ Your machines SSH host keys are stored in a separate location at `/etc/ssh/`. Be
 > [Introduced](https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/5102) in GitLab 13.12.
 
 GitLab configuration backups can be pruned using the same `backup_keep_time` setting that is
-[used for the GitLab application backups](https://docs.gitlab.com/ee/raketasks/backup_restore.html#limit-backup-lifetime-for-local-files-prune-old-backups)
+[used for the GitLab application backups](https://docs.gitlab.com/ee/administration/backup_restore/backup_gitlab.html#limit-backup-lifetime-for-local-files-prune-old-backups)
 
 To make use of this setting, edit `/etc/gitlab/gitlab.rb`:
 
@@ -105,7 +105,7 @@ lost/leaked/stolen together with the keys needed to decrypt it.
 ## Creating an application backup
 
 To create a backup of your repositories and GitLab metadata, follow the
-[backup create documentation](https://docs.gitlab.com/ee/raketasks/backup_restore.html).
+[backup create documentation](https://docs.gitlab.com/ee/administration/backup_restore/backup_gitlab.html).
 
 Backup create will store a tar file in `/var/opt/gitlab/backups`.
 
@@ -120,7 +120,7 @@ gitlab_rails['backup_path'] = '/mnt/backups'
 ## Creating backups for GitLab instances in Docker containers
 
 WARNING:
-The backup command requires [additional parameters](https://docs.gitlab.com/ee/raketasks/backup_restore.html#backup-and-restore-for-installations-using-pgbouncer)
+The backup command requires [additional parameters](https://docs.gitlab.com/ee/administration/backup_restore/backup_gitlab.html#back-up-and-restore-for-installations-using-pgbouncer)
 when your installation is using PgBouncer, for either performance reasons or when using it with a Patroni cluster.
 
 Backups can be scheduled on the host by prepending `docker exec -t <your container name>` to the commands.
@@ -152,15 +152,15 @@ To persist these backups outside the container, mount volumes in the following d
 
 ## Restoring an application backup
 
-See [backup restore documentation](https://docs.gitlab.com/ee/raketasks/backup_restore.html#restore-for-omnibus-installations).
+See [restore documentation](https://docs.gitlab.com/ee/administration/backup_restore/restore_gitlab.html).
 
 ## Backup and restore using non-packaged database
 
 If you are using non-packaged database see [documentation on using non-packaged database](database.md#using-a-non-packaged-postgresql-database-management-server).
 
 ## Upload backups to remote (cloud) storage
 
-For details check [backup restore document](https://docs.gitlab.com/ee/raketasks/backup_restore.html#uploading-backups-to-a-remote-cloud-storage).
+For details check [backup documentation](https://docs.gitlab.com/ee/administration/backup_restore/backup_gitlab.html#upload-backups-to-a-remote-cloud-storage).
 
 ## Manually manage backup directory
 

doc/settings/database.md

@@ -719,7 +719,9 @@ both the root and intermediate certificates.
 
 ### Backup and restore a non-packaged PostgreSQL database
 
-When using the [Rake backup create and restore task](https://docs.gitlab.com/ee/raketasks/backup_restore.html#create-a-backup-of-the-gitlab-system), GitLab will
+When using the [backup](https://docs.gitlab.com/ee/administration/backup_restore/backup_gitlab.html#backup-command)
+and [restore](https://docs.gitlab.com/ee/administration/backup_restore/restore_gitlab.html#restore-for-linux-package-installations)
+commands, GitLab will
 attempt to use the packaged `pg_dump` command to create a database backup file
 and the packaged `psql` command to restore a backup. This will only work if
 they are the correct versions. Check the versions of the packaged `pg_dump` and
@@ -730,7 +732,7 @@ they are the correct versions. Check the versions of the packaged `pg_dump` and
 /opt/gitlab/embedded/bin/psql --version
 ```
 
-If these versions are different from your non-packaged external PostgreSQL, you may encounter the following error output when attempting to run a [Rake backup create task](https://docs.gitlab.com/ee/raketasks/backup_restore.html#create-a-backup-of-the-gitlab-system):
+If these versions are different from your non-packaged external PostgreSQL, you may encounter the following error output when attempting to run the [backup command](https://docs.gitlab.com/ee/administration/backup_restore/backup_gitlab.html#backup-command).
 
 ```plaintext
 Dumping PostgreSQL database gitlabhq_production ... pg_dump: error: server version: 13.3; pg_dump version: 12.6
@@ -762,8 +764,8 @@ these steps, using the correct path to the location you installed the new tools:
    They should now be the same as your non-packaged external PostgreSQL.
 
 After this is done, ensure that the backup and restore tasks are using the
-correct executables by running both the [backup](https://docs.gitlab.com/ee/raketasks/backup_restore.html#create-a-backup-of-the-gitlab-system) and
-[restore](https://docs.gitlab.com/ee/raketasks/backup_restore.html#restore-a-previously-created-backup) tasks.
+correct executables by running both the [backup](https://docs.gitlab.com/ee/administration/backup_restore/backup_gitlab.html#backup-command) and
+[restore](https://docs.gitlab.com/ee/administration/backup_restore/restore_gitlab.html#restore-for-linux-package-installations) commands.
 
 ### Upgrade a non-packaged PostgreSQL database
 
@@ -784,7 +786,7 @@ Before proceeding with the upgrade, note the following:
     The Linux package is tested for compatibility with the major releases of PostgreSQL that it ships with.
 - When using GitLab backup or restore, you _must_ keep the same version of GitLab.
   If you plan to upgrade to a later GitLab version as well, upgrade PostgreSQL first.
-- The [backup and restore Rake task](https://docs.gitlab.com/ee/raketasks/backup_restore.html#create-a-backup-of-the-gitlab-system)
+- The [backup and restore commands](https://docs.gitlab.com/ee/administration/backup_restore/backup_gitlab.html#backup-command)
   can be used to back up and restore the database to a later version of PostgreSQL.
 - If a PostgreSQL version is specified with `postgresql['version']` that doesn't ship
   with that Linux package release, the
@@ -816,7 +818,7 @@ The following example demonstrates upgrading from a database host running Postgr
    ```
 
 WARNING:
-The backup command requires [additional parameters](https://docs.gitlab.com/ee/raketasks/backup_restore.html#backup-and-restore-for-installations-using-pgbouncer)
+The backup command requires [additional parameters](https://docs.gitlab.com/ee/administration/backup_restore/backup_gitlab.html#back-up-and-restore-for-installations-using-pgbouncer)
 when your installation is using PgBouncer.
 
 1. Run the backup Rake task using the SKIP options to back up only the database.
@@ -838,14 +840,14 @@ when your installation is using PgBouncer.
    ```
 
    WARNING:
-   The backup command requires [additional parameters](https://docs.gitlab.com/ee/raketasks/backup_restore.html#backup-and-restore-for-installations-using-pgbouncer)
+   The backup command requires [additional parameters](https://docs.gitlab.com/ee/administration/backup_restore/backup_gitlab.html#back-up-and-restore-for-installations-using-pgbouncer)
    when your installation is using PgBouncer.
 
 1. Restore the database using the database backup file created earlier, and be
    sure to answer **no** when asked "This task will now rebuild the authorized_keys file":
 
    ```shell
-   # Use the backup timestamp https://docs.gitlab.com/ee/raketasks/backup_restore.html#backup-timestamp
+   # Use the backup timestamp https://docs.gitlab.com/ee/administration/backup_restore/backup_gitlab.html#backup-timestamp
    sudo gitlab-backup restore BACKUP=<backup-timestamp>
    ```
 

doc/update/convert_to_omnibus.md

@@ -24,7 +24,7 @@ To convert your installation to using the Linux package:
 
 1. [Install GitLab using a Linux package](https://about.gitlab.com/install/).
 1. Copy the backup file to the directory `/var/opt/gitlab/backups/` of the new server.
-1. Restore the backup in the new installation ([detailed instructions](https://docs.gitlab.com/ee/raketasks/backup_restore.html#restore-for-omnibus-gitlab-installations)):
+1. Restore the backup in the new installation ([detailed instructions](https://docs.gitlab.com/ee/administration/backup_restore/restore_gitlab.html#restore-for-linux-package-installations)):
 
    ```shell
    # This command will overwrite the contents of your GitLab database!

files/gitlab-config-template/gitlab.rb.template

@@ -606,7 +606,7 @@ external_url 'GENERATED_EXTERNAL_URL'
 # gitlab_rails['backup_path'] = "/var/opt/gitlab/backups"
 # gitlab_rails['backup_gitaly_backup_path'] = "/opt/gitlab/embedded/bin/gitaly-backup"
 
-###! Docs: https://docs.gitlab.com/ee/raketasks/backup_restore.html#backup-archive-permissions
+###! Docs: https://docs.gitlab.com/ee/administration/backup_restore/backup_gitlab.html#backup-archive-permissions
 # gitlab_rails['backup_archive_permissions'] = 0644
 
 # gitlab_rails['backup_pg_schema'] = 'public'
@@ -644,7 +644,7 @@ external_url 'GENERATED_EXTERNAL_URL'
 # gitlab_rails['backup_storage_class'] = 'STANDARD'
 
 ###! Skip parts of the backup. Comma separated.
-###! Docs: https://docs.gitlab.com/ee/raketasks/backup_restore.html#excluding-specific-directories-from-the-backup
+###! Docs: https://docs.gitlab.com/ee/administration/backup_restore/backup_gitlab.html#excluding-specific-directories-from-the-backup
 #gitlab_rails['env'] = {
 #    "SKIP" => "db,uploads,repositories,builds,artifacts,lfs,registry,pages"
 #}