master #1

Merged
lino.jorzick merged 203 commits from External/greenlight:master into master 2021-10-02 18:19:43 +00:00
3 changed files with 16 additions and 0 deletions
Showing only changes of commit e54208f710 - Show all commits

View File

@ -63,6 +63,8 @@ Rails.application.configure do
# Store uploaded files on the local file system (see config/storage.yml for options) # Store uploaded files on the local file system (see config/storage.yml for options)
config.active_storage.service = if ENV["AWS_ACCESS_KEY_ID"].present? config.active_storage.service = if ENV["AWS_ACCESS_KEY_ID"].present?
:amazon :amazon
elsif ENV["S3_ACCESS_KEY_ID"].present?
:s3
elsif ENV["GCS_PRIVATE_KEY_ID"].present? elsif ENV["GCS_PRIVATE_KEY_ID"].present?
:google :google
else else

View File

@ -13,6 +13,13 @@ amazon:
secret_access_key: <%= ENV['AWS_SECRET_ACCESS_KEY'] %> secret_access_key: <%= ENV['AWS_SECRET_ACCESS_KEY'] %>
region: <%= ENV['AWS_REGION'] %> region: <%= ENV['AWS_REGION'] %>
bucket: <%= ENV['AWS_BUCKET'] %> bucket: <%= ENV['AWS_BUCKET'] %>
s3:
service: S3
endpoint: <%= ENV['S3_ENDPOINT'] %>
access_key_id: <%= ENV['S3_ACCESS_KEY_ID'] %>
secret_access_key: <%= ENV['S3_SECRET_ACCESS_KEY'] %>
region: <%= ENV['S3_REGION'] %>
bucket: <%= ENV['S3_BUCKET'] %>
# Remember not to checkin your GCS keyfile to a repository # Remember not to checkin your GCS keyfile to a repository
google: google:

View File

@ -326,6 +326,13 @@ DEFAULT_REGISTRATION=open
# AWS_REGION= # AWS_REGION=
# AWS_BUCKET= # AWS_BUCKET=
# #
# For S3-compatible API:
# S3_ENDPOINT=
# S3_ACCESS_KEY_ID=
# S3_SECRET_ACCESS_KEY=
# S3_REGION=
# S3_BUCKET=
#
# For GCS Storage: # For GCS Storage:
# GCS_PROJECT_ID= # GCS_PROJECT_ID=
# GCS_PRIVATE_KEY_ID= # GCS_PRIVATE_KEY_ID=