Mercurial > libervia-backend

changeset 3379:9081b6c41328

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
core: `sat.conf` is now first checked in `/etc/_sat.conf` for system-related settings
author Goffi <goffi@goffi.org>
date Thu, 15 Oct 2020 16:13:30 +0200
parents 67e306cae157
children 4dbf9fcbf26d
files sat/core/constants.py
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/sat/core/constants.py	Thu Oct 15 14:44:42 2020 +0200
+++ b/sat/core/constants.py	Thu Oct 15 16:13:30 2020 +0200
@@ -458,7 +458,10 @@
         # per instance configurations (e.g. a dev instance and a main instance)
         root_dir = dirname(dirname(sat.__file__)) + '/'
         Const.CONFIG_PATHS = (
-            ["/etc/", "~/", "~/."]
+            # /etc/_sat.conf is used for system-related settings (e.g. when media_dir
+            # is set by the distribution and has not reason to change, or in a Docker
+            # image)
+            ["/etc/_", "/etc/", "~/", "~/."]
             + [
                 "%s/" % path
                 for path in list(BaseDirectory.load_config_paths(Const.APP_NAME_FILE))