/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
 
121
123
# Used by run-server
122
124
confdir/mandos.conf: mandos.conf
123
125
        install --directory confdir
124
 
        install --mode=0644 $^ $@
 
126
        install --mode=u=rw,go=r $^ $@
125
127
confdir/clients.conf: clients.conf keydir/seckey.txt
126
128
        install --directory confdir
127
 
        install --mode=0640 $< $@
 
129
        install --mode=u=rw,g=r $< $@
128
130
# Add a client password
129
131
        ./mandos-keygen --dir keydir --password >> $@
130
132
 
131
133
install: install-server install-client
132
134
 
133
135
install-server: doc
134
 
        install --directory --parents $(CONFDIR) $(MANDIR)/man5 \
 
136
        install --directory $(CONFDIR) $(MANDIR)/man5 \
135
137
                $(MANDIR)/man8
136
 
        install --mode=0755 mandos $(PREFIX)/sbin/mandos
137
 
        install --mode=0644 --target-directory=$(CONFDIR) mandos.conf
138
 
        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) \
139
141
                clients.conf
140
142
        gzip --best --to-stdout mandos.8 \
141
143
                > $(MANDIR)/man8/mandos.8.gz
145
147
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
146
148
 
147
149
install-client: all doc /usr/share/initramfs-tools/hooks/.
148
 
        install --directory --parents $(PREFIX)/lib/mandos \
149
 
                $(CONFDIR) $(MANDIR)/man8
150
 
        install --directory --mode=0700 $(PREFIX)/lib/mandos/plugins.d
151
 
        chmod u=rwx,g=,o= $(PREFIX)/lib/mandos/plugins.d
152
 
        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 \
153
159
                plugin-runner
154
 
        install --mode=0755 --target-directory=$(PREFIX)/sbin \
 
160
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
155
161
                mandos-keygen
156
 
        install --mode=0755 \
 
162
        install --mode=u=rwx,go=rx \
157
163
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
158
164
                plugins.d/password-prompt
159
 
        install --mode=4755 \
 
165
        install --mode=u=rwxs,go=rx \
160
166
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
161
167
                plugins.d/password-request
 
168
        install --mode=u=rwx,go=rx \
 
169
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
170
                plugins.d/usplash
162
171
        install initramfs-tools-hook \
163
172
                /usr/share/initramfs-tools/hooks/mandos
164
173
        install initramfs-tools-hook-conf \
165
174
                /usr/share/initramfs-tools/conf-hooks.d/mandos
166
175
        install initramfs-tools-script \
167
176
                /usr/share/initramfs-tools/scripts/local-top/mandos
 
177
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
168
178
        gzip --best --to-stdout mandos-keygen.8 \
169
179
                > $(MANDIR)/man8/mandos-keygen.8.gz
170
180
        gzip --best --to-stdout plugin-runner.8mandos \
173
183
                > $(MANDIR)/man8/password-prompt.8mandos.gz
174
184
        gzip --best --to-stdout plugins.d/password-request.8mandos \
175
185
                > $(MANDIR)/man8/password-request.8mandos.gz
176
 
        -$(PREFIX)/sbin/mandos-keygen
 
186
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
177
187
        update-initramfs -k all -u
 
188
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
178
189
 
179
190
uninstall: uninstall-server uninstall-client
180
191
 
181
 
uninstall-server: $(PREFIX)/sbin/mandos
 
192
uninstall-server:
182
193
        -rm --force $(PREFIX)/sbin/mandos \
183
194
                $(MANDIR)/man8/mandos.8.gz \
184
195
                $(MANDIR)/man5/mandos.conf.5.gz \
211
222
        -rmdir $(CONFDIR)
212
223
 
213
224
purge-client: uninstall-client
214
 
        -rm --force $(CONFDIR)/seckey.txt $(CONFDIR)/pubkey.txt
215
 
        -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)