maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Support alternate S3 endpoints" (#16173)

Browse source
This commit is contained in:
Jamie Gaskins 2022-01-18 14:11:18 -05:00 • committed by GitHub
parent d3bffb507f
commit ebdaaaf15b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
.env_sample
View file

@ -72,14 +72,11 @@ NODE_ENV="development"
HONEYBADGER_API_KEY="Optional"
HONEYBADGER_JS_API_KEY="Optional"
# Uncomment the lines below and fill in values to enable AWS S3 (or S3-
# compatible services) for image storage. The AWS_S3_ENDPOINT variable is only
# necessary if you're using an S3-compatible service but not S3 proper.
# AWS_ID=
# AWS_SECRET=
# AWS_BUCKET_NAME=
# AWS_UPLOAD_REGION=
# AWS_S3_ENDPOINT=
# AWS for images storages
AWS_ID=
AWS_SECRET=
AWS_BUCKET_NAME=
AWS_UPLOAD_REGION=
# AWS for video storage
AWS_S3_INPUT_BUCKET="Optional"

3
config/initializers/carrierwave.rb
View file

@ -27,8 +27,7 @@ module CarrierWaveInitializer
provider: "AWS",
aws_access_key_id: ApplicationConfig["AWS_ID"],
aws_secret_access_key: ApplicationConfig["AWS_SECRET"],
region: ApplicationConfig["AWS_UPLOAD_REGION"].presence || ApplicationConfig["AWS_DEFAULT_REGION"],
endpoint: ApplicationConfig["AWS_S3_ENDPOINT"],
region: ApplicationConfig["AWS_UPLOAD_REGION"].presence || ApplicationConfig["AWS_DEFAULT_REGION"]
}
end
end