File puppetdb-fix-templates.patch of Package puppetdb
--- a/ext/redhat/puppetdb.spec.erb 2015-10-13 19:22:51.000000000 +0200
+++ b/ext/redhat/puppetdb.spec.erb 2023-06-04 09:34:47.228087711 +0200
@@ -248,7 +248,7 @@
fi
%endif
-<%= @sbin_dir -%>/puppetdb ssl-setup
+<%= @sbin_dir %>/puppetdb ssl-setup
<%= ERB.new(File.read("ext/templates/directory_perms.erb")).result %>
@@ -376,7 +376,7 @@
require 'socket'
hostname = Socket.gethostname
-%>
-* <%= Time.now.strftime("%a %b %d %Y") %> <%= ENV['USER'] -%> <<%= ENV['USER'].strip -%>@<%= hostname -%>> - <%= Pkg::Config.rpmversion %>-<%= Pkg::Config.rpmrelease %>
+* <%= Time.now.strftime("%a %b %d %Y") %> <%= ENV['USER'] %> <<%= ENV['USER'].strip %>@<%= hostname %>> - <%= Pkg::Config.rpmversion %>-<%= Pkg::Config.rpmrelease %>
- Autobuild from Rake task
* Mon Apr 02 2012 Michael Stahnke <stahnma@puppetlabs.com> - 0.1.0-1
--- a/ext/templates/config.ini.erb 2015-10-13 19:22:51.000000000 +0200
+++ b/ext/templates/config.ini.erb 2023-06-04 09:28:47.238923309 +0200
@@ -3,15 +3,15 @@
[global]
# Store mq/db data in a custom directory
-vardir = <%= @lib_dir -%>
+vardir = <%= @lib_dir %>
# Use an external logback config file
-logging-config = <%= @etc_dir -%>/logback.xml
+logging-config = <%= @etc_dir %>/logback.xml
<% if @pe -%>
product-name = pe-puppetdb
-<% end -%>
+<% end -%>
[command-processing]
# How many command-processing threads to use, defaults to (CPUs / 2)
# threads = 4
--- a/ext/templates/database.ini.erb 2015-10-13 19:22:51.000000000 +0200
+++ b/ext/templates/database.ini.erb 2023-06-04 09:29:16.271660001 +0200
@@ -12,7 +12,7 @@
# 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:<%= @lib_dir -%>/db/db;hsqldb.tx=mvcc;sql.syntax_pgs=true
+subname = file:<%= @lib_dir %>/db/db;hsqldb.tx=mvcc;sql.syntax_pgs=true
# Connect as a specific user
# username = foobar
--- a/ext/templates/deb/base.install.erb 2015-10-13 19:22:51.000000000 +0200
+++ b/ext/templates/deb/base.install.erb 2023-06-04 09:40:22.224621592 +0200
@@ -6,5 +6,5 @@
<%= @libexec_dir.gsub(/^\//, '') %>
<%= @sbin_dir.gsub(/^\//, '') %>
<% if @pe == false -%>
-<%= @link.gsub(/^\//, '') -%>
+<%= @link.gsub(/^\//, '') %>
<% end -%>
--- a/ext/templates/deb/changelog.erb 2015-10-13 19:22:51.000000000 +0200
+++ b/ext/templates/deb/changelog.erb 2023-06-04 09:35:24.781044348 +0200
@@ -3,7 +3,7 @@
else
dists = 'hardy lucid maverick oneiric unstable lenny sid squeeze wheezy precise'
end -%>
-<%= @name -%> (<%= Pkg::Config.debversion -%>) <%= dists -%>; urgency=low
+<%= @name %> (<%= Pkg::Config.debversion %>) <%= dists %>; urgency=low
* Add postgresql to suggests
* Adding an init script from Puppet Labs Ops
--- a/ext/templates/deb/postinst.erb 2015-10-13 19:22:51.000000000 +0200
+++ b/ext/templates/deb/postinst.erb 2023-06-04 09:35:38.977405991 +0200
@@ -2,7 +2,7 @@
# Set up the SSL stuff
-<%= @sbin_dir -%>/puppetdb ssl-setup
+<%= @sbin_dir %>/puppetdb ssl-setup
<%= ERB.new(File.read("ext/templates/directory_perms.erb")).result %>
--- a/ext/templates/deb/postrm.erb 2015-10-13 19:22:51.000000000 +0200
+++ b/ext/templates/deb/postrm.erb 2023-06-04 09:35:55.309822054 +0200
@@ -2,9 +2,9 @@
case "$1" in
purge)
- rm -rf <%= @config_dir -%>
+ rm -rf <%= @config_dir %>
- rm -rf <%= @link -%> <%= @install_dir -%>
+ rm -rf <%= @link %> <%= @install_dir %>
# Remove puppet log files
rm -rf <%= @log_dir %>
--- a/ext/templates/deb/preinst.erb 2015-10-13 19:22:51.000000000 +0200
+++ b/ext/templates/deb/preinst.erb 2023-06-04 09:36:16.814369880 +0200
@@ -1,18 +1,18 @@
#!/bin/sh
if [ "$1" = install ] || [ "$1" = upgrade ]; then
- # Create the "<%= @name -%>" user
- if ! getent passwd <%= @name -%> > /dev/null; then
- adduser --quiet --system --group --home <%= @install_dir -%> \
+ # Create the "<%= @name %>" user
+ if ! getent passwd <%= @name %> > /dev/null; then
+ adduser --quiet --system --group --home <%= @install_dir %> \
--no-create-home \
--gecos "Puppet StoredConfigs daemon" \
<%= @name %>
fi
- # Create the "<%= @name -%>" group, if it is missing, and set the
- # primary group of the "<%= @name -%>" user to this group.
- if ! getent group <%= @name -%> > /dev/null; then
+ # Create the "<%= @name %>" group, if it is missing, and set the
+ # primary group of the "<%= @name %>" user to this group.
+ if ! getent group <%= @name %> > /dev/null; then
addgroup --quiet --system <%= @name %>
- usermod -g <%= @name -%> <%= @name %>
+ usermod -g <%= @name %> <%= @name %>
fi
fi
--- a/ext/templates/deb/rules.erb 2015-10-13 19:22:51.000000000 +0200
+++ b/ext/templates/deb/rules.erb 2023-06-04 09:41:13.057916546 +0200
@@ -7,11 +7,11 @@
DIST := $(shell lsb_release -i | awk '{print tolower($$3)}')
RELEASE := $(shell lsb_release -r | awk '{print $$2}')
<% if @pe -%>
- <% @rake = "/opt/puppet/bin/rake" -%>
- <% @pe_build = "PE_BUILD=true" -%>
+ <%- @rake = "/opt/puppet/bin/rake" -%>
+ <%- @pe_build = "PE_BUILD=true" -%>
<% else -%>
- <% @rake = "rake" -%>
- <% @pe_build = "" -%>
+ <%- @rake = "rake" -%>
+ <%- @pe_build = "" -%>
<% end -%>
%:
--- a/ext/templates/deb/terminus.install.erb 2015-10-13 19:22:51.000000000 +0200
+++ b/ext/templates/deb/terminus.install.erb 2023-06-04 09:36:35.838854520 +0200
@@ -1,32 +1,32 @@
-<%= @plibdir -%>/puppet/application/storeconfigs.rb
-<%= @plibdir -%>/puppet/face/node/deactivate.rb
-<%= @plibdir -%>/puppet/face/node/status.rb
-<%= @plibdir -%>/puppet/face/storeconfigs.rb
-<%= @plibdir -%>/puppet/indirector/catalog/puppetdb.rb
-<%= @plibdir -%>/puppet/indirector/facts/puppetdb.rb
-<%= @plibdir -%>/puppet/indirector/facts/puppetdb_apply.rb
-<%= @plibdir -%>/puppet/indirector/node/puppetdb.rb
-<%= @plibdir -%>/puppet/indirector/resource/puppetdb.rb
-<%= @plibdir -%>/puppet/reports/puppetdb.rb
-<%= @plibdir -%>/puppet/util/puppetdb.rb
-<%= @plibdir -%>/puppet/util/puppetdb/char_encoding.rb
-<%= @plibdir -%>/puppet/util/puppetdb/command.rb
-<%= @plibdir -%>/puppet/util/puppetdb/command_names.rb
-<%= @plibdir -%>/puppet/util/puppetdb/config.rb
-<%= @plibdir -%>/puppet/util/puppetdb/blacklist.rb
-<%= @p4libdir -%>/puppet/application/storeconfigs.rb
-<%= @p4libdir -%>/puppet/face/node/deactivate.rb
-<%= @p4libdir -%>/puppet/face/node/status.rb
-<%= @p4libdir -%>/puppet/face/storeconfigs.rb
-<%= @p4libdir -%>/puppet/indirector/catalog/puppetdb.rb
-<%= @p4libdir -%>/puppet/indirector/facts/puppetdb.rb
-<%= @p4libdir -%>/puppet/indirector/facts/puppetdb_apply.rb
-<%= @p4libdir -%>/puppet/indirector/node/puppetdb.rb
-<%= @p4libdir -%>/puppet/indirector/resource/puppetdb.rb
-<%= @p4libdir -%>/puppet/reports/puppetdb.rb
-<%= @p4libdir -%>/puppet/util/puppetdb.rb
-<%= @p4libdir -%>/puppet/util/puppetdb/char_encoding.rb
-<%= @p4libdir -%>/puppet/util/puppetdb/command.rb
-<%= @p4libdir -%>/puppet/util/puppetdb/command_names.rb
-<%= @p4libdir -%>/puppet/util/puppetdb/config.rb
-<%= @p4libdir -%>/puppet/util/puppetdb/blacklist.rb
+<%= @plibdir %>/puppet/application/storeconfigs.rb
+<%= @plibdir %>/puppet/face/node/deactivate.rb
+<%= @plibdir %>/puppet/face/node/status.rb
+<%= @plibdir %>/puppet/face/storeconfigs.rb
+<%= @plibdir %>/puppet/indirector/catalog/puppetdb.rb
+<%= @plibdir %>/puppet/indirector/facts/puppetdb.rb
+<%= @plibdir %>/puppet/indirector/facts/puppetdb_apply.rb
+<%= @plibdir %>/puppet/indirector/node/puppetdb.rb
+<%= @plibdir %>/puppet/indirector/resource/puppetdb.rb
+<%= @plibdir %>/puppet/reports/puppetdb.rb
+<%= @plibdir %>/puppet/util/puppetdb.rb
+<%= @plibdir %>/puppet/util/puppetdb/char_encoding.rb
+<%= @plibdir %>/puppet/util/puppetdb/command.rb
+<%= @plibdir %>/puppet/util/puppetdb/command_names.rb
+<%= @plibdir %>/puppet/util/puppetdb/config.rb
+<%= @plibdir %>/puppet/util/puppetdb/blacklist.rb
+<%= @p4libdir %>/puppet/application/storeconfigs.rb
+<%= @p4libdir %>/puppet/face/node/deactivate.rb
+<%= @p4libdir %>/puppet/face/node/status.rb
+<%= @p4libdir %>/puppet/face/storeconfigs.rb
+<%= @p4libdir %>/puppet/indirector/catalog/puppetdb.rb
+<%= @p4libdir %>/puppet/indirector/facts/puppetdb.rb
+<%= @p4libdir %>/puppet/indirector/facts/puppetdb_apply.rb
+<%= @p4libdir %>/puppet/indirector/node/puppetdb.rb
+<%= @p4libdir %>/puppet/indirector/resource/puppetdb.rb
+<%= @p4libdir %>/puppet/reports/puppetdb.rb
+<%= @p4libdir %>/puppet/util/puppetdb.rb
+<%= @p4libdir %>/puppet/util/puppetdb/char_encoding.rb
+<%= @p4libdir %>/puppet/util/puppetdb/command.rb
+<%= @p4libdir %>/puppet/util/puppetdb/command_names.rb
+<%= @p4libdir %>/puppet/util/puppetdb/config.rb
+<%= @p4libdir %>/puppet/util/puppetdb/blacklist.rb
--- a/ext/templates/dev/redhat/redhat_dev_postinst.erb 2015-10-13 19:22:51.000000000 +0200
+++ b/ext/templates/dev/redhat/redhat_dev_postinst.erb 2023-06-04 09:42:06.011265510 +0200
@@ -1,14 +1,14 @@
#!/bin/bash
# Setup the SSL stuff
-<%= @sbin_dir -%>/puppetdb ssl-setup
+<%= @sbin_dir %>/puppetdb ssl-setup
# Correct permissions
-find <%= @config_dir -%> -type f | xargs chmod 640
-chown -R <%= @name -%>:<%= @name -%> <%= @etc_dir %>
-chown -R <%= @name -%>:<%= @name -%> <%= @install_dir %>
-chown -R <%= @name -%>:<%= @name -%> <%= @lib_dir %>
+find <%= @config_dir %> -type f | xargs chmod 640
+chown -R <%= @name %>:<%= @name %> <%= @etc_dir %>
+chown -R <%= @name %>:<%= @name %> <%= @install_dir %>
+chown -R <%= @name %>:<%= @name %> <%= @lib_dir %>
<% unless @pe -%>
-chown -R <%= @name -%>:<%= @name -%> <%= @link %>
+chown -R <%= @name %>:<%= @name %> <%= @link %>
<% end -%>
-chown -R <%= @name -%>:<%= @name -%> <%= @log_dir -%>
+chown -R <%= @name %>:<%= @name %> <%= @log_dir %>
--- a/ext/templates/dev/redhat/redhat_dev_preinst.erb 2015-10-13 19:22:51.000000000 +0200
+++ b/ext/templates/dev/redhat/redhat_dev_preinst.erb 2023-06-04 09:39:24.747157368 +0200
@@ -1,17 +1,17 @@
#!/bin/sh
if [ "$1" = install ] || [ "$1" = upgrade ]; then
- # Create the "<%= @name -%>" user
- if ! getent passwd <%= @name -%> > /dev/null; then
+ # Create the "<%= @name %>" user
+ if ! getent passwd <%= @name %> > /dev/null; then
# Use -r here for redhat 5 compatiblity, instead of --system
- adduser -r --home <%= @install_dir -%> <%= @name %>
+ adduser -r --home <%= @install_dir %> <%= @name %>
fi
- # Create the "<%= @name -%>" group, if it is missing, and set the
- # primary group of the "<%= @name -%>" user to this group.
- if ! getent group <%= @name -%> > /dev/null; then
+ # Create the "<%= @name %>" group, if it is missing, and set the
+ # primary group of the "<%= @name %>" user to this group.
+ if ! getent group <%= @name %> > /dev/null; then
# Use -r here for redhat 5 compatiblity, instead of --system
groupadd -r <%= @name %>
- usermod -g <%= @name -%> <%= @name %>
+ usermod -g <%= @name %> <%= @name %>
fi
fi
--- a/ext/templates/init_debian.erb 2015-10-13 19:22:51.000000000 +0200
+++ b/ext/templates/init_debian.erb 2023-06-04 09:29:36.156164559 +0200
@@ -5,8 +5,8 @@
# Required-Stop: $remote_fs $syslog
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
-# Short-Description: <%= @name -%> stored config server
-# Description: Start <%= @name -%> daemon placed in /etc/init.d.
+# Short-Description: <%= @name %> stored config server
+# Description: Start <%= @name %> daemon placed in /etc/init.d.
### END INIT INFO
# Author: Ben Hughes <ben@puppetlabs.com>
@@ -14,9 +14,9 @@
# Copyright 2012 Puppet Labs
-# You should only need to edit the default/<%= @name -%> file and not
+# You should only need to edit the default/<%= @name %> file and not
# this init script directly
-if [ -r "/etc/default/<%= @name -%>" ] ; then
+if [ -r "/etc/default/<%= @name %>" ] ; then
. /etc/default/<%= @name %>
else
exit 1
@@ -25,7 +25,7 @@
# PATH should only include /usr/* if it runs after the mountnfs.sh script
PATH=/sbin:/usr/sbin:/bin:/usr/bin
NAME=<%= @name %>
-DESC="<%= @name -%> centralized storage daemon"
+DESC="<%= @name %> centralized storage daemon"
JARFILE="puppetdb.jar"
PIDFILE=/var/run/$NAME.pid
SCRIPTNAME=/etc/init.d/$NAME
--- a/ext/templates/init_openbsd.erb 2015-10-13 19:22:51.000000000 +0200
+++ b/ext/templates/init_openbsd.erb 2023-06-04 09:29:46.660431102 +0200
@@ -1,7 +1,7 @@
#!/bin/sh
-daemon=$(/usr/local/bin/javaPathHelper -c <%= @name -%>)
-daemon_flags="-cp <% @install_dir -%>/puppetdb.jar clojure.main -m com.puppetlabs.puppetdb.core services -c /etc/puppetdb/conf.d/puppetdb.conf"
+daemon=$(/usr/local/bin/javaPathHelper -c <%= @name %>)
+daemon_flags="-cp <% @install_dir %>/puppetdb.jar clojure.main -m com.puppetlabs.puppetdb.core services -c /etc/puppetdb/conf.d/puppetdb.conf"
. /etc/rc.d/rc.subr
--- a/ext/templates/init_redhat.erb 2015-10-13 19:22:51.000000000 +0200
+++ b/ext/templates/init_redhat.erb 2023-06-04 09:30:04.440883805 +0200
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# <%= @name -%> Centralized Storage Daemon for Puppet
+# <%= @name %> Centralized Storage Daemon for Puppet
#
# chkconfig: - 20 80
# description: Centralized Storage Daemon for Puppet
@@ -11,8 +11,8 @@
# Required-Stop: $remote_fs $syslog
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
-# Short-Description: <%= @name -%> stored config server
-# Description: Start <%= @name -%> daemon placed in /etc/init.d.
+# Short-Description: <%= @name %> stored config server
+# Description: Start <%= @name %> daemon placed in /etc/init.d.
### END INIT INFO
# Author: Michael Stahnke <stahnma@puppetlabs.com>
@@ -21,7 +21,7 @@
# Source function library.
. /etc/rc.d/init.d/functions
-prog="<%= @name -%>"
+prog="<%= @name %>"
##########################################
# You should not have to edit this init script.
--- a/ext/templates/init_suse.erb 2015-10-13 19:22:51.000000000 +0200
+++ b/ext/templates/init_suse.erb 2023-06-04 09:30:19.913277966 +0200
@@ -5,21 +5,21 @@
# Required-Stop: $remote_fs $syslog
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
-# Short-Description: <%= @name -%> stored config server
-# Description: Start <%= @name -%> daemon placed in /etc/init.d.
+# Short-Description: <%= @name %> stored config server
+# Description: Start <%= @name %> daemon placed in /etc/init.d.
### END INIT INFO
# Author: Matthaus Owens <matthaus@puppetlabs.com>
# Copyright 2013 Puppet Labs
-# You should only need to edit the sysconfig/<%= @name -%> file and not
+# You should only need to edit the sysconfig/<%= @name %> file and not
# this init script directly
[ -f /etc/rc.status ] && . /etc/rc.status
-# /etc/sysconfig/<%= @name -%> defines JAVA_BIN, USER, and other variables
+# /etc/sysconfig/<%= @name %> defines JAVA_BIN, USER, and other variables
# that are required for this script to function, so it is not optional
-if [ -r "/etc/sysconfig/<%= @name -%>" ] ; then
+if [ -r "/etc/sysconfig/<%= @name %>" ] ; then
. /etc/sysconfig/<%= @name %>
else
exit 1
@@ -28,7 +28,7 @@
# PATH should only include /usr/* if it runs after the mountnfs.sh script
PATH=/sbin:/usr/sbin:/bin:/usr/bin
NAME=<%= @name %>
-DESC="<%= @name -%> centralized storage daemon"
+DESC="<%= @name %> centralized storage daemon"
JARFILE="puppetdb.jar"
PIDFILE=/var/run/$NAME/$NAME.pid
SCRIPTNAME=/etc/init.d/$NAME
--- a/ext/templates/logback.xml.erb 2015-10-13 19:22:51.000000000 +0200
+++ b/ext/templates/logback.xml.erb 2023-06-04 09:30:53.998146250 +0200
@@ -6,7 +6,7 @@
</appender>
<appender name="F1" class="ch.qos.logback.core.FileAppender">
- <file><%= @log_dir -%>/<%= @name -%>.log</file>
+ <file><%= @log_dir %>/<%= @name %>.log</file>
<append>true</append>
<encoder>
<pattern>%d %-5p [%c{2}] %m%n</pattern>
--- a/ext/templates/logrotate.erb 2015-10-13 19:22:51.000000000 +0200
+++ b/ext/templates/logrotate.erb 2023-06-04 09:31:00.278306231 +0200
@@ -1,9 +1,9 @@
-<%= @log_dir -%>/<%= @name -%>.log {
+<%= @log_dir %>/<%= @name %>.log {
weekly
missingok
rotate 12
compress
copytruncate
notifempty
- create 640 <%= @name -%> <%= @name %>
+ create 640 <%= @name %> <%= @name %>
}
--- a/ext/templates/puppetdb-anonymize.erb 2015-10-13 19:22:51.000000000 +0200
+++ b/ext/templates/puppetdb-anonymize.erb 2023-06-04 09:31:08.046504120 +0200
@@ -2,4 +2,4 @@
. <%= @libexec_dir %>/<%= @name %>.env
-${JAVA_BIN} <%= @java_args || @default_java_args -%> -cp ${INSTALL_DIR}/puppetdb.jar clojure.main -m com.puppetlabs.puppetdb.core anonymize "$@"
+${JAVA_BIN} <%= @java_args || @default_java_args %> -cp ${INSTALL_DIR}/puppetdb.jar clojure.main -m com.puppetlabs.puppetdb.core anonymize "$@"
--- a/ext/templates/puppetdb-env.erb 2015-10-13 19:22:51.000000000 +0200
+++ b/ext/templates/puppetdb-env.erb 2023-06-04 09:31:13.898653200 +0200
@@ -1,8 +1,8 @@
#!/bin/bash
-if [ -r "/etc/default/<%= @name -%>" ] ; then
+if [ -r "/etc/default/<%= @name %>" ] ; then
. /etc/default/<%= @name %>
-elif [ -r "/etc/sysconfig/<%= @name -%>" ] ; then
+elif [ -r "/etc/sysconfig/<%= @name %>" ] ; then
. /etc/sysconfig/<%= @name %>
elif [ `uname` == "OpenBSD" ] ; then
JAVA_BIN=$(javaPathHelper -c puppetdb)
--- a/ext/templates/puppetdb-export.erb 2015-10-13 19:22:51.000000000 +0200
+++ b/ext/templates/puppetdb-export.erb 2023-06-04 09:31:20.046809828 +0200
@@ -2,4 +2,4 @@
. <%= @libexec_dir %>/<%= @name %>.env
-${JAVA_BIN} <%= @java_args || @default_java_args -%> -cp ${INSTALL_DIR}/puppetdb.jar clojure.main -m com.puppetlabs.puppetdb.core export "$@"
+${JAVA_BIN} <%= @java_args || @default_java_args %> -cp ${INSTALL_DIR}/puppetdb.jar clojure.main -m com.puppetlabs.puppetdb.core export "$@"
--- a/ext/templates/puppetdb-import.erb 2015-10-13 19:22:51.000000000 +0200
+++ b/ext/templates/puppetdb-import.erb 2023-06-04 09:31:29.207043179 +0200
@@ -2,4 +2,4 @@
. <%= @libexec_dir %>/<%= @name %>.env
-${JAVA_BIN} <%= @java_args || @default_java_args -%> -cp ${INSTALL_DIR}/puppetdb.jar clojure.main -m com.puppetlabs.puppetdb.core import "$@"
+${JAVA_BIN} <%= @java_args || @default_java_args %> -cp ${INSTALL_DIR}/puppetdb.jar clojure.main -m com.puppetlabs.puppetdb.core import "$@"
--- a/ext/templates/puppetdb-ssl-setup.erb 2015-10-13 19:22:51.000000000 +0200
+++ b/ext/templates/puppetdb-ssl-setup.erb 2023-06-04 09:32:03.475916157 +0200
@@ -222,7 +222,7 @@
done
else
# This should be run on the host with PuppetDB
- PATH="<%= @labsbindir -%>:/opt/puppet/bin:$PATH"
+ PATH="<%= @labsbindir %>:/opt/puppet/bin:$PATH"
agent_confdir=`puppet agent --configprint confdir`
agent_vardir=`puppet agent --configprint vardir`
--- a/ext/templates/puppetdb.erb 2015-10-13 19:22:51.000000000 +0200
+++ b/ext/templates/puppetdb.erb 2023-06-04 09:32:14.776204023 +0200
@@ -48,7 +48,7 @@
function execsubcommand {
sub=$1
shift
- cmd="<%= @libexec_dir -%>/puppetdb-${sub}"
+ cmd="<%= @libexec_dir %>/puppetdb-${sub}"
if [ -e ${cmd} ]; then
exec "${cmd}" "$@"
--- a/ext/templates/puppetdb_default.erb 2015-10-13 19:22:51.000000000 +0200
+++ b/ext/templates/puppetdb_default.erb 2023-06-04 09:32:45.368983371 +0200
@@ -30,9 +30,9 @@
fi
<%- end -%>
# Modify this if you'd like to change the memory allocation, enable JMX, etc
-JAVA_ARGS="<%= @java_args || @default_java_args -%>"
+JAVA_ARGS="<%= @java_args || @default_java_args %>"
# These normally shouldn't need to be edited if using OS packages
-USER="<%= @name -%>"
-INSTALL_DIR="<%= @install_dir || "/usr/share/puppetdb" -%>"
-CONFIG="<%= @config_dir -%>"
+USER="<%= @name %>"
+INSTALL_DIR="<%= @install_dir || "/usr/share/puppetdb" %>"
+CONFIG="<%= @config_dir %>"
--- a/ext/templates/puppetdb_default_systemd.erb 2015-10-13 19:22:51.000000000 +0200
+++ b/ext/templates/puppetdb_default_systemd.erb 2023-06-04 09:33:10.185615563 +0200
@@ -9,9 +9,9 @@
JAVA_BIN="/usr/lib/jvm/jre-1.7.0-openjdk/bin/java"
<%- end -%>
# Modify this if you'd like to change the memory allocation, enable JMX, etc
-JAVA_ARGS="<%= @java_args || @default_java_args -%>"
+JAVA_ARGS="<%= @java_args || @default_java_args %>"
# These normally shouldn't need to be edited if using OS packages
-USER="<%= @name -%>"
-INSTALL_DIR="<%= @install_dir || "/usr/share/puppetdb" -%>"
-CONFIG="<%= @config_dir -%>"
+USER="<%= @name %>"
+INSTALL_DIR="<%= @install_dir || "/usr/share/puppetdb" %>"
+CONFIG="<%= @config_dir %>"
