/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: 2011-11-26 23:08:17 UTC
  • mto: (518.1.8 mandos-persistent)
  • mto: This revision was merged to the branch mainline in revision 524.
  • Revision ID: teddy@recompile.se-20111126230817-tv08v831s2yltbkd
Make "enabled" a client config option.

* DBUS-API: Fix wording on "Expires" option.
* clients.conf (enabled): New.
* mandos (Client): "last_enabled" can now be None.
  (Client.__init__): Get "enabled" from config.  Only set
                     "last_enabled" and "expires" if enabled.
  (ClientDBus.Created_dbus_property): Removed redundant dbus.String().
  (ClientDBus.Interval_dbus_property): If changed, only reschedule
                                       checker if enabled.
  (main/special_settings): Added "enabled".
* mandos-clients.conf (OPTIONS): Added "enabled".

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