svn commit: r411954 - in head/databases: . puppetdb puppetdb-terminus puppetdb-terminus4 puppetdb-terminus4/files puppetdb4 puppetdb4/files

Tom Judge tj at FreeBSD.org
Sat Mar 26 18:06:31 UTC 2016 

Author: tj
Date: Sat Mar 26 18:06:28 2016
New Revision: 411954
URL: https://svnweb.freebsd.org/changeset/ports/411954

Log:
  New ports for PuppetDB 4.0
  	databases/puppetdb4
  	databases/puppetdb-terminus4
  
  WWW: https://forge.puppetlabs.com/puppetlabs/puppetdb
  
  Also add conflicts with the puppetdb 2.x ports.

Added:
  head/databases/puppetdb-terminus4/
     - copied from r411813, head/databases/puppetdb-terminus/
  head/databases/puppetdb-terminus4/files/
  head/databases/puppetdb-terminus4/files/patch-Makefile   (contents, props changed)
  head/databases/puppetdb4/
     - copied from r411813, head/databases/puppetdb/
  head/databases/puppetdb4/files/patch-Makefile   (contents, props changed)
  head/databases/puppetdb4/files/patch-ext_bin_puppetdb   (contents, props changed)
  head/databases/puppetdb4/files/patch-ext_cli_ssl-setup   (contents, props changed)
  head/databases/puppetdb4/files/patch-ext_config_conf.d_config.ini   (contents, props changed)
  head/databases/puppetdb4/files/patch-ext_config_conf.d_jetty.ini   (contents, props changed)
  head/databases/puppetdb4/files/patch-ext_config_logback.xml   (contents, props changed)
  head/databases/puppetdb4/files/patch-ext_config_request-logging.xml   (contents, props changed)
Deleted:
  head/databases/puppetdb4/files/patch-Rakefile
  head/databases/puppetdb4/files/patch-ext__files__config.ini
  head/databases/puppetdb4/files/patch-ext__files__database.ini
  head/databases/puppetdb4/files/patch-ext__files__puppetdb
  head/databases/puppetdb4/files/patch-ext__files__puppetdb-anonymize
  head/databases/puppetdb4/files/patch-ext__files__puppetdb-export
  head/databases/puppetdb4/files/patch-ext__files__puppetdb-foreground
  head/databases/puppetdb4/files/patch-ext__files__puppetdb-import
  head/databases/puppetdb4/files/patch-ext__files__puppetdb-ssl-setup
  head/databases/puppetdb4/files/patch-ext__files__puppetdb.newsyslog
  head/databases/puppetdb4/files/patch-tasks__install.rake
Modified:
  head/databases/Makefile
  head/databases/puppetdb-terminus/Makefile
  head/databases/puppetdb-terminus4/Makefile
  head/databases/puppetdb-terminus4/distinfo
  head/databases/puppetdb-terminus4/pkg-plist
  head/databases/puppetdb/Makefile
  head/databases/puppetdb4/Makefile
  head/databases/puppetdb4/distinfo
  head/databases/puppetdb4/files/puppetdb.in
  head/databases/puppetdb4/pkg-plist

Modified: head/databases/Makefile
==============================================================================
--- head/databases/Makefile	Sat Mar 26 17:20:25 2016	(r411953)
+++ head/databases/Makefile	Sat Mar 26 18:06:28 2016	(r411954)
@@ -703,6 +703,8 @@
     SUBDIR += proftpd-mod_sql_tds
     SUBDIR += puppetdb
     SUBDIR += puppetdb-terminus
+    SUBDIR += puppetdb-terminus4
+    SUBDIR += puppetdb4
     SUBDIR += pure-sql3
     SUBDIR += puredb
     SUBDIR += pxlib

Modified: head/databases/puppetdb-terminus/Makefile
==============================================================================
--- head/databases/puppetdb-terminus/Makefile	Sat Mar 26 17:20:25 2016	(r411953)
+++ head/databases/puppetdb-terminus/Makefile	Sat Mar 26 18:06:28 2016	(r411954)
@@ -2,6 +2,7 @@
 
 PORTNAME=	puppetdb-terminus
 PORTVERSION=	2.3.4
+PORTREVISION=	1
 CATEGORIES=	databases ruby
 MASTER_SITES=	http://downloads.puppetlabs.com/puppetdb/
 DISTNAME=	puppetdb-${PORTVERSION}
@@ -13,6 +14,7 @@ LICENSE=	APACHE20
 
 BUILD_DEPENDS=	puppet38>=0:${PORTSDIR}/sysutils/puppet38
 
+CONFLICTS_INSTALL=	puppetdb-terminus4-*
 USE_RUBY=	yes
 NO_BUILD=	yes
 

Modified: head/databases/puppetdb-terminus4/Makefile
==============================================================================
--- head/databases/puppetdb-terminus/Makefile	Thu Mar 24 21:43:57 2016	(r411813)
+++ head/databases/puppetdb-terminus4/Makefile	Sat Mar 26 18:06:28 2016	(r411954)
@@ -1,24 +1,28 @@
 # $FreeBSD$
 
 PORTNAME=	puppetdb-terminus
-PORTVERSION=	2.3.4
+PORTVERSION=	4.0.0
 CATEGORIES=	databases ruby
 MASTER_SITES=	http://downloads.puppetlabs.com/puppetdb/
+PKGNAMESUFFIX=	4
 DISTNAME=	puppetdb-${PORTVERSION}
 
-MAINTAINER=	freebsd at geoffgarside.co.uk
+MAINTAINER=	tj at FreeBSD.org
 COMMENT=	PuppetDB storeconfigs backend terminus module
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	puppet38>=0:${PORTSDIR}/sysutils/puppet38
+BUILD_DEPENDS=	puppet4>=0:${PORTSDIR}/sysutils/puppet4
 
+CONFLICTS_INSTALL=	puppetdb-terminus-*
 USE_RUBY=	yes
 NO_BUILD=	yes
+USES=		gmake
+
+post-patch:
+	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/Makefile
 
 do-install:
-	${MKDIR} ${STAGEDIR}${RUBY_SITELIBDIR}/puppet
-	(cd ${WRKSRC}/ext/master/lib/puppet && ${COPYTREE_SHARE} . \
-		${STAGEDIR}${RUBY_SITELIBDIR}/puppet)
+	@cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} ${GMAKE} install-puppetdb-termini
 
 .include <bsd.port.mk>

Modified: head/databases/puppetdb-terminus4/distinfo
==============================================================================
--- head/databases/puppetdb-terminus/distinfo	Thu Mar 24 21:43:57 2016	(r411813)
+++ head/databases/puppetdb-terminus4/distinfo	Sat Mar 26 18:06:28 2016	(r411954)
@@ -1,2 +1,2 @@
-SHA256 (puppetdb-2.3.4.tar.gz) = bb48d7b8b26a54f814a8d35019392fc1414375080592884af1734ad72a594630
-SIZE (puppetdb-2.3.4.tar.gz) = 23814293
+SHA256 (puppetdb-4.0.0.tar.gz) = e28d898e1912a43cb3f2555c5bacf4cb03d819579ad5c018b70b5f73af52fc33
+SIZE (puppetdb-4.0.0.tar.gz) = 22121324

Added: head/databases/puppetdb-terminus4/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/puppetdb-terminus4/files/patch-Makefile	Sat Mar 26 18:06:28 2016	(r411954)
@@ -0,0 +1,62 @@
+--- Makefile.orig	2016-03-17 04:17:10 UTC
++++ Makefile
+@@ -1,7 +1,7 @@
+ prefix = /usr/local
+ datadir = $(prefix)/share
+ confdir = /etc
+-rubylibdir = $(shell ruby -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']")
++rubylibdir = $(shell %%PREFIX%%/bin/ruby -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']")
+ rundir = /var/run
+ bindir = /usr/bin
+ 
+@@ -33,22 +33,34 @@ install-puppetdb:
+ 
+ 
+ install-puppetdb-termini:
+-	install -Dm 0644 puppet/indirector/node/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/node/puppetdb.rb"
+-	install -Dm 0644 puppet/indirector/facts/puppetdb_apply.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb_apply.rb"
+-	install -Dm 0644 puppet/indirector/facts/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb.rb"
+-	install -Dm 0644 puppet/indirector/catalog/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog/puppetdb.rb"
+-	install -Dm 0644 puppet/indirector/resource/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource/puppetdb.rb"
+-	install -Dm 0644 puppet/util/puppetdb/command.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command.rb"
+-	install -Dm 0644 puppet/util/puppetdb/command_names.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command_names.rb"
+-	install -Dm 0644 puppet/util/puppetdb/config.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/config.rb"
+-	install -Dm 0644 puppet/util/puppetdb/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.rb"
+-	install -Dm 0644 puppet/util/puppetdb/char_encoding.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/char_encoding.rb"
+-	install -Dm 0644 puppet/util/puppetdb/atom.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/atom.rb"
+-	install -Dm 0644 puppet/util/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb"
+-	install -Dm 0644 puppet/reports/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/reports/puppetdb.rb"
+-	install -Dm 0644 puppet/face/node/deactivate.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/deactivate.rb"
+-	install -Dm 0644 puppet/face/node/status.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/status.rb"
+-	install -Dm 0644 puppet/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/node"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/util"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/face"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/face/node"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/reports"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/functions"
++	install -m 0644 puppet/indirector/node/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/node/puppetdb.rb"
++	install -m 0644 puppet/indirector/facts/puppetdb_apply.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb_apply.rb"
++	install -m 0644 puppet/indirector/facts/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb.rb"
++	install -m 0644 puppet/indirector/catalog/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog/puppetdb.rb"
++	install -m 0644 puppet/indirector/resource/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource/puppetdb.rb"
++	install -m 0644 puppet/util/puppetdb/command.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command.rb"
++	install -m 0644 puppet/util/puppetdb/command_names.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command_names.rb"
++	install -m 0644 puppet/util/puppetdb/config.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/config.rb"
++	install -m 0644 puppet/util/puppetdb/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.rb"
++	install -m 0644 puppet/util/puppetdb/char_encoding.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/char_encoding.rb"
++	install -m 0644 puppet/util/puppetdb/atom.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/atom.rb"
++	install -m 0644 puppet/util/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb"
++	install -m 0644 puppet/reports/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/reports/puppetdb.rb"
++	install -m 0644 puppet/face/node/deactivate.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/deactivate.rb"
++	install -m 0644 puppet/face/node/status.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/status.rb"
++	install -m 0644 puppet/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb"
+ 
+ install-rpm-sysv-init: install-rpm-preinst
+ 	install -d -m 0755 "$(DESTDIR)$(initdir)"

Modified: head/databases/puppetdb-terminus4/pkg-plist
==============================================================================
--- head/databases/puppetdb-terminus/pkg-plist	Thu Mar 24 21:43:57 2016	(r411813)
+++ head/databases/puppetdb-terminus4/pkg-plist	Sat Mar 26 18:06:28 2016	(r411954)
@@ -1,7 +1,6 @@
-%%RUBY_SITELIBDIR%%/puppet/application/storeconfigs.rb
 %%RUBY_SITELIBDIR%%/puppet/face/node/deactivate.rb
 %%RUBY_SITELIBDIR%%/puppet/face/node/status.rb
-%%RUBY_SITELIBDIR%%/puppet/face/storeconfigs.rb
+%%RUBY_SITELIBDIR%%/puppet/functions/puppetdb_query.rb
 %%RUBY_SITELIBDIR%%/puppet/indirector/catalog/puppetdb.rb
 %%RUBY_SITELIBDIR%%/puppet/indirector/facts/puppetdb.rb
 %%RUBY_SITELIBDIR%%/puppet/indirector/facts/puppetdb_apply.rb
@@ -9,8 +8,10 @@
 %%RUBY_SITELIBDIR%%/puppet/indirector/resource/puppetdb.rb
 %%RUBY_SITELIBDIR%%/puppet/reports/puppetdb.rb
 %%RUBY_SITELIBDIR%%/puppet/util/puppetdb.rb
-%%RUBY_SITELIBDIR%%/puppet/util/puppetdb/blacklist.rb
+%%RUBY_SITELIBDIR%%/puppet/util/puppetdb/atom.rb
 %%RUBY_SITELIBDIR%%/puppet/util/puppetdb/char_encoding.rb
 %%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/http.rb
+

Modified: head/databases/puppetdb/Makefile
==============================================================================
--- head/databases/puppetdb/Makefile	Sat Mar 26 17:20:25 2016	(r411953)
+++ head/databases/puppetdb/Makefile	Sat Mar 26 18:06:28 2016	(r411954)
@@ -2,6 +2,7 @@
 
 PORTNAME=	puppetdb
 PORTVERSION=	2.3.8
+PORTREVISION=	1
 CATEGORIES=	databases java
 MASTER_SITES=	http://downloads.puppetlabs.com/puppetdb/
 
@@ -17,6 +18,7 @@ BUILD_DEPENDS=	rubygem-facter>=0:${PORTS
 
 USE_RC_SUBR=	puppetdb
 
+CONFLICTS_INSTALL=	puppetdb4-*
 USES=		shebangfix
 SHEBANG_FILES=	ext/files/puppetdb \
 		ext/files/puppetdb-anonymize \

Modified: head/databases/puppetdb4/Makefile
==============================================================================
--- head/databases/puppetdb/Makefile	Thu Mar 24 21:43:57 2016	(r411813)
+++ head/databases/puppetdb4/Makefile	Sat Mar 26 18:06:28 2016	(r411954)
@@ -1,32 +1,31 @@
 # $FreeBSD$
 
 PORTNAME=	puppetdb
-PORTVERSION=	2.3.8
+PORTVERSION=	4.0.0
 CATEGORIES=	databases java
 MASTER_SITES=	http://downloads.puppetlabs.com/puppetdb/
+PKGNAMESUFFIX=	4
 
-MAINTAINER=	xaque208 at gmail.com
+MAINTAINER=	tj at FreeBSD.org
 COMMENT=	PuppetDB storeconfigs backend
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		puppet:${PORTSDIR}/sysutils/puppet38
-BUILD_DEPENDS=	rubygem-facter>=0:${PORTSDIR}/sysutils/rubygem-facter \
-		rubygem-rake>=0:${PORTSDIR}/devel/rubygem-rake
+		puppet:${PORTSDIR}/sysutils/puppet4
 
 USE_RC_SUBR=	puppetdb
 
+CONFLICTS_INSTALL=	puppetdb-*
 USES=		shebangfix
-SHEBANG_FILES=	ext/files/puppetdb \
-		ext/files/puppetdb-anonymize \
-		ext/files/puppetdb-export \
-		ext/files/puppetdb-foreground \
-		ext/files/puppetdb-import \
-		ext/files/puppetdb-legacy \
-		ext/files/puppetdb-ssl-setup
+SHEBANG_FILES=	ext/bin/puppetdb \
+		ext/cli/anonymize \
+		ext/cli/config-migration \
+		ext/cli/export \
+		ext/cli/foreground \
+		ext/cli/import \
+		ext/cli/ssl-setup
 USE_JAVA=	yes
-USE_RAKE=	yes
 NO_ARCH=	yes
 NO_BUILD=	yes
 JAVA_VERSION=	1.7+
@@ -40,14 +39,13 @@ SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 post-patch:
-.for file in tasks/install.rake ext/files/config.ini ext/files/puppetdb \
-	ext/files/puppetdb-import ext/files/puppetdb-anonymize \
-	ext/files/database.ini ext/files/puppetdb-ssl-setup \
-	ext/files/puppetdb-export ext/files/puppetdb-foreground Rakefile
+.for file in Makefile ext/bin/puppetdb ext/cli/ssl-setup \
+	ext/config/conf.d/jetty.ini ext/config/conf.d/config.ini
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/${file}
 .endfor
+	@${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|" ${WRKSRC}/ext/bin/puppetdb
 
 do-install:
-	@cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} rake install
+	@cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} make install-puppetdb
 
 .include <bsd.port.mk>

Modified: head/databases/puppetdb4/distinfo
==============================================================================
--- head/databases/puppetdb/distinfo	Thu Mar 24 21:43:57 2016	(r411813)
+++ head/databases/puppetdb4/distinfo	Sat Mar 26 18:06:28 2016	(r411954)
@@ -1,2 +1,2 @@
-SHA256 (puppetdb-2.3.8.tar.gz) = d17c942a9bf6ffca65d8afa253741df98cc7d11195819daa980743543a69263d
-SIZE (puppetdb-2.3.8.tar.gz) = 23815881
+SHA256 (puppetdb-4.0.0.tar.gz) = e28d898e1912a43cb3f2555c5bacf4cb03d819579ad5c018b70b5f73af52fc33
+SIZE (puppetdb-4.0.0.tar.gz) = 22121324

Added: head/databases/puppetdb4/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/puppetdb4/files/patch-Makefile	Sat Mar 26 18:06:28 2016	(r411954)
@@ -0,0 +1,37 @@
+--- Makefile.orig	2016-03-17 04:17:10 UTC
++++ Makefile
+@@ -1,23 +1,23 @@
+-prefix = /usr/local
++prefix = %%PREFIX%%
+ datadir = $(prefix)/share
+-confdir = /etc
++confdir = %%PREFIX%%/etc
+ rubylibdir = $(shell ruby -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']")
+ rundir = /var/run
+-bindir = /usr/bin
++bindir = %%PREFIX%%/bin
+ 
+ install-puppetdb:
+ 	install -d -m 0755 "$(DESTDIR)$(datadir)/puppetdb"
+ 	install -m 0644 puppetdb.jar "$(DESTDIR)$(datadir)/puppetdb"
+ 	install -m 0774 ext/ezbake-functions.sh "$(DESTDIR)$(datadir)/puppetdb"
+ 	install -m 0644 ext/ezbake.manifest "$(DESTDIR)$(datadir)/puppetdb"
+-	install -d -m 0755 "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d"
+-	install -m 0644 ext/config/logback.xml "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/logback.xml"
+-	install -m 0644 ext/config/bootstrap.cfg "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/bootstrap.cfg"
+-	install -m 0644 ext/config/conf.d/jetty.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/jetty.ini"
+-	install -m 0644 ext/config/conf.d/repl.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/repl.ini"
+-	install -m 0644 ext/config/conf.d/database.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/database.ini"
+-	install -m 0644 ext/config/conf.d/config.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/config.ini"
+-	install -m 0644 ext/config/request-logging.xml "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/request-logging.xml"
++	install -d -m 0755 "$(DESTDIR)$(confdir)/puppetdb/conf.d"
++	install -m 0644 ext/config/logback.xml "$(DESTDIR)$(confdir)/puppetdb/logback.xml.sample"
++	install -m 0644 ext/config/bootstrap.cfg "$(DESTDIR)$(confdir)/puppetdb/bootstrap.cfg.sample"
++	install -m 0644 ext/config/conf.d/jetty.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/jetty.ini.sample"
++	install -m 0644 ext/config/conf.d/repl.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/repl.ini.sample"
++	install -m 0644 ext/config/conf.d/database.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/database.ini.sample"
++	install -m 0644 ext/config/conf.d/config.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/config.ini.sample"
++	install -m 0644 ext/config/request-logging.xml "$(DESTDIR)$(confdir)/puppetdb/request-logging.xml.sample"
+ 	install -d -m 0755 "$(DESTDIR)$(datadir)/puppetdb/cli"
+ 	install -d -m 0755 "$(DESTDIR)$(datadir)/puppetdb/cli/apps"
+ 	install -d -m 0755 "$(DESTDIR)$(bindir)"

Added: head/databases/puppetdb4/files/patch-ext_bin_puppetdb
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/puppetdb4/files/patch-ext_bin_puppetdb	Sat Mar 26 18:06:28 2016	(r411954)
@@ -0,0 +1,15 @@
+--- ext/bin/puppetdb.orig	2016-03-17 04:17:10 UTC
++++ ext/bin/puppetdb
+@@ -5,6 +5,12 @@ if [ -r "/etc/default/puppetdb" ] ; then
+     . /etc/default/puppetdb
+ elif [ -r "/etc/sysconfig/puppetdb" ] ; then
+     . /etc/sysconfig/puppetdb
++elif [ `uname` == "FreeBSD" ] ; then
++    CONFIG="%%PREFIX%%/etc/puppetdb/conf.d"
++    INSTALL_DIR="%%DATADIR%%"
++    JAVA_BIN="%%PREFIX%%/bin/java"
++    JAVA_ARGS="-Xmx192m"
++    USER="puppet"
+ elif [ `uname` == "OpenBSD" ] ; then
+     JAVA_BIN=$(javaPathHelper -c puppetdb)
+     JAVA_ARGS="-Xmx192m"

Added: head/databases/puppetdb4/files/patch-ext_cli_ssl-setup
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/puppetdb4/files/patch-ext_cli_ssl-setup	Sat Mar 26 18:06:28 2016	(r411954)
@@ -0,0 +1,11 @@
+--- ext/cli/ssl-setup.orig	2016-03-17 04:17:10 UTC
++++ ext/cli/ssl-setup
+@@ -230,7 +230,7 @@ else
+   user=puppetdb
+   group=puppetdb
+ 
+-  puppetdb_confdir="/etc/puppetlabs/puppetdb"
++  puppetdb_confdir="%%PREFIX%%/etc/puppetdb"
+ fi
+ 
+ set -e

Added: head/databases/puppetdb4/files/patch-ext_config_conf.d_config.ini
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/puppetdb4/files/patch-ext_config_conf.d_config.ini	Sat Mar 26 18:06:28 2016	(r411954)
@@ -0,0 +1,15 @@
+--- ext/config/conf.d/config.ini.orig	2016-03-17 04:17:06 UTC
++++ ext/config/conf.d/config.ini
+@@ -3,10 +3,10 @@
+ 
+ [global]
+ # Store mq/db data in a custom directory
+-vardir = /opt/puppetlabs/server/data/puppetdb
++vardir = /var/db/puppetdb
+ 
+ # Use an external logback config file
+-logging-config = /etc/puppetlabs/puppetdb/logback.xml
++logging-config = %%PREFIX%%/etc/puppetdb/logback.xml
+ 
+ [command-processing]
+ # How many command-processing threads to use, defaults to (CPUs / 2)

Added: head/databases/puppetdb4/files/patch-ext_config_conf.d_jetty.ini
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/puppetdb4/files/patch-ext_config_conf.d_jetty.ini	Sat Mar 26 18:06:28 2016	(r411954)
@@ -0,0 +1,8 @@
+--- ext/config/conf.d/jetty.ini.orig	2016-03-17 04:17:06 UTC
++++ ext/config/conf.d/jetty.ini
+@@ -30,4 +30,4 @@ port = 8080
+ 
+ # Access logging configuration path. To turn off access logging
+ # comment out the line with `access-log-config=...`
+-access-log-config = /etc/puppetlabs/puppetdb/request-logging.xml
++access-log-config = %%PREFIX%%/etc/puppetdb/request-logging.xml

Added: head/databases/puppetdb4/files/patch-ext_config_logback.xml
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/puppetdb4/files/patch-ext_config_logback.xml	Sat Mar 26 18:06:28 2016	(r411954)
@@ -0,0 +1,15 @@
+--- ext/config/logback.xml.orig	2016-03-17 04:17:06 UTC
++++ ext/config/logback.xml
+@@ -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>
+ 
+         <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>
+             <maxHistory>90</maxHistory>
+         </rollingPolicy>
+         <encoder>

Added: head/databases/puppetdb4/files/patch-ext_config_request-logging.xml
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/puppetdb4/files/patch-ext_config_request-logging.xml	Sat Mar 26 18:06:28 2016	(r411954)
@@ -0,0 +1,10 @@
+--- ext/config/request-logging.xml.orig	2016-03-17 04:17:06 UTC
++++ ext/config/request-logging.xml
+@@ -1,6 +1,6 @@
+ <configuration debug="false">
+     <appender name="FILE" class="ch.qos.logback.core.FileAppender">
+-        <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>

Modified: head/databases/puppetdb4/files/puppetdb.in
==============================================================================
--- head/databases/puppetdb/files/puppetdb.in	Thu Mar 24 21:43:57 2016	(r411813)
+++ head/databases/puppetdb4/files/puppetdb.in	Sat Mar 26 18:06:28 2016	(r411954)
@@ -55,7 +55,7 @@ pidfile="/var/run/puppetdb/puppetdb.pid"
 command="/usr/sbin/daemon"
 java_cmd="${puppetdb_java_home}/bin/java"
 procname="${java_cmd}"
-command_args="-p ${pidfile} ${java_cmd} -cp %%DATADIR%%/puppetdb.jar clojure.main -m com.puppetlabs.puppetdb.core ${puppetdb_args} > ${puppetdb_log_file} 2>&1"
+command_args="-p ${pidfile} ${java_cmd} -cp %%DATADIR%%/puppetdb.jar clojure.main -m puppetlabs.puppetdb.main -Djava.security.egd=/dev/urandom ${puppetdb_args} > ${puppetdb_log_file} 2>&1"
 
 
 required_files="${java_cmd}"
@@ -63,6 +63,9 @@ required_files="${java_cmd}"
 start_precmd="puppetdb_prestart"
 
 puppetdb_prestart() {
+  if [ ! -d "/var/log/puppetdb" ]; then
+    install -d -o "${puppetdb_user}" -g "${puppetdb_group}" -m 750 "/var/log/puppetdb"
+  fi
   if [ ! -f "${puppetdb_log_file}" ]; then
     touch "${puppetdb_log_file}"
     chown "${puppetdb_user}:${puppetdb_group}" "${puppetdb_log_file}"
@@ -78,6 +81,9 @@ puppetdb_prestart() {
   chown "root:${puppetdb_group}" "%%PREFIX%%/etc/puppetdb/logback.xml"
   chmod 0640 "%%PREFIX%%/etc/puppetdb/logback.xml"
 
+  if [ ! -d "/var/db/puppetdb" ]; then
+    install -d -o "${puppetdb_user}" -g "${puppetdb_group}" -m 750 "/var/db/puppetdb"
+  fi
   chown -R "${puppetdb_user}:${puppetdb_group}" "/var/db/puppetdb"
   chmod 0750 "/var/db/puppetdb"
 }

Modified: head/databases/puppetdb4/pkg-plist
==============================================================================
--- head/databases/puppetdb/pkg-plist	Thu Mar 24 21:43:57 2016	(r411813)
+++ head/databases/puppetdb4/pkg-plist	Sat Mar 26 18:06:28 2016	(r411954)
@@ -1,27 +1,19 @@
-%%ETCDIR%%/logback.xml
-etc/newsyslog.conf.d/puppetdb
-libexec/puppetdb/puppetdb-anonymize
-libexec/puppetdb/puppetdb-export
-libexec/puppetdb/puppetdb-foreground
-libexec/puppetdb/puppetdb-import
-libexec/puppetdb/puppetdb-ssl-setup
-sbin/puppetdb-anonymize
-sbin/puppetdb-export
-sbin/puppetdb-foreground
-sbin/puppetdb-import
-sbin/puppetdb-ssl-setup
-sbin/puppetdb
+bin/puppetdb
+%%DATADIR%%/cli/apps/anonymize
+%%DATADIR%%/cli/apps/config-migration
+%%DATADIR%%/cli/apps/export
+%%DATADIR%%/cli/apps/foreground
+%%DATADIR%%/cli/apps/import
+%%DATADIR%%/cli/apps/ssl-setup
+%%DATADIR%%/ezbake-functions.sh
+%%DATADIR%%/ezbake.manifest
 %%DATADIR%%/puppetdb.jar
 @group puppetdb
+ at sample etc/puppetdb/bootstrap.cfg.sample
 @sample etc/puppetdb/conf.d/config.ini.sample
 @sample etc/puppetdb/conf.d/database.ini.sample
 @sample etc/puppetdb/conf.d/jetty.ini.sample
 @sample etc/puppetdb/conf.d/repl.ini.sample
+ at sample etc/puppetdb/logback.xml.sample
+ at sample etc/puppetdb/request-logging.xml.sample
 @group
- at mode 0750
- at dir /var/db/puppetdb/state
- at dir /var/db/puppetdb/db
- at dir /var/db/puppetdb/mq
- at dir /var/db/puppetdb
- at mode
- at dir(puppetdb,puppetdb,) /var/log/puppetdb

More information about the svn-ports-head mailing list