ctdb-scripts: Drop CTDB_PIDFILE 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/ctdb.init b/ctdb/config/ctdb.init
index e55c4e68add5643b2f3a3e82b157ec0734da23ac..dcb32e46ead02290a243fbad596fd84592f4fbac 100755 (executable)
--- a/ctdb/config/ctdb.init
+++ b/ctdb/config/ctdb.init
@@ -54,7 +54,7 @@ export CTDB_INIT_STYLE
 
 ctdbd="${CTDBD:-/usr/sbin/ctdbd}"
 ctdbd_wrapper="${CTDBD_WRAPPER:-/usr/sbin/ctdbd_wrapper}"
-pidfile="${CTDB_PIDFILE:-/var/run/ctdb/ctdbd.pid}"
+pidfile="/var/run/ctdb/ctdbd.pid"
 
 ############################################################
 

diff --git a/ctdb/config/ctdbd_wrapper b/ctdb/config/ctdbd_wrapper
index d56fbef7bc6d6258c04ea6d0929fb58c08b3507b..0e3c7aa62e59621b2a2dfab323075d1709e181e2 100755 (executable)
--- a/ctdb/config/ctdbd_wrapper
+++ b/ctdb/config/ctdbd_wrapper
@@ -94,7 +94,6 @@ build_ctdb_options ()
     maybe_set "--reclock"                "$CTDB_RECOVERY_LOCK"
 
     # build up ctdb_options variable from optional parameters
-    maybe_set "--pidfile"                "$CTDB_PIDFILE"
     maybe_set "--logging"                "$CTDB_LOGGING"
     maybe_set "--nlist"                  "$CTDB_NODES"
     maybe_set "--socket"                 "$CTDB_SOCKET"

diff --git a/ctdb/doc/ctdbd.conf.5.xml b/ctdb/doc/ctdbd.conf.5.xml
index 4c013f073cba75cd6ad5a42711924a1a5000506e..eb1dfd56dbc186a5d3779a6ebad975cb94f93bc8 100644 (file)
--- a/ctdb/doc/ctdbd.conf.5.xml
+++ b/ctdb/doc/ctdbd.conf.5.xml
@@ -50,41 +50,6 @@
 
   </refsect1>
 
-  <refsect1>
-    <title>
-      INITSCRIPT CONFIGURATION
-    </title>
-
-    <para>
-      Some options must be available to the initscript so they need to
-      be set in the distribution-specific initscript configuration,
-      such as <filename>/etc/sysconfig/ctdb</filename> or
-      <filename>/etc/default/ctdb</filename>.
-    </para>
-
-    <variablelist>
-
-      <varlistentry>
-       <term>CTDB_PIDFILE=<parameter>FILENAME</parameter></term>
-       <listitem>
-         <para>
-           FILENAME is the name of the file used to contain the
-           process ID (PID) of the main CTDB daemon when it is
-           running.  This is passed from the initscript to
-           <citerefentry><refentrytitle>ctdbd_wrapper</refentrytitle>
-           <manvolnum>1</manvolnum></citerefentry>.
-         </para>
-
-         <para>
-           Default is <filename>/usr/local/var/run/ctdb/ctdbd.pid</filename>.
-           Corresponds to <option>--pidfile</option>.
-         </para>
-       </listitem>
-      </varlistentry>
-
-    </variablelist>
-  </refsect1>
-
   <refsect1>
     <title>
       GLOBAL CONFIGURATION