Fix CMake variables

[Bug]           * systemd service/socket files should be in /usr/local/lib, while
                  compiled libraries should reside in /usr/local/lib64 on 64-bit
                  systems.
                * Two sockets were created - one by systemd service, one by vasum
                  IPC mechanisms.
[Cause]         N/A
[Solution]      Rename vasum-ipc.socket to vasum.socket
                Correct variables regarding library and systemd file locations
[Verification]  Build, install, run tests, run vasum-cli, check file locations and
                service files.

Change-Id: I54681eaebd00b1aec547617a2ea51b0675c24ec3

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e865117..cbcf4b9 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -162,7 +162,7 @@ IF(NOT DEFINED SYSCONF_INSTALL_DIR)
 ENDIF(NOT DEFINED SYSCONF_INSTALL_DIR)
 
 IF(NOT DEFINED LIB_INSTALL_DIR)
-    SET(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib")
+    SET(LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}")
 ENDIF(NOT DEFINED LIB_INSTALL_DIR)
 
 IF(NOT DEFINED INCLUDE_INSTALL_DIR)
@@ -174,16 +174,20 @@ IF(NOT DEFINED SCRIPT_INSTALL_DIR)
 ENDIF(NOT DEFINED SCRIPT_INSTALL_DIR)
 
 IF(NOT DEFINED SYSTEMD_UNIT_DIR)
-    SET(SYSTEMD_UNIT_DIR "${LIB_INSTALL_DIR}/systemd/system")
+    SET(SYSTEMD_UNIT_DIR "${CMAKE_INSTALL_PREFIX}/lib/systemd/system")
 ENDIF(NOT DEFINED SYSTEMD_UNIT_DIR)
 
 IF(NOT DEFINED DATA_DIR)
     SET(DATA_DIR "${CMAKE_INSTALL_PREFIX}/share")
 ENDIF(NOT DEFINED DATA_DIR)
 
+IF(NOT DEFINED RUN_DIR)
+    SET(RUN_DIR "/var/run")
+ENDIF(NOT DEFINED RUN_DIR)
+
 SET(VSM_CONFIG_INSTALL_DIR ${SYSCONF_INSTALL_DIR}/vasum)
-SET(VSM_SERVER_IPC_SOCKET_PATH /var/run/vasum-ipc.socket)
-SET(VSM_UNIT_TESTS_IPC_SOCKET_PATH /var/run/vasum-ipc-unit-tests.socket)
+SET(VSM_SERVER_IPC_SOCKET_PATH ${RUN_DIR}/vasum.socket)
+SET(VSM_UNIT_TESTS_IPC_SOCKET_PATH ${RUN_DIR}/vasum-ipc-unit-tests.socket)
 
 ADD_SUBDIRECTORY(${LOGGER_FOLDER})
 ADD_SUBDIRECTORY(${DBUS_FOLDER})

diff --git a/server/configs/CMakeLists.txt b/server/configs/CMakeLists.txt
index 278a9fc..c57a806 100644 (file)
--- a/server/configs/CMakeLists.txt
+++ b/server/configs/CMakeLists.txt
@@ -25,6 +25,8 @@ FILE(GLOB lxc_templates_CONF   templates/*.sh)
 ## Generate ####################################################################
 CONFIGURE_FILE(systemd/vasum.service.in
                ${CMAKE_BINARY_DIR}/systemd/vasum.service)
+CONFIGURE_FILE(systemd/vasum.socket.in
+               ${CMAKE_BINARY_DIR}/systemd/vasum.socket)
 
 
 ## Install #####################################################################
@@ -51,5 +53,5 @@ INSTALL(PROGRAMS    ${lxc_templates_CONF}
 
 INSTALL(FILES
         ${CMAKE_BINARY_DIR}/systemd/vasum.service
-        systemd/vasum.socket
+        ${CMAKE_BINARY_DIR}/systemd/vasum.socket
         DESTINATION ${SYSTEMD_UNIT_DIR})

diff --git a/server/configs/systemd/vasum.socket b/server/configs/systemd/vasum.socket.in
similarity index 73%
rename from server/configs/systemd/vasum.socket
rename to server/configs/systemd/vasum.socket.in
index 792935d..05bc66d 100644 (file)
--- a/server/configs/systemd/vasum.socket
+++ b/server/configs/systemd/vasum.socket.in
@@ -1,5 +1,5 @@
 [Socket]
-ListenStream=/run/vasum.socket
+ListenStream=${VSM_SERVER_IPC_SOCKET_PATH}
 SocketMode=0755
 SmackLabelIPIn=*
 SmackLabelIPOut=@