/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 12:38:35 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080904123835-hervuvv4pmpxl8r1
* README: Improved wording.

* initramfs-tools-hook: Do not copy auto-save files from
                        "/etc/mandos/plugins.d".  Do not create key
                        ring files.  Do not reset permissions on
                        things like "$DESTDIR/lib/mandos/plugins.d",
                        which should not be publicly accessible.

* plugin-runner.xml (DESCRIPTION, PLUGINS): Improved grammar.

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
22
 
106
104
        ./mandos --check
107
105
 
108
106
# Run the client with a local config and key
109
 
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
110
109
        ./plugin-runner --plugin-dir=plugins.d \
111
110
                --config-file=plugin-runner.conf \
112
111
                --options-for=password-request:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
113
112
 
114
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 $^
115
118
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
116
119
        install --directory keydir
117
120
        ./mandos-keygen --dir keydir --force
123
126
# Used by run-server
124
127
confdir/mandos.conf: mandos.conf
125
128
        install --directory confdir
126
 
        install --mode=u=rw,go=r $^ $@
 
129
        install $^ $@
127
130
confdir/clients.conf: clients.conf keydir/seckey.txt
128
131
        install --directory confdir
129
 
        install --mode=u=rw,g=r $< $@
 
132
        install clients.conf $@
130
133
# Add a client password
131
134
        ./mandos-keygen --dir keydir --password >> $@
132
135
 
133
136
install: install-server install-client
134
137
 
135
138
install-server: doc
136
 
        install --directory $(CONFDIR) $(MANDIR)/man5 \
 
139
        install --directory --parents $(CONFDIR) $(MANDIR)/man5 \
137
140
                $(MANDIR)/man8
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) \
 
141
        install --mode=0755 mandos $(PREFIX)/sbin/mandos
 
142
        install --mode=0644 --target-directory=$(CONFDIR) mandos.conf
 
143
        install --mode=0640 --target-directory=$(CONFDIR) \
141
144
                clients.conf
142
145
        gzip --best --to-stdout mandos.8 \
143
146
                > $(MANDIR)/man8/mandos.8.gz
147
150
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
148
151
 
149
152
install-client: all doc /usr/share/initramfs-tools/hooks/.
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
        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 \
159
158
                plugin-runner
160
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
159
        install --mode=0755 --target-directory=$(PREFIX)/sbin \
161
160
                mandos-keygen
162
 
        install --mode=u=rwx,go=rx \
 
161
        install --mode=0755 \
163
162
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
164
163
                plugins.d/password-prompt
165
 
        install --mode=u=rwxs,go=rx \
 
164
        install --mode=4755 \
166
165
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
167
166
                plugins.d/password-request
168
 
        install --mode=u=rwx,go=rx \
169
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
170
 
                plugins.d/usplash
171
167
        install initramfs-tools-hook \
172
168
                /usr/share/initramfs-tools/hooks/mandos
173
169
        install initramfs-tools-hook-conf \
174
170
                /usr/share/initramfs-tools/conf-hooks.d/mandos
175
171
        install initramfs-tools-script \
176
172
                /usr/share/initramfs-tools/scripts/local-top/mandos
177
 
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
178
173
        gzip --best --to-stdout mandos-keygen.8 \
179
174
                > $(MANDIR)/man8/mandos-keygen.8.gz
180
175
        gzip --best --to-stdout plugin-runner.8mandos \
183
178
                > $(MANDIR)/man8/password-prompt.8mandos.gz
184
179
        gzip --best --to-stdout plugins.d/password-request.8mandos \
185
180
                > $(MANDIR)/man8/password-request.8mandos.gz
186
 
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
 
181
        -$(PREFIX)/sbin/mandos-keygen
187
182
        update-initramfs -k all -u
188
 
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
189
183
 
190
184
uninstall: uninstall-server uninstall-client
191
185
 
192
 
uninstall-server:
 
186
uninstall-server: $(PREFIX)/sbin/mandos
193
187
        -rm --force $(PREFIX)/sbin/mandos \
194
188
                $(MANDIR)/man8/mandos.8.gz \
195
189
                $(MANDIR)/man5/mandos.conf.5.gz \
222
216
        -rmdir $(CONFDIR)
223
217
 
224
218
purge-client: uninstall-client
225
 
        -shred --remove $(KEYDIR)/seckey.txt
226
 
        -rm --force $(CONFDIR)/plugin-runner.conf \
227
 
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
228
 
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)
 
219
        -rm --force $(CONFDIR)/seckey.txt $(CONFDIR)/pubkey.txt
 
220
        -rmdir $(CONFDIR) $(CONFDIR)/plugins.d