Skip to content

Commit 8dbaf8a

Browse files
refactor: avoid hard-coded file paths
Signed-off-by: Sebastian Maier <sebastian.maier@siemens.com>
1 parent 097533c commit 8dbaf8a

3 files changed

Lines changed: 15 additions & 3 deletions

File tree

openvoxserver/container-entrypoint.d/84-enable_graphite.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,14 @@
22

33
set -e
44

5+
# determine script location
6+
readonly SCRIPT_FILENAME=$(readlink -f "${BASH_SOURCE[0]}")
7+
readonly SCRIPT_PATH=$(dirname "$SCRIPT_FILENAME")
8+
59
if [[ "$OPENVOXSERVER_GRAPHITE_EXPORTER_ENABLED" == "true" ]]; then
610
if [[ -n "$OPENVOXSERVER_GRAPHITE_HOST" && -n "$OPENVOXSERVER_GRAPHITE_PORT" ]]; then
711
echo "Enabling graphite exporter"
8-
sed -e "s/GRAPHITE_HOST/$OPENVOXSERVER_GRAPHITE_HOST/" -e "s/GRAPHITE_PORT/$OPENVOXSERVER_GRAPHITE_PORT/" /container-entrypoint.d/84-metrics.conf.tmpl > /etc/puppetlabs/puppetserver/conf.d/metrics.conf
12+
sed -e "s/GRAPHITE_HOST/$OPENVOXSERVER_GRAPHITE_HOST/" -e "s/GRAPHITE_PORT/$OPENVOXSERVER_GRAPHITE_PORT/" "$SCRIPT_PATH/84-metrics.conf.tmpl" > /etc/puppetlabs/puppetserver/conf.d/metrics.conf
913
else
1014
echo "ERROR: no OPENVOXSERVER_GRAPHITE_HOST or OPENVOXSERVER_GRAPHITE_PORT set."
1115
exit 99

openvoxserver/container-entrypoint.d/88-enable-cache-delete-api.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,14 @@
22

33
set -e
44

5+
# determine script location
6+
readonly SCRIPT_FILENAME=$(readlink -f "${BASH_SOURCE[0]}")
7+
readonly SCRIPT_PATH=$(dirname "$SCRIPT_FILENAME")
8+
59
if [[ "$OPENVOXSERVER_ENABLE_ENV_CACHE_DEL_API" == true ]]; then
610
if [[ $(grep 'puppet-admin-api' /etc/puppetlabs/puppetserver/conf.d/auth.conf) ]]; then
711
echo "Admin API already set"
812
else
9-
/opt/puppetlabs/puppet/bin/ruby /container-entrypoint.d/88-add_cache_del_api_auth_rules.rb
13+
/opt/puppetlabs/puppet/bin/ruby "$SCRIPT_PATH/88-add_cache_del_api_auth_rules.rb"
1014
fi
1115
fi

openvoxserver/container-entrypoint.d/89-csr_attributes.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22

33
set -e
44

5+
# determine script location
6+
readonly SCRIPT_FILENAME=$(readlink -f "${BASH_SOURCE[0]}")
7+
readonly SCRIPT_PATH=$(dirname "$SCRIPT_FILENAME")
8+
59
if [ -n "${CSR_ATTRIBUTES}" ]; then
610
echo "CSR Attributes: ${CSR_ATTRIBUTES}"
7-
/opt/puppetlabs/puppet/bin/ruby /container-entrypoint.d/89-csr_attributes.rb
11+
/opt/puppetlabs/puppet/bin/ruby "$SCRIPT_PATH/89-csr_attributes.rb"
812
fi

0 commit comments

Comments
 (0)