2 files changed, 5 insertions(+), 2 deletions(-)

M CHANGELOG.rst
M CMakeLists.txt

@@ 17,6 17,10 @@ For admins
 - SIGHUP is now caught and reloads the configuration like SIGUSR1 and 2.
 - Add a verify_certificate policy option that lets the admin disable
   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
 ========================

@@ 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(WATCHDOG_SEC_DOCSTRING "The value used as WatchdogSec= in the systemd unit file.")
+set(WATCHDOG_SEC "" CACHE STRING ${WATCHDOG_SEC_DOCSTRING})
 if(SYSTEMD_FOUND)
   set(SYSTEMD_SERVICE_TYPE "notify" CACHE STRING ${SYSTEMD_SERVICE_TYPE_DOCSTRING})
-  set(WATCHDOG_SEC "20" CACHE STRING ${WATCHDOG_SEC_DOCSTRING})
 else()
   set(SYSTEMD_SERVICE_TYPE "simple" CACHE STRING ${SYSTEMD_SERVICE_TYPE_DOCSTRING})
-  set(WATCHDOG_SEC "" CACHE STRING ${WATCHDOG_SEC_DOCSTRING})
 endif()
 set(SERVICE_USER_DOCSTRING "The value used as the User= in the systemd unit file.")
 if(NOT DEFINED SERVICE_USER)