osr-plastic/osr-discourse-src
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

FEATURE: Optionally allow a separate s3_asset_cdn_url to be specified (#19284)

Browse Source 
If configured, this will be used for static JS assets which are stored on S3. This can be useful if you want to use different CDN providers/configuration for Uploads and JS
This commit is contained in:
David Taylor
2022-12-08 10:36:20 +00:00
committed by GitHub
parent 3fdb8ffb57
commit 03fadf91f0
5 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/content_security_policy/default.rb
+1 -1
View File
@@ -37,7 +37,7 @@ class ContentSecurityPolicy
['/svg-sprite/', false, true, false],
]
def script_assets(base = base_url, s3_cdn = GlobalSetting.s3_cdn_url, cdn = GlobalSetting.cdn_url, worker: false)
def script_assets(base = base_url, s3_cdn = GlobalSetting.s3_asset_cdn_url.presence || GlobalSetting.s3_cdn_url, cdn = GlobalSetting.cdn_url, worker: false)
SCRIPT_ASSET_DIRECTORIES.map do |dir, can_use_s3_cdn, can_use_cdn, for_worker|
next if worker && !for_worker
if can_use_s3_cdn && s3_cdn