summaryrefslogtreecommitdiff
path: root/lib/backup
diff options
context:
space:
mode:
authorPepijn Van Eeckhoudt <pepijn@vaneeckhoudt.net>2019-01-09 16:39:20 +0000
committerJames Lopez <james@gitlab.com>2019-01-09 16:39:20 +0000
commit1b3ffdf250e2fc632765aef2d003d1ea29f66977 (patch)
tree9895345ba5aa38d04712fb44b37661174c809c26 /lib/backup
parent00ac520e2025d79ce4c51650e6312ce043bfab1f (diff)
downloadgitlab-ce-1b3ffdf250e2fc632765aef2d003d1ea29f66977.tar.gz
Add SSE-C key configuration option for Amazon S3 remote backups
Diffstat (limited to 'lib/backup')
-rw-r--r--lib/backup/manager.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/backup/manager.rb b/lib/backup/manager.rb
index 0add2b3f875..06b0338b1ed 100644
--- a/lib/backup/manager.rb
+++ b/lib/backup/manager.rb
@@ -50,6 +50,7 @@ module Backup
if directory.files.create(key: remote_target, body: File.open(tar_file), public: false,
multipart_chunk_size: Gitlab.config.backup.upload.multipart_chunk_size,
encryption: Gitlab.config.backup.upload.encryption,
+ encryption_key: Gitlab.config.backup.upload.encryption_key,
storage_class: Gitlab.config.backup.upload.storage_class)
progress.puts "done".color(:green)
else