diff options
author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-03-13 11:11:58 +0000 |
---|---|---|
committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-03-13 12:03:18 +0000 |
commit | e7bafe926e1f02a71fe0782be32663829d955d88 (patch) | |
tree | fc83492e5cd6babac5e3e3673c72ee6a9b5c243d | |
parent | c475b8026e075e03b9671685b345e0aeebddf302 (diff) | |
download | rspamd-e7bafe926e1f02a71fe0782be32663829d955d88.tar.gz rspamd-e7bafe926e1f02a71fe0782be32663829d955d88.zip |
Reiterate on systemd.
Conflicts:
CMakeLists.txt
conf/rspamd.systemd.conf
-rw-r--r-- | CMakeLists.txt | 36 | ||||
-rw-r--r-- | conf/rspamd.systemd.conf | 20 |
2 files changed, 48 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d4809b4f0..5d6d7e853 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,7 +41,7 @@ OPTION(NO_SHARED "Build internal libs static [default: ON]" O OPTION(FORCE_GMIME24 "Link with gmime2.4 [default: OFF]" OFF) OPTION(INSTALL_EXAMPLES "Install examples [default: OFF]" OFF) OPTION(INSTALL_WEBUI "Install web interface [default: ON]" ON) -OPTION(WANT_SYSTEMD_UNITS "Install systemd unit files on Linux [default: ON]" ON) +OPTION(WANT_SYSTEMD_UNITS "Install systemd unit files on Linux [default: OFF]" OFF) # Build optimized code for following CPU (default i386) #SET(CPU_TUNE "i686") @@ -103,6 +103,7 @@ IF(NOT SYSTEMDDIR) SET(SYSTEMDDIR ${CMAKE_INSTALL_PREFIX}/lib/systemd/system) ENDIF(NOT SYSTEMDDIR) + ############################# INCLUDE SECTION ############################################# INCLUDE(CheckIncludeFiles) @@ -195,27 +196,28 @@ MACRO(FindLua _major _minor) ENDIF(LUA_LIBRARY AND LUA_INCLUDE_DIR) ENDMACRO(FindLua _major _minor) -FUNCTION(INSTALL_IF_NOT_EXISTS src dest suffix) +FUNCTION(INSTALL_IF_NOT_EXISTS src dest destname suffix) IF(NOT IS_ABSOLUTE "${src}") SET(src "${CMAKE_CURRENT_SOURCE_DIR}/${src}") ENDIF() GET_FILENAME_COMPONENT(src_name "${src}" NAME) + GET_FILENAME_COMPONENT(dest_name "${destname}" NAME) IF(NOT IS_ABSOLUTE "${dest}") SET(dest "${CMAKE_INSTALL_PREFIX}/${dest}") ENDIF() INSTALL(CODE " - IF(NOT EXISTS \"\$ENV{DESTDIR}${dest}/${src_name}${suffix}\") + IF(NOT EXISTS \"\$ENV{DESTDIR}${dest}/${dest_name}${suffix}\") #FILE(INSTALL \"${src}\" DESTINATION \"${dest}\") - MESSAGE(STATUS \"Installing: \$ENV{DESTDIR}${dest}/${src_name}${suffix}\") + MESSAGE(STATUS \"Installing: \$ENV{DESTDIR}${dest}/${dest_name}${suffix}\") EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E copy \"${src}\" - \"\$ENV{DESTDIR}${dest}/${src_name}${suffix}\" + \"\$ENV{DESTDIR}${dest}/${dest_name}${suffix}\" RESULT_VARIABLE copy_result ERROR_VARIABLE error_output) IF(copy_result) MESSAGE(FATAL_ERROR \${error_output}) ENDIF() ELSE() - MESSAGE(STATUS \"Skipping : \$ENV{DESTDIR}${dest}/${src_name}${suffix}\") + MESSAGE(STATUS \"Skipping : \$ENV{DESTDIR}${dest}/${dest_name}${suffix}\") ENDIF() ") ENDFUNCTION(INSTALL_IF_NOT_EXISTS) @@ -1013,8 +1015,11 @@ SET(CONFFILES conf/logging.conf conf/metrics.conf conf/modules.conf +<<<<<<< HEAD conf/options.conf conf/rspamd.conf +======= +>>>>>>> 317da93... Reiterate on systemd. conf/statistic.conf conf/workers.conf conf/2tld.inc @@ -1036,15 +1041,30 @@ MATH(EXPR CONFLIST_MAX ${CONFLIST_COUNT}-1) FOREACH(CONF_IDX RANGE ${CONFLIST_MAX}) LIST(GET CONFFILES ${CONF_IDX} CONF_FILE) IF(BUILD_PORT) - INSTALL_IF_NOT_EXISTS(${CONF_FILE} ${CONFDIR} ".sample") + INSTALL_IF_NOT_EXISTS(${CONF_FILE} ${CONFDIR} ${CONF_FILE} ".sample") ELSE(BUILD_PORT) - INSTALL_IF_NOT_EXISTS(${CONF_FILE} ${CONFDIR} "") + INSTALL_IF_NOT_EXISTS(${CONF_FILE} ${CONFDIR} ${CONF_FILE} "") ENDIF(BUILD_PORT) IF(INSTALL_EXAMPLES MATCHES "ON") INSTALL(FILES ${CONF_FILE} DESTINATION ${EXAMPLESDIR}) ENDIF(INSTALL_EXAMPLES MATCHES "ON") ENDFOREACH(CONF_IDX RANGE ${CONFLIST_MAX}) +# Main config is special due to systemd +IF(WANT_SYSTEMD_UNITS MATCHES "ON") + SET(MAIN_CONF "conf/rspamd.systemd.conf") +ELSE(WANT_SYSTEMD_UNITS MATCHES "ON") + SET(MAIN_CONF "conf/rspamd.sysvinit.conf") +ENDIF(WANT_SYSTEMD_UNITS MATCHES "ON") +IF(BUILD_PORT) + INSTALL_IF_NOT_EXISTS(${MAIN_CONF} ${CONFDIR} "rspamd.conf" ".sample") +ELSE(BUILD_PORT) + INSTALL_IF_NOT_EXISTS(${MAIN_CONF} ${CONFDIR} "rspamd.conf" "") +ENDIF(BUILD_PORT) +IF(INSTALL_EXAMPLES MATCHES "ON") + INSTALL(FILES ${MAIN_CONF} DESTINATION ${EXAMPLESDIR}) +ENDIF(INSTALL_EXAMPLES MATCHES "ON") + # Lua plugins FILE(GLOB LUA_PLUGINS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/src/plugins/lua" diff --git a/conf/rspamd.systemd.conf b/conf/rspamd.systemd.conf new file mode 100644 index 000000000..06dbe8599 --- /dev/null +++ b/conf/rspamd.systemd.conf @@ -0,0 +1,20 @@ +.include "$CONFDIR/common.conf" + +options { + .include "$CONFDIR/options.inc" +} + +logging { + type = "console"; + .include "$CONFDIR/logging.inc" +} + +worker { + bind_socket = "systemd:0"; + .include "$CONFDIR/worker-normal.inc" +} + +worker { + bind_socket = "systemd:1"; + .include "$CONFDIR/worker-controller.inc" +} |