From f6026ad1d0274b2ddfdea46b0fab74f6c0f714d6 Mon Sep 17 00:00:00 2001
From: jaanus <jaanus@gmail.com>
Date: Mon, 29 Dec 2014 18:31:21 +0200
Subject: [PATCH] Added eu-central-1 S3 bucket.

---
 Gemfile                                    |  2 +-
 Gemfile.lock                               | 65 +++++++++++++++++++---
 app/models/s3_region_site_setting.rb       |  1 +
 spec/models/s3_region_site_setting_spec.rb |  2 +-
 4 files changed, 60 insertions(+), 10 deletions(-)

diff --git a/Gemfile b/Gemfile
index 033dbbac3e4..b200869527e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -117,7 +117,7 @@ gem 'fast_xs'
 
 gem 'fast_xor'
 gem 'fastimage'
-gem 'fog', '1.22.1', require: false
+gem 'fog', '1.26.0', require: false
 gem 'unf', require: false
 
 gem 'email_reply_parser'
diff --git a/Gemfile.lock b/Gemfile.lock
index cd0beb92b20..92cf8738b89 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,6 +6,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    CFPropertyList (2.2.8)
     actionmailer (4.1.8)
       actionpack (= 4.1.8)
       actionview (= 4.1.8)
@@ -81,7 +82,7 @@ GEM
       handlebars-source (~> 2.0)
     erubis (2.7.0)
     eventmachine (1.0.4)
-    excon (0.39.6)
+    excon (0.42.1)
     execjs (2.2.2)
     exifr (1.1.3)
     fabrication (2.9.8)
@@ -99,27 +100,75 @@ GEM
     fastimage (1.6.3)
       addressable (~> 2.3, >= 2.3.5)
     ffi (1.9.6)
+    fission (0.5.0)
+      CFPropertyList (~> 2.2)
     flamegraph (0.1.0)
       fast_stack
-    fog (1.22.1)
-      fog-brightbox
-      fog-core (~> 1.22)
+    fog (1.26.0)
+      fog-atmos
+      fog-brightbox (~> 0.4)
+      fog-core (~> 1.27, >= 1.27.1)
+      fog-ecloud
       fog-json
+      fog-profitbricks
+      fog-radosgw (>= 0.0.2)
+      fog-sakuracloud (>= 0.0.4)
+      fog-softlayer
+      fog-storm_on_demand
+      fog-terremark
+      fog-vmfusion
+      fog-voxel
+      fog-xml (~> 0.1.1)
       ipaddress (~> 0.5)
       nokogiri (~> 1.5, >= 1.5.11)
-    fog-brightbox (0.5.1)
+    fog-atmos (0.1.0)
+      fog-core
+      fog-xml
+    fog-brightbox (0.7.1)
       fog-core (~> 1.22)
       fog-json
-      inflecto
-    fog-core (1.24.0)
+      inflecto (~> 0.0.2)
+    fog-core (1.27.2)
       builder
       excon (~> 0.38)
       formatador (~> 0.2)
       mime-types
       net-scp (~> 1.1)
       net-ssh (>= 2.1.3)
+    fog-ecloud (0.0.2)
+      fog-core
+      fog-xml
     fog-json (1.0.0)
       multi_json (~> 1.0)
+    fog-profitbricks (0.0.1)
+      fog-core
+      fog-xml
+      nokogiri
+    fog-radosgw (0.0.3)
+      fog-core (>= 1.21.0)
+      fog-json
+      fog-xml (>= 0.0.1)
+    fog-sakuracloud (0.1.1)
+      fog-core
+      fog-json
+    fog-softlayer (0.3.26)
+      fog-core
+      fog-json
+    fog-storm_on_demand (0.1.0)
+      fog-core
+      fog-json
+    fog-terremark (0.0.3)
+      fog-core
+      fog-xml
+    fog-vmfusion (0.0.1)
+      fission
+      fog-core
+    fog-voxel (0.0.2)
+      fog-core
+      fog-xml
+    fog-xml (0.1.1)
+      fog-core
+      nokogiri (~> 1.5, >= 1.5.11)
     foreman (0.75.0)
       dotenv (~> 0.11.1)
       thor (~> 0.19.1)
@@ -423,7 +472,7 @@ DEPENDENCIES
   fast_xs
   fastimage
   flamegraph
-  fog (= 1.22.1)
+  fog (= 1.26.0)
   foreman
   gctools
   handlebars-source (= 2.0.0)
diff --git a/app/models/s3_region_site_setting.rb b/app/models/s3_region_site_setting.rb
index decefb185e7..101dd005414 100644
--- a/app/models/s3_region_site_setting.rb
+++ b/app/models/s3_region_site_setting.rb
@@ -16,6 +16,7 @@ class S3RegionSiteSetting < EnumSiteSetting
       'us-west-2',
       'us-gov-west-1',
       'eu-west-1',
+      'eu-central-1',
       'ap-southeast-1',
       'ap-southeast-2',
       'ap-northeast-1',
diff --git a/spec/models/s3_region_site_setting_spec.rb b/spec/models/s3_region_site_setting_spec.rb
index f2743e16693..7bb346445c0 100644
--- a/spec/models/s3_region_site_setting_spec.rb
+++ b/spec/models/s3_region_site_setting_spec.rb
@@ -14,7 +14,7 @@ describe S3RegionSiteSetting do
 
   describe 'values' do
     it 'returns all the S3 regions and blank' do
-      expect(S3RegionSiteSetting.values.map {|x| x[:value]}.sort).to eq(['', 'us-east-1', 'us-west-1', 'us-west-2', 'us-gov-west-1', 'eu-west-1', 'ap-southeast-1', 'ap-southeast-2', 'ap-northeast-1', 'sa-east-1'].sort)
+      expect(S3RegionSiteSetting.values.map {|x| x[:value]}.sort).to eq(['', 'us-east-1', 'us-west-1', 'us-west-2', 'us-gov-west-1', 'eu-west-1', 'eu-central-1', 'ap-southeast-1', 'ap-southeast-2', 'ap-northeast-1', 'sa-east-1'].sort)
     end
   end