This is an automated email from the ASF dual-hosted git repository.
sbp pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tooling-trusted-release.git
The following commit(s) were added to refs/heads/main by this push:
new b552354 Improve the style of the page to download a release
b552354 is described below
commit b55235458254e038db8a3a3902d5346b1a55197b
Author: Sean B. Palmer <[email protected]>
AuthorDate: Mon May 5 14:45:56 2025 +0100
Improve the style of the page to download a release
---
atr/templates/download-all.html | 6 ++--
atr/templates/user-ssh-keys.html | 59 ++++++++++++++++++++--------------------
2 files changed, 33 insertions(+), 32 deletions(-)
diff --git a/atr/templates/download-all.html b/atr/templates/download-all.html
index a88e0b6..28096e0 100644
--- a/atr/templates/download-all.html
+++ b/atr/templates/download-all.html
@@ -93,7 +93,7 @@
<h3 id="download-curl" class="mt-4">Using curl</h3>
<p>You can download all of the files in this release using curl with the
following command:</p>
<!-- TODO: Add a button to copy the command to the clipboard -->
- <pre class="bg-light p-3 mb-3">
+ <pre class="bg-light border rounded p-3 mb-3">
curl -fsS https://{{ server_domain }}{{ as_url(routes.download.sh_selected,
project_name=release.project.name, version_name=release.version) }} | sh
</pre>
<p>
@@ -103,14 +103,14 @@ curl -fsS https://{{ server_domain }}{{
as_url(routes.download.sh_selected, proj
<h3 id="download-rsync" class="mt-4">Using rsync</h3>
<p>You can download all of the files in this release using rsync with the
following command:</p>
<!-- TODO: Add a button to copy the command to the clipboard -->
- <pre class="bg-light p-3 mb-3">
+ <pre class="bg-light border rounded p-3 mb-3">
rsync -av -e 'ssh -p 2222' {{ asf_id }}@{{ server_domain }}:/{{
release.project.name }}/{{ release.version }}/ ${DOWNLOAD_PATH}/
</pre>
{% include "user-ssh-keys.html" %}
<h3 id="download-wget" class="mt-4">Using wget</h3>
<p>You can download all of the files in this release using wget with the
following command:</p>
- <pre class="bg-light p-3 mb-3">
+ <pre class="bg-light border rounded p-3 mb-3">
wget -r -np -nH --cut-dirs=3{% if server_domain == "127.0.0.1" %}
--no-check-certificate{% endif %} https://{{ server_domain }}{{
as_url(routes.download.path_empty, project_name=release.project.name,
version_name=release.version) }}
</pre>
<p>
diff --git a/atr/templates/user-ssh-keys.html b/atr/templates/user-ssh-keys.html
index 315e442..5e8f639 100644
--- a/atr/templates/user-ssh-keys.html
+++ b/atr/templates/user-ssh-keys.html
@@ -1,31 +1,32 @@
+<p>
+ The ATR server should be compatible with long obsolete versions of rsync, as
long as you use the command as shown, but as of May 2025 the only rsync version
line without <a
href="https://github.com/google/security-research/security/advisories/GHSA-p5pg-x43v-mvqj";>known
CVEs</a> is 3.4.*. Your package manager may have backports.
+</p>
{% set key_count = user_ssh_keys|length %}
-{# TODO: Abstract this and the section in finish-selected.html to a common
include or macro #}
-<div class="card bg-warning-subtle mb-3">
- <div class="card-body p-3">
- <p>
- {% if key_count == 0 %}
- We have no SSH keys on file for you, so you cannot yet use this
command. Please <a href="{{ as_url(routes.keys.ssh_add) }}">add your SSH
key</a>.
- {% elif key_count == 1 %}
- {% set key = user_ssh_keys[0] %}
- {% set key_parts = key.key.split(' ', 2) %}
- {% set key_comment = key_parts[2] if key_parts|length > 2 else 'key' %}
- We have the SSH key <a href="{{ as_url(routes.keys.keys,
_anchor='ssh-key-' + key.fingerprint) }}"
+{% if key_count == 0 %}
+ <p>
+ We have no SSH keys on file for you, so you cannot yet use this command.
Please <a href="{{ as_url(routes.keys.ssh_add) }}">add your SSH key</a>.
+ </p>
+{% elif key_count == 1 %}
+ {% set key = user_ssh_keys[0] %}
+ {% set key_parts = key.key.split(' ', 2) %}
+ {% set key_comment = key_parts[2] if key_parts|length > 2 else 'key' %}
+ <p>
+ We have the SSH key <a href="{{ as_url(routes.keys.keys,
_anchor='ssh-key-' + key.fingerprint) }}"
title="{{ key.fingerprint }}"><code>{{- key_comment | trim -}}</code></a>
on file for you. You can also <a href="{{ as_url(routes.keys.ssh_add) }}">add
another SSH key</a>.
- {% else %}
- We have the SSH keys
- {% for key in user_ssh_keys %}
- {% if loop.last and key_count > 1 %}and{% endif %}
- {% set key_parts = key.key.split(' ', 2) %}
- {% set key_comment = key_parts[2] if key_parts|length > 2 else 'key'
%}
- <a href="{{ as_url(routes.keys.keys, _anchor='ssh-key-' +
key.fingerprint) }}"
- title="{{ key.fingerprint }}"><code>{{- key_comment | trim
-}}</code></a>
- {% if not loop.last %},{% endif %}
- {% endfor %}
- on file for you. You can also <a href="{{ as_url(routes.keys.ssh_add)
}}">add another SSH key</a>.
- {% endif %}
- </p>
- <p class="mb-0">
- The ATR server should be compatible with long obsolete versions of
rsync, as long as you use the command as shown, but as of May 2025 the only
rsync version line without <a
href="https://github.com/google/security-research/security/advisories/GHSA-p5pg-x43v-mvqj";>known
CVEs</a> is 3.4.*. Your package manager may have backports.
- </p>
- </div>
-</div>
+ </p>
+{% else %}
+ <p>We have the following SSH keys on file for you:</p>
+ <ul>
+ {% for key in user_ssh_keys %}
+ {% set key_parts = key.key.split(' ', 2) %}
+ {% set key_comment = key_parts[2] if key_parts|length > 2 else 'key' %}
+ <li>
+ <a href="{{ as_url(routes.keys.keys, _anchor='ssh-key-' +
key.fingerprint) }}"
+ title="{{ key.fingerprint }}"><code>{{- key_comment | trim
-}}</code></a>
+ </li>
+ {% endfor %}
+ </ul>
+ <p>
+ You can also <a href="{{ as_url(routes.keys.ssh_add) }}">add another SSH
key</a>.
+ </p>
+{% endif %}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
