Move the configuration file to /etc/dbl/dbl.conf

That way, we can have some companion files with credentials, etc.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/dbl/api/__init__.py b/src/dbl/api/__init__.py
index d2795ea424ac593127973f7e0638913305a62362..53248033be9ac189fbeead65f2820e6761e5e7d9 100644 (file)
--- a/src/dbl/api/__init__.py
+++ b/src/dbl/api/__init__.py
@@ -39,7 +39,7 @@ app.add_middleware(middlewares.DatabaseSessionMiddleware)
 
 # Initialize the backend
 backend = app.state.backend = Backend(
-       config = "/etc/dbl.conf",
+       config = "/etc/dbl/dbl.conf",
        debug  = True,
 )
 

diff --git a/src/scripts/dbl.in b/src/scripts/dbl.in
index 1e32833787e80e67b5bb32560426314d3b20e34d..aa4560f6968fa16e27c4f01b700c6f1940b881be 100644 (file)
--- a/src/scripts/dbl.in
+++ b/src/scripts/dbl.in
@@ -52,7 +52,7 @@ class CLI(object):
                subparsers = parser.add_subparsers()
 
                # Global Configuration Flags
-               parser.add_argument("--config", default="@sysconfdir@/dbl.conf",
+               parser.add_argument("--config", default="@sysconfdir@/dbl/dbl.conf",
                                type=argparse.FileType("r"), help=_("Configuration File"))
 
                # Logging Flags