/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
 
PIDDIR=/var/run/mandos
25
 
USER=nobody
26
 
GROUP=nogroup
27
22
 
28
23
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
29
24
GNUTLS_LIBS=$(shell libgnutls-config --libs)
72
67
%.8mandos: %.xml legalnotice.xml
73
68
        $(DOCBOOKTOMAN)
74
69
 
75
 
mandos.8: mandos.xml mandos-options.xml overview.xml legalnotice.xml
76
 
        $(DOCBOOKTOMAN)
77
 
 
78
 
mandos-keygen.8: mandos-keygen.xml overview.xml legalnotice.xml
79
 
        $(DOCBOOKTOMAN)
80
 
 
81
 
mandos.conf.5: mandos.conf.xml mandos-options.xml legalnotice.xml
82
 
        $(DOCBOOKTOMAN)
83
 
 
84
 
plugin-runner.8mandos: plugin-runner.xml overview.xml legalnotice.xml
85
 
        $(DOCBOOKTOMAN)
86
 
 
87
 
plugins.d/password-request.8mandos: plugins.d/password-request.xml \
88
 
                                        mandos-options.xml \
89
 
                                        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
90
74
        $(DOCBOOKTOMAN)
91
75
 
92
76
plugins.d/password-request: plugins.d/password-request.o
109
93
        ./mandos --check
110
94
 
111
95
# Run the client with a local config and key
112
 
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
113
98
        ./plugin-runner --plugin-dir=plugins.d \
114
99
                --config-file=plugin-runner.conf \
115
 
                --options-for=password-request:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
 
100
                --options-for=password-request:--keydir=keydir
116
101
 
117
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 $^
118
107
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
119
108
        install --directory keydir
120
109
        ./mandos-keygen --dir keydir --force
126
115
# Used by run-server
127
116
confdir/mandos.conf: mandos.conf
128
117
        install --directory confdir
129
 
        install --mode=u=rw,go=r $^ $@
 
118
        install $^ $@
130
119
confdir/clients.conf: clients.conf keydir/seckey.txt
131
120
        install --directory confdir
132
 
        install --mode=u=rw,g=r $< $@
 
121
        install clients.conf $@
133
122
# Add a client password
134
123
        ./mandos-keygen --dir keydir --password >> $@
135
124
 
136
125
install: install-server install-client
137
126
 
138
127
install-server: doc
139
 
        install --directory $(CONFDIR) $(MANDIR)/man5 \
 
128
        install --directory --parents $(CONFDIR) $(MANDIR)/man5 \
140
129
                $(MANDIR)/man8
141
 
        install --mode=u=rwx,go=rx --owner=$(USER) --group=$(GROUP) \
142
 
                --directory $(PIDDIR)
143
 
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
144
 
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
145
 
                mandos.conf
146
 
        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) \
147
133
                clients.conf
148
 
        install --mode=u=rwx,go=rx init.d-mandos /etc/init.d/mandos
149
 
        install --mode=u=rw,go=r default-mandos /etc/default/mandos
150
 
        update-rc.d mandos defaults
151
134
        gzip --best --to-stdout mandos.8 \
152
135
                > $(MANDIR)/man8/mandos.8.gz
153
136
        gzip --best --to-stdout mandos.conf.5 \
156
139
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
157
140
 
158
141
install-client: all doc /usr/share/initramfs-tools/hooks/.
159
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR) \
160
 
                $(MANDIR)/man8
161
 
        install --directory --mode=u=rwx $(KEYDIR)
162
 
        install --directory --mode=u=rwx \
163
 
                $(PREFIX)/lib/mandos/plugins.d
164
 
        if [ "$(CONFDIR)/plugins.d" \
165
 
                        != "$(PREFIX)/lib/mandos/plugins.d" ]; then \
166
 
                        install --directory "$(CONFDIR)/plugins.d"; \
167
 
                fi
168
 
        install --mode=u=rwx,go=rx \
169
 
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
170
 
        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 \
171
149
                mandos-keygen
172
 
        install --mode=u=rwx,go=rx \
 
150
        install --mode=0755 \
173
151
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
174
152
                plugins.d/password-prompt
175
 
        install --mode=u=rwxs,go=rx \
 
153
        install --mode=4755 \
176
154
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
177
155
                plugins.d/password-request
178
 
        install --mode=u=rwx,go=rx \
179
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
180
 
                plugins.d/usplash
181
156
        install initramfs-tools-hook \
182
157
                /usr/share/initramfs-tools/hooks/mandos
183
158
        install initramfs-tools-hook-conf \
184
159
                /usr/share/initramfs-tools/conf-hooks.d/mandos
185
160
        install initramfs-tools-script \
186
161
                /usr/share/initramfs-tools/scripts/local-top/mandos
187
 
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
188
162
        gzip --best --to-stdout mandos-keygen.8 \
189
163
                > $(MANDIR)/man8/mandos-keygen.8.gz
190
164
        gzip --best --to-stdout plugin-runner.8mandos \
193
167
                > $(MANDIR)/man8/password-prompt.8mandos.gz
194
168
        gzip --best --to-stdout plugins.d/password-request.8mandos \
195
169
                > $(MANDIR)/man8/password-request.8mandos.gz
196
 
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
 
170
        -$(PREFIX)/sbin/mandos-keygen
197
171
        update-initramfs -k all -u
198
 
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
199
172
 
200
173
uninstall: uninstall-server uninstall-client
201
174
 
202
 
uninstall-server:
 
175
uninstall-server: $(PREFIX)/sbin/mandos
203
176
        -rm --force $(PREFIX)/sbin/mandos \
204
177
                $(MANDIR)/man8/mandos.8.gz \
205
178
                $(MANDIR)/man5/mandos.conf.5.gz \
206
179
                $(MANDIR)/man5/mandos-clients.conf.5.gz
207
 
        update-rc.d -f mandos remove
208
 
        -rmdir $(CONFDIR) $(PIDDIR)
 
180
        -rmdir $(CONFDIR)
209
181
 
210
182
uninstall-client:
211
183
# Refuse to uninstall client if /etc/crypttab is explicitly configured
229
201
purge: purge-server purge-client
230
202
 
231
203
purge-server: uninstall-server
232
 
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
233
 
                /etc/default/mandos /etc/init.d/mandos
 
204
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf
234
205
        -rmdir $(CONFDIR)
235
206
 
236
207
purge-client: uninstall-client
237
 
        -shred --remove $(KEYDIR)/seckey.txt
238
 
        -rm --force $(CONFDIR)/plugin-runner.conf \
239
 
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
240
 
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)
 
208
        -rm --force $(CONFDIR)/seckey.txt $(CONFDIR)/pubkey.txt
 
209
        -rmdir $(CONFDIR) $(CONFDIR)/plugins.d