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

diff --git a/bin/run-mirrors b/bin/run-mirrors
index ef7f92c..fcc345b 100755 (executable)
--- a/bin/run-mirrors
+++ b/bin/run-mirrors
@@ -5,7 +5,7 @@ set -e
 ## Make sure we're running as the right user.
 case $(id -un) in
   mirror) ;;
-  *) exec userv -fstdin=/dev/null mirror run ;;
+  *) exec sudo -umirror "$0" "$@" ;;
 esac
 
 ## Set up a plausible environment.