Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
biboumi
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
88
Issues
88
List
Boards
Labels
Service Desk
Milestones
Merge Requests
7
Merge Requests
7
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
louiz’
biboumi
Commits
a8cd2414
Commit
a8cd2414
authored
Aug 04, 2019
by
louiz’
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Disable systemd’s watchdog by default
parent
ce7b8395
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
CHANGELOG.rst
CHANGELOG.rst
+4
-0
CMakeLists.txt
CMakeLists.txt
+1
-2
No files found.
CHANGELOG.rst
View file @
a8cd2414
...
...
@@ -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
========================
...
...
CMakeLists.txt
View file @
a8cd2414
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment