File fix-file-location.patch of Package puppetserver
diff -durN a/etc/puppetlabs/puppetserver/conf.d/puppetserver.conf b/etc/puppetlabs/puppetserver/conf.d/puppetserver.conf
--- a/etc/puppetlabs/puppetserver/conf.d/puppetserver.conf 2020-05-29 02:25:46.000000000 +0200
+++ b/etc/puppetlabs/puppetserver/conf.d/puppetserver.conf 2020-06-14 10:29:56.642456047 +0200
@@ -2,7 +2,7 @@
jruby-puppet: {
# Where the puppet-agent dependency places puppet, facter, etc...
# Puppet server expects to load Puppet from this location
- ruby-load-path: [/opt/puppetlabs/puppet/lib/ruby/vendor_ruby]
+ ruby-load-path: [/usr/lib64/ruby/gems/2.5.0]
# This setting determines where JRuby will install gems. It is used for loading gems,
# and also by the `puppetserver gem` command line tool.
@@ -11,7 +11,7 @@
# This setting defines the complete "GEM_PATH" for jruby. If set, it should include
# the gem-home directory as well as any other directories that gems can be loaded
# from (including the vendored gems directory for gems that ship with puppetserver)
- gem-path: [${jruby-puppet.gem-home}, "/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems", "/opt/puppetlabs/puppet/lib/ruby/vendor_gems"]
+ gem-path: [${jruby-puppet.gem-home}, "/usr/lib64/ruby/gems/2.5.0"]
# PLEASE NOTE: Use caution when modifying the below settings. Modifying
# these settings will change the value of the corresponding Puppet settings
@@ -34,15 +34,15 @@
# (optional) path to puppet var dir; if not specified, will use
# /opt/puppetlabs/server/data/puppetserver
- server-var-dir: /opt/puppetlabs/server/data/puppetserver
+ server-var-dir: /var/cache/puppetserver
# (optional) path to puppet run dir; if not specified, will use
# /var/run/puppetlabs/puppetserver
- server-run-dir: /var/run/puppetlabs/puppetserver
+ server-run-dir: /var/run/puppetserver
# (optional) path to puppet log dir; if not specified, will use
# /var/log/puppetlabs/puppetserver
- server-log-dir: /var/log/puppetlabs/puppetserver
+ server-log-dir: /var/log/puppetserver
# (optional) maximum number of JRuby instances to allow
#max-active-instances: 1
diff -durN a/etc/puppetlabs/puppetserver/logback.xml b/etc/puppetlabs/puppetserver/logback.xml
--- a/etc/puppetlabs/puppetserver/logback.xml 2020-05-29 02:25:46.000000000 +0200
+++ b/etc/puppetlabs/puppetserver/logback.xml 2020-06-14 10:29:56.642456047 +0200
@@ -7,11 +7,11 @@
<appender name="F1" class="ch.qos.logback.core.rolling.RollingFileAppender">
<!-- TODO: this path should not be hard-coded -->
- <file>/var/log/puppetlabs/puppetserver/puppetserver.log</file>
+ <file>/var/log/puppetserver/puppetserver.log</file>
<append>true</append>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!-- rollover daily -->
- <fileNamePattern>/var/log/puppetlabs/puppetserver/puppetserver-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>/var/log/puppetserver/puppetserver-%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>
@@ -23,11 +23,11 @@
</appender>
<appender name="STATUS" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>/var/log/puppetlabs/puppetserver/puppetserver-status.log</file>
+ <file>/var/log/puppetserver/puppetserver-status.log</file>
<append>true</append>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!-- rollover daily -->
- <fileNamePattern>/var/log/puppetlabs/puppetserver/puppetserver-status-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>/var/log/puppetserver/puppetserver-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 -durN a/etc/puppetlabs/puppetserver/request-logging.xml b/etc/puppetlabs/puppetserver/request-logging.xml
--- a/etc/puppetlabs/puppetserver/request-logging.xml 2020-05-29 02:25:46.000000000 +0200
+++ b/etc/puppetlabs/puppetserver/request-logging.xml 2020-06-14 10:29:56.642456047 +0200
@@ -1,10 +1,10 @@
<configuration debug="false">
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>/var/log/puppetlabs/puppetserver/puppetserver-access.log</file>
+ <file>/var/log/puppetserver/puppetserver-access.log</file>
<append>true</append>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!-- rollover daily -->
- <fileNamePattern>/var/log/puppetlabs/puppetserver/puppetserver-access-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>/var/log/puppetserver/puppetserver-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 -durN a/etc/sysconfig/puppetserver b/etc/sysconfig/puppetserver
--- a/etc/sysconfig/puppetserver 2020-05-29 02:25:46.000000000 +0200
+++ b/etc/sysconfig/puppetserver 2020-06-14 10:29:56.642456047 +0200
@@ -17,11 +17,11 @@
# These normally shouldn't need to be edited if using OS packages
USER="puppet"
GROUP="puppet"
-INSTALL_DIR="/opt/puppetlabs/server/apps/puppetserver"
+INSTALL_DIR="/usr/lib/puppetserver"
CONFIG="/etc/puppetlabs/puppetserver/conf.d"
# Bootstrap path
-BOOTSTRAP_CONFIG="/etc/puppetlabs/puppetserver/services.d/,/opt/puppetlabs/server/apps/puppetserver/config/services.d/"
+BOOTSTRAP_CONFIG="/etc/puppetlabs/puppetserver/services.d/,/usr/share/puppetserver/config/services.d/"
# SERVICE_STOP_RETRIES can be set here to alter the default stop timeout in
# seconds. For systemd, the shorter of this setting or 'TimeoutStopSec' in
diff -durN a/opt/puppetlabs/server/apps/puppetserver/bin/puppetserver b/opt/puppetlabs/server/apps/puppetserver/bin/puppetserver
--- a/opt/puppetlabs/server/apps/puppetserver/bin/puppetserver 2020-05-29 02:25:46.000000000 +0200
+++ b/opt/puppetlabs/server/apps/puppetserver/bin/puppetserver 2020-06-14 10:29:56.642456047 +0200
@@ -13,8 +13,8 @@
JAVA_ARGS="-Xms2g -Xmx2g -Djruby.logger.class=com.puppetlabs.jruby_utils.jruby.Slf4jLogger"
TK_ARGS=""
USER="_puppet"
- INSTALL_DIR="/opt/puppetlabs/server/apps/puppetserver"
- CONFIG="/etc/puppetlabs/puppetserver/conf.d"
+ INSTALL_DIR="/usr/lib/puppetserver"
+ CONFIG="/etc/puppetlabs/puppetserver/conf.d"
else
echo "You seem to be missing some important configuration files; could not find /etc/default/puppetserver or /etc/sysconfig/puppetserver" >&2
exit 1
diff -durN a/opt/puppetlabs/server/apps/puppetserver/cli/apps/ca b/opt/puppetlabs/server/apps/puppetserver/cli/apps/ca
--- a/opt/puppetlabs/server/apps/puppetserver/cli/apps/ca 2020-05-29 02:25:46.000000000 +0200
+++ b/opt/puppetlabs/server/apps/puppetserver/cli/apps/ca 2020-06-14 10:29:56.642456047 +0200
@@ -1,1 +1,1 @@
-#!/opt/puppetlabs/puppet/bin/ruby
+#!/usr/bin/ruby
diff -durN a/opt/puppetlabs/server/apps/puppetserver/cli/apps/foreground b/opt/puppetlabs/server/apps/puppetserver/cli/apps/foreground
--- a/opt/puppetlabs/server/apps/puppetserver/cli/apps/foreground 2020-05-29 02:25:46.000000000 +0200
+++ b/opt/puppetlabs/server/apps/puppetserver/cli/apps/foreground 2020-06-14 10:35:05.948999129 +0200
@@ -1,6 +1,6 @@
-#!/usr/bin/env bash
+#!/bin/bash
-restartfile="/opt/puppetlabs/server/data/puppetserver/restartcounter"
+restartfile="/run/puppetserver/restartcounter"
cli_defaults=${INSTALL_DIR}/cli/cli-defaults.sh
if [ ! -e "${INSTALL_DIR}/ezbake-functions.sh" ]; then
diff -durN a/opt/puppetlabs/server/apps/puppetserver/cli/apps/gem b/opt/puppetlabs/server/apps/puppetserver/cli/apps/gem
--- a/opt/puppetlabs/server/apps/puppetserver/cli/apps/gem 2020-05-29 02:25:46.000000000 +0200
+++ b/opt/puppetlabs/server/apps/puppetserver/cli/apps/gem 2020-06-14 10:35:22.340924472 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
umask 0022
diff -durN a/opt/puppetlabs/server/apps/puppetserver/cli/apps/irb b/opt/puppetlabs/server/apps/puppetserver/cli/apps/irb
--- a/opt/puppetlabs/server/apps/puppetserver/cli/apps/irb 2020-05-29 02:25:46.000000000 +0200
+++ b/opt/puppetlabs/server/apps/puppetserver/cli/apps/irb 2020-06-14 10:35:34.340869816 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
cli_defaults=${INSTALL_DIR}/cli/cli-defaults.sh
diff -durN a/opt/puppetlabs/server/apps/puppetserver/cli/apps/reload b/opt/puppetlabs/server/apps/puppetserver/cli/apps/reload
--- a/opt/puppetlabs/server/apps/puppetserver/cli/apps/reload 2020-05-29 02:25:46.000000000 +0200
+++ b/opt/puppetlabs/server/apps/puppetserver/cli/apps/reload 2020-06-14 10:39:09.263844726 +0200
@@ -1,11 +1,11 @@
-#!/usr/bin/env bash
+#!/bin/bash
set +e
-restartfile="/opt/puppetlabs/server/data/puppetserver/restartcounter"
+restartfile="/run/puppetserver/restartcounter"
reload_timeout="${RELOAD_TIMEOUT:-120}"
timeout="$reload_timeout"
realname="puppetserver"
-PIDFILE="/var/run/puppetlabs/${realname}/${realname}.pid"
+PIDFILE="/run/${realname}/${realname}.pid"
if [ ! -e "${INSTALL_DIR}/ezbake-functions.sh" ]; then
echo "Unable to find ${INSTALL_DIR}/ezbake-functions.sh script, failing start." 1>&2
diff -durN a/opt/puppetlabs/server/apps/puppetserver/cli/apps/ruby b/opt/puppetlabs/server/apps/puppetserver/cli/apps/ruby
--- a/opt/puppetlabs/server/apps/puppetserver/cli/apps/ruby 2020-05-29 02:25:46.000000000 +0200
+++ b/opt/puppetlabs/server/apps/puppetserver/cli/apps/ruby 2020-06-14 10:39:23.439772085 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
cli_defaults=${INSTALL_DIR}/cli/cli-defaults.sh
diff -durN a/opt/puppetlabs/server/apps/puppetserver/cli/apps/start b/opt/puppetlabs/server/apps/puppetserver/cli/apps/start
--- a/opt/puppetlabs/server/apps/puppetserver/cli/apps/start 2020-05-29 02:25:46.000000000 +0200
+++ b/opt/puppetlabs/server/apps/puppetserver/cli/apps/start 2020-06-14 10:50:34.820607240 +0200
@@ -1,13 +1,13 @@
-#!/usr/bin/env bash
+#!/bin/bash
set +e
pid="$(pgrep -f "puppet-server-release.jar.* -m puppetlabs.trapperkeeper.main")"
-restartfile="/opt/puppetlabs/server/data/puppetserver/restartcounter"
+restartfile="/run/puppetserver/restartcounter"
start_timeout="${START_TIMEOUT:-300}"
real_name="puppetserver"
-rundir="/var/run/puppetlabs/${real_name}"
+rundir="/run/${real_name}"
app_logdir=${app_logdir:=/var/log/puppetlabs/${real_name}}
PIDFILE="${rundir}/${real_name}.pid"
diff -durN a/opt/puppetlabs/server/apps/puppetserver/cli/apps/stop b/opt/puppetlabs/server/apps/puppetserver/cli/apps/stop
--- a/opt/puppetlabs/server/apps/puppetserver/cli/apps/stop 2020-05-29 02:25:46.000000000 +0200
+++ b/opt/puppetlabs/server/apps/puppetserver/cli/apps/stop 2020-06-14 10:41:33.847109254 +0200
@@ -1,9 +1,9 @@
-#!/usr/bin/env bash
+#!/bin/bash
set +e
pid="$(pgrep -f "puppet-server-release.jar.* -m puppetlabs.trapperkeeper.main")"
realname="puppetserver"
-PIDFILE="/var/run/puppetlabs/${realname}/${realname}.pid"
+PIDFILE="/run/${realname}/${realname}.pid"
if [ ! -e "${INSTALL_DIR}/ezbake-functions.sh" ]; then
echo "Unable to find ${INSTALL_DIR}/ezbake-functions.sh script, failing stop." 1>&2
diff -durN a/opt/puppetlabs/server/apps/puppetserver/cli/cli-defaults.sh b/opt/puppetlabs/server/apps/puppetserver/cli/cli-defaults.sh
--- a/opt/puppetlabs/server/apps/puppetserver/cli/cli-defaults.sh 2020-05-29 02:25:46.000000000 +0200
+++ b/opt/puppetlabs/server/apps/puppetserver/cli/cli-defaults.sh 2020-06-14 10:29:56.642456047 +0200
@@ -1,7 +1,7 @@
-INSTALL_DIR="/opt/puppetlabs/server/apps/puppetserver"
+INSTALL_DIR="/usr/lib/puppetserver"
if [ -n "$JRUBY_JAR" ]; then
echo "Warning: the JRUBY_JAR setting is no longer needed and will be ignored." 1>&2
fi
-CLASSPATH="${CLASSPATH}:/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/facter.jar:/opt/puppetlabs/server/data/puppetserver/jars/*"
+CLASSPATH="${CLASSPATH}:/usr/lib64/ruby/vendor_ruby/2.5.0/facter.jar:/opt/puppetlabs/server/data/puppetserver/jars/*"
diff -durN a/opt/puppetlabs/server/bin/puppetserver b/opt/puppetlabs/server/bin/puppetserver
--- a/usr/lib/systemd/system/puppetserver.service 2020-05-29 02:25:46.000000000 +0200
+++ b/usr/lib/systemd/system/puppetserver.service 2020-06-14 10:29:56.646456027 +0200
@@ -20,7 +20,7 @@
TimeoutStopSec=60
Restart=on-failure
StartLimitBurst=5
-PIDFile=/var/run/puppetlabs/puppetserver/puppetserver.pid
+PIDFile=/run/puppetserver/puppetserver.pid
# https://tickets.puppetlabs.com/browse/EZ-129
# Prior to systemd v228, TasksMax was unset by default, and unlimited. Starting in 228 a default of '512'
@@ -34,9 +34,9 @@
UMask=027
-ExecReload=/opt/puppetlabs/server/apps/puppetserver/bin/puppetserver reload
-ExecStart=/opt/puppetlabs/server/apps/puppetserver/bin/puppetserver start
-ExecStop=/opt/puppetlabs/server/apps/puppetserver/bin/puppetserver stop
+ExecReload=/usr/bin/puppetserver reload
+ExecStart=/usr/bin/puppetserver start
+ExecStop=/usr/bin/puppetserver stop
KillMode=process
diff -durN a/usr/lib/tmpfiles.d/puppetserver.conf b/usr/lib/tmpfiles.d/puppetserver.conf
--- a/usr/lib/tmpfiles.d/puppetserver.conf 2020-05-29 02:25:46.000000000 +0200
+++ b/usr/lib/tmpfiles.d/puppetserver.conf 2020-06-14 10:29:56.646456027 +0200
@@ -1 +1 @@
-d /var/run/puppetlabs/puppetserver 0755 puppet puppet -
+d /run/puppetserver 0755 puppet puppet -
