/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-02 17:42:53 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080902174253-p3wxrq7z6ccnv7fs
* plugins.d/password-request.c (main): Change default GnuTLS priority
                                       string to
                             "SECURE256":!CTYPE-X.509:+CTYPE-OPENPGP".

* plugins.d/password-request.xml (DESCRIPTION): Improve wording.
  (PURPOSE, OVERVIEW): New sections.
  (OPTIONS): Improved wording.
  (EXIT STATUS): Add text.
  (ENVIRONMENT): Commented out.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
17
17
PREFIX=$(DESTDIR)/usr
18
18
# CONFDIR=/usr/local/lib/mandos
19
19
CONFDIR=$(DESTDIR)/etc/mandos
20
 
# KEYDIR=/usr/local/lib/mandos/keys
21
 
KEYDIR=$(DESTDIR)/etc/keys/mandos
22
20
# MANDIR=/usr/local/man
23
21
MANDIR=$(DESTDIR)/usr/share/man
24
22
 
69
67
%.8mandos: %.xml legalnotice.xml
70
68
        $(DOCBOOKTOMAN)
71
69
 
72
 
mandos.8: mandos.xml mandos-options.xml overview.xml legalnotice.xml
73
 
        $(DOCBOOKTOMAN)
74
 
 
75
 
mandos-keygen.8: mandos-keygen.xml overview.xml legalnotice.xml
76
 
        $(DOCBOOKTOMAN)
77
 
 
78
 
mandos.conf.5: mandos.conf.xml mandos-options.xml legalnotice.xml
79
 
        $(DOCBOOKTOMAN)
80
 
 
81
 
plugin-runner.8mandos: plugin-runner.xml overview.xml legalnotice.xml
82
 
        $(DOCBOOKTOMAN)
83
 
 
84
 
plugins.d/password-request.8mandos: plugins.d/password-request.xml \
85
 
                                        mandos-options.xml \
86
 
                                        overview.xml legalnotice.xml
 
70
mandos.8: mandos.xml mandos-options.xml
 
71
        $(DOCBOOKTOMAN)
 
72
 
 
73
mandos.conf.5: mandos.conf.xml mandos-options.xml
87
74
        $(DOCBOOKTOMAN)
88
75
 
89
76
plugins.d/password-request: plugins.d/password-request.o
106
93
        ./mandos --check
107
94
 
108
95
# Run the client with a local config and key
109
 
run-client: all keydir/seckey.txt keydir/pubkey.txt
 
96
run-client: all keydir/seckey.txt keydir/pubkey.txt \
 
97
        keydir/secring.gpg keydir/pubring.gpg
110
98
        ./plugin-runner --plugin-dir=plugins.d \
111
99
                --config-file=plugin-runner.conf \
112
 
                --options-for=password-request:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
 
100
                --options-for=password-request:--keydir=keydir
113
101
 
114
102
# Used by run-client
 
103
keydir/secring.gpg: keydir/seckey.txt
 
104
        gpg --homedir $(dir $<) --import $^
 
105
keydir/pubring.gpg: keydir/pubkey.txt
 
106
        gpg --homedir $(dir $<) --import $^
115
107
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
116
108
        install --directory keydir
117
109
        ./mandos-keygen --dir keydir --force
123
115
# Used by run-server
124
116
confdir/mandos.conf: mandos.conf
125
117
        install --directory confdir
126
 
        install --mode=u=rw,go=r $^ $@
 
118
        install $^ $@
127
119
confdir/clients.conf: clients.conf keydir/seckey.txt
128
120
        install --directory confdir
129
 
        install --mode=u=rw,g=r $< $@
 
121
        install clients.conf $@
130
122
# Add a client password
131
123
        ./mandos-keygen --dir keydir --password >> $@
132
124
 
133
125
install: install-server install-client
134
126
 
135
127
install-server: doc
136
 
        install --directory $(CONFDIR) $(MANDIR)/man5 \
 
128
        install --directory --parents $(CONFDIR) $(MANDIR)/man5 \
137
129
                $(MANDIR)/man8
138
 
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
139
 
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
140
 
                mandos.conf
141
 
        install --mode=u=rw,g=r --target-directory=$(CONFDIR) \
 
130
        install --mode=0755 mandos $(PREFIX)/sbin/mandos
 
131
        install --mode=0644 --target-directory=$(CONFDIR) mandos.conf
 
132
        install --mode=0640 --target-directory=$(CONFDIR) \
142
133
                clients.conf
143
 
        install --mode=u=rwx,go=rx init.d-mandos /etc/init.d/mandos
144
 
        install --mode=u=rw,go=r default-mandos /etc/default/mandos
145
 
        update-rc.d mandos defaults
146
134
        gzip --best --to-stdout mandos.8 \
147
135
                > $(MANDIR)/man8/mandos.8.gz
148
136
        gzip --best --to-stdout mandos.conf.5 \
151
139
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
152
140
 
153
141
install-client: all doc /usr/share/initramfs-tools/hooks/.
154
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR) \
155
 
                $(MANDIR)/man8
156
 
        install --directory --mode=u=rwx $(KEYDIR)
157
 
        install --directory --mode=u=rwx \
158
 
                $(PREFIX)/lib/mandos/plugins.d
159
 
        if [ "$(CONFDIR)/plugins.d" \
160
 
                        != "$(PREFIX)/lib/mandos/plugins.d" ]; then \
161
 
                        install --directory "$(CONFDIR)/plugins.d"; \
162
 
                fi
163
 
        install --mode=u=rwx,go=rx \
164
 
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
165
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
142
        install --directory --parents $(PREFIX)/lib/mandos \
 
143
                $(CONFDIR) $(MANDIR)/man8
 
144
        install --directory --mode=0700 $(PREFIX)/lib/mandos/plugins.d
 
145
        chmod u=rwx,g=,o= $(PREFIX)/lib/mandos/plugins.d
 
146
        install --mode=0755 --target-directory=$(PREFIX)/lib/mandos \
 
147
                plugin-runner
 
148
        install --mode=0755 --target-directory=$(PREFIX)/sbin \
166
149
                mandos-keygen
167
 
        install --mode=u=rwx,go=rx \
 
150
        install --mode=0755 \
168
151
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
169
152
                plugins.d/password-prompt
170
 
        install --mode=u=rwxs,go=rx \
 
153
        install --mode=4755 \
171
154
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
172
155
                plugins.d/password-request
173
 
        install --mode=u=rwx,go=rx \
174
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
175
 
                plugins.d/usplash
176
156
        install initramfs-tools-hook \
177
157
                /usr/share/initramfs-tools/hooks/mandos
178
158
        install initramfs-tools-hook-conf \
179
159
                /usr/share/initramfs-tools/conf-hooks.d/mandos
180
160
        install initramfs-tools-script \
181
161
                /usr/share/initramfs-tools/scripts/local-top/mandos
182
 
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
183
162
        gzip --best --to-stdout mandos-keygen.8 \
184
163
                > $(MANDIR)/man8/mandos-keygen.8.gz
185
164
        gzip --best --to-stdout plugin-runner.8mandos \
188
167
                > $(MANDIR)/man8/password-prompt.8mandos.gz
189
168
        gzip --best --to-stdout plugins.d/password-request.8mandos \
190
169
                > $(MANDIR)/man8/password-request.8mandos.gz
191
 
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
 
170
        -$(PREFIX)/sbin/mandos-keygen
192
171
        update-initramfs -k all -u
193
 
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
194
172
 
195
173
uninstall: uninstall-server uninstall-client
196
174
 
197
 
uninstall-server:
 
175
uninstall-server: $(PREFIX)/sbin/mandos
198
176
        -rm --force $(PREFIX)/sbin/mandos \
199
177
                $(MANDIR)/man8/mandos.8.gz \
200
178
                $(MANDIR)/man5/mandos.conf.5.gz \
201
179
                $(MANDIR)/man5/mandos-clients.conf.5.gz
202
 
        update-rc.d -f mandos remove
203
180
        -rmdir $(CONFDIR)
204
181
 
205
182
uninstall-client:
224
201
purge: purge-server purge-client
225
202
 
226
203
purge-server: uninstall-server
227
 
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
228
 
                /etc/default/mandos /etc/init.d/mandos
 
204
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf
229
205
        -rmdir $(CONFDIR)
230
206
 
231
207
purge-client: uninstall-client
232
 
        -shred --remove $(KEYDIR)/seckey.txt
233
 
        -rm --force $(CONFDIR)/plugin-runner.conf \
234
 
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
235
 
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)
 
208
        -rm --force $(CONFDIR)/seckey.txt $(CONFDIR)/pubkey.txt
 
209
        -rmdir $(CONFDIR) $(CONFDIR)/plugins.d