From 6b35c735c9e70a07523df335c094d02dfd123bb2 Mon Sep 17 00:00:00 2001 From: Michele Cereda Date: Wed, 8 May 2024 19:01:10 +0200 Subject: [PATCH] fix(gitlab): complete set of commands for restore --- knowledge base/gitlab.md | 16 ++++++++++++++-- snippets/gitlab.omnibus.sh | 9 +++++++-- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/knowledge base/gitlab.md b/knowledge base/gitlab.md index 75bcb60..eea5c81 100644 --- a/knowledge base/gitlab.md +++ b/knowledge base/gitlab.md @@ -138,8 +138,20 @@ sudo gitlab-backup create … \ SKIP='db,repositories,uploads,builds,artifacts,pages,lfs,terraform_state,registry,packages,ci_secure_files' # Restore backups. -sudo gitlab-ctl stop 'puma' \ -&& sudo gitlab-ctl stop 'sidekiq' +sudo aws s3 cp 's3://backups/gitlab/gitlab-secrets.json' '/etc/gitlab/gitlab-secrets.json' \ +&& sudo aws s3 cp 's3://backups/gitlab/gitlab.rb' '/etc/gitlab/gitlab.rb' \ +&& sudo aws s3 cp \ + 's3://backups/gitlab/11493107454_2018_04_25_10.6.4-ce_gitlab_backup.tar' \ + '/var/opt/gitlab/backups/' \ +&& sudo gitlab-ctl stop 'puma' \ +&& sudo gitlab-ctl stop 'sidekiq' \ +&& sudo GITLAB_ASSUME_YES=1 gitlab-backup restore BACKUP='11493107454_2018_04_25_10.6.4-ce' \ +&& sudo gitlab-ctl restart \ +&& sudo gitlab-rake 'gitlab:check' SANITIZE=true \ +&& sudo gitlab-rake 'gitlab:doctor:secrets' \ +&& sudo gitlab-rake 'gitlab:artifacts:check' \ +&& sudo gitlab-rake 'gitlab:lfs:check' \ +&& sudo gitlab-rake 'gitlab:uploads:check' # Upgrade the package. sudo yum check-update diff --git a/snippets/gitlab.omnibus.sh b/snippets/gitlab.omnibus.sh index 64b25f6..f689dce 100644 --- a/snippets/gitlab.omnibus.sh +++ b/snippets/gitlab.omnibus.sh @@ -126,8 +126,13 @@ sudo aws s3 cp \ '/var/opt/gitlab/backups/' sudo gitlab-ctl stop 'puma' sudo gitlab-ctl stop 'sidekiq' -sudo gitlab-backup restore BACKUP='11493107454_2018_04_25_10.6.4-ce' -sudo gitlab-ctl start +sudo GITLAB_ASSUME_YES=1 gitlab-backup restore BACKUP='11493107454_2018_04_25_10.6.4-ce' +sudo gitlab-ctl restart +sudo gitlab-rake 'gitlab:check' SANITIZE=true +sudo gitlab-rake 'gitlab:doctor:secrets' +sudo gitlab-rake 'gitlab:artifacts:check' +sudo gitlab-rake 'gitlab:lfs:check' +sudo gitlab-rake 'gitlab:uploads:check' ## Restore backups - end ------------- #