diff options
| author | Matthew Seaman <matthew@FreeBSD.org> | 2021-12-17 13:40:37 +0000 |
|---|---|---|
| committer | Matthew Seaman <matthew@FreeBSD.org> | 2021-12-17 13:51:15 +0000 |
| commit | 73e9076cbb643952df24c76910e6538d597f92ef (patch) | |
| tree | d7b2f8526bcc7ec98d66105fe514047b9ab105be /databases/pgbarman/files/patch-doc_barman.5 | |
| parent | databases/pg_citus: update to 10.2.3 (diff) | |
databases/pgbarman: Update to 2.17
Following upstream changes, switch master site to GitHub, including
for hte pre-build PDF manual.
Drop support for python-3.6 -- the software claims to support this
version, but setup.py fails with an obscure error, and considering
that python-3.6 is going out of support at the end of this month, I
could not justify the time to develop a compatibility fix.
Drop the USE_PYTHON 'optsuffix' flag in favour of an explicit
PKGNAMESUFFIX
As reported in PR 260340, appending the python version to the barman
${ETCDIR} doesn't make sense. Fix this by dropping the USE_PYTHON
'concurrent' flag, which doesn't really make sense for end-user
software rather than library modules. (1)
PR: 260340 (1)
Reported by: bsd at abinet.ru
Diffstat (limited to 'databases/pgbarman/files/patch-doc_barman.5')
| -rw-r--r-- | databases/pgbarman/files/patch-doc_barman.5 | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/databases/pgbarman/files/patch-doc_barman.5 b/databases/pgbarman/files/patch-doc_barman.5 index f753f01839fc..abaa27b7fbed 100644 --- a/databases/pgbarman/files/patch-doc_barman.5 +++ b/databases/pgbarman/files/patch-doc_barman.5 @@ -1,12 +1,12 @@ ---- doc/barman.5.orig 2019-12-02 10:19:28 UTC +--- doc/barman.5.orig 2021-12-01 11:09:36 UTC +++ doc/barman.5 -@@ -17,7 +17,7 @@ The system-level Barman configuration file is located +@@ -17,7 +17,7 @@ The system\-level Barman configuration file is located .IP .nf \f[C] -/etc/barman.conf +%%PREFIX%%/etc/barman.conf - \f[R] + \f[] .fi .PP @@ -25,7 +25,7 @@ or @@ -15,44 +15,44 @@ \f[C] -/etc/barman/barman.conf +%%PREFIX%%/etc/barman/barman.conf - \f[R] + \f[] .fi .PP @@ -51,9 +51,9 @@ configurations. - If the value of \f[C]configuration_files_directory\f[R] is a directory, - Barman reads all files with \f[C].conf\f[R] extension that exist in that - folder. --For example, if you set it to \f[C]/etc/barman.d\f[R], you can specify -+For example, if you set it to \f[C]%%PREFIX%%/etc/barman.d\f[R], you can specify + 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[R] file inside the \f[C]/etc/barman.d\f[R] folder. -+\f[C].conf\f[R] file inside the \f[C]%%PREFIX%%/etc/barman.d\f[R] folder. +-\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 - active -@@ -632,7 +632,7 @@ Here is an example of configuration file: + .B active +@@ -851,7 +851,7 @@ Here is an example of configuration file: \f[C] [barman] - ; Main directory --barman_home = /var/lib/barman -+barman_home = /var/barman + ;\ Main\ directory +-barman_home\ =\ /var/lib/barman ++barman_home\ =\ /var/barman - ; System user - barman_user = barman -@@ -652,13 +652,13 @@ reuse_backup = link - description = \[dq]Main PostgreSQL Database\[dq] + ;\ System\ user + barman_user\ =\ barman +@@ -871,13 +871,13 @@ reuse_backup\ =\ link + description\ =\ \ "Main\ PostgreSQL\ Database" - ; SSH options --ssh_command = ssh postgres\[at]pg -+ssh_command = ssh %%PGUSER%%\[at]pg + ;\ 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%% + ;\ PostgreSQL\ connection\ string +-conninfo\ =\ host=pg\ user=postgres ++conninfo\ =\ host=pg\ user=%%PGUSER%% - ; PostgreSQL streaming connection string --streaming_conninfo = host=pg user=postgres -+streaming_conninfo = host=pg user=%%PGUSER%% + ;\ 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 + ;\ Minimum\ number\ of\ required\ backups\ (redundancy) + minimum_redundancy\ =\ 1 |
