From 9a5210a65664791f550cb778650ff13c5788d5be Mon Sep 17 00:00:00 2001
From: Oskar <o.winkels@fasttube.de>
Date: Mon, 7 Dec 2020 23:27:41 +0100
Subject: [PATCH] Deployment improvements

---
 fs-quiz-tool-db/__main__.py | 2 +-
 fs-quiz-tool-db/app.py      | 3 ++-
 res/fs-quiz-tool.rc         | 7 +++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/fs-quiz-tool-db/__main__.py b/fs-quiz-tool-db/__main__.py
index 0df5575..3478e00 100644
--- a/fs-quiz-tool-db/__main__.py
+++ b/fs-quiz-tool-db/__main__.py
@@ -17,4 +17,4 @@ if __name__ == "__main__":
 		response.headers['Access-Control-Allow-Methods'] = 'GET, POST, OPTIONS'
 		return response
 
-	app.run(host='0.0.0.0', port=12345)
+	app.run(port=12345)
diff --git a/fs-quiz-tool-db/app.py b/fs-quiz-tool-db/app.py
index 0f90345..9b77035 100644
--- a/fs-quiz-tool-db/app.py
+++ b/fs-quiz-tool-db/app.py
@@ -1,4 +1,5 @@
 from flask import Flask, request
+import sys
 import json
 import string
 import random
@@ -6,7 +7,7 @@ import atexit
 
 app = Flask(__name__)
 
-filename = 'db.json'
+filename = sys.argv[1] if len(sys.argv) > 1 else 'db.json'
 id_length = 16
 
 data = {}
diff --git a/res/fs-quiz-tool.rc b/res/fs-quiz-tool.rc
index 75ac605..8e70c55 100644
--- a/res/fs-quiz-tool.rc
+++ b/res/fs-quiz-tool.rc
@@ -18,8 +18,11 @@ pidfile="/var/run/${name}.pid"
 task="/usr/local/bin/python3.7 -m fs-quiz-tool-db"
 procname="/usr/local/bin/python3.7"
 
-command="/usr/sbin/daemon"
-command_args="-p ${pidfile} ${task}"
+dbfile="/var/fs-quiz-tool/db.json"
+task="/usr/local/bin/python3.7 -m fs-quiz-tool-db ${dbfile}"
+procname="/usr/local/bin/python3.7"
+
+sig_stop="INT"
 
 load_rc_config ${name}
 run_rc_command "$1"