matty/peertube-plugin-livechat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Prosody WS configuration.

Browse Source
This commit is contained in:
John Livingston 2022-08-25 13:44:35 +02:00
parent 67062aac62
commit e7eca75736
No known key found for this signature in database
GPG Key ID: B17B5640CE66CDBC
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/lib/prosody/config.ts
View File

@ -130,7 +130,7 @@ async function getProsodyConfig (options: RegisterServerOptions): Promise<Prosod
config.useAnonymous() config.useAnonymous()
} }
config.useHttpAuthentication(authApiUrl) config.useHttpAuthentication(authApiUrl)
config.usePeertubeBoshAndWebsocket(prosodyDomain, port) config.usePeertubeBoshAndWebsocket(prosodyDomain, port, options.peertubeHelpers.config.getWebserverUrl())
config.useMucHttpDefault(roomApiUrl) config.useMucHttpDefault(roomApiUrl)
if (enableC2s) { if (enableC2s) {

7
server/lib/prosody/config/content.ts
View File

@ -156,7 +156,7 @@ class ProsodyConfigContent {
'uptime', // Report how long server has been running 'uptime', // Report how long server has been running
'ping', // Replies to XMPP pings with pongs 'ping', // Replies to XMPP pings with pongs
'bosh', // Enable BOSH clients, aka "Jabber over HTTP" 'bosh', // Enable BOSH clients, aka "Jabber over HTTP"
'websocket', // Enable Websocket clients // 'websocket', // Enable Websocket clients
'posix' // POSIX functionality, sends server to background, enables syslog, etc. 'posix' // POSIX functionality, sends server to background, enables syslog, etc.
// 'pep', // Enables users to publish their avatar, mood, activity, playing music and more // 'pep', // Enables users to publish their avatar, mood, activity, playing music and more
// 'vcard_legacy' // Conversion between legacy vCard and PEP Avatar, vcard // 'vcard_legacy' // Conversion between legacy vCard and PEP Avatar, vcard
@ -201,7 +201,7 @@ class ProsodyConfigContent {
this.authenticated.set('http_auth_url', url) this.authenticated.set('http_auth_url', url)
} }
usePeertubeBoshAndWebsocket (prosodyDomain: string, port: string): void { usePeertubeBoshAndWebsocket (prosodyDomain: string, port: string, publicServerUrl: string): void {
this.global.set('c2s_require_encryption', false) this.global.set('c2s_require_encryption', false)
this.global.set('interfaces', ['127.0.0.1', '::1']) this.global.set('interfaces', ['127.0.0.1', '::1'])
this.global.set('c2s_ports', []) this.global.set('c2s_ports', [])
@ -216,6 +216,9 @@ class ProsodyConfigContent {
this.global.set('consider_bosh_secure', true) this.global.set('consider_bosh_secure', true)
this.global.set('consider_websocket_secure', true) this.global.set('consider_websocket_secure', true)
// This line seems to be required by Prosody, otherwise it rejects websocket...
this.global.set('cross_domain_websocket', [publicServerUrl])
if (this.anon) { if (this.anon) {
this.anon.set('trusted_proxies', ['127.0.0.1', '::1']) this.anon.set('trusted_proxies', ['127.0.0.1', '::1'])
this.anon.set('allow_anonymous_s2s', false) this.anon.set('allow_anonymous_s2s', false)