2
0
Эх сурвалжийг харах

jvb: remove deprecated option

It was only used for REST after internal JVB changes, and it can now be
enabled with the dedicated COLIBRI_REST_ENABLED env var.
Saúl Ibarra Corretgé 3 жил өмнө
parent
commit
e9275d5e8f

+ 0 - 1
docker-compose.yml

@@ -273,7 +273,6 @@ services:
             - JVB_TCP_PORT
             - JVB_TCP_PORT
             - JVB_TCP_MAPPED_PORT
             - JVB_TCP_MAPPED_PORT
             - JVB_STUN_SERVERS
             - JVB_STUN_SERVERS
-            - JVB_ENABLE_APIS
             - JVB_OCTO_BIND_ADDRESS
             - JVB_OCTO_BIND_ADDRESS
             - JVB_OCTO_PUBLIC_ADDRESS
             - JVB_OCTO_PUBLIC_ADDRESS
             - JVB_OCTO_BIND_PORT
             - JVB_OCTO_BIND_PORT

+ 0 - 4
env.example

@@ -259,10 +259,6 @@ JVB_TCP_HARVESTER_DISABLED=true
 JVB_TCP_PORT=4443
 JVB_TCP_PORT=4443
 JVB_TCP_MAPPED_PORT=4443
 JVB_TCP_MAPPED_PORT=4443
 
 
-# A comma separated list of APIs to enable when the JVB is started [default: none]
-# See https://github.com/jitsi/jitsi-videobridge/blob/master/doc/rest.md for more information
-#JVB_ENABLE_APIS=rest,colibri
-
 # XMPP user for Jicofo client connections.
 # XMPP user for Jicofo client connections.
 # NOTE: this option doesn't currently work due to a bug
 # NOTE: this option doesn't currently work due to a bug
 JICOFO_AUTH_USER=focus
 JICOFO_AUTH_USER=focus

+ 1 - 1
jvb/rootfs/etc/services.d/jvb/run

@@ -4,4 +4,4 @@ export JAVA_SYS_PROPS="-Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION=/ -Dnet.
 
 
 DAEMON=/usr/share/jitsi-videobridge/jvb.sh
 DAEMON=/usr/share/jitsi-videobridge/jvb.sh
 
 
-exec s6-setuidgid jvb /bin/bash -c "exec $DAEMON --apis=${JVB_ENABLE_APIS:="none"}"
+exec s6-setuidgid jvb /bin/bash -c "exec $DAEMON"