/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

Merge from Björn:

* plugin-runner.c (main): Bug fix: For the "--options-for" option, do
                          not mangle arguments with colon characters.
                          Also support adding empty arguments.

* plugins.d/mandos-client.c: (mc): New global variable; moved from
                                   "main".
  (init_gpgme, pgp_packet_decrypt, init_gnutls_global,
  init_gnutls_session, start_mandos_communication): Removed "mc"
                                                    argument.  All
                                                    callers changed.

  (resolve_callback, browse_callback): Ignore "userdata" argument.
                                       All callers changed.
  (handle_sigterm): New function.
  (main): Add "handle_sigterm" as signal handler for SIGTERM before
          starting the main loop.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos.service
1
 
[Unit]
2
 
Description=Server of encrypted passwords to Mandos clients
3
 
Documentation=man:intro(8mandos) man:mandos(8)
4
 
 
5
 
[Service]
6
 
Type=simple
7
 
## Type=dbus is not appropriate, because Mandos also needs to announce
8
 
## its ZeroConf service and be reachable on the network.
9
 
#Type=dbus
10
 
#BusName=se.recompile.Mandos
11
 
# If you add --no-dbus, also comment out BusName above, and vice versa
12
 
ExecStart=/usr/sbin/mandos --foreground
13
 
Restart=always
14
 
KillMode=process
15
 
## Using socket activation won't work either, because systemd always
16
 
## does bind() on the socket, and also won't announce the ZeroConf
17
 
## service.
18
 
#ExecStart=/usr/sbin/mandos --foreground --socket=0
19
 
#StandardInput=socket
20
 
 
21
 
[Install]
22
 
WantedBy=multi-user.target