/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-08-25 03:53:42 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080825035342-wheobopjfhf0hive
* Makefile (maintainer-clean): Also remove "confdir".
  (run-client): Also create a key.
  (run-server): Also create a local config including a client.
  (keydir/secring.gpg, keydir/pubring.gpg, keydir/seckey.txt
  keydir/pubkey.txt): New targets used by "run-client".
  (confdir/mandos.conf, confdir/clients.conf): New targets used by
                                               "run-server".

* mandos-keygen (KEYLENGTH): Changed default to "2048".

* mandos-keygen.xml (OPTIONS): Changed default value for "--length".

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
87
87
distclean: clean
88
88
mostlyclean: clean
89
89
maintainer-clean: clean
90
 
        -rm --force --recursive keydir
 
90
        -rm --force --recursive keydir confdir
91
91
 
92
92
check:
93
93
        ./mandos --check
94
94
 
95
 
run-client: all
96
 
        -mkdir keydir
97
 
        -./mandos-keygen --dir keydir
 
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
98
98
        ./plugin-runner --plugin-dir=plugins.d \
99
99
                --options-for=password-request:--keydir=keydir
100
100
 
101
 
run-server:
102
 
        ./mandos --debug --configdir=.
 
101
# 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
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
 
107
        install --directory keydir
 
108
        ./mandos-keygen --dir keydir --force
 
109
 
 
110
# Run the server with a local config
 
111
run-server: confdir/mandos.conf confdir/clients.conf
 
112
        ./mandos --debug --configdir=confdir
 
113
 
 
114
# Used by run-server
 
115
confdir/mandos.conf: mandos.conf
 
116
        install --directory confdir
 
117
        install $^ $@
 
118
confdir/clients.conf: clients.conf keydir/seckey.txt
 
119
        install --directory confdir
 
120
        install clients.conf $@
 
121
# Add a client password
 
122
        ./mandos-keygen --dir keydir --password >> $@
103
123
 
104
124
install: install-server install-client
105
125