summaryrefslogtreecommitdiff
path: root/databases/pgbarman/files
diff options
context:
space:
mode:
Diffstat (limited to 'databases/pgbarman/files')
-rw-r--r--databases/pgbarman/files/patch-barman_config.py16
-rw-r--r--databases/pgbarman/files/patch-doc_barman.562
-rw-r--r--databases/pgbarman/files/patch-setup.py37
3 files changed, 54 insertions, 61 deletions
diff --git a/databases/pgbarman/files/patch-barman_config.py b/databases/pgbarman/files/patch-barman_config.py
index 9c510c52f6b6..3d22d892e578 100644
--- a/databases/pgbarman/files/patch-barman_config.py
+++ b/databases/pgbarman/files/patch-barman_config.py
@@ -1,13 +1,13 @@
---- barman/config.py.orig 2019-12-02 10:19:28 UTC
+--- barman/config.py.orig 2021-12-01 11:09:36 UTC
+++ barman/config.py
-@@ -592,8 +592,8 @@ class Config(object):
- """
+@@ -661,8 +661,8 @@ class Config(object):
+
CONFIG_FILES = [
- '~/.barman.conf',
-- '/etc/barman.conf',
-- '/etc/barman/barman.conf',
-+ '%%PREFIX%%/etc/barman.conf',
-+ '%%PREFIX%%/etc/barman/barman.conf',
+ "~/.barman.conf",
+- "/etc/barman.conf",
+- "/etc/barman/barman.conf",
++ "%%PREFIX%%/etc/barman.conf",
++ "%%PREFIX%%/etc/barman/barman.conf",
]
_QUOTE_RE = re.compile(r"""^(["'])(.*)\1$""")
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
diff --git a/databases/pgbarman/files/patch-setup.py b/databases/pgbarman/files/patch-setup.py
index 1dc83e103ea2..4c4266d4ee38 100644
--- a/databases/pgbarman/files/patch-setup.py
+++ b/databases/pgbarman/files/patch-setup.py
@@ -1,27 +1,20 @@
---- setup.py.orig 2020-07-08 09:12:30 UTC
+--- setup.py.orig 2021-12-01 11:09:36 UTC
+++ setup.py
-@@ -70,15 +70,15 @@ setup(
- url='http://www.pgbarman.org/',
+@@ -61,7 +61,7 @@ setup(
packages=find_packages(exclude=["tests"]),
data_files=[
-- ('share/man/man1', ['doc/barman.1',
-- 'doc/barman-cloud-backup.1',
-- 'doc/barman-cloud-backup-list.1',
-- 'doc/barman-cloud-restore.1',
-- 'doc/barman-cloud-wal-archive.1',
-- 'doc/barman-cloud-wal-restore.1',
-- 'doc/barman-wal-archive.1',
-- 'doc/barman-wal-restore.1']),
-- ('share/man/man5', ['doc/barman.5']),
-+ ('man/man1', ['doc/barman.1',
-+ 'doc/barman-cloud-backup.1',
-+ 'doc/barman-cloud-backup-list.1',
-+ 'doc/barman-cloud-restore.1',
-+ 'doc/barman-cloud-wal-archive.1',
-+ 'doc/barman-cloud-wal-restore.1',
-+ 'doc/barman-wal-archive.1',
-+ 'doc/barman-wal-restore.1']),
-+ ('man/man5', ['doc/barman.5']),
+ (
+- "share/man/man1",
++ "man/man1",
+ [
+ "doc/barman.1",
+ "doc/barman-cloud-backup.1",
+@@ -73,7 +73,7 @@ setup(
+ "doc/barman-wal-restore.1",
+ ],
+ ),
+- ("share/man/man5", ["doc/barman.5"]),
++ ("man/man5", ["doc/barman.5"]),
],
entry_points={
- 'console_scripts': [
+ "console_scripts": [
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-07 08:23:42 +0000