diff --git a/base/config.sh b/base/config.sh index 4292331..f7a3635 100755 --- a/base/config.sh +++ b/base/config.sh @@ -159,10 +159,4 @@ EOF fi fi -LSMB_CONFIG_FILE=${LSMB_CONFIG_FILE:-./local/conf/ledgersmb.yaml} -export LSMB_CONFIG_FILE -echo "--------- LEDGERSMB CONFIGURATION: $LSMB_CONFIG_FILE" -cat ${LSMB_CONFIG_FILE} -echo '--------- LEDGERSMB CONFIGURATION --- END' - exit 0 diff --git a/base/start.sh b/base/start.sh index d1b1a9d..36ba9e4 100755 --- a/base/start.sh +++ b/base/start.sh @@ -3,4 +3,10 @@ home_dir="$(dirname $(readlink -f $BASH_SOURCE))" "$home_dir/config.sh" || { echo "Failed configuration" ; exit 1 } +LSMB_CONFIG_FILE=${LSMB_CONFIG_FILE:-/srv/ledgersmb/local/conf/ledgersmb.yaml} +export LSMB_CONFIG_FILE +echo "--------- LEDGERSMB CONFIGURATION: $LSMB_CONFIG_FILE" +cat ${LSMB_CONFIG_FILE} +echo '--------- LEDGERSMB CONFIGURATION --- END' + exec "$home_dir/run.sh" diff --git a/proxy/services/starman/run b/proxy/services/starman/run index 44218a0..72dbcb9 100644 --- a/proxy/services/starman/run +++ b/proxy/services/starman/run @@ -1,3 +1,10 @@ #!/usr/bin/with-contenv /bin/bash + +LSMB_CONFIG_FILE=${LSMB_CONFIG_FILE:-/srv/ledgersmb/local/conf/ledgersmb.yaml} +export LSMB_CONFIG_FILE +echo "--------- LEDGERSMB CONFIGURATION: $LSMB_CONFIG_FILE" +cat ${LSMB_CONFIG_FILE} +echo '--------- LEDGERSMB CONFIGURATION --- END' + s6-setuidgid www-data /usr/local/bin/run.sh