x/solar
Code Issues Proposed changes

Merge "Add /etc/solar/config.yaml as first file in config"

Browse Source
This commit is contained in:
Jenkins 2016-03-03 10:48:15 +00:00 committed by Gerrit Code Review
commit 30e2379c4a
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
solar/config.py
View File

@ -54,6 +54,7 @@ def _lookup_vals(setter, config, prefix=None):
def from_configs():
paths = [
'/etc/solar/solar.yaml',
os.getenv('SOLAR_CONFIG', os.path.join(CWD, '.config')),
os.getenv('SOLAR_CONFIG_OVERRIDE', None),
os.path.join(CWD, '.config.override')