Merge branch 'distorted' into vampire

* distorted:
  etc/ftpsync-debian-security.conf: Don't ask for unstable or experimental.
  etc/ftpsync-common.conf: Include Debian sources.

diff --git a/bin/run-mirrors b/bin/run-mirrors
index c69b903..1dffeec 100755 (executable)
--- a/bin/run-mirrors
+++ b/bin/run-mirrors
@@ -5,11 +5,11 @@ 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.
-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/ftpsync-common.conf b/etc/ftpsync-common.conf
index af89c7e..de669b9 100644 (file)
--- a/etc/ftpsync-common.conf
+++ b/etc/ftpsync-common.conf
@@ -15,7 +15,7 @@
 ## CAREFUL, this directory will contain the mirror. Everything else that
 ## might have happened to be in there WILL BE GONE after the mirror sync!
 : ${LABEL="debian"}
-: ${TO="/mnt/mirror/$LABEL/"}
+: ${TO="/mnt/ftp/pub/mirrors/$LABEL/"}
 
 ## The upstream name of the rsync share.
 : ${RSYNC_PATH="$LABEL"}

diff --git a/etc/logrotate.conf b/etc/logrotate.conf
index 44f00d4..a67d4a2 100644 (file)
--- 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 (executable)
--- 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 (executable)
--- 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 (executable)
--- 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/