Commit deba30fd authored by sajolida's avatar sajolida

Revert "Download fake ISO from poivron.org for UX testing"

This reverts commit 3ad2b1bd.

Conflicts:
	wiki/src/download.inline.mdwn
	wiki/src/install/v1/Tails/i386/stable/latest.yml
parent 93be1a5b
......@@ -99,7 +99,7 @@ Download and verify
<a id="i_have_iso" href="" title="Select an ISO image to verify">I already have an ISO image.</a>
<div id="download">
<a id="download-button" href='https://un.poivron.org/~sajolida/tails-ux-testing-2.iso' class="btn btn-lg btn-primary clearfix iso-url">
<a id="download-button" href='[[!inline pages="inc/stable_i386_iso_url" raw="yes"]]' class="btn btn-lg btn-primary clearfix iso-url">
<span id="download-button-label" class="pull-left">Download Tails <span class="iso-version">[[!inline pages="inc/stable_i386_version" raw="yes"]]</span> ISO image
<small id="download-button-size">(<span class="iso-size-MiB">$SIZE</span> MiB)</small>
</span>
......@@ -178,7 +178,7 @@ Download and verify
<span class="upgrade-clone">[[Open these instructions on another device|upgrade/clone#next]].</span>
<span class="upgrade-tails">[[Install a temporary Tails|upgrade/tails#next]].</span>
</p>
<p class="openpgp">If you are knowledgeable about OpenPGP, you can do additional verification using the <a href=''>OpenPGP signature.</a>. <a class="openpgp-learn" href="">Learn how to do that.</a></p>
<p class="openpgp">If you are knowledgeable about OpenPGP, you can do additional verification using the <a href='[[!inline pages="inc/stable_i386_iso_sig_url" raw="yes"]]'>OpenPGP signature</a>.</p>
</div>
<a href="" class="btn btn-lg btn-link">Download again</a>
</div>
......
......@@ -24,7 +24,7 @@
<ul>
<li>1 USB stick <small>(at least 4 GB)</small></li>
<li>30&ndash;60 minutes to download Tails <small>(448 MiB)</small></li>
<li>30&ndash;60 minutes to download Tails <small>[[!inline pages="inc/stable_i386_iso_size" raw="yes"]]</small></li>
<li>25 minutes to install</li>
</ul>
......
......@@ -93,26 +93,19 @@ using the Tails signing key.
1. Download the ISO image:
<p class="pre">wget --continue https://un.poivron.org/~sajolida/tails-ux-testing.iso</p>
<p class="pre">wget --continue [[!inline pages="inc/stable_i386_iso_url" raw="yes"]]</p>
1. Download the signature of the ISO image:
<p class="pre">wget https://un.poivron.org/~sajolida/tails-ux-testing.iso.sig</p>
<p class="pre">wget [[!inline pages="inc/stable_i386_iso_sig_url" raw="yes"]]</p>
1. Verify that the ISO image is signed by the Tails signing key:
<p class="pre">gpg --keyid-format 0xlong --verify tails-ux-testing.iso.sig tails-ux-testing.iso</p>
<p class="pre">[[!inline pages="inc/stable_i386_gpg_verify" raw="yes"]]</p>
The output of this command should be the following:
<pre>
gpg: Signature made Thu 19 Nov 2015 02:39:11 PM UTC
gpg: using RSA key 0x3C83DCB52F699C56
gpg: Good signature from "Tails developers (offline long-term identity key) <[email protected]>" [full]
gpg: aka "Tails developers <[email protected]>" [full]
Primary key fingerprint: A490 D0F4 D311 A415 3E2B B7CA DBB8 02B2 58AC D84F
Subkey fingerprint: A509 1F72 C746 BA6B 163D 1C18 3C83 DCB5 2F69 9C56
</pre>
<p class="pre">[[!inline pages="inc/stable_i386_gpg_signature_output" raw="yes"]]</p>
Verify in this output that:
......
......@@ -23,7 +23,7 @@
<ul>
<li>2 USB sticks <small>(at least 4 GB)</small></li>
<li>30&ndash;60 minutes to download Tails <small>(448 MiB)</small></li>
<li>30&ndash;60 minutes to download Tails <small>[[!inline pages="inc/stable_i386_iso_size" raw="yes"]]</small></li>
<li>45 minutes to install</li>
</ul>
......
......@@ -4,6 +4,6 @@ channel: stable
product-name: Tails
version: '1.7'
target-files:
- sha256: 6e4b68cedfcd9a37ae83285da0a97b4b45abdf155aeb79df9c9cf40577d7ca2d
size: 559319040
url: https://un.poivron.org/~sajolida/tails-ux-testing-2.iso
- sha256: 15242870914cda12a4c3462ecf869ea7a09b35bf3bd3af9741b59bfc95f7c1b2
size: 31457280
url: https://un.poivron.org/~sajolida/dave-testing.iso
......@@ -23,7 +23,7 @@
<ul>
<li>2 USB sticks <small>(at least 4 GB)</small></li>
<li>30&ndash;60 minutes to download Tails <small>(448 MiB)</small></li>
<li>30&ndash;60 minutes to download Tails <small>[[!inline pages="inc/stable_i386_iso_size" raw="yes"]]</small></li>
<li>45 minutes to install</li>
</ul>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment