evilham/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Support in-distribution config file

Browse source
This commit is contained in:
Darko Poljak 2018-03-01 20:12:21 +01:00
commit 378c7f6a89
3 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cdist/configuration.py
View file

@ -275,7 +275,10 @@ class Configuration(metaclass=Singleton):
os.environ.get('XDG_CONFIG_HOME', os.environ.get('XDG_CONFIG_HOME',
os.path.expanduser('~/.config/cdist')), os.path.expanduser('~/.config/cdist')),
_config_basename) _config_basename)
default_config_files = (_global_config_file, _local_config_file, ) _dist_config_file = os.path.join(
os.path.abspath(os.path.join(os.path.dirname(cdist.__file__), "conf")),
'cdist.cfg')
default_config_files = (_global_config_file, _dist_config_file, _local_config_file, )
ENV_VAR_CONFIG_FILE = 'CDIST_CONFIG_FILE' ENV_VAR_CONFIG_FILE = 'CDIST_CONFIG_FILE'
VERBOSITY_VALUES = _VERBOSITY_VALUES VERBOSITY_VALUES = _VERBOSITY_VALUES

1
docs/changelog
View file

@ -12,6 +12,7 @@ next:
* Core: Fix lost error info with parallel jobs (option -j) (Darko Poljak) * Core: Fix lost error info with parallel jobs (option -j) (Darko Poljak)
* Core: Fix determining beta value through configuration (Darko Poljak) * Core: Fix determining beta value through configuration (Darko Poljak)
* Core: Fix determining save_output_streams value through configuration (Darko Poljak) * Core: Fix determining save_output_streams value through configuration (Darko Poljak)
* Core: Support in-distribution config file (Darko Poljak)
4.8.0: 2018-02-14 4.8.0: 2018-02-14
* Core: Skip empty lines in parameter files (Darko Poljak) * Core: Skip empty lines in parameter files (Darko Poljak)

1
docs/src/cdist-configuration.rst
View file

@ -11,6 +11,7 @@ order:
#. configuration file specified in CDIST_CONFIG_FILE environment variable #. configuration file specified in CDIST_CONFIG_FILE environment variable
#. environment variables #. environment variables
#. user's configuration file (first one found of ~/.cdist.cfg, $XDG_CONFIG_HOME/cdist/cdist.cfg, in specified order) #. user's configuration file (first one found of ~/.cdist.cfg, $XDG_CONFIG_HOME/cdist/cdist.cfg, in specified order)
#. in-distribution configuration file (cdist/conf/cdist.cfg)
#. system-wide configuration file (/etc/cdist.cfg) #. system-wide configuration file (/etc/cdist.cfg)
if one exists. if one exists.