From 847540f7b75671d750496dba59ac9b03b8bf1340 Mon Sep 17 00:00:00 2001
From: Quentin <quentin@deuxfleurs.fr>
Date: Mon, 1 Feb 2021 10:29:13 +0100
Subject: [PATCH] Add trimSpace to secrets to prevent a parsing bug

---
 app/jitsi/config/jicofo.conf      | 2 +-
 app/jitsi/config/videobridge.conf | 2 +-
 app/jitsi/deploy/jitsi.hcl        | 4 ++--
 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