/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: 2013-10-28 08:38:47 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 307.
  • Revision ID: teddy@recompile.se-20131028083847-cper3srg5o29r2ge
Use architecture libdir.

Instead of always using /usr/lib/mandos, use whatever the architecture
specifies, like /usr/lib/x86_64-linux-gnu/mandos or /usr/lib64/mandos.
Still use /usr/lib/mandos as a fallback.

* Makefile (LIBDIR): New.
 (install-client-nokey, uninstall-client): Use LIBDIR instead of
                                           $(PREFIX)/lib.
* initramfs-tools-hook: Detect correct libdir and copy from there.

Reported-by: Nathanael D. Noblet <nathanael@gnat.ca>
Suggested-by: Nathanael D. Noblet <nathanael@gnat.ca>

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
 
Documentation=man:intro(8mandos) man:mandos(8)
4
3
 
5
4
[Service]
6
 
BusName=se.recompile.Mandos
 
5
Type=simple
 
6
## Type=dbus is not appropriate, because Mandos also needs to announce
 
7
## its ZeroConf service and be reachable on the network.
 
8
#Type=dbus
 
9
#BusName=se.recompile.Mandos
7
10
ExecStart=/usr/sbin/mandos --foreground
8
11
Restart=always
9
 
KillMode=mixed
10
 
## Using socket activation won't work, because systemd always does
11
 
## bind() on the socket, and also won't announce the ZeroConf service.
 
12
KillMode=process
 
13
## Using socket activation won't work either, because systemd always
 
14
## does bind() on the socket, and also won't announce the ZeroConf
 
15
## service.
12
16
#ExecStart=/usr/sbin/mandos --foreground --socket=0
13
17
#StandardInput=socket
14
18