9 files changed, 0 insertions, 208 deletions
diff --git a/databases/puppetdb7/files/patch-Makefile b/databases/puppetdb7/files/patch-Makefile
deleted file mode 100644
index 583fcfa9fe4a..000000000000
--- a/databases/puppetdb7/files/patch-Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
---- Makefile.orig	2024-07-19 17:09:14 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/puppetdb7/files/patch-ext_bin_puppetdb b/databases/puppetdb7/files/patch-ext_bin_puppetdb
deleted file mode 100644
index 0a139b110d2e..000000000000
--- a/databases/puppetdb7/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/puppetdb7/files/patch-ext_cli_ssl-setup b/databases/puppetdb7/files/patch-ext_cli_ssl-setup
deleted file mode 100644
index ab86d849142d..000000000000
--- a/databases/puppetdb7/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/puppetdb7/files/patch-ext_config_conf.d_config.ini b/databases/puppetdb7/files/patch-ext_config_conf.d_config.ini
deleted file mode 100644
index 390068840508..000000000000
--- a/databases/puppetdb7/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/puppetdb7/files/patch-ext_config_conf.d_jetty.ini b/databases/puppetdb7/files/patch-ext_config_conf.d_jetty.ini
deleted file mode 100644
index 42d5665a0f64..000000000000
--- a/databases/puppetdb7/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/puppetdb7/files/patch-ext_config_logback.xml b/databases/puppetdb7/files/patch-ext_config_logback.xml
deleted file mode 100644
index 08cb543440aa..000000000000
--- a/databases/puppetdb7/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/puppetdb7/files/patch-ext_config_request-logging.xml b/databases/puppetdb7/files/patch-ext_config_request-logging.xml
deleted file mode 100644
index 51b90d0e844e..000000000000
--- a/databases/puppetdb7/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/puppetdb7/files/pkg-message.in b/databases/puppetdb7/files/pkg-message.in
deleted file mode 100644
index fba773047854..000000000000
--- a/databases/puppetdb7/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/puppetdb7/files/puppetdb.in b/databases/puppetdb7/files/puppetdb.in
deleted file mode 100644
index eb761d7ab425..000000000000
--- a/databases/puppetdb7/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} -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"