From f7b14ed0442585f63334d0bb3c6773ac91fae6c0 Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Tue, 16 Aug 2011 10:19:18 +0100
Subject: [PATCH] Move the mirror home directory to /var/lib/mirror-admin.

This seems like a place that will work everywhere.
---
 bin/run-mirrors         | 2 +-
 etc/logrotate.conf      | 2 +-
 etc/mirrors.d/50-debian | 2 +-
 etc/mirrors.d/50-mirror | 2 +-
 etc/mirrors.d/50-rfc    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/run-mirrors b/bin/run-mirrors
index c69b903..1dc0a14 100755
--- a/bin/run-mirrors
+++ b/bin/run-mirrors
@@ -9,7 +9,7 @@ case $(id -un) in
 esac
 
 ## Set up a plausible environment.
-HOME=/mnt/ftp/mirror-admin; export HOME; cd
+HOME=/var/lib/mirror-admin; export HOME; cd
 PATH=$HOME/bin:/usr/bin:/usr/sbin:/bin:/sbin:/usr/local/bin:/usr/local/sbin
 export PATH
 umask 002
diff --git a/etc/logrotate.conf b/etc/logrotate.conf
index 44f00d4..a67d4a2 100644
--- a/etc/logrotate.conf
+++ b/etc/logrotate.conf
@@ -7,5 +7,5 @@ rotate 31
 minsize 4194304
 daily
 
-/mnt/ftp/mirror-admin/log/*.log {
+/var/lib/mirror-admin/log/*.log {
 }
diff --git a/etc/mirrors.d/50-debian b/etc/mirrors.d/50-debian
index 23a0db5..7f65d0d 100755
--- a/etc/mirrors.d/50-debian
+++ b/etc/mirrors.d/50-debian
@@ -2,6 +2,6 @@
 ###
 ### Mirror Debian archives.
 
-for archive in debian; do
+for archive in debian-security debian; do
   bin/ftpsync sync:all sync:archive:$archive
 done
diff --git a/etc/mirrors.d/50-mirror b/etc/mirrors.d/50-mirror
index 989fff2..da23848 100755
--- a/etc/mirrors.d/50-mirror
+++ b/etc/mirrors.d/50-mirror
@@ -3,5 +3,5 @@
 ### Lee MacLoughlin's mirror scripts.
 
 here=$(pwd)
-cd ../pub/mirrors
+cd /mnt/ftp/pub/mirrors
 mirror -d "$@" "$here"/etc/mirror.packages
diff --git a/etc/mirrors.d/50-rfc b/etc/mirrors.d/50-rfc
index 3323f2a..7cab6b8 100755
--- a/etc/mirrors.d/50-rfc
+++ b/etc/mirrors.d/50-rfc
@@ -7,4 +7,4 @@ standard_rsync "$@" \
   --exclude /ien/scanned/ \
   --exclude /tar/ \
   rsync.mirrorservice.org::ftp.isi.edu/in-notes/ \
-  ../pub/mirrors/rfc/
+  /mnt/ftp/pub/mirrors/rfc/
-- 
2.11.0