Deuxfleurs/infrastructure
Archived
24
2
Fork 2
Code Issues 22 Pull requests Projects 1 Releases Wiki Activity

Add trimSpace to secrets to prevent a parsing bug

Browse source
This commit is contained in:
Quentin 2021-02-01 10:29:13 +01:00
parent 9337129336
commit 847540f7b7
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/jitsi/config/jicofo.conf
View file

@ -243,7 +243,7 @@ jicofo {
port = {{ env "NOMAD_PORT_xmpp_port" }} port = {{ env "NOMAD_PORT_xmpp_port" }}
domain = "auth.jitsi" domain = "auth.jitsi"
username = "focus" username = "focus"
password = {{ key "secrets/jitsi/jicofo_pass" }} password = {{ key "secrets/jitsi/jicofo_pass" | trimSpace }}
// How long to wait for a response to a stanza before giving up. // How long to wait for a response to a stanza before giving up.
reply-timeout = 15 seconds reply-timeout = 15 seconds

2
app/jitsi/config/videobridge.conf
View file

@ -66,7 +66,7 @@ videobridge {
port = {{ env "NOMAD_PORT_xmpp_port" }} port = {{ env "NOMAD_PORT_xmpp_port" }}
domain = "auth.jitsi" domain = "auth.jitsi"
username = "jvb" username = "jvb"
password = "{{ key "secrets/jitsi/jvb_pass" }}" password = "{{ key "secrets/jitsi/jvb_pass" | trimSpace }}"
muc_jids = "jvbbrewery@internal.auth.jitsi" muc_jids = "jvbbrewery@internal.auth.jitsi"
# The muc_nickname must be unique across all jitsi-videobridge instances # The muc_nickname must be unique across all jitsi-videobridge instances
muc_nickname = "unique-jvb-server" muc_nickname = "unique-jvb-server"

4
app/jitsi/deploy/jitsi.hcl
View file

@ -33,8 +33,8 @@ job "jitsi" {
template { template {
data = <<EOF data = <<EOF
JICOFO_AUTH_PASSWORD={{ key "secrets/jitsi/jicofo_pass" }} JICOFO_AUTH_PASSWORD={{ key "secrets/jitsi/jicofo_pass" | trimSpace }}
JVB_AUTH_PASSWORD={{ key "secrets/jitsi/jvb_pass" }} JVB_AUTH_PASSWORD={{ key "secrets/jitsi/jvb_pass" | trimSpace }}
EOF EOF
destination = "secrets/global_env" destination = "secrets/global_env"
env = true env = true