/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
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
 
138
138
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
139
139
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
140
140
                mandos.conf
141
 
        install --mode=u=rw --target-directory=$(CONFDIR) \
 
141
        install --mode=u=rw,g=r --target-directory=$(CONFDIR) \
142
142
                clients.conf
143
143
        install --mode=u=rwx,go=rx init.d-mandos /etc/init.d/mandos
144
144
        install --mode=u=rw,go=r default-mandos /etc/default/mandos
158
158
                $(PREFIX)/lib/mandos/plugins.d
159
159
        if [ "$(CONFDIR)/plugins.d" \
160
160
                        != "$(PREFIX)/lib/mandos/plugins.d" ]; then \
161
 
                install --mode=u=rwx \
162
 
                        --directory "$(CONFDIR)/plugins.d"; \
163
 
        fi
 
161
                        install --directory "$(CONFDIR)/plugins.d"; \
 
162
                fi
164
163
        install --mode=u=rwx,go=rx \
165
164
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
166
165
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
189
188
                > $(MANDIR)/man8/password-prompt.8mandos.gz
190
189
        gzip --best --to-stdout plugins.d/password-request.8mandos \
191
190
                > $(MANDIR)/man8/password-request.8mandos.gz
192
 
# Post-installation stuff
193
191
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
194
192
        update-initramfs -k all -u
195
193
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
213
211
                $(PREFIX)/lib/mandos/plugin-runner \
214
212
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
215
213
                $(PREFIX)/lib/mandos/plugins.d/password-request \
216
 
                $(PREFIX)/lib/mandos/plugins.d/usplash \
217
214
                /usr/share/initramfs-tools/hooks/mandos \
218
215
                /usr/share/initramfs-tools/conf-hooks.d/mandos \
219
 
                /usr/share/initramfs-tools/scripts/local-top/mandos \
220
216
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
221
217
                $(MANDIR)/man8/mandos-keygen.8.gz \
222
218
                $(MANDIR)/man8/password-prompt.8mandos.gz \
223
219
                $(MANDIR)/man8/password-request.8mandos.gz
224
220
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
225
 
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
 
221
                 $(PREFIX)/lib/mandos $(CONFDIR)
226
222
        update-initramfs -k all -u
227
223
 
228
224
purge: purge-server purge-client
229
225
 
230
226
purge-server: uninstall-server
231
227
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
232
 
                /etc/default/mandos /etc/init.d/mandos \
233
 
                /var/run/mandos.pid
 
228
                /etc/default/mandos /etc/init.d/mandos
234
229
        -rmdir $(CONFDIR)
235
230
 
236
231
purge-client: uninstall-client