From fb00d667477ffab22040b8b75714d2baf45b3a4a Mon Sep 17 00:00:00 2001
From: Jack Ivanov <17044561+jackivanov@users.noreply.github.com>
Date: Mon, 3 Jun 2019 20:08:06 +0200
Subject: [PATCH 1/3] Update Dockerfile (#1466)

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 14036294..6fa1d0fc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,7 +20,7 @@ RUN apk --no-cache add ${BUILD_PACKAGES} && \
     python -m pip --no-cache-dir install virtualenv && \
     python -m virtualenv env && \
     source env/bin/activate && \
-    python -m pip --no-cache-dir install -r requirements.txt --no-use-pep51 && \
+    python -m pip --no-cache-dir install -r requirements.txt && \
     apk del ${BUILD_PACKAGES}
 COPY . .
 RUN chmod 0755 /algo/algo-docker.sh

From 6b2defe470f7fc2d4f9053c69f860e1810a953a6 Mon Sep 17 00:00:00 2001
From: TC1977 <37350377+TC1977@users.noreply.github.com>
Date: Mon, 3 Jun 2019 14:08:53 -0400
Subject: [PATCH 2/3] Update deploy-from-ansible.md (#1464)

Merged redundant and contradictory "Local install" instructions.
---
 docs/deploy-from-ansible.md | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/docs/deploy-from-ansible.md b/docs/deploy-from-ansible.md
index f26de00d..8429430a 100644
--- a/docs/deploy-from-ansible.md
+++ b/docs/deploy-from-ansible.md
@@ -83,9 +83,11 @@ Note: The `strongswan` role generates Apple profiles with On-Demand Wifi and Cel
 
 - role: local, provider: local
 
-Required variables:
+This role is intended to be run for local install onto an Ubuntu server, or onto an unsupported cloud provider's Ubuntu instance. Required variables:
 
-- server - IP address of your server
+- server - IP address of your server (or "localhost" if deploying to the local machine)
+- endpoint - public IP address of the server you're installing on
+- ssh_user - name of the SSH user you will use to install on the machine (passwordless login required). If `server=localhost`, this isn't required.
 - ca_password - Password for the private CA key
 
 Note that by default, the iptables rules on your existing server will be overwritten. If you don't want to overwrite the iptables rules, you can use the `--skip-tags iptables` flag.
@@ -249,16 +251,6 @@ Required variables:
 
 You need to source the rc file prior to run Algo. Download it from the OpenStack dashboard->Compute->API Access and source it in the shell (eg: source /tmp/dhc-openrc.sh)
 
-
-### Local
-
-Required variables:
-
-- server - IP or hostname to access the server via SSH
-- endpoint - Public IP address or domain name of your server
-- ssh_user
-
-
 ### Update users
 
 Playbook:

From ac6b543134395031c4ac8742b10f8fb8c8b5f072 Mon Sep 17 00:00:00 2001
From: TC1977 <37350377+TC1977@users.noreply.github.com>
Date: Tue, 4 Jun 2019 12:03:10 -0400
Subject: [PATCH 3/3] Update deploy-to-unsupported-cloud.md (#1467)

Future-proofs the "unsupported cloud providers" list.
---
 docs/deploy-to-unsupported-cloud.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/deploy-to-unsupported-cloud.md b/docs/deploy-to-unsupported-cloud.md
index e6d03e80..24c2b81d 100644
--- a/docs/deploy-to-unsupported-cloud.md
+++ b/docs/deploy-to-unsupported-cloud.md
@@ -1,6 +1,6 @@
 # Unsupported Cloud Providers
 
-Algo officially supports DigitalOcean, Amazon Web Services, Microsoft Azure, and Google Cloud Engine. If you want to deploy Algo on another virtual hosting provider, that provider must support:
+Algo officially supports the [cloud providers listed here](https://github.com/trailofbits/algo/blob/master/README.md#deploy-the-algo-server). If you want to deploy Algo on another virtual hosting provider, that provider must support:
 
 1. the base operating system image that Algo uses (Ubuntu 18.04, 19.04), and
 2. a minimum of certain kernel modules required for the strongSwan IPsec server.