/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
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
22
21
## bind() on the socket, and also won't announce the ZeroConf service.
23
22
#ExecStart=/usr/sbin/mandos --foreground --socket=0
24
23
#StandardInput=socket
25
 
# Restrict what the Mandos daemon can do.  Note that this also affects
26
 
# "checker" programs!
27
 
PrivateTmp=yes
28
 
PrivateDevices=yes
29
 
ProtectSystem=full
30
 
ProtectHome=yes
31
 
CapabilityBoundingSet=CAP_KILL CAP_SETGID CAP_SETUID CAP_DAC_OVERRIDE CAP_NET_RAW
32
 
ProtectKernelTunables=yes
33
 
ProtectControlGroups=yes
34
24
 
35
25
[Install]
36
26
WantedBy=multi-user.target