From b7d1394d0842cff49c3f029598e23e9b1fa5367b Mon Sep 17 00:00:00 2001
From: Nathan Steel <aney.login+lilman@gmail.com>
Date: Wed, 25 May 2022 09:17:55 +0100
Subject: [PATCH] Make all <pre> tags contain no unwanted whitespace

---
 blog/add-domain-to-server.html |  12 ++--
 blog/debian-server-setup.html  | 108 +++++++++++----------------------
 2 files changed, 41 insertions(+), 79 deletions(-)

diff --git a/blog/add-domain-to-server.html b/blog/add-domain-to-server.html
index 5bfc9bb..c46d70b 100644
--- a/blog/add-domain-to-server.html
+++ b/blog/add-domain-to-server.html
@@ -40,16 +40,12 @@
 				<h2>Add the A record</h2>
 				<p>There will likely be many option for adding records, but all we need is to add a singular A record</p>
 				<p>Find the box that allows you to "Add a new record" and input the below, changing <IP> and <DOMAIN> with your IP address, and domain name</p>
-				<pre>
-					<code>
-					</code>
-				</pre>
+
+				<pre><code></code></pre>
 
 				<p>If there are not multiple boxes, but instead a single box to input your record into, this will be what you add instead</p>
-				<pre>
-					<code>
-					</code>
-				</pre>
+
+				<pre><code></code></pre>
 
 				<h2>Wait for propagation</h2>
 				<p>Now there's a bit of a waiting game, as you need to wait for the new DNS record to propagate (get updated) for all nameservers. This can be anywhere from instantly to 72 hours, but typically takes an hour or two.</p>
diff --git a/blog/debian-server-setup.html b/blog/debian-server-setup.html
index 3a4e57a..7acae7b 100644
--- a/blog/debian-server-setup.html
+++ b/blog/debian-server-setup.html
@@ -39,34 +39,23 @@
 
 				<h2>Update the OS</h2>
 				<p>Even with a fresh install of Debian from the latest ISO, there may be some updates you're missing, and it's a good idea to have these, especially in case they're security updates.</p>
-				<pre>
-					<code>
-						root$ apt update && apt upgrade	
-					</code>
-				</pre>
+
+				<pre><code>apt update && apt upgrade</code></pre>
 
 				<h2>Install essential packages</h2>
 				<p>These are packages that are needed for accessing, and controlling the server</p>
-				<pre>
-					<code>
-						root$ apt install sudo ssh	
-					</code>
-				</pre>
+
+				<pre><code>apt install sudo ssh</code></pre>
+
 				<h3>Some useful packages too</h3>
-				<pre>
-					<code>
-						root$ apt install vim htop wget curl tmux	
-					</code>
-				</pre>
+				<pre><code>apt install vim htop wget curl tmux</code></pre>
 
 				<h2>Add a user, and give super user privilleges</h2>
 				<p>You want to avoid using root as much as possible in regular use, so a new user for yourself is a must</p>
-				<pre>
-					<code>
-						root$ adduser <USERNAME>	
-						root$ usermod -aG sudo <USERNAME>
-					</code>
-				</pre>
+
+<pre><code>adduser <USERNAME>	
+usermod -aG sudo <USERNAME></code></pre>
+
 				<p>*replace <USERNAME> with the user you want to create, e.g. nathan</p>
 
 				<h2>(Local server) Set static IP</h2>
@@ -74,53 +63,38 @@
 
 				<h2>Secure ssh</h2>
 				<p>Although this is optional, I recommend it, as SSH (secure shell) will be the primary means of access to the server.</p>
-				<pre>
-					<code>
-						root$ vim /etc/ssh/sshd_config
-					</code>
-				</pre>
+
+				<pre><code>vim /etc/ssh/sshd_config</code></pre>
+
 				<p>Within the editor you will need to search for <strong>PermitRootLogin</strong> and set it to <strong>no</strong>, this prevents ssh as root</p>
 				<p>Search for <strong>Port</strong> and set it to a different port to 22, a port over 1024 prevents basic nmap scans, and therefor a lot of bruteforcing, so let's go with 2020 so it's easy to remember</p>
 				<p>Below the <strong>Port</strong> line, add a new line with <strong>Protocol 2</strong> this enables ssh2, which is more secure</p>
-				<p>(Optional) Comment/Add a <strong>#<strong> to the beginning of the <strong>passwordlogin</strong> line. This will prevent sshing to the server from any PC that doesn't have it's SSH key on the server already. I recommend only doing this if your sshkeys are on the server, or you're comfortable adding them.</p>
-				<pre>
-					<code>
-						root$ systemctl reload sshd
-					</code>
-				</pre>
+				<p>(Optional) Comment/Add a <strong>#</strong> to the beginning of the <strong>passwordlogin</strong> line. This will prevent sshing to the server from any PC that doesn't have it's SSH key on the server already. I recommend only doing this if your sshkeys are on the server, or you're comfortable adding them.</p>
+
+				<pre><code>systemctl reload sshd</code></pre>
+
 				<p>This reloads the ssh daemon, and enables all the changes we've made</p>
 
 				<h2>Setup UFW</h2>
 				<p>UFW (Uncomplicated Firewall) is a simple to use firewall, that can be used to easily open/close ports on your server.</p>
 				<p>We'll install ufw, deny access inwards to all ports, but allow our server to access any ports outwards. We will then manually allow inwards traffic to the SSH port we set, in this case 2020</p>
-				<pre>
-					<code>
-						root$ apt install ufw
-						root$ ufw deny incoming
-						root$ ufw allow outgoing
-						root$ ufw allow 2020
-						root$ ufw enable
-					</code>
-				</pre>
+
+<pre><code>apt install ufw
+ufw deny incoming
+ufw allow outgoing
+ufw allow 2020
+ufw enable</code></pre>
 				<p>If there are any other ports that need to be opened in the future this can be done with:</p>
-				<pre>
-					<code>
-						root$ ufw allow <PORT>
-					</code>
-					or
-					<code>
-						root$ sudo ufw allow <PORT>
-					</code>
-				</pre>
+				<pre><code>ufw allow <PORT></code></pre>
+				<p>or</p>
+				<pre><code>sudo ufw allow <PORT></code></pre>
 
 				<h2>Set hostname</h2>
 				<p>Setting the name for a server is an important step, but the name doesn't need to be serious</p>
-				<pre>
-					<code>
-						root$ vim /etc/hosts
-						root$ vim /etc/hostname
-					</code>
-				</pre>
+
+<pre><code>vim /etc/hosts
+vim /etc/hostname</code></pre>
+
 				<p>Within both of these files the hostname should be changed to the same thing</p>
 
 			</section>
@@ -129,25 +103,17 @@
 				<p>This next section can be done via a terminal, or an SSH client e.g. PuTTY for Windowss. For the sake of the guide, this assume you're using a Unix terminal</p>
 				<h2>Create an SSH key</h2>
 				<p>We'll create an ed25519 ssh-key, as it's more secure, and performant than the defaultrsa</p>
-				<pre>
-					<code>
-						$ ssh-keygen -t ed25519
-					</code>
-				</pre>
+				<pre><code>ssh-keygen -t ed25519</code></pre>
+				
 				<h2>SSH into the server</h2>
 				<p>This is a two part section, and I recommend using this every time you SSH into a server from a new PC</p>
-				<pre>
-					<code>
-						$ ssh <USER>@<HOST> -p 2020
-					</code>
-				</pre>
+				<pre><code>ssh <USER>@<HOST> -p 2020</code></pre>
+
 				<p>This will likely display a message asking to verify the key for the server. This is to prevent man-in-the-middle attacks, so I reccommend verifying this whenever asked.</p>
 				<p>To check the key for the server, you need to run this command on the server.</p>
-				<pre>
-					<code>
-						$ ssh-keygen -l -f /etc/ssh/ssh_host_<KEY>_key.pub	
-					</code>
-				</pre>
+
+				<pre><code>ssh-keygen -l -f /etc/ssh/ssh_host_<KEY>_key.pub</code></pre>
+
 				<p>Replace <KEY> with the key the message is asking about. Then if key the server shows matches that on your PC you are SSHing from, type <strong>yes</strong> and hit enter</p>
 
 				<h2>TODO:(Optional) Fail2Ban</h2>