ctdb: Use CTDB_PIDDIR and CTDB_SOCKETDIR

These are now used in path_*() functions, the default CTDB_SOCKET
define and substitution in ctdb.service.

Signed-off-by: Martin Schwenke <mschwenke@ddn.com>
Reviewed-by: Anoop C S <anoopcs@samba.org>

diff --git a/ctdb/common/path.c b/ctdb/common/path.c
index e207641beb9ed97ff98946d93e2569ca0799daf6..9d23ddcd5129883bb1b70ca2daba6f1d2fd6fa25 100644 (file)
--- a/ctdb/common/path.c
+++ b/ctdb/common/path.c
@@ -321,7 +321,7 @@ char *path_socket(TALLOC_CTX *mem_ctx, const char *daemon)
 
        return talloc_asprintf(mem_ctx,
                               "%s/%s.socket",
-                              path_rundir(),
+                              path_socketdir(),
                               daemon);
 }
 
@@ -329,6 +329,6 @@ char *path_pidfile(TALLOC_CTX *mem_ctx, const char *daemon)
 {
        return talloc_asprintf(mem_ctx,
                               "%s/%s.pid",
-                              path_rundir(),
+                              path_piddir(),
                               daemon);
 }

diff --git a/ctdb/wscript b/ctdb/wscript
index d8db80b49828a75f6da0c92d26a9e3c3f4a3c7e2..b223524bc68b93ca5f869f352db17fc55951b74a 100644 (file)
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -313,7 +313,7 @@ def configure(conf):
     if Options.options.ctdb_sockpath:
         conf.env.CTDB_SOCKPATH = Options.options.ctdb_sockpath
     else:
-        conf.env.CTDB_SOCKPATH = os.path.join(conf.env.CTDB_RUNDIR,
+        conf.env.CTDB_SOCKPATH = os.path.join(conf.env.CTDB_SOCKETDIR,
                                               'ctdbd.socket')
     conf.define('CTDB_SOCKET', conf.env.CTDB_SOCKPATH)
 

diff --git a/packaging/systemd/ctdb.service.in b/packaging/systemd/ctdb.service.in
index 7905a93e24293d0d7de7a4dad6ff4c4bf7ca706f..8edd7522869f0195c32997ac6fde230e3c29e84c 100644 (file)
--- a/packaging/systemd/ctdb.service.in
+++ b/packaging/systemd/ctdb.service.in
@@ -9,7 +9,7 @@ Type=forking
 LimitCORE=infinity
 LimitNOFILE=1048576
 TasksMax=4096
-PIDFile=@CTDB_RUNDIR@/ctdbd.pid
+PIDFile=@CTDB_PIDDIR@/ctdbd.pid
 ExecStart=@SBINDIR@/ctdbd
 ExecStop=@BINDIR@/ctdb shutdown
 KillMode=control-group