diff options
| author | Johannes Jost Meixner <xmj@FreeBSD.org> | 2015-03-30 15:48:33 +0000 |
|---|---|---|
| committer | Johannes Jost Meixner <xmj@FreeBSD.org> | 2015-03-30 15:48:33 +0000 |
| commit | d181cdd8279755c4be0258d6d2678b17f4266916 (patch) | |
| tree | 35427e8b4a11fd668611ad3a41fdb628760ab527 /databases | |
| parent | Use more compact notation. (diff) | |
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@kvedulv.de>
Approved by: mentors (implicit)
Notes
Notes:
svn path=/head/; revision=382680
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/puppetdb-terminus/Makefile | 2 | ||||
| -rw-r--r-- | databases/puppetdb-terminus/distinfo | 4 | ||||
| -rw-r--r-- | databases/puppetdb-terminus/pkg-plist | 1 | ||||
| -rw-r--r-- | databases/puppetdb/Makefile | 2 | ||||
| -rw-r--r-- | databases/puppetdb/distinfo | 4 | ||||
| -rw-r--r-- | databases/puppetdb/files/puppetdb.in | 4 | ||||
| -rw-r--r-- | databases/puppetdb/pkg-plist | 2 |
7 files changed, 9 insertions, 10 deletions
diff --git a/databases/puppetdb-terminus/Makefile b/databases/puppetdb-terminus/Makefile index 3ad6d2bf0818..95b21575f957 100644 --- a/databases/puppetdb-terminus/Makefile +++ b/databases/puppetdb-terminus/Makefile @@ -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} diff --git a/databases/puppetdb-terminus/distinfo b/databases/puppetdb-terminus/distinfo index 80807752e57e..6a1b63d3cfc9 100644 --- a/databases/puppetdb-terminus/distinfo +++ b/databases/puppetdb-terminus/distinfo @@ -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 diff --git a/databases/puppetdb-terminus/pkg-plist b/databases/puppetdb-terminus/pkg-plist index 1902afa7359c..c27b6faa0821 100644 --- a/databases/puppetdb-terminus/pkg-plist +++ b/databases/puppetdb-terminus/pkg-plist @@ -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 diff --git a/databases/puppetdb/Makefile b/databases/puppetdb/Makefile index f2d004064350..ebb84f84b105 100644 --- a/databases/puppetdb/Makefile +++ b/databases/puppetdb/Makefile @@ -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/ diff --git a/databases/puppetdb/distinfo b/databases/puppetdb/distinfo index 80807752e57e..6a1b63d3cfc9 100644 --- a/databases/puppetdb/distinfo +++ b/databases/puppetdb/distinfo @@ -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 diff --git a/databases/puppetdb/files/puppetdb.in b/databases/puppetdb/files/puppetdb.in index 1b95e918ee39..a28754be9417 100644 --- a/databases/puppetdb/files/puppetdb.in +++ b/databases/puppetdb/files/puppetdb.in @@ -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" diff --git a/databases/puppetdb/pkg-plist b/databases/puppetdb/pkg-plist index e86d37248a6a..e7eb5c9c0b4c 100644 --- a/databases/puppetdb/pkg-plist +++ b/databases/puppetdb/pkg-plist @@ -24,4 +24,4 @@ sbin/puppetdb @dir /var/db/puppetdb/mq @dir /var/db/puppetdb @mode -@dir(puppetdb,,) /var/log/puppetdb +@dir(puppetdb,puppetdb,) /var/log/puppetdb |