Browse Source

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.

Conflicts:
	CMakeLists.txt
tags/0.9.0
Andrej Zverev 9 years ago
parent
commit
d8f17b0618
2 changed files with 11 additions and 2 deletions
  1. 9
    0
      CMakeLists.txt
  2. 2
    2
      conf/rspamd.conf.in

+ 9
- 0
CMakeLists.txt View File

@@ -22,6 +22,9 @@ IF(NOT RSPAMD_USER)
ENDIF(NOT RSPAMD_USER)

CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
# Default for SysV Init
SET(RSPAMD_WORKER_NORMAL "*:11333")
SET(RSPAMD_WORKER_CONTROLLER "*:11334")
SET_PROPERTY(GLOBAL PROPERTY ALLOW_DUPLICATE_CUSTOM_TARGETS 1)

############################# OPTIONS SECTION #############################################
@@ -346,6 +349,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")
@@ -394,6 +400,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

conf/rspamd.conf → conf/rspamd.conf.in View File

@@ -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"
}

Loading…
Cancel
Save