d71323ff32
- Account for different username between postgresql 9.5 (postgres)
or earlier versions (pgsql)
- Regenerate patches by 'make makepatch'
58 lines
1.6 KiB
Groff
58 lines
1.6 KiB
Groff
--- doc/barman.5.orig 2016-09-26 15:32:17 UTC
|
|
+++ doc/barman.5
|
|
@@ -17,7 +17,7 @@ The system\-level Barman configuration f
|
|
.IP
|
|
.nf
|
|
\f[C]
|
|
-/etc/barman.conf
|
|
+%%PREFIX%%/etc/barman.conf
|
|
\f[]
|
|
.fi
|
|
.PP
|
|
@@ -25,7 +25,7 @@ or
|
|
.IP
|
|
.nf
|
|
\f[C]
|
|
-/etc/barman/barman.conf
|
|
+%%PREFIX%%/etc/barman/barman.conf
|
|
\f[]
|
|
.fi
|
|
.PP
|
|
@@ -51,9 +51,9 @@ configurations.
|
|
If the value of \f[C]configuration_files_directory\f[] is a directory,
|
|
Barman reads all files with \f[C]\&.conf\f[] extension that exist in
|
|
that folder.
|
|
-For example, if you set it to \f[C]/etc/barman.d\f[], you can specify
|
|
+For example, if you set it to \f[C]%%PREFIX%%/etc/barman.d\f[], you can specify
|
|
your PostgreSQL servers placing each section in a separate
|
|
-\f[C]\&.conf\f[] file inside the \f[C]/etc/barman.d\f[] folder.
|
|
+\f[C]\&.conf\f[] file inside the \f[C]%%PREFIX%%/etc/barman.d\f[] folder.
|
|
.SH OPTIONS
|
|
.TP
|
|
.B active
|
|
@@ -608,7 +608,7 @@ Here is an example of configuration file
|
|
\f[C]
|
|
[barman]
|
|
;\ Main\ directory
|
|
-barman_home\ =\ /var/lib/barman
|
|
+barman_home\ =\ /var/barman
|
|
|
|
;\ System\ user
|
|
barman_user\ =\ barman
|
|
@@ -628,13 +628,13 @@ reuse_backup\ =\ link
|
|
description\ =\ \ "Main\ PostgreSQL\ Database"
|
|
|
|
;\ SSH\ options
|
|
-ssh_command\ =\ ssh\ postgres\@pg
|
|
+ssh_command\ =\ ssh\ %%PGUSER%%\@pg
|
|
|
|
;\ PostgreSQL\ connection\ string
|
|
-conninfo\ =\ host=pg\ user=postgres
|
|
+conninfo\ =\ host=pg\ user=%%PGUSER%%\ db=postgres
|
|
|
|
;\ PostgreSQL\ streaming\ connection\ string
|
|
-streaming_conninfo\ =\ host=pg\ user=postgres
|
|
+streaming_conninfo\ =\ host=pg\ user=%%PGUSER%%
|
|
|
|
;\ Minimum\ number\ of\ required\ backups\ (redundancy)
|
|
minimum_redundancy\ =\ 1
|