diff options
Diffstat (limited to 'databases/puppetdb8/files')
| -rw-r--r-- | databases/puppetdb8/files/patch-Makefile | 28 | ||||
| -rw-r--r-- | databases/puppetdb8/files/puppetdb.in | 2 |
2 files changed, 3 insertions, 27 deletions
diff --git a/databases/puppetdb8/files/patch-Makefile b/databases/puppetdb8/files/patch-Makefile index e7cff1bad771..0bdb0aa87c7f 100644 --- a/databases/puppetdb8/files/patch-Makefile +++ b/databases/puppetdb8/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2023-06-14 04:02:14 UTC +--- Makefile.orig 2024-06-10 16:24:36 UTC +++ Makefile -@@ -1,24 +1,24 @@ +@@ -1,9 +1,9 @@ -prefix = /usr/local +prefix = %%PREFIX%% datadir = $(prefix)/share @@ -13,27 +13,3 @@ 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/request-logging.xml "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/request-logging.xml" -- install -m 0644 ext/config/logback.xml "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/logback.xml" -- install -m 0644 ext/config/bootstrap.cfg "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/bootstrap.cfg" -- install -m 0644 ext/config/conf.d/repl.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/repl.ini" -- install -m 0644 ext/config/conf.d/database.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/database.ini" -- install -m 0644 ext/config/conf.d/config.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/config.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/jetty.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/jetty.ini" -+ install -d -m 0755 "$(DESTDIR)$(confdir)/puppetdb/conf.d" -+ install -m 0644 ext/config/request-logging.xml "$(DESTDIR)$(confdir)/puppetdb/request-logging.xml.sample" -+ install -m 0644 ext/config/logback.xml "$(DESTDIR)$(confdir)/puppetdb/logback.xml.sample" -+ install -m 0644 ext/config/bootstrap.cfg "$(DESTDIR)$(confdir)/puppetdb/bootstrap.cfg.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/database.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/database.ini.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/auth.conf "$(DESTDIR)$(confdir)/puppetdb/conf.d/auth.conf.sample" -+ install -m 0644 ext/config/conf.d/jetty.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/jetty.ini.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/puppetdb.in b/databases/puppetdb8/files/puppetdb.in index 4e2f85a2d366..eb761d7ab425 100644 --- a/databases/puppetdb8/files/puppetdb.in +++ b/databases/puppetdb8/files/puppetdb.in @@ -53,7 +53,7 @@ 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" +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}" |