# HG changeset patch # User Goffi # Date 1602771210 -7200 # Node ID 9081b6c41328c6207c9cc5ccd0b3a1aa267549f6 # Parent 67e306cae157e9216ffafa8605f0e9b0c7cf47c1 core: `sat.conf` is now first checked in `/etc/_sat.conf` for system-related settings diff -r 67e306cae157 -r 9081b6c41328 sat/core/constants.py --- 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))