From owner-svn-ports-head@FreeBSD.ORG Wed Dec 3 17:05:06 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4131028F; Wed, 3 Dec 2014 17:05:06 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2C872C97; Wed, 3 Dec 2014 17:05:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB3H56fo096931; Wed, 3 Dec 2014 17:05:06 GMT (envelope-from matthew@FreeBSD.org) Received: (from matthew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB3H54FM096926; Wed, 3 Dec 2014 17:05:04 GMT (envelope-from matthew@FreeBSD.org) Message-Id: <201412031705.sB3H54FM096926@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: matthew set sender to matthew@FreeBSD.org using -f From: Matthew Seaman Date: Wed, 3 Dec 2014 17:05:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r373845 - in head/databases/pgbarman: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Dec 2014 17:05:06 -0000 Author: matthew Date: Wed Dec 3 17:05:04 2014 New Revision: 373845 URL: https://svnweb.freebsd.org/changeset/ports/373845 QAT: https://qat.redports.org/buildarchive/r373845/ Log: - Install man pages to a location where man(1) can find them - While here update man pages and speciment barman.conf file to use FreeBSD-ish locations for various things, particularly that our idea of the PostgreSQL default user is 'pgsql' although the database to connect to is 'postgres' Added: head/databases/pgbarman/files/patch-doc_barman.5 (contents, props changed) head/databases/pgbarman/files/patch-doc_barman.conf (contents, props changed) head/databases/pgbarman/files/patch-setup.py (contents, props changed) Modified: head/databases/pgbarman/Makefile head/databases/pgbarman/files/patch-barman_config.py (contents, props changed) Modified: head/databases/pgbarman/Makefile ============================================================================== --- head/databases/pgbarman/Makefile Wed Dec 3 16:52:47 2014 (r373844) +++ head/databases/pgbarman/Makefile Wed Dec 3 17:05:04 2014 (r373845) @@ -3,6 +3,7 @@ PORTNAME= barman DISTVERSION= 1.3.3 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= SF/${PKGNAMEPREFIX}${PORTNAME}/${DISTVERSION} PKGNAMEPREFIX= pg Modified: head/databases/pgbarman/files/patch-barman_config.py ============================================================================== --- head/databases/pgbarman/files/patch-barman_config.py Wed Dec 3 16:52:47 2014 (r373844) +++ head/databases/pgbarman/files/patch-barman_config.py Wed Dec 3 17:05:04 2014 (r373845) @@ -1,4 +1,4 @@ ---- barman/config.py.orig 2014-12-02 14:47:11 UTC +--- barman/config.py.orig 2014-08-01 13:50:46 UTC +++ barman/config.py @@ -341,8 +341,8 @@ class Config(object): """ @@ -6,8 +6,8 @@ '~/.barman.conf', - '/etc/barman.conf', - '/etc/barman/barman.conf', -+ '%%PREFIX%%/etc/barman.conf', -+ '%%PREFIX%%/etc/barman/barman.conf', ++ '/usr/local/etc/barman.conf', ++ '/usr/local/etc/barman/barman.conf', ] _QUOTE_RE = re.compile(r"""^(["'])(.*)\1$""") Added: head/databases/pgbarman/files/patch-doc_barman.5 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/pgbarman/files/patch-doc_barman.5 Wed Dec 3 17:05:04 2014 (r373845) @@ -0,0 +1,51 @@ +--- doc/barman.5.orig 2014-08-18 10:29:45 UTC ++++ doc/barman.5 +@@ -37,7 +37,7 @@ The system\-level Barman configuration f + .RS 4 + .\} + .nf +-/etc/barman\&.conf ++/usr/local/etc/barman\&.conf + .fi + .if n \{\ + .RE +@@ -49,7 +49,7 @@ or + .RS 4 + .\} + .nf +-/etc/barman/barman\&.conf ++/usr/local/etc/barman/barman\&.conf + .fi + .if n \{\ + .RE +@@ -71,7 +71,7 @@ $HOME/\&.barman\&.conf + The Barman configuration file is a plain ini file\&. There is a general section called [barman] and a section [servername] for each server you want to backup\&. Rows starting with ; are comments\&. + .SH "CONFIGURATION FILE DIRECTORY" + .sp +-Barman supports the inclusion of multiple configuration files, through the configuration_files_directory option\&. Included files must contain only server specifications, not global configurations\&. If the value of configuration_files_directory is a directory, Barman reads all files with \&.conf extension that exist in that folder\&. For example, if you set it to /etc/barman\&.d, you can specify your PostgreSQL servers placing each section in a separate \&.conf file inside the /etc/barman\&.d folder\&. ++Barman supports the inclusion of multiple configuration files, through the configuration_files_directory option\&. Included files must contain only server specifications, not global configurations\&. If the value of configuration_files_directory is a directory, Barman reads all files with \&.conf extension that exist in that folder\&. For example, if you set it to /usr/local/etc/barman\&.d, you can specify your PostgreSQL servers placing each section in a separate \&.conf file inside the /usr/local/etc/barman\&.d folder\&. + .SH "OPTIONS" + .PP + \fBactive\fR +@@ -322,7 +322,7 @@ Example of the configuration file: + .nf + [barman] + ; Main directory +-barman_home = /var/lib/barman ++barman_home = /var/barman + + ; System user + barman_user = barman +@@ -339,10 +339,10 @@ log_file = /var/log/barman/barman\&.log + description = "Main PostgreSQL Database" + + ; SSH options +-ssh_command = ssh postgres@pg ++ssh_command = ssh pgsql@pg + + ; PostgreSQL connection string +-conninfo = host=pg user=postgres ++conninfo = host=pg user=pgsql dbname=postgres + + ; Minimum number of required backups (redundancy) + minimum_redundancy = 1 Added: head/databases/pgbarman/files/patch-doc_barman.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/pgbarman/files/patch-doc_barman.conf Wed Dec 3 17:05:04 2014 (r373845) @@ -0,0 +1,35 @@ +--- doc/barman.conf.orig 2014-08-18 10:29:45 UTC ++++ doc/barman.conf +@@ -5,7 +5,7 @@ + + [barman] + ; Main directory +-barman_home = /var/lib/barman ++barman_home = /var/barman + + ; System user + barman_user = barman +@@ -25,8 +25,8 @@ log_file = /var/log/barman/barman.log + ;post_archive_script = env | grep ^BARMAN + + ; Directory of configuration files. Place your sections in separate files with .conf extension +-; For example place the 'main' server section in /etc/barman.d/main.conf +-;configuration_files_directory = /etc/barman.d ++; For example place the 'main' server section in /usr/local/etc/barman.d/main.conf ++;configuration_files_directory = /usr/local/etc/barman.d + + ; Minimum number of required backups (redundancy) - default 0 + ;minimum_redundancy = 0 +@@ -68,10 +68,10 @@ log_file = /var/log/barman/barman.log + ;; description = "Main PostgreSQL Database" + ;; + ;; ; SSH options +-;; ssh_command = ssh postgres@pg ++;; ssh_command = ssh pgsql@pg + ;; + ;; ; PostgreSQL connection string +-;; conninfo = host=pg user=postgres ++;; conninfo = host=pg user=pgsql dbname=postgres + ;; + ;; ; Minimum number of required backups (redundancy) + ;; ; minimum_redundancy = 1 Added: head/databases/pgbarman/files/patch-setup.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/pgbarman/files/patch-setup.py Wed Dec 3 17:05:04 2014 (r373845) @@ -0,0 +1,13 @@ +--- setup.py.orig 2014-12-03 15:50:50 UTC ++++ setup.py +@@ -74,8 +74,8 @@ setup( + packages=['barman', ], + scripts=['bin/barman', ], + data_files=[ +- ('share/man/man1', ['doc/barman.1']), +- ('share/man/man5', ['doc/barman.5']), ++ ('man/man1', ['doc/barman.1']), ++ ('man/man5', ['doc/barman.5']), + ], + license='GPL-3.0', + description=__doc__.split("\n")[0],