Skip to content

Commit

Permalink
Resolves Issue #140
Browse files Browse the repository at this point in the history
  • Loading branch information
BJ Dierkes committed Jul 31, 2012
1 parent 431bf68 commit f9621a1
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions ChangeLog
Expand Up @@ -27,6 +27,7 @@ Bugs:

Features:

* :issue:`140` - Included ~/.myapp/config in default config search
* :issue:`144` - Added a note on Contributing, as well as a CONTRIBUTORS
file.

Expand Down
3 changes: 2 additions & 1 deletion cement/core/foundation.py
Expand Up @@ -106,7 +106,7 @@ class CementApp(meta.MetaMixin):
set this to a default list based on Meta.label (or in other words,
the name of the application). This will equate to:
['/etc/<app_label>/<app_label>.conf', '~/.<app_label>.conf']
['/etc/<app_label>/<app_label>.conf', '~/.<app_label>.conf', '~/.<app_label>/config']
plugins
A list of plugins to load. This is generally considered bad
Expand Down Expand Up @@ -676,6 +676,7 @@ def _setup_config_handler(self):
self._meta.config_files = [
os.path.join('/', 'etc', label, '%s.conf' % label),
os.path.join(user_home, '.%s.conf' % label),
os.path.join(user_home, '.%s' % label, 'config'),
]
for _file in self._meta.config_files:
self.config.parse_file(_file)
Expand Down
1 change: 1 addition & 0 deletions doc/source/dev/configuration.rst
Expand Up @@ -209,6 +209,7 @@ If no config_files meta data is provided, Cement will set the defaults to:

* /etc/<app_label>/<app_label>.conf
* ~/.<app_label>.conf
* ~/.<app_label>/config


Overriding Configurations with Command Line Options
Expand Down

0 comments on commit f9621a1

Please sign in to comment.