diff options
Diffstat (limited to 'databases')
19 files changed, 0 insertions, 420 deletions
diff --git a/databases/Makefile b/databases/Makefile index b8ff199d6db4..e6e3be1338e9 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -719,10 +719,8 @@ SUBDIR += proftpd-mod_sql_tds SUBDIR += prometheus-postgresql-adapter SUBDIR += pspg - SUBDIR += puppetdb-terminus6 SUBDIR += puppetdb-terminus7 SUBDIR += puppetdb-terminus8 - SUBDIR += puppetdb6 SUBDIR += puppetdb7 SUBDIR += puppetdb8 SUBDIR += puredb diff --git a/databases/puppetdb-terminus6/Makefile b/databases/puppetdb-terminus6/Makefile deleted file mode 100644 index 61ef379fdefb..000000000000 --- a/databases/puppetdb-terminus6/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -PORTNAME= puppetdb-terminus -PORTVERSION= 6.22.1 -CATEGORIES= databases ruby -MASTER_SITES= https://downloads.puppetlabs.com/puppetdb/ -PKGNAMESUFFIX= 6 -DISTNAME= puppetdb-${PORTVERSION} - -MAINTAINER= puppet@FreeBSD.org -COMMENT= PuppetDB storeconfigs backend terminus module -WWW= https://docs.puppetlabs.com/puppetdb/latest/ - -LICENSE= APACHE20 - -DEPRECATED= Puppet 6 has reached EOL -EXPIRATION_DATE=2023-06-01 - -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 <bsd.port.mk> diff --git a/databases/puppetdb-terminus6/distinfo b/databases/puppetdb-terminus6/distinfo deleted file mode 100644 index f83677cc455a..000000000000 --- a/databases/puppetdb-terminus6/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1663350139 -SHA256 (puppetdb-6.22.1.tar.gz) = bc77e244411fcc49398ab8f50a28e39ea4424f92f1a94c27c084b8ae7499679b -SIZE (puppetdb-6.22.1.tar.gz) = 48848603 diff --git a/databases/puppetdb-terminus6/files/patch-Makefile b/databases/puppetdb-terminus6/files/patch-Makefile deleted file mode 100644 index a01cbdc3477b..000000000000 --- a/databases/puppetdb-terminus6/files/patch-Makefile +++ /dev/null @@ -1,58 +0,0 @@ ---- Makefile.orig 2022-08-01 21:19:05 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,30 @@ install-puppetdb: - - - install-puppetdb-termini: -- 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 -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/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/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/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/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.rb" -- install -Dm 0644 puppet/util/puppetdb/config.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/config.rb" -- install -Dm 0644 puppet/util/puppetdb/atom.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/atom.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 -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/functions" -+ install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/reports" -+ install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/face/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/node" -+ install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource" -+ install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb" -+ 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 -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/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/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/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/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.rb" -+ install -m 0644 puppet/util/puppetdb/config.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/config.rb" -+ install -m 0644 puppet/util/puppetdb/atom.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/atom.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-rpm-sysv-init: install-rpm-preinst - install -d -m 0755 "$(DESTDIR)$(initdir)" diff --git a/databases/puppetdb-terminus6/pkg-descr b/databases/puppetdb-terminus6/pkg-descr deleted file mode 100644 index 4d64063e8c6e..000000000000 --- a/databases/puppetdb-terminus6/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -The PuppetDB storeconfigs backend terminus module. diff --git a/databases/puppetdb-terminus6/pkg-plist b/databases/puppetdb-terminus6/pkg-plist deleted file mode 100644 index a12b86eb6a1a..000000000000 --- a/databases/puppetdb-terminus6/pkg-plist +++ /dev/null @@ -1,17 +0,0 @@ -%%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/puppetdb6/Makefile b/databases/puppetdb6/Makefile deleted file mode 100644 index 81912224e8a2..000000000000 --- a/databases/puppetdb6/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -PORTNAME= puppetdb -PORTVERSION= 6.22.1 -CATEGORIES= databases java -MASTER_SITES= https://downloads.puppetlabs.com/puppetdb/ -PKGNAMESUFFIX= 6 - -MAINTAINER= puppet@FreeBSD.org -COMMENT= PuppetDB storeconfigs backend -WWW= https://docs.puppetlabs.com/puppetdb/latest/ - -LICENSE= APACHE20 - -DEPRECATED= Puppet 6 has reached EOL -EXPIRATION_DATE=2023-06-01 - -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 -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 <bsd.port.mk> diff --git a/databases/puppetdb6/distinfo b/databases/puppetdb6/distinfo deleted file mode 100644 index 3ff2e6a73bf9..000000000000 --- a/databases/puppetdb6/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1663350175 -SHA256 (puppetdb-6.22.1.tar.gz) = bc77e244411fcc49398ab8f50a28e39ea4424f92f1a94c27c084b8ae7499679b -SIZE (puppetdb-6.22.1.tar.gz) = 48848603 diff --git a/databases/puppetdb6/files/patch-Makefile b/databases/puppetdb6/files/patch-Makefile deleted file mode 100644 index 6e34d619fbeb..000000000000 --- a/databases/puppetdb6/files/patch-Makefile +++ /dev/null @@ -1,39 +0,0 @@ ---- Makefile.orig 2022-08-01 21:19:05 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/jetty.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/jetty.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/repl.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/repl.ini" -- install -m 0644 ext/config/conf.d/config.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/config.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/jetty.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/jetty.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/repl.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/repl.ini.sample" -+ install -m 0644 ext/config/conf.d/config.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/config.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/puppetdb6/files/patch-ext_bin_puppetdb b/databases/puppetdb6/files/patch-ext_bin_puppetdb deleted file mode 100644 index 0a139b110d2e..000000000000 --- a/databases/puppetdb6/files/patch-ext_bin_puppetdb +++ /dev/null @@ -1,15 +0,0 @@ ---- 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/puppetdb6/files/patch-ext_cli_ssl-setup b/databases/puppetdb6/files/patch-ext_cli_ssl-setup deleted file mode 100644 index ab86d849142d..000000000000 --- a/databases/puppetdb6/files/patch-ext_cli_ssl-setup +++ /dev/null @@ -1,11 +0,0 @@ ---- 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/puppetdb6/files/patch-ext_config_conf.d_config.ini b/databases/puppetdb6/files/patch-ext_config_conf.d_config.ini deleted file mode 100644 index 390068840508..000000000000 --- a/databases/puppetdb6/files/patch-ext_config_conf.d_config.ini +++ /dev/null @@ -1,15 +0,0 @@ ---- 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/puppetdb6/files/patch-ext_config_conf.d_jetty.ini b/databases/puppetdb6/files/patch-ext_config_conf.d_jetty.ini deleted file mode 100644 index 42d5665a0f64..000000000000 --- a/databases/puppetdb6/files/patch-ext_config_conf.d_jetty.ini +++ /dev/null @@ -1,8 +0,0 @@ ---- 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/puppetdb6/files/patch-ext_config_logback.xml b/databases/puppetdb6/files/patch-ext_config_logback.xml deleted file mode 100644 index 08cb543440aa..000000000000 --- a/databases/puppetdb6/files/patch-ext_config_logback.xml +++ /dev/null @@ -1,29 +0,0 @@ ---- 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/puppetdb6/files/patch-ext_config_request-logging.xml b/databases/puppetdb6/files/patch-ext_config_request-logging.xml deleted file mode 100644 index 51b90d0e844e..000000000000 --- a/databases/puppetdb6/files/patch-ext_config_request-logging.xml +++ /dev/null @@ -1,14 +0,0 @@ ---- 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/puppetdb6/files/pkg-message.in b/databases/puppetdb6/files/pkg-message.in deleted file mode 100644 index fba773047854..000000000000 --- a/databases/puppetdb6/files/pkg-message.in +++ /dev/null @@ -1,12 +0,0 @@ -[ -{ 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/puppetdb6/files/puppetdb.in b/databases/puppetdb6/files/puppetdb.in deleted file mode 100644 index 4e2f85a2d366..000000000000 --- a/databases/puppetdb6/files/puppetdb.in +++ /dev/null @@ -1,89 +0,0 @@ -#!/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} ${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/puppetdb6/pkg-descr b/databases/puppetdb6/pkg-descr deleted file mode 100644 index b76f9bc98577..000000000000 --- a/databases/puppetdb6/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -The PuppetDB storeconfigs backend diff --git a/databases/puppetdb6/pkg-plist b/databases/puppetdb6/pkg-plist deleted file mode 100644 index 91c4e1df6246..000000000000 --- a/databases/puppetdb6/pkg-plist +++ /dev/null @@ -1,23 +0,0 @@ -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 |