From e6e9a32f0385789e5e772e5cabcc0da0b8ccbb01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karol=20S=C3=B3jko?= <karolsojko@proton.me>
Date: Fri, 2 Jun 2023 12:29:19 +0200
Subject: [PATCH] fix(home-server): default configuration variables

---
 packages/home-server/.env.sample              |  9 --------
 packages/home-server/src/Server/HomeServer.ts | 21 +++++++++++++------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/packages/home-server/.env.sample b/packages/home-server/.env.sample
index 7de2b7a46..da3fbcbca 100644
--- a/packages/home-server/.env.sample
+++ b/packages/home-server/.env.sample
@@ -2,15 +2,6 @@ LOG_LEVEL=debug
 NODE_ENV=development
 VERSION=development
 
-# (Optional) New Relic Setup
-NEW_RELIC_ENABLED=false
-NEW_RELIC_APP_NAME="Home Server"
-
-CACHE_TYPE=memory
-
-DB_TYPE=sqlite
-DB_DATABASE=home_server
-
 JWT_SECRET=
 AUTH_JWT_SECRET=
 ENCRYPTION_SERVER_KEY=
diff --git a/packages/home-server/src/Server/HomeServer.ts b/packages/home-server/src/Server/HomeServer.ts
index 3f3a10373..315300f67 100644
--- a/packages/home-server/src/Server/HomeServer.ts
+++ b/packages/home-server/src/Server/HomeServer.ts
@@ -30,7 +30,16 @@ export class HomeServer implements HomeServerInterface {
     const serviceContainer = new ServiceContainer()
     const directCallDomainEventPublisher = new DirectCallDomainEventPublisher()
 
-    const env: Env = new Env(configuration?.environment)
+    const environmentOverrides = {
+      ...configuration?.environment,
+      NEW_RELIC_ENABLED: 'false',
+      NEW_RELIC_APP_NAME: 'Home Server',
+      CACHE_TYPE: 'memory',
+      DB_TYPE: 'sqlite',
+      DB_DATABASE: 'home_server',
+    }
+
+    const env: Env = new Env(environmentOverrides)
     env.load()
 
     this.configureLoggers(env)
@@ -44,23 +53,23 @@ export class HomeServer implements HomeServerInterface {
     const container = Container.merge(
       (await apiGatewayService.getContainer({
         logger: winston.loggers.get('api-gateway'),
-        environmentOverrides: configuration?.environment,
+        environmentOverrides,
       })) as Container,
       (await authService.getContainer({
         logger: winston.loggers.get('auth-server'),
-        environmentOverrides: configuration?.environment,
+        environmentOverrides,
       })) as Container,
       (await syncingService.getContainer({
         logger: winston.loggers.get('syncing-server'),
-        environmentOverrides: configuration?.environment,
+        environmentOverrides,
       })) as Container,
       (await revisionsService.getContainer({
         logger: winston.loggers.get('revisions-server'),
-        environmentOverrides: configuration?.environment,
+        environmentOverrides,
       })) as Container,
       (await filesService.getContainer({
         logger: winston.loggers.get('files-server'),
-        environmentOverrides: configuration?.environment,
+        environmentOverrides,
       })) as Container,
     )