summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-08-01 06:44:04 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-08-01 06:44:04 +0000
commitdc775b0a9131cea6be5ae6b0ec3fba662af26b42 (patch)
treea02d795b296f96611cb5c7fd00cd8b4433e0ebbe
parent740aef9c0f44d34962f188d5e24b29e2c77db478 (diff)
parent7658f31a621f6ebc97af5c21802854ed56b0bd0f (diff)
downloadgitlab-ce-dc775b0a9131cea6be5ae6b0ec3fba662af26b42.tar.gz
Merge branch 'clarify-backup-keep-time' into 'master'
Clarify backup_keep_time config parameter with S3 Discussed in gitlab-org/omnibus-gitlab#1453 See merge request !5567
-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