From 9e9582e71f8b01b0292191615c26950a21a6b5d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Thu, 12 Jan 2017 08:59:13 +0200 Subject: [PATCH] Fix and install module configuration directory The module configuration directory didn't have a value in the CMake files. The directory is now also installed by both packages and local installations. --- CMakeLists.txt | 1 + cmake/install_layout.cmake | 2 ++ etc/postinst.in | 3 +++ 3 files changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index e5d67c626..59438e168 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -310,4 +310,5 @@ if (NOT PACKAGE) install(DIRECTORY DESTINATION var/log/maxscale) install(DIRECTORY DESTINATION var/run/maxscale) install(DIRECTORY DESTINATION var/lib/maxscale) + install(DIRECTORY DESTINATION ${DEFAULT_MODULE_CONFIG_SUBPATH}) endif() diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake index 1abf7a7e2..749aa2a57 100644 --- a/cmake/install_layout.cmake +++ b/cmake/install_layout.cmake @@ -21,6 +21,7 @@ set(DEFAULT_LANG_SUBPATH "lib/maxscale" CACHE PATH "Default language file subpat set(DEFAULT_EXEC_SUBPATH "${MAXSCALE_BINDIR}" CACHE PATH "Default executable subpath") set(DEFAULT_CONFIG_SUBPATH "etc" CACHE PATH "Default configuration subpath") set(DEFAULT_CONFIG_PERSIST_SUBPATH "maxscale.cnf.d" CACHE PATH "Default persisted configuration subpath") +set(DEFAULT_MODULE_CONFIG_SUBPATH "${DEFAULT_CONFIG_SUBPATH}/maxscale.modules.d" CACHE PATH "Default configuration subpath") set(DEFAULT_PIDDIR ${MAXSCALE_VARDIR}/${DEFAULT_PID_SUBPATH} CACHE PATH "Default PID file directory") set(DEFAULT_LOGDIR ${MAXSCALE_VARDIR}/${DEFAULT_LOG_SUBPATH} CACHE PATH "Default log directory") @@ -31,6 +32,7 @@ set(DEFAULT_LANGDIR ${MAXSCALE_VARDIR}/${DEFAULT_LANG_SUBPATH} CACHE PATH "Defau set(DEFAULT_EXECDIR ${CMAKE_INSTALL_PREFIX}/${DEFAULT_EXEC_SUBPATH} CACHE PATH "Default executable directory") set(DEFAULT_CONFIGDIR /${DEFAULT_CONFIG_SUBPATH} CACHE PATH "Default configuration directory") set(DEFAULT_CONFIG_PERSISTDIR ${DEFAULT_DATADIR}/${DEFAULT_CONFIG_PERSIST_SUBPATH} CACHE PATH "Default persisted configuration directory") +set(DEFAULT_MODULE_CONFIGDIR /${DEFAULT_MODULE_CONFIG_SUBPATH} CACHE PATH "Default module configuration directory") # Massage TARGET_COMPONENT into a list if (TARGET_COMPONENT) diff --git a/etc/postinst.in b/etc/postinst.in index 91c0e09c8..a46ec3bd9 100755 --- a/etc/postinst.in +++ b/etc/postinst.in @@ -29,6 +29,9 @@ chmod 0755 @MAXSCALE_VARDIR@/lib/maxscale chmod 0755 @MAXSCALE_VARDIR@/cache/maxscale chmod 0755 @MAXSCALE_VARDIR@/run/maxscale +# Create the module configuration directory (default: /etc/maxscale.modules.d/) +mkdir -p @DEFAULT_MODULE_CONFIGDIR@ + # Install ldconfig files if [ -f "@CMAKE_INSTALL_PREFIX@/@MAXSCALE_SHAREDIR@/maxscale.conf" ] then