Skip to content

Commit 0ac2798

Browse files
authored
Merge pull request OpenVoxProject#35 from bastelfreak/foreground
Restore foreground.erb & cli_defaults packaging
2 parents 81e4c9b + 5d0a3bc commit 0ac2798

File tree

2 files changed

+43
-0
lines changed

2 files changed

+43
-0
lines changed

resources/puppetlabs/lein-ezbake/staging-templates/project_data.yaml.mustache

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ templates:
4040
- ext/config/user/conf.d/*.erb
4141
- ext/bin/*.erb
4242
- ext/cli/*.erb
43+
- ext/cli_defaults/*.erb
4344
- ext/default.erb
4445
- install.sh.erb
4546
- controller.sh.erb
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
#!/usr/bin/env bash
2+
3+
restartfile="/opt/puppetlabs/server/data/<%= EZBake::Config[:real_name] %>/restartcounter"
4+
if [ ! -e "$restartfile" ]; then
5+
printf '0' | /usr/bin/install -D --owner="${USER:-<%= EZBake::Config[:user] %>}" --group="${GROUP:-<%= EZBake::Config[:group] %>}" --mode=0644 "$restartfile"
6+
fi
7+
8+
if ! (echo "${@}" | grep -e "--debug" -q)
9+
then
10+
LOG_APPENDER="-Dlogappender=STDOUT"
11+
fi
12+
13+
CLASSPATH="${INSTALL_DIR}/<%= EZBake::Config[:uberjar_name] %>"
14+
15+
cli_defaults="${INSTALL_DIR}/cli/cli-defaults.sh"
16+
if [ -e "$cli_defaults" ]; then
17+
. "$cli_defaults"
18+
if [ $? -ne 0 ]; then
19+
echo "Unable to initialize cli defaults, failing start." 1>&2
20+
exit 1
21+
fi
22+
fi
23+
24+
COMMAND="${JAVA_BIN} ${JAVA_ARGS} ${LOG_APPENDER} \
25+
-cp '${CLASSPATH}' \
26+
clojure.main -m <%= EZBake::Config[:main_namespace] %> \
27+
--config ${CONFIG} --bootstrap-config ${BOOTSTRAP_CONFIG} \
28+
--restart-file '${restartfile}' \
29+
${TK_ARGS} \
30+
${@}"
31+
32+
pushd "${INSTALL_DIR}" &> /dev/null
33+
if [ "$EUID" = "0" ] && command -v runuser &> /dev/null; then
34+
runuser "${USER}" -s /bin/bash -c "$COMMAND"
35+
elif [ "$EUID" = "$(id -u ${USER})" ]; then
36+
/bin/bash -c "$COMMAND"
37+
elif command -v sudo &> /dev/null; then
38+
sudo -H -u "${USER}" $COMMAND
39+
else
40+
su "${USER}" -s /bin/bash -c "$COMMAND"
41+
fi
42+
popd &> /dev/null

0 commit comments

Comments
 (0)