commit: 448bf5d0dededcbcc24c82318eb9e5f05ba10eb8 Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> AuthorDate: Wed Apr 29 04:46:23 2020 +0000 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> CommitDate: Wed Apr 29 04:46:23 2020 +0000 URL: https://gitweb.gentoo.org/proj/gentoo-mirrorstats.git/commit/?id=448bf5d0
snapshots: prepare for common mirmon runner code via specific mirrors Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> distfiles_mirrors/g.mirrors.extra | 1 + experimental_mirrors/g.mirrors.extra | 1 + mirmon-snapshots.sh | 9 ++++++++- releases_mirrors/g.mirrors.extra | 1 + snapshots_mirrors/g.mirrors.extra | 1 + 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/distfiles_mirrors/g.mirrors.extra b/distfiles_mirrors/g.mirrors.extra new file mode 100644 index 0000000..75c3d12 --- /dev/null +++ b/distfiles_mirrors/g.mirrors.extra @@ -0,0 +1 @@ +gentoo http://distfiles.gentoo.org/ diff --git a/experimental_mirrors/g.mirrors.extra b/experimental_mirrors/g.mirrors.extra new file mode 100644 index 0000000..75c3d12 --- /dev/null +++ b/experimental_mirrors/g.mirrors.extra @@ -0,0 +1 @@ +gentoo http://distfiles.gentoo.org/ diff --git a/mirmon-snapshots.sh b/mirmon-snapshots.sh index b1198de..0f10688 100755 --- a/mirmon-snapshots.sh +++ b/mirmon-snapshots.sh @@ -11,10 +11,17 @@ VARDIR=${SITEDIR}/var/${MODE} HTDOCS=${SITEDIR}/htdocs/${MODE} MIRMON=$(readlink -f "${SITEDIR}"/mirmon/mirmon) CONFFILE=$(readlink -f "${MODEDIR}"/mirmon.conf) +VAR_GMIRRORS=${VARDIR}/g.mirrors # Grab mirrors from the web mkdir -p "${VARDIR}" -"${REPODIR}"/get-mirrors-from-${SRC}-xml.rb > "${VARDIR}"/g.mirrors.tmp && mv -f "${VARDIR}"/g.mirrors{.tmp,} +"${REPODIR}"/get-mirrors-from-${SRC}-xml.rb > "${VAR_GMIRRORS}".tmp + +EXTRA_MIRRORS=${MODEDIR}/g.mirrors.extra +[[ -e "${EXTRA_MIRRORS}" ]] && cat "${EXTRA_MIRRORS}" >>"${VAR_GMIRRORS}".tmp + +# Atomic rotate into place +mv -f "${VAR_GMIRRORS}"{.tmp,} # fatal if the state file is NOT present. [[ -e ${VARDIR}/mirmon.state ]] || touch "${VARDIR}/mirmon.state" diff --git a/releases_mirrors/g.mirrors.extra b/releases_mirrors/g.mirrors.extra new file mode 100644 index 0000000..75c3d12 --- /dev/null +++ b/releases_mirrors/g.mirrors.extra @@ -0,0 +1 @@ +gentoo http://distfiles.gentoo.org/ diff --git a/snapshots_mirrors/g.mirrors.extra b/snapshots_mirrors/g.mirrors.extra new file mode 100644 index 0000000..75c3d12 --- /dev/null +++ b/snapshots_mirrors/g.mirrors.extra @@ -0,0 +1 @@ +gentoo http://distfiles.gentoo.org/
