aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rwxr-xr-xapp/jitsi/build/jitsi-conference-focus/jicofo3
-rw-r--r--app/jitsi/integration/README.md7
-rw-r--r--app/jitsi/integration/jicofo.conf2
-rw-r--r--app/jitsi/integration/videobridge.conf4
4 files changed, 12 insertions, 4 deletions
diff --git a/app/jitsi/build/jitsi-conference-focus/jicofo b/app/jitsi/build/jitsi-conference-focus/jicofo
index 1c1f77d..bfc54f6 100755
--- a/app/jitsi/build/jitsi-conference-focus/jicofo
+++ b/app/jitsi/build/jitsi-conference-focus/jicofo
@@ -13,7 +13,8 @@ exec java \
-XX:+HeapDumpOnOutOfMemoryError \
-XX:HeapDumpPath=/tmp \
-Djdk.tls.ephemeralDHKeySize=2048 \
- -Djava.util.logging.config.file=/srv/jicofo/lib/logging.properties \
+ -Djava.util.logging.config.file=/usr/share/jicofo/lib/logging.properties \
+ -Dconfig.file=/etc/jitsi/jicofo.conf \
-cp "/usr/share/jicofo/*:/usr/share/jicofo/lib/*" \
org.jitsi.jicofo.Main \
--host=${JITSI_PROSODY_HOST} \
diff --git a/app/jitsi/integration/README.md b/app/jitsi/integration/README.md
index 261f71d..315b5de 100644
--- a/app/jitsi/integration/README.md
+++ b/app/jitsi/integration/README.md
@@ -31,6 +31,13 @@ Base conf:
the following is used in videobridge.conf:
[jicoco/MucClientConfiguration](https://github.com/jitsi/jicoco/blob/master/jicoco/src/main/java/org/jitsi/xmpp/mucclient/MucClientConfiguration.java)
+How the new configuration is read in jicoco:
+https://github.com/jitsi/jicoco/blob/master/jicoco-config/src/main/kotlin/org/jitsi/config/JitsiConfig.kt#L83-L91
+They use this library: https://github.com/lightbend/config
+We are particularly interested by: https://github.com/lightbend/config#standard-behavior
+Using 'application.conf' with classpath does not seem to work.
+But, specifying the file path as `-Dconfig.file=/etc/jitsi/jicofo.conf` works!
+
## Resources to understand jitsi
- [jicofo/debian/postinst](https://github.com/jitsi/jicofo/blob/master/debian/postinst)
diff --git a/app/jitsi/integration/jicofo.conf b/app/jitsi/integration/jicofo.conf
index ecf45fc..2351cde 100644
--- a/app/jitsi/integration/jicofo.conf
+++ b/app/jitsi/integration/jicofo.conf
@@ -53,7 +53,7 @@ jicofo {
}
// The JID of the MUC to be used as a brewery for bridge instances.
- brewery-jid = jvbbrewery@example.com
+ brewery-jid = "jvbbrewery@example.com"
}
// Configure the codecs and RTP extensions to be used in the offer sent to clients.
codec {
diff --git a/app/jitsi/integration/videobridge.conf b/app/jitsi/integration/videobridge.conf
index 2e2548b..e9bded0 100644
--- a/app/jitsi/integration/videobridge.conf
+++ b/app/jitsi/integration/videobridge.conf
@@ -220,10 +220,10 @@ videobridge {
ice {
tcp {
# Whether ICE/TCP is enabled.
- enabled = false
+ enabled = true
# The port to bind to for ICE/TCP.
- port = 443
+ port = 8080
# An optional additional port to advertise.
# mapped-port = 8443