summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2019-05-09 09:35:59 +0000
committerRémy Coutable <remy@rymai.me>2019-05-09 09:35:59 +0000
commit615e57c7c51849493b87a9c2a9c0abdc00404201 (patch)
tree4f073b6ea72aec13d8346b95dbd47abd75b70642
parent16d4eeb217beecd1a7e4920167de819746e93244 (diff)
parentdeb5276f8bdc54ee4e6fe3f5aa02ca18c7482e77 (diff)
downloadgitlab-ce-615e57c7c51849493b87a9c2a9c0abdc00404201.tar.gz
Merge branch 'add-warning-to-backup-rake-task' into 'master'
Add warning that gitlab-secrets isn't included See merge request gitlab-org/gitlab-ce!28187
-rw-r--r--changelogs/unreleased/add-warning-to-backup-rake-task.yml5
-rw-r--r--lib/tasks/gitlab/backup.rake8
2 files changed, 13 insertions, 0 deletions
diff --git a/changelogs/unreleased/add-warning-to-backup-rake-task.yml b/changelogs/unreleased/add-warning-to-backup-rake-task.yml
new file mode 100644
index 00000000000..7ddeae3f9fd
--- /dev/null
+++ b/changelogs/unreleased/add-warning-to-backup-rake-task.yml
@@ -0,0 +1,5 @@
+---
+title: Add warning that gitlab-secrets isn't included in backup
+merge_request:
+author:
+type: other
diff --git a/lib/tasks/gitlab/backup.rake b/lib/tasks/gitlab/backup.rake
index 3977fc7ad8c..c531eb1d216 100644
--- a/lib/tasks/gitlab/backup.rake
+++ b/lib/tasks/gitlab/backup.rake
@@ -20,6 +20,11 @@ namespace :gitlab do
backup.pack
backup.cleanup
backup.remove_old
+
+ puts "Warning: Your gitlab.rb and gitlab-secrets.json files contain sensitive data \n" \
+ "and are not included in this backup. You will need these files to restore a backup.\n" \
+ "Please back them up manually.".color(:red)
+ puts "Backup task is done."
end
# Restore backup of GitLab system
@@ -68,6 +73,9 @@ namespace :gitlab do
Rake::Task['cache:clear'].invoke
backup.cleanup
+ puts "Warning: Your gitlab.rb and gitlab-secrets.json files contain sensitive data \n" \
+ "and are not included in this backup. You will need to restore these files manually.".color(:red)
+ puts "Restore task is done."
end
namespace :repo do