From 294bc993b933c3103b53d0c565672dfcc07ffd2b Mon Sep 17 00:00:00 2001 From: Alex 'AdUser' Z Date: Fri, 2 Dec 2016 16:47:52 +1000 Subject: [PATCH] * add 'statedir' to config & cmake paths --- CMakeLists.txt | 2 ++ configs/f2b.conf.in | 1 + 2 files changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c5a29d..f37a422 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,6 +19,7 @@ endif () # HACK: cmake >= 3.4 fixes this if (CMAKE_INSTALL_PREFIX MATCHES "^/usr/?$") set(CMAKE_INSTALL_SYSCONFDIR "/etc") + set(CMAKE_INSTALL_LOCALSTATEDIR "/var") endif () include(GNUInstallDirs) @@ -44,6 +45,7 @@ message(STATUS "- configs : ${CMAKE_INSTALL_FULL_SYSCONFDIR}") message(STATUS "- binary : ${CMAKE_INSTALL_FULL_BINDIR}") message(STATUS "- binary : ${CMAKE_INSTALL_FULL_SBINDIR}") message(STATUS "- data : ${CMAKE_INSTALL_FULL_DATAROOTDIR}") +message(STATUS "- state : ${CMAKE_INSTALL_FULL_LOCALSTATEDIR}") message(STATUS "Build type : ${CMAKE_BUILD_TYPE}") message(STATUS "Options:") message(STATUS "- WITH_CLIENT : ${WITH_CLIENT}") diff --git a/configs/f2b.conf.in b/configs/f2b.conf.in index 8047afe..2889c9a 100644 --- a/configs/f2b.conf.in +++ b/configs/f2b.conf.in @@ -1,6 +1,7 @@ [main] includes = ${CMAKE_INSTALL_FULL_SYSCONFDIR}/f2b/conf-enabled pidfile = /var/run/f2b.pid +statedir = ${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/lib/f2b logdest = syslog loglevel = info logfile = /var/log/f2b.log