Skip to content
Snippets Groups Projects
Commit 4b28bf89 authored by John Chilton's avatar John Chilton
Browse files

Fix Pulsar configs so ./run.sh just works out of the box.

Unless uwsgi is available - but I can't get that to work at all today.
parent 267669e9
No related branches found
No related tags found
No related merge requests found
......@@ -151,6 +151,8 @@ def load_app_configuration(ini_path=None, app_conf_path=None, app_name=None, loc
local_conf = local_conf or {}
if app_conf_path is None and "app_config" in local_conf:
app_conf_path = absolute_config_path(local_conf["app_config"], config_dir)
if not os.path.exists(app_conf_path) and os.path.exists(app_conf_path + ".sample"):
app_conf_path = app_conf_path + ".sample"
elif ini_path:
# If not explicit app.yml file found - look next to server.ini -
# be it in pulsar root, some temporary staging directory, or /etc.
......
......@@ -22,7 +22,7 @@ Extra Options:
EOF
}
MODE=""
: ${MODE:=""}
while :
do
case "$1" in
......@@ -58,7 +58,7 @@ do
esac
done
SCRIPTS_DIRECTORY="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
SCRIPTS_DIRECTORY="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/scripts"
PROJECT_DIRECTORY=$SCRIPTS_DIRECTORY/..
PULSAR_CONFIG_DIR=${PULSAR_CONFIG_DIR:-"."}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment