From 6555f46ec99e9187473a95a6e3de2b93010165d6 Mon Sep 17 00:00:00 2001 From: Andrej Zverev Date: Thu, 12 Mar 2015 01:25:26 +0300 Subject: [PATCH] Use Systemd for Linux family and SysV for other systems. We are creating conf/rspamd.conf.in as template and declaring two new variables for CMake: DEFAULTS (for SysV): RSPAMD_WORKER_NORMAL = "*:11333" RSPAMD_WORKER_CONTROLLER = "*:11334" For Linux (for Systemd): RSPAMD_WORKER_NORMAL = "systemd:0" RSPAMD_WORKER_CONTROLLER = "systemd:1" During build we replace template with correct values. --- CMakeLists.txt | 9 +++++++++ conf/{rspamd.conf => rspamd.conf.in} | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) rename conf/{rspamd.conf => rspamd.conf.in} (74%) diff --git a/CMakeLists.txt b/CMakeLists.txt index afa9f84ac..ba9d12134 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,6 +20,9 @@ IF(NOT RSPAMD_USER) SET(RSPAMD_GROUP "nobody") ENDIF(NOT RSPAMD_USER) +# Default for SysV Init +SET(RSPAMD_WORKER_NORMAL "*:11333") +SET(RSPAMD_WORKER_CONTROLLER "*:11334") CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0 FATAL_ERROR) SET_PROPERTY(GLOBAL PROPERTY ALLOW_DUPLICATE_CUSTOM_TARGETS 1) @@ -341,6 +344,9 @@ IF(CMAKE_SYSTEM_NAME STREQUAL "Linux") ELSE(EXISTS "/etc/debian_version") SET(LINUX_START_SCRIPT "rspamd_rh.in") ENDIF(EXISTS "/etc/debian_version") + # Overwrite to conform systemd + SET(RSPAMD_WORKER_NORMAL "systemd:0") + SET(RSPAMD_WORKER_CONTROLLER "systemd:1") ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Linux") IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS") @@ -389,6 +395,9 @@ IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS") SET(CMAKE_INSTALL_RPATH "${PREFIX}/lib") ENDIF(CMAKE_SYSTEM_NAME STREQUAL "SunOS") +# Create conf/rspamd.conf from template +CONFIGURE_FILE(conf/rspamd.conf.in conf/rspamd.conf @ONLY) + # Now find libraries and headers # Find lua libraries diff --git a/conf/rspamd.conf b/conf/rspamd.conf.in similarity index 74% rename from conf/rspamd.conf rename to conf/rspamd.conf.in index 06dbe8599..db0ca9099 100644 --- a/conf/rspamd.conf +++ b/conf/rspamd.conf.in @@ -10,11 +10,11 @@ logging { } worker { - bind_socket = "systemd:0"; + bind_socket = "@RSPAMD_WORKER_NORMAL@"; .include "$CONFDIR/worker-normal.inc" } worker { - bind_socket = "systemd:1"; + bind_socket = "@RSPAMD_WORKER_CONTROLLER@"; .include "$CONFDIR/worker-controller.inc" } -- 2.39.5