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>

diff --git a/ctdb/config/ctdbd_wrapper b/ctdb/config/ctdbd_wrapper
index 84f1376e679dd9bf0143d54dfeb158bfee05e570..79e130d39ab501ff42ce44383c9a550bbe0f1e4a 100755 (executable)
--- a/ctdb/config/ctdbd_wrapper
+++ b/ctdb/config/ctdbd_wrapper
@@ -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"

diff --git a/ctdb/doc/ctdbd.conf.5.xml b/ctdb/doc/ctdbd.conf.5.xml
index a18cf5a945048164fc4a8dbea41d4eb494076178..1685692a106f06e83d4756d65e13b6a78c554fb6 100644 (file)
--- a/ctdb/doc/ctdbd.conf.5.xml
+++ b/ctdb/doc/ctdbd.conf.5.xml
@@ -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>