2016-09-30 18:18:42 +02:00
|
|
|
--- barman/config.py.orig 2016-09-23 12:56:55 UTC
|
2014-12-02 16:41:14 +01:00
|
|
|
+++ barman/config.py
|
2016-09-30 18:18:42 +02:00
|
|
|
@@ -520,8 +520,8 @@ class Config(object):
|
2014-12-02 16:41:14 +01:00
|
|
|
"""
|
|
|
|
CONFIG_FILES = [
|
|
|
|
'~/.barman.conf',
|
|
|
|
- '/etc/barman.conf',
|
|
|
|
- '/etc/barman/barman.conf',
|
2014-12-03 18:10:21 +01:00
|
|
|
+ '%%PREFIX%%/etc/barman.conf',
|
|
|
|
+ '%%PREFIX%%/etc/barman/barman.conf',
|
2014-12-02 16:41:14 +01:00
|
|
|
]
|
|
|
|
|
|
|
|
_QUOTE_RE = re.compile(r"""^(["'])(.*)\1$""")
|