/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
126
126
        install --mode=u=rw,go=r $^ $@
127
127
confdir/clients.conf: clients.conf keydir/seckey.txt
128
128
        install --directory confdir
129
 
        install --mode=u=rw $< $@
 
129
        install --mode=u=rw,g=r $< $@
130
130
# Add a client password
131
131
        ./mandos-keygen --dir keydir --password >> $@
132
132
 
136
136
        install --directory $(CONFDIR) $(MANDIR)/man5 \
137
137
                $(MANDIR)/man8
138
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) \
 
139
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) mandos.conf
 
140
        install --mode=u=rw,g=r --target-directory=$(CONFDIR) \
142
141
                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
142
        gzip --best --to-stdout mandos.8 \
147
143
                > $(MANDIR)/man8/mandos.8.gz
148
144
        gzip --best --to-stdout mandos.conf.5 \
154
150
        install --directory $(PREFIX)/lib/mandos $(CONFDIR) \
155
151
                $(MANDIR)/man8
156
152
        install --directory --mode=u=rwx $(KEYDIR)
157
 
        install --directory --mode=u=rwx \
158
 
                $(PREFIX)/lib/mandos/plugins.d
159
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
160
 
                install --mode=u=rwx \
161
 
                        --directory "$(CONFDIR)/plugins.d"; \
162
 
                install --mode=u=rw,go=r etc-plugins.d-README \
163
 
                        $(CONFDIR)/plugins.d/README ; \
164
 
        fi
165
 
        install --mode=u=rwx,go=rx \
166
 
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
 
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 \
 
159
                plugin-runner
167
160
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
168
161
                mandos-keygen
169
162
        install --mode=u=rwx,go=rx \
190
183
                > $(MANDIR)/man8/password-prompt.8mandos.gz
191
184
        gzip --best --to-stdout plugins.d/password-request.8mandos \
192
185
                > $(MANDIR)/man8/password-request.8mandos.gz
193
 
# Post-installation stuff
194
186
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
195
187
        update-initramfs -k all -u
196
188
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
202
194
                $(MANDIR)/man8/mandos.8.gz \
203
195
                $(MANDIR)/man5/mandos.conf.5.gz \
204
196
                $(MANDIR)/man5/mandos-clients.conf.5.gz
205
 
        update-rc.d -f mandos remove
206
197
        -rmdir $(CONFDIR)
207
198
 
208
199
uninstall-client:
214
205
                $(PREFIX)/lib/mandos/plugin-runner \
215
206
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
216
207
                $(PREFIX)/lib/mandos/plugins.d/password-request \
217
 
                $(PREFIX)/lib/mandos/plugins.d/usplash \
218
208
                /usr/share/initramfs-tools/hooks/mandos \
219
209
                /usr/share/initramfs-tools/conf-hooks.d/mandos \
220
 
                /usr/share/initramfs-tools/scripts/local-top/mandos \
221
210
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
222
211
                $(MANDIR)/man8/mandos-keygen.8.gz \
223
212
                $(MANDIR)/man8/password-prompt.8mandos.gz \
224
213
                $(MANDIR)/man8/password-request.8mandos.gz
225
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
226
 
                rm --force $(CONFDIR)/plugins.d/README; \
227
 
        fi
228
214
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
229
 
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
 
215
                 $(PREFIX)/lib/mandos $(CONFDIR)
230
216
        update-initramfs -k all -u
231
217
 
232
218
purge: purge-server purge-client
233
219
 
234
220
purge-server: uninstall-server
235
 
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
236
 
                /etc/default/mandos /etc/init.d/mandos \
237
 
                /var/run/mandos.pid
 
221
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf
238
222
        -rmdir $(CONFDIR)
239
223
 
240
224
purge-client: uninstall-client
241
225
        -shred --remove $(KEYDIR)/seckey.txt
242
 
        -rm --force $(CONFDIR)/plugin-runner.conf \
243
 
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
 
226
        -rm --force $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
244
227
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)