chiark / gitweb /
~mdw / mirror-admin / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7c48256 1294d4a)
Merge branch 'distorted' into vampire
authorMark Wooding <mdw@distorted.org.uk>
Fri, 16 Mar 2012 11:44:14 +0000 (11:44 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Fri, 16 Mar 2012 11:44:14 +0000 (11:44 +0000)
commitdb1a5606b2f45017fc9322fee506279e8ff39b04
tree5eda7b5f8326b5549e66bd36eb65beaad9660c5atree | snapshot
parent7c4825638adac8b88f656e994b079d2dd6db00edcommit | diff
parent1294d4a0d20d258dff65142449e18190487b01d6commit | diff
Merge branch 'distorted' into vampire

* distorted:
  etc/mirrors.d/50-rfc: Fetch RFCs from IETF; fetch IDs separately.
  etc/mirrors.d/50-debian: Actually mirror security updates.
  etc/ftpsync-common.conf: Adjust the mirror root directory.
  Move the mirror home directory to /var/lib/mirror-admin.
  Move the mirror home directory to /var/lib/mirror-admin.
  bin/run-mirrors: If we have a keytab file, log in with it.
  bin/ftpsync: New version from upstream.

Conflicts:
etc/mirrors.d/50-rfc
bin/run-mirrors diff1 | diff2 | blob | history
Mirror scripts for distorted.org.uk.