summaryrefslogtreecommitdiffstats
path: root/ctdb/config/ctdb.sysconfig
diff options
context:
space:
mode:
authorAmitay Isaacs <amitay@gmail.com>2013-10-03 15:19:05 +1000
committerAmitay Isaacs <amitay@gmail.com>2013-10-25 12:06:07 +1100
commit7eb680a95fcdacfd47d7ddab3a4df5b9ed0c837d (patch)
tree0bad71afa324787b1f9b4aac069b2fa25abcbe30 /ctdb/config/ctdb.sysconfig
parent4432aef6d1c98b9e73f60139afa6a36b4dd6ba76 (diff)
downloadsamba-7eb680a95fcdacfd47d7ddab3a4df5b9ed0c837d.tar.gz
samba-7eb680a95fcdacfd47d7ddab3a4df5b9ed0c837d.tar.xz
samba-7eb680a95fcdacfd47d7ddab3a4df5b9ed0c837d.zip
build: Move the default CTDB socket from /tmp to /var/run/ctdb
Use /var/run/ctdb/ctdbd.socket because there might be other daemons that need sockets in the future. The local daemons test code to create a link for the default convenience socket has to be removed because the link can't be created as a regular user in the new location. This should be OK since all calls to the ctdb tool in the test code should be wrapped in onnode. When debugging tests, a developer will have to set CTDB_SOCKET by hand. Signed-off-by: Amitay Isaacs <amitay@gmail.com> Pair-programmed-with: Martin Schwenke <martin@meltin.net> (This used to be ctdb commit dc67a4e24af9d07aead2a1710eeaf5d6cc409201)
Diffstat (limited to 'ctdb/config/ctdb.sysconfig')
-rw-r--r--ctdb/config/ctdb.sysconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/ctdb/config/ctdb.sysconfig b/ctdb/config/ctdb.sysconfig
index 8233f27a96..35bf5f8323 100644
--- a/ctdb/config/ctdb.sysconfig
+++ b/ctdb/config/ctdb.sysconfig
@@ -108,8 +108,8 @@ CTDB_RECOVERY_LOCK="/some/place/on/shared/storage"
# CTDB_EVENT_SCRIPT_DIR=/etc/ctdb/events.d
# the location of the local ctdb socket
-# defaults to /tmp/ctdb.socket
-# CTDB_SOCKET=/tmp/ctdb.socket
+# defaults to /var/run/ctdb/ctdbd.socket
+# CTDB_SOCKET=/var/run/ctdb/ctdbd.socket
# what transport to use. Only tcp is currently supported
# defaults to tcp