Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:smarty12:puppet
puppetdb
fix-file-location.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File fix-file-location.patch of Package puppetdb
diff -durN a/etc/puppetlabs/puppetdb/conf.d/config.ini b/etc/puppetlabs/puppetdb/conf.d/config.ini --- a/etc/puppetlabs/puppetdb/conf.d/config.ini 2020-05-29 21:29:00.000000000 +0200 +++ b/etc/puppetlabs/puppetdb/conf.d/config.ini 2020-06-20 08:31:12.564433844 +0200 @@ -3,7 +3,7 @@ [global] # Store mq/db data in a custom directory -vardir = /opt/puppetlabs/server/data/puppetdb +vardir = /var/lib/puppetdb # Use an external logback config file logging-config = /etc/puppetlabs/puppetdb/logback.xml diff -durN a/etc/puppetlabs/puppetdb/logback.xml b/etc/puppetlabs/puppetdb/logback.xml --- a/etc/puppetlabs/puppetdb/logback.xml 2020-05-29 21:29:00.000000000 +0200 +++ b/etc/puppetlabs/puppetdb/logback.xml 2020-06-20 08:33:26.723689108 +0200 @@ -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> @@ -24,11 +24,11 @@ <logger name="org.springframework.jms.connection" level="warn"/> <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 -durN a/etc/puppetlabs/puppetdb/request-logging.xml b/etc/puppetlabs/puppetdb/request-logging.xml --- a/etc/puppetlabs/puppetdb/request-logging.xml 2020-05-29 21:29:00.000000000 +0200 +++ b/etc/puppetlabs/puppetdb/request-logging.xml 2020-06-20 08:33:43.023598976 +0200 @@ -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 -durN a/etc/sysconfig/puppetdb b/etc/sysconfig/puppetdb --- a/etc/sysconfig/puppetdb 2020-05-29 21:29:00.000000000 +0200 +++ b/etc/sysconfig/puppetdb 2020-06-20 08:35:07.879132448 +0200 @@ -17,7 +17,7 @@ # These normally shouldn't need to be edited if using OS packages USER="puppetdb" GROUP="puppetdb" -INSTALL_DIR="/opt/puppetlabs/server/apps/puppetdb" +INSTALL_DIR="/usr/lib/puppetdb" CONFIG="/etc/puppetlabs/puppetdb/conf.d" # Bootstrap path diff -durN a/opt/puppetlabs/server/apps/puppetdb/cli/apps/delete-reports b/opt/puppetlabs/server/apps/puppetdb/cli/apps/delete-reports --- a/opt/puppetlabs/server/apps/puppetdb/cli/apps/delete-reports 2020-05-29 21:29:00.000000000 +0200 +++ b/opt/puppetlabs/server/apps/puppetdb/cli/apps/delete-reports 2020-06-20 08:41:01.321186095 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash set -e diff -durN a/opt/puppetlabs/server/apps/puppetdb/cli/apps/foreground b/opt/puppetlabs/server/apps/puppetdb/cli/apps/foreground --- a/opt/puppetlabs/server/apps/puppetdb/cli/apps/foreground 2020-05-29 21:29:00.000000000 +0200 +++ b/opt/puppetlabs/server/apps/puppetdb/cli/apps/foreground 2020-06-20 08:41:37.568986188 +0200 @@ -1,6 +1,6 @@ -#!/usr/bin/env bash +#!/bin/bash -restartfile="/opt/puppetlabs/server/data/puppetdb/restartcounter" +restartfile="/run/puppetdb/restartcounter" cli_defaults=${INSTALL_DIR}/cli/cli-defaults.sh if [ ! -e "${INSTALL_DIR}/ezbake-functions.sh" ]; then diff -durN a/opt/puppetlabs/server/apps/puppetdb/cli/apps/reload b/opt/puppetlabs/server/apps/puppetdb/cli/apps/reload --- a/opt/puppetlabs/server/apps/puppetdb/cli/apps/reload 2020-05-29 21:29:00.000000000 +0200 +++ b/opt/puppetlabs/server/apps/puppetdb/cli/apps/reload 2020-06-20 08:42:31.628688045 +0200 @@ -1,11 +1,11 @@ -#!/usr/bin/env bash +#!/bin/bash set +e -restartfile="/opt/puppetlabs/server/data/puppetdb/restartcounter" +restartfile="/run/puppetdb/restartcounter" reload_timeout="${RELOAD_TIMEOUT:-120}" timeout="$reload_timeout" realname="puppetdb" -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/puppetdb/cli/apps/ssl-setup b/opt/puppetlabs/server/apps/puppetdb/cli/apps/ssl-setup --- a/opt/puppetlabs/server/apps/puppetdb/cli/apps/ssl-setup 2020-05-29 21:29:00.000000000 +0200 +++ b/opt/puppetlabs/server/apps/puppetdb/cli/apps/ssl-setup 2020-06-20 08:43:25.660390057 +0200 @@ -232,7 +232,6 @@ done else # This should be run on the host with PuppetDB - PATH=/opt/puppetlabs/bin:/opt/puppet/bin:$PATH agent_confdir=`puppet agent --configprint confdir` agent_vardir=`puppet agent --configprint vardir` user=puppetdb diff -durN a/opt/puppetlabs/server/apps/puppetdb/cli/apps/start b/opt/puppetlabs/server/apps/puppetdb/cli/apps/start --- a/opt/puppetlabs/server/apps/puppetdb/cli/apps/start 2020-05-29 21:29:00.000000000 +0200 +++ b/opt/puppetlabs/server/apps/puppetdb/cli/apps/start 2020-06-20 08:44:21.892079937 +0200 @@ -1,14 +1,14 @@ -#!/usr/bin/env bash +#!/bin/bash set +e pid="$(pgrep -f "puppetdb.jar.* -m puppetlabs.puppetdb.cli.services")" -restartfile="/opt/puppetlabs/server/data/puppetdb/restartcounter" +restartfile="/run/puppetdb/restartcounter" start_timeout="${START_TIMEOUT:-14400}" real_name="puppetdb" -rundir="/var/run/puppetlabs/${real_name}" -app_logdir=${app_logdir:=/var/log/puppetlabs/${real_name}} +rundir="/run/${real_name}" +app_logdir=${app_logdir:=/var/log/${real_name}} PIDFILE="${rundir}/${real_name}.pid" cli_defaults=${INSTALL_DIR}/cli/cli-defaults.sh diff -durN a/opt/puppetlabs/server/apps/puppetdb/cli/apps/stop b/opt/puppetlabs/server/apps/puppetdb/cli/apps/stop --- a/opt/puppetlabs/server/apps/puppetdb/cli/apps/stop 2020-05-29 21:29:00.000000000 +0200 +++ b/opt/puppetlabs/server/apps/puppetdb/cli/apps/stop 2020-06-20 08:44:45.667948814 +0200 @@ -1,9 +1,9 @@ -#!/usr/bin/env bash +#!/bin/bash set +e pid="$(pgrep -f "puppetdb.jar.* -m puppetlabs.puppetdb.cli.services")" realname="puppetdb" -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/usr/lib/systemd/system/puppetdb.service b/usr/lib/systemd/system/puppetdb.service --- a/usr/lib/systemd/system/puppetdb.service 2020-05-29 21:29:00.000000000 +0200 +++ b/usr/lib/systemd/system/puppetdb.service 2020-06-20 08:46:31.627364357 +0200 @@ -20,7 +20,7 @@ TimeoutStopSec=60 Restart=on-failure StartLimitBurst=5 -PIDFile=/var/run/puppetlabs/puppetdb/puppetdb.pid +PIDFile=/run/puppetdb/puppetdb.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/puppetdb/bin/puppetdb reload -ExecStart=/opt/puppetlabs/server/apps/puppetdb/bin/puppetdb start -ExecStop=/opt/puppetlabs/server/apps/puppetdb/bin/puppetdb stop +ExecReload=/usr/bin/puppetdb reload +ExecStart=/usr/bin/puppetdb start +ExecStop=/usr/bin/puppetdb stop KillMode=process diff -durN a/usr/lib/tmpfiles.d/puppetdb.conf b/usr/lib/tmpfiles.d/puppetdb.conf --- a/usr/lib/tmpfiles.d/puppetdb.conf 2020-05-29 21:29:00.000000000 +0200 +++ b/usr/lib/tmpfiles.d/puppetdb.conf 2020-06-20 08:46:45.903284267 +0200 @@ -1 +1 @@ -d /var/run/puppetlabs/puppetdb 0755 puppetdb puppetdb - +d /run/puppetdb 0755 puppetdb puppetdb -
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
