Merge branch 'release/3.2.0' into prosody_room_list

2021-07-14 19:11:09 +02:00
parent 98c5518059 e6f23e660e
commit 446ebc0de9
7 changed files with 71 additions and 1 deletions
--- a/server/lib/prosody/config/content.ts
+++ b/server/lib/prosody/config/content.ts
@ -203,6 +203,10 @@ class ProsodyConfigContent {
    }
  }

+  useC2S (c2sPort: string): void {
+    this.global.set('c2s_ports', [c2sPort])
+  }
+
  useMucHttpDefault (url: string): void {
    this.muc.add('modules_enabled', 'muc_http_defaults')
    this.muc.add('muc_create_api_url', url)