From 59b7820b3f09d2230c137e8f87feffa0b7338ecc Mon Sep 17 00:00:00 2001 From: Goffi Date: Thu, 15 Oct 2020 16:13:30 +0200 Subject: [PATCH] core: `sat.conf` is now first checked in `/etc/_sat.conf` for system-related settings --- sat/core/constants.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sat/core/constants.py b/sat/core/constants.py index f62dfbc9..84ff7806 100644 --- a/sat/core/constants.py +++ b/sat/core/constants.py @@ -458,7 +458,10 @@ if ( # 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))