summaryrefslogtreecommitdiff
path: root/doc/raketasks
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-07-08 15:09:24 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-07-08 15:09:24 +0000
commit833d57e60da633435d845a7867e46e6092c46520 (patch)
tree35676d3a0da36ef28b67cadb06af474b6c8f5b85 /doc/raketasks
parentc52b72f5772d52e9fc85bd9f4e8b8497a6278c37 (diff)
downloadgitlab-ce-833d57e60da633435d845a7867e46e6092c46520.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/raketasks')
-rw-r--r--doc/raketasks/backup_restore.md8
1 files changed, 7 insertions, 1 deletions
diff --git a/doc/raketasks/backup_restore.md b/doc/raketasks/backup_restore.md
index 569ee48e282..c10dac2750c 100644
--- a/doc/raketasks/backup_restore.md
+++ b/doc/raketasks/backup_restore.md
@@ -458,7 +458,13 @@ For Omnibus GitLab packages:
gitlab_rails['backup_upload_connection'] = {
'provider' => 'Google',
'google_storage_access_key_id' => 'Access Key',
- 'google_storage_secret_access_key' => 'Secret'
+ 'google_storage_secret_access_key' => 'Secret',
+
+ ## If you have CNAME buckets (foo.example.com), you might run into SSL issues
+ ## when uploading backups ("hostname foo.example.com.storage.googleapis.com
+ ## does not match the server certificate"). In that case, uncomnent the following
+ ## setting. See: https://github.com/fog/fog/issues/2834
+ #'path_style' => true
}
gitlab_rails['backup_upload_remote_directory'] = 'my.google.bucket'
```