Merge remote-tracking branch 'upstream/master'

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

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:

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.