From nobody Sat Apr 29 01:36:29 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q7XBP4F9Kz48G2L; Sat, 29 Apr 2023 01:36:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q7XBP3Mr9z42M5; Sat, 29 Apr 2023 01:36:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682732189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jMhd9/nO1GVmXFTMXTUNeMhuTh2VPrs4g4ILU8hwga0=; b=xDMgrUNjyqqcCWrgXvaicOLtQxBvWWeZYYojxq0gdrvImUNZjjPdIqOVR/uvTFOC/y6bjg OsLVsqQzSTnZo6XKRYM/9r31pa5+zlVV7q6H8iUybal8nrudPjFtmzOGfMvslmsRRyAlOY sxBU4R6jb60sD+VCA1DnLnYVppR8tiraT0QgYAFGn/UeyuAUk9tACQbxQyojRcucDMpgt7 Ieyy+DQMSodO7PrHrHHvXEYfs23EHww6HqV2adJ4u0Qv6M7UjTyuc41NvEhJM7DVI273vd HEKU4jSZk5biGiEJZa/y44WlANAKViaeCuJIN2HWj3Z2A6LfvJWHbVW2s4KI9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682732189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jMhd9/nO1GVmXFTMXTUNeMhuTh2VPrs4g4ILU8hwga0=; b=fTN7tN5/Y486qyN3PhKgIH4frxMhh2h9IcDgXOhHDNwel5WaYSIM5X6uGfKGAXbgGGzbfe ZdukJluvQanWkEeh8RlKpjCSvXZQUVXCAiRNAWRyCHllpbArdfwWexhvzM/udakvTLRvE8 KlhngXNubqU93X2lVl3N1JpbG+4EDG4hLRuNXEE8WC7XEBRhwS4IsDWpzhyDWCJf7+e2C9 hsP3a3sNdw6nkgIuffwL8Bleg2mheh4Am6/rVvq3u04HN3d2G+uMxVV+tTfBa8pcz5F0ur UO4oymOQ96c8+0mqxmZx6aL2LyGjVu4Gtv4Gkd9SwouCbRY71AKF140sbQCGAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682732189; a=rsa-sha256; cv=none; b=JdIVEWUQHLHKf65imqXdkpcdZ3CAdxpEhnE5rQ8hQ5WDE/bTg4npyMNB3Zc9r4IdEe5pxI jxEGpeHpl85w50vRjjqwNOBEtp24VXMo7TIFB9b+1pE0gQSAZ5VkxCauO0B/fY6PuAoXfT ifq/2VMCyjrzZzk+E6PjtYcEM6dU/KRYDz2LgVW7tHAcTSJysgZxhvQ3p5JphW9K3Qna6K tZsoavLGtd5MuHcHP2wAYK/vr6h2d9RUSxFPuZHdIuMC1sjU+t8A/JIi0g+YCaXe+6RTuF aoeB/HW+Vqb1p5pu90rdOmlald8t7bZ3FGjRaoIy9L7eIN6SgAAimoHNLLBQUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q7XBP2H1czNSH; Sat, 29 Apr 2023 01:36:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33T1aTnl069520; Sat, 29 Apr 2023 01:36:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33T1aTsg069519; Sat, 29 Apr 2023 01:36:29 GMT (envelope-from git) Date: Sat, 29 Apr 2023 01:36:29 GMT Message-Id: <202304290136.33T1aTsg069519@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Romain=20Tarti=C3=A8re?= Subject: git: e500139794ef - main - databases/puppetdb8: New port List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: romain X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e500139794ef0e5d4c888457877799b23bf65104 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by romain: URL: https://cgit.FreeBSD.org/ports/commit/?id=e500139794ef0e5d4c888457877799b23bf65104 commit e500139794ef0e5d4c888457877799b23bf65104 Author: Romain Tartière AuthorDate: 2023-04-28 21:02:35 +0000 Commit: Romain Tartière CommitDate: 2023-04-29 01:36:13 +0000 databases/puppetdb8: New port The PuppetDB storeconfigs backend --- databases/Makefile | 2 + databases/puppetdb-terminus6/Makefile | 2 +- databases/puppetdb-terminus7/Makefile | 2 +- databases/puppetdb-terminus8/Makefile | 26 +++++++ databases/puppetdb-terminus8/distinfo | 3 + databases/puppetdb-terminus8/files/patch-Makefile | 59 ++++++++++++++ databases/puppetdb-terminus8/pkg-descr | 1 + databases/puppetdb-terminus8/pkg-plist | 17 +++++ databases/puppetdb8/Makefile | 51 +++++++++++++ databases/puppetdb8/distinfo | 3 + databases/puppetdb8/files/patch-Makefile | 39 ++++++++++ databases/puppetdb8/files/patch-ext_bin_puppetdb | 15 ++++ databases/puppetdb8/files/patch-ext_cli_ssl-setup | 11 +++ .../files/patch-ext_config_conf.d_config.ini | 15 ++++ .../files/patch-ext_config_conf.d_jetty.ini | 8 ++ .../puppetdb8/files/patch-ext_config_logback.xml | 29 +++++++ .../files/patch-ext_config_request-logging.xml | 14 ++++ databases/puppetdb8/files/pkg-message.in | 12 +++ databases/puppetdb8/files/puppetdb.in | 89 ++++++++++++++++++++++ databases/puppetdb8/pkg-descr | 1 + databases/puppetdb8/pkg-plist | 23 ++++++ 21 files changed, 420 insertions(+), 2 deletions(-) diff --git a/databases/Makefile b/databases/Makefile index 5b1c367d83e3..869d48af8a8f 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -717,8 +717,10 @@ SUBDIR += pspg SUBDIR += puppetdb-terminus6 SUBDIR += puppetdb-terminus7 + SUBDIR += puppetdb-terminus8 SUBDIR += puppetdb6 SUBDIR += puppetdb7 + SUBDIR += puppetdb8 SUBDIR += puredb SUBDIR += pxlib SUBDIR += pxtools diff --git a/databases/puppetdb-terminus6/Makefile b/databases/puppetdb-terminus6/Makefile index bc15f09678b9..52a7230395fc 100644 --- a/databases/puppetdb-terminus6/Makefile +++ b/databases/puppetdb-terminus6/Makefile @@ -16,7 +16,7 @@ EXPIRATION_DATE=2023-06-01 BUILD_DEPENDS= puppet6>=0:sysutils/puppet6 -CONFLICTS_INSTALL= puppetdb-terminus5 puppetdb-terminus7 +CONFLICTS_INSTALL= puppetdb-terminus[0-9] NO_BUILD= yes USES= gmake ruby diff --git a/databases/puppetdb-terminus7/Makefile b/databases/puppetdb-terminus7/Makefile index 59bf8c70aade..439050b62a38 100644 --- a/databases/puppetdb-terminus7/Makefile +++ b/databases/puppetdb-terminus7/Makefile @@ -13,7 +13,7 @@ LICENSE= APACHE20 BUILD_DEPENDS= puppet7>=0:sysutils/puppet7 -CONFLICTS_INSTALL= puppetdb-terminus5 puppetdb-terminus6 +CONFLICTS_INSTALL= puppetdb-terminus[0-9] NO_BUILD= yes USES= gmake ruby diff --git a/databases/puppetdb-terminus8/Makefile b/databases/puppetdb-terminus8/Makefile new file mode 100644 index 000000000000..e7d78f248c9d --- /dev/null +++ b/databases/puppetdb-terminus8/Makefile @@ -0,0 +1,26 @@ +PORTNAME= puppetdb-terminus +PORTVERSION= 8.0.0 +CATEGORIES= databases ruby +MASTER_SITES= https://downloads.puppetlabs.com/puppetdb/ +PKGNAMESUFFIX= 8 +DISTNAME= puppetdb-${PORTVERSION} + +MAINTAINER= puppet@FreeBSD.org +COMMENT= PuppetDB storeconfigs backend terminus module +WWW= https://docs.puppetlabs.com/puppetdb/latest/ + +LICENSE= APACHE20 + +BUILD_DEPENDS= puppet7>=0:sysutils/puppet7 + +CONFLICTS_INSTALL= puppetdb-terminus[0-9] +NO_BUILD= yes +USES= gmake ruby + +post-patch: + @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/Makefile + +do-install: + @cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} ${GMAKE} install-puppetdb-termini + +.include diff --git a/databases/puppetdb-terminus8/distinfo b/databases/puppetdb-terminus8/distinfo new file mode 100644 index 000000000000..b883a3ef5bc7 --- /dev/null +++ b/databases/puppetdb-terminus8/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1682476160 +SHA256 (puppetdb-8.0.0.tar.gz) = 7c3cf4e45951134f326cf2bb636496dfb45e205d3cc839fd20e173a4dd7095ae +SIZE (puppetdb-8.0.0.tar.gz) = 50152833 diff --git a/databases/puppetdb-terminus8/files/patch-Makefile b/databases/puppetdb-terminus8/files/patch-Makefile new file mode 100644 index 000000000000..5417b760be4f --- /dev/null +++ b/databases/puppetdb-terminus8/files/patch-Makefile @@ -0,0 +1,59 @@ +--- Makefile.orig 2023-04-04 16:01:28 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 + +@@ -36,22 +36,31 @@ install-puppetdb: + + + install-puppetdb-termini: +- install -Dm 0644 puppet/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb" +- install -Dm 0644 puppet/face/node/status.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/status.rb" +- install -Dm 0644 puppet/face/node/deactivate.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/deactivate.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/indirector/facts/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb.rb" +- install -Dm 0644 puppet/indirector/facts/puppetdb_apply.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb_apply.rb" +- install -Dm 0644 puppet/indirector/node/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/node/puppetdb.rb" +- install -Dm 0644 puppet/util/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb" +- install -Dm 0644 puppet/util/puppetdb/command.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command.rb" +- install -Dm 0644 puppet/util/puppetdb/atom.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/atom.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/char_encoding.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/char_encoding.rb" +- install -Dm 0644 puppet/util/puppetdb/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.rb" +- install -Dm 0644 puppet/reports/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/reports/puppetdb.rb" ++ install -d -m 755 "$(DESTDIR)$(rubylibdir)/puppet/face/node" ++ install -d -m 755 "$(DESTDIR)$(rubylibdir)/puppet/functions" ++ install -d -m 755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog" ++ install -d -m 755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts" ++ install -d -m 755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/node" ++ install -d -m 755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource" ++ install -d -m 755 "$(DESTDIR)$(rubylibdir)/puppet/reports" ++ install -d -m 755 "$(DESTDIR)$(rubylibdir)/puppet/util" ++ install -d -m 755 "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb" ++ install -m 0644 puppet/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb" ++ install -m 0644 puppet/face/node/status.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/status.rb" ++ install -m 0644 puppet/face/node/deactivate.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/deactivate.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/indirector/facts/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb.rb" ++ install -m 0644 puppet/indirector/facts/puppetdb_apply.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb_apply.rb" ++ install -m 0644 puppet/indirector/node/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/node/puppetdb.rb" ++ install -m 0644 puppet/util/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb" ++ install -m 0644 puppet/util/puppetdb/command.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command.rb" ++ install -m 0644 puppet/util/puppetdb/atom.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/atom.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/char_encoding.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/char_encoding.rb" ++ install -m 0644 puppet/util/puppetdb/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.rb" ++ install -m 0644 puppet/reports/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/reports/puppetdb.rb" + + install-rpm-sysv-init: install-rpm-preinst + install -d -m 0755 "$(DESTDIR)$(initdir)" diff --git a/databases/puppetdb-terminus8/pkg-descr b/databases/puppetdb-terminus8/pkg-descr new file mode 100644 index 000000000000..4d64063e8c6e --- /dev/null +++ b/databases/puppetdb-terminus8/pkg-descr @@ -0,0 +1 @@ +The PuppetDB storeconfigs backend terminus module. diff --git a/databases/puppetdb-terminus8/pkg-plist b/databases/puppetdb-terminus8/pkg-plist new file mode 100644 index 000000000000..a12b86eb6a1a --- /dev/null +++ b/databases/puppetdb-terminus8/pkg-plist @@ -0,0 +1,17 @@ +%%RUBY_SITELIBDIR%%/puppet/face/node/deactivate.rb +%%RUBY_SITELIBDIR%%/puppet/face/node/status.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 +%%RUBY_SITELIBDIR%%/puppet/indirector/node/puppetdb.rb +%%RUBY_SITELIBDIR%%/puppet/indirector/resource/puppetdb.rb +%%RUBY_SITELIBDIR%%/puppet/reports/puppetdb.rb +%%RUBY_SITELIBDIR%%/puppet/util/puppetdb.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 + diff --git a/databases/puppetdb8/Makefile b/databases/puppetdb8/Makefile new file mode 100644 index 000000000000..95d78c6ac72d --- /dev/null +++ b/databases/puppetdb8/Makefile @@ -0,0 +1,51 @@ +PORTNAME= puppetdb +PORTVERSION= 8.0.0 +CATEGORIES= databases java +MASTER_SITES= https://downloads.puppetlabs.com/puppetdb/ +PKGNAMESUFFIX= 8 + +MAINTAINER= puppet@FreeBSD.org +COMMENT= PuppetDB storeconfigs backend +WWW= https://docs.puppetlabs.com/puppetdb/latest/ + +LICENSE= APACHE20 + +RUN_DEPENDS= bash:shells/bash + +USE_RC_SUBR= puppetdb + +CONFLICTS_INSTALL= puppetdb[0-9] # etc/puppetdb/bootstrap.cfg.sample +USES= cpe shebangfix +CPE_VENDOR= puppet +SHEBANG_FILES= ext/bin/puppetdb \ + ext/cli/anonymize \ + ext/cli/config-migration \ + ext/cli/foreground \ + ext/cli/ssl-setup \ + ext/cli/start \ + ext/cli/stop \ + ext/cli/reload \ + ext/cli/upgrade \ + ext/ezbake-functions.sh +USE_JAVA= yes +JAVA_VERSION= 11+ +NO_ARCH= yes +NO_BUILD= yes + +USERS= puppetdb +GROUPS= puppetdb + +SUB_LIST= JAVA_HOME=${JAVA_HOME} +SUB_FILES= pkg-message + +post-patch: +.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} make install-puppetdb + +.include diff --git a/databases/puppetdb8/distinfo b/databases/puppetdb8/distinfo new file mode 100644 index 000000000000..0d087536cef4 --- /dev/null +++ b/databases/puppetdb8/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1682476153 +SHA256 (puppetdb-8.0.0.tar.gz) = 7c3cf4e45951134f326cf2bb636496dfb45e205d3cc839fd20e173a4dd7095ae +SIZE (puppetdb-8.0.0.tar.gz) = 50152833 diff --git a/databases/puppetdb8/files/patch-Makefile b/databases/puppetdb8/files/patch-Makefile new file mode 100644 index 000000000000..f91d176cfc78 --- /dev/null +++ b/databases/puppetdb8/files/patch-Makefile @@ -0,0 +1,39 @@ +--- Makefile.orig 2023-04-04 16:01:28 UTC ++++ Makefile +@@ -1,24 +1,24 @@ +-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/conf.d/database.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/database.ini" +- install -m 0644 ext/config/conf.d/auth.conf "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/auth.conf" +- install -m 0644 ext/config/conf.d/config.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/config.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/jetty.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/jetty.ini" +- install -m 0644 ext/config/bootstrap.cfg "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/bootstrap.cfg" +- install -m 0644 ext/config/logback.xml "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/logback.xml" +- 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/conf.d/database.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/database.ini.sample" ++ install -m 0644 ext/config/conf.d/auth.conf "$(DESTDIR)$(confdir)/puppetdb/conf.d/auth.conf.sample" ++ install -m 0644 ext/config/conf.d/config.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/config.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/jetty.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/jetty.ini.sample" ++ install -m 0644 ext/config/bootstrap.cfg "$(DESTDIR)$(confdir)/puppetdb/bootstrap.cfg.sample" ++ install -m 0644 ext/config/logback.xml "$(DESTDIR)$(confdir)/puppetdb/logback.xml.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)" diff --git a/databases/puppetdb8/files/patch-ext_bin_puppetdb b/databases/puppetdb8/files/patch-ext_bin_puppetdb new file mode 100644 index 000000000000..0a139b110d2e --- /dev/null +++ b/databases/puppetdb8/files/patch-ext_bin_puppetdb @@ -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" diff --git a/databases/puppetdb8/files/patch-ext_cli_ssl-setup b/databases/puppetdb8/files/patch-ext_cli_ssl-setup new file mode 100644 index 000000000000..ab86d849142d --- /dev/null +++ b/databases/puppetdb8/files/patch-ext_cli_ssl-setup @@ -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 diff --git a/databases/puppetdb8/files/patch-ext_config_conf.d_config.ini b/databases/puppetdb8/files/patch-ext_config_conf.d_config.ini new file mode 100644 index 000000000000..390068840508 --- /dev/null +++ b/databases/puppetdb8/files/patch-ext_config_conf.d_config.ini @@ -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) diff --git a/databases/puppetdb8/files/patch-ext_config_conf.d_jetty.ini b/databases/puppetdb8/files/patch-ext_config_conf.d_jetty.ini new file mode 100644 index 000000000000..42d5665a0f64 --- /dev/null +++ b/databases/puppetdb8/files/patch-ext_config_conf.d_jetty.ini @@ -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 diff --git a/databases/puppetdb8/files/patch-ext_config_logback.xml b/databases/puppetdb8/files/patch-ext_config_logback.xml new file mode 100644 index 000000000000..08cb543440aa --- /dev/null +++ b/databases/puppetdb8/files/patch-ext_config_logback.xml @@ -0,0 +1,29 @@ +--- 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 @@ + + + +- /var/log/puppetlabs/puppetdb/puppetdb.log ++ /var/log/puppetdb/puppetdb.log + true + +- /var/log/puppetlabs/puppetdb/puppetdb-%d{yyyy-MM-dd}.%i.log.gz ++ /var/log/puppetdb/puppetdb-%d{yyyy-MM-dd}.%i.log.gz + + 200MB + 90 +@@ -31,11 +31,11 @@ + level="info"/> + + +- /var/log/puppetlabs/puppetdb/puppetdb-status.log ++ /var/log/puppetdb/puppetdb-status.log + true + + +- /var/log/puppetlabs/puppetdb/puppetdb-status-%d{yyyy-MM-dd}.%i.log.gz ++ /var/log/puppetdb/puppetdb-status-%d{yyyy-MM-dd}.%i.log.gz + + 200MB + 90 diff --git a/databases/puppetdb8/files/patch-ext_config_request-logging.xml b/databases/puppetdb8/files/patch-ext_config_request-logging.xml new file mode 100644 index 000000000000..51b90d0e844e --- /dev/null +++ b/databases/puppetdb8/files/patch-ext_config_request-logging.xml @@ -0,0 +1,14 @@ +--- 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 @@ + + +- /var/log/puppetlabs/puppetdb/puppetdb-access.log ++ /var/log/puppetdb/puppetdb-access.log + true + +- /var/log/puppetlabs/puppetdb/puppetdb-access-%d{yyyy-MM-dd}.%i.log.gz ++ /var/log/puppetdb/puppetdb-access-%d{yyyy-MM-dd}.%i.log.gz + + 200MB + 90 diff --git a/databases/puppetdb8/files/pkg-message.in b/databases/puppetdb8/files/pkg-message.in new file mode 100644 index 000000000000..fba773047854 --- /dev/null +++ b/databases/puppetdb8/files/pkg-message.in @@ -0,0 +1,12 @@ +[ +{ type: install + message: <