Merge branch 'master' into bye-bye-nginx-proxy

.gitignore

@@ -1,7 +1,4 @@
-/inventory/*
-!/inventory/.gitkeep
-!/inventory/host_vars/.gitkeep
-!/inventory/scripts
+/inventory
 /roles/**/files/scratchpad
 .DS_Store
 .python-version

docs/configuring-playbook.md

@@ -18,7 +18,9 @@ You can then follow these steps inside the playbook directory:
 
 1. edit the inventory hosts file (`inventory/hosts`) to your liking
 
-1. (optional, advanced) to run Ansible against multiple servers with different `sudo` credentials, you can copy the sample inventory hosts yaml file for each of your hosts: (`cp examples/host.yml inventory/my_host1.yml` …) and use the [`ansible-all-hosts.sh`](../inventory/scripts/ansible-all-hosts.sh) script [in the installation step](installing.md).
+2. (optional, advanced) you may wish to keep your `inventory` directory under version control with [git](https://git-scm.com/) or any other version-control system.
+
+3. (optional, advanced) to run Ansible against multiple servers with different `sudo` credentials, you can copy the sample inventory hosts yaml file for each of your hosts: (`cp examples/host.yml inventory/my_host1.yml` …) and use the [`ansible-all-hosts.sh`](../bin/ansible-all-hosts.sh) script [in the installation step](installing.md).
 
 For a basic Matrix installation, that's all you need.
 For a more custom setup, see the [Other configuration options](#other-configuration-options) below.

examples/host.yml

@@ -1,6 +1,6 @@
 ---
 
-# This is a host file for usage with the `ansible-all-hosts.sh` script,
+# This is a host file for usage with the `../bin/ansible-all-hosts.sh` script,
 # which runs Ansible against a bunch of hosts, each with its own `sudo` password.
 matrix_servers:
   hosts: