Procházet zdrojové kódy

Merge pull request #105 from jitsi/nuke-preconfigured-bridge

Nukes the pre-configured bridge from the example config file.
dev1
bgrozev před 9 roky
rodič
revize
8e9812150e
3 změnil soubory, kde provedl 0 přidání a 10 odebrání
  1. 0
    1
      doc/API.md
  2. 0
    1
      doc/example/example.js
  3. 0
    8
      modules/xmpp/moderator.js

+ 0
- 1
doc/API.md Zobrazit soubor

176
         2. hosts - JS Object
176
         2. hosts - JS Object
177
             - domain
177
             - domain
178
             - muc
178
             - muc
179
-            - bridge
180
             - anonymousdomain
179
             - anonymousdomain
181
         3. useStunTurn -
180
         3. useStunTurn -
182
 
181
 

+ 0
- 1
doc/example/example.js Zobrazit soubor

2
     hosts: {
2
     hosts: {
3
         domain: 'jitsi-meet.example.com',
3
         domain: 'jitsi-meet.example.com',
4
         muc: 'conference.jitsi-meet.example.com', // FIXME: use XEP-0030
4
         muc: 'conference.jitsi-meet.example.com', // FIXME: use XEP-0030
5
-        bridge: 'jitsi-videobridge.jitsi-meet.example.com', // FIXME: use XEP-0030
6
     },
5
     },
7
     bosh: '//jitsi-meet.example.com/http-bind', // FIXME: use xep-0156 for that
6
     bosh: '//jitsi-meet.example.com/http-bind', // FIXME: use xep-0156 for that
8
     clientNode: 'http://jitsi.org/jitsimeet', // The name of client node advertised in XEP-0115 'c' stanza
7
     clientNode: 'http://jitsi.org/jitsimeet', // The name of client node advertised in XEP-0115 'c' stanza

+ 0
- 8
modules/xmpp/moderator.js Zobrazit soubor

124
     if (sessionId) {
124
     if (sessionId) {
125
         elem.attrs({ 'session-id': sessionId});
125
         elem.attrs({ 'session-id': sessionId});
126
     }
126
     }
127
-    if (this.options.connection.hosts !== undefined
128
-        && this.options.connection.hosts.bridge !== undefined) {
129
-        elem.c(
130
-            'property', {
131
-                name: 'bridge',
132
-                value: this.options.connection.hosts.bridge
133
-            }).up();
134
-    }
135
     if (this.options.connection.enforcedBridge !== undefined) {
127
     if (this.options.connection.enforcedBridge !== undefined) {
136
         elem.c(
128
         elem.c(
137
             'property', {
129
             'property', {

Načítá se…
Zrušit
Uložit