pr conflict resolving

This commit is contained in:
2020-04-09 08:48:02 +02:00
parent e77f7ea200
commit 38bcce9362

View File

@@ -1,13 +1,13 @@
import os
HOST = "0.0.0.0"
PORT = 9814
DATA_DIR = os.path.expanduser("~/.teos/")
CONF_FILE_NAME = "teos.conf"
LOG_PREFIX = "teos"
# Default conf fields
DEFAULT_CONF = {
"API_CONNECT": {"value": "localhost", "type": str},
"API_PORT": {"value": 9814, "type": int},
"BTC_RPC_USER": {"value": "user", "type": str},
"BTC_RPC_PASSWORD": {"value": "passwd", "type": str},
"BTC_RPC_CONNECT": {"value": "127.0.0.1", "type": str},
@@ -25,3 +25,4 @@ DEFAULT_CONF = {
"APPOINTMENTS_DB_PATH": {"value": "appointments", "type": str, "path": True},
"USERS_DB_PATH": {"value": "users", "type": str, "path": True},
}