/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-05 07:11:24 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080905071124-9dq11jq5rfd6zfxf
* Makefile: Changed to use symbolic instead of octal modes throughout.
  (KEYDIR): New variable for the key directory.
  (install-server): Bug fix: remove "--parents" from install args.
  (install-client): Bug fix: - '' -  Also create key directory.  Do
                    not chmod plugin dir.  Create custom plugin directory
                    if not the same as normal plugin directory.  Add
                    "--dir" option to "mandos-keygen".  Add note about
                    running "mandos-keygen --password".
  (uninstall-server): Do not depend on the installed server binary,
                      since this made it impossible to do a purge
                      after an uninstall.
  (purge-client): Shred seckey.txt.  Use $(KEYDIR).

* README: Improved wording.

* initramfs-tools-hook: Use a loop to find prefix.  Also find keydir.
                        Remove "${DESTDIR}" from "copy_exec".  Do not
                        try to copy literal "*" if no custom plugins
                        are found.  Copy key files from keydir, not
                        config dir.  Only repair mode on directories
                        that actually exist.  Do not run chmod if
                        nothing needs repairing.

* plugin-runner.conf: New file.

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,g=r $< $@
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) mandos.conf
 
140
        install --mode=u=rw,g=r --target-directory=$(CONFDIR) \
144
141
                clients.conf
145
142
        gzip --best --to-stdout mandos.8 \
146
143
                > $(MANDIR)/man8/mandos.8.gz
150
147
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
151
148
 
152
149
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 \
 
150
        install --directory $(PREFIX)/lib/mandos $(CONFDIR) \
 
151
                $(MANDIR)/man8
 
152
        install --directory --mode=u=rwx $(KEYDIR)
 
153
        install --directory --mode=u=rwx $(PREFIX)/lib/mandos/plugins.d
 
154
        if [ "$(CONFDIR)/plugins.d" \
 
155
                        != "$(PREFIX)/lib/mandos/plugins.d" ]; then \
 
156
                        install --directory "$(CONFDIR)/plugins.d"; \
 
157
                fi
 
158
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/lib/mandos \
158
159
                plugin-runner
159
 
        install --mode=0755 --target-directory=$(PREFIX)/sbin \
 
160
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
160
161
                mandos-keygen
161
 
        install --mode=0755 \
 
162
        install --mode=u=rwx,go=rx \
162
163
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
163
164
                plugins.d/password-prompt
164
 
        install --mode=4755 \
 
165
        install --mode=u=rwxs,go=rx \
165
166
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
166
167
                plugins.d/password-request
 
168
        install --mode=u=rwx,go=rx \
 
169
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
170
                plugins.d/usplash
167
171
        install initramfs-tools-hook \
168
172
                /usr/share/initramfs-tools/hooks/mandos
169
173
        install initramfs-tools-hook-conf \
170
174
                /usr/share/initramfs-tools/conf-hooks.d/mandos
171
175
        install initramfs-tools-script \
172
176
                /usr/share/initramfs-tools/scripts/local-top/mandos
 
177
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
173
178
        gzip --best --to-stdout mandos-keygen.8 \
174
179
                > $(MANDIR)/man8/mandos-keygen.8.gz
175
180
        gzip --best --to-stdout plugin-runner.8mandos \
178
183
                > $(MANDIR)/man8/password-prompt.8mandos.gz
179
184
        gzip --best --to-stdout plugins.d/password-request.8mandos \
180
185
                > $(MANDIR)/man8/password-request.8mandos.gz
181
 
        -$(PREFIX)/sbin/mandos-keygen
 
186
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
182
187
        update-initramfs -k all -u
 
188
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
183
189
 
184
190
uninstall: uninstall-server uninstall-client
185
191
 
186
 
uninstall-server: $(PREFIX)/sbin/mandos
 
192
uninstall-server:
187
193
        -rm --force $(PREFIX)/sbin/mandos \
188
194
                $(MANDIR)/man8/mandos.8.gz \
189
195
                $(MANDIR)/man5/mandos.conf.5.gz \
216
222
        -rmdir $(CONFDIR)
217
223
 
218
224
purge-client: uninstall-client
219
 
        -rm --force $(CONFDIR)/seckey.txt $(CONFDIR)/pubkey.txt
220
 
        -rmdir $(CONFDIR) $(CONFDIR)/plugins.d
 
225
        -shred --remove $(KEYDIR)/seckey.txt
 
226
        -rm --force $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
 
227
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)