blob: a4a4a5ad66497ee395ef65fe7de6b423b36f3309 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
|
--- ext/cli/foreground.orig 2019-09-17 14:05:56 UTC
+++ ext/cli/foreground
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-restartfile="/opt/puppetlabs/server/data/puppetserver/restartcounter"
+restartfile="/var/puppet/server/data/puppetserver/restartcounter"
cli_defaults=${INSTALL_DIR}/cli/cli-defaults.sh
if [ ! -e "${INSTALL_DIR}/ezbake-functions.sh" ]; then
@@ -30,7 +30,7 @@ fi
COMMAND="${JAVA_BIN} ${JAVA_ARGS} ${LOG_APPENDER} \
-cp "$CLASSPATH" \
clojure.main -m puppetlabs.trapperkeeper.main \
- --config ${CONFIG} --bootstrap-config ${BOOTSTRAP_CONFIG} \
+ --config ${CONFIG} --bootstrap-config %%ETCDIR%%/services.d \
--restart-file "${restartfile}" \
${TK_ARGS} \
${@}"
|
