From 0271e549bb5f582b9760b5b1172b5fee4365a8b5 Mon Sep 17 00:00:00 2001
From: jvolkenant <jeff@volkenant.net>
Date: Tue, 10 Dec 2019 16:01:09 -0800
Subject: [PATCH 1/3] Fix typo in InstallNextcloud calls (#1693)

---
 setup/nextcloud.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup/nextcloud.sh b/setup/nextcloud.sh
index af47a062..e80480a5 100755
--- a/setup/nextcloud.sh
+++ b/setup/nextcloud.sh
@@ -148,11 +148,11 @@ if [ ! -d /usr/local/lib/owncloud/ ] || [[ ! ${CURRENT_NEXTCLOUD_VER} =~ ^$nextc
 			# During the upgrade from Nextcloud 14 to 15, user_external may cause the upgrade to fail.
 			# We will disable it here before the upgrade and install it again after the upgrade.
 			hide_output sudo -u www-data php /usr/local/lib/owncloud/console.php app:disable user_external
-			InstallNextCloud 15.0.8 4129d8d4021c435f2e86876225fb7f15adf764a3
+			InstallNextcloud 15.0.8 4129d8d4021c435f2e86876225fb7f15adf764a3
 			CURRENT_NEXTCLOUD_VER="15.0.8"
 		fi
 		if [[ ${CURRENT_NEXTCLOUD_VER} =~ ^15 ]]; then
-                        InstallNextCloud 16.0.6 0bb3098455ec89f5af77a652aad553ad40a88819
+                        InstallNextcloud 16.0.6 0bb3098455ec89f5af77a652aad553ad40a88819
                         CURRENT_NEXTCLOUD_VER="16.0.6"
                 fi
 	fi

From 385340da46862b83d87c399474152961771d1832 Mon Sep 17 00:00:00 2001
From: Joshua Tauberer <jt@occams.info>
Date: Thu, 12 Dec 2019 11:27:35 -0500
Subject: [PATCH 2/3] install openssh-client which provides ssh-keygen and is
 not present on desktop Ubuntu by default

---
 setup/system.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup/system.sh b/setup/system.sh
index df5f2856..28043b16 100755
--- a/setup/system.sh
+++ b/setup/system.sh
@@ -125,11 +125,12 @@ apt_get_quiet autoremove
 # * sudo: allows privileged users to execute commands as root without being root
 # * coreutils: includes `nproc` tool to report number of processors, mktemp
 # * bc: allows us to do math to compute sane defaults
+# * openssh-client: provides ssh-keygen
 
 echo Installing system packages...
 apt_install python3 python3-dev python3-pip \
 	netcat-openbsd wget curl git sudo coreutils bc \
-	haveged pollinate unzip \
+	haveged pollinate openssh-client unzip \
 	unattended-upgrades cron ntp fail2ban rsyslog
 
 # ### Suppress Upgrade Prompts

From a67f90593db50242dc6428b0c85ad46d2e3768bd Mon Sep 17 00:00:00 2001
From: Bart <bart_louwers@hotmail.com>
Date: Fri, 20 Dec 2019 00:33:36 +0100
Subject: [PATCH 3/3] Replace dead link with archive.org link (#1698)

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

diff --git a/README.md b/README.md
index 88735bcc..ca4c0538 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Our goals are to:
 
 * Make deploying a good mail server easy.
 * Promote [decentralization](http://redecentralize.org/), innovation, and privacy on the web.
-* Have automated, auditable, and [idempotent](https://sharknet.us/2014/02/01/automated-configuration-management-challenges-with-idempotency/) configuration.
+* Have automated, auditable, and [idempotent](https://web.archive.org/web/20190518072631/https://sharknet.us/2014/02/01/automated-configuration-management-challenges-with-idempotency/) configuration.
 * **Not** make a totally unhackable, NSA-proof server.
 * **Not** make something customizable by power users.