diff options
Diffstat (limited to 'databases/puppetdb3/files')
7 files changed, 0 insertions, 166 deletions
diff --git a/databases/puppetdb3/files/patch-ext__bin__puppetdb b/databases/puppetdb3/files/patch-ext__bin__puppetdb deleted file mode 100644 index 3a813b34d8cd..000000000000 --- a/databases/puppetdb3/files/patch-ext__bin__puppetdb +++ /dev/null @@ -1,21 +0,0 @@ ---- ext/bin/puppetdb.orig 2016-01-25 03:46:10.797703384 +0000 -+++ ext/bin/puppetdb 2016-01-25 04:12:10.048976423 +0000 -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!%%PREFIX%%/bin/bash - - set -a - if [ -r "/etc/default/puppetdb" ] ; then -@@ -11,6 +11,12 @@ - USER="_puppetdb" - INSTALL_DIR="/opt/puppetlabs/server/apps/puppetdb" - CONFIG="/etc/puppetlabs/puppetdb/conf.d" -+elif [ `uname` == "FreeBSD" ] ; then -+ JAVA_BIN="%%JAVA%%" -+ JAVA_ARGS="-Xmx192m" -+ USER="puppetdb" -+ INSTALL_DIR="%%DATADIR%%" -+ CONFIG="%%PREFIX%%/%%ETCDIR%%/conf.d" - else - echo "You seem to be missing some important configuration files; could not find /etc/default/puppetdb or /etc/sysconfig/puppetdb" >&2 - exit 1 diff --git a/databases/puppetdb3/files/patch-ext__config__conf.d__config.ini b/databases/puppetdb3/files/patch-ext__config__conf.d__config.ini deleted file mode 100644 index 316e40af8da5..000000000000 --- a/databases/puppetdb3/files/patch-ext__config__conf.d__config.ini +++ /dev/null @@ -1,15 +0,0 @@ ---- ext/config/conf.d/config.ini.orig 2016-02-25 00:02:56 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 = /usr/local/etc/puppetdb/logback.xml - - [command-processing] - # How many command-processing threads to use, defaults to (CPUs / 2) diff --git a/databases/puppetdb3/files/patch-ext__config__conf.d__database.ini b/databases/puppetdb3/files/patch-ext__config__conf.d__database.ini deleted file mode 100644 index 8c68b3529f83..000000000000 --- a/databases/puppetdb3/files/patch-ext__config__conf.d__database.ini +++ /dev/null @@ -1,11 +0,0 @@ ---- ext/config/conf.d/database.ini.orig 2016-02-25 00:02:56 UTC -+++ ext/config/conf.d/database.ini -@@ -12,7 +12,7 @@ subprotocol = hsqldb - # For the embedded DB: file:/path/to/database;hsqldb.tx=mvcc;sql.syntax_pgs=true - # For PostgreSQL: //host:port/databaseName - # Defaults to embedded DB located in <vardir>/db --subname = file:/opt/puppetlabs/server/data/puppetdb/db/db;hsqldb.tx=mvcc;sql.syntax_pgs=true -+subname = file:/var/db/puppetdb/db/db;hsqldb.tx=mvcc;sql.syntax_pgs=true - - # Connect as a specific user - # username = foobar diff --git a/databases/puppetdb3/files/patch-ext__config__logback.xml b/databases/puppetdb3/files/patch-ext__config__logback.xml deleted file mode 100644 index c27980d88516..000000000000 --- a/databases/puppetdb3/files/patch-ext__config__logback.xml +++ /dev/null @@ -1,15 +0,0 @@ ---- ext/config/logback.xml.orig 2016-02-25 00:02:56 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> diff --git a/databases/puppetdb3/files/patch-ext__config__request-logging.xml b/databases/puppetdb3/files/patch-ext__config__request-logging.xml deleted file mode 100644 index a058b8950e6b..000000000000 --- a/databases/puppetdb3/files/patch-ext__config__request-logging.xml +++ /dev/null @@ -1,10 +0,0 @@ ---- ext/config/request-logging.xml.orig 2016-02-25 00:02:56 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>combined</pattern> - <!-- To have the same "combined" pattern with elapsedTime ('%D') diff --git a/databases/puppetdb3/files/pkg-message.in b/databases/puppetdb3/files/pkg-message.in deleted file mode 100644 index 82e76a35423c..000000000000 --- a/databases/puppetdb3/files/pkg-message.in +++ /dev/null @@ -1,9 +0,0 @@ -If this is a new installation, please run the follow to setup your SSL/puppetdb -server: - -%%PREFIX%%/sbin/puppetdb ssl-setup - -Add puppetdb_enable="YES" into your rc.conf to enable. - -To enable communication from a FreeBSD Puppet master, install the -puppetdb-terminus package on the master. diff --git a/databases/puppetdb3/files/puppetdb.in b/databases/puppetdb3/files/puppetdb.in deleted file mode 100644 index 906cc12ef605..000000000000 --- a/databases/puppetdb3/files/puppetdb.in +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ -# -# 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="--config %%PREFIX%%/etc/puppetdb/conf.d -b %%PREFIX%%/etc/puppetdb/bootstrap.cfg"} -: ${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} -cp %%DATADIR%%/puppetdb.jar clojure.main -m puppetlabs.puppetdb.main ${puppetdb_args} > ${puppetdb_log_file} 2>&1" - - -required_files="${java_cmd}" - -start_precmd="puppetdb_prestart" - -puppetdb_prestart() { - 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" - - chown -R "${puppetdb_user}:${puppetdb_group}" "/var/db/puppetdb" - chmod 0750 "/var/db/puppetdb" -} - -run_rc_command "$1" |