/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 network-hooks.d/bridge.conf

  • Committer: Teddy Hogeborn
  • Date: 2011-11-26 23:08:17 UTC
  • mto: (237.12.8 mandos-persistent)
  • mto: This revision was merged to the branch mainline in revision 290.
  • 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:
network-hooks.d/bridge.conf
1
 
## Required
2
 
 
3
 
#BRIDGE=br0
4
 
 
5
 
#PORT_ADDRESSES="00:11:22:33:44:55 11:22:33:44:55:66"
6
 
 
7
 
## Optional
8
 
 
9
 
#IPADDRS="192.0.2.3/24 2001:DB8::aede:48ff:fe71:f6f2/32"
10
 
 
11
 
#ROUTES="192.0.2.0/24 2001:DB8::/32"