| 1 |
commit: 354c8ccd31a81616c408e6558f5f50907abd0abe |
| 2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Apr 29 05:47:59 2020 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Apr 29 05:47:59 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gentoo-mirrorstats.git/commit/?id=354c8ccd |
| 7 |
|
| 8 |
Update config location |
| 9 |
|
| 10 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
| 11 |
|
| 12 |
{distfiles_mirrors => conf/distfiles}/g.mirrors.extra | 0 |
| 13 |
{distfiles_mirrors => conf/distfiles}/mirmon.conf | 0 |
| 14 |
.../experimental}/g.mirrors.extra | 0 |
| 15 |
{experimental_mirrors => conf/experimental}/mirmon.conf | 0 |
| 16 |
{releases_mirrors => conf/releases}/g.mirrors.extra | 0 |
| 17 |
{releases_mirrors => conf/releases}/mirmon.conf | 0 |
| 18 |
{rsync_mirrors => conf/rsync}/g.mirrors.extra | 0 |
| 19 |
{rsync_mirrors => conf/rsync}/mirmon.conf | 0 |
| 20 |
{snapshots_mirrors => conf/snapshots}/g.mirrors.extra | 0 |
| 21 |
{snapshots_mirrors => conf/snapshots}/mirmon.conf | 0 |
| 22 |
mirmon-wrapper.sh | 6 +++--- |
| 23 |
validation/mirror-validate.sh | 15 +++++++++++---- |
| 24 |
12 files changed, 14 insertions(+), 7 deletions(-) |
| 25 |
|
| 26 |
diff --git a/distfiles_mirrors/g.mirrors.extra b/conf/distfiles/g.mirrors.extra |
| 27 |
similarity index 100% |
| 28 |
rename from distfiles_mirrors/g.mirrors.extra |
| 29 |
rename to conf/distfiles/g.mirrors.extra |
| 30 |
|
| 31 |
diff --git a/distfiles_mirrors/mirmon.conf b/conf/distfiles/mirmon.conf |
| 32 |
similarity index 100% |
| 33 |
rename from distfiles_mirrors/mirmon.conf |
| 34 |
rename to conf/distfiles/mirmon.conf |
| 35 |
|
| 36 |
diff --git a/experimental_mirrors/g.mirrors.extra b/conf/experimental/g.mirrors.extra |
| 37 |
similarity index 100% |
| 38 |
rename from experimental_mirrors/g.mirrors.extra |
| 39 |
rename to conf/experimental/g.mirrors.extra |
| 40 |
|
| 41 |
diff --git a/experimental_mirrors/mirmon.conf b/conf/experimental/mirmon.conf |
| 42 |
similarity index 100% |
| 43 |
rename from experimental_mirrors/mirmon.conf |
| 44 |
rename to conf/experimental/mirmon.conf |
| 45 |
|
| 46 |
diff --git a/releases_mirrors/g.mirrors.extra b/conf/releases/g.mirrors.extra |
| 47 |
similarity index 100% |
| 48 |
rename from releases_mirrors/g.mirrors.extra |
| 49 |
rename to conf/releases/g.mirrors.extra |
| 50 |
|
| 51 |
diff --git a/releases_mirrors/mirmon.conf b/conf/releases/mirmon.conf |
| 52 |
similarity index 100% |
| 53 |
rename from releases_mirrors/mirmon.conf |
| 54 |
rename to conf/releases/mirmon.conf |
| 55 |
|
| 56 |
diff --git a/rsync_mirrors/g.mirrors.extra b/conf/rsync/g.mirrors.extra |
| 57 |
similarity index 100% |
| 58 |
rename from rsync_mirrors/g.mirrors.extra |
| 59 |
rename to conf/rsync/g.mirrors.extra |
| 60 |
|
| 61 |
diff --git a/rsync_mirrors/mirmon.conf b/conf/rsync/mirmon.conf |
| 62 |
similarity index 100% |
| 63 |
rename from rsync_mirrors/mirmon.conf |
| 64 |
rename to conf/rsync/mirmon.conf |
| 65 |
|
| 66 |
diff --git a/snapshots_mirrors/g.mirrors.extra b/conf/snapshots/g.mirrors.extra |
| 67 |
similarity index 100% |
| 68 |
rename from snapshots_mirrors/g.mirrors.extra |
| 69 |
rename to conf/snapshots/g.mirrors.extra |
| 70 |
|
| 71 |
diff --git a/snapshots_mirrors/mirmon.conf b/conf/snapshots/mirmon.conf |
| 72 |
similarity index 100% |
| 73 |
rename from snapshots_mirrors/mirmon.conf |
| 74 |
rename to conf/snapshots/mirmon.conf |
| 75 |
|
| 76 |
diff --git a/mirmon-wrapper.sh b/mirmon-wrapper.sh |
| 77 |
index 2c50369..4c5570b 100755 |
| 78 |
--- a/mirmon-wrapper.sh |
| 79 |
+++ b/mirmon-wrapper.sh |
| 80 |
@@ -26,13 +26,13 @@ die() { |
| 81 |
main() { |
| 82 |
SITEDIR=/var/www/mirrorstats.gentoo.org |
| 83 |
REPODIR=${SITEDIR}/gentoo-mirrorstats/ |
| 84 |
- MODEDIR=${REPODIR}/${MODE}_mirrors/ |
| 85 |
+ CONFDIR=${REPODIR}/conf/${MODE}/ |
| 86 |
VARDIR=${SITEDIR}/var/${MODE} |
| 87 |
HTDOCS=${SITEDIR}/htdocs/${MODE} |
| 88 |
MIRMON=$(readlink -f "${SITEDIR}"/mirmon/mirmon) |
| 89 |
- CONFFILE=$(readlink -f "${MODEDIR}"/mirmon.conf) |
| 90 |
+ CONFFILE=$(readlink -f "${CONFDIR}"/mirmon.conf) |
| 91 |
VAR_GMIRRORS=${VARDIR}/g.mirrors |
| 92 |
- EXTRA_MIRRORS=${MODEDIR}/g.mirrors.extra |
| 93 |
+ EXTRA_MIRRORS=${CONFDIR}/g.mirrors.extra |
| 94 |
|
| 95 |
# Grab mirrors from the web |
| 96 |
mkdir -p "${VARDIR}" "${HTDOCS}" || die "Failed to mkdir" |
| 97 |
|
| 98 |
diff --git a/validation/mirror-validate.sh b/validation/mirror-validate.sh |
| 99 |
index e5348ec..8d50ad7 100755 |
| 100 |
--- a/validation/mirror-validate.sh |
| 101 |
+++ b/validation/mirror-validate.sh |
| 102 |
@@ -9,12 +9,19 @@ |
| 103 |
|
| 104 |
. /etc/init.d/functions.sh |
| 105 |
|
| 106 |
-if [[ $1 != "distfiles" ]] && [[ $1 != "rsync" ]]; then |
| 107 |
- echo "Need to specify distfiles or rsync" |
| 108 |
+case $1 in |
| 109 |
+ distfiles) ;; |
| 110 |
+ rsync) ;; |
| 111 |
+ releases) ;; |
| 112 |
+ snapshots) ;; |
| 113 |
+ experimental) ;; |
| 114 |
+ *) |
| 115 |
+ echo "Need to specify valid mode" 1>&2 |
| 116 |
exit 1 |
| 117 |
-fi |
| 118 |
+ ;; |
| 119 |
+esac |
| 120 |
|
| 121 |
-STATE_FILE="/var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/$1_mirrors/var/mirmon.state" |
| 122 |
+STATE_FILE="/var/www/mirrorstats.gentoo.org/var/$1/mirmon.state" |
| 123 |
|
| 124 |
count_bad_status() { |
| 125 |
BAD_STATUS_COUNT=0 |
Archives