DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #8400 from adullact/feature/s3-storage

Browse source 
S3 storage support
This commit is contained in:
mfo 2023-01-11 13:06:55 +01:00 committed by GitHub
commit a760ccade9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
config/env.example.optional
View file

@ -146,6 +146,11 @@ DATAGOUV_DESCRIPTIF_DEMARCHES_RESOURCE="resourceid"
# Zonage # Zonage
ZONAGE_ENABLED='enabled' # zonage disabled by default if `ZONAGE_ENABLED` not set ZONAGE_ENABLED='enabled' # zonage disabled by default if `ZONAGE_ENABLED` not set
# Configuration for the S3 storage service (if enabled)
S3_ACCESS_KEY_ID=""
S3_SECRET_ACCESS_KEY=""
S3_REGION=""
S3_BUCKET=""
# SAML # SAML
SAML_IDP_CERTIFICATE="idpcertificate" SAML_IDP_CERTIFICATE="idpcertificate"

1
config/initializers/content_security_policy.rb
View file

@ -22,6 +22,7 @@ Rails.application.config.content_security_policy do |policy|
connect_whitelist = ["wss://*.crisp.chat", "*.crisp.chat", "app.franceconnect.gouv.fr", "openmaptiles.geo.data.gouv.fr", "openmaptiles.github.io", "tiles.geo.api.gouv.fr", "wxs.ign.fr"] connect_whitelist = ["wss://*.crisp.chat", "*.crisp.chat", "app.franceconnect.gouv.fr", "openmaptiles.geo.data.gouv.fr", "openmaptiles.github.io", "tiles.geo.api.gouv.fr", "wxs.ign.fr"]
connect_whitelist << ENV.fetch('APP_HOST') connect_whitelist << ENV.fetch('APP_HOST')
connect_whitelist << "*.amazonaws.com" if Rails.configuration.active_storage.service == :amazon
connect_whitelist += [URI(ENV["SENTRY_DSN_JS"]).host, URI(ENV["SENTRY_DSN_RAILS"]).host].compact.uniq connect_whitelist += [URI(ENV["SENTRY_DSN_JS"]).host, URI(ENV["SENTRY_DSN_RAILS"]).host].compact.uniq
connect_whitelist << URI(DS_PROXY_URL).host if DS_PROXY_URL.present? connect_whitelist << URI(DS_PROXY_URL).host if DS_PROXY_URL.present?
connect_whitelist << URI(API_ADRESSE_URL).host if API_ADRESSE_URL.present? connect_whitelist << URI(API_ADRESSE_URL).host if API_ADRESSE_URL.present?

6
config/storage.yml
View file

@ -13,3 +13,9 @@ openstack:
openstack_username: "<%= ENV['FOG_OPENSTACK_USERNAME'] %>" openstack_username: "<%= ENV['FOG_OPENSTACK_USERNAME'] %>"
openstack_region: "<%= ENV['FOG_OPENSTACK_REGION'] %>" openstack_region: "<%= ENV['FOG_OPENSTACK_REGION'] %>"
openstack_temp_url_key: "<%= ENV['FOG_OPENSTACK_TEMP_URL_KEY'] %>" openstack_temp_url_key: "<%= ENV['FOG_OPENSTACK_TEMP_URL_KEY'] %>"
amazon:
service: S3
access_key_id: <%= ENV.fetch("S3_ACCESS_KEY_ID", "") %>
secret_access_key: <%= ENV.fetch("S3_SECRET_ACCESS_KEY", "") %>
region: <%= ENV.fetch("S3_REGION", "") %>
bucket: <%= ENV.fetch("S3_BUCKET", "") %>