From e9275d5e8fddd75642a02ed0bdfdfc4365022dfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <s@saghul.net>
Date: Sat, 11 Dec 2021 08:22:54 +0100
Subject: [PATCH] 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.
---
 docker-compose.yml                | 1 -
 env.example                       | 4 ----
 jvb/rootfs/etc/services.d/jvb/run | 2 +-
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 570edfd..8ed63a2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -273,7 +273,6 @@ services:
             - JVB_TCP_PORT
             - JVB_TCP_MAPPED_PORT
             - JVB_STUN_SERVERS
-            - JVB_ENABLE_APIS
             - JVB_OCTO_BIND_ADDRESS
             - JVB_OCTO_PUBLIC_ADDRESS
             - JVB_OCTO_BIND_PORT
diff --git a/env.example b/env.example
index 48c4bb8..31abb07 100644
--- a/env.example
+++ b/env.example
@@ -259,10 +259,6 @@ JVB_TCP_HARVESTER_DISABLED=true
 JVB_TCP_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.
 # NOTE: this option doesn't currently work due to a bug
 JICOFO_AUTH_USER=focus
diff --git a/jvb/rootfs/etc/services.d/jvb/run b/jvb/rootfs/etc/services.d/jvb/run
index 0786584..09b9c3e 100644
--- a/jvb/rootfs/etc/services.d/jvb/run
+++ b/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
 
-exec s6-setuidgid jvb /bin/bash -c "exec $DAEMON --apis=${JVB_ENABLE_APIS:="none"}"
+exec s6-setuidgid jvb /bin/bash -c "exec $DAEMON"