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

Disable systemd’s watchdog by default

Browse Source
This commit is contained in:
louiz’
2019-08-04 04:55:33 +02:00
parent ce7b8395d0
commit a8cd241485
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.rst
+4
View File
@@ -17,6 +17,10 @@ For admins
- SIGHUP is now caught and reloads the configuration like SIGUSR1 and 2. - SIGHUP is now caught and reloads the configuration like SIGUSR1 and 2.
- Add a verify_certificate policy option that lets the admin disable - Add a verify_certificate policy option that lets the admin disable
certificate validation per-domain. certificate validation per-domain.
- The WatchdogSec value in the biboumi.service file (for systemd) now
defaults to the empty string, which means “disabled”. This value can
still be set at configure time by passing the option "-DWATCHDOG_SEC=20”
to cmake, if you want to enable the systemd watchdog.
Version 8.3 - 2018-06-01 Version 8.3 - 2018-06-01
======================== ========================
CMakeLists.txt
+1 -2
View File
@@ -379,12 +379,11 @@ add_custom_target(rpm
# #
set(SYSTEMD_SERVICE_TYPE_DOCSTRING "The value used as the Type= in the systemd unit file.") set(SYSTEMD_SERVICE_TYPE_DOCSTRING "The value used as the Type= in the systemd unit file.")
set(WATCHDOG_SEC_DOCSTRING "The value used as WatchdogSec= in the systemd unit file.") set(WATCHDOG_SEC_DOCSTRING "The value used as WatchdogSec= in the systemd unit file.")
set(WATCHDOG_SEC "" CACHE STRING ${WATCHDOG_SEC_DOCSTRING})
if(SYSTEMD_FOUND) if(SYSTEMD_FOUND)
set(SYSTEMD_SERVICE_TYPE "notify" CACHE STRING ${SYSTEMD_SERVICE_TYPE_DOCSTRING}) set(SYSTEMD_SERVICE_TYPE "notify" CACHE STRING ${SYSTEMD_SERVICE_TYPE_DOCSTRING})
set(WATCHDOG_SEC "20" CACHE STRING ${WATCHDOG_SEC_DOCSTRING})
else() else()
set(SYSTEMD_SERVICE_TYPE "simple" CACHE STRING ${SYSTEMD_SERVICE_TYPE_DOCSTRING}) set(SYSTEMD_SERVICE_TYPE "simple" CACHE STRING ${SYSTEMD_SERVICE_TYPE_DOCSTRING})
set(WATCHDOG_SEC "" CACHE STRING ${WATCHDOG_SEC_DOCSTRING})
endif() endif()
set(SERVICE_USER_DOCSTRING "The value used as the User= in the systemd unit file.") set(SERVICE_USER_DOCSTRING "The value used as the User= in the systemd unit file.")
if(NOT DEFINED SERVICE_USER) if(NOT DEFINED SERVICE_USER)