Merge branch 'master' into distorted

* master:
  etc/ftpsync-debian-security.conf: Don't ask for unstable or experimental.

diff --git a/etc/ftpsync-common.conf b/etc/ftpsync-common.conf
index 61712f4..af89c7e 100644 (file)
--- a/etc/ftpsync-common.conf
+++ b/etc/ftpsync-common.conf
@@ -83,7 +83,6 @@
 ## want.  Crazy, no?
 ARCH_EXCLUDE=$(
        bin/debian-excludes $RSYNC_HOST $RSYNC_PATH $WANT_ARCH $SEARCH_DISTS
-       echo source
 )
 
 ## Do we have leaf mirror to signal we are done and they should sync?

diff --git a/etc/mirror.packages b/etc/mirror.packages
index a790722..a3c951c 100644 (file)
--- a/etc/mirror.packages
+++ b/etc/mirror.packages
@@ -24,4 +24,14 @@ package=defaults
        do_deletes=true
        max_delete_files=80%
 
+###--------------------------------------------------------------------------
+### Nelson Beebe's BibTeX database archive.
+
+package=utah-bib
+       site=ftp.math.utah.edu
+       remote_dir=/pub/tex/bib/
+       local_dir=utah-bib
+       recursive=false
+       get_patt=\.bib$
+
 ###----- That's all, folks --------------------------------------------------

diff --git a/etc/mirrors.d/50-debian b/etc/mirrors.d/50-debian
new file mode 100755 (executable)
index 0000000..23a0db5
--- /dev/null
+++ b/etc/mirrors.d/50-debian
@@ -0,0 +1,7 @@
+#! /bin/sh -e
+###
+### Mirror Debian archives.
+
+for archive in debian; do
+  bin/ftpsync sync:all sync:archive:$archive
+done

diff --git a/etc/mirrors.d/50-mirror b/etc/mirrors.d/50-mirror
new file mode 100755 (executable)
index 0000000..989fff2
--- /dev/null
+++ b/etc/mirrors.d/50-mirror
@@ -0,0 +1,7 @@
+#! /bin/sh -e
+###
+### Lee MacLoughlin's mirror scripts.
+
+here=$(pwd)
+cd ../pub/mirrors
+mirror -d "$@" "$here"/etc/mirror.packages

diff --git a/etc/mirrors.d/50-rfc b/etc/mirrors.d/50-rfc
new file mode 100755 (executable)
index 0000000..3323f2a
--- /dev/null
+++ b/etc/mirrors.d/50-rfc
@@ -0,0 +1,10 @@
+#! /bin/sh -e
+###
+### Mirror RFCs and Internet Drafts from mirrorservice.org
+
+. lib/functions.sh
+standard_rsync "$@" \
+  --exclude /ien/scanned/ \
+  --exclude /tar/ \
+  rsync.mirrorservice.org::ftp.isi.edu/in-notes/ \
+  ../pub/mirrors/rfc/