/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 13:36:59 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080904133659-0omre4j6luosb20q
* mandos-clients.conf.xml (OPTIONS): Improved spelling.

* mandos.conf.xml (BUGS): - '' -

* mandos.xml (BUGS): - '' -

* plugin-runner.xml (NAME): Fix spelling by changing wording.
  (OPTIONS): Improved spelling.
  (EXAMPLE): Do not use obsolete "--keydir" option.  Improved wording.

* plugins.d/password-prompt.xml (DESCRIPTION): Improved spelling.
  (EXAMPLE): Add <acronym> tag.
  (SECURITY): Improved spelling.

* plugins.d/password-request.xml (SYNOPSIS): Changed replaceable to
                                             match OPTIONS section.
  (DESCRIPTION, OVERVIEW): Improved spelling.

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