From 7ea8ff9e59efd542191e9bd772fd9cbc745590cd Mon Sep 17 00:00:00 2001
From: Marko <marko.rajala@mariadb.com>
Date: Thu, 2 Aug 2018 09:31:58 +0300
Subject: [PATCH] MXS-1763 Move default location of maxadmin socket to
 /run/maxscale

MaxAdmin socket is now placed to piddir used by MaxScale.
---
 cmake/install_layout.cmake  | 2 ++
 include/maxscale/maxadmin.h | 3 ++-
 include/maxscale/paths.h.in | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake
index 32376c680..527dee75f 100644
--- a/cmake/install_layout.cmake
+++ b/cmake/install_layout.cmake
@@ -13,6 +13,7 @@ set(MAXSCALE_CONFDIR /etc CACHE PATH "Configuration file installation path (/etc
 # Default values for directories and subpaths where files are searched. These
 # are used in `include/maxscale/paths.h.in`.
 set(DEFAULT_PID_SUBPATH "run/maxscale" CACHE PATH "Default PID file subpath")
+set(DEFAULT_MAXADMIN_SOCKET_FILE "maxadmin.sock" CACHE PATH "Default maxadmin socket filename")
 set(DEFAULT_LOG_SUBPATH "log/maxscale" CACHE PATH "Default log subpath")
 set(DEFAULT_DATA_SUBPATH "lib/maxscale" CACHE PATH "Default datadir subpath")
 set(DEFAULT_LIB_SUBPATH "${MAXSCALE_LIBDIR}" CACHE PATH "Default library subpath")
@@ -25,6 +26,7 @@ set(DEFAULT_MODULE_CONFIG_SUBPATH "${DEFAULT_CONFIG_SUBPATH}/maxscale.modules.d"
 set(DEFAULT_CONNECTOR_PLUGIN_SUBPATH "lib/plugin" CACHE PATH "Default connector plugin subpath")
 
 set(DEFAULT_PIDDIR ${MAXSCALE_VARDIR}/${DEFAULT_PID_SUBPATH} CACHE PATH "Default PID file directory")
+set(DEFAULT_MAXADMIN_SOCKET ${DEFAULT_PIDDIR}/${DEFAULT_MAXADMIN_SOCKET_FILE} CACHE PATH "Default MaxAdmin socket path")
 set(DEFAULT_LOGDIR ${MAXSCALE_VARDIR}/${DEFAULT_LOG_SUBPATH} CACHE PATH "Default log directory")
 set(DEFAULT_DATADIR ${MAXSCALE_VARDIR}/${DEFAULT_DATA_SUBPATH} CACHE PATH "Default datadir path")
 set(DEFAULT_LIBDIR ${CMAKE_INSTALL_PREFIX}/${DEFAULT_LIB_SUBPATH}/ CACHE PATH "Default library path")
diff --git a/include/maxscale/maxadmin.h b/include/maxscale/maxadmin.h
index 7aa715ebf..e6bb8155a 100644
--- a/include/maxscale/maxadmin.h
+++ b/include/maxscale/maxadmin.h
@@ -13,10 +13,11 @@
  */
 
 #include <maxscale/cdefs.h>
+#include <maxscale/paths.h>
 
 MXS_BEGIN_DECLS
 
-#define MAXADMIN_DEFAULT_SOCKET                "/tmp/maxadmin.sock"
+#define MAXADMIN_DEFAULT_SOCKET                MXS_DEFAULT_MAXADMIN_SOCKET
 
 #define MAXADMIN_CONFIG_DEFAULT_SOCKET_TAG_LEN 7
 #define MAXADMIN_CONFIG_DEFAULT_SOCKET_TAG     "default"
diff --git a/include/maxscale/paths.h.in b/include/maxscale/paths.h.in
index 7341fd151..e15426559 100644
--- a/include/maxscale/paths.h.in
+++ b/include/maxscale/paths.h.in
@@ -45,6 +45,7 @@ MXS_BEGIN_DECLS
 #define MXS_DEFAULT_CONFIG_PERSISTDIR "@DEFAULT_CONFIG_PERSISTDIR@"
 #define MXS_DEFAULT_MODULE_CONFIGDIR  "@DEFAULT_MODULE_CONFIGDIR@"
 #define MXS_DEFAULT_CONNECTOR_PLUGINDIR "@DEFAULT_CONNECTOR_PLUGINDIR@"
+#define MXS_DEFAULT_MAXADMIN_SOCKET   "@DEFAULT_MAXADMIN_SOCKET@"
 
 static const char* default_cnf_fname = "maxscale.cnf";
 static const char* default_configdir = MXS_DEFAULT_CONFIGDIR;