bsmtp-pull: drop -2; avoid connection sharing

[bin.git] / my-debmirror

diff --git a/my-debmirror b/my-debmirror
index 6fa7952d74d5c7f55bb0c6e015d04620cc76af3e..7a3cc28e2798f890fcad514ce9f4c2c6d3b8fbe0 100755 (executable)
--- a/my-debmirror
+++ b/my-debmirror
@@ -1,20 +1,12 @@
 #! /bin/sh
-DEB_MIRROR=${DEB_MIRROR:-ftp.de.debian.org}
-debmirror /mirror/debian -h "$DEB_MIRROR" --passive \
-         --dist=testing,unstable \
-         --section=main,contrib,non-free,main/debian-installer \
-         --arch=i386,powerpc --getcontents \
-         --ignore=non-US/,doc/,indices/,tools/,main/installer- "$@"
-debmirror /mirror/debian/non-US -h "$DEB_MIRROR" -r /debian-non-US --passive \
-         --dist=testing/non-US,unstable/non-US \
-         --arch=i386,powerpc --getcontents "$@"
-rsync -aqz "$DEB_MIRROR::debian/README*" /mirror/debian/
-for dir in doc indices tools; do
-       rsync -aqz "$DEB_MIRROR::debian/$dir/" "/mirror/debian/$dir/"
-done
-for dist in testing unstable; do
-       for arch in i386 powerpc; do
-               rsync -aqz "$DEB_MIRROR::debian/dists/$dist/main/installer-$arch/" \
-                       "/mirror/debian/dists/$dist/main/installer-$arch/"
-       done
-done
+set -e
+unset http_proxy
+DEB_MIRROR=${DEB_MIRROR:-ftp.se.debian.org}
+debmirror /mirror/debian -h "$DEB_MIRROR" --method http \
+         --dist=wheezy,jessie,sid,experimental \
+         --section=main,main/debian-installer \
+         --arch=i386 --getcontents \
+         --rsync-extra=doc,indices,tools,trace \
+         --i18n \
+         --exclude='i18n/Translation-' --include='i18n/Translation-en' \
+         "$@"