aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin <quentin@deuxfleurs.fr>2021-02-01 10:29:13 +0100
committerQuentin <quentin@deuxfleurs.fr>2021-02-01 10:29:13 +0100
commit847540f7b75671d750496dba59ac9b03b8bf1340 (patch)
treee0bebd135fe86b149640bb10ac99ef68975771ca
parent9337129336ad95685e2402b4dd804d16a9e47422 (diff)
downloadinfrastructure-847540f7b75671d750496dba59ac9b03b8bf1340.tar.gz
infrastructure-847540f7b75671d750496dba59ac9b03b8bf1340.zip
Add trimSpace to secrets to prevent a parsing bug
-rw-r--r--app/jitsi/config/jicofo.conf2
-rw-r--r--app/jitsi/config/videobridge.conf2
-rw-r--r--app/jitsi/deploy/jitsi.hcl4
3 files changed, 4 insertions, 4 deletions
diff --git a/app/jitsi/config/jicofo.conf b/app/jitsi/config/jicofo.conf
index cde4eb6..553e5e5 100644
--- a/app/jitsi/config/jicofo.conf
+++ b/app/jitsi/config/jicofo.conf
@@ -243,7 +243,7 @@ jicofo {
port = {{ env "NOMAD_PORT_xmpp_port" }}
domain = "auth.jitsi"
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.
reply-timeout = 15 seconds
diff --git a/app/jitsi/config/videobridge.conf b/app/jitsi/config/videobridge.conf
index 7f85f3c..a7c166a 100644
--- a/app/jitsi/config/videobridge.conf
+++ b/app/jitsi/config/videobridge.conf
@@ -66,7 +66,7 @@ videobridge {
port = {{ env "NOMAD_PORT_xmpp_port" }}
domain = "auth.jitsi"
username = "jvb"
- password = "{{ key "secrets/jitsi/jvb_pass" }}"
+ password = "{{ key "secrets/jitsi/jvb_pass" | trimSpace }}"
muc_jids = "jvbbrewery@internal.auth.jitsi"
# The muc_nickname must be unique across all jitsi-videobridge instances
muc_nickname = "unique-jvb-server"
diff --git a/app/jitsi/deploy/jitsi.hcl b/app/jitsi/deploy/jitsi.hcl
index bf7d6b5..e65cb6d 100644
--- a/app/jitsi/deploy/jitsi.hcl
+++ b/app/jitsi/deploy/jitsi.hcl
@@ -33,8 +33,8 @@ job "jitsi" {
template {
data = <<EOF
-JICOFO_AUTH_PASSWORD={{ key "secrets/jitsi/jicofo_pass" }}
-JVB_AUTH_PASSWORD={{ key "secrets/jitsi/jvb_pass" }}
+JICOFO_AUTH_PASSWORD={{ key "secrets/jitsi/jicofo_pass" | trimSpace }}
+JVB_AUTH_PASSWORD={{ key "secrets/jitsi/jvb_pass" | trimSpace }}
EOF
destination = "secrets/global_env"
env = true