/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos.service

  • Committer: Teddy Hogeborn
  • Date: 2016-02-28 13:09:43 UTC
  • Revision ID: teddy@recompile.se-20160228130943-6ofi0xgek1xd7qmy
Use GnuPG 2 if available

* debian/control (Package: mandos/Depends): Change "gnupg (<< 2)" to
                                            "gnupg".
  (Package: mandos-client/Depends): Remove "gnupg (<< 2)"; it will be
                                    depended on by libgpgme11, which
                                    will be added automatically by
                                    ${shlibs:Depends}.
* mandos (PGPEngine.__init__): Try to run "gpgconf" and set 'self.gpg'
                               to any binary found.  Also change
                               "--home" to "--homedir".
  (PGPEngine.encrypt, PGPEngine.decrypt): Use the 'self.gpg' attribute
                                          instead of "gpg".

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos.service
1
1
[Unit]
2
2
Description=Server of encrypted passwords to Mandos clients
3
3
Documentation=man:intro(8mandos) man:mandos(8)
 
4
## If the server is configured to listen to a specific IP or network
 
5
## interface, it may be necessary to change "network.target" to
 
6
## "network-online.target".
 
7
After=network.target
 
8
## If the server is configured to not use ZeroConf, these two lines
 
9
## become unnecessary and should be removed or commented out.
 
10
After=avahi-daemon.service
 
11
RequisiteOverridable=avahi-daemon.service
4
12
 
5
13
[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
 
14
## If the server's D-Bus interface is disabled, the "BusName" setting
 
15
## should be removed or commented out.
 
16
BusName=se.recompile.Mandos
12
17
ExecStart=/usr/sbin/mandos --foreground
13
18
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.
 
19
KillMode=mixed
 
20
## Using socket activation won't work, because systemd always does
 
21
## bind() on the socket, and also won't announce the ZeroConf service.
18
22
#ExecStart=/usr/sbin/mandos --foreground --socket=0
19
23
#StandardInput=socket
20
24