/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 debian/mandos.postinst

  • 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:
debian/mandos.postinst
47
47
        ;;
48
48
esac
49
49
 
50
 
# Avahi version 0.6.31-2 and older provides "avahi" (instead of
51
 
# "avahi-daemon") in its /etc/init.d script header.  To make
52
 
# insserv(8) happy, we edit our /etc/init.d script header to contain
53
 
# the correct string before the code added by dh_installinit calls
54
 
# update.rc-d, which calls insserv.
55
 
avahi_version="`dpkg-query --showformat='${Version}' --show avahi-daemon`"
56
 
if dpkg --compare-versions "$avahi_version" le 0.6.31-2; then
57
 
    sed --in-place --expression='/^### BEGIN INIT INFO$/,/^### END INIT INFO$/s/^\(# Required-\(Stop\|Start\):.*avahi\)-daemon\>/\1/g' /etc/init.d/mandos
58
 
fi
59
 
 
60
50
#DEBHELPER#
61
51
 
62
52
exit 0