From a2333b3e76d294e6d0a01ead69f4efa67fe12cd5 Mon Sep 17 00:00:00 2001
From: bgrozev <boris@jitsi.org>
Date: Mon, 31 Oct 2022 13:06:04 -0500
Subject: [PATCH] jicofo: remove JICOFO_SHORT_ID (removed upstream)

---
 docker-compose.yml                 | 1 -
 jicofo/rootfs/defaults/jicofo.conf | 2 --
 2 files changed, 3 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index f1f6a1d..9bbcbaa 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -269,7 +269,6 @@ services:
             - JICOFO_CONF_INITIAL_PARTICIPANT_WAIT_TIMEOUT
             - JICOFO_CONF_SINGLE_PARTICIPANT_TIMEOUT
             - JICOFO_ENABLE_HEALTH_CHECKS
-            - JICOFO_SHORT_ID
             - JIBRI_BREWERY_MUC
             - JIBRI_REQUEST_RETRIES
             - JIBRI_PENDING_TIMEOUT
diff --git a/jicofo/rootfs/defaults/jicofo.conf b/jicofo/rootfs/defaults/jicofo.conf
index 7e79590..1e0119f 100644
--- a/jicofo/rootfs/defaults/jicofo.conf
+++ b/jicofo/rootfs/defaults/jicofo.conf
@@ -132,8 +132,6 @@ jicofo {
       // two MUST be in sync (otherwise bridges will crash because they won't know how to
       // deal with octo channels).
       enabled = {{ $ENABLE_OCTO }}
-
-      id = "{{ .Env.JICOFO_SHORT_ID | default "1" }}"
     }
 
     sctp {