Add ENV vars to config file, switch to ERB template
This commit is contained in:
parent
e90ed70002
commit
53eb5461fe
2
.github/workflows/ruby.yml
vendored
2
.github/workflows/ruby.yml
vendored
@ -28,6 +28,6 @@ jobs:
|
||||
with:
|
||||
redis-version: ${{ matrix.redis-version }}
|
||||
- name: Configure
|
||||
run: cp config.yml.example.s3 config.yml
|
||||
run: cp config.yml.erb.example config.yml.erb
|
||||
- name: Run tests
|
||||
run: bundle exec rake test
|
||||
|
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,4 +1,5 @@
|
||||
config.yml
|
||||
config.yml.erb
|
||||
cs_credentials.json
|
||||
pids
|
||||
.bundle
|
||||
|
17
config.yml.erb.example
Normal file
17
config.yml.erb.example
Normal file
@ -0,0 +1,17 @@
|
||||
development: &defaults
|
||||
maintenance: false
|
||||
redis:
|
||||
host: <%= ENV["REDIS_HOST"] || "localhost" %>
|
||||
port: <%= ENV["REDIS_PORT"] || "6379" %>
|
||||
s3: &s3_defaults
|
||||
endpoint: <%= ENV["S3_ENDPOINT"] || "http://127.0.0.1:9000" %>
|
||||
region: <%= ENV["S3_REGION"] %>
|
||||
access_key_id: <%= ENV["S3_ACCESS_KEY"] || "minioadmin" %>
|
||||
secret_key_id: <%= ENV["S3_SECRET_KEY"] || "minioadmin" %>
|
||||
bucket: <%= ENV["S3_BUCKET"] || "rs-development" %>
|
||||
test:
|
||||
<<: *defaults
|
||||
staging:
|
||||
<<: *defaults
|
||||
production:
|
||||
<<: *defaults
|
@ -1,26 +0,0 @@
|
||||
development: &defaults
|
||||
maintenance: false
|
||||
s3:
|
||||
endpoint: "https://some-endpoint"
|
||||
region: "region"
|
||||
access_key_id: ""
|
||||
secret_key_id: ""
|
||||
bucket: "test-bucket"
|
||||
redis:
|
||||
host: localhost
|
||||
port: 6379
|
||||
|
||||
test:
|
||||
<<: *defaults
|
||||
s3:
|
||||
endpoint: "https://some-endpoint"
|
||||
region: "region"
|
||||
access_key_id: ""
|
||||
secret_key_id: ""
|
||||
bucket: "test-bucket"
|
||||
|
||||
staging:
|
||||
<<: *defaults
|
||||
|
||||
production:
|
||||
<<: *defaults
|
@ -106,7 +106,7 @@ module RemoteStorage
|
||||
end
|
||||
|
||||
def container_url_for(user)
|
||||
"#{base_url}#{settings.s3["bucket"]}/#{user}"
|
||||
"#{base_url}/#{settings.s3["bucket"]}/#{user}"
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -18,7 +18,7 @@ class LiquorCabinet < Sinatra::Base
|
||||
|
||||
register Sinatra::ConfigFile
|
||||
set :environments, %w{development test production staging}
|
||||
config_file 'config.yml'
|
||||
config_file 'config.yml.erb'
|
||||
end
|
||||
|
||||
configure :development do
|
||||
|
@ -2,7 +2,7 @@ require_relative "../spec_helper"
|
||||
|
||||
describe "S3 provider" do
|
||||
def container_url_for(user)
|
||||
"#{app.settings.s3["endpoint"]}#{app.settings.s3["bucket"]}/#{user}"
|
||||
"#{app.settings.s3["endpoint"]}/#{app.settings.s3["bucket"]}/#{user}"
|
||||
end
|
||||
|
||||
def storage_class
|
||||
|
Loading…
Reference in New Issue
Block a user