From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 21 Sep 2007 06:12:04 +0000 (+1000)
Subject: make the persistent dbdir configurable
X-Git-Tag: tevent-0.9.20~348^2~2394
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=416c0cec6eb321032f221af6b0d8078cc92ac188;p=thirdparty%2Fsamba.git

make the persistent dbdir configurable
(This used to be ctdb commit 2587b887dcfce26b12c66fcb5d34e92da42a1776)
---

diff --git a/ctdb/config/ctdb.init b/ctdb/config/ctdb.init
index dbc1bef1c23..503c267407d 100755
--- a/ctdb/config/ctdb.init
+++ b/ctdb/config/ctdb.init
@@ -58,6 +58,7 @@ CTDB_OPTIONS="$CTDB_OPTIONS --reclock=$CTDB_RECOVERY_LOCK"
 [ -z "$CTDB_PUBLIC_ADDRESSES" ] || CTDB_OPTIONS="$CTDB_OPTIONS --public-addresses=$CTDB_PUBLIC_ADDRESSES"
 [ -z "$CTDB_PUBLIC_INTERFACE" ] || CTDB_OPTIONS="$CTDB_OPTIONS --public-interface=$CTDB_PUBLIC_INTERFACE"
 [ -z "$CTDB_DBDIR" ]            || CTDB_OPTIONS="$CTDB_OPTIONS --dbdir=$CTDB_DBDIR"
+[ -z "$CTDB_DBDIR_PERSISTENT" ] || CTDB_OPTIONS="$CTDB_OPTIONS --dbdir-persistent=$CTDB_DBDIR_PERSISTENT"
 [ -z "$CTDB_EVENT_SCRIPT_DIR" ] || CTDB_OPTIONS="$CTDB_OPTIONS --event-script-dir $CTDB_EVENT_SCRIPT_DIR"
 [ -z "$CTDB_TRANSPORT" ]        || CTDB_OPTIONS="$CTDB_OPTIONS --transport $CTDB_TRANSPORT"
 [ -z "$CTDB_DEBUGLEVEL" ]       || CTDB_OPTIONS="$CTDB_OPTIONS -d $CTDB_DEBUGLEVEL"
diff --git a/ctdb/config/ctdb.sysconfig b/ctdb/config/ctdb.sysconfig
index 11c71cef3ef..c4b192bec51 100644
--- a/ctdb/config/ctdb.sysconfig
+++ b/ctdb/config/ctdb.sysconfig
@@ -40,6 +40,10 @@
 # defaults to /var/ctdb
 # CTDB_DBDIR=/var/ctdb
 
+# the directory to put the local persistent ctdb database files in
+# defaults to /var/ctdb/persistent
+# CTDB_DBDIR_PERSISTENT=/var/ctdb/persistent
+
 # the directory where service specific event scripts are stored
 # defaults to /etc/ctdb/events.d
 # CTDB_EVENT_SCRIPT_DIR=/etc/ctdb/events.d