diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-30 19:17:17 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-30 19:17:17 +0000 |
| commit | f0bb3ff53307aac7b9c64ec8a48d4ba1d2019513 (patch) | |
| tree | 42a5d4f630f5afe0c2aee7e53fbdbe5751cb1fb6 /.env.production.sample | |
| parent | 01bad04efd09ede8c31c578259468be329e4fc3c (diff) | |
| parent | e573bb0990ece4b1a521ccf8a4c7bec5972d3538 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to '.env.production.sample')
| -rw-r--r-- | .env.production.sample | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.env.production.sample b/.env.production.sample index 059b314b7..0c158b06e 100644 --- a/.env.production.sample +++ b/.env.production.sample @@ -81,6 +81,10 @@ SMTP_FROM_ADDRESS=notifications@example.com # PAPERCLIP_ROOT_URL=/system # Optional asset host for multi-server setups +# The asset host must allow cross origin request from WEB_DOMAIN or LOCAL_DOMAIN +# if WEB_DOMAIN is not set. For example, the server may have the +# following header field: +# Access-Control-Allow-Origin: https://example.com/ # CDN_HOST=https://assets.example.com # S3 (optional) |