d71323ff32
- Account for different username between postgresql 9.5 (postgres)
or earlier versions (pgsql)
- Regenerate patches by 'make makepatch'
13 lines
381 B
Python
13 lines
381 B
Python
--- barman/config.py.orig 2016-09-23 12:56:55 UTC
|
|
+++ barman/config.py
|
|
@@ -520,8 +520,8 @@ class Config(object):
|
|
"""
|
|
CONFIG_FILES = [
|
|
'~/.barman.conf',
|
|
- '/etc/barman.conf',
|
|
- '/etc/barman/barman.conf',
|
|
+ '%%PREFIX%%/etc/barman.conf',
|
|
+ '%%PREFIX%%/etc/barman/barman.conf',
|
|
]
|
|
|
|
_QUOTE_RE = re.compile(r"""^(["'])(.*)\1$""")
|