/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 16:24:33 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080905162433-58fgx91ae9foxlh1
* Makefile (PIDDIR, USER, GROUP): Removed.
  (install-server): Do not create $(PIDDIR).
  (uninstall-server): Do not remove $(PIDDIR).

* init.d-mandos (PIDFILE): Changed to "/var/run/$NAME.pid".

* mandos (IPv6_TCPServer.enabled): New attribute.
  (IPv6_TCPServer.server_activate): Only call method of superclass if
                                    "self.enabled".
  (IPv6_TCPServer.enable): Set "self.enabled" to True.
  (main): Create client Set() early.  Create IPv6_TCPServer object
          early.  Switch to user and group "mandos", "nobody" or
          65534, if possible.  Enable IPv6_TCPServer *after* switching
          user.

* mandos-keygen (KEYDIR): Changed to "/etc/keys/mandos".

* mandos.xml (FILES): Changed PID file.
  (SECURITY): The server does need to be privileged, but switches to a
              non-privileged user.

* plugin-runner.xml (EXAMPLE): Changed long example to something more
                               realistic.

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) \
 
140
                mandos.conf
 
141
        install --mode=u=rw,g=r --target-directory=$(CONFDIR) \
139
142
                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
140
146
        gzip --best --to-stdout mandos.8 \
141
147
                > $(MANDIR)/man8/mandos.8.gz
142
148
        gzip --best --to-stdout mandos.conf.5 \
145
151
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
146
152
 
147
153
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 \
153
 
                plugin-runner
154
 
        install --mode=0755 --target-directory=$(PREFIX)/sbin \
 
154
        install --directory $(PREFIX)/lib/mandos $(CONFDIR) \
 
155
                $(MANDIR)/man8
 
156
        install --directory --mode=u=rwx $(KEYDIR)
 
157
        install --directory --mode=u=rwx \
 
158
                $(PREFIX)/lib/mandos/plugins.d
 
159
        if [ "$(CONFDIR)/plugins.d" \
 
160
                        != "$(PREFIX)/lib/mandos/plugins.d" ]; then \
 
161
                        install --directory "$(CONFDIR)/plugins.d"; \
 
162
                fi
 
163
        install --mode=u=rwx,go=rx \
 
164
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
 
165
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
155
166
                mandos-keygen
156
 
        install --mode=0755 \
 
167
        install --mode=u=rwx,go=rx \
157
168
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
158
169
                plugins.d/password-prompt
159
 
        install --mode=4755 \
 
170
        install --mode=u=rwxs,go=rx \
160
171
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
161
172
                plugins.d/password-request
 
173
        install --mode=u=rwx,go=rx \
 
174
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
175
                plugins.d/usplash
162
176
        install initramfs-tools-hook \
163
177
                /usr/share/initramfs-tools/hooks/mandos
164
178
        install initramfs-tools-hook-conf \
165
179
                /usr/share/initramfs-tools/conf-hooks.d/mandos
166
180
        install initramfs-tools-script \
167
181
                /usr/share/initramfs-tools/scripts/local-top/mandos
 
182
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
168
183
        gzip --best --to-stdout mandos-keygen.8 \
169
184
                > $(MANDIR)/man8/mandos-keygen.8.gz
170
185
        gzip --best --to-stdout plugin-runner.8mandos \
173
188
                > $(MANDIR)/man8/password-prompt.8mandos.gz
174
189
        gzip --best --to-stdout plugins.d/password-request.8mandos \
175
190
                > $(MANDIR)/man8/password-request.8mandos.gz
176
 
        -$(PREFIX)/sbin/mandos-keygen
 
191
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
177
192
        update-initramfs -k all -u
 
193
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
178
194
 
179
195
uninstall: uninstall-server uninstall-client
180
196
 
181
 
uninstall-server: $(PREFIX)/sbin/mandos
 
197
uninstall-server:
182
198
        -rm --force $(PREFIX)/sbin/mandos \
183
199
                $(MANDIR)/man8/mandos.8.gz \
184
200
                $(MANDIR)/man5/mandos.conf.5.gz \
185
201
                $(MANDIR)/man5/mandos-clients.conf.5.gz
 
202
        update-rc.d -f mandos remove
186
203
        -rmdir $(CONFDIR)
187
204
 
188
205
uninstall-client:
207
224
purge: purge-server purge-client
208
225
 
209
226
purge-server: uninstall-server
210
 
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf
 
227
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
 
228
                /etc/default/mandos /etc/init.d/mandos
211
229
        -rmdir $(CONFDIR)
212
230
 
213
231
purge-client: uninstall-client
214
 
        -rm --force $(CONFDIR)/seckey.txt $(CONFDIR)/pubkey.txt
215
 
        -rmdir $(CONFDIR) $(CONFDIR)/plugins.d
 
232
        -shred --remove $(KEYDIR)/seckey.txt
 
233
        -rm --force $(CONFDIR)/plugin-runner.conf \
 
234
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
 
235
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)