From 76a16a8b78b309aa71ee295756fc39ca3fe80f25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <s@saghul.net>
Date: Tue, 12 Oct 2021 21:11:00 +0200
Subject: [PATCH] jvb: use modern config for ice4j

---
 jvb/rootfs/defaults/jvb.conf                    | 15 +++++++++++++--
 jvb/rootfs/defaults/sip-communicator.properties |  5 -----
 jvb/rootfs/etc/cont-init.d/10-config            |  3 +--
 3 files changed, 14 insertions(+), 9 deletions(-)
 delete mode 100644 jvb/rootfs/defaults/sip-communicator.properties

diff --git a/jvb/rootfs/defaults/jvb.conf b/jvb/rootfs/defaults/jvb.conf
index 8ba26c4..cf16561 100644
--- a/jvb/rootfs/defaults/jvb.conf
+++ b/jvb/rootfs/defaults/jvb.conf
@@ -68,10 +68,21 @@ ice4j {
     harvest {
         mapping {
             stun {
-{{ if .Env.JVB_STUN_SERVERS }}
+{{ if .Env.JVB_STUN_SERVERS -}}
                 addresses = [ "{{ join "\",\"" (splitList "," .Env.JVB_STUN_SERVERS) }}" ]
-{{ end }}
+{{ else -}}
+                enabled = false
+{{ end -}}
             }
+
+            static-mappings = [
+{{ if .Env.DOCKER_HOST_ADDRESS -}}
+                {
+                    local-address = "{{ .Env.LOCAL_ADDRESS }}"
+                    public-address = "{{ .Env.DOCKER_HOST_ADDRESS }}"
+                }
+{{ end -}}
+            ]
         }
     }
 }
diff --git a/jvb/rootfs/defaults/sip-communicator.properties b/jvb/rootfs/defaults/sip-communicator.properties
deleted file mode 100644
index 44f45db..0000000
--- a/jvb/rootfs/defaults/sip-communicator.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-{{ if .Env.DOCKER_HOST_ADDRESS }}
-org.ice4j.ice.harvest.NAT_HARVESTER_LOCAL_ADDRESS={{ .Env.LOCAL_ADDRESS }}
-org.ice4j.ice.harvest.NAT_HARVESTER_PUBLIC_ADDRESS={{ .Env.DOCKER_HOST_ADDRESS }}
-{{ end }}
-
diff --git a/jvb/rootfs/etc/cont-init.d/10-config b/jvb/rootfs/etc/cont-init.d/10-config
index e3053bb..769b153 100644
--- a/jvb/rootfs/etc/cont-init.d/10-config
+++ b/jvb/rootfs/etc/cont-init.d/10-config
@@ -14,9 +14,8 @@ if [[ "$JVB_AUTH_PASSWORD" == "$OLD_JVB_AUTH_PASSWORD" ]]; then
     exit 1
 fi
 
-tpl /defaults/sip-communicator.properties > /config/sip-communicator.properties
 if [[ -f /config/custom-sip-communicator.properties ]]; then
-    cat /config/custom-sip-communicator.properties >> /config/sip-communicator.properties
+    cat /config/custom-sip-communicator.properties > /config/sip-communicator.properties
 fi
 
 tpl /defaults/logging.properties > /config/logging.properties