diff --git a/extra/dist/tarantool.init b/extra/dist/tarantool.init index 015b1f67271ad5d254267997231de4345d753058..df8f42d9419bb1eeb5d8b70b5b83cc6c19fc4d2e 100644 --- a/extra/dist/tarantool.init +++ b/extra/dist/tarantool.init @@ -30,13 +30,16 @@ fi if [ -e "/etc/sysconfig/tarantool" ]; then sysconfig_tarantool="/etc/sysconfig/tarantool" elif [ -e "/etc/default/tarantool" ]; then - sysconfig_tarantool="/etc/sysconfig/tarantool" + sysconfig_tarantool="/etc/default/tarantool" fi -CONF_DIR=`echo "dofile('$sysconfig_tarantool') print(instance_dir)" | tarantool` -if [ "$CONF_DIR" = "nil" ]; then - CONF_DIR="/etc/tarantool/instances.enabled" + +if [ -n "$sysconfig_tarantool" ]; then + CONF_DIR=`echo "dofile('$sysconfig_tarantool') print(instance_dir)" | tarantool` fi +if [ -z "$sysconfig_tarantool" || "$CONF_DIR" = "nil" ]; then + CONF_DIR="/etc/tarantool/instances.enabled" +fi INSTANCES=`find $CONF_DIR -xtype f -name '*lua'`