commit: 354c8ccd31a81616c408e6558f5f50907abd0abe
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 29 05:47:59 2020 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Apr 29 05:47:59 2020 +0000
URL:
https://gitweb.gentoo.org/proj/gentoo-mirrorstats.git/commit/?id=354c8ccd
Update config location
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
{distfiles_mirrors => conf/distfiles}/g.mirrors.extra | 0
{distfiles_mirrors => conf/distfiles}/mirmon.conf | 0
.../experimental}/g.mirrors.extra | 0
{experimental_mirrors => conf/experimental}/mirmon.conf | 0
{releases_mirrors => conf/releases}/g.mirrors.extra | 0
{releases_mirrors => conf/releases}/mirmon.conf | 0
{rsync_mirrors => conf/rsync}/g.mirrors.extra | 0
{rsync_mirrors => conf/rsync}/mirmon.conf | 0
{snapshots_mirrors => conf/snapshots}/g.mirrors.extra | 0
{snapshots_mirrors => conf/snapshots}/mirmon.conf | 0
mirmon-wrapper.sh | 6 +++---
validation/mirror-validate.sh | 15 +++++++++++----
12 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/distfiles_mirrors/g.mirrors.extra b/conf/distfiles/g.mirrors.extra
similarity index 100%
rename from distfiles_mirrors/g.mirrors.extra
rename to conf/distfiles/g.mirrors.extra
diff --git a/distfiles_mirrors/mirmon.conf b/conf/distfiles/mirmon.conf
similarity index 100%
rename from distfiles_mirrors/mirmon.conf
rename to conf/distfiles/mirmon.conf
diff --git a/experimental_mirrors/g.mirrors.extra
b/conf/experimental/g.mirrors.extra
similarity index 100%
rename from experimental_mirrors/g.mirrors.extra
rename to conf/experimental/g.mirrors.extra
diff --git a/experimental_mirrors/mirmon.conf b/conf/experimental/mirmon.conf
similarity index 100%
rename from experimental_mirrors/mirmon.conf
rename to conf/experimental/mirmon.conf
diff --git a/releases_mirrors/g.mirrors.extra b/conf/releases/g.mirrors.extra
similarity index 100%
rename from releases_mirrors/g.mirrors.extra
rename to conf/releases/g.mirrors.extra
diff --git a/releases_mirrors/mirmon.conf b/conf/releases/mirmon.conf
similarity index 100%
rename from releases_mirrors/mirmon.conf
rename to conf/releases/mirmon.conf
diff --git a/rsync_mirrors/g.mirrors.extra b/conf/rsync/g.mirrors.extra
similarity index 100%
rename from rsync_mirrors/g.mirrors.extra
rename to conf/rsync/g.mirrors.extra
diff --git a/rsync_mirrors/mirmon.conf b/conf/rsync/mirmon.conf
similarity index 100%
rename from rsync_mirrors/mirmon.conf
rename to conf/rsync/mirmon.conf
diff --git a/snapshots_mirrors/g.mirrors.extra b/conf/snapshots/g.mirrors.extra
similarity index 100%
rename from snapshots_mirrors/g.mirrors.extra
rename to conf/snapshots/g.mirrors.extra
diff --git a/snapshots_mirrors/mirmon.conf b/conf/snapshots/mirmon.conf
similarity index 100%
rename from snapshots_mirrors/mirmon.conf
rename to conf/snapshots/mirmon.conf
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/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
