mike/biboumi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only activate systemd’s watchdog if we are compiling with systemd

Browse Source 
ref #3152
This commit is contained in:
Florent Le Coz
2016-01-14 14:39:06 +01:00
parent 0864f2ab99
commit d58dcde856
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+2
View File
@@ -242,7 +242,9 @@ configure_file(biboumi.h.cmake src/biboumi.h)
if(SYSTEMD_FOUND) if(SYSTEMD_FOUND)
set(SYSTEMD_SERVICE_TYPE "notify") set(SYSTEMD_SERVICE_TYPE "notify")
set(WATCHDOG_SEC "20")
else() else()
set(SYSTEMD_SERVICE_TYPE "simple") set(SYSTEMD_SERVICE_TYPE "simple")
set(WATCHDOG_SEC "")
endif() endif()
configure_file(unit/biboumi.service.cmake biboumi.service) configure_file(unit/biboumi.service.cmake biboumi.service)
unit/biboumi.service.cmake
+2 -1
View File
@@ -1,12 +1,13 @@
[Unit] [Unit]
Description=Biboumi, XMPP to IRC gateway Description=Biboumi, XMPP to IRC gateway
Documentation=man:biboumi(1) http://biboumi.louiz.org
After=network.target After=network.target
[Service] [Service]
Type=${SYSTEMD_SERVICE_TYPE} Type=${SYSTEMD_SERVICE_TYPE}
ExecStart=${CMAKE_INSTALL_PREFIX}/bin/biboumi /etc/biboumi/biboumi.cfg ExecStart=${CMAKE_INSTALL_PREFIX}/bin/biboumi /etc/biboumi/biboumi.cfg
ExecReload=/bin/kill -s USR1 $MAINPID ExecReload=/bin/kill -s USR1 $MAINPID
WatchdogSec=10 WatchdogSec=${WATCHDOG_SEC}
Restart=always Restart=always
User=nobody User=nobody
Group=nobody Group=nobody