Sadly, nope, since barman is supposed to be run from _barman's crontab,
(as shown in the pkg README) which has no write rights on /var/run -
hence the possibility of a subdir owned by _barman, but since there's no
rc script to create it like its done for ckit or dbus...
Ah ok. Yeah so @sample /var/spool/barman or something.
After better acquainting myself with pkg/PLIST annotations, I've updated
the doc/ patch and PLIST to refer to /var/spool/barman/ as the lock
directory. Thanks for the review.
--
Eric
Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/barman/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Makefile 29 Sep 2015 10:51:14 -0000 1.5
+++ Makefile 22 Dec 2015 21:02:27 -0000
@@ -2,11 +2,10 @@
COMMENT = backup and restoration manager for PostgreSQL
-MODPY_EGG_VERSION = 1.4.1
+MODPY_EGG_VERSION = 1.5.1
DISTNAME = barman-${MODPY_EGG_VERSION}
CATEGORIES = databases
HOMEPAGE = http://www.pgbarman.org/
-REVISION = 0
MAINTAINER= Eric Lalonde <[email protected]>
Index: distinfo
===================================================================
RCS file: /cvs/ports/databases/barman/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo 13 May 2015 20:11:24 -0000 1.3
+++ distinfo 22 Dec 2015 21:02:27 -0000
@@ -1,2 +1,2 @@
-SHA256 (barman-1.4.1.tar.gz) = OKZJqxzqgR4tuUENh8CEI76zE1+IsRYJE7y58WoQsd8=
-SIZE (barman-1.4.1.tar.gz) = 122048
+SHA256 (barman-1.5.1.tar.gz) = aRJ8KY+R9pYkHfDhX5Mn1TsFDLvuprpd7AOa6nbUMt4=
+SIZE (barman-1.5.1.tar.gz) = 132842
Index: patches/patch-doc_barman_conf
===================================================================
RCS file: /cvs/ports/databases/barman/patches/patch-doc_barman_conf,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-doc_barman_conf
--- patches/patch-doc_barman_conf 26 Aug 2013 09:37:52 -0000 1.1
+++ patches/patch-doc_barman_conf 22 Dec 2015 21:02:27 -0000
@@ -1,12 +1,15 @@
-$OpenBSD: patch-doc_barman_conf,v 1.1 2013/08/26 09:37:52 landry Exp $
---- doc/barman.conf.orig Tue Aug 20 16:34:28 2013
-+++ doc/barman.conf Tue Aug 20 16:35:30 2013
-@@ -5,10 +5,10 @@
+--- doc/barman.conf.orig Wed Nov 4 07:00:11 2015
++++ doc/barman.conf Tue Dec 22 03:26:06 2015
+@@ -5,13 +5,13 @@
[barman]
; Main directory
-barman_home = /var/lib/barman
+barman_home = /var/db/barman
+
+ ; Locks directory - default: %(barman_home)s
+-;barman_lock_directory = /var/run/barman
++;barman_lock_directory = /var/spool/barman
; System user
-barman_user = barman
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/databases/barman/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST 24 Mar 2015 20:25:01 -0000 1.3
+++ pkg/PLIST 22 Dec 2015 21:02:27 -0000
@@ -8,6 +8,7 @@
@mode 0750
@sample /var/db/barman/
@sample /var/log/barman/
+@sample /var/spool/barman/
@mode
@owner
@group
@@ -23,6 +24,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/barman/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/barman/backup.py
lib/python${MODPY_VERSION}/site-packages/barman/backup.pyc
+lib/python${MODPY_VERSION}/site-packages/barman/backup_executor.py
+lib/python${MODPY_VERSION}/site-packages/barman/backup_executor.pyc
lib/python${MODPY_VERSION}/site-packages/barman/cli.py
lib/python${MODPY_VERSION}/site-packages/barman/cli.pyc
lib/python${MODPY_VERSION}/site-packages/barman/command_wrappers.py
@@ -43,12 +46,12 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/barman/lockfile.pyc
lib/python${MODPY_VERSION}/site-packages/barman/output.py
lib/python${MODPY_VERSION}/site-packages/barman/output.pyc
+lib/python${MODPY_VERSION}/site-packages/barman/recovery_executor.py
+lib/python${MODPY_VERSION}/site-packages/barman/recovery_executor.pyc
lib/python${MODPY_VERSION}/site-packages/barman/retention_policies.py
lib/python${MODPY_VERSION}/site-packages/barman/retention_policies.pyc
lib/python${MODPY_VERSION}/site-packages/barman/server.py
lib/python${MODPY_VERSION}/site-packages/barman/server.pyc
-lib/python${MODPY_VERSION}/site-packages/barman/testing_helpers.py
-lib/python${MODPY_VERSION}/site-packages/barman/testing_helpers.pyc
lib/python${MODPY_VERSION}/site-packages/barman/utils.py
lib/python${MODPY_VERSION}/site-packages/barman/utils.pyc
lib/python${MODPY_VERSION}/site-packages/barman/version.py