svn commit: r382680 - in head/databases: puppetdb puppetdb-terminus puppetdb/files

[Johannes Jost Meixner]

Author: xmj
Date: Mon Mar 30 15:48:33 2015
New Revision: 382680
URL: https://svnweb.freebsd.org/changeset/ports/382680
QAT: https://qat.redports.org/buildarchive/r382680/

Log:
  databases/puppetdb{,-terminus}: update to 2.2.2
  
  - Update puppetdb to 2.2.2
  - Update puppetdb-terminus to 2.2.2
  - Hardcode puppetdb_log_file, as it can be overwritten
    in rc.conf if necessary.
  
  PR:		198619
  Submitted by:	Michael Moll <kvedulv at kvedulv.de>
  Approved by:	mentors (implicit)

Modified:
  head/databases/puppetdb-terminus/Makefile
  head/databases/puppetdb-terminus/distinfo
  head/databases/puppetdb-terminus/pkg-plist
  head/databases/puppetdb/Makefile
  head/databases/puppetdb/distinfo
  head/databases/puppetdb/files/puppetdb.in
  head/databases/puppetdb/pkg-plist

Modified: head/databases/puppetdb-terminus/Makefile
==============================================================================
--- head/databases/puppetdb-terminus/Makefile	Mon Mar 30 15:48:25 2015	(r382679)
+++ head/databases/puppetdb-terminus/Makefile	Mon Mar 30 15:48:33 2015	(r382680)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	puppetdb-terminus
-PORTVERSION=	2.2.0
+PORTVERSION=	2.2.2
 CATEGORIES=	databases ruby
 MASTER_SITES=	http://downloads.puppetlabs.com/puppetdb/
 DISTNAME=	puppetdb-${PORTVERSION}

Modified: head/databases/puppetdb-terminus/distinfo
==============================================================================
--- head/databases/puppetdb-terminus/distinfo	Mon Mar 30 15:48:25 2015	(r382679)
+++ head/databases/puppetdb-terminus/distinfo	Mon Mar 30 15:48:33 2015	(r382680)
@@ -1,2 +1,2 @@
-SHA256 (puppetdb-2.2.0.tar.gz) = 3a177568e67eda3191f52509c91ca1fdf989a21437dfbaf21fa024790eac93d6
-SIZE (puppetdb-2.2.0.tar.gz) = 21787873
+SHA256 (puppetdb-2.2.2.tar.gz) = b2921a97e985ee2bf3cf8c6294cfd27e8080637e7d575895001c3949199b2142
+SIZE (puppetdb-2.2.2.tar.gz) = 21797613

Modified: head/databases/puppetdb-terminus/pkg-plist
==============================================================================
--- head/databases/puppetdb-terminus/pkg-plist	Mon Mar 30 15:48:25 2015	(r382679)
+++ head/databases/puppetdb-terminus/pkg-plist	Mon Mar 30 15:48:33 2015	(r382680)
@@ -14,4 +14,3 @@
 %%RUBY_SITELIBDIR%%/puppet/util/puppetdb/command.rb
 %%RUBY_SITELIBDIR%%/puppet/util/puppetdb/command_names.rb
 %%RUBY_SITELIBDIR%%/puppet/util/puppetdb/config.rb
-%%RUBY_SITELIBDIR%%/puppet/util/puppetdb/global_check.rb

Modified: head/databases/puppetdb/Makefile
==============================================================================
--- head/databases/puppetdb/Makefile	Mon Mar 30 15:48:25 2015	(r382679)
+++ head/databases/puppetdb/Makefile	Mon Mar 30 15:48:33 2015	(r382680)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	puppetdb
-PORTVERSION=	2.2.0
+PORTVERSION=	2.2.2
 CATEGORIES=	databases java
 MASTER_SITES=	http://downloads.puppetlabs.com/puppetdb/
 

Modified: head/databases/puppetdb/distinfo
==============================================================================
--- head/databases/puppetdb/distinfo	Mon Mar 30 15:48:25 2015	(r382679)
+++ head/databases/puppetdb/distinfo	Mon Mar 30 15:48:33 2015	(r382680)
@@ -1,2 +1,2 @@
-SHA256 (puppetdb-2.2.0.tar.gz) = 3a177568e67eda3191f52509c91ca1fdf989a21437dfbaf21fa024790eac93d6
-SIZE (puppetdb-2.2.0.tar.gz) = 21787873
+SHA256 (puppetdb-2.2.2.tar.gz) = b2921a97e985ee2bf3cf8c6294cfd27e8080637e7d575895001c3949199b2142
+SIZE (puppetdb-2.2.2.tar.gz) = 21797613

Modified: head/databases/puppetdb/files/puppetdb.in
==============================================================================
--- head/databases/puppetdb/files/puppetdb.in	Mon Mar 30 15:48:25 2015	(r382679)
+++ head/databases/puppetdb/files/puppetdb.in	Mon Mar 30 15:48:33 2015	(r382680)
@@ -33,7 +33,7 @@
 #   Group for data file ownership.
 #
 # puppetdb_log_file (str):
-#   Set to "%%PUPPETDB_LOG_FILE%%" by default.
+#   Set to "/var/log/puppetdb/puppetdb.log" by default.
 #   Log file location.
 #
 
@@ -49,7 +49,7 @@ load_rc_config "${name}"
 : ${puppetdb_java_home="%%JAVA_HOME%%"}
 : ${puppetdb_user="puppetdb"}
 : ${puppetdb_group="puppetdb"}
-: ${puppetdb_log_file="%%PUPPETDB_LOG_FILE%%"}
+: ${puppetdb_log_file="/var/log/puppetdb/puppetdb.log"}
 
 pidfile="/var/run/puppetdb/puppetdb.pid"
 command="/usr/sbin/daemon"

Modified: head/databases/puppetdb/pkg-plist
==============================================================================
--- head/databases/puppetdb/pkg-plist	Mon Mar 30 15:48:25 2015	(r382679)
+++ head/databases/puppetdb/pkg-plist	Mon Mar 30 15:48:33 2015	(r382680)
@@ -24,4 +24,4 @@ sbin/puppetdb
 @dir /var/db/puppetdb/mq
 @dir /var/db/puppetdb
 @mode
- at dir(puppetdb,,) /var/log/puppetdb
+ at dir(puppetdb,puppetdb,) /var/log/puppetdb