From 47eeb38edfd4cc21b8af6071fd4dca8cbfe8fcb5 Mon Sep 17 00:00:00 2001
From: Krateng <git.noreply@krateng.ch>
Date: Tue, 3 Dec 2019 16:10:22 +0100
Subject: [PATCH] Moved doreah settings

---
 .dev                      |  0
 maloja/__init__.py        | 21 ++++++++++++++++++++-
 maloja/data_files/.doreah | 12 ------------
 3 files changed, 20 insertions(+), 13 deletions(-)
 delete mode 100644 .dev
 delete mode 100644 maloja/data_files/.doreah

diff --git a/.dev b/.dev
deleted file mode 100644
index e69de29..0000000
diff --git a/maloja/__init__.py b/maloja/__init__.py
index 7940e5c..6d7b188 100644
--- a/maloja/__init__.py
+++ b/maloja/__init__.py
@@ -5,7 +5,7 @@ from .info import author,version,versionstr
 requires = [
 	"bottle>=0.12.16",
 	"waitress>=1.3",
-	"doreah>=1.2.9",
+	"doreah>=1.2.10",
 	"nimrodel>=0.4.9",
 	"setproctitle>=1.1.10",
 	"wand>=0.5.4",
@@ -21,3 +21,22 @@ resources = [
 commands = {
 	"maloja":"controller:main"
 }
+
+from doreah import config
+config(
+	logging={
+		"logfolder": "logs"
+	},
+	settings={
+		"files":[
+			"settings/default.ini",
+			"settings/settings.ini"
+		]
+	},
+	caching={
+		"folder": "cache/"
+	},
+	regular={
+		"autostart": False
+	}
+)
diff --git a/maloja/data_files/.doreah b/maloja/data_files/.doreah
deleted file mode 100644
index 29356ba..0000000
--- a/maloja/data_files/.doreah
+++ /dev/null
@@ -1,12 +0,0 @@
-logging:
-   logfolder: "logs"
-settings:
-   files:
-   - "settings/default.ini"
-   - "settings/settings.ini"
-caching:
-   folder: "cache/"
-regular:
-   autostart: false
-pyhp:
-   version: 2