From d58dcde856aa1885e0eb4a1286eeaa6e4861557b Mon Sep 17 00:00:00 2001 From: Florent Le Coz Date: Thu, 14 Jan 2016 14:33:49 +0100 Subject: =?UTF-8?q?Only=20activate=20systemd=E2=80=99s=20watchdog=20if=20w?= =?UTF-8?q?e=20are=20compiling=20with=20systemd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ref #3152 --- CMakeLists.txt | 2 ++ unit/biboumi.service.cmake | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b51444a..ba3213b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -242,7 +242,9 @@ configure_file(biboumi.h.cmake src/biboumi.h) if(SYSTEMD_FOUND) set(SYSTEMD_SERVICE_TYPE "notify") + set(WATCHDOG_SEC "20") else() set(SYSTEMD_SERVICE_TYPE "simple") + set(WATCHDOG_SEC "") endif() configure_file(unit/biboumi.service.cmake biboumi.service) diff --git a/unit/biboumi.service.cmake b/unit/biboumi.service.cmake index 0a9b76b..4685f43 100644 --- a/unit/biboumi.service.cmake +++ b/unit/biboumi.service.cmake @@ -1,12 +1,13 @@ [Unit] Description=Biboumi, XMPP to IRC gateway +Documentation=man:biboumi(1) http://biboumi.louiz.org After=network.target [Service] Type=${SYSTEMD_SERVICE_TYPE} ExecStart=${CMAKE_INSTALL_PREFIX}/bin/biboumi /etc/biboumi/biboumi.cfg ExecReload=/bin/kill -s USR1 $MAINPID -WatchdogSec=10 +WatchdogSec=${WATCHDOG_SEC} Restart=always User=nobody Group=nobody -- cgit v1.2.3