oxen-io
/
session-open-group-server-legacy
mirror of https://github.com/oxen-io/session-open-group-server-legacy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

public_host => public_url

This commit is contained in:
Ryan Tharp 2020-06-03 23:48:40 +00:00
parent c4994bb8fa
commit 482bad533a
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dialects/homepage/dialect_homepage_handlers.js
View File

@ -24,6 +24,9 @@ const homePageHandler = async (req, res) => {
if (nconf.get('web:public_host')) {
public_url = 'https://' + nconf.get('web:public_host')
}
if (nconf.get('web:public_url')) {
public_url = nconf.get('web:public_url')
}
// console.log('disk_config', disk_config);
cache.getAnnotations('channel', 1, function(note, err) {
if (err) console.error('error', err)

4
dialects/nodepomf/dialect.loki_nodepomf.js
View File

@ -41,6 +41,10 @@ module.exports = (app, prefix) => {
if (nconf.get('web:public_host')) {
process.env.NPOMF_FILE_URL = 'https://' + nconf.get('web:public_host') + '/f';
}
if (nconf.get('web:public_url')) {
const url = nconf.get('web:public_url').replace(/\/$/, ''); // strip any trailing slash
process.env.NPOMF_FILE_URL = url + '/f';
}
if (diskConfig.storage && diskConfig.storage.download_url) {
process.env.NPOMF_FILE_URL = diskConfig.storage.download_url + '/f'
}

2
docker-compose-backend.yml
View File

@ -34,7 +34,7 @@ services:
web__listen: 0.0.0.0
# web__port: ${PORT?Variable PORT not set}
web__port: 7070
web__public_host: ${DOMAIN?Variable DOMAIN not set}
web__public_url: "https://${DOMAIN?Variable DOMAIN not set}"
admin__listen: unified
admin__modKey: enableAdmin
database__default__type: mysql

2
docker-compose.yml
View File

@ -64,7 +64,7 @@ services:
environment:
stream__host: redis
web__listen: unified
web__public_host: ${DOMAIN?Variable DOMAIN not set}
web__public_url: "https://${DOMAIN?Variable DOMAIN not set}"
admin__listen: unified
admin__modKey: enableAdmin
database__default__type: mysql