From 354c8ccd31a81616c408e6558f5f50907abd0abe Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Tue, 28 Apr 2020 22:47:59 -0700 Subject: Update config location Signed-off-by: Robin H. Johnson --- conf/distfiles/g.mirrors.extra | 1 + conf/distfiles/mirmon.conf | 23 +++++++++++++++++++++++ conf/experimental/g.mirrors.extra | 1 + conf/experimental/mirmon.conf | 23 +++++++++++++++++++++++ conf/releases/g.mirrors.extra | 1 + conf/releases/mirmon.conf | 23 +++++++++++++++++++++++ conf/rsync/g.mirrors.extra | 6 ++++++ conf/rsync/mirmon.conf | 23 +++++++++++++++++++++++ conf/snapshots/g.mirrors.extra | 1 + conf/snapshots/mirmon.conf | 22 ++++++++++++++++++++++ distfiles_mirrors/g.mirrors.extra | 1 - distfiles_mirrors/mirmon.conf | 23 ----------------------- experimental_mirrors/g.mirrors.extra | 1 - experimental_mirrors/mirmon.conf | 23 ----------------------- mirmon-wrapper.sh | 6 +++--- releases_mirrors/g.mirrors.extra | 1 - releases_mirrors/mirmon.conf | 23 ----------------------- rsync_mirrors/g.mirrors.extra | 6 ------ rsync_mirrors/mirmon.conf | 23 ----------------------- snapshots_mirrors/g.mirrors.extra | 1 - snapshots_mirrors/mirmon.conf | 22 ---------------------- validation/mirror-validate.sh | 15 +++++++++++---- 22 files changed, 138 insertions(+), 131 deletions(-) create mode 100644 conf/distfiles/g.mirrors.extra create mode 100644 conf/distfiles/mirmon.conf create mode 100644 conf/experimental/g.mirrors.extra create mode 100644 conf/experimental/mirmon.conf create mode 100644 conf/releases/g.mirrors.extra create mode 100644 conf/releases/mirmon.conf create mode 100644 conf/rsync/g.mirrors.extra create mode 100644 conf/rsync/mirmon.conf create mode 100644 conf/snapshots/g.mirrors.extra create mode 100644 conf/snapshots/mirmon.conf delete mode 100644 distfiles_mirrors/g.mirrors.extra delete mode 100644 distfiles_mirrors/mirmon.conf delete mode 100644 experimental_mirrors/g.mirrors.extra delete mode 100644 experimental_mirrors/mirmon.conf delete mode 100644 releases_mirrors/g.mirrors.extra delete mode 100644 releases_mirrors/mirmon.conf delete mode 100644 rsync_mirrors/g.mirrors.extra delete mode 100644 rsync_mirrors/mirmon.conf delete mode 100644 snapshots_mirrors/g.mirrors.extra delete mode 100644 snapshots_mirrors/mirmon.conf diff --git a/conf/distfiles/g.mirrors.extra b/conf/distfiles/g.mirrors.extra new file mode 100644 index 0000000..75c3d12 --- /dev/null +++ b/conf/distfiles/g.mirrors.extra @@ -0,0 +1 @@ +gentoo http://distfiles.gentoo.org/ diff --git a/conf/distfiles/mirmon.conf b/conf/distfiles/mirmon.conf new file mode 100644 index 0000000..ab0cb66 --- /dev/null +++ b/conf/distfiles/mirmon.conf @@ -0,0 +1,23 @@ +project_name Gentoo Linux (distfiles) +web_page /var/www/mirrorstats.gentoo.org/htdocs/distfiles/index-wip.html +icons ../icons +countries /var/www/mirrorstats.gentoo.org/mirmon/countries.list +mirror_list /var/www/mirrorstats.gentoo.org/var/distfiles/g.mirrors +state /var/www/mirrorstats.gentoo.org/var/distfiles/mirmon.state +probe /var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/probe-mirmon %TIMEOUT% %URL%distfiles/timestamp.mirmon +project_url ///www.gentoo.org/ +project_logo ///www.gentoo.org/assets/img/logo/gentoo-3d-small.png + + +# Fresh: 0 - 8h +# Oldish: 8 - 24h +# Old: 24h - inf +# Bad: No reachable, no state saved + +max_poll 4h +min_sync 4h +max_sync 20h + +put_histo top +timeout 30 + diff --git a/conf/experimental/g.mirrors.extra b/conf/experimental/g.mirrors.extra new file mode 100644 index 0000000..75c3d12 --- /dev/null +++ b/conf/experimental/g.mirrors.extra @@ -0,0 +1 @@ +gentoo http://distfiles.gentoo.org/ diff --git a/conf/experimental/mirmon.conf b/conf/experimental/mirmon.conf new file mode 100644 index 0000000..dbce73d --- /dev/null +++ b/conf/experimental/mirmon.conf @@ -0,0 +1,23 @@ +project_name Gentoo Linux (experimental) +web_page /var/www/mirrorstats.gentoo.org/htdocs/experimental/index-wip.html +icons ../icons +countries /var/www/mirrorstats.gentoo.org/mirmon/countries.list +mirror_list /var/www/mirrorstats.gentoo.org/var/experimental/g.mirrors +state /var/www/mirrorstats.gentoo.org/var/experimental/mirmon.state +probe /var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/probe-mirmon %TIMEOUT% %URL%experimental/.timestamp-experimental.x +project_url ///www.gentoo.org/ +project_logo ///www.gentoo.org/assets/img/logo/gentoo-3d-small.png + + +# Fresh: 0 - 8h +# Oldish: 8 - 24h +# Old: 24h - inf +# Bad: No reachable, no state saved + +max_poll 4h +min_sync 4h +max_sync 20h + +put_histo top +timeout 30 + diff --git a/conf/releases/g.mirrors.extra b/conf/releases/g.mirrors.extra new file mode 100644 index 0000000..75c3d12 --- /dev/null +++ b/conf/releases/g.mirrors.extra @@ -0,0 +1 @@ +gentoo http://distfiles.gentoo.org/ diff --git a/conf/releases/mirmon.conf b/conf/releases/mirmon.conf new file mode 100644 index 0000000..66201e6 --- /dev/null +++ b/conf/releases/mirmon.conf @@ -0,0 +1,23 @@ +project_name Gentoo Linux (releases) +web_page /var/www/mirrorstats.gentoo.org/htdocs/releases/index-wip.html +icons ../icons +countries /var/www/mirrorstats.gentoo.org/mirmon/countries.list +mirror_list /var/www/mirrorstats.gentoo.org/var/releases/g.mirrors +state /var/www/mirrorstats.gentoo.org/var/releases/mirmon.state +probe /var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/probe-mirmon %TIMEOUT% %URL%releases/.timestamp-releases.x +project_url ///www.gentoo.org/ +project_logo ///www.gentoo.org/assets/img/logo/gentoo-3d-small.png + + +# Fresh: 0 - 8h +# Oldish: 8 - 24h +# Old: 24h - inf +# Bad: No reachable, no state saved + +max_poll 4h +min_sync 4h +max_sync 20h + +put_histo top +timeout 30 + diff --git a/conf/rsync/g.mirrors.extra b/conf/rsync/g.mirrors.extra new file mode 100644 index 0000000..75a1939 --- /dev/null +++ b/conf/rsync/g.mirrors.extra @@ -0,0 +1,6 @@ +gentoo rsync://albatross.gentoo.org/ +gentoo rsync://boobie.gentoo.org/ +gentoo rsync://dipper.gentoo.org/ +gentoo rsync://quetzal.gentoo.org/ +gentoo rsync://starling.gentoo.org/ +gentoo rsync://swan.gentoo.org/ diff --git a/conf/rsync/mirmon.conf b/conf/rsync/mirmon.conf new file mode 100644 index 0000000..bc5904d --- /dev/null +++ b/conf/rsync/mirmon.conf @@ -0,0 +1,23 @@ +project_name Gentoo Linux (rsync) +web_page /var/www/mirrorstats.gentoo.org/htdocs/rsync/index-wip.html +icons ../icons +countries /var/www/mirrorstats.gentoo.org/mirmon/countries.list +mirror_list /var/www/mirrorstats.gentoo.org/var/rsync/g.mirrors +state /var/www/mirrorstats.gentoo.org/var/rsync/mirmon.state +probe /var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/probe-mirmon %TIMEOUT% %URL%gentoo-portage/metadata/timestamp +project_url ///www.gentoo.org/ +project_logo ///www.gentoo.org/assets/img/logo/gentoo-3d-small.png + + +# Fresh: 0 - 1h +# Oldish: 8 - 24h +# Old: 24h - inf +# Bad: No reachable, no state saved + +max_poll 60m +min_sync 30m +max_sync 30m + +put_histo top +timeout 30 + diff --git a/conf/snapshots/g.mirrors.extra b/conf/snapshots/g.mirrors.extra new file mode 100644 index 0000000..75c3d12 --- /dev/null +++ b/conf/snapshots/g.mirrors.extra @@ -0,0 +1 @@ +gentoo http://distfiles.gentoo.org/ diff --git a/conf/snapshots/mirmon.conf b/conf/snapshots/mirmon.conf new file mode 100644 index 0000000..41840c0 --- /dev/null +++ b/conf/snapshots/mirmon.conf @@ -0,0 +1,22 @@ +project_name Gentoo Linux (snapshots) +web_page /var/www/mirrorstats.gentoo.org/htdocs/snapshots/index-wip.html +icons ../icons +countries /var/www/mirrorstats.gentoo.org/mirmon/countries.list +mirror_list /var/www/mirrorstats.gentoo.org/var/snapshots/g.mirrors +state /var/www/mirrorstats.gentoo.org/var/snapshots/mirmon.state +probe /var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/probe-mirmon %TIMEOUT% %URL%snapshots/.timestamp-snapshots.x +project_url ///www.gentoo.org/ +project_logo ///www.gentoo.org/assets/img/logo/gentoo-3d-small.png + +# Fresh: 0 - 8h +# Oldish: 8 - 24h +# Old: 24h - inf +# Bad: No reachable, no state saved + +max_poll 4h +min_sync 4h +max_sync 20h + +put_histo top +timeout 30 + diff --git a/distfiles_mirrors/g.mirrors.extra b/distfiles_mirrors/g.mirrors.extra deleted file mode 100644 index 75c3d12..0000000 --- a/distfiles_mirrors/g.mirrors.extra +++ /dev/null @@ -1 +0,0 @@ -gentoo http://distfiles.gentoo.org/ diff --git a/distfiles_mirrors/mirmon.conf b/distfiles_mirrors/mirmon.conf deleted file mode 100644 index ab0cb66..0000000 --- a/distfiles_mirrors/mirmon.conf +++ /dev/null @@ -1,23 +0,0 @@ -project_name Gentoo Linux (distfiles) -web_page /var/www/mirrorstats.gentoo.org/htdocs/distfiles/index-wip.html -icons ../icons -countries /var/www/mirrorstats.gentoo.org/mirmon/countries.list -mirror_list /var/www/mirrorstats.gentoo.org/var/distfiles/g.mirrors -state /var/www/mirrorstats.gentoo.org/var/distfiles/mirmon.state -probe /var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/probe-mirmon %TIMEOUT% %URL%distfiles/timestamp.mirmon -project_url ///www.gentoo.org/ -project_logo ///www.gentoo.org/assets/img/logo/gentoo-3d-small.png - - -# Fresh: 0 - 8h -# Oldish: 8 - 24h -# Old: 24h - inf -# Bad: No reachable, no state saved - -max_poll 4h -min_sync 4h -max_sync 20h - -put_histo top -timeout 30 - diff --git a/experimental_mirrors/g.mirrors.extra b/experimental_mirrors/g.mirrors.extra deleted file mode 100644 index 75c3d12..0000000 --- a/experimental_mirrors/g.mirrors.extra +++ /dev/null @@ -1 +0,0 @@ -gentoo http://distfiles.gentoo.org/ diff --git a/experimental_mirrors/mirmon.conf b/experimental_mirrors/mirmon.conf deleted file mode 100644 index dbce73d..0000000 --- a/experimental_mirrors/mirmon.conf +++ /dev/null @@ -1,23 +0,0 @@ -project_name Gentoo Linux (experimental) -web_page /var/www/mirrorstats.gentoo.org/htdocs/experimental/index-wip.html -icons ../icons -countries /var/www/mirrorstats.gentoo.org/mirmon/countries.list -mirror_list /var/www/mirrorstats.gentoo.org/var/experimental/g.mirrors -state /var/www/mirrorstats.gentoo.org/var/experimental/mirmon.state -probe /var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/probe-mirmon %TIMEOUT% %URL%experimental/.timestamp-experimental.x -project_url ///www.gentoo.org/ -project_logo ///www.gentoo.org/assets/img/logo/gentoo-3d-small.png - - -# Fresh: 0 - 8h -# Oldish: 8 - 24h -# Old: 24h - inf -# Bad: No reachable, no state saved - -max_poll 4h -min_sync 4h -max_sync 20h - -put_histo top -timeout 30 - diff --git a/mirmon-wrapper.sh b/mirmon-wrapper.sh index 2c50369..4c5570b 100755 --- a/mirmon-wrapper.sh +++ b/mirmon-wrapper.sh @@ -26,13 +26,13 @@ die() { main() { SITEDIR=/var/www/mirrorstats.gentoo.org REPODIR=${SITEDIR}/gentoo-mirrorstats/ - MODEDIR=${REPODIR}/${MODE}_mirrors/ + CONFDIR=${REPODIR}/conf/${MODE}/ VARDIR=${SITEDIR}/var/${MODE} HTDOCS=${SITEDIR}/htdocs/${MODE} MIRMON=$(readlink -f "${SITEDIR}"/mirmon/mirmon) - CONFFILE=$(readlink -f "${MODEDIR}"/mirmon.conf) + CONFFILE=$(readlink -f "${CONFDIR}"/mirmon.conf) VAR_GMIRRORS=${VARDIR}/g.mirrors - EXTRA_MIRRORS=${MODEDIR}/g.mirrors.extra + EXTRA_MIRRORS=${CONFDIR}/g.mirrors.extra # Grab mirrors from the web mkdir -p "${VARDIR}" "${HTDOCS}" || die "Failed to mkdir" diff --git a/releases_mirrors/g.mirrors.extra b/releases_mirrors/g.mirrors.extra deleted file mode 100644 index 75c3d12..0000000 --- a/releases_mirrors/g.mirrors.extra +++ /dev/null @@ -1 +0,0 @@ -gentoo http://distfiles.gentoo.org/ diff --git a/releases_mirrors/mirmon.conf b/releases_mirrors/mirmon.conf deleted file mode 100644 index 66201e6..0000000 --- a/releases_mirrors/mirmon.conf +++ /dev/null @@ -1,23 +0,0 @@ -project_name Gentoo Linux (releases) -web_page /var/www/mirrorstats.gentoo.org/htdocs/releases/index-wip.html -icons ../icons -countries /var/www/mirrorstats.gentoo.org/mirmon/countries.list -mirror_list /var/www/mirrorstats.gentoo.org/var/releases/g.mirrors -state /var/www/mirrorstats.gentoo.org/var/releases/mirmon.state -probe /var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/probe-mirmon %TIMEOUT% %URL%releases/.timestamp-releases.x -project_url ///www.gentoo.org/ -project_logo ///www.gentoo.org/assets/img/logo/gentoo-3d-small.png - - -# Fresh: 0 - 8h -# Oldish: 8 - 24h -# Old: 24h - inf -# Bad: No reachable, no state saved - -max_poll 4h -min_sync 4h -max_sync 20h - -put_histo top -timeout 30 - diff --git a/rsync_mirrors/g.mirrors.extra b/rsync_mirrors/g.mirrors.extra deleted file mode 100644 index 75a1939..0000000 --- a/rsync_mirrors/g.mirrors.extra +++ /dev/null @@ -1,6 +0,0 @@ -gentoo rsync://albatross.gentoo.org/ -gentoo rsync://boobie.gentoo.org/ -gentoo rsync://dipper.gentoo.org/ -gentoo rsync://quetzal.gentoo.org/ -gentoo rsync://starling.gentoo.org/ -gentoo rsync://swan.gentoo.org/ diff --git a/rsync_mirrors/mirmon.conf b/rsync_mirrors/mirmon.conf deleted file mode 100644 index bc5904d..0000000 --- a/rsync_mirrors/mirmon.conf +++ /dev/null @@ -1,23 +0,0 @@ -project_name Gentoo Linux (rsync) -web_page /var/www/mirrorstats.gentoo.org/htdocs/rsync/index-wip.html -icons ../icons -countries /var/www/mirrorstats.gentoo.org/mirmon/countries.list -mirror_list /var/www/mirrorstats.gentoo.org/var/rsync/g.mirrors -state /var/www/mirrorstats.gentoo.org/var/rsync/mirmon.state -probe /var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/probe-mirmon %TIMEOUT% %URL%gentoo-portage/metadata/timestamp -project_url ///www.gentoo.org/ -project_logo ///www.gentoo.org/assets/img/logo/gentoo-3d-small.png - - -# Fresh: 0 - 1h -# Oldish: 8 - 24h -# Old: 24h - inf -# Bad: No reachable, no state saved - -max_poll 60m -min_sync 30m -max_sync 30m - -put_histo top -timeout 30 - diff --git a/snapshots_mirrors/g.mirrors.extra b/snapshots_mirrors/g.mirrors.extra deleted file mode 100644 index 75c3d12..0000000 --- a/snapshots_mirrors/g.mirrors.extra +++ /dev/null @@ -1 +0,0 @@ -gentoo http://distfiles.gentoo.org/ diff --git a/snapshots_mirrors/mirmon.conf b/snapshots_mirrors/mirmon.conf deleted file mode 100644 index 41840c0..0000000 --- a/snapshots_mirrors/mirmon.conf +++ /dev/null @@ -1,22 +0,0 @@ -project_name Gentoo Linux (snapshots) -web_page /var/www/mirrorstats.gentoo.org/htdocs/snapshots/index-wip.html -icons ../icons -countries /var/www/mirrorstats.gentoo.org/mirmon/countries.list -mirror_list /var/www/mirrorstats.gentoo.org/var/snapshots/g.mirrors -state /var/www/mirrorstats.gentoo.org/var/snapshots/mirmon.state -probe /var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/probe-mirmon %TIMEOUT% %URL%snapshots/.timestamp-snapshots.x -project_url ///www.gentoo.org/ -project_logo ///www.gentoo.org/assets/img/logo/gentoo-3d-small.png - -# Fresh: 0 - 8h -# Oldish: 8 - 24h -# Old: 24h - inf -# Bad: No reachable, no state saved - -max_poll 4h -min_sync 4h -max_sync 20h - -put_histo top -timeout 30 - diff --git a/validation/mirror-validate.sh b/validation/mirror-validate.sh index e5348ec..8d50ad7 100755 --- a/validation/mirror-validate.sh +++ b/validation/mirror-validate.sh @@ -9,12 +9,19 @@ . /etc/init.d/functions.sh -if [[ $1 != "distfiles" ]] && [[ $1 != "rsync" ]]; then - echo "Need to specify distfiles or rsync" +case $1 in + distfiles) ;; + rsync) ;; + releases) ;; + snapshots) ;; + experimental) ;; + *) + echo "Need to specify valid mode" 1>&2 exit 1 -fi + ;; +esac -STATE_FILE="/var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/$1_mirrors/var/mirmon.state" +STATE_FILE="/var/www/mirrorstats.gentoo.org/var/$1/mirmon.state" count_bad_status() { BAD_STATUS_COUNT=0 -- cgit v1.2.3-65-gdbad