diff options
| author | MaZderMind <git@mazdermind.de> | 2016-04-27 22:56:46 +0200 |
|---|---|---|
| committer | MaZderMind <git@mazdermind.de> | 2016-04-27 22:56:46 +0200 |
| commit | dea4babbc4442b91e49487b11e03aef9479c2438 (patch) | |
| tree | f66ba916e3c1e21ecbe9e93b8afacc2c76e63a12 | |
| parent | 38b557574fefa3b2ec16e3ad41ec5dcf39266ba1 (diff) | |
also allow config files in a folder under /etc
| -rw-r--r-- | voctocore/README.md | 1 | ||||
| -rw-r--r-- | voctocore/lib/config.py | 1 | ||||
| -rw-r--r-- | voctogui/README.md | 1 | ||||
| -rw-r--r-- | voctogui/lib/config.py | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/voctocore/README.md b/voctocore/README.md index d3be701..b7b5242 100644 --- a/voctocore/README.md +++ b/voctocore/README.md @@ -147,6 +147,7 @@ They can be used to Implement Features like a "Cut-Button" in the GUI. When Clic On Startup the Video-Mixer reads the following Configuration-Files: - `<install-dir>/default-config.ini` - `<install-dir>/config.ini` + - `/etc/voctomix/voctocore.ini` - `/etc/voctocore.ini` - `<homedir>/.voctocore.ini` - `<File specified on Command-Line via --ini-file>` diff --git a/voctocore/lib/config.py b/voctocore/lib/config.py index 4567acf..3075f61 100644 --- a/voctocore/lib/config.py +++ b/voctocore/lib/config.py @@ -12,6 +12,7 @@ SafeConfigParser.getlist = getlist files = [ os.path.join(os.path.dirname(os.path.realpath(__file__)), '../default-config.ini'), os.path.join(os.path.dirname(os.path.realpath(__file__)), '../config.ini'), + '/etc/voctomix/voctocore.ini', '/etc/voctomix.ini', # deprecated '/etc/voctocore.ini', os.path.expanduser('~/.voctomix.ini'), # deprecated diff --git a/voctogui/README.md b/voctogui/README.md index 081e9d8..8dcf09e 100644 --- a/voctogui/README.md +++ b/voctogui/README.md @@ -29,6 +29,7 @@ Click twice on the Selection Combobox, the select your Source within 5 Seconds ( On Startup the GUI reads the following Configuration-Files: - `<install-dir>/default-config.ini` - `<install-dir>/config.ini` + - `/etc/voctomix/voctogui.ini` - `/etc/voctogui.ini` - `<homedir>/.voctogui.ini` - `<File specified on Command-Line via --ini-file>` diff --git a/voctogui/lib/config.py b/voctogui/lib/config.py index 4120092..d4630bf 100644 --- a/voctogui/lib/config.py +++ b/voctogui/lib/config.py @@ -25,6 +25,7 @@ SafeConfigParser.fetchServerConfig = fetchServerConfig files = [ os.path.join(os.path.dirname(os.path.realpath(__file__)), '../default-config.ini'), os.path.join(os.path.dirname(os.path.realpath(__file__)), '../config.ini'), + '/etc/voctomix/voctogui.ini', '/etc/voctogui.ini', os.path.expanduser('~/.voctogui.ini'), ] |