From a5aff0244c8bac3235392434645815f178b12025 Mon Sep 17 00:00:00 2001 From: John Parker Date: Sat, 14 Jan 2012 12:27:58 -0800 Subject: [PATCH] added support for server-side encryption on s3 --- lib/fog/aws/models/storage/file.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/fog/aws/models/storage/file.rb b/lib/fog/aws/models/storage/file.rb index 10878608c..669307251 100644 --- a/lib/fog/aws/models/storage/file.rb +++ b/lib/fog/aws/models/storage/file.rb @@ -21,6 +21,7 @@ module Fog attribute :metadata attribute :owner, :aliases => 'Owner' attribute :storage_class, :aliases => ['x-amz-storage-class', 'StorageClass'] + attribute :encryption, :aliases => 'x-amz-server-side-encryption' def acl=(new_acl) valid_acls = ['private', 'public-read', 'public-read-write', 'authenticated-read'] @@ -115,6 +116,7 @@ module Fog options['Expires'] = expires if expires options.merge!(metadata) options['x-amz-storage-class'] = storage_class if storage_class + options['x-amz-server-side-encryption'] = encryption if encryption data = connection.put_object(directory.key, key, body, options) data.headers['ETag'].gsub!('"','')