From f6d3bfb6fd41b4446304acb79e6a4a64aafce0b5 Mon Sep 17 00:00:00 2001
From: Steven Foerster <steven@cyber5k.com>
Date: Wed, 22 Apr 2020 12:21:55 -0400
Subject: [PATCH 01/15] wireguard without PPAs

---
 scripts/subinstallers/wireguard.sh | 38 ++++++++++++++++++------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/scripts/subinstallers/wireguard.sh b/scripts/subinstallers/wireguard.sh
index d027f79..82ffea5 100755
--- a/scripts/subinstallers/wireguard.sh
+++ b/scripts/subinstallers/wireguard.sh
@@ -2,23 +2,31 @@
 
 figlet "Mistborn: Installing Wireguard"
 
-# Wireguard
-if [ "$DISTRO" == "raspbian" ]; then
-    echo "Adding Wireguard repo keys"
-    sudo apt-get install -y dirmngr
-    sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 8B48AD6246925553
-    sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 7638D0442B90D010
-    sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 04EE7237B7D453EC
+# if wireguard not in current repositories
+if [ ! $(sudo apt-cache show wireguard > /dev/null 2>&1) ]; then
+    # install PPAs
+
+    echo "Adding Wireguard PPAs"
+
+    # Wireguard
+    if [ "$DISTRO" == "raspbian" ]; then
+        echo "Adding Wireguard repo keys"
+        sudo apt-get install -y dirmngr
+        sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 8B48AD6246925553
+        sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 7638D0442B90D010
+        sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 04EE7237B7D453EC
+    fi
+
+    if [ "$DISTRO" == "ubuntu" ]; then
+        # Ubuntu	
+        sudo add-apt-repository -y ppa:wireguard/wireguard
+    elif [ "$DISTRO" == "debian" ] || [ "$DISTRO" == "raspbian" ]; then
+        # Debian
+        sudo bash -c 'echo "deb http://deb.debian.org/debian/ unstable main" > /etc/apt/sources.list.d/unstable.list'
+        sudo bash -c "printf 'Package: *\nPin: release a=unstable\nPin-Priority: 90\n' > /etc/apt/preferences.d/limit-unstable"
+    fi
 fi
 
 echo "Installing Wireguard"
-if [ "$DISTRO" == "ubuntu" ]; then
-    # Ubuntu	
-    sudo add-apt-repository -y ppa:wireguard/wireguard
-elif [ "$DISTRO" == "debian" ] || [ "$DISTRO" == "raspbian" ]; then
-    # Debian
-    sudo bash -c 'echo "deb http://deb.debian.org/debian/ unstable main" > /etc/apt/sources.list.d/unstable.list'
-    sudo bash -c "printf 'Package: *\nPin: release a=unstable\nPin-Priority: 90\n' > /etc/apt/preferences.d/limit-unstable"
-fi
 sudo apt-get update
 sudo apt-get install -y openresolv wireguard

From d5b26806f40c15afbc9cb89f2ac6aa649b03f2cc Mon Sep 17 00:00:00 2001
From: Steven Foerster <steven@cyber5k.com>
Date: Wed, 22 Apr 2020 12:34:53 -0400
Subject: [PATCH 02/15] not

---
 scripts/subinstallers/wireguard.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/subinstallers/wireguard.sh b/scripts/subinstallers/wireguard.sh
index 82ffea5..c802860 100755
--- a/scripts/subinstallers/wireguard.sh
+++ b/scripts/subinstallers/wireguard.sh
@@ -3,7 +3,7 @@
 figlet "Mistborn: Installing Wireguard"
 
 # if wireguard not in current repositories
-if [ ! $(sudo apt-cache show wireguard > /dev/null 2>&1) ]; then
+if [ $(sudo apt-cache show wireguard > /dev/null 2>&1) ]; then
     # install PPAs
 
     echo "Adding Wireguard PPAs"

From 9bff945c6c3dbca7436c20b5caa0f27e8f6243ff Mon Sep 17 00:00:00 2001
From: Steven Foerster <steven@cyber5k.com>
Date: Wed, 22 Apr 2020 12:51:56 -0400
Subject: [PATCH 03/15] version id

---
 scripts/subinstallers/docker.sh        | 75 +++-----------------------
 scripts/subinstallers/docker_manual.sh | 72 +++++++++++++++++++++++++
 scripts/subinstallers/platform.sh      |  3 ++
 3 files changed, 81 insertions(+), 69 deletions(-)
 create mode 100755 scripts/subinstallers/docker_manual.sh

diff --git a/scripts/subinstallers/docker.sh b/scripts/subinstallers/docker.sh
index b962864..3a8b6c1 100755
--- a/scripts/subinstallers/docker.sh
+++ b/scripts/subinstallers/docker.sh
@@ -1,72 +1,9 @@
 #!/bin/bash
 
-# Docker
-figlet "Mistborn: Installing Docker"
-
-# dependencies
-echo "Installing Docker dependencies"
-sudo apt-get install -y \
-    apt-transport-https \
-    ca-certificates \
-    curl \
-    gnupg-agent \
-    software-properties-common
-
-# Docker repo key
-echo "Adding docker repository key"
-if [ "$DISTRO" == "ubuntu" ]; then
-    curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-elif [ "$DISTRO" == "debian" ]; then
-    curl -fsSL https://download.docker.com/linux/debian/gpg | sudo apt-key add -
-elif [ "$DISTRO" == "raspbian" ]; then
-    curl -fsSL https://download.docker.com/linux/$(. /etc/os-release; echo "$ID")/gpg | sudo apt-key add -
-fi
-
-# Docker repo to source list
-echo "Adding docker to sources list"
-if [ "$DISTRO" == "ubuntu" ]; then
-    sudo add-apt-repository -y \
-       "deb https://download.docker.com/linux/ubuntu \
-       $(lsb_release -cs) \
-       stable"
-elif [ "$DISTRO" == "debian" ]; then
-    sudo add-apt-repository -y \
-   "deb https://download.docker.com/linux/debian \
-   $(lsb_release -cs) \
-   stable"
-elif [ "$DISTRO" == "raspbian" ]; then
-    echo "deb [arch=armhf] https://download.docker.com/linux/$(. /etc/os-release; echo "$ID") \
-     $(lsb_release -cs) stable" | \
-    sudo tee /etc/apt/sources.list.d/docker.list
+if [ "$DISTRO" == "ubuntu" ] && [ "$VERSION_ID" == "20.04" ]; then
+    echo "Automated Docker install"
+    sudo apt-get install docker-compose
+else
+    echo "Manual Docker installation"
+    source ./scripts/subinstallers/docker_manual.sh
 fi
-
-# install Docker
-echo "Installing docker"
-sudo apt-get update
-
-if [ "$DISTRO" == "ubuntu" ] || [ "$DISTRO" == "debian" ]; then
-    sudo apt-get install -y docker-ce docker-ce-cli containerd.io
-elif [ "$DISTRO" == "raspbian" ]; then
-    sudo apt install -y --no-install-recommends \
-    docker-ce \
-    cgroupfs-mount
-fi
-
-# Docker group
-sudo usermod -aG docker $USER
-
-# Docker Compose
-echo "Installing Docker Compose"
-#if [ "$DISTRO" == "ubuntu" ] || [ "$DISTRO" == "debian" ]; then
-#    sudo curl -L "https://github.com/docker/compose/releases/download/1.24.1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
-#    sudo chmod +x /usr/local/bin/docker-compose
-#elif [ "$DISTRO" == "raspbian" ]; then
-# Install required packages
-sudo apt update
-sudo apt install -y python python3-pip python3-setuptools libffi-dev python-backports.ssl-match-hostname python3-dev libssl-dev
-
-# Install Docker Compose from pip
-# This might take a while
-sudo pip3 install docker-compose
-#fi
-
diff --git a/scripts/subinstallers/docker_manual.sh b/scripts/subinstallers/docker_manual.sh
new file mode 100755
index 0000000..b962864
--- /dev/null
+++ b/scripts/subinstallers/docker_manual.sh
@@ -0,0 +1,72 @@
+#!/bin/bash
+
+# Docker
+figlet "Mistborn: Installing Docker"
+
+# dependencies
+echo "Installing Docker dependencies"
+sudo apt-get install -y \
+    apt-transport-https \
+    ca-certificates \
+    curl \
+    gnupg-agent \
+    software-properties-common
+
+# Docker repo key
+echo "Adding docker repository key"
+if [ "$DISTRO" == "ubuntu" ]; then
+    curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
+elif [ "$DISTRO" == "debian" ]; then
+    curl -fsSL https://download.docker.com/linux/debian/gpg | sudo apt-key add -
+elif [ "$DISTRO" == "raspbian" ]; then
+    curl -fsSL https://download.docker.com/linux/$(. /etc/os-release; echo "$ID")/gpg | sudo apt-key add -
+fi
+
+# Docker repo to source list
+echo "Adding docker to sources list"
+if [ "$DISTRO" == "ubuntu" ]; then
+    sudo add-apt-repository -y \
+       "deb https://download.docker.com/linux/ubuntu \
+       $(lsb_release -cs) \
+       stable"
+elif [ "$DISTRO" == "debian" ]; then
+    sudo add-apt-repository -y \
+   "deb https://download.docker.com/linux/debian \
+   $(lsb_release -cs) \
+   stable"
+elif [ "$DISTRO" == "raspbian" ]; then
+    echo "deb [arch=armhf] https://download.docker.com/linux/$(. /etc/os-release; echo "$ID") \
+     $(lsb_release -cs) stable" | \
+    sudo tee /etc/apt/sources.list.d/docker.list
+fi
+
+# install Docker
+echo "Installing docker"
+sudo apt-get update
+
+if [ "$DISTRO" == "ubuntu" ] || [ "$DISTRO" == "debian" ]; then
+    sudo apt-get install -y docker-ce docker-ce-cli containerd.io
+elif [ "$DISTRO" == "raspbian" ]; then
+    sudo apt install -y --no-install-recommends \
+    docker-ce \
+    cgroupfs-mount
+fi
+
+# Docker group
+sudo usermod -aG docker $USER
+
+# Docker Compose
+echo "Installing Docker Compose"
+#if [ "$DISTRO" == "ubuntu" ] || [ "$DISTRO" == "debian" ]; then
+#    sudo curl -L "https://github.com/docker/compose/releases/download/1.24.1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+#    sudo chmod +x /usr/local/bin/docker-compose
+#elif [ "$DISTRO" == "raspbian" ]; then
+# Install required packages
+sudo apt update
+sudo apt install -y python python3-pip python3-setuptools libffi-dev python-backports.ssl-match-hostname python3-dev libssl-dev
+
+# Install Docker Compose from pip
+# This might take a while
+sudo pip3 install docker-compose
+#fi
+
diff --git a/scripts/subinstallers/platform.sh b/scripts/subinstallers/platform.sh
index 3c18fce..305bf16 100755
--- a/scripts/subinstallers/platform.sh
+++ b/scripts/subinstallers/platform.sh
@@ -4,11 +4,14 @@
 # Determine OS platform
 UNAME=$(uname | tr "[:upper:]" "[:lower:]")
 DISTRO=""
+VERSION_ID=""
 # If Linux, try to determine specific distribution
 if [ "$UNAME" == "linux" ]; then
     # use /etc/os-release to get distro 
     DISTRO=$(cat /etc/os-release | awk -F= '/^ID=/{print $2}')
+    VERSION_ID=$(cat /etc/os-release | awk -F= '/^VERSION_ID=/{print $2}')
 fi
 
 figlet "UNAME: $UNAME"
 figlet "DISTRO: $DISTRO"
+figlet "VERSION: $VERSION_ID"

From a0f868e08e5269e06e53d60cc33b6d19e9fa110d Mon Sep 17 00:00:00 2001
From: Steven Foerster <steven@cyber5k.com>
Date: Wed, 22 Apr 2020 12:54:25 -0400
Subject: [PATCH 04/15] python dependencies

---
 scripts/subinstallers/docker.sh        | 3 +++
 scripts/subinstallers/docker_manual.sh | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/subinstallers/docker.sh b/scripts/subinstallers/docker.sh
index 3a8b6c1..c388488 100755
--- a/scripts/subinstallers/docker.sh
+++ b/scripts/subinstallers/docker.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+sudo apt update
+sudo apt install -y python python3-pip python3-setuptools libffi-dev python-backports.ssl-match-hostname python3-dev libssl-dev
+
 if [ "$DISTRO" == "ubuntu" ] && [ "$VERSION_ID" == "20.04" ]; then
     echo "Automated Docker install"
     sudo apt-get install docker-compose
diff --git a/scripts/subinstallers/docker_manual.sh b/scripts/subinstallers/docker_manual.sh
index b962864..a1c4e2c 100755
--- a/scripts/subinstallers/docker_manual.sh
+++ b/scripts/subinstallers/docker_manual.sh
@@ -62,8 +62,6 @@ echo "Installing Docker Compose"
 #    sudo chmod +x /usr/local/bin/docker-compose
 #elif [ "$DISTRO" == "raspbian" ]; then
 # Install required packages
-sudo apt update
-sudo apt install -y python python3-pip python3-setuptools libffi-dev python-backports.ssl-match-hostname python3-dev libssl-dev
 
 # Install Docker Compose from pip
 # This might take a while

From f5bc1830cbf93552217a622c4ada3fd54bd7beb0 Mon Sep 17 00:00:00 2001
From: Steven Foerster <steven@cyber5k.com>
Date: Wed, 22 Apr 2020 13:14:29 -0400
Subject: [PATCH 05/15] tweaks

---
 scripts/subinstallers/docker_manual.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/subinstallers/docker_manual.sh b/scripts/subinstallers/docker_manual.sh
index a1c4e2c..176aba9 100755
--- a/scripts/subinstallers/docker_manual.sh
+++ b/scripts/subinstallers/docker_manual.sh
@@ -62,6 +62,7 @@ echo "Installing Docker Compose"
 #    sudo chmod +x /usr/local/bin/docker-compose
 #elif [ "$DISTRO" == "raspbian" ]; then
 # Install required packages
+sudo apt install -y python-backports.ssl-match-hostname
 
 # Install Docker Compose from pip
 # This might take a while

From b7d03f2a1bbbf671862cb5db9cf26f1475469355 Mon Sep 17 00:00:00 2001
From: Steven Foerster <steven@cyber5k.com>
Date: Wed, 22 Apr 2020 13:17:38 -0400
Subject: [PATCH 06/15] python dependencies

---
 scripts/subinstallers/docker.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/subinstallers/docker.sh b/scripts/subinstallers/docker.sh
index c388488..7509574 100755
--- a/scripts/subinstallers/docker.sh
+++ b/scripts/subinstallers/docker.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 sudo apt update
-sudo apt install -y python python3-pip python3-setuptools libffi-dev python-backports.ssl-match-hostname python3-dev libssl-dev
+sudo apt install -y python python3-pip python3-setuptools libffi-dev python3-dev libssl-dev
 
 if [ "$DISTRO" == "ubuntu" ] && [ "$VERSION_ID" == "20.04" ]; then
     echo "Automated Docker install"

From 6ebe94f014fd15fc5ba33246dc1d27775a446926 Mon Sep 17 00:00:00 2001
From: Steven Foerster <steven@cyber5k.com>
Date: Wed, 22 Apr 2020 13:24:09 -0400
Subject: [PATCH 07/15] remove quotes

---
 scripts/subinstallers/platform.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/subinstallers/platform.sh b/scripts/subinstallers/platform.sh
index 305bf16..a619a95 100755
--- a/scripts/subinstallers/platform.sh
+++ b/scripts/subinstallers/platform.sh
@@ -9,7 +9,7 @@ VERSION_ID=""
 if [ "$UNAME" == "linux" ]; then
     # use /etc/os-release to get distro 
     DISTRO=$(cat /etc/os-release | awk -F= '/^ID=/{print $2}')
-    VERSION_ID=$(cat /etc/os-release | awk -F= '/^VERSION_ID=/{print $2}')
+    VERSION_ID=$(cat /etc/os-release | awk -F= '/^VERSION_ID=/{print $2}' | tr -d '"')
 fi
 
 figlet "UNAME: $UNAME"

From 42a90fd8b680dfd57327c3062eba935ed5a06f45 Mon Sep 17 00:00:00 2001
From: Steven Foerster <steven@cyber5k.com>
Date: Wed, 22 Apr 2020 13:27:25 -0400
Subject: [PATCH 08/15] noninteractive

---
 scripts/subinstallers/docker.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/subinstallers/docker.sh b/scripts/subinstallers/docker.sh
index 7509574..48635cb 100755
--- a/scripts/subinstallers/docker.sh
+++ b/scripts/subinstallers/docker.sh
@@ -5,7 +5,7 @@ sudo apt install -y python python3-pip python3-setuptools libffi-dev python3-dev
 
 if [ "$DISTRO" == "ubuntu" ] && [ "$VERSION_ID" == "20.04" ]; then
     echo "Automated Docker install"
-    sudo apt-get install docker-compose
+    sudo apt-get install -y docker-compose
 else
     echo "Manual Docker installation"
     source ./scripts/subinstallers/docker_manual.sh

From b822f25c336eb73282bd9d2e0cdf5dba27d11bd7 Mon Sep 17 00:00:00 2001
From: Steven Foerster <steven@cyber5k.com>
Date: Wed, 22 Apr 2020 13:46:48 -0400
Subject: [PATCH 09/15] symbolic link docker-compose

---
 scripts/subinstallers/docker.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/subinstallers/docker.sh b/scripts/subinstallers/docker.sh
index 48635cb..1542207 100755
--- a/scripts/subinstallers/docker.sh
+++ b/scripts/subinstallers/docker.sh
@@ -10,3 +10,8 @@ else
     echo "Manual Docker installation"
     source ./scripts/subinstallers/docker_manual.sh
 fi
+
+# set docker-compose path used in Mistborn
+if [ ! -f /usr/local/bin/docker-compose ]; then
+    sudo ln -s $(which docker-compose) /usr/local/bin/docker-compose
+fi

From e6512cb0870f2476302e814e4b0210734dcf2cce Mon Sep 17 00:00:00 2001
From: Steven Foerster <steven@cyber5k.com>
Date: Wed, 22 Apr 2020 13:59:01 -0400
Subject: [PATCH 10/15] ne

---
 scripts/subinstallers/wireguard.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/subinstallers/wireguard.sh b/scripts/subinstallers/wireguard.sh
index c802860..49b1b76 100755
--- a/scripts/subinstallers/wireguard.sh
+++ b/scripts/subinstallers/wireguard.sh
@@ -3,7 +3,7 @@
 figlet "Mistborn: Installing Wireguard"
 
 # if wireguard not in current repositories
-if [ $(sudo apt-cache show wireguard > /dev/null 2>&1) ]; then
+if [ $(sudo apt-cache show wireguard > /dev/null 2>&1) -ne 0 ]; then
     # install PPAs
 
     echo "Adding Wireguard PPAs"

From bdb1a0aebc0eac2ccd08cdd316e134445c4007ec Mon Sep 17 00:00:00 2001
From: Steven Foerster <steven@cyber5k.com>
Date: Wed, 22 Apr 2020 14:03:50 -0400
Subject: [PATCH 11/15] syntax

---
 scripts/subinstallers/wireguard.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/subinstallers/wireguard.sh b/scripts/subinstallers/wireguard.sh
index 49b1b76..93b2490 100755
--- a/scripts/subinstallers/wireguard.sh
+++ b/scripts/subinstallers/wireguard.sh
@@ -3,7 +3,7 @@
 figlet "Mistborn: Installing Wireguard"
 
 # if wireguard not in current repositories
-if [ $(sudo apt-cache show wireguard > /dev/null 2>&1) -ne 0 ]; then
+if ! $(sudo apt-cache show wireguard > /dev/null 2>&1) ; then
     # install PPAs
 
     echo "Adding Wireguard PPAs"

From dc852fd43a5c5e75d497a77597ccfec064de8d11 Mon Sep 17 00:00:00 2001
From: Steven Foerster <steven@cyber5k.com>
Date: Wed, 22 Apr 2020 14:48:46 -0400
Subject: [PATCH 12/15] Quickstart

---
 README.md | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2b4f5de..a7ed810 100644
--- a/README.md
+++ b/README.md
@@ -32,6 +32,37 @@ Within Mistborn is a panel to enable and manage these free extra services (off b
 - [Tor](https://www.torproject.org): The Onion Router. One tool in the arsenal of online security and privacy.
 - [Jitsi](https://jitsi.org): Multi-platform open-source video conferencing
 
+# Quickstart
+Tested Operating Systems (in order of thoroughness):
+- Ubuntu 18.04 LTS
+- Ubuntu 20.04 LTS
+- Debian 10 (Buster)
+- Raspbian Buster
+
+Recommended System Specifications
+| Use Case               | Description                                                                   | RAM  | Hard Disk |
+|------------------------|-------------------------------------------------------------------------------|------|-----------|
+| Bare bones             | Wireguard, Pihole (no Cockpit, no extra services)                             | 1 GB | 10 GB     |
+| Default                | Bare bones + Cockpit                                                          | 2 GB | 10 GB     |
+| Low-resource services  | Default + Bitwarden, Tor, Syncthing                                           | 3 GB | 15 GB     |
+| High-resource services | Default + Jitsi, Nextcloud, Jellyfin, Rocket.Chat, Home Assistant, OnlyOffice | 4 GB | 25 GB+    |
+
+Starting from base installation
+```
+git clone https://gitlab.com/cyber5k/mistborn.git
+./mistborn/scripts/install.sh
+```
+
+Get default admin Wireguard profile
+*wait 1 minute after "Mistborn Installed" message*
+```
+sudo docker-compose -f /opt/mistborn/base.yml run --rm django python manage.py getconf admin default
+```
+
+Connect via Wireguard then visit `http://home.mistborn`
+
+For more information, see the `Installation` section below.
+
 # Network Diagram
 ![Mistborn Network Diagram](https://gitlab.com/cyber5k/public/-/raw/master/graphics/mistborn_network.png)
 
@@ -54,7 +85,7 @@ In Mistborn, Gateways are upstream from the VPN server so connections to third-p
 The Gateway adds an extra network hop. DNS is still resolved in Mistborn so pihole is still blocking ads.
 
 # Installation
-Mistborn is regularly tested on Ubuntu 18.04 LTS (DigitalOcean droplet with 2 GB RAM). It has also been successfully used on Debian Buster and Raspbian Buster systems (though not regularly tested).
+Mistborn is regularly tested on Ubuntu 18.04 LTS (DigitalOcean droplet with 2 GB RAM). It has also been successfully used on Debian Buster and Raspbian Buster systems (though not regularly tested). Additionally tested on Ubuntu 20.04 LTS.
 
 Clone the git repository and run the install script:
 ```

From 2cc6fefd9e8580f42c484172a198fdd34b756cad Mon Sep 17 00:00:00 2001
From: Steven Foerster <steven@cyber5k.com>
Date: Wed, 22 Apr 2020 14:49:56 -0400
Subject: [PATCH 13/15] formatting

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a7ed810..3af659a 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,8 @@ Tested Operating Systems (in order of thoroughness):
 - Debian 10 (Buster)
 - Raspbian Buster
 
-Recommended System Specifications
+Recommended System Specifications:
+
 | Use Case               | Description                                                                   | RAM  | Hard Disk |
 |------------------------|-------------------------------------------------------------------------------|------|-----------|
 | Bare bones             | Wireguard, Pihole (no Cockpit, no extra services)                             | 1 GB | 10 GB     |

From 0281a779f56f35a002ab97e2233b816bcf8834db Mon Sep 17 00:00:00 2001
From: Steven Foerster <steven@cyber5k.com>
Date: Wed, 22 Apr 2020 14:52:10 -0400
Subject: [PATCH 14/15] resource table

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 3af659a..f4202d3 100644
--- a/README.md
+++ b/README.md
@@ -41,12 +41,12 @@ Tested Operating Systems (in order of thoroughness):
 
 Recommended System Specifications:
 
-| Use Case               | Description                                                                   | RAM  | Hard Disk |
-|------------------------|-------------------------------------------------------------------------------|------|-----------|
-| Bare bones             | Wireguard, Pihole (no Cockpit, no extra services)                             | 1 GB | 10 GB     |
-| Default                | Bare bones + Cockpit                                                          | 2 GB | 10 GB     |
-| Low-resource services  | Default + Bitwarden, Tor, Syncthing                                           | 3 GB | 15 GB     |
-| High-resource services | Default + Jitsi, Nextcloud, Jellyfin, Rocket.Chat, Home Assistant, OnlyOffice | 4 GB | 25 GB+    |
+| Use Case               | Description                                                                   | RAM   | Hard Disk |
+|------------------------|-------------------------------------------------------------------------------|-------|-----------|
+| Bare bones             | Wireguard, Pihole (no Cockpit, no extra services)                             | 1 GB  | 10 GB     |
+| Default                | Bare bones + Cockpit                                                          | 2 GB  | 10 GB     |
+| Low-resource services  | Default + Bitwarden, Tor, Syncthing                                           | 3 GB  | 15 GB     |
+| High-resource services | Default + Jitsi, Nextcloud, Jellyfin, Rocket.Chat, Home Assistant, OnlyOffice | 4 GB+ | 25 GB+    |
 
 Starting from base installation
 ```

From fa72a2aca28e235e0faed65beb64e66d06b61e37 Mon Sep 17 00:00:00 2001
From: Steven Foerster <steven@cyber5k.com>
Date: Wed, 22 Apr 2020 14:53:24 -0400
Subject: [PATCH 15/15] consistent install line

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f4202d3..e780665 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ Recommended System Specifications:
 Starting from base installation
 ```
 git clone https://gitlab.com/cyber5k/mistborn.git
-./mistborn/scripts/install.sh
+sudo bash ./mistborn/scripts/install.sh
 ```
 
 Get default admin Wireguard profile