From 589e5d7a7bf34c419336ab6483d9b580557ea21e Mon Sep 17 00:00:00 2001 From: Alex 'AdUser' Z Date: Fri, 9 Sep 2016 22:16:48 +1000 Subject: [PATCH] * apply CMAKE_INSTALL_PREFIX to configs --- CMakeLists.txt | 11 +++++++++-- configs/{f2b.conf.sample => f2b.conf.in} | 5 ++--- 2 files changed, 11 insertions(+), 5 deletions(-) rename configs/{f2b.conf.sample => f2b.conf.in} (73%) diff --git a/CMakeLists.txt b/CMakeLists.txt index eef3b7f..1217727 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,8 +57,15 @@ add_subdirectory(t) set_property(DIRECTORY "t" PROPERTY COMPILE_FLAGS "-g;-ggdb;-Wall;-Wextra;-pedantic;-O0") install(DIRECTORY "filters" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/f2b") -install(DIRECTORY "configs/" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/f2b") -install(FILES "configs/f2b.conf.sample" DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}/f2b/" RENAME "f2b.conf") +file(GLOB_RECURSE CONFIGS "*.conf.in") +foreach(CONFIG ${CONFIGS}) + string(REPLACE ".conf.in" ".conf" GENERATED ${CONFIG}) + configure_file(${CONFIG} ${GENERATED}) +endforeach() +install(DIRECTORY "configs/" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/f2b" + FILES_MATCHING PATTERN "*.conf") +install(FILES "configs/f2b.conf" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/f2b" + RENAME "f2b.conf.sample") add_custom_target("dist" COMMAND "git" "archive" "--format=tar.gz" diff --git a/configs/f2b.conf.sample b/configs/f2b.conf.in similarity index 73% rename from configs/f2b.conf.sample rename to configs/f2b.conf.in index 8f9df04..8047afe 100644 --- a/configs/f2b.conf.sample +++ b/configs/f2b.conf.in @@ -1,5 +1,5 @@ [main] -includes = /etc/f2b/conf-enabled +includes = ${CMAKE_INSTALL_FULL_SYSCONFDIR}/f2b/conf-enabled pidfile = /var/run/f2b.pid logdest = syslog loglevel = info @@ -17,9 +17,8 @@ incr_bantime = 0.0 incr_findtime = 0.0 maxretry = 5 source = files:/var/log/messages -; filter = preg:/etc/f2b/filters/$someservice.preg backend = exec-ipset:banned [jail:ssh] source = files:/var/log/auth.log -filter = preg:/etc/f2b/filters/ssh.preg +filter = preg:${CMAKE_INSTALL_FULL_DATAROOTDIR}/f2b/filters/ssh.preg