/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-06 15:34:21 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080906153421-605ydhwyo404krh9
* initramfs-tools-hook: Use long options where available.  Use only
                        one "test" invocation instead of several.

* mandos-keygen: Use only one "test" invocation instead of several.
                 Use long options where available.  Strip newline from
                 entered password.

* plugin-runner.c (print_out_password): Do not strip trailing newline.
  (fallback): Strip trailing newline from getpass().

* plugin-runner.xml (PLUGINS): Plugins should not print trailing
                               newlines.

* plugins.d/password-prompt.c (main): Strip trailing newline.

* plugins.d/password-request.c (main): Bug fix: Read "pubkey.txt", not
                                       "pupkey.txt".

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
20
22
# MANDIR=/usr/local/man
21
23
MANDIR=$(DESTDIR)/usr/share/man
22
24
 
104
106
        ./mandos --check
105
107
 
106
108
# Run the client with a local config and key
107
 
run-client: all keydir/seckey.txt keydir/pubkey.txt \
108
 
        keydir/secring.gpg keydir/pubring.gpg
 
109
run-client: all keydir/seckey.txt keydir/pubkey.txt
109
110
        ./plugin-runner --plugin-dir=plugins.d \
110
111
                --config-file=plugin-runner.conf \
111
112
                --options-for=password-request:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
112
113
 
113
114
# Used by run-client
114
 
keydir/secring.gpg: keydir/seckey.txt
115
 
        gpg --homedir $(dir $<) --import $^
116
 
keydir/pubring.gpg: keydir/pubkey.txt
117
 
        gpg --homedir $(dir $<) --import $^
118
115
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
119
116
        install --directory keydir
120
117
        ./mandos-keygen --dir keydir --force
126
123
# Used by run-server
127
124
confdir/mandos.conf: mandos.conf
128
125
        install --directory confdir
129
 
        install $^ $@
 
126
        install --mode=u=rw,go=r $^ $@
130
127
confdir/clients.conf: clients.conf keydir/seckey.txt
131
128
        install --directory confdir
132
 
        install clients.conf $@
 
129
        install --mode=u=rw $< $@
133
130
# Add a client password
134
131
        ./mandos-keygen --dir keydir --password >> $@
135
132
 
136
133
install: install-server install-client
137
134
 
138
135
install-server: doc
139
 
        install --directory --parents $(CONFDIR) $(MANDIR)/man5 \
 
136
        install --directory $(CONFDIR) $(MANDIR)/man5 \
140
137
                $(MANDIR)/man8
141
 
        install --mode=0755 mandos $(PREFIX)/sbin/mandos
142
 
        install --mode=0644 --target-directory=$(CONFDIR) mandos.conf
143
 
        install --mode=0640 --target-directory=$(CONFDIR) \
 
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 --target-directory=$(CONFDIR) \
144
142
                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
145
146
        gzip --best --to-stdout mandos.8 \
146
147
                > $(MANDIR)/man8/mandos.8.gz
147
148
        gzip --best --to-stdout mandos.conf.5 \
150
151
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
151
152
 
152
153
install-client: all doc /usr/share/initramfs-tools/hooks/.
153
 
        install --directory --parents $(PREFIX)/lib/mandos \
154
 
                $(CONFDIR) $(MANDIR)/man8
155
 
        install --directory --mode=0700 $(PREFIX)/lib/mandos/plugins.d
156
 
        chmod u=rwx,g=,o= $(PREFIX)/lib/mandos/plugins.d
157
 
        install --mode=0755 --target-directory=$(PREFIX)/lib/mandos \
158
 
                plugin-runner
159
 
        install --mode=0755 --target-directory=$(PREFIX)/sbin \
 
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 --mode=u=rwx \
 
162
                        --directory "$(CONFDIR)/plugins.d"; \
 
163
        fi
 
164
        install --mode=u=rwx,go=rx \
 
165
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
 
166
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
160
167
                mandos-keygen
161
 
        install --mode=0755 \
 
168
        install --mode=u=rwx,go=rx \
162
169
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
163
170
                plugins.d/password-prompt
164
 
        install --mode=4755 \
 
171
        install --mode=u=rwxs,go=rx \
165
172
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
166
173
                plugins.d/password-request
 
174
        install --mode=u=rwx,go=rx \
 
175
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
176
                plugins.d/usplash
167
177
        install initramfs-tools-hook \
168
178
                /usr/share/initramfs-tools/hooks/mandos
169
179
        install initramfs-tools-hook-conf \
170
180
                /usr/share/initramfs-tools/conf-hooks.d/mandos
171
181
        install initramfs-tools-script \
172
182
                /usr/share/initramfs-tools/scripts/local-top/mandos
 
183
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
173
184
        gzip --best --to-stdout mandos-keygen.8 \
174
185
                > $(MANDIR)/man8/mandos-keygen.8.gz
175
186
        gzip --best --to-stdout plugin-runner.8mandos \
178
189
                > $(MANDIR)/man8/password-prompt.8mandos.gz
179
190
        gzip --best --to-stdout plugins.d/password-request.8mandos \
180
191
                > $(MANDIR)/man8/password-request.8mandos.gz
181
 
        -$(PREFIX)/sbin/mandos-keygen
 
192
# Post-installation stuff
 
193
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
182
194
        update-initramfs -k all -u
 
195
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
183
196
 
184
197
uninstall: uninstall-server uninstall-client
185
198
 
186
 
uninstall-server: $(PREFIX)/sbin/mandos
 
199
uninstall-server:
187
200
        -rm --force $(PREFIX)/sbin/mandos \
188
201
                $(MANDIR)/man8/mandos.8.gz \
189
202
                $(MANDIR)/man5/mandos.conf.5.gz \
190
203
                $(MANDIR)/man5/mandos-clients.conf.5.gz
 
204
        update-rc.d -f mandos remove
191
205
        -rmdir $(CONFDIR)
192
206
 
193
207
uninstall-client:
199
213
                $(PREFIX)/lib/mandos/plugin-runner \
200
214
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
201
215
                $(PREFIX)/lib/mandos/plugins.d/password-request \
 
216
                $(PREFIX)/lib/mandos/plugins.d/usplash \
202
217
                /usr/share/initramfs-tools/hooks/mandos \
203
218
                /usr/share/initramfs-tools/conf-hooks.d/mandos \
 
219
                /usr/share/initramfs-tools/scripts/local-top/mandos \
204
220
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
205
221
                $(MANDIR)/man8/mandos-keygen.8.gz \
206
222
                $(MANDIR)/man8/password-prompt.8mandos.gz \
207
223
                $(MANDIR)/man8/password-request.8mandos.gz
208
224
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
209
 
                 $(PREFIX)/lib/mandos $(CONFDIR)
 
225
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
210
226
        update-initramfs -k all -u
211
227
 
212
228
purge: purge-server purge-client
213
229
 
214
230
purge-server: uninstall-server
215
 
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf
 
231
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
 
232
                /etc/default/mandos /etc/init.d/mandos \
 
233
                /var/run/mandos.pid
216
234
        -rmdir $(CONFDIR)
217
235
 
218
236
purge-client: uninstall-client
219
 
        -rm --force $(CONFDIR)/seckey.txt $(CONFDIR)/pubkey.txt
220
 
        -rmdir $(CONFDIR) $(CONFDIR)/plugins.d
 
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)