jvb: use modern config for ice4j

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 -}}
+            ]
         }
     }
 }

jvb/rootfs/defaults/sip-communicator.properties

@@ -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 }}
-

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