diff options
| author | Florent Le Coz <louiz@louiz.org> | 2016-01-14 14:33:49 +0100 |
|---|---|---|
| committer | Florent Le Coz <louiz@louiz.org> | 2016-01-14 14:39:06 +0100 |
| commit | d58dcde856aa1885e0eb4a1286eeaa6e4861557b (patch) | |
| tree | 871bfe7eab7960e23995721eb807324ab55152cd | |
| parent | 0864f2ab99073b62e4173da694a13aa4ccc8b554 (diff) | |
| download | biboumi-d58dcde856aa1885e0eb4a1286eeaa6e4861557b.tar.gz biboumi-d58dcde856aa1885e0eb4a1286eeaa6e4861557b.tar.bz2 biboumi-d58dcde856aa1885e0eb4a1286eeaa6e4861557b.tar.xz biboumi-d58dcde856aa1885e0eb4a1286eeaa6e4861557b.zip | |
Only activate systemd’s watchdog if we are compiling with systemd
ref #3152
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | unit/biboumi.service.cmake | 3 |
2 files changed, 4 insertions, 1 deletions
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 |