diff options
| author | Dan McGee <dan@archlinux.org> | 2011-04-12 18:36:20 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-04-12 18:36:20 -0500 |
| commit | 78a553e558217640c0efa233ac7a7037be3f34b5 (patch) | |
| tree | dc042ef4ab8d52e93250e7d6b3a36b477cb86182 /templates | |
| parent | 064813560c20f53f9fd759d0c4e0f0a6729c8ba6 (diff) | |
| download | archweb-78a553e558217640c0efa233ac7a7037be3f34b5.tar.gz archweb-78a553e558217640c0efa233ac7a7037be3f34b5.zip | |
Add optional country override for individual mirror URLs
This allows a named top-level mirror to have geographically distributed
URLs, e.g. kernel.org and the geo-DNS setup.
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/mirrors/mirrorlist.txt | 2 | ||||
| -rw-r--r-- | templates/mirrors/mirrorlist_status.txt | 2 | ||||
| -rw-r--r-- | templates/mirrors/status.html | 2 | ||||
| -rw-r--r-- | templates/mirrors/status_table.html | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/templates/mirrors/mirrorlist.txt b/templates/mirrors/mirrorlist.txt index 2eedbd71..24b52fa1 100644 --- a/templates/mirrors/mirrorlist.txt +++ b/templates/mirrors/mirrorlist.txt @@ -8,6 +8,6 @@ content right, and then go back later to fix it all up. ## Generated on {% now "Y-m-d" %} ##{% for mirror_url in mirror_urls %}{% ifchanged %} -## {{ mirror_url.mirror.country }}{% endifchanged %} +## {{ mirror_url.real_country }}{% endifchanged %} #Server = {{ mirror_url.url}}$repo/os/$arch{% endfor %} {% endautoescape %} diff --git a/templates/mirrors/mirrorlist_status.txt b/templates/mirrors/mirrorlist_status.txt index e2fbc1e6..e3504395 100644 --- a/templates/mirrors/mirrorlist_status.txt +++ b/templates/mirrors/mirrorlist_status.txt @@ -8,6 +8,6 @@ content right, and then go back later to fix it all up. ## Sorted by mirror score from mirror status page ## Generated on {% now "Y-m-d" %} {% for mirror_url in mirror_urls %} -## Score: {{ mirror_url.score|floatformat:1|default:'unknown' }}, {{ mirror_url.mirror.country }} +## Score: {{ mirror_url.score|floatformat:1|default:'unknown' }}, {{ mirror_url.real_country }} #Server = {{ mirror_url.url}}$repo/os/$arch{% endfor %} {% endautoescape %} diff --git a/templates/mirrors/status.html b/templates/mirrors/status.html index 5724c71c..046c4196 100644 --- a/templates/mirrors/status.html +++ b/templates/mirrors/status.html @@ -91,7 +91,7 @@ <tr class="{% cycle 'odd' 'even' %}"> <td>{{ log.url__url }}</td> <td>{{ log.url__protocol__protocol }}</td> - <td>{{ log.url__mirror__country }}</td> + <td>{{ log.country }}</td> <td>{{ log.error }}</td> <td>{{ log.last_occurred|date:'Y-m-d H:i' }}</td> <td>{{ log.error_count }}</td> diff --git a/templates/mirrors/status_table.html b/templates/mirrors/status_table.html index 240a5452..72de25dc 100644 --- a/templates/mirrors/status_table.html +++ b/templates/mirrors/status_table.html @@ -18,7 +18,7 @@ <tr class="{% cycle 'odd' 'even' %}"> <td>{{ m_url.url }}</td> <td>{{ m_url.protocol }}</td> - <td>{{ m_url.mirror.country }}</td> + <td>{{ m_url.real_country }}</td> <td>{{ m_url.last_sync|date:'Y-m-d H:i'|default:'unknown' }}</td> <td>{{ m_url.completion_pct|percentage:1 }}</td> <td>{{ m_url.delay|duration|default:'unknown' }}</td> |