mirror of
https://github.com/codeninjasllc/discourse.git
synced 2024-11-23 15:48:43 -05:00
Added eu-central-1 S3 bucket.
This commit is contained in:
parent
5ac0fd019e
commit
f6026ad1d0
4 changed files with 60 additions and 10 deletions
2
Gemfile
2
Gemfile
|
@ -117,7 +117,7 @@ gem 'fast_xs'
|
||||||
|
|
||||||
gem 'fast_xor'
|
gem 'fast_xor'
|
||||||
gem 'fastimage'
|
gem 'fastimage'
|
||||||
gem 'fog', '1.22.1', require: false
|
gem 'fog', '1.26.0', require: false
|
||||||
gem 'unf', require: false
|
gem 'unf', require: false
|
||||||
|
|
||||||
gem 'email_reply_parser'
|
gem 'email_reply_parser'
|
||||||
|
|
65
Gemfile.lock
65
Gemfile.lock
|
@ -6,6 +6,7 @@ PATH
|
||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
|
CFPropertyList (2.2.8)
|
||||||
actionmailer (4.1.8)
|
actionmailer (4.1.8)
|
||||||
actionpack (= 4.1.8)
|
actionpack (= 4.1.8)
|
||||||
actionview (= 4.1.8)
|
actionview (= 4.1.8)
|
||||||
|
@ -81,7 +82,7 @@ GEM
|
||||||
handlebars-source (~> 2.0)
|
handlebars-source (~> 2.0)
|
||||||
erubis (2.7.0)
|
erubis (2.7.0)
|
||||||
eventmachine (1.0.4)
|
eventmachine (1.0.4)
|
||||||
excon (0.39.6)
|
excon (0.42.1)
|
||||||
execjs (2.2.2)
|
execjs (2.2.2)
|
||||||
exifr (1.1.3)
|
exifr (1.1.3)
|
||||||
fabrication (2.9.8)
|
fabrication (2.9.8)
|
||||||
|
@ -99,27 +100,75 @@ GEM
|
||||||
fastimage (1.6.3)
|
fastimage (1.6.3)
|
||||||
addressable (~> 2.3, >= 2.3.5)
|
addressable (~> 2.3, >= 2.3.5)
|
||||||
ffi (1.9.6)
|
ffi (1.9.6)
|
||||||
|
fission (0.5.0)
|
||||||
|
CFPropertyList (~> 2.2)
|
||||||
flamegraph (0.1.0)
|
flamegraph (0.1.0)
|
||||||
fast_stack
|
fast_stack
|
||||||
fog (1.22.1)
|
fog (1.26.0)
|
||||||
fog-brightbox
|
fog-atmos
|
||||||
fog-core (~> 1.22)
|
fog-brightbox (~> 0.4)
|
||||||
|
fog-core (~> 1.27, >= 1.27.1)
|
||||||
|
fog-ecloud
|
||||||
fog-json
|
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)
|
ipaddress (~> 0.5)
|
||||||
nokogiri (~> 1.5, >= 1.5.11)
|
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-core (~> 1.22)
|
||||||
fog-json
|
fog-json
|
||||||
inflecto
|
inflecto (~> 0.0.2)
|
||||||
fog-core (1.24.0)
|
fog-core (1.27.2)
|
||||||
builder
|
builder
|
||||||
excon (~> 0.38)
|
excon (~> 0.38)
|
||||||
formatador (~> 0.2)
|
formatador (~> 0.2)
|
||||||
mime-types
|
mime-types
|
||||||
net-scp (~> 1.1)
|
net-scp (~> 1.1)
|
||||||
net-ssh (>= 2.1.3)
|
net-ssh (>= 2.1.3)
|
||||||
|
fog-ecloud (0.0.2)
|
||||||
|
fog-core
|
||||||
|
fog-xml
|
||||||
fog-json (1.0.0)
|
fog-json (1.0.0)
|
||||||
multi_json (~> 1.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)
|
foreman (0.75.0)
|
||||||
dotenv (~> 0.11.1)
|
dotenv (~> 0.11.1)
|
||||||
thor (~> 0.19.1)
|
thor (~> 0.19.1)
|
||||||
|
@ -423,7 +472,7 @@ DEPENDENCIES
|
||||||
fast_xs
|
fast_xs
|
||||||
fastimage
|
fastimage
|
||||||
flamegraph
|
flamegraph
|
||||||
fog (= 1.22.1)
|
fog (= 1.26.0)
|
||||||
foreman
|
foreman
|
||||||
gctools
|
gctools
|
||||||
handlebars-source (= 2.0.0)
|
handlebars-source (= 2.0.0)
|
||||||
|
|
|
@ -16,6 +16,7 @@ class S3RegionSiteSetting < EnumSiteSetting
|
||||||
'us-west-2',
|
'us-west-2',
|
||||||
'us-gov-west-1',
|
'us-gov-west-1',
|
||||||
'eu-west-1',
|
'eu-west-1',
|
||||||
|
'eu-central-1',
|
||||||
'ap-southeast-1',
|
'ap-southeast-1',
|
||||||
'ap-southeast-2',
|
'ap-southeast-2',
|
||||||
'ap-northeast-1',
|
'ap-northeast-1',
|
||||||
|
|
|
@ -14,7 +14,7 @@ describe S3RegionSiteSetting do
|
||||||
|
|
||||||
describe 'values' do
|
describe 'values' do
|
||||||
it 'returns all the S3 regions and blank' 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
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue