summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2016-07-29 07:28:34 -0700
committerStan Hu <stanhu@gmail.com>2016-07-29 07:32:37 -0700
commit7658f31a621f6ebc97af5c21802854ed56b0bd0f (patch)
tree78c2ae4af815dc32d0bc826f3a66bdfea804a4e0
parenta330b29b701b2de49206f864e654a01ad1a031c7 (diff)
downloadgitlab-ce-7658f31a621f6ebc97af5c21802854ed56b0bd0f.tar.gz
Clarify backup_keep_time config parameter with S3clarify-backup-keep-time
Discussed in gitlab-org/omnibus-gitlab#1453 [ci skip]
-rw-r--r--doc/raketasks/backup_restore.md7
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/raketasks/backup_restore.md b/doc/raketasks/backup_restore.md
index fa976134341..5fa96736d59 100644
--- a/doc/raketasks/backup_restore.md
+++ b/doc/raketasks/backup_restore.md
@@ -382,6 +382,13 @@ backups using all your disk space. To do this add the following lines to
gitlab_rails['backup_keep_time'] = 604800
```
+Note that the `backup_keep_time` configuration option only manages local
+files. GitLab does not automatically prune old files stored in a third-party
+object storage (e.g. AWS S3) because the user may not have permission to list
+and delete files. We recommend that you configure the appropriate retention
+policy for your object storage. For example, you can configure [the S3 backup
+policy here as described here](http://stackoverflow.com/questions/37553070/gitlab-omnibus-delete-backup-from-amazon-s3).
+
NOTE: This cron job does not [backup your omnibus-gitlab configuration](#backup-and-restore-omnibus-gitlab-configuration) or [SSH host keys](https://superuser.com/questions/532040/copy-ssh-keys-from-one-server-to-another-server/532079#532079).
## Alternative backup strategies