/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 init.d-mandos

  • 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:
init.d-mandos
23
23
NAME=mandos
24
24
DAEMON=/usr/sbin/$NAME
25
25
DAEMON_ARGS=""
26
 
PIDFILE=/run/$NAME.pid
 
26
PIDFILE=/var/run/$NAME.pid
27
27
SCRIPTNAME=/etc/init.d/$NAME
28
28
 
29
29
# Exit if the package is not installed
149
149
                ;;
150
150
        esac
151
151
        ;;
152
 
  status)
153
 
        status_of_proc "$DAEMON" "$NAME" -p "$PIDFILE"
154
 
        ;;
155
152
  *)
156
153
        #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
157
154
        echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2