lbailly/infrastructure
1
0
Fork 0
forked from DGNum/infrastructure
Code Pull requests Activity

feat(ds-fr): Update our version

Browse source
This commit is contained in:
Tom Hubrecht 2023-12-14 14:20:31 +01:00
parent 3a5e7fec01
commit d5bbf07484
2 changed files with 2 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
machines/compute01/ds-fr/package/dgnum.nix
View file

@ -2,21 +2,5 @@ _:
builtins.map (id: builtins.map (id:
builtins.fetchurl builtins.fetchurl
"https://git.dgnum.eu/DGNum/demarches-normaliennes/commit/${id}.patch") [ "https://git.dgnum.eu/DGNum/demarches-normaliennes/commit/${id}.patch")
"1b6b0b50a1409fd2e2e5436305f01ee3a8981b58" [ "b7da18961474d4fc757adfa10558d5a3c4ec893c" ]
"aa9b3f496f43354b6be23bd705af007c123de14b"
"7c3022757766b04e6b7267417527b3043589dec3"
"a13589fd759d0e37a063429c669cc892c472ab6e"
"4383cfd3461889adac56e4d8bf105d35b37f7be4"
"783f1ed23b4ae8b150d121eaa7ba0533756d2071"
"d61f12223b16b46a369e938a166900a3c444b012"
"590474130fed63074092c4273781fac27512ccef"
"2ae30924fe6ede0a70f4381055a33cb1b28b2f3a"
"8ed3e06e90d5d614b703253acb2ebf6435e2d281"
"67dfffc3387649e8141b4e79c8f94d3abb237ef1"
"22edf5e2fb30f9dcdc61f69d1d59a81e0adc85e9"
"9957049894d63a1e61d51ea8ecb9b49f4b3cc296"
"2b7ce11bd2ead96fdda5e4dbd1171b7c5d4d140d"
"286a789c539274b117604664bbd69a6172680eda"
"6c39ac708e6abbb395218ab092f74f234535727f"
]

22
machines/compute01/ds-fr/package/patches/build.patch
View file

@ -19,28 +19,6 @@ index 16d8c8e84..6262b8782 100644
+ config.lograge.enabled = ENV.fetch('LOGRAGE_ENABLED', 'disabled') == 'enabled' + config.lograge.enabled = ENV.fetch('LOGRAGE_ENABLED', 'disabled') == 'enabled'
end end
diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb
index 135495216..4d4bcf8dc 100644
--- a/config/initializers/content_security_policy.rb
+++ b/config/initializers/content_security_policy.rb
@@ -23,7 +23,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 << 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.fetch("SENTRY_DSN_JS", '')).host, URI(ENV.fetch("SENTRY_DSN_RAILS", '')).host].compact.uniq
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_EDUCATION_URL).host if API_EDUCATION_URL.present?
@@ -39,7 +39,7 @@ Rails.application.config.content_security_policy do |policy|
# Everything else: allow us
# Add the error source in the violation notification
default_whitelist = ["fonts.gstatic.com", "in-automate.sendinblue.com", "player.vimeo.com", "app.franceconnect.gouv.fr", "*.crisp.chat", "crisp.chat", "*.crisp.help", "*.sibautomation.com", "sibautomation.com", "data"]
- default_whitelist += [URI(ENV["SENTRY_DSN_JS"]).host, URI(ENV["SENTRY_DSN_RAILS"]).host].compact.uniq
+ default_whitelist += [URI(ENV.fetch("SENTRY_DSN_JS", '')).host, URI(ENV.fetch("SENTRY_DSN_RAILS", '')).host].compact.uniq
default_whitelist << URI(DS_PROXY_URL).host if DS_PROXY_URL.present?
policy.default_src(:self, :data, :blob, :report_sample, *default_whitelist)
diff --git a/config/initializers/mailcatcher.rb b/config/initializers/mailcatcher.rb diff --git a/config/initializers/mailcatcher.rb b/config/initializers/mailcatcher.rb
index 8b931f704..dbeceb4ec 100644 index 8b931f704..dbeceb4ec 100644
--- a/config/initializers/mailcatcher.rb --- a/config/initializers/mailcatcher.rb