summaryrefslogtreecommitdiff
path: root/tor.html
diff options
context:
space:
mode:
authorclimbTheStairs <yxtqwf+github@gmail.com>2021-12-05 02:00:31 -0800
committerclimbTheStairs <yxtqwf+github@gmail.com>2021-12-05 02:00:31 -0800
commit6173b1f435f9a3dbff97a82b3a903acf9b2e3c20 (patch)
tree412fc2c12fcbf5c0481664d4352a083feb801bdc /tor.html
parentffcb57e246beba5533514b811899313228fb3884 (diff)
Edit tor.html to follow official instructions
Remove OS-specific code, check CPU architecture, make tabs/spaces consistent
Diffstat (limited to 'tor.html')
-rw-r--r--tor.html20
1 files changed, 11 insertions, 9 deletions
diff --git a/tor.html b/tor.html
index 4135080..ddaa9d2 100644
--- a/tor.html
+++ b/tor.html
@@ -22,19 +22,21 @@
<h3>Installing Tor</h3>
- <p>Firstly we need to add the Tor repos to our system to get the latest version of Tor:</p>
+ <p>First, we need to ensure that our CPU architecture is supported. Ensure that it is either amd64, arm64, or i386:</p>
+ <pre><code>dpkg --print-architecture</code></pre>
+
+ <p>We need to <a href="https://support.torproject.org/apt/tor-deb-repo/">add the Tor repos to our system</a> to get the latest version of Tor:</p>
<pre><code>apt install -y apt-transport-https gpg
-echo "deb https://deb.torproject.org/torproject.org buster main
-deb-src https://deb.torproject.org/torproject.org buster main" > /etc/apt/sources.list.d/tor.list</code></pre>
+echo "deb [signed-by=/usr/share/keyrings/tor-archive-keyring.gpg] https://deb.torproject.org/torproject.org $(lsb_release -cs) main
+deb-src [signed-by=/usr/share/keyrings/tor-archive-keyring.gpg] https://deb.torproject.org/torproject.org $(lsb_release -cs) main" > /etc/apt/sources.list.d/tor.list</code></pre>
- <p>Then we need to add the gpg keys to our keyring:</p>
+ <p>Then we need to add the GPG keys to our keyring:</p>
- <pre><code>curl -s https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc | gpg --import
-gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | apt-key add -</code></pre>
+ <pre><code>curl -s https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc | gpg --dearmor > /usr/share/keyrings/tor-archive-keyring.gpg</code></pre>
- <p>Now update and install Tor:</p>
+ <p>Now install Tor:</p>
- <pre><code>apt update
+ <pre><code>apt update
apt install tor deb.torproject.org-keyring</code></pre>
<h3>Enabling Tor</h3>
@@ -104,6 +106,6 @@ apt install tor</code></pre>
<p><strong>Contributor</strong> - <a href="https://tomfasano.co" target="_blank">tomfasano.co</a></p>
</main>
- <footer><a href="https://landchad.net">LandChad.net</a></br>Because Everyone should be an Internet LandChad.</br><a href="index.html"><li><img src="pix/chad.gif" alt="chad"></li></a><a href="rss.xml"><li><img src="pix/rss.svg" alt="RSS"></li></a><a href="donate-bitcoin.html"><li><img src="pix/btc.svg" alt="BTC"></li></a><a href="donate-monero.html"><li><img src="pix/xmr.svg" alt="XMR"></li></a><a href="https://github.com/lukesmithxyz/landchad"><li><img src="pix/git.svg" alt="Github"></li></a></footer>
+ <footer><a href="https://landchad.net">LandChad.net</a></br>Because Everyone should be an Internet LandChad.</br><a href="index.html"><li><img src="pix/chad.gif" alt="chad"></li></a><a href="rss.xml"><li><img src="pix/rss.svg" alt="RSS"></li></a><a href="donate-bitcoin.html"><li><img src="pix/btc.svg" alt="BTC"></li></a><a href="donate-monero.html"><li><img src="pix/xmr.svg" alt="XMR"></li></a><a href="https://github.com/lukesmithxyz/landchad"><li><img src="pix/git.svg" alt="Github"></li></a></footer>
</body>
</html>