From 83f73758c4b1afd2edd3a810fc4804fbeb5fe35e Mon Sep 17 00:00:00 2001
From: Krateng <git.noreply@krateng.ch>
Date: Fri, 28 Feb 2020 16:22:57 +0100
Subject: [PATCH] Can now load settings from environment variables GH-10

---
 maloja/__init__.py   | 2 +-
 maloja/globalconf.py | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/maloja/__init__.py b/maloja/__init__.py
index 866be66..63658f7 100644
--- a/maloja/__init__.py
+++ b/maloja/__init__.py
@@ -14,7 +14,7 @@ versionstr = ".".join(str(n) for n in version)
 requires = [
 	"bottle>=0.12.16",
 	"waitress>=1.3",
-	"doreah>=1.4.5",
+	"doreah>=1.5.2",
 	"nimrodel>=0.6.3",
 	"setproctitle>=1.1.10",
 	"wand>=0.5.4",
diff --git a/maloja/globalconf.py b/maloja/globalconf.py
index 6389091..4118189 100644
--- a/maloja/globalconf.py
+++ b/maloja/globalconf.py
@@ -33,7 +33,8 @@ config(
 		"files":[
 			datadir("settings/default.ini"),
 			datadir("settings/settings.ini")
-		]
+		],
+		"environ_prefix":"MALOJA_"
 	},
 	caching={
 		"folder": datadir("cache")