fedora and fedora-epel: readjust settings to try going tier-1 again

diff --git a/fetch-scripts/fedora b/fetch-scripts/fedora
index 4291b655f8ebf63366f446913a919096b3b32c0f..0c9ec4025b974db1a53ffea41f300ed49cc3e3a0 100644 (file)
--- a/fetch-scripts/fedora
+++ b/fetch-scripts/fedora
@@ -1,10 +1,18 @@
 #!/bin/bash
 
-RSYNCSOURCE=rsync://mirrors.rit.edu
-MODULE="fedora-enchilada"
-MODULEDIR="fedora"
-TIMEFILE="${MIRRORDIR}/.locks/fedora.timefile"
+# mirrors.mit.edu is on the IP ACL for fedora-buffet0 here
+# so we'll use it. Adjust these values if switching upstreams.
+RSYNCSOURCE=rsync://download-i2.fedoraproject.org
+MASTERMODULE=fedora-buffet0
+PREBITFLIP=1
+
+# The remote module we want to sync from fedora-buffet[0].
+# Some call it fedora, others call it fedora-enchilada.
+MODULE=fedora
+# The local name for it.
+MODULEDIR=fedora
 
+TIMEFILE="${MIRRORDIR}/.locks/fedora.timefile"
 QFM="./tools/fedora/quick-fedora-mirror"
 
 if ! [ -x "${QFM}" ]; then
@@ -28,8 +36,10 @@ cat >"${CONF}" <<EOF
 DESTD=${MIRRORDIR}
 # State regarding last sync, and also a lockfile for qfm
 TIMEFILE=${TIMEFILE}
-# Upstream mirror that contains fedora-buffet
+# Upstream mirror that contains MASTERMODULE
 REMOTE=${RSYNCSOURCE}
+MASTERMODULE=${MASTERMODULE}
+PREBITFLIP=${PREBITFLIP}
 # Which module to sync
 MODULES=(${MODULE})
 # Map from module to location in DESTD

diff --git a/fetch-scripts/fedora-epel b/fetch-scripts/fedora-epel
index 726f2967568725a8d6c0bb3637870c3e5bb503ef..38635216e90c02acfe7f9bad7df2f3a19eba2630 100644 (file)
--- a/fetch-scripts/fedora-epel
+++ b/fetch-scripts/fedora-epel
@@ -1,10 +1,18 @@
 #!/bin/bash
 
-RSYNCSOURCE=rsync://mirrors.rit.edu
-MODULE="fedora-epel"
-MODULEDIR="epel"
-TIMEFILE="${MIRRORDIR}/.locks/fedora-epel.timefile"
+# mirrors.mit.edu is on the IP ACL for fedora-buffet0 here
+# so we'll use it. Adjust these values if switching upstreams.
+RSYNCSOURCE=rsync://download-i2.fedoraproject.org
+MASTERMODULE=fedora-buffet0
+PREBITFLIP=1
+
+# The remote module we want to sync from fedora-buffet[0].
+# Some call it epel, others call it fedora-epel.
+MODULE=epel
+# The local name for it.
+MODULEDIR=epel
 
+TIMEFILE="${MIRRORDIR}/.locks/fedora-epel.timefile"
 QFM="./tools/fedora/quick-fedora-mirror"
 
 if ! [ -x "${QFM}" ]; then
@@ -28,8 +36,10 @@ cat >"${CONF}" <<EOF
 DESTD=${MIRRORDIR}
 # State regarding last sync, and also a lockfile for qfm
 TIMEFILE=${TIMEFILE}
-# Upstream mirror that contains fedora-buffet
+# Upstream mirror that contains MASTERMODULE
 REMOTE=${RSYNCSOURCE}
+MASTERMODULE=${MASTERMODULE}
+PREBITFLIP=${PREBITFLIP}
 # Which module to sync
 MODULES=(${MODULE})
 # Map from module to location in DESTD