aboutsummaryrefslogtreecommitdiff
path: root/voctocore
diff options
context:
space:
mode:
Diffstat (limited to 'voctocore')
-rw-r--r--voctocore/README.md1
-rw-r--r--voctocore/lib/config.py1
2 files changed, 2 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