Merge branch 'master' into ubuntu_1804

Installation.md

@@ -83,16 +83,18 @@ sudo python2.7 -m ensurepip
 
   git clone https://github.com/StreisandEffect/streisand.git && cd streisand
 
-1. Run the installer for Ansible and its dependencies. The installer will detect missing packages, and print the commands needed to install them.
+1. Run the installer for Ansible and its dependencies. The installer will detect missing packages, and print the commands needed to install them. (Ignore the Python 2.7 `DEPRECATION` warning; ignore the warning from python-novaclient that pbr 5.1.3 is incompatible.)
+
+ ./util/venv-dependencies.sh ./venv
 
-  ./util/venv-dependencies.sh ./venv
 1. Activate the Ansible packages that were installed.
 
   source ./venv/bin/activate
 
 1. Execute the Streisand script.
 
   ./streisand
+
 1. Follow the prompts to choose your provider, the physical region for the server, and its name. You will also be asked to enter API information.
 1. Once login information and API keys are entered, Streisand will begin spinning up a new remote server.
 1. Wait for the setup to complete (this usually takes around ten minutes) and look for the corresponding files in the `generated-docs` folder in the Streisand repository directory. The HTML file will explain how to connect to the Gateway over SSL, or via the Tor hidden service. All instructions, files, mirrored clients, and keys for the new server can then be found on the Gateway. You are all done!

streisand

@@ -6,6 +6,10 @@ set -e
 
 echo -e "\n\033[38;5;255m\033[48;5;234m\033[1m S T R E I S A N D \033[0m\n"
 
+# This is where Ansible looks for local modules. Disable it, in the
+# interests of consistency between installs.
+export ANSIBLE_LIBRARY=
+
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 
 DEFAULT_SITE_VARS="$SCRIPT_DIR/global_vars/default-site.yml"