1 |
commit: 6925ffcc3d6adef82c582c9d895878bf219a2260 |
2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Apr 29 05:20:09 2020 +0000 |
4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Apr 29 05:20:09 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/gentoo-mirrorstats.git/commit/?id=6925ffcc |
7 |
|
8 |
switch to new refactored scripts |
9 |
|
10 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
11 |
|
12 |
distfiles_mirrors/mirmon.conf | 8 ++++---- |
13 |
experimental_mirrors/mirmon.conf | 8 ++++---- |
14 |
mirmon-distfiles.sh | 21 ++++----------------- |
15 |
mirmon-experimental.sh | 21 ++++----------------- |
16 |
mirmon-releases.sh | 21 ++++----------------- |
17 |
mirmon-rsync.sh | 34 ++++------------------------------ |
18 |
releases_mirrors/mirmon.conf | 8 ++++---- |
19 |
rsync_mirrors/g.mirrors.extra | 6 ++++++ |
20 |
rsync_mirrors/mirmon.conf | 8 ++++---- |
21 |
snapshots_mirrors/mirmon.conf | 3 +-- |
22 |
10 files changed, 39 insertions(+), 99 deletions(-) |
23 |
|
24 |
diff --git a/distfiles_mirrors/mirmon.conf b/distfiles_mirrors/mirmon.conf |
25 |
index fa2ab1b..ab0cb66 100644 |
26 |
--- a/distfiles_mirrors/mirmon.conf |
27 |
+++ b/distfiles_mirrors/mirmon.conf |
28 |
@@ -2,11 +2,11 @@ project_name Gentoo Linux (distfiles) |
29 |
web_page /var/www/mirrorstats.gentoo.org/htdocs/distfiles/index-wip.html |
30 |
icons ../icons |
31 |
countries /var/www/mirrorstats.gentoo.org/mirmon/countries.list |
32 |
-mirror_list /var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/distfiles_mirrors/var/g.mirrors |
33 |
-state /var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/distfiles_mirrors/var/mirmon.state |
34 |
+mirror_list /var/www/mirrorstats.gentoo.org/var/distfiles/g.mirrors |
35 |
+state /var/www/mirrorstats.gentoo.org/var/distfiles/mirmon.state |
36 |
probe /var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/probe-mirmon %TIMEOUT% %URL%distfiles/timestamp.mirmon |
37 |
-project_url http://www.gentoo.org/ |
38 |
-project_logo http://www.gentoo.org/images/gentoo-new.gif |
39 |
+project_url ///www.gentoo.org/ |
40 |
+project_logo ///www.gentoo.org/assets/img/logo/gentoo-3d-small.png |
41 |
|
42 |
|
43 |
# Fresh: 0 - 8h |
44 |
|
45 |
diff --git a/experimental_mirrors/mirmon.conf b/experimental_mirrors/mirmon.conf |
46 |
index b27bea0..dbce73d 100644 |
47 |
--- a/experimental_mirrors/mirmon.conf |
48 |
+++ b/experimental_mirrors/mirmon.conf |
49 |
@@ -2,11 +2,11 @@ project_name Gentoo Linux (experimental) |
50 |
web_page /var/www/mirrorstats.gentoo.org/htdocs/experimental/index-wip.html |
51 |
icons ../icons |
52 |
countries /var/www/mirrorstats.gentoo.org/mirmon/countries.list |
53 |
-mirror_list /var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/experimental_mirrors/var/g.mirrors |
54 |
-state /var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/experimental_mirrors/var/mirmon.state |
55 |
+mirror_list /var/www/mirrorstats.gentoo.org/var/experimental/g.mirrors |
56 |
+state /var/www/mirrorstats.gentoo.org/var/experimental/mirmon.state |
57 |
probe /var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/probe-mirmon %TIMEOUT% %URL%experimental/.timestamp-experimental.x |
58 |
-project_url http://www.gentoo.org/ |
59 |
-project_logo http://www.gentoo.org/images/gentoo-new.gif |
60 |
+project_url ///www.gentoo.org/ |
61 |
+project_logo ///www.gentoo.org/assets/img/logo/gentoo-3d-small.png |
62 |
|
63 |
|
64 |
# Fresh: 0 - 8h |
65 |
|
66 |
diff --git a/mirmon-distfiles.sh b/mirmon-distfiles.sh |
67 |
index 5738c99..0a245e2 100755 |
68 |
--- a/mirmon-distfiles.sh |
69 |
+++ b/mirmon-distfiles.sh |
70 |
@@ -1,18 +1,5 @@ |
71 |
#!/bin/bash |
72 |
- |
73 |
-cd /var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/distfiles_mirrors |
74 |
-# Grab mirrors from the web |
75 |
-[[ -d ./var ]] || mkdir ./var |
76 |
-../get-mirrors-from-distfiles-xml.rb > ./var/g.mirrors |
77 |
-# fatal if the state file is NOT present. |
78 |
-[[ -e ./var/mirmon.state ]] || touch ./var/mirmon.state |
79 |
-# run mirmon |
80 |
-/usr/bin/perl ../../mirmon/mirmon -c ./mirmon.conf -q -get update |
81 |
-# Set up a nice link to our mirror page directly: |
82 |
-[[ -d ../../htdocs/distfiles ]] || mkdir ../../htdocs/distfiles |
83 |
-sed \ |
84 |
- -e 's#mirrors</H2>#<a href="http://www.gentoo.org/main/en/mirrors2.xml">mirrors</a></H2>#' \ |
85 |
- >../../htdocs/distfiles/index.html <../../htdocs/distfiles/index-wip.html |
86 |
-# Generate a json file containing the state of each mirror |
87 |
-..//generate-json.py /var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/distfiles_mirrors/var/mirmon.state \ |
88 |
- > ../../htdocs/distfiles/state.json |
89 |
+exec $(dirname "$0")/mirmon-wrapper.sh \ |
90 |
+ --mode=distfiles \ |
91 |
+ --xml-src=distfiles \ |
92 |
+ --url=https://www.gentoo.org/downloads/mirrors/ |
93 |
|
94 |
diff --git a/mirmon-experimental.sh b/mirmon-experimental.sh |
95 |
index 5b671bf..a48d57f 100755 |
96 |
--- a/mirmon-experimental.sh |
97 |
+++ b/mirmon-experimental.sh |
98 |
@@ -1,18 +1,5 @@ |
99 |
#!/bin/bash |
100 |
- |
101 |
-cd /var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/experimental_mirrors |
102 |
-# Grab mirrors from the web |
103 |
-[[ -d ./var ]] || mkdir ./var |
104 |
-../get-mirrors-from-distfiles-xml.rb > ./var/g.mirrors |
105 |
-# fatal if the state file is NOT present. |
106 |
-[[ -e ./var/mirmon.state ]] || touch ./var/mirmon.state |
107 |
-# run mirmon |
108 |
-/usr/bin/perl ../../mirmon/mirmon -c ./mirmon.conf -q -get update |
109 |
-# Set up a nice link to our mirror page directly: |
110 |
-[[ -d ../../htdocs/experimental ]] || mkdir ../../htdocs/experimental |
111 |
-sed \ |
112 |
- -e 's#mirrors</H2>#<a href="http://www.gentoo.org/main/en/mirrors2.xml">mirrors</a></H2>#' \ |
113 |
- >../../htdocs/experimental/index.html <../../htdocs/experimental/index-wip.html |
114 |
-# Generate a json file containing the state of each mirror |
115 |
-..//generate-json.py /var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/experimental_mirrors/var/mirmon.state \ |
116 |
- > ../../htdocs/experimental/state.json |
117 |
+exec $(dirname "$0")/mirmon-wrapper.sh \ |
118 |
+ --mode=experimental \ |
119 |
+ --xml-src=distfiles \ |
120 |
+ --url=https://www.gentoo.org/downloads/mirrors/ |
121 |
|
122 |
diff --git a/mirmon-releases.sh b/mirmon-releases.sh |
123 |
index bbd5640..4839856 100755 |
124 |
--- a/mirmon-releases.sh |
125 |
+++ b/mirmon-releases.sh |
126 |
@@ -1,18 +1,5 @@ |
127 |
#!/bin/bash |
128 |
- |
129 |
-cd /var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/releases_mirrors |
130 |
-# Grab mirrors from the web |
131 |
-[[ -d ./var ]] || mkdir ./var |
132 |
-../get-mirrors-from-distfiles-xml.rb > ./var/g.mirrors |
133 |
-# fatal if the state file is NOT present. |
134 |
-[[ -e ./var/mirmon.state ]] || touch ./var/mirmon.state |
135 |
-# run mirmon |
136 |
-/usr/bin/perl ../../mirmon/mirmon -c ./mirmon.conf -q -get update |
137 |
-# Set up a nice link to our mirror page directly: |
138 |
-[[ -d ../../htdocs/releases ]] || mkdir ../../htdocs/releases |
139 |
-sed \ |
140 |
- -e 's#mirrors</H2>#<a href="http://www.gentoo.org/main/en/mirrors2.xml">mirrors</a></H2>#' \ |
141 |
- >../../htdocs/releases/index.html <../../htdocs/releases/index-wip.html |
142 |
-# Generate a json file containing the state of each mirror |
143 |
-..//generate-json.py /var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/releases_mirrors/var/mirmon.state \ |
144 |
- > ../../htdocs/releases/state.json |
145 |
+exec $(dirname "$0")/mirmon-wrapper.sh \ |
146 |
+ --mode=releases \ |
147 |
+ --xml-src=distfiles \ |
148 |
+ --url=https://www.gentoo.org/downloads/mirrors/ |
149 |
|
150 |
diff --git a/mirmon-rsync.sh b/mirmon-rsync.sh |
151 |
index 0f37f78..d97e149 100755 |
152 |
--- a/mirmon-rsync.sh |
153 |
+++ b/mirmon-rsync.sh |
154 |
@@ -1,31 +1,5 @@ |
155 |
#!/bin/bash |
156 |
- |
157 |
-INFRA=" |
158 |
-albatross |
159 |
-boobie |
160 |
-dipper |
161 |
-quetzal |
162 |
-starling |
163 |
-swan |
164 |
-" |
165 |
- |
166 |
-cd /var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/rsync_mirrors |
167 |
-# Grab mirrors from the web |
168 |
-[[ -d ./var ]] || mkdir ./var |
169 |
-../get-mirrors-from-rsync-xml.rb > ./var/g.mirrors |
170 |
-# infra mirrors, "manually added" to list to check |
171 |
-for i in ${INFRA}; do |
172 |
- echo "gentoo rsync://$i.gentoo.org/" >> ./var/g.mirrors |
173 |
-done |
174 |
-# fatal if the state file is NOT present. |
175 |
-[[ -e ./var/mirmon.state ]] || touch ./var/mirmon.state |
176 |
-# run mirmon |
177 |
-/usr/bin/perl ../../mirmon/mirmon -c ./mirmon.conf -q -get update |
178 |
-[[ -d ../../htdocs/rsync ]] || mkdir ../../htdocs/rsync |
179 |
-# Set up a nice link to our mirror page directly: |
180 |
-sed \ |
181 |
- -e 's#mirrors</H2>#<a href="http://www.gentoo.org/main/en/mirrors-rsync.xml">mirrors</a></H2>#' \ |
182 |
- >../../htdocs/rsync/index.html <../../htdocs/rsync/index-wip.html |
183 |
-# Generate a json file containing the state of each mirror |
184 |
-..//generate-json.py /var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/rsync_mirrors/var/mirmon.state \ |
185 |
- > ../../htdocs/rsync/state.json |
186 |
+exec $(dirname "$0")/mirmon-wrapper.sh \ |
187 |
+ --mode=rsync \ |
188 |
+ --xml-src=rsync \ |
189 |
+ --url=https://www.gentoo.org/support/rsync-mirrors/ |
190 |
|
191 |
diff --git a/releases_mirrors/mirmon.conf b/releases_mirrors/mirmon.conf |
192 |
index 45b55e0..66201e6 100644 |
193 |
--- a/releases_mirrors/mirmon.conf |
194 |
+++ b/releases_mirrors/mirmon.conf |
195 |
@@ -2,11 +2,11 @@ project_name Gentoo Linux (releases) |
196 |
web_page /var/www/mirrorstats.gentoo.org/htdocs/releases/index-wip.html |
197 |
icons ../icons |
198 |
countries /var/www/mirrorstats.gentoo.org/mirmon/countries.list |
199 |
-mirror_list /var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/releases_mirrors/var/g.mirrors |
200 |
-state /var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/releases_mirrors/var/mirmon.state |
201 |
+mirror_list /var/www/mirrorstats.gentoo.org/var/releases/g.mirrors |
202 |
+state /var/www/mirrorstats.gentoo.org/var/releases/mirmon.state |
203 |
probe /var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/probe-mirmon %TIMEOUT% %URL%releases/.timestamp-releases.x |
204 |
-project_url http://www.gentoo.org/ |
205 |
-project_logo http://www.gentoo.org/images/gentoo-new.gif |
206 |
+project_url ///www.gentoo.org/ |
207 |
+project_logo ///www.gentoo.org/assets/img/logo/gentoo-3d-small.png |
208 |
|
209 |
|
210 |
# Fresh: 0 - 8h |
211 |
|
212 |
diff --git a/rsync_mirrors/g.mirrors.extra b/rsync_mirrors/g.mirrors.extra |
213 |
new file mode 100644 |
214 |
index 0000000..340865c |
215 |
--- /dev/null |
216 |
+++ b/rsync_mirrors/g.mirrors.extra |
217 |
@@ -0,0 +1,6 @@ |
218 |
+gentoo rsync://albatross.gentoo.org |
219 |
+gentoo rsync://boobie.gentoo.org |
220 |
+gentoo rsync://dipper.gentoo.org |
221 |
+gentoo rsync://quetzal.gentoo.org |
222 |
+gentoo rsync://starling.gentoo.org |
223 |
+gentoo rsync://swan.gentoo.org |
224 |
|
225 |
diff --git a/rsync_mirrors/mirmon.conf b/rsync_mirrors/mirmon.conf |
226 |
index d285f8d..bc5904d 100644 |
227 |
--- a/rsync_mirrors/mirmon.conf |
228 |
+++ b/rsync_mirrors/mirmon.conf |
229 |
@@ -2,11 +2,11 @@ project_name Gentoo Linux (rsync) |
230 |
web_page /var/www/mirrorstats.gentoo.org/htdocs/rsync/index-wip.html |
231 |
icons ../icons |
232 |
countries /var/www/mirrorstats.gentoo.org/mirmon/countries.list |
233 |
-mirror_list /var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/rsync_mirrors/var/g.mirrors |
234 |
-state /var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/rsync_mirrors/var/mirmon.state |
235 |
+mirror_list /var/www/mirrorstats.gentoo.org/var/rsync/g.mirrors |
236 |
+state /var/www/mirrorstats.gentoo.org/var/rsync/mirmon.state |
237 |
probe /var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/probe-mirmon %TIMEOUT% %URL%gentoo-portage/metadata/timestamp |
238 |
-project_url http://www.gentoo.org/ |
239 |
-project_logo http://www.gentoo.org/images/gentoo-new.gif |
240 |
+project_url ///www.gentoo.org/ |
241 |
+project_logo ///www.gentoo.org/assets/img/logo/gentoo-3d-small.png |
242 |
|
243 |
|
244 |
# Fresh: 0 - 1h |
245 |
|
246 |
diff --git a/snapshots_mirrors/mirmon.conf b/snapshots_mirrors/mirmon.conf |
247 |
index 846b994..41840c0 100644 |
248 |
--- a/snapshots_mirrors/mirmon.conf |
249 |
+++ b/snapshots_mirrors/mirmon.conf |
250 |
@@ -6,8 +6,7 @@ mirror_list /var/www/mirrorstats.gentoo.org/var/snapshots/g.mirrors |
251 |
state /var/www/mirrorstats.gentoo.org/var/snapshots/mirmon.state |
252 |
probe /var/www/mirrorstats.gentoo.org/gentoo-mirrorstats/probe-mirmon %TIMEOUT% %URL%snapshots/.timestamp-snapshots.x |
253 |
project_url ///www.gentoo.org/ |
254 |
-project_logo ///www.gentoo.org/images/gentoo-new.gif |
255 |
- |
256 |
+project_logo ///www.gentoo.org/assets/img/logo/gentoo-3d-small.png |
257 |
|
258 |
# Fresh: 0 - 8h |
259 |
# Oldish: 8 - 24h |