jvb: use modern config for ice4j

saghul · saghul · commit 76a16a8b78b3 · 2021-10-12T21:46:30.000+02:00
diff --git 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
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -68,10 +68,21 @@ ice4j {`
`68`	`68`	`harvest {`
`69`	`69`	`mapping {`
`70`	`70`	`stun {`
`71`		`-{{ if .Env.JVB_STUN_SERVERS }}`
	`71`	`+{{ if .Env.JVB_STUN_SERVERS -}}`
`72`	`72`	`addresses = [ "{{ join "\",\"" (splitList "," .Env.JVB_STUN_SERVERS) }}" ]`
`73`		`-{{ end }}`
	`73`	`+{{ else -}}`
	`74`	`+ enabled = false`
	`75`	`+{{ end -}}`
`74`	`76`	`}`
	`77`	`+`
	`78`	`+ static-mappings = [`
	`79`	`+{{ if .Env.DOCKER_HOST_ADDRESS -}}`
	`80`	`+ {`
	`81`	`+ local-address = "{{ .Env.LOCAL_ADDRESS }}"`
	`82`	`+ public-address = "{{ .Env.DOCKER_HOST_ADDRESS }}"`
	`83`	`+ }`
	`84`	`+{{ end -}}`
	`85`	`+ ]`
`75`	`86`	`}`
`76`	`87`	`}`
`77`	`88`	`}`