From 49c7992d7ee02302d36471f4af6b73eb5a6a9053 Mon Sep 17 00:00:00 2001 From: ocelot-inc <pgulutzan@ocelot.ca> Date: Mon, 6 Jun 2016 13:02:48 -0600 Subject: [PATCH] tarantoolctl and sysconfdir --- doc/sphinx/book/administration.rst | 4 ++-- src/lib/small | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/sphinx/book/administration.rst b/doc/sphinx/book/administration.rst index 01f1a4355f..f6417baf88 100644 --- a/doc/sphinx/book/administration.rst +++ b/doc/sphinx/book/administration.rst @@ -257,10 +257,10 @@ and checking status. configuring for tarantoolctl ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -"The :codenormal:`tarantool` script will look for a configuration file +"The :codenormal:`tarantoolctl` script will look for a configuration file in the current directory (:codenormal:`$PWD/.tarantoolctl`). If that fails, it looks in the current user's home directory (:codenormal:`$HOME/.config/tarantool/tarantool`). -If that fails, it looks in the SYSCONFIGDIR directory (usually :codenormal:`/usr/local/etc/default/tarantool` +If that fails, it looks in the SYSCONFDIR directory (usually :codenormal:`/etc/sysconfig/tarantool` but it may be different on some platforms)." Most of the settings are similar to the settings used by ``box.cfg{...};`` diff --git a/src/lib/small b/src/lib/small index a664fadf70..18b5408440 160000 --- a/src/lib/small +++ b/src/lib/small @@ -1 +1 @@ -Subproject commit a664fadf70aaf5a38813483284e7c5449e6f0ab2 +Subproject commit 18b54084402cdd1e999e9998fa60471fad7aad50 -- GitLab