/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: 2008-09-04 21:42:02 UTC
  • mfrom: (24.1.89 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20080904214202-md7u3n1yqng8vz82
* Makefile (run-client): Do not depend on the key ring files.
  (keydir/secring.gpg, keydir/pubring.gpg): Removed.
  (confdir/mandos.conf): Install with proper mode.
  (confdir/clients.conf): - '' -

* mandos-keygen: Use a temporary directory with key ring files instead
                 of separate temporary key ring files.  Removed
                 "--no-random-seed" and "--no-permission-warning" from
                 all gpg invocations.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
67
67
%.8mandos: %.xml legalnotice.xml
68
68
        $(DOCBOOKTOMAN)
69
69
 
70
 
mandos.8: mandos.xml mandos-options.xml
71
 
        $(DOCBOOKTOMAN)
72
 
 
73
 
mandos.conf.5: mandos.conf.xml mandos-options.xml
 
70
mandos.8: mandos.xml mandos-options.xml overview.xml legalnotice.xml
 
71
        $(DOCBOOKTOMAN)
 
72
 
 
73
mandos-keygen.8: mandos-keygen.xml overview.xml legalnotice.xml
 
74
        $(DOCBOOKTOMAN)
 
75
 
 
76
mandos.conf.5: mandos.conf.xml mandos-options.xml legalnotice.xml
 
77
        $(DOCBOOKTOMAN)
 
78
 
 
79
plugin-runner.8mandos: plugin-runner.xml overview.xml legalnotice.xml
 
80
        $(DOCBOOKTOMAN)
 
81
 
 
82
plugins.d/password-request.8mandos: plugins.d/password-request.xml \
 
83
                                        mandos-options.xml \
 
84
                                        overview.xml legalnotice.xml
74
85
        $(DOCBOOKTOMAN)
75
86
 
76
87
plugins.d/password-request: plugins.d/password-request.o
92
103
check:
93
104
        ./mandos --check
94
105
 
95
 
# Run the server with a local key
96
 
run-client: all keydir/seckey.txt keydir/pubkey.txt \
97
 
        keydir/secring.gpg keydir/pubring.gpg
 
106
# Run the client with a local config and key
 
107
run-client: all keydir/seckey.txt keydir/pubkey.txt
98
108
        ./plugin-runner --plugin-dir=plugins.d \
99
 
                --options-for=password-request:--keydir=keydir
 
109
                --config-file=plugin-runner.conf \
 
110
                --options-for=password-request:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
100
111
 
101
112
# Used by run-client
102
 
keydir/secring.gpg: keydir/seckey.txt
103
 
        gpg --homedir $(dir $<) --import $^
104
 
keydir/pubring.gpg: keydir/pubkey.txt
105
 
        gpg --homedir $(dir $<) --import $^
106
113
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
107
114
        install --directory keydir
108
115
        ./mandos-keygen --dir keydir --force
114
121
# Used by run-server
115
122
confdir/mandos.conf: mandos.conf
116
123
        install --directory confdir
117
 
        install $^ $@
 
124
        install --mode=0644 $^ $@
118
125
confdir/clients.conf: clients.conf keydir/seckey.txt
119
126
        install --directory confdir
120
 
        install clients.conf $@
 
127
        install --mode=0640 $< $@
121
128
# Add a client password
122
129
        ./mandos-keygen --dir keydir --password >> $@
123
130