Date: Tue, 2 May 2017 19:09:40 +0000 (UTC) From: Martin Wilke <miwi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r439968 - in head/databases/puppetdb4: . files Message-ID: <201705021909.v42J9eQo016673@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: miwi Date: Tue May 2 19:09:39 2017 New Revision: 439968 URL: https://svnweb.freebsd.org/changeset/ports/439968 Log: - Update to 4.4.0 PR: 218866 Submitted by: Zach Leslie Modified: head/databases/puppetdb4/Makefile head/databases/puppetdb4/distinfo head/databases/puppetdb4/files/patch-ext_config_logback.xml head/databases/puppetdb4/files/patch-ext_config_request-logging.xml head/databases/puppetdb4/files/pkg-message.in head/databases/puppetdb4/pkg-plist Modified: head/databases/puppetdb4/Makefile ============================================================================== --- head/databases/puppetdb4/Makefile Tue May 2 19:02:16 2017 (r439967) +++ head/databases/puppetdb4/Makefile Tue May 2 19:09:39 2017 (r439968) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= puppetdb -PORTVERSION= 4.0.0 -PORTREVISION= 1 +PORTVERSION= 4.4.0 CATEGORIES= databases java MASTER_SITES= http://downloads.puppetlabs.com/puppetdb/ PKGNAMESUFFIX= 4 @@ -25,7 +24,11 @@ SHEBANG_FILES= ext/bin/puppetdb \ ext/cli/export \ ext/cli/foreground \ ext/cli/import \ - ext/cli/ssl-setup + ext/cli/ssl-setup \ + ext/cli/start \ + ext/cli/stop \ + ext/cli/reload \ + ext/ezbake-functions.sh USE_JAVA= yes NO_ARCH= yes NO_BUILD= yes Modified: head/databases/puppetdb4/distinfo ============================================================================== --- head/databases/puppetdb4/distinfo Tue May 2 19:02:16 2017 (r439967) +++ head/databases/puppetdb4/distinfo Tue May 2 19:09:39 2017 (r439968) @@ -1,2 +1,3 @@ -SHA256 (puppetdb-4.0.0.tar.gz) = e28d898e1912a43cb3f2555c5bacf4cb03d819579ad5c018b70b5f73af52fc33 -SIZE (puppetdb-4.0.0.tar.gz) = 22121324 +TIMESTAMP = 1493780923 +SHA256 (puppetdb-4.4.0.tar.gz) = b9e656846981397a3eed64dff44a7171e6a01b7e8c76c877bd93267d96f50414 +SIZE (puppetdb-4.4.0.tar.gz) = 23629723 Modified: head/databases/puppetdb4/files/patch-ext_config_logback.xml ============================================================================== --- head/databases/puppetdb4/files/patch-ext_config_logback.xml Tue May 2 19:02:16 2017 (r439967) +++ head/databases/puppetdb4/files/patch-ext_config_logback.xml Tue May 2 19:09:39 2017 (r439968) @@ -1,15 +1,29 @@ ---- ext/config/logback.xml.orig 2016-03-17 04:17:06 UTC -+++ ext/config/logback.xml +--- ext/config/logback.xml.orig 2017-04-24 12:27:57.366296793 -0700 ++++ ext/config/logback.xml 2017-04-24 12:28:48.723259627 -0700 @@ -6,10 +6,10 @@ </appender> <appender name="F1" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>/var/log/puppetlabs/puppetdb/puppetdb.log</file> + <file>/var/log/puppetdb/puppetdb.log</file> + <append>true</append> + <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> +- <fileNamePattern>/var/log/puppetlabs/puppetdb/puppetdb-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern> ++ <fileNamePattern>/var/log/puppetdb/puppetdb-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern> + <!-- each file should be at most 200MB, keep 90 days worth of history, but at most 1GB total--> + <maxFileSize>200MB</maxFileSize> + <maxHistory>90</maxHistory> +@@ -31,11 +31,11 @@ + level="info"/> - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> -- <fileNamePattern>/var/log/puppetlabs/puppetdb/puppetdb-%d{yyyy-MM-dd}.log.gz</fileNamePattern> -+ <fileNamePattern>/var/log/puppetdb/puppetdb-%d{yyyy-MM-dd}.log.gz</fileNamePattern> + <appender name="STATUS" class="ch.qos.logback.core.rolling.RollingFileAppender"> +- <file>/var/log/puppetlabs/puppetdb/puppetdb-status.log</file> ++ <file>/var/log/puppetdb/puppetdb-status.log</file> + <append>true</append> + <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> + <!-- rollover daily --> +- <fileNamePattern>/var/log/puppetlabs/puppetdb/puppetdb-status-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern> ++ <fileNamePattern>/var/log/puppetdb/puppetdb-status-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern> + <!-- each file should be at most 200MB, keep 90 days worth of history, but at most 1GB total--> + <maxFileSize>200MB</maxFileSize> <maxHistory>90</maxHistory> - </rollingPolicy> - <encoder> Modified: head/databases/puppetdb4/files/patch-ext_config_request-logging.xml ============================================================================== --- head/databases/puppetdb4/files/patch-ext_config_request-logging.xml Tue May 2 19:02:16 2017 (r439967) +++ head/databases/puppetdb4/files/patch-ext_config_request-logging.xml Tue May 2 19:09:39 2017 (r439968) @@ -1,10 +1,14 @@ ---- ext/config/request-logging.xml.orig 2016-03-17 04:17:06 UTC -+++ ext/config/request-logging.xml -@@ -1,6 +1,6 @@ +--- ext/config/request-logging.xml.orig 2017-04-24 12:32:16.604464262 -0700 ++++ ext/config/request-logging.xml 2017-04-24 12:32:46.404637027 -0700 +@@ -1,9 +1,9 @@ <configuration debug="false"> - <appender name="FILE" class="ch.qos.logback.core.FileAppender"> + <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>/var/log/puppetlabs/puppetdb/puppetdb-access.log</file> + <file>/var/log/puppetdb/puppetdb-access.log</file> - <encoder> - <pattern>%h %l %u [%t] "%r" %s %b "%i{Referer}" "%i{User-Agent}" %D</pattern> - </encoder> + <append>true</append> + <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> +- <fileNamePattern>/var/log/puppetlabs/puppetdb/puppetdb-access-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern> ++ <fileNamePattern>/var/log/puppetdb/puppetdb-access-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern> + <!-- each file should be at most 200MB, keep 90 days worth of history, but at most 1GB total--> + <maxFileSize>200MB</maxFileSize> + <maxHistory>90</maxHistory> Modified: head/databases/puppetdb4/files/pkg-message.in ============================================================================== --- head/databases/puppetdb4/files/pkg-message.in Tue May 2 19:02:16 2017 (r439967) +++ head/databases/puppetdb4/files/pkg-message.in Tue May 2 19:09:39 2017 (r439968) @@ -1,6 +1,6 @@ If this is a new installation, please run the follow to setup your SSL/puppetdb server: -%%PREFIX%%/sbin/puppetdb ssl-setup +%%PREFIX%%/bin/puppetdb ssl-setup Please also remember to add puppetdb_enable="YES" into your rc.conf. Modified: head/databases/puppetdb4/pkg-plist ============================================================================== --- head/databases/puppetdb4/pkg-plist Tue May 2 19:02:16 2017 (r439967) +++ head/databases/puppetdb4/pkg-plist Tue May 2 19:09:39 2017 (r439968) @@ -5,6 +5,9 @@ bin/puppetdb %%DATADIR%%/cli/apps/foreground %%DATADIR%%/cli/apps/import %%DATADIR%%/cli/apps/ssl-setup +%%DATADIR%%/cli/apps/start +%%DATADIR%%/cli/apps/stop +%%DATADIR%%/cli/apps/reload %%DATADIR%%/ezbake-functions.sh %%DATADIR%%/ezbake.manifest %%DATADIR%%/puppetdb.jar
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705021909.v42J9eQo016673>