From: Mark Wooding <mdw@distorted.org.uk>
Date: Fri, 16 Mar 2012 11:44:14 +0000 (+0000)
Subject: Merge branch 'distorted' into vampire
X-Git-Url: https://git.distorted.org.uk/~mdw/mirror-admin/commitdiff_plain/db1a5606b2f45017fc9322fee506279e8ff39b04

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
---

db1a5606b2f45017fc9322fee506279e8ff39b04