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

Setup SitemapGenerator and CarrierWave to use new AWS creds when ENV var is set (#5570) [deploy]

Browse source
This commit is contained in:
Molly Struve 2020-01-24 14:25:57 -05:00 • committed by GitHub
parent 7444b315a4
commit c336dfc84a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
config/initializers/carrierwave.rb
View file

@ -6,13 +6,23 @@ CarrierWave.configure do |config|
config.storage = :file
else
config.fog_provider = "fog/aws"
config.fog_credentials = {
provider: "AWS",
aws_access_key_id: ApplicationConfig["AWS_ID"],
aws_secret_access_key: ApplicationConfig["AWS_SECRET"],
region: ApplicationConfig["AWS_DEFAULT_REGION"]
}
config.fog_directory = ApplicationConfig["AWS_BUCKET_NAME"]
if ENV["USE_NEW_AWS"]
config.fog_credentials = {
provider: "AWS",
aws_access_key_id: ApplicationConfig["AWS_UPLOAD_ID"],
aws_secret_access_key: ApplicationConfig["AWS_UPLOAD_SECRET"],
region: ApplicationConfig["AWS_UPLOAD_REGION"]
}
config.fog_directory = ApplicationConfig["AWS_UPLOAD_BUCKET_NAME"]
else
config.fog_credentials = {
provider: "AWS",
aws_access_key_id: ApplicationConfig["AWS_ID"],
aws_secret_access_key: ApplicationConfig["AWS_SECRET"],
region: ApplicationConfig["AWS_DEFAULT_REGION"]
}
config.fog_directory = ApplicationConfig["AWS_BUCKET_NAME"]
end
config.storage = :fog
end
end

27
config/sitemap.rb
View file

@ -1,14 +1,25 @@
if Rails.env.production?
SitemapGenerator::Sitemap.adapter = SitemapGenerator::S3Adapter.new(
fog_provider: "AWS",
aws_access_key_id: ApplicationConfig["AWS_ID"],
aws_secret_access_key: ApplicationConfig["AWS_SECRET"],
fog_directory: ApplicationConfig["AWS_BUCKET_NAME"],
fog_region: ApplicationConfig["AWS_DEFAULT_REGION"],
)
if ENV["USE_NEW_AWS"]
SitemapGenerator::Sitemap.adapter = SitemapGenerator::S3Adapter.new(
fog_provider: "AWS",
aws_access_key_id: ApplicationConfig["AWS_UPLOAD_ID"],
aws_secret_access_key: ApplicationConfig["AWS_UPLOAD_SECRET"],
fog_directory: ApplicationConfig["AWS_UPLOAD_BUCKET_NAME"],
fog_region: ApplicationConfig["AWS_UPLOAD_REGION"],
)
SitemapGenerator::Sitemap.sitemaps_host = "https://#{ApplicationConfig['AWS_UPLOAD_BUCKET_NAME']}.s3.amazonaws.com/"
else
SitemapGenerator::Sitemap.adapter = SitemapGenerator::S3Adapter.new(
fog_provider: "AWS",
aws_access_key_id: ApplicationConfig["AWS_ID"],
aws_secret_access_key: ApplicationConfig["AWS_SECRET"],
fog_directory: ApplicationConfig["AWS_BUCKET_NAME"],
fog_region: ApplicationConfig["AWS_DEFAULT_REGION"],
)
SitemapGenerator::Sitemap.sitemaps_host = "https://thepracticaldev.s3.amazonaws.com/"
end
SitemapGenerator::Sitemap.public_path = "tmp/"
SitemapGenerator::Sitemap.sitemaps_host = "https://thepracticaldev.s3.amazonaws.com/"
SitemapGenerator::Sitemap.sitemaps_path = "sitemaps/"
end