summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Jones <brad@bradjonesllc.com>2016-08-11 20:38:43 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-10-25 22:27:57 +0200
commit723e5d65d6985d355a689c1a963d4d1242564c2f (patch)
tree9316cbeca67578211f288de6419c64b0e8284f7c
parent279ffe7bff112a86454bd37ce4023bf415205822 (diff)
downloadgitlab-ce-723e5d65d6985d355a689c1a963d4d1242564c2f.tar.gz
Specify which Fog storage drivers are imported by default in backup_restore.mdbradjones1/gitlab-ce-patch-3
-rw-r--r--doc/raketasks/backup_restore.md7
1 files changed, 5 insertions, 2 deletions
diff --git a/doc/raketasks/backup_restore.md b/doc/raketasks/backup_restore.md
index fc0cd1b8af2..0ad84705cfd 100644
--- a/doc/raketasks/backup_restore.md
+++ b/doc/raketasks/backup_restore.md
@@ -85,8 +85,11 @@ Deleting old backups... [SKIPPING]
Starting with GitLab 7.4 you can let the backup script upload the '.tar' file it creates.
It uses the [Fog library](http://fog.io/) to perform the upload.
-In the example below we use Amazon S3 for storage.
-Fog also supports [other storage providers](http://fog.io/storage/).
+In the example below we use Amazon S3 for storage, but Fog also lets you use
+[other storage providers](http://fog.io/storage/). GitLab
+[imports cloud drivers](https://gitlab.com/gitlab-org/gitlab-ce/blob/30f5b9a5b711b46f1065baf755e413ceced5646b/Gemfile#L88)
+for AWS, Azure, Google, OpenStack Swift and Rackspace as well. A local driver is
+[also available](#uploading-to-locally-mounted-shares).
For omnibus packages: