1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00

ctdb-scripts: Drop CTDB_SOCKET configuration option

Use environment variables for test-only options.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2018-02-21 14:57:07 +11:00 committed by Amitay Isaacs
parent de44df261b
commit 81b57fa544
2 changed files with 0 additions and 21 deletions

View File

@ -21,8 +21,6 @@ fi
. "${CTDB_BASE}/functions"
loadconfig "ctdb"
[ -n "$CTDB_SOCKET" ] && export CTDB_SOCKET
ctdbd="${CTDBD:-/usr/local/sbin/ctdbd}"
############################################################
@ -96,7 +94,6 @@ build_ctdb_options ()
# build up ctdb_options variable from optional parameters
maybe_set "--logging" "$CTDB_LOGGING"
maybe_set "--nlist" "$CTDB_NODES"
maybe_set "--socket" "$CTDB_SOCKET"
maybe_set "--listen" "$CTDB_NODE_ADDRESS"
maybe_set "--public-addresses" "$CTDB_PUBLIC_ADDRESSES"
maybe_set "--public-interface" "$CTDB_PUBLIC_INTERFACE"

View File

@ -378,24 +378,6 @@
</listitem>
</varlistentry>
<varlistentry>
<term>CTDB_SOCKET=<parameter>FILENAME</parameter></term>
<listitem>
<para>
Defaults to <filename>/usr/local/var/run/ctdb/ctdbd.socket</filename>.
Corresponds to <option>--socket</option>.
</para>
<para>
If you change this then you probably want to set this in
root's environment (perhaps in a file in
<filename>/etc/profile.d</filename>) so that you can use
the <citerefentry><refentrytitle>ctdb</refentrytitle>
<manvolnum>1</manvolnum></citerefentry> command in a
straightforward manner.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>CTDB_START_AS_DISABLED=yes|no</term>
<listitem>