[PATCH] Use https for all links to /keys and /verify
Todd Zullinger
tmz at pobox.com
Fri Oct 23 17:37:15 UTC 2009
---
Ricky Zhou wrote:
> I guess an absolute URL can't be avoided if we want https, so something
> like this might work:
>
> <p class="note">${Markup(_('After downloading an ISO, <a href="https://fedoraproject.org/%s/%s/verify">verify</a> it.') % (path, lang))}</p>
>
> At some point, we can probably wrap making links like this in a function
> letting you choose between https/http and absolute vs. relative.
I stripped off the / before %s, as in my testing path always expanded
to include the leading slash (and a URL with a unnessecary // in it
just looks ugly). If it's not a safe to assume that path always has a
leading /, I can add it back or see about using some python to strip
it when needed.
fedoraproject.org/data/content/get-fedora-all.html | 2 +-
fedoraproject.org/data/content/get-fedora-kde.html | 4 ++--
fedoraproject.org/data/content/get-fedora-ppc.html | 2 +-
fedoraproject.org/data/content/get-fedora.html | 4 ++--
fedoraproject.org/data/content/get-prerelease.html | 2 +-
fedoraproject.org/data/content/verify.html | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/fedoraproject.org/data/content/get-fedora-all.html b/fedoraproject.org/data/content/get-fedora-all.html
index 6097ebf..14b407e 100644
--- a/fedoraproject.org/data/content/get-fedora-all.html
+++ b/fedoraproject.org/data/content/get-fedora-all.html
@@ -13,7 +13,7 @@
<a href="${path}/${lang}/get-fedora">${Markup(_('← Back to the main "Get Fedora" page'))}</a>
</div>
<h2>${Markup(_('Fedora, For You.'))}</h2>
- <p class="note">${Markup(_('After downloading an ISO, <a href="%s/%s/verify">verify</a> it.') % (path, lang))}</p>
+ <p class="note">${Markup(_('After downloading an ISO, <a href="https://fedoraproject.org%s/%s/verify">verify</a> it.') % (path, lang))}</p>
<h3>${Markup(_('Install Media'))}</h3>
<ul class="downloadbox installdvd">
<li>
diff --git a/fedoraproject.org/data/content/get-fedora-kde.html b/fedoraproject.org/data/content/get-fedora-kde.html
index f863603..53cc3d9 100644
--- a/fedoraproject.org/data/content/get-fedora-kde.html
+++ b/fedoraproject.org/data/content/get-fedora-kde.html
@@ -27,7 +27,7 @@
<li><a href="http://docs.fedoraproject.org/install-guide/f11/">${Markup(_('Fedora 11 Installation Guide'))}</a></li>
<li><a href="http://docs.fedoraproject.org/release-notes/f11/">${Markup(_('Fedora 11 Release Notes'))}</a></li>
<li><a href="${path}/${lang}/get-help">${Markup(_('Help & Support'))}</a></li>
- <li><a href="${path}/${lang}/verify">${Markup(_('Verify your download'))}</a></li>
+ <li><a href="https://fedoraproject.org${path}/${lang}/verify">${Markup(_('Verify your download'))}</a></li>
</ul>
</div>
<p>
@@ -47,7 +47,7 @@
<li>${Markup(_('<a href="http://docs.fedoraproject.org/install-guide/f11/en-US/html/ch-upgrade-x86.html">Fedora 11 Upgrade Guide</a>'))}</li>
<li><a href="http://docs.fedoraproject.org/release-notes/f11/">${Markup(_('Fedora 11 Release Notes'))}</a></li>
<li><a href="${path}/${lang}/get-help">${Markup(_('Help & Support'))}</a></li>
- <li><a href="${path}/${lang}/verify">${Markup(_('Verify your download'))}</a></li>
+ <li><a href="https://fedoraproject.org${path}/${lang}/verify">${Markup(_('Verify your download'))}</a></li>
</ul>
</div>
<p>
diff --git a/fedoraproject.org/data/content/get-fedora-ppc.html b/fedoraproject.org/data/content/get-fedora-ppc.html
index 86ba655..6e09632 100644
--- a/fedoraproject.org/data/content/get-fedora-ppc.html
+++ b/fedoraproject.org/data/content/get-fedora-ppc.html
@@ -26,7 +26,7 @@
<li>${Markup(_('<a href="http://docs.fedoraproject.org/install-guide/f11/">Fedora 11 Install Guide</a>'))}</li>
<li><a href="http://docs.fedoraproject.org/release-notes/f11/">${Markup(_('Fedora 11 Release Notes'))}</a></li>
<li><a href="${path}/${lang}/get-help">${Markup(_('Help & Support'))}</a></li>
- <li><a href="${path}/${lang}/verify">${Markup(_('Verify your download'))}</a></li>
+ <li><a href="https://fedoraproject.org${path}/${lang}/verify">${Markup(_('Verify your download'))}</a></li>
</ul>
</div>
<p>
diff --git a/fedoraproject.org/data/content/get-fedora.html b/fedoraproject.org/data/content/get-fedora.html
index 3ac0dee..0360167 100644
--- a/fedoraproject.org/data/content/get-fedora.html
+++ b/fedoraproject.org/data/content/get-fedora.html
@@ -23,7 +23,7 @@
<li><a href="http://docs.fedoraproject.org/install-guide/f11/">${Markup(_('Fedora 11 Installation Guide'))}</a></li>
<li><a href="http://docs.fedoraproject.org/release-notes/f11/">${Markup(_('Fedora 11 Release Notes'))}</a></li>
<li><a href="${path}/${lang}/get-help">${Markup(_('Help & Support'))}</a></li>
- <li><a href="${path}/${lang}/verify">${Markup(_('Verify your download'))}</a></li>
+ <li><a href="https://fedoraproject.org${path}/${lang}/verify">${Markup(_('Verify your download'))}</a></li>
</ul>
</div>
<p>
@@ -43,7 +43,7 @@
<li>${Markup(_('<a href="http://docs.fedoraproject.org/install-guide/f11/en-US/html/ch-upgrade-x86.html">Fedora 11 Upgrade Guide</a>'))}</li>
<li><a href="http://docs.fedoraproject.org/release-notes/f11/">${Markup(_('Fedora 11 Release Notes'))}</a></li>
<li><a href="${path}/${lang}/get-help">${Markup(_('Help & Support'))}</a></li>
- <li><a href="${path}/${lang}/verify">${Markup(_('Verify your download'))}</a></li>
+ <li><a href="https://fedoraproject.org${path}/${lang}/verify">${Markup(_('Verify your download'))}</a></li>
</ul>
</div>
<p>
diff --git a/fedoraproject.org/data/content/get-prerelease.html b/fedoraproject.org/data/content/get-prerelease.html
index f7729a5..de8cd5a 100644
--- a/fedoraproject.org/data/content/get-prerelease.html
+++ b/fedoraproject.org/data/content/get-prerelease.html
@@ -11,7 +11,7 @@
<body class="get">
<h2>${Markup(_('Fedora, For You.'))}</h2>
<p class="warning">${Markup(_('This is pre-release software. The Fedora Project makes no guarantees as to its suitability or usefulness. All issues should be reported via the <a href="https://bugzilla.redhat.com/">Red Hat Bugzilla</a>. Read the <a href="%(relnotes_url)s">Release Notes</a> for more information.') % {'relnotes_url': _('http://docs.fedoraproject.org/release-notes/f12/en-US/html/')})}</p>
- <p class="note">${Markup(_('After downloading an ISO, <a href="%s/%s/verify">verify</a> it.') % (path, lang))}</p>
+ <p class="note">${Markup(_('After downloading an ISO, <a href="https://fedoraproject.org%s/%s/verify">verify</a> it.') % (path, lang))}</p>
<h3>${Markup(_('Install Media'))}</h3>
<ul class="downloadbox installdvd">
<li>
diff --git a/fedoraproject.org/data/content/verify.html b/fedoraproject.org/data/content/verify.html
index 2576dd8..ee41527 100644
--- a/fedoraproject.org/data/content/verify.html
+++ b/fedoraproject.org/data/content/verify.html
@@ -32,7 +32,7 @@
</p>
<pre class="command">$ curl https://fedoraproject.org/static/fedora.gpg | gpg --import</pre>
<p>
- ${Markup(_('You can verify the details of the GPG key(s) <a href="%s/%s/keys">here</a>.') % (path, lang))}
+ ${Markup(_('You can verify the details of the GPG key(s) <a href="https://fedoraproject.org%s/%s/keys">here</a>.') % (path, lang))}
</p>
<p>
${Markup(_('Now, verify that the CHECKSUM file is valid:'))}
--
1.6.5.1
--
Todd OpenPGP -> KeyID: 0xBEAF0CE3 | URL: www.pobox.com/~tmz/pgp
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
I always keep a supply of stimulant handy in case I see a snake -
which I also keep handy.
-- W. C. Fields
More information about the Fedora-websites-list
mailing list