diff options
Diffstat (limited to 'databases')
24 files changed, 426 insertions, 6 deletions
diff --git a/databases/Makefile b/databases/Makefile index 359bafe2b195..f5601bd46577 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -224,6 +224,8 @@ SUBDIR += ods2sql SUBDIR += opendbviewer SUBDIR += opendbx + SUBDIR += openvoxdb8 + SUBDIR += openvoxdb-terminus8 SUBDIR += ora2pg SUBDIR += oracle8-client SUBDIR += p5-Amazon-SimpleDB diff --git a/databases/luasql-mysql/Makefile b/databases/luasql-mysql/Makefile index 4d74dfe4afd9..2dde1c748160 100644 --- a/databases/luasql-mysql/Makefile +++ b/databases/luasql-mysql/Makefile @@ -1,5 +1,5 @@ PORTNAME= luasql -PORTVERSION= 2.6.0 +PORTVERSION= 2.7.0 CATEGORIES= databases PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} PKGNAMESUFFIX= -${LUASQL_DRIVER} diff --git a/databases/luasql-mysql/distinfo b/databases/luasql-mysql/distinfo index fc2be004870c..0a51c2b21d80 100644 --- a/databases/luasql-mysql/distinfo +++ b/databases/luasql-mysql/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1609938245 -SHA256 (keplerproject-luasql-2.6.0_GH0.tar.gz) = 8ec445c58fa6148be759080c08f37baea5c3fa84f766197db9bf9c8edb6f8e60 -SIZE (keplerproject-luasql-2.6.0_GH0.tar.gz) = 107651 +TIMESTAMP = 1752710523 +SHA256 (keplerproject-luasql-2.7.0_GH0.tar.gz) = 15de59f0ea1a2ab205a11e0115d760f8e0c3fee0d3fcc37f52e326a53236e0c7 +SIZE (keplerproject-luasql-2.7.0_GH0.tar.gz) = 111312 diff --git a/databases/luasql-mysql/files/patch-src_ls__odbc.c b/databases/luasql-mysql/files/patch-src_ls__odbc.c new file mode 100644 index 000000000000..c6953edba8a2 --- /dev/null +++ b/databases/luasql-mysql/files/patch-src_ls__odbc.c @@ -0,0 +1,19 @@ +--- src/ls_odbc.c.orig 2025-07-17 01:23:45 UTC ++++ src/ls_odbc.c +@@ -493,6 +493,16 @@ static int cur_fetch (lua_State *L) + } + + /* ++** Cursor object collector function ++*/ ++static int cur_gc (lua_State *L) { ++ cur_data *cur = (cur_data *) luaL_checkudata (L, 1, LUASQL_CURSOR_ODBC); ++ if (cur != NULL && !(cur->closed)) ++ cur_shut(L, cur); ++ return 0; ++} ++ ++/* + ** Closes a cursor. + */ + static int cur_close (lua_State *L) diff --git a/databases/openvoxdb-terminus8/Makefile b/databases/openvoxdb-terminus8/Makefile new file mode 100644 index 000000000000..98ac666e1081 --- /dev/null +++ b/databases/openvoxdb-terminus8/Makefile @@ -0,0 +1,25 @@ +PORTNAME= openvoxdb-terminus +PORTVERSION= 8.9.1 +CATEGORIES= databases ruby +MASTER_SITES= https://artifacts.voxpupuli.org/openvoxdb/${PORTVERSION}/ +PKGNAMESUFFIX= 8 +DISTNAME= openvoxdb-${PORTVERSION} + +MAINTAINER= puppet@FreeBSD.org +COMMENT= PuppetDB storeconfigs backend terminus module +WWW= https://docs.puppetlabs.com/puppetdb/latest/ + +LICENSE= APACHE20 + +CONFLICTS_INSTALL= openvoxdb-terminus[0-9] puppetdb-terminus[0-9] +NO_BUILD= yes +USES= gmake ruby +WRKSRC= ${WRKDIR}/puppetdb-${PORTVERSION} + +post-patch: + @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/Makefile + +do-install: + @cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} ${GMAKE} install-puppetdb-termini + +.include <bsd.port.mk> diff --git a/databases/openvoxdb-terminus8/distinfo b/databases/openvoxdb-terminus8/distinfo new file mode 100644 index 000000000000..ea7fff96577c --- /dev/null +++ b/databases/openvoxdb-terminus8/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1748051408 +SHA256 (openvoxdb-8.9.1.tar.gz) = ac4b2ad8de6b95edb2a53d8c85421cd3aa1daafff3499b986a822b68b4186355 +SIZE (openvoxdb-8.9.1.tar.gz) = 61667810 diff --git a/databases/openvoxdb-terminus8/files/patch-Makefile b/databases/openvoxdb-terminus8/files/patch-Makefile new file mode 100644 index 000000000000..a8f4969db7a4 --- /dev/null +++ b/databases/openvoxdb-terminus8/files/patch-Makefile @@ -0,0 +1,61 @@ +--- Makefile.orig 2025-03-19 21:22:39 UTC ++++ Makefile +@@ -1,7 +1,7 @@ confdir = /etc + 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,33 @@ install-puppetdb-termini: + + + install-puppetdb-termini: +- install -Dm 0644 puppet/util/puppetdb/atom.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/atom.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/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/command.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command.rb" +- install -Dm 0644 puppet/util/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.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/node/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/node/puppetdb.rb" +- install -Dm 0644 puppet/indirector/resource/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource/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/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb" +- install -Dm 0644 puppet/reports/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/reports/puppetdb.rb" ++ install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/face" ++ install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/face/node" ++ install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/functions" ++ install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector" ++ install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog" ++ install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts" ++ install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/node" ++ install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource" ++ install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/reports" ++ install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/util" ++ install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb" ++ install -m 0644 puppet/util/puppetdb/atom.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/atom.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/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/command.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command.rb" ++ install -m 0644 puppet/util/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.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/node/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/node/puppetdb.rb" ++ install -m 0644 puppet/indirector/resource/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource/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/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.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/openvoxdb-terminus8/pkg-descr b/databases/openvoxdb-terminus8/pkg-descr new file mode 100644 index 000000000000..4d64063e8c6e --- /dev/null +++ b/databases/openvoxdb-terminus8/pkg-descr @@ -0,0 +1 @@ +The PuppetDB storeconfigs backend terminus module. diff --git a/databases/openvoxdb-terminus8/pkg-plist b/databases/openvoxdb-terminus8/pkg-plist new file mode 100644 index 000000000000..a12b86eb6a1a --- /dev/null +++ b/databases/openvoxdb-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/openvoxdb8/Makefile b/databases/openvoxdb8/Makefile new file mode 100644 index 000000000000..44305c7a51b6 --- /dev/null +++ b/databases/openvoxdb8/Makefile @@ -0,0 +1,57 @@ +PORTNAME= openvoxdb +PORTVERSION= 8.9.1 +CATEGORIES= databases java +MASTER_SITES= https://artifacts.voxpupuli.org/${PORTNAME}/${PORTVERSION}/ +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= openvoxdb[0-9] puppetdb[0-9] # etc/puppetdb/bootstrap.cfg.sample +USES= cpe java 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 +JAVA_VERSION= 11+ +NO_ARCH= yes +NO_BUILD= yes +WRKSRC= ${WRKDIR}/puppetdb-${PORTVERSION} + +USERS= puppetdb +GROUPS= puppetdb + +SUB_LIST= JAVA_HOME=${JAVA_HOME} +SUB_FILES= pkg-message + +DATADIR= ${PREFIX}/share/puppetdb +ETCDIR= ${PREFIX}/etc/puppetdb + +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 + @${REINPLACE_CMD} -e 's|/puppetlabs/puppetdb/|/puppetdb/|' \ + -e 's|\(install -m 0644 ext/config/.*\)"|\1.sample"|' \ + ${WRKSRC}/Makefile + +do-install: + @cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} make install-puppetdb + +.include <bsd.port.mk> diff --git a/databases/openvoxdb8/distinfo b/databases/openvoxdb8/distinfo new file mode 100644 index 000000000000..0a39ca95e129 --- /dev/null +++ b/databases/openvoxdb8/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1748051253 +SHA256 (openvoxdb-8.9.1.tar.gz) = ac4b2ad8de6b95edb2a53d8c85421cd3aa1daafff3499b986a822b68b4186355 +SIZE (openvoxdb-8.9.1.tar.gz) = 61667810 diff --git a/databases/openvoxdb8/files/patch-Makefile b/databases/openvoxdb8/files/patch-Makefile new file mode 100644 index 000000000000..0bdb0aa87c7f --- /dev/null +++ b/databases/openvoxdb8/files/patch-Makefile @@ -0,0 +1,15 @@ +--- Makefile.orig 2024-06-10 16:24:36 UTC ++++ Makefile +@@ -1,9 +1,9 @@ +-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" diff --git a/databases/openvoxdb8/files/patch-ext_bin_puppetdb b/databases/openvoxdb8/files/patch-ext_bin_puppetdb new file mode 100644 index 000000000000..0a139b110d2e --- /dev/null +++ b/databases/openvoxdb8/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/openvoxdb8/files/patch-ext_cli_ssl-setup b/databases/openvoxdb8/files/patch-ext_cli_ssl-setup new file mode 100644 index 000000000000..ab86d849142d --- /dev/null +++ b/databases/openvoxdb8/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/openvoxdb8/files/patch-ext_config_conf.d_config.ini b/databases/openvoxdb8/files/patch-ext_config_conf.d_config.ini new file mode 100644 index 000000000000..390068840508 --- /dev/null +++ b/databases/openvoxdb8/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/openvoxdb8/files/patch-ext_config_conf.d_jetty.ini b/databases/openvoxdb8/files/patch-ext_config_conf.d_jetty.ini new file mode 100644 index 000000000000..42d5665a0f64 --- /dev/null +++ b/databases/openvoxdb8/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/openvoxdb8/files/patch-ext_config_logback.xml b/databases/openvoxdb8/files/patch-ext_config_logback.xml new file mode 100644 index 000000000000..08cb543440aa --- /dev/null +++ b/databases/openvoxdb8/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 @@ + </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"/> + + <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> diff --git a/databases/openvoxdb8/files/patch-ext_config_request-logging.xml b/databases/openvoxdb8/files/patch-ext_config_request-logging.xml new file mode 100644 index 000000000000..51b90d0e844e --- /dev/null +++ b/databases/openvoxdb8/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 @@ + <configuration debug="false"> + <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> + <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> diff --git a/databases/openvoxdb8/files/pkg-message.in b/databases/openvoxdb8/files/pkg-message.in new file mode 100644 index 000000000000..fba773047854 --- /dev/null +++ b/databases/openvoxdb8/files/pkg-message.in @@ -0,0 +1,12 @@ +[ +{ type: install + message: <<EOM +If this is a new installation, please run the follow to setup your SSL/puppetdb +server: + +%%PREFIX%%/bin/puppetdb ssl-setup + +Please also remember to add puppetdb_enable="YES" into your rc.conf. +EOM +} +] diff --git a/databases/openvoxdb8/files/puppetdb.in b/databases/openvoxdb8/files/puppetdb.in new file mode 100644 index 000000000000..eb761d7ab425 --- /dev/null +++ b/databases/openvoxdb8/files/puppetdb.in @@ -0,0 +1,89 @@ +#!/bin/sh + +# PROVIDE: puppetdb +# REQUIRE: LOGIN +# KEYWORD: shutdown + +# +# Configuration settings for puppetdb in /etc/rc.conf: +# +# puppetdb_enable (bool): +# Set to "NO" by default. +# Set it to "YES" to enable puppetdb +# +# puppetdb_args (str): +# Extra arguments passed to start command +# +# puppetdb_java_home (str): +# Set to "%%JAVA_HOME%%" by default. +# Set the Java virtual machine to run puppetdb +# +# puppetdb_java_opts (str): +# Set to "" by default. +# Java VM args to use. +# +# puppetdb_user (str): +# Set to "puppetdb" by default. +# User to run puppetdb as. +# +# puppetdb_group (str): +# Set to "puppetdb" by default. +# Group for data file ownership. +# +# puppetdb_log_file (str): +# Set to "/var/log/puppetdb/puppetdb.log" by default. +# Log file location. +# + +. /etc/rc.subr + +name="puppetdb" +rcvar=puppetdb_enable + +load_rc_config "${name}" + +: ${puppetdb_enable="NO"} +: ${puppetdb_args="services -c %%PREFIX%%/etc/puppetdb/conf.d"} +: ${puppetdb_java_home="%%JAVA_HOME%%"} +: ${puppetdb_user="puppetdb"} +: ${puppetdb_group="puppetdb"} +: ${puppetdb_log_file="/var/log/puppetdb/puppetdb.log"} + +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} -Djruby.logger.class=com.puppetlabs.jruby_utils.jruby.Slf4jLogger -Dlogappender=F1 ${puppetdb_java_opts} -Djava.security.egd=/dev/urandom -cp %%DATADIR%%/puppetdb.jar clojure.main -m puppetlabs.puppetdb.core ${puppetdb_args} > ${puppetdb_log_file} 2>&1" + + +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}" + chmod 640 "${puppetdb_log_file}" + fi + if [ ! -d "/var/run/puppetdb" ]; then + install -d -o "${puppetdb_user}" -g "${puppetdb_group}" -m 750 "/var/run/puppetdb" + fi + + chown -R "root:${puppetdb_group}" "%%PREFIX%%/etc/puppetdb/conf.d" + chmod 0750 "%%PREFIX%%/etc/puppetdb/conf.d" + + 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" +} + +run_rc_command "$1" diff --git a/databases/openvoxdb8/pkg-descr b/databases/openvoxdb8/pkg-descr new file mode 100644 index 000000000000..b76f9bc98577 --- /dev/null +++ b/databases/openvoxdb8/pkg-descr @@ -0,0 +1 @@ +The PuppetDB storeconfigs backend diff --git a/databases/openvoxdb8/pkg-plist b/databases/openvoxdb8/pkg-plist new file mode 100644 index 000000000000..91c4e1df6246 --- /dev/null +++ b/databases/openvoxdb8/pkg-plist @@ -0,0 +1,23 @@ +bin/puppetdb +%%DATADIR%%/cli/apps/anonymize +%%DATADIR%%/cli/apps/config-migration +%%DATADIR%%/cli/apps/delete-reports +%%DATADIR%%/cli/apps/foreground +%%DATADIR%%/cli/apps/ssl-setup +%%DATADIR%%/cli/apps/start +%%DATADIR%%/cli/apps/stop +%%DATADIR%%/cli/apps/reload +%%DATADIR%%/cli/apps/upgrade +%%DATADIR%%/ezbake-functions.sh +%%DATADIR%%/ezbake.manifest +%%DATADIR%%/puppetdb.jar +@group puppetdb +@sample etc/puppetdb/bootstrap.cfg.sample +@sample etc/puppetdb/conf.d/auth.conf.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 +@sample etc/puppetdb/logback.xml.sample +@sample etc/puppetdb/request-logging.xml.sample +@group diff --git a/databases/puppetdb-terminus8/Makefile b/databases/puppetdb-terminus8/Makefile index 91ac32a5bfc3..0264e945004d 100644 --- a/databases/puppetdb-terminus8/Makefile +++ b/databases/puppetdb-terminus8/Makefile @@ -11,7 +11,7 @@ WWW= https://docs.puppetlabs.com/puppetdb/latest/ LICENSE= APACHE20 -CONFLICTS_INSTALL= puppetdb-terminus[0-9] +CONFLICTS_INSTALL= openvoxdb-terminus[0-9] puppetdb-terminus[0-9] NO_BUILD= yes USES= gmake ruby diff --git a/databases/puppetdb8/Makefile b/databases/puppetdb8/Makefile index dd209692ba14..48d2e1d88be0 100644 --- a/databases/puppetdb8/Makefile +++ b/databases/puppetdb8/Makefile @@ -14,7 +14,7 @@ RUN_DEPENDS= bash:shells/bash USE_RC_SUBR= puppetdb -CONFLICTS_INSTALL= puppetdb[0-9] # etc/puppetdb/bootstrap.cfg.sample +CONFLICTS_INSTALL= openvoxdb[0-9] puppetdb[0-9] # etc/puppetdb/bootstrap.cfg.sample USES= cpe java shebangfix CPE_VENDOR= puppet SHEBANG_FILES= ext/bin/puppetdb \ |