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

  • Committer: Teddy Hogeborn
  • Date: 2010-09-12 03:00:40 UTC
  • Revision ID: teddy@fukt.bsnet.se-20100912030040-b0uopyennste9fdh
Documentation changes:

* DBUS-API: New file documenting the server D-Bus interface.

* clients.conf: Add examples of new approval settings.

* debian/mandos.docs: Added "DBUS-API".

* mandos-clients.conf.xml (OPTIONS): Added "approved_by_default",
                                     "approval_delay", and
                                     "approval_duration".
* mandos.xml (D-BUS INTERFACE): Refer to the "DBUS-API" file.
  (BUGS): Remove mention of lack of a remote query interface.

Show diffs side-by-side

added added

removed removed

Lines of Context:
83
83
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
84
84
 
85
85
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
86
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
87
 
        plugins.d/plymouth
 
86
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
88
87
CPROGS=plugin-runner $(PLUGINS)
89
88
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
90
89
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
234
233
# Run the server with a local config
235
234
run-server: confdir/mandos.conf confdir/clients.conf
236
235
        @echo "#################################################################"
237
 
        @echo "# NOTE: Please IGNORE the error about \"Could not open file      #"
238
 
        @echo "# u'/var/run/mandos.pid'\" -  it is harmless and is caused by    #"
239
 
        @echo "# the server not running as root.  Do NOT run \"make run-server\" #"
240
 
        @echo "# server as root if you didn't also unpack and compile it thus. #"
 
236
        @echo "# NOTE: Please IGNORE errors about \"No permission to bind to    #"
 
237
        @echo "# interface\" or \"Could not open file u'/var/run/mandos.pid'\" -  #"
 
238
        @echo "# they are harmless and are caused by the server not running as #"
 
239
        @echo "# root.  Do NOT run \"make run-server\" server as root if you did #"
 
240
        @echo "# not also unpack and compile it as root.                       #"
241
241
        @echo "#################################################################"
242
242
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
243
243
 
265
265
                mandos.conf
266
266
        install --mode=u=rw --target-directory=$(CONFDIR) \
267
267
                clients.conf
268
 
        install --mode=u=rw,go=r dbus-mandos.conf \
269
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
270
268
        install --mode=u=rwx,go=rx init.d-mandos \
271
269
                $(DESTDIR)/etc/init.d/mandos
272
270
        install --mode=u=rw,go=r default-mandos \
308
306
        install --mode=u=rwxs,go=rx \
309
307
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
310
308
                plugins.d/askpass-fifo
311
 
        install --mode=u=rwxs,go=rx \
312
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
313
 
                plugins.d/plymouth
314
309
        install initramfs-tools-hook \
315
310
                $(INITRAMFSTOOLS)/hooks/mandos
316
311
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
361
356
                $(PREFIX)/lib/mandos/plugins.d/usplash \
362
357
                $(PREFIX)/lib/mandos/plugins.d/splashy \
363
358
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
364
 
                $(PREFIX)/lib/mandos/plugins.d/plymouth \
365
359
                $(INITRAMFSTOOLS)/hooks/mandos \
366
360
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
367
361
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
380
374
 
381
375
purge-server: uninstall-server
382
376
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
383
 
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
384
377
                $(DESTDIR)/etc/default/mandos \
385
378
                $(DESTDIR)/etc/init.d/mandos \
386
379
                $(DESTDIR)/var/run/mandos.pid