forked from Deuxfleurs/infrastructure
Fix ansible inventory + Fix jicofo's hocon conf + fix jicofo's dockerfile
This commit is contained in:
parent
07765e8456
commit
ebb772e5ba
5 changed files with 13 additions and 5 deletions
|
@ -13,7 +13,8 @@ exec java \
|
||||||
-XX:+HeapDumpOnOutOfMemoryError \
|
-XX:+HeapDumpOnOutOfMemoryError \
|
||||||
-XX:HeapDumpPath=/tmp \
|
-XX:HeapDumpPath=/tmp \
|
||||||
-Djdk.tls.ephemeralDHKeySize=2048 \
|
-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/*" \
|
-cp "/usr/share/jicofo/*:/usr/share/jicofo/lib/*" \
|
||||||
org.jitsi.jicofo.Main \
|
org.jitsi.jicofo.Main \
|
||||||
--host=${JITSI_PROSODY_HOST} \
|
--host=${JITSI_PROSODY_HOST} \
|
||||||
|
|
|
@ -31,6 +31,13 @@ Base conf:
|
||||||
the following is used in videobridge.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)
|
[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
|
## Resources to understand jitsi
|
||||||
|
|
||||||
- [jicofo/debian/postinst](https://github.com/jitsi/jicofo/blob/master/debian/postinst)
|
- [jicofo/debian/postinst](https://github.com/jitsi/jicofo/blob/master/debian/postinst)
|
||||||
|
|
|
@ -53,7 +53,7 @@ jicofo {
|
||||||
}
|
}
|
||||||
|
|
||||||
// The JID of the MUC to be used as a brewery for bridge instances.
|
// 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.
|
// Configure the codecs and RTP extensions to be used in the offer sent to clients.
|
||||||
codec {
|
codec {
|
||||||
|
|
|
@ -220,10 +220,10 @@ videobridge {
|
||||||
ice {
|
ice {
|
||||||
tcp {
|
tcp {
|
||||||
# Whether ICE/TCP is enabled.
|
# Whether ICE/TCP is enabled.
|
||||||
enabled = false
|
enabled = true
|
||||||
|
|
||||||
# The port to bind to for ICE/TCP.
|
# The port to bind to for ICE/TCP.
|
||||||
port = 443
|
port = 8080
|
||||||
|
|
||||||
# An optional additional port to advertise.
|
# An optional additional port to advertise.
|
||||||
# mapped-port = 8443
|
# mapped-port = 8443
|
||||||
|
|
|
@ -40,7 +40,7 @@ cluster_nodes:
|
||||||
ansible_python_interpreter: python3
|
ansible_python_interpreter: python3
|
||||||
|
|
||||||
io:
|
io:
|
||||||
ansible_host: pluton.site.deuxfleurs.fr
|
ansible_host: jupiter.site.deuxfleurs.fr
|
||||||
ansible_port: 110
|
ansible_port: 110
|
||||||
ansible_become: true
|
ansible_become: true
|
||||||
ipv4: 192.168.1.2
|
ipv4: 192.168.1.2
|
||||||
|
|
Loading…
Reference in a new issue