songtianlun
f2e2c8c4d8
- Modify AWS credentials to use 's3' instead of 'minio' for both production and development environments. - Update associated initializers, environment configurations, and sitemap generator settings. - Simplify the configuration retrieval by aligning with new standards for S3. These changes ensure consistent access to AWS S3 resources and improve maintainability by aligning with updated environment variable practices.
22 lines
1.2 KiB
Ruby
22 lines
1.2 KiB
Ruby
if Rails.env.production?
|
|
Aws.config.update({
|
|
region: ENV.fetch("AWS_REGION", Rails.application.credentials.dig(:s3, :region)),
|
|
credentials: Aws::Credentials.new(
|
|
ENV.fetch("AWS_ACCESS_KEY_ID", Rails.application.credentials.dig(:s3, :access_key_id)),
|
|
ENV.fetch("AWS_SECRET_ACCESS_KEY_ID", Rails.application.credentials.dig(:s3, :secret_access_key))
|
|
),
|
|
force_path_style: ENV.fetch("AWS_FORCE_PATH_STYLE", Rails.application.credentials.dig(:s3_dev, :force_path_style)),
|
|
endpoint: ENV.fetch("AWS_ENDPOINT", Rails.application.credentials.dig(:s3, :endpoint))
|
|
})
|
|
else
|
|
Aws.config.update({
|
|
region: ENV.fetch("AWS_DEV_REGION", Rails.application.credentials.dig(:s3_dev, :region)),
|
|
credentials: Aws::Credentials.new(
|
|
ENV.fetch("AWS_DEV_ACCESS_KEY_ID", Rails.application.credentials.dig(:s3_dev, :access_key_id)),
|
|
ENV.fetch("AWS_DEV_SECRET_ACCESS_KEY_ID", Rails.application.credentials.dig(:s3_dev, :secret_access_key))
|
|
),
|
|
force_path_style: ENV.fetch("AWS_DEV_FORCE_PATH_STYLE", Rails.application.credentials.dig(:s3_dev, :force_path_style)),
|
|
endpoint: ENV.fetch("AWS_DEV_ENDPOINT", Rails.application.credentials.dig(:s3_dev, :endpoint))
|
|
})
|
|
end
|