/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 Makefile

  • 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:
23
23
OPTIMIZE=-Os
24
24
LANGUAGE=-std=gnu99
25
25
htmldir=man
26
 
version=1.5.5
 
26
version=1.4.1
27
27
SED=sed
28
28
 
29
29
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
71
71
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
72
72
        $(notdir $<); \
73
73
        $(MANPOST) $(notdir $@);\
74
 
        if locale --all | grep --regexp='^en_US\.utf8$$' && type man \
75
 
        2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 man \
76
 
        --warnings --encoding=UTF-8 --local-file $(notdir $@); fi \
77
 
        >/dev/null)
 
74
        LANG=en_US.UTF-8 MANWIDTH=80 man --warnings --encoding=UTF-8 \
 
75
        --local-file $(notdir $@) >/dev/null)
78
76
# DocBook-to-man post-processing to fix a '\n' escape bug
79
77
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
80
78
 
257
255
        @echo "###################################################################"
258
256
        ./plugin-runner --plugin-dir=plugins.d \
259
257
                --config-file=plugin-runner.conf \
260
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
 
258
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
261
259
                $(CLIENTARGS)
262
260
 
263
261
# Used by run-client
266
264
        ./mandos-keygen --dir keydir --force
267
265
 
268
266
# Run the server with a local config
269
 
run-server: confdir/mandos.conf confdir/clients.conf statedir
 
267
run-server: confdir/mandos.conf confdir/clients.conf
270
268
        ./mandos --debug --no-dbus --configdir=confdir \
271
269
                --statedir=statedir $(SERVERARGS)
272
270
 
321
319
                > $(MANDIR)/man5/mandos.conf.5.gz
322
320
        gzip --best --to-stdout mandos-clients.conf.5 \
323
321
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
324
 
        gzip --best --to-stdout intro.8mandos \
325
 
                > $(MANDIR)/man8/intro.8mandos.gz
326
322
 
327
323
install-client-nokey: all doc
328
324
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
332
328
                install --mode=u=rwx \
333
329
                        --directory "$(CONFDIR)/plugins.d"; \
334
330
        fi
335
 
        install --mode=u=rwx,go=rx --directory \
336
 
                "$(CONFDIR)/network-hooks.d"
337
331
        install --mode=u=rwx,go=rx \
338
332
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
339
333
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \