From 7ed6c641cc501246931721700b73f40dce7e8f4b Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 22 Dec 2020 15:38:56 +0100
Subject: [PATCH 1/2] Define configs with env vars

---
 app.php                      | 4 ++--
 services/DatabaseService.php | 2 +-
 services/FilesService.php    | 2 +-
 services/StockService.php    | 3 +--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app.php b/app.php
index 8176ebe..04432ba 100644
--- a/app.php
+++ b/app.php
@@ -10,7 +10,7 @@ use Slim\Factory\AppFactory;
 require_once __DIR__ . '/vendor/autoload.php';
 
 // Load config files
-require_once GROCY_DATAPATH . '/config.php';
+require_once getenv('GROCY_CONFIG_FILE');
 require_once __DIR__ . '/config-dist.php'; // For not in own config defined values we use the default ones
 
 // Definitions for dev/demo/prerelease mode
@@ -37,7 +37,7 @@ $app = AppFactory::create();
 
 $container = $app->getContainer();
 $container->set('view', function (Container $container) {
-	return new Slim\Views\Blade(__DIR__ . '/views', GROCY_DATAPATH . '/viewcache');
+	return new Slim\Views\Blade(__DIR__ . '/views', getenv('GROCY_CACHE_DIR'));
 });
 $container->set('UrlManager', function (Container $container) {
 	return new UrlManager(GROCY_BASE_URL);
diff --git a/services/DatabaseService.php b/services/DatabaseService.php
index d1080b0..8bc4ee1 100644
--- a/services/DatabaseService.php
+++ b/services/DatabaseService.php
@@ -105,6 +105,6 @@ class DatabaseService
 			return GROCY_DATAPATH . '/grocy_' . $dbSuffix . '.db';
 		}
 
-		return GROCY_DATAPATH . '/grocy.db';
+		return getenv('GROCY_DB_FILE');
 	}
 }
diff --git a/services/FilesService.php b/services/FilesService.php
index 8c1483e..8f74b4b 100644
--- a/services/FilesService.php
+++ b/services/FilesService.php
@@ -70,7 +70,7 @@ class FilesService extends BaseService
 	{
 		parent::__construct();
 
-		$this->StoragePath = GROCY_DATAPATH . '/storage';
+		$this->StoragePath = getenv('GROCY_STORAGE_DIR');
 
 		if (!file_exists($this->StoragePath))
 		{
diff --git a/services/StockService.php b/services/StockService.php
index 4741b4b..6d4e748 100644
--- a/services/StockService.php
+++ b/services/StockService.php
@@ -1374,8 +1374,7 @@ class StockService extends BaseService
 			throw new \Exception('No barcode lookup plugin defined');
 		}
 
-		$path = GROCY_DATAPATH . "/plugins/$pluginName.php";
-
+		$path = getenv('GROCY_PLUGIN_DIR') . "/$pluginName.php";
 		if (file_exists($path))
 		{
 			require_once $path;
-- 
2.29.2