From cf116669c66f4ca9f92a1b4433186a74e1880f0a Mon Sep 17 00:00:00 2001
From: Cian Hughes <cian.hughes@dcu.ie>
Date: Fri, 12 Jan 2024 18:24:36 +0000
Subject: [PATCH] 3rd attempt at using elabftw secret

---
 backend.yaml  | 4 ++--
 frontend.yaml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend.yaml b/backend.yaml
index 6c50e2b..e70509a 100644
--- a/backend.yaml
+++ b/backend.yaml
@@ -91,8 +91,8 @@ services:
       MYSQL_USER: "elabftw"
       MYSQL_PASSWORD_FILE: /run/secrets/elabftw_sql_key
       MYSQL_ROOT_PASSWORD: "test" # MYSQL_RANDOM_ROOT_PASSWORD: 1
-      MYSQL_HOST: "172.252.0.15"
-      MYSQL_ROOT_HOST: "172.252.0.15" # Must allow root access from any host or won't work on swarm
+      MYSQL_HOST: "172.252.0.15" # Needs to allow access from the elabftw container
+      MYSQL_ROOT_HOST: "172.252.0.15"
       TZ: "Europe/Paris"
     volumes:
       - stack_elabftw_sql:/var/lib/mysql
diff --git a/frontend.yaml b/frontend.yaml
index 22a8e06..5bb4ab2 100644
--- a/frontend.yaml
+++ b/frontend.yaml
@@ -72,7 +72,7 @@ services:
       - elabftw_sql_key
       - elabftw_secret_key
     environment:
-      SECRET_KEY: "$${cat /run/secrets/elabftw_secret_key}"
+      SECRET_KEY: $${cat /run/secrets/elabftw_secret_key}
       DB_HOST: "172.252.0.7"
       DB_PORT: "3306"
       DB_NAME: "elabftw"