/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-13 00:37:02 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 339.
  • Revision ID: teddy@recompile.se-20160313003702-dulwtwt8ilpojra9
Server: Fix bug where it did not exit timely on signals

Use GLib.unix_signal_add() instead of signal.signal() to catch
signals; this will allow GLib to do its internal magic with signal
file descriptors.  (GLib does not handle signals properly otherwise.)
The function unix_signal_add() requires GLib 2.30 or later, which was
not required by PyGobject until version 3.7.1, so depend on this.

* INSTALL (Mandos Server): Document dependency on PyGObject 3.7.1
* mandos (main): Use GLib.unix_signal_add instead of signal.signal.
* init.d-mandos (do_stop): Remove workaround.
* mandos.service ([Service]): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
15
15
## should be removed or commented out.
16
16
BusName=se.recompile.Mandos
17
 
EnvironmentFile=/etc/default/mandos
18
 
ExecStart=/usr/sbin/mandos --foreground $DAEMON_ARGS
 
17
ExecStart=/usr/sbin/mandos --foreground
19
18
Restart=always
20
19
KillMode=mixed
21
20
## Using socket activation won't work, because systemd always does
29
28
ProtectSystem=full
30
29
ProtectHome=yes
31
30
CapabilityBoundingSet=CAP_KILL CAP_SETGID CAP_SETUID CAP_DAC_OVERRIDE CAP_NET_RAW
32
 
ProtectKernelTunables=yes
33
 
ProtectControlGroups=yes
34
31
 
35
32
[Install]
36
33
WantedBy=multi-user.target