/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to mandos.service

  • Committer: Teddy Hogeborn
  • Date: 2016-03-08 00:03:43 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 337.
  • Revision ID: teddy@recompile.se-20160308000343-kjoyixwksmboql1s
Server bug fix: Work around bug when stopping server

* init.d-mandos (do_stop): Work around SIGTERM ignoring bug by doing
  "mandos-ctl >/dev/null 2>&1" after sending signal.
* mandos.service (ExecStop): New; set to "/bin/kill -TERM $MAINPID ;
  /usr/sbin/mandos-ctl >/dev/null 2>&1" to work around SIGTERM
  ignoring bug.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos.service
8
8
## If the server is configured to not use ZeroConf, these two lines
9
9
## become unnecessary and should be removed or commented out.
10
10
After=avahi-daemon.service
11
 
Requisite=avahi-daemon.service
 
11
RequisiteOverridable=avahi-daemon.service
12
12
 
13
13
[Service]
14
14
## If the server's D-Bus interface is disabled, the "BusName" setting
28
28
ProtectSystem=full
29
29
ProtectHome=yes
30
30
CapabilityBoundingSet=CAP_KILL CAP_SETGID CAP_SETUID CAP_DAC_OVERRIDE CAP_NET_RAW
31
 
ProtectKernelTunables=yes
32
 
ProtectControlGroups=yes
 
31
# Bug workaround; the daemon does not stop on SIGTERM until poked via
 
32
# D-Bus; cause is unknown at this time
 
33
ExecStop=/bin/kill -TERM $MAINPID ; /usr/sbin/mandos-ctl >/dev/null 2>&1
33
34
 
34
35
[Install]
35
36
WantedBy=multi-user.target