From df18284ef604ebfb0a6ee73ba18144badce25206 Mon Sep 17 00:00:00 2001
From: "Shawn S. Smiley" <shawn.smiley@achieveinternet.com>
Date: Tue, 7 Jul 2015 20:12:17 -0700
Subject: [PATCH 0001/1273] Added support for the vagrant-auto_network plugin.

---
 README.md   | 3 +++
 Vagrantfile | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3a31be2c7..e6a29daa9 100644
--- a/README.md
+++ b/README.md
@@ -74,6 +74,9 @@ Note: *If there are any errors during the course of running `vagrant up`, and it
 ### 3 - Configure your host machine to access the VM.
 
   1. [Edit your hosts file](http://www.rackspace.com/knowledge_center/article/how-do-i-modify-my-hosts-file), adding the line `192.168.88.88  drupalvm.dev` so you can connect to the VM. Alternatively, you can install a Vagrant plugin to automatically add and remove the entry from your hosts file; run `vagrant plugin install vagrant-hostsupdater`. The plugin will also add in all other hosts defined via `apache_vhosts`.
+    - You can have vagrant automatically assign IP addresses to your VM by adding the vagrant-auto_network plugin (`vagrant plugin install vagrant-auto_network`).
+    - To use the vagrant-auto_network plugin, set the vagrant_ip setting in your config.yml file to "0.0.0.0"
+      NOTE: You will want to use the vagrant-hostsupdater plugin in combination with vagrant-auto_network.
   2. Open your browser and access [http://drupalvm.dev/](http://drupalvm.dev/). The default login for the admin account is `admin` for both the username and password.
 
 ## Extra software/utilities
diff --git a/Vagrantfile b/Vagrantfile
index 8ca381289..5e3af5283 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -16,7 +16,11 @@ is_windows = (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.hostname = vconfig['vagrant_hostname']
-  config.vm.network :private_network, ip: vconfig['vagrant_ip']
+  if vconfig['vagrant_ip'] == "0.0.0.0" && Vagrant.has_plugin?("vagrant-auto_network")
+    config.vm.network :private_network, :ip => "0.0.0.0", :auto_network => true
+  else
+    config.vm.network :private_network, ip: vconfig['vagrant_ip']
+  end
   config.ssh.insert_key = false
   config.ssh.forward_agent = true
 

From 5acd5e57dd095319130bc2459bf4c4adef47bce9 Mon Sep 17 00:00:00 2001
From: Sidney Gijzen <sidneygijzen@users.noreply.github.com>
Date: Wed, 29 Jul 2015 14:16:47 +0200
Subject: [PATCH 0002/1273] Updated documentation links

To point to http://docs.drupalvm.com instead of the Github wiki
---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index a65c8c1fc..0fd94ebb4 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ It will install the following on an Ubuntu 14.04 (by default) linux VM:
 
 It should take 5-10 minutes to build or rebuild the VM from scratch on a decent broadband connection.
 
-Please read through the rest of this README and the [Drupal VM Wiki](https://github.com/geerlingguy/drupal-vm/wiki) for help getting Drupal VM configured and integrated with your development workflow.
+Please read through the rest of this README and the [Drupal VM documentation](http://docs.drupalvm.com/) for help getting Drupal VM configured and integrated with your development workflow.
 
 ## Documentation
 
@@ -47,7 +47,7 @@ If you want to switch from Drupal 8 (default) to Drupal 7 or 6 on the initial in
 
 ## Quick Start Guide
 
-This Quick Start Guide will help you quickly build a Drupal 8 site on the Drupal VM using the included example Drush make file. You can also use the Drupal VM with a [Local Drupal codebase](https://github.com/geerlingguy/drupal-vm/wiki/Local-Drupal-codebase) or even a [Drupal multisite installation](https://github.com/geerlingguy/drupal-vm/wiki/Drupal-multisite).
+This Quick Start Guide will help you quickly build a Drupal 8 site on the Drupal VM using the included example Drush make file. You can also use the Drupal VM with a [Local Drupal codebase](http://docs.drupalvm.com/en/latest/deployment/local-codebase/) or even a [Drupal multisite installation](http://docs.drupalvm.com/en/latest/deployment/multisite/).
 
 ### 1 - Install dependencies (VirtualBox, Vagrant, Ansible)
 
@@ -98,7 +98,7 @@ If you don't want or need one or more of these extras, just delete them or comme
 
 ## Using Drupal VM
 
-Drupal VM is built to integrate with every developer's workflow. Many guides for using Drupal VM for common development tasks are available on the [Drupal VM Wiki](https://github.com/geerlingguy/drupal-vm/wiki):
+Drupal VM is built to integrate with every developer's workflow. Many guides for using Drupal VM for common development tasks are available on the [Drupal VM documentation site](http://docs.drupalvm.com):
 
   - [Syncing Folders](http://docs.drupalvm.com/en/latest/extras/syncing-folders/)
   - [Connect to the MySQL Database](http://docs.drupalvm.com/en/latest/extras/mysql/)

From ac4584593dda7f81141aa127904f087ab9dc5241 Mon Sep 17 00:00:00 2001
From: Sidney Gijzen <sidneygijzen@users.noreply.github.com>
Date: Wed, 29 Jul 2015 14:18:45 +0200
Subject: [PATCH 0003/1273] Updated documentation link

To point to http://docs.drupalvm.com instead of the Github wiki.
---
 example.config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/example.config.yml b/example.config.yml
index 50d0fc0c4..589e89840 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -12,7 +12,7 @@ vagrant_ip: 192.168.88.88
 
 # A list of synced folders, with the keys 'local_path', 'destination', 'id', and
 # a 'type' of [nfs|rsync|smb] (leave empty for slow native shares). See
-# https://github.com/geerlingguy/drupal-vm/wiki/Syncing-Folders for more info.
+# http://docs.drupalvm.com/en/latest/extras/syncing-folders/ for more info.
 vagrant_synced_folders:
   # The first synced folder will be used for the default Drupal installation, if
   # build_from_makefile is 'true'.

From 57434b0a901beefa49556884008df4c9872a7d41 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 29 Jul 2015 08:12:37 -0500
Subject: [PATCH 0004/1273] PR #155: Adjust documentation slightly for
 auto_network plugin.

---
 README.md   | 7 +++----
 Vagrantfile | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 7efa6c890..97206b15a 100644
--- a/README.md
+++ b/README.md
@@ -76,10 +76,9 @@ Note: *If there are any errors during the course of running `vagrant up`, and it
 
 ### 3 - Configure your host machine to access the VM.
 
-  1. [Edit your hosts file](http://www.rackspace.com/knowledge_center/article/how-do-i-modify-my-hosts-file), adding the line `192.168.88.88  drupalvm.dev` so you can connect to the VM. Alternatively, you can install a Vagrant plugin to automatically add and remove the entry from your hosts file; run `vagrant plugin install vagrant-hostsupdater`. The plugin will also add in all other hosts defined via `apache_vhosts`.
-    - You can have vagrant automatically assign IP addresses to your VM by adding the vagrant-auto_network plugin (`vagrant plugin install vagrant-auto_network`).
-    - To use the vagrant-auto_network plugin, set the vagrant_ip setting in your config.yml file to "0.0.0.0"
-      NOTE: You will want to use the vagrant-hostsupdater plugin in combination with vagrant-auto_network.
+  1. [Edit your hosts file](http://www.rackspace.com/knowledge_center/article/how-do-i-modify-my-hosts-file), adding the line `192.168.88.88  drupalvm.dev` so you can connect to the VM.
+    - You can have Vagrant automatically configure your hosts file if you install the `hostsupdater` plugin (`vagrant plugin install vagrant-hostsupdater`). All hosts defined in `apache_vhosts` will be automatically managed.
+    - You can also have Vagrant automatically assign an available IP address to your VM if you install the `auto_network` plugin (`vagrant plugin install vagrant-auto_network`), and set `vagrant_ip` to `0.0.0.0` inside `config.yml`.
   2. Open your browser and access [http://drupalvm.dev/](http://drupalvm.dev/). The default login for the admin account is `admin` for both the username and password.
 
 ## Extra software/utilities
diff --git a/Vagrantfile b/Vagrantfile
index dba872c11..ab9a4e776 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -17,7 +17,7 @@ is_windows = (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.hostname = vconfig['vagrant_hostname']
   if vconfig['vagrant_ip'] == "0.0.0.0" && Vagrant.has_plugin?("vagrant-auto_network")
-    config.vm.network :private_network, :ip => "0.0.0.0", :auto_network => true
+    config.vm.network :private_network, :ip => vconfig['vagrant_ip'], :auto_network => true
   else
     config.vm.network :private_network, ip: vconfig['vagrant_ip']
   end

From fd73a1ece2996f9092d82b100233c991e66c9636 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 29 Jul 2015 08:21:49 -0500
Subject: [PATCH 0005/1273] PR #155: Add 'Networking Notes' section to docs.

---
 docs/other/networking.md | 12 ++++++++++++
 mkdocs.yml               |  1 +
 2 files changed, 13 insertions(+)
 create mode 100644 docs/other/networking.md

diff --git a/docs/other/networking.md b/docs/other/networking.md
new file mode 100644
index 000000000..3604e3723
--- /dev/null
+++ b/docs/other/networking.md
@@ -0,0 +1,12 @@
+Since Vagrant manages internal network connections for Drupal VM, and since every person's network setup is unique, there are sometimes networking issues that require some adjustments to your Drupal VM configuration or a computer reboot.
+
+## Network Route Collision
+
+Drupal VM comes configured with the default IP address `192.168.88.88`. If you're connected to a LAN with the same private IP address range (e.g. `192.168.x.x`), then VirtualBox or VMware will not be able to set up the VM with the default IP address, because that would conflict with the `192.168.x.x` network your computer is using.
+
+In this case, you have two options:
+
+  1. Switch the `vagrant_ip` in `config.yml` to a different private IP address, e.g. `172.16.0.88` or `10.0.1.88`.
+  2. Install the `vagrant-auto_network` plugin (`vagrant plugin install vagrant-auto_network`), and set the `vagrant_ip` to `0.0.0.0`.
+
+Another cause of route collisions is the use of multiple VM providers on your computer. If you have both VirtualBox and VMware Fusion, and you have VMs running in both, and you attempt to use the same IP range in both providers, you'll hit a networking conflict. In this case, the only easy way to restore connectivity is to restart your host machine.
diff --git a/mkdocs.yml b/mkdocs.yml
index 028095faa..f8721d58a 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -30,6 +30,7 @@ pages:
   - Other Information:
     - 'Using Different Base OSes': 'other/base-os.md'
     - 'PHP 7 on Drupal VM': 'other/php-7.md'
+    - 'Networking Notes': 'other/networking.md'
     - 'Drupal 6 Notes': 'other/drupal-6.md'
     - 'Windows Notes': 'other/windows.md'
     - 'Cloning Drupal VM with newd': 'other/cloning-with-newd.md'

From 94dc0f8dc51cc0b25b5d9d67118c95bbe8cdacad Mon Sep 17 00:00:00 2001
From: Christopher Panza <christopherpanza@gmail.com>
Date: Mon, 3 Aug 2015 00:10:51 -0400
Subject: [PATCH 0006/1273] Update documentation for xhprof and pimpmylog urls

---
 docs/extras/pimpmylog.md | 4 ++--
 docs/extras/xhprof.md    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/extras/pimpmylog.md b/docs/extras/pimpmylog.md
index 1abed918a..c7634eb67 100644
--- a/docs/extras/pimpmylog.md
+++ b/docs/extras/pimpmylog.md
@@ -1,8 +1,8 @@
-[Pimp my Log](http://pimpmylog.com/) is a PHP-based web GUI for viewing log files on a given server. By default, it is installed on Drupal VM, and you can access it at the URL `http://local.pimpmylog.com/` (as long as you have a hosts entry for that URL pointing at Drupal VM's IP address!).
+[Pimp my Log](http://pimpmylog.com/) is a PHP-based web GUI for viewing log files on a given server. By default, it is installed on Drupal VM, and you can access it at the URL `http://pimpmylog.drupalvm.dev/` (as long as you have a hosts entry for that URL pointing at Drupal VM's IP address!).
 
 By default, it will find the default Apache 2 `access.log` and `error.log` files, but it will not find other logs, like MySQL or extra Apache virtualhost logs.
 
-When configuring Pimp my Log (on the first visit to the `local.pimpmylog.com` URL), you can add extra paths in the UI, or you can add them after the fact by manually editing the configuration file, which by default is stored at `/usr/share/php/pimpmylog/config.user.php`. You can also delete that file and re-configure Pimp my Log via the web UI.
+When configuring Pimp my Log (on the first visit to the `pimpmylog.drupalvm.dev` URL), you can add extra paths in the UI, or you can add them after the fact by manually editing the configuration file, which by default is stored at `/usr/share/php/pimpmylog/config.user.php`. You can also delete that file and re-configure Pimp my Log via the web UI.
 
 Some log files you may be interested in monitoring:
 
diff --git a/docs/extras/xhprof.md b/docs/extras/xhprof.md
index 1609e1047..19b43a882 100644
--- a/docs/extras/xhprof.md
+++ b/docs/extras/xhprof.md
@@ -11,4 +11,4 @@ The XHProf module doesn't yet include support for callgraphs, but there's an iss
 The Devel module also *used* to provide XHProf configuration, and setting the options below would allow Devel's XHProf integration to work correctly with Drupal VM's XHProf installation:
 
   - **xhprof directory**: `/usr/share/php`
-  - **XHProf URL**: `http://local.xhprof.com/` (assuming this domain is configured in `apache_vhosts` inside `config.yml`)
\ No newline at end of file
+  - **XHProf URL**: `http://xhprof.drupalvm.dev/` (assuming this domain is configured in `apache_vhosts` inside `config.yml`)

From f910a4e66a590dd5870b0b8c2e546f17536480e2 Mon Sep 17 00:00:00 2001
From: Moshe Weitzman <weitzman@tejasa.com>
Date: Mon, 3 Aug 2015 13:51:26 -0400
Subject: [PATCH 0007/1273] Avoid Drupal installer exception for xdebug nesting
 level

```
Exception 'Drupal\Core\Installer\Exception\InstallerException' with message 'Xdebug settings: xdebug.max_nesting_level is set to 255.

Set xdebug.max_nesting_level=256 in your PHP configuration as some pages in your Drupal site will not work when
this setting is too low.' in /var/www/drupal/core/includes/install.core.inc:2292
```
---
 example.config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/example.config.yml b/example.config.yml
index 589e89840..beb1b01b2 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -163,7 +163,7 @@ php_xdebug_remote_enable: 1
 php_xdebug_remote_connect_back: 1
 # Use PHPSTORM for PHPStorm, sublime.xdebug for Sublime Text.
 php_xdebug_idekey: PHPSTORM
-php_xdebug_max_nesting_level: 255
+php_xdebug_max_nesting_level: 256
 
 # Solr Configuration (if enabled above).
 solr_version: "4.10.4"

From 34583aee835f14096a10fd915f2b3e2ed7764eaf Mon Sep 17 00:00:00 2001
From: Sidney Gijzen <info@puzzlingpanda.nl>
Date: Tue, 4 Aug 2015 17:35:19 +0200
Subject: [PATCH 0008/1273] Fix formatting and add note about permission
 settings on some log files.

---
 docs/extras/pimpmylog.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/extras/pimpmylog.md b/docs/extras/pimpmylog.md
index c7634eb67..46b0b69bc 100644
--- a/docs/extras/pimpmylog.md
+++ b/docs/extras/pimpmylog.md
@@ -10,7 +10,9 @@ Some log files you may be interested in monitoring:
   - `/var/log/apache2/error.log` (this log will show Apache and PHP notices/warnings/errors)
   - `/var/log/apache2/other_vhosts_access.log`
   - `/var/log/mysql.err` (MySQL error log)
-  - `/var/log/mysql-slow.log (MySQL slow query log)
+  - `/var/log/mysql-slow.log` (MySQL slow query log)
   - `/var/log/syslog` (enable the Drupal syslog module to route watchdog log entries to this file)
 
-For MySQL logs, you might want to read through the PML docs on [MySQL](http://support.pimpmylog.com/kb/softwares/mysql).
\ No newline at end of file
+For MySQL logs, you might want to read through the PML docs on [MySQL](http://support.pimpmylog.com/kb/softwares/mysql).
+
+It might be necessary to grant read permissions to the other group (e.g. `chmod o+r /var/log/mysql.err`) on some log files in order for Pimp My Log to be able to parse them.

From 030e492f6cff75441aebc5bbbcd4fe52c93eaff5 Mon Sep 17 00:00:00 2001
From: cthos <daginus@gmail.com>
Date: Thu, 6 Aug 2015 10:01:09 -0700
Subject: [PATCH 0009/1273] Set example mysql_wait_timeout to 300.

---
 example.config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/example.config.yml b/example.config.yml
index beb1b01b2..6bb543d57 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -143,6 +143,7 @@ composer_home_path: '/home/vagrant/.composer'
 mysql_root_password: root
 mysql_slow_query_log_enabled: true
 mysql_slow_query_time: 2
+mysql_wait_timeout: 300
 adminer_add_apache_config: true
 
 # Varnish Configuration.

From 5e0a2deeab7ae7e6366b4eafd204a9cb911e46fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Fri, 7 Aug 2015 23:42:21 -0500
Subject: [PATCH 0010/1273] Issue #186: Do not accept locale environment
 variables passed over SSH

---
 provisioning/playbook.yml   | 1 +
 provisioning/tasks/sshd.yml | 7 +++++++
 2 files changed, 8 insertions(+)
 create mode 100644 provisioning/tasks/sshd.yml

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 3b07db67b..428174116 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -46,6 +46,7 @@
       stat: "path={{ drupal_core_path }}/index.php"
       register: drupal_site
 
+    - include: tasks/sshd.yml
     - include: tasks/extras.yml
     - include: tasks/www.yml
     - include: tasks/apparmor.yml
diff --git a/provisioning/tasks/sshd.yml b/provisioning/tasks/sshd.yml
new file mode 100644
index 000000000..262430b0c
--- /dev/null
+++ b/provisioning/tasks/sshd.yml
@@ -0,0 +1,7 @@
+---
+- name: Do not accept locale environment variables passed over SSH.
+  lineinfile:
+    dest: /etc/ssh/sshd_config
+    regexp: "^AcceptEnv LANG"
+    state: absent
+    validate: "/usr/sbin/sshd -T -f %s"

From 3d974aac7ce662484beec8cfe78f4d5b12b84417 Mon Sep 17 00:00:00 2001
From: Sidney Gijzen <info@puzzlingpanda.nl>
Date: Wed, 12 Aug 2015 21:38:19 +0200
Subject: [PATCH 0011/1273] Add a bit more explanation to the extra_packages
 variable

---
 example.config.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/example.config.yml b/example.config.yml
index 6bb543d57..9d155b5cc 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -100,7 +100,9 @@ installed_extras:
   - xdebug
   - xhprof
 
-# Add any extra packages you'd like to install.
+# Add any extra apt or yum packages. Use the apt or yum package name to
+# indicate which package you'd like to install. E.g. the unzip apt package is
+# used by Drush to unzip libraries downloaded by Drush make files. 
 extra_packages: []
 
 # You can configure almost anything else on the server in the rest of this file.

From 230d97557794def17d789e27c305f0c43cd49dd1 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 14 Aug 2015 18:39:56 -0500
Subject: [PATCH 0012/1273] Fixes #200: Java role is always installed,
 regardless of installed_extras.

---
 provisioning/playbook.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 3b07db67b..c4759af7f 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -33,7 +33,7 @@
     - { role: geerlingguy.pimpmylog, when: '"pimpmylog" in installed_extras' }
     - { role: geerlingguy.daemonize, when: '"mailhog" in installed_extras' }
     - { role: geerlingguy.mailhog, when: '"mailhog" in installed_extras' }
-    - { role: geerlingguy.java, when: '"solr" or "selenium" in installed_extras' }
+    - { role: geerlingguy.java, when: '"solr" in installed_extras or "selenium" in installed_extras' }
     - { role: arknoll.selenium, when: '"selenium" in installed_extras' }
     - { role: geerlingguy.solr, when: '"solr" in installed_extras' }
     - { role: geerlingguy.varnish, when: '"varnish" in installed_extras' }

From 42877d1e6b106c790b13b6f859b9bc19c300b63a Mon Sep 17 00:00:00 2001
From: Andrei Simion <andrei.simion@fluxus.io>
Date: Tue, 18 Aug 2015 11:38:50 +0100
Subject: [PATCH 0013/1273] Pass the port number from the Vagrant autogenerated
 inventory

---
 provisioning/templates/drupalvm.aliases.drushrc.php.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/templates/drupalvm.aliases.drushrc.php.j2 b/provisioning/templates/drupalvm.aliases.drushrc.php.j2
index 9f1138518..eab5d77af 100644
--- a/provisioning/templates/drupalvm.aliases.drushrc.php.j2
+++ b/provisioning/templates/drupalvm.aliases.drushrc.php.j2
@@ -12,7 +12,7 @@ $aliases['{{ vhost.servername }}'] = array(
   'root' => '{{ vhost.documentroot }}',
   'remote-host' => '{{ vhost.servername }}',
   'remote-user' => 'vagrant',
-  'ssh-options' => '-o PasswordAuthentication=no -i ~/.vagrant.d/insecure_private_key',
+  'ssh-options' => '-p {{ ansible_ssh_port }} -o PasswordAuthentication=no -i ~/.vagrant.d/insecure_private_key',
 );
 
 {% endfor %}

From 83320b2943a57f3668e9b9029eaf48c4121f73ca Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 18 Aug 2015 14:07:30 -0700
Subject: [PATCH 0014/1273] PR #195: Better language for extra_packages
 variable.

---
 example.config.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/example.config.yml b/example.config.yml
index 9d155b5cc..764230333 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -100,10 +100,9 @@ installed_extras:
   - xdebug
   - xhprof
 
-# Add any extra apt or yum packages. Use the apt or yum package name to
-# indicate which package you'd like to install. E.g. the unzip apt package is
-# used by Drush to unzip libraries downloaded by Drush make files. 
-extra_packages: []
+# Add any extra apt or yum packages you would like installed.
+extra_packages:
+  - unzip
 
 # You can configure almost anything else on the server in the rest of this file.
 extra_security_enabled: false

From 72ba56bbe93e46f7e848eff0af54513aa850b8f7 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 18 Aug 2015 14:55:38 -0700
Subject: [PATCH 0015/1273] Update JJG-Ansible-Windows dependency.

---
 provisioning/JJG-Ansible-Windows/windows.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/JJG-Ansible-Windows/windows.sh b/provisioning/JJG-Ansible-Windows/windows.sh
index 9ef898bae..f6d045eef 100644
--- a/provisioning/JJG-Ansible-Windows/windows.sh
+++ b/provisioning/JJG-Ansible-Windows/windows.sh
@@ -50,7 +50,7 @@ fi
 
 # Install requirements.
 echo "Installing Ansible roles from requirements file, if available."
-find "/vagrant/$PLAYBOOK_DIR" \( -name "requirements.yml" -o -name "requirements.txt" \) -exec sudo ansible-galaxy install -r {} \;
+find "/vagrant/$PLAYBOOK_DIR" \( -name "requirements.yml" -o -name "requirements.txt" \) -exec sudo ansible-galaxy install --ignore-errors -r {} \;
 
 # Run the playbook.
 echo "Running Ansible provisioner defined in Vagrantfile."

From c3baf7e0695feaa0b9d9635832d341a786f8ab30 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 18 Aug 2015 16:16:39 -0700
Subject: [PATCH 0016/1273] Issue #199: Use Ansible inside VM if Ansible is not
 present on the host.

---
 Vagrantfile | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index ab9a4e776..7aa27bf97 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -2,6 +2,18 @@
 # vi: set ft=ruby :
 VAGRANTFILE_API_VERSION = "2"
 
+# Cross-platform way of finding an executable in the $PATH.
+def which(cmd)
+  exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+  ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+    exts.each { |ext|
+      exe = File.join(path, "#{cmd}#{ext}")
+      return exe if File.executable?(exe) && !File.directory?(exe)
+    }
+  end
+  return nil
+end
+
 # Use config.yml for basic VM configuration.
 require 'yaml'
 dir = File.dirname(File.expand_path(__FILE__))
@@ -10,10 +22,6 @@ if !File.exist?("#{dir}/config.yml")
 end
 vconfig = YAML::load_file("#{dir}/config.yml")
 
-# Use rbconfig to determine if we're on a windows host or not.
-require 'rbconfig'
-is_windows = (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
-
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.hostname = vconfig['vagrant_hostname']
   if vconfig['vagrant_ip'] == "0.0.0.0" && Vagrant.has_plugin?("vagrant-auto_network")
@@ -48,18 +56,18 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       mount_options: synced_folder.include?('mount_options') ? synced_folder['mount_options'] : []
   end
 
-  if is_windows
-    # Provisioning configuration for shell script (for Windows).
-    config.vm.provision "shell" do |sh|
-      sh.path = "#{dir}/provisioning/JJG-Ansible-Windows/windows.sh"
-      sh.args = "/provisioning/playbook.yml"
-    end
-  else
-    # Provisioning configuration for Ansible (for Mac/Linux hosts).
+  # Provision using Ansible provisioner if Ansible is installed on host.
+  if which('ansible-playbook')
     config.vm.provision "ansible" do |ansible|
       ansible.playbook = "#{dir}/provisioning/playbook.yml"
       ansible.sudo = true
     end
+  # Provision using shell provisioner and JJG-Ansible-Windows otherwise.
+  else
+    config.vm.provision "shell" do |sh|
+      sh.path = "#{dir}/provisioning/JJG-Ansible-Windows/windows.sh"
+      sh.args = "/provisioning/playbook.yml"
+    end
   end
 
   # VMware Fusion.

From 4e00d8fc09695581094fac2ab93ddfbeb8072dac Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 19 Aug 2015 17:15:58 -0700
Subject: [PATCH 0017/1273] Better spacing for code example.

---
 docs/other/php-7.md | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/docs/other/php-7.md b/docs/other/php-7.md
index 620aff684..fe717a4b4 100644
--- a/docs/other/php-7.md
+++ b/docs/other/php-7.md
@@ -30,25 +30,26 @@ However, there's currently a bug with the beta1 version of the package, which ca
 After configuring Drupal VM to [use a different base OS](https://github.com/geerlingguy/drupal-vm/wiki/Using-Different-Base-OSes) (in this case, CentOS 7), you need to do the following to get PHP 7 running inside the VM:
 
   1. Make the following changes to `config.yml`:
-    ```yaml
-    # Changes to make PHP 7 work in CentOS via Remi's repo.
-    php_executable: php70
-    php_packages:
-      - ImageMagick
-      - php70
-      - php70-php
-      - php70-fakepear
-      - php70-php-devel
-      - php70-php-gd
-      - php70-php-imap
-      - php70-php-ldap
-      - php70-php-mbstring
-      - php70-php-pdo
-      - php70-php-process
-      - php70-php-xml
-      - php70-php-xmlrpc
-    php_mysql_package: php70-php-mysqlnd
-    ```
+
+      ```yaml
+      # Changes to make PHP 7 work in CentOS via Remi's repo.
+      php_executable: php70
+      php_packages:
+        - ImageMagick
+        - php70
+        - php70-php
+        - php70-fakepear
+        - php70-php-devel
+        - php70-php-gd
+        - php70-php-imap
+        - php70-php-ldap
+        - php70-php-mbstring
+        - php70-php-pdo
+        - php70-php-process
+        - php70-php-xml
+        - php70-php-xmlrpc
+      php_mysql_package: php70-php-mysqlnd
+      ```
 
   2. At this time, automatic install of `xhprof` and `xdebug` are unsupported. Make sure these options are commented or removed from the `installed_extras` setting in `config.yml`.
 

From cf8ae4fe2720f153ec7022d339a6108740c2587b Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 19 Aug 2015 17:20:20 -0700
Subject: [PATCH 0018/1273] Fixes #199: Use Ansible inside VM if Ansible is not
 present on the host - docs.

---
 README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 97206b15a..58adfb94b 100644
--- a/README.md
+++ b/README.md
@@ -53,13 +53,12 @@ This Quick Start Guide will help you quickly build a Drupal 8 site on the Drupal
 
   1. Download and install [VirtualBox](https://www.virtualbox.org/wiki/Downloads) (Drupal VM also works with Parallels or VMware, if you have the [Vagrant VMware integration plugin](http://www.vagrantup.com/vmware)).
   2. Download and install [Vagrant](http://www.vagrantup.com/downloads.html).
-  3. [Mac/Linux only] Install [Ansible](http://docs.ansible.com/intro_installation.html).
 
-Note for Windows users: *Ansible will be installed inside the VM, and everything will be configured internally (unlike on Mac/Linux hosts). See [JJG-Ansible-Windows](https://github.com/geerlingguy/JJG-Ansible-Windows) for more information.*
+Note for Faster Provisioning (Mac/Linux only): *For faster and more efficient provisioning, you should [install Ansible](http://docs.ansible.com/intro_installation.html) on your host machine, so Drupal VM can run the provisioning steps locally instead of inside the VM.*
 
 Note for Linux users: *If NFS is not already installed on your host, you will need to install it to use the default NFS synced folder configuration. See guides for [Debian/Ubuntu](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-ubuntu-14-04), [Arch](https://wiki.archlinux.org/index.php/NFS#Installation), and [RHEL/CentOS](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-centos-6).*
 
-Note on versions: *Please make sure you're running the latest stable version of Vagrant, VirtualBox, and Ansible, as the current version of Drupal VM is tested with the latest releases. As of June 2015: Vagrant 1.7.2, VirtualBox 4.3.26, and Ansible 1.9.2.*
+Note on versions: *Please make sure you're running the latest stable version of Vagrant, VirtualBox, and Ansible, as the current version of Drupal VM is tested with the latest releases. As of August 2015: Vagrant 1.7.4, VirtualBox 5.0.2, and Ansible 1.9.2.*
 
 ### 2 - Build the Virtual Machine
 
@@ -69,8 +68,9 @@ Note on versions: *Please make sure you're running the latest stable version of
     - Copy `example.config.yml` to `config.yml`.
   3. Create a local directory where Drupal will be installed and configure the path to that directory in `config.yml` (`local_path`, inside `vagrant_synced_folders`).
   4. Open Terminal, cd to this directory (containing the `Vagrantfile` and this README file).
-  5. [Mac/Linux only] Install Ansible Galaxy roles required for this VM: `$ sudo ansible-galaxy install -r provisioning/requirements.txt --force`
-  6. Type in `vagrant up`, and let Vagrant do its magic.
+  5. Type in `vagrant up`, and let Vagrant do its magic.
+
+If you have Ansible installed on your host machine, run `$ sudo ansible-galaxy install -r provisioning/requirements.txt --force` prior to step 5 (`vagrant up`), otherwise Ansible will complain about missing roles.
 
 Note: *If there are any errors during the course of running `vagrant up`, and it drops you back to your command prompt, just run `vagrant provision` to continue building the VM from where you left off. If there are still errors after doing this a few times, post an issue to this project's issue queue on GitHub with the error.*
 

From 05e1a882a7cd17c3ccabacc5068e03a426d0bd0f Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 19 Aug 2015 17:21:16 -0700
Subject: [PATCH 0019/1273] Try to format PHP7 docs better.

---
 docs/other/php-7.md | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/docs/other/php-7.md b/docs/other/php-7.md
index fe717a4b4..81659fc71 100644
--- a/docs/other/php-7.md
+++ b/docs/other/php-7.md
@@ -31,25 +31,25 @@ After configuring Drupal VM to [use a different base OS](https://github.com/geer
 
   1. Make the following changes to `config.yml`:
 
-      ```yaml
-      # Changes to make PHP 7 work in CentOS via Remi's repo.
-      php_executable: php70
-      php_packages:
-        - ImageMagick
-        - php70
-        - php70-php
-        - php70-fakepear
-        - php70-php-devel
-        - php70-php-gd
-        - php70-php-imap
-        - php70-php-ldap
-        - php70-php-mbstring
-        - php70-php-pdo
-        - php70-php-process
-        - php70-php-xml
-        - php70-php-xmlrpc
-      php_mysql_package: php70-php-mysqlnd
-      ```
+    ```yaml
+    # Changes to make PHP 7 work in CentOS via Remi's repo.
+    php_executable: php70
+    php_packages:
+      - ImageMagick
+      - php70
+      - php70-php
+      - php70-fakepear
+      - php70-php-devel
+      - php70-php-gd
+      - php70-php-imap
+      - php70-php-ldap
+      - php70-php-mbstring
+      - php70-php-pdo
+      - php70-php-process
+      - php70-php-xml
+      - php70-php-xmlrpc
+    php_mysql_package: php70-php-mysqlnd
+    ```
 
   2. At this time, automatic install of `xhprof` and `xdebug` are unsupported. Make sure these options are commented or removed from the `installed_extras` setting in `config.yml`.
 

From 1d11628134f9cea0963173bf997cb7748af4479d Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 19 Aug 2015 17:25:06 -0700
Subject: [PATCH 0020/1273] Try to format PHP7 docs better x2.

---
 docs/other/php-7.md | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/docs/other/php-7.md b/docs/other/php-7.md
index 81659fc71..3edc9640c 100644
--- a/docs/other/php-7.md
+++ b/docs/other/php-7.md
@@ -29,7 +29,19 @@ However, there's currently a bug with the beta1 version of the package, which ca
 
 After configuring Drupal VM to [use a different base OS](https://github.com/geerlingguy/drupal-vm/wiki/Using-Different-Base-OSes) (in this case, CentOS 7), you need to do the following to get PHP 7 running inside the VM:
 
-  1. Make the following changes to `config.yml`:
+  1. Make the changes to `config.yml` defined in the code block at the end of these instructions ('Changes to make PHP 7 work...').
+
+  2. At this time, automatic install of `xhprof` and `xdebug` are unsupported. Make sure these options are commented or removed from the `installed_extras` setting in `config.yml`.
+
+  3. Run the normal `vagrant up` as you would with PHP 5.x, but when provisioning fails (usually on the Composer step), log into the VM with `vagrant ssh`, and run the following two commands:
+    ```
+    sudo ln -s /usr/bin/php70 /usr/bin/php
+    sudo systemctl restart httpd.service
+    ```
+
+  4. Log back out (type `exit` to exit the session in the VM) and run `vagrant provision`. This should pick back up where the provisioning left off earlier, and complete installation.
+
+Note: Make sure you're running the latest version of all Ansible role dependencies by running `ansible-galaxy install -r provisioning/requirements.txt --force` inside the root Drupal VM project folder.
 
     ```yaml
     # Changes to make PHP 7 work in CentOS via Remi's repo.
@@ -51,18 +63,6 @@ After configuring Drupal VM to [use a different base OS](https://github.com/geer
     php_mysql_package: php70-php-mysqlnd
     ```
 
-  2. At this time, automatic install of `xhprof` and `xdebug` are unsupported. Make sure these options are commented or removed from the `installed_extras` setting in `config.yml`.
-
-  3. Run the normal `vagrant up` as you would with PHP 5.x, but when provisioning fails (usually on the Composer step), log into the VM with `vagrant ssh`, and run the following two commands:
-    ```
-    sudo ln -s /usr/bin/php70 /usr/bin/php
-    sudo systemctl restart httpd.service
-    ```
-
-  4. Log back out (type `exit` to exit the session in the VM) and run `vagrant provision`. This should pick back up where the provisioning left off earlier, and complete installation.
-
-Note: Make sure you're running the latest version of all Ansible role dependencies by running `ansible-galaxy install -r provisioning/requirements.txt --force` inside the root Drupal VM project folder.
-
 ## Zend nightly PHP 7 builds
 
 Zend has a repository with [nightly PHP 7 builds](http://php7.zend.com/repo.php) for either RHEL/CentOS 7 or Debian 8/Ubuntu 14.04, but the repository requires some manual configuration and setup and is not going to be officially supported as a PHP 7 installation method within Drupal VM.
\ No newline at end of file

From 779f4e80f1dc0c093bde75656127d5db0e91362e Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 19 Aug 2015 19:27:27 -0500
Subject: [PATCH 0021/1273] Try to format PHP7 docs better - code formatting.

---
 docs/other/php-7.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/other/php-7.md b/docs/other/php-7.md
index 3edc9640c..703043603 100644
--- a/docs/other/php-7.md
+++ b/docs/other/php-7.md
@@ -43,7 +43,6 @@ After configuring Drupal VM to [use a different base OS](https://github.com/geer
 
 Note: Make sure you're running the latest version of all Ansible role dependencies by running `ansible-galaxy install -r provisioning/requirements.txt --force` inside the root Drupal VM project folder.
 
-    ```yaml
     # Changes to make PHP 7 work in CentOS via Remi's repo.
     php_executable: php70
     php_packages:
@@ -61,7 +60,6 @@ Note: Make sure you're running the latest version of all Ansible role dependenci
       - php70-php-xml
       - php70-php-xmlrpc
     php_mysql_package: php70-php-mysqlnd
-    ```
 
 ## Zend nightly PHP 7 builds
 

From ca81c740fd9f9d8391c7c8dd4059948bdf2cdcf7 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 21 Aug 2015 11:00:17 -0500
Subject: [PATCH 0022/1273] Updates to README.

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 58adfb94b..68b33da40 100644
--- a/README.md
+++ b/README.md
@@ -49,12 +49,12 @@ If you want to switch from Drupal 8 (default) to Drupal 7 or 6 on the initial in
 
 This Quick Start Guide will help you quickly build a Drupal 8 site on the Drupal VM using the included example Drush make file. You can also use the Drupal VM with a [Local Drupal codebase](http://docs.drupalvm.com/en/latest/deployment/local-codebase/) or even a [Drupal multisite installation](http://docs.drupalvm.com/en/latest/deployment/multisite/).
 
-### 1 - Install dependencies (VirtualBox, Vagrant, Ansible)
+### 1 - Install dependencies (VirtualBox and Vagrant)
 
   1. Download and install [VirtualBox](https://www.virtualbox.org/wiki/Downloads) (Drupal VM also works with Parallels or VMware, if you have the [Vagrant VMware integration plugin](http://www.vagrantup.com/vmware)).
   2. Download and install [Vagrant](http://www.vagrantup.com/downloads.html).
 
-Note for Faster Provisioning (Mac/Linux only): *For faster and more efficient provisioning, you should [install Ansible](http://docs.ansible.com/intro_installation.html) on your host machine, so Drupal VM can run the provisioning steps locally instead of inside the VM.*
+Note for Faster Provisioning (Mac/Linux only): *[Install Ansible](http://docs.ansible.com/intro_installation.html) on your host machine, so Drupal VM can run the provisioning steps locally instead of inside the VM.*
 
 Note for Linux users: *If NFS is not already installed on your host, you will need to install it to use the default NFS synced folder configuration. See guides for [Debian/Ubuntu](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-ubuntu-14-04), [Arch](https://wiki.archlinux.org/index.php/NFS#Installation), and [RHEL/CentOS](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-centos-6).*
 
@@ -70,7 +70,7 @@ Note on versions: *Please make sure you're running the latest stable version of
   4. Open Terminal, cd to this directory (containing the `Vagrantfile` and this README file).
   5. Type in `vagrant up`, and let Vagrant do its magic.
 
-If you have Ansible installed on your host machine, run `$ sudo ansible-galaxy install -r provisioning/requirements.txt --force` prior to step 5 (`vagrant up`), otherwise Ansible will complain about missing roles.
+If you have Ansible installed on your host machine: Run `$ sudo ansible-galaxy install -r provisioning/requirements.txt --force` prior to step 5 (`vagrant up`), otherwise Ansible will complain about missing roles.
 
 Note: *If there are any errors during the course of running `vagrant up`, and it drops you back to your command prompt, just run `vagrant provision` to continue building the VM from where you left off. If there are still errors after doing this a few times, post an issue to this project's issue queue on GitHub with the error.*
 

From 994e17feeddbced2ef3a4e93813887b550d717e6 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 21 Aug 2015 13:00:42 -0500
Subject: [PATCH 0023/1273] Remove ImageMagick from default set of packages to
 install on RedHat PHP7.

---
 docs/other/php-7.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/other/php-7.md b/docs/other/php-7.md
index 703043603..f0f51954e 100644
--- a/docs/other/php-7.md
+++ b/docs/other/php-7.md
@@ -46,7 +46,6 @@ Note: Make sure you're running the latest version of all Ansible role dependenci
     # Changes to make PHP 7 work in CentOS via Remi's repo.
     php_executable: php70
     php_packages:
-      - ImageMagick
       - php70
       - php70-php
       - php70-fakepear

From 6aa5b71a696e0494ae501c4df8b1caba8e8f743f Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 21 Aug 2015 14:44:56 -0500
Subject: [PATCH 0024/1273] Updated PHP 7.0 instructions for Ubuntu 14.04.

---
 docs/other/php-7.md | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/docs/other/php-7.md b/docs/other/php-7.md
index f0f51954e..81df2e477 100644
--- a/docs/other/php-7.md
+++ b/docs/other/php-7.md
@@ -1,6 +1,6 @@
-Many users have requested the ability to easily install PHP 7.x in addition to the already easy-to-configure options of 5.3, 5.4, 5.5, and 5.6. This page will guide you through how to get PHP 7 running on Drupal VM by modifying a few configuration options and running a couple simple commands inside the VM.
+Many users have requested the ability to easily install PHP 7.x in addition to the already easy-to-configure options of 5.3, 5.4, 5.5, and 5.6. This page will guide you through how to get PHP 7 running on Drupal VM in a few different ways, depending on what type of installation you need.
 
-Note that, at this time (summer 2015), PHP 7 is still in pre-beta releases, and all support is experimental and prone to breaking things. Please don't try running PHP 7 on production machines yet!
+_At this time (summer 2015), PHP 7 is still in the release candidate stage, and all support is experimental and prone to breaking. Please don't try running PHP 7 on production environments yet!_
 
 ## Ubuntu 14.04
 
@@ -12,18 +12,15 @@ Otherwise, Ondřej Surý also has a PPA for PHP 7.0 that is included with Drupal
 php_version: "7.0"
 php_packages:
   - libapache2-mod-php7.0
-  - php7.0-mcrypt
   - php7.0-common
   - php7.0-cli
-  - php7.0-curl
   - php7.0-dev
   - php7.0-fpm
-  - php7.0-gd
   - libpcre3-dev
 php_mysql_package: php7.0-mysqlnd
 ```
 
-However, there's currently a bug with the beta1 version of the package, which causes installation to fail (see: https://github.com/oerdnj/deb.sury.org/issues/87). This section will be updated with more information once this packaging bug is fixed or a workaround is found.
+However, the PHP MySQL package is currently not available in the repo, so MySQL support is not active (see: https://github.com/oerdnj/deb.sury.org/issues/106). This section will be updated with more information once this problem is fixed or a workaround is found.
 
 ## RedHat/CentOS 7
 
@@ -62,4 +59,4 @@ Note: Make sure you're running the latest version of all Ansible role dependenci
 
 ## Zend nightly PHP 7 builds
 
-Zend has a repository with [nightly PHP 7 builds](http://php7.zend.com/repo.php) for either RHEL/CentOS 7 or Debian 8/Ubuntu 14.04, but the repository requires some manual configuration and setup and is not going to be officially supported as a PHP 7 installation method within Drupal VM.
\ No newline at end of file
+Zend has a repository with [nightly PHP 7 builds](http://php7.zend.com/repo.php) for either RHEL/CentOS 7 or Debian 8/Ubuntu 14.04, but the repository requires some manual configuration and setup and is not going to be officially supported as a PHP 7 installation method within Drupal VM.

From a289a4f91724fcd6357eee3f4968f68a856ac33d Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 21 Aug 2015 16:53:36 -0500
Subject: [PATCH 0025/1273] Much simpler PHP 7.0 docs for Ubuntu 14.04.

---
 docs/other/php-7.md | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/docs/other/php-7.md b/docs/other/php-7.md
index 81df2e477..35d969ca4 100644
--- a/docs/other/php-7.md
+++ b/docs/other/php-7.md
@@ -4,9 +4,7 @@ _At this time (summer 2015), PHP 7 is still in the release candidate stage, and
 
 ## Ubuntu 14.04
 
-Currently the most reliable way to get PHP 7 (any version) running on Ubuntu is to build from source. This is supported by Drupal VM and is not too difficult, but it requires a few manual steps to make sure Apache and PHP play nice together, so this process is not currently documented here.
-
-Otherwise, Ondřej Surý also has a PPA for PHP 7.0 that is included with Drupal VM, and you can make the following additions/changes to your `config.yml` to use it:
+Ondřej Surý's PPA for PHP 7.0 is included with Drupal VM, and you can make the following changes/additions to `config.yml` to use it:
 
 ```yaml
 php_version: "7.0"
@@ -17,10 +15,15 @@ php_packages:
   - php7.0-dev
   - php7.0-fpm
   - libpcre3-dev
-php_mysql_package: php7.0-mysqlnd
+  - php-gd
+  - php-curl
+  - php-imap
+  - php-json
+  - php-opcache
+php_mysql_package: php-mysql
 ```
 
-However, the PHP MySQL package is currently not available in the repo, so MySQL support is not active (see: https://github.com/oerdnj/deb.sury.org/issues/106). This section will be updated with more information once this problem is fixed or a workaround is found.
+Note that there can still be a few inconsistencies with this configuration, especially as PHP 7.0.0 is still in 'release candidate status'. You can also build from source using the same/included `geerlingguy.php` Ansible role, but that process is a bit more involved and for power users comfortable with the process.
 
 ## RedHat/CentOS 7
 

From 70a3436d63c4eebf03d6c6adc1ccbf36aa311772 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 21 Aug 2015 16:53:58 -0500
Subject: [PATCH 0026/1273] Much faster Drush installation with default install
 option of --prefer-dist.

---
 example.config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/example.config.yml b/example.config.yml
index 764230333..9c9cc4502 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -109,6 +109,7 @@ extra_security_enabled: false
 
 drush_version: master
 drush_keep_updated: true
+drush_composer_cli_options: "--prefer-dist --no-interaction"
 
 firewall_allowed_tcp_ports:
   - "22"

From 8045f7deda5c9d02048730844d048d7c1887299d Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 24 Aug 2015 22:34:47 -0500
Subject: [PATCH 0027/1273] Fixes #212: Use KVM paravirtualization instead of
 Legacy for VirtualBox.

---
 Vagrantfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Vagrantfile b/Vagrantfile
index 7aa27bf97..4ca0a106d 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -87,6 +87,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     v.cpus = vconfig['vagrant_cpus']
     v.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
     v.customize ["modifyvm", :id, "--ioapic", "on"]
+    v.customize ["modifyvm", :id, "--paravirtprovider", "kvm"]
   end
 
   # Parallels.

From 284f2bfd1ca7fd96621b9b8b6b110cd8559f9c0a Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 27 Aug 2015 14:50:08 -0500
Subject: [PATCH 0028/1273] Fixes #216: Install Postfix with
 geerlingguy.postfix role instead of custom task.

---
 provisioning/playbook.yml          | 1 +
 provisioning/requirements.txt      | 1 +
 provisioning/tasks/init-debian.yml | 3 ---
 provisioning/tasks/init-redhat.yml | 3 ---
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 9902105c0..fc6cd3058 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -15,6 +15,7 @@
     - { role: geerlingguy.repo-remi, when: ansible_os_family == 'RedHat' }
     - geerlingguy.firewall
     - geerlingguy.git
+    - geerlingguy.postfix
     - geerlingguy.apache
     - geerlingguy.mysql
     - geerlingguy.php
diff --git a/provisioning/requirements.txt b/provisioning/requirements.txt
index d7e067f24..9aa5244db 100644
--- a/provisioning/requirements.txt
+++ b/provisioning/requirements.txt
@@ -18,6 +18,7 @@ geerlingguy.php-pecl
 geerlingguy.php-xdebug
 geerlingguy.php-xhprof
 geerlingguy.pimpmylog
+geerlingguy.postfix
 geerlingguy.repo-remi
 geerlingguy.security
 geerlingguy.solr
diff --git a/provisioning/tasks/init-debian.yml b/provisioning/tasks/init-debian.yml
index 1e39ad63e..74f842232 100644
--- a/provisioning/tasks/init-debian.yml
+++ b/provisioning/tasks/init-debian.yml
@@ -13,9 +13,6 @@
 - name: Disable the ufw firewall (since we use a simple iptables firewall).
   service: name=ufw state=stopped
 
-- name: Install postfix so Drupal can send emails.
-  apt: name=postfix state=installed
-
 - name: Add repository for PHP 5.5.
   apt_repository: repo='ppa:ondrej/php5'
   when: php_version == "5.5"
diff --git a/provisioning/tasks/init-redhat.yml b/provisioning/tasks/init-redhat.yml
index b4d265efc..b95ca9383 100644
--- a/provisioning/tasks/init-redhat.yml
+++ b/provisioning/tasks/init-redhat.yml
@@ -6,9 +6,6 @@
     - "python-pycurl"
     - "@development"
 
-- name: Install postfix so Drupal can send emails.
-  yum: name=postfix state=installed
-
 - name: Enable remi repo for MySQL.
   set_fact: mysql_enablerepo="remi"
 

From c3922f498659d8ba7d9924fe17e7186dededd070 Mon Sep 17 00:00:00 2001
From: Craig Aschbrenner <caschbre+bitbucket@gmail.com>
Date: Thu, 27 Aug 2015 22:26:07 -0400
Subject: [PATCH 0029/1273] Issue #185: Added ability for configuring a public
 network.

---
 Vagrantfile        | 9 +++++++++
 example.config.yml | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/Vagrantfile b/Vagrantfile
index 4ca0a106d..9ca52c048 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -29,6 +29,15 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   else
     config.vm.network :private_network, ip: vconfig['vagrant_ip']
   end
+
+  if vconfig['vagrant_enable_public_network']
+    if vconfig['vagrant_public_ip'] == "0.0.0.0"
+      config.vm.network :public_network
+    else
+      config.vm.network :public_network, ip: vconfig['vagrant_public_ip']
+    end
+  end
+
   config.ssh.insert_key = false
   config.ssh.forward_agent = true
 
diff --git a/example.config.yml b/example.config.yml
index 9c9cc4502..01f6ed5af 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -10,6 +10,15 @@ vagrant_hostname: drupalvm.dev
 vagrant_machine_name: drupalvm
 vagrant_ip: 192.168.88.88
 
+# If you need to access this guest from a device other than the host you will
+# want to enable public networking. Optionally provide a static IP value.
+# Warning! Vagrant boxes are insecure by default and by design, featuring public
+# passwords, insecure keypairs for SSH access, and potentially allow root access
+# over SSH.
+# https://docs.vagrantup.com/v2/networking/public_network.html
+vagrant_enable_public_network: false
+# vagrant_public_ip: 192.168.1.100
+
 # A list of synced folders, with the keys 'local_path', 'destination', 'id', and
 # a 'type' of [nfs|rsync|smb] (leave empty for slow native shares). See
 # http://docs.drupalvm.com/en/latest/extras/syncing-folders/ for more info.

From 802fff24664c97453c8155696eb58c8230696620 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Tue, 1 Sep 2015 22:01:47 +0100
Subject: [PATCH 0030/1273] Added spaces

---
 example.config.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/example.config.yml b/example.config.yml
index 50d0fc0c4..b367d13b3 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -65,9 +65,9 @@ configure_local_drush_aliases: true
 # Apache VirtualHosts. Add one for each site you are running inside the VM. For
 # multisite deployments, you can point multiple servernames at one documentroot.
 apache_vhosts:
-  - {servername: "{{ drupal_domain }}", documentroot: "{{ drupal_core_path }}"}
-  - {servername: "xhprof.drupalvm.dev", documentroot: "/usr/share/php/xhprof_html"}
-  - {servername: "pimpmylog.drupalvm.dev", documentroot: "/usr/share/php/pimpmylog"}
+  - { servername: "{{ drupal_domain }}", documentroot: "{{ drupal_core_path }}" }
+  - { servername: "xhprof.drupalvm.dev", documentroot: "/usr/share/php/xhprof_html" }
+  - { servername: "pimpmylog.drupalvm.dev", documentroot: "/usr/share/php/pimpmylog" }
 apache_remove_default_vhost: true
 apache_mods_enabled:
   - expires.load

From 7f5ab08774305fbf4bfeaa9008085165ba7d30be Mon Sep 17 00:00:00 2001
From: TravisCarden <travis.carden@gmail.com>
Date: Wed, 2 Sep 2015 20:54:21 -0500
Subject: [PATCH 0031/1273] Fixed references to misnamed property
 "build_from_makefile".

---
 docs/deployment/local-codebase.md | 2 +-
 example.config.yml                | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/deployment/local-codebase.md b/docs/deployment/local-codebase.md
index a70f1870b..047ca54b1 100644
--- a/docs/deployment/local-codebase.md
+++ b/docs/deployment/local-codebase.md
@@ -17,7 +17,7 @@ vagrant_synced_folders:
 Set `build_makefile` and `install_site` to `false`:
 
 ```yaml
-build_from_makefile: false
+build_makefile:: false
 ...
 install_site: false
 ```
diff --git a/example.config.yml b/example.config.yml
index ff54ea182..206d64885 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -15,7 +15,7 @@ vagrant_ip: 192.168.88.88
 # http://docs.drupalvm.com/en/latest/extras/syncing-folders/ for more info.
 vagrant_synced_folders:
   # The first synced folder will be used for the default Drupal installation, if
-  # build_from_makefile is 'true'.
+  # build_makefile: is 'true'.
   - local_path: ~/Sites/drupalvm
     destination: /var/www
     id: drupal
@@ -35,7 +35,7 @@ drush_makefile_path: /vagrant/drupal.make.yml
 # settings below), but instead copy down a database (e.g. using drush sql-sync).
 install_site: true
 
-# Settings for building a Drupal site from a makefile (if 'build_from_makefile'
+# Settings for building a Drupal site from a makefile (if 'build_makefile:'
 # is 'true').
 drupal_major_version: 8
 drupal_core_path: "/var/www/drupal"
@@ -74,7 +74,7 @@ apache_mods_enabled:
   - ssl.load
   - rewrite.load
 
-# MySQL Databases and users. If build_from_makefile is true, first database will
+# MySQL Databases and users. If build_makefile: is true, first database will
 # be used for the makefile-built site.
 mysql_databases:
   - name: "{{ drupal_mysql_database }}"

From 8be94e7144537e5c2701b1a271bcfa53fb4c2245 Mon Sep 17 00:00:00 2001
From: TravisCarden <travis.carden@gmail.com>
Date: Thu, 3 Sep 2015 10:49:26 -0500
Subject: [PATCH 0032/1273] PR #111: Replace phpMyAdmin documentation with
 Adminer.

---
 docs/extras/mysql.md | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/docs/extras/mysql.md b/docs/extras/mysql.md
index 7deffafc0..1769ca84a 100644
--- a/docs/extras/mysql.md
+++ b/docs/extras/mysql.md
@@ -1,12 +1,10 @@
 By default, this VM is set up so you can manage MySQL databases on your own. The default root MySQL user credentials are `root` for username and password, but you can change the password via `config.yml` (changing the `mysql_root_password` variable). I use the [Sequel Pro](http://www.sequelpro.com/) (Mac-only) to connect and manage databases, and Drush to sync databases (sometimes I'll just do a dump and import, but Drush is usually quicker, and is easier to do over and over again when you need it).
 
-## Connect using phpMyAdmin
+## Connect using Adminer
 
-If you have `phpmyadmin` listed as one of the `installed_extras` inside `config.yml`, you can use phpMyAdmin's web-based interface to interact with databases. With Drupal VM running, visit `http://drupaltest.dev/phpmyadmin/`, and log in with `root` as the username and the password you set in `config.yml` (`mysql_root_password`).
+If you have `adminer` listed as one of the `installed_extras` inside `config.yml`, you can use Adminer's web-based interface to interact with databases. With Drupal VM running, visit `http://drupalvm.dev/adminer/`, and log in with `root` as the username and the password you set in `config.yml` (`mysql_root_password`). Leave the "Server" field blank. The "Database" field is optional.
 
-More about how to use phpMyAdmin: [phpMyAdmin documentation](http://docs.phpmyadmin.net/).
-
-_Note_: If you get the error `#1146 - Table 'phpmyadmin.pma_table_uiprefs' doesn't exist` when browsing tables in phpMyAdmin, please log into the VM using `vagrant ssh`, then run the command `sudo dpkg-reconfigure phpmyadmin`, and follow the onscreen prompts. This error is caused by [a bug in phpMyAdmin's Ubuntu package installation](https://github.com/geerlingguy/ansible-role-phpmyadmin/issues/1#issuecomment-92461536).
+More about how to use Admier: [Adminer website](http://www.adminer.org/).
 
 ## Connect using Sequel Pro (or a similar client):
 

From e67ae2c2fa10b25ac9581f9bc1301a713925c27f Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 3 Sep 2015 17:14:18 -0500
Subject: [PATCH 0033/1273] Cleaner apache_vhosts example.

---
 example.config.yml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/example.config.yml b/example.config.yml
index 206d64885..190fc7aca 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -64,10 +64,17 @@ configure_local_drush_aliases: true
 
 # Apache VirtualHosts. Add one for each site you are running inside the VM. For
 # multisite deployments, you can point multiple servernames at one documentroot.
+# View the geerlingguy.apache Ansible Role README for more options.
 apache_vhosts:
-  - { servername: "{{ drupal_domain }}", documentroot: "{{ drupal_core_path }}" }
-  - { servername: "xhprof.drupalvm.dev", documentroot: "/usr/share/php/xhprof_html" }
-  - { servername: "pimpmylog.drupalvm.dev", documentroot: "/usr/share/php/pimpmylog" }
+  - servername: "{{ drupal_domain }}"
+    documentroot: "{{ drupal_core_path }}"
+
+  - servername: "xhprof.drupalvm.dev"
+    documentroot: "/usr/share/php/xhprof_html"
+
+  - servername: "pimpmylog.drupalvm.dev"
+    documentroot: "/usr/share/php/pimpmylog"
+
 apache_remove_default_vhost: true
 apache_mods_enabled:
   - expires.load

From 39024021bdee86cf65f33caf3fc62966f6f5360b Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 4 Sep 2015 14:42:11 -0500
Subject: [PATCH 0034/1273] Issue #227: Add optional Node.js installation
 option.

---
 example.config.yml            | 1 +
 provisioning/playbook.yml     | 1 +
 provisioning/requirements.txt | 1 +
 3 files changed, 3 insertions(+)

diff --git a/example.config.yml b/example.config.yml
index 190fc7aca..f98186681 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -100,6 +100,7 @@ installed_extras:
   - adminer
   - mailhog
   - memcached
+  # - nodejs
   - pimpmylog
   # - selenium
   # - solr
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index fc6cd3058..124735dfb 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -34,6 +34,7 @@
     - { role: geerlingguy.pimpmylog, when: '"pimpmylog" in installed_extras' }
     - { role: geerlingguy.daemonize, when: '"mailhog" in installed_extras' }
     - { role: geerlingguy.mailhog, when: '"mailhog" in installed_extras' }
+    - { role: geerlingguy.nodejs, when: '"nodejs" in installed_extras' }
     - { role: geerlingguy.java, when: '"solr" in installed_extras or "selenium" in installed_extras' }
     - { role: arknoll.selenium, when: '"selenium" in installed_extras' }
     - { role: geerlingguy.solr, when: '"solr" in installed_extras' }
diff --git a/provisioning/requirements.txt b/provisioning/requirements.txt
index 9aa5244db..94cf3c171 100644
--- a/provisioning/requirements.txt
+++ b/provisioning/requirements.txt
@@ -11,6 +11,7 @@ geerlingguy.java
 geerlingguy.mailhog
 geerlingguy.memcached
 geerlingguy.mysql
+geerlingguy.nodejs
 geerlingguy.php
 geerlingguy.php-memcached
 geerlingguy.php-mysql

From 39f644c465e581ee10954ddb8286e54a3d1df4f8 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 4 Sep 2015 14:43:15 -0500
Subject: [PATCH 0035/1273] Issue #227: Add optional Ruby installation option.

---
 example.config.yml            | 1 +
 provisioning/playbook.yml     | 1 +
 provisioning/requirements.txt | 1 +
 3 files changed, 3 insertions(+)

diff --git a/example.config.yml b/example.config.yml
index f98186681..000f89e6f 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -102,6 +102,7 @@ installed_extras:
   - memcached
   # - nodejs
   - pimpmylog
+  # - ruby
   # - selenium
   # - solr
   - varnish
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 124735dfb..86adb74de 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -35,6 +35,7 @@
     - { role: geerlingguy.daemonize, when: '"mailhog" in installed_extras' }
     - { role: geerlingguy.mailhog, when: '"mailhog" in installed_extras' }
     - { role: geerlingguy.nodejs, when: '"nodejs" in installed_extras' }
+    - { role: geerlingguy.ruby, when: '"ruby" in installed_extras' }
     - { role: geerlingguy.java, when: '"solr" in installed_extras or "selenium" in installed_extras' }
     - { role: arknoll.selenium, when: '"selenium" in installed_extras' }
     - { role: geerlingguy.solr, when: '"solr" in installed_extras' }
diff --git a/provisioning/requirements.txt b/provisioning/requirements.txt
index 94cf3c171..8a2056d84 100644
--- a/provisioning/requirements.txt
+++ b/provisioning/requirements.txt
@@ -21,6 +21,7 @@ geerlingguy.php-xhprof
 geerlingguy.pimpmylog
 geerlingguy.postfix
 geerlingguy.repo-remi
+geerlingguy.ruby
 geerlingguy.security
 geerlingguy.solr
 geerlingguy.varnish

From f40db4a23dafcd3ee2ecbdc8890e2a43b0339fb0 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 4 Sep 2015 15:19:38 -0500
Subject: [PATCH 0036/1273] Issue #227: Add config examples for Ruby gems and
 NPM packages.

---
 example.config.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/example.config.yml b/example.config.yml
index 000f89e6f..da1925dfa 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -113,6 +113,12 @@ installed_extras:
 extra_packages:
   - unzip
 
+# `nodejs` must be in installed_extras for this to work.
+nodejs_npm_global_packages: []
+
+# `ruby` must be in installed_extras for this to work.
+ruby_install_gems: []
+
 # You can configure almost anything else on the server in the rest of this file.
 extra_security_enabled: false
 

From 1d3c158dcd4e00a775cb540b257a2e44f5bca412 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 4 Jul 2015 11:23:32 -0500
Subject: [PATCH 0037/1273] Add drupal install arguments configuration option

---
 example.config.yml                  | 3 +++
 provisioning/tasks/install-site.yml | 1 +
 2 files changed, 4 insertions(+)

diff --git a/example.config.yml b/example.config.yml
index 125ef8d23..dd29b6fb2 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -49,6 +49,9 @@ drupal_mysql_user: drupal
 drupal_mysql_password: drupal
 drupal_mysql_database: drupal
 
+# Additional arguments or options to pass to `drush site-install`.
+drupal_site_install_extra_args: []
+
 # Cron jobs are added to the root user's crontab. Keys include name (required),
 # minute, hour, day, weekday, month, job (required), and state.
 drupalvm_cron_jobs: []
diff --git a/provisioning/tasks/install-site.yml b/provisioning/tasks/install-site.yml
index 9ee4df24b..b91c0e08d 100644
--- a/provisioning/tasks/install-site.yml
+++ b/provisioning/tasks/install-site.yml
@@ -15,6 +15,7 @@
     --account-name={{ drupal_account_name }}
     --account-pass={{ drupal_account_pass }}
     --db-url=mysql://{{ drupal_mysql_user }}:{{ drupal_mysql_password }}@localhost/{{ mysql_databases[0].name }}
+    {{ drupal_site_install_extra_args | default([]) | join(" ") }}
     chdir={{ drupal_core_path }}
   notify: restart webserver
   when: "'Successful' not in drupal_site_installed.stdout"

From e4059a4f522df9c1891281ac3a77a52f9c56642e Mon Sep 17 00:00:00 2001
From: Craig Aschbrenner <caschbre+bitbucket@gmail.com>
Date: Sat, 5 Sep 2015 17:35:12 -0400
Subject: [PATCH 0038/1273] Reduced variables and updated logic based on
 original PR feedback.

---
 Vagrantfile        | 10 ++++------
 example.config.yml | 12 ++++--------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 9ca52c048..785b11c76 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -30,12 +30,10 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     config.vm.network :private_network, ip: vconfig['vagrant_ip']
   end
 
-  if vconfig['vagrant_enable_public_network']
-    if vconfig['vagrant_public_ip'] == "0.0.0.0"
-      config.vm.network :public_network
-    else
-      config.vm.network :public_network, ip: vconfig['vagrant_public_ip']
-    end
+  if !vconfig['vagrant_public_ip'].empty? && vconfig['vagrant_public_ip'] == "0.0.0.0"
+    config.vm.network :public_network
+  elsif !vconfig['vagrant_public_ip'].empty?
+    config.vm.network :public_network, ip: vconfig['vagrant_public_ip']
   end
 
   config.ssh.insert_key = false
diff --git a/example.config.yml b/example.config.yml
index 01f6ed5af..1ebe369e9 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -10,14 +10,10 @@ vagrant_hostname: drupalvm.dev
 vagrant_machine_name: drupalvm
 vagrant_ip: 192.168.88.88
 
-# If you need to access this guest from a device other than the host you will
-# want to enable public networking. Optionally provide a static IP value.
-# Warning! Vagrant boxes are insecure by default and by design, featuring public
-# passwords, insecure keypairs for SSH access, and potentially allow root access
-# over SSH.
-# https://docs.vagrantup.com/v2/networking/public_network.html
-vagrant_enable_public_network: false
-# vagrant_public_ip: 192.168.1.100
+# Allow Drupal VM to be accessed via a network interface on your host by setting
+# the IP address here. Vagrant boxes are insecure by default, so be careful
+# exposing Drupal VM to the outside world. You've been warned!
+vagrant_public_ip: ""
 
 # A list of synced folders, with the keys 'local_path', 'destination', 'id', and
 # a 'type' of [nfs|rsync|smb] (leave empty for slow native shares). See

From b914a6ea4ad96dba0688280b738a6f5c93b05223 Mon Sep 17 00:00:00 2001
From: Travis Carden <TravisCarden@users.noreply.github.com>
Date: Sun, 6 Sep 2015 14:19:57 -0500
Subject: [PATCH 0039/1273] Fix typo in mysql.md.

---
 docs/extras/mysql.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/extras/mysql.md b/docs/extras/mysql.md
index 1769ca84a..e3b985813 100644
--- a/docs/extras/mysql.md
+++ b/docs/extras/mysql.md
@@ -4,7 +4,7 @@ By default, this VM is set up so you can manage MySQL databases on your own. The
 
 If you have `adminer` listed as one of the `installed_extras` inside `config.yml`, you can use Adminer's web-based interface to interact with databases. With Drupal VM running, visit `http://drupalvm.dev/adminer/`, and log in with `root` as the username and the password you set in `config.yml` (`mysql_root_password`). Leave the "Server" field blank. The "Database" field is optional.
 
-More about how to use Admier: [Adminer website](http://www.adminer.org/).
+More about how to use Adminer: [Adminer website](http://www.adminer.org/).
 
 ## Connect using Sequel Pro (or a similar client):
 
@@ -17,4 +17,4 @@ More about how to use Admier: [Adminer website](http://www.adminer.org/).
     - SSH User: `vagrant`
     - SSH Key: (browse to your `~/.vagrant.d/` folder and choose `insecure_private_key`)
 
-You should be able to connect as the root user and add, manage, and remove databases and users.
\ No newline at end of file
+You should be able to connect as the root user and add, manage, and remove databases and users.

From 0cf3b272b2bb3d033dfeb8dedf15a9e453cdc6f3 Mon Sep 17 00:00:00 2001
From: "Robert L. Huffstedtler" <rhuffstedtler@gmail.com>
Date: Sun, 6 Sep 2015 18:35:38 -0400
Subject: [PATCH 0040/1273] Added PowerShell details for Windows 7

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 68b33da40..238eb32d4 100644
--- a/README.md
+++ b/README.md
@@ -58,8 +58,11 @@ Note for Faster Provisioning (Mac/Linux only): *[Install Ansible](http://docs.an
 
 Note for Linux users: *If NFS is not already installed on your host, you will need to install it to use the default NFS synced folder configuration. See guides for [Debian/Ubuntu](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-ubuntu-14-04), [Arch](https://wiki.archlinux.org/index.php/NFS#Installation), and [RHEL/CentOS](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-centos-6).*
 
+Note for Windows 7 users: *Windows 7 ships with PowerShell 2.0. If vagrant up hangs for you, you may need to upgrade to PowerShell 4.0 which is part of the [Windows Management Framework](http://www.microsoft.com/en-us/download/details.aspx?id=40855).
+
 Note on versions: *Please make sure you're running the latest stable version of Vagrant, VirtualBox, and Ansible, as the current version of Drupal VM is tested with the latest releases. As of August 2015: Vagrant 1.7.4, VirtualBox 5.0.2, and Ansible 1.9.2.*
 
+
 ### 2 - Build the Virtual Machine
 
   1. Download this project and put it wherever you want.

From cd5c313b536d3e55a6c340790c782d086ecbb971 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 6 Sep 2015 23:03:44 -0500
Subject: [PATCH 0041/1273] Clearer documentation of public networking option
 from PR #217.

---
 example.config.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/example.config.yml b/example.config.yml
index 8913d5e99..cb284116d 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -10,9 +10,9 @@ vagrant_hostname: drupalvm.dev
 vagrant_machine_name: drupalvm
 vagrant_ip: 192.168.88.88
 
-# Allow Drupal VM to be accessed via a network interface on your host by setting
-# the IP address here. Vagrant boxes are insecure by default, so be careful
-# exposing Drupal VM to the outside world. You've been warned!
+# Allow Drupal VM to be accessed via a public network interface on your host.
+# Vagrant boxes are insecure by default, so be careful. You've been warned!
+# See: https://docs.vagrantup.com/v2/networking/public_network.html
 vagrant_public_ip: ""
 
 # A list of synced folders, with the keys 'local_path', 'destination', 'id', and

From 77fe4995f6a62b3e9b9fea2b6ace831e7a150bcb Mon Sep 17 00:00:00 2001
From: "Robert L. Huffstedtler" <rhuffstedtler@gmail.com>
Date: Mon, 7 Sep 2015 11:01:32 -0400
Subject: [PATCH 0042/1273] Moved PowerShell note to docs\other\windows

---
 README.md             | 2 --
 docs/other/windows.md | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 238eb32d4..6f5d8b01a 100644
--- a/README.md
+++ b/README.md
@@ -58,8 +58,6 @@ Note for Faster Provisioning (Mac/Linux only): *[Install Ansible](http://docs.an
 
 Note for Linux users: *If NFS is not already installed on your host, you will need to install it to use the default NFS synced folder configuration. See guides for [Debian/Ubuntu](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-ubuntu-14-04), [Arch](https://wiki.archlinux.org/index.php/NFS#Installation), and [RHEL/CentOS](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-centos-6).*
 
-Note for Windows 7 users: *Windows 7 ships with PowerShell 2.0. If vagrant up hangs for you, you may need to upgrade to PowerShell 4.0 which is part of the [Windows Management Framework](http://www.microsoft.com/en-us/download/details.aspx?id=40855).
-
 Note on versions: *Please make sure you're running the latest stable version of Vagrant, VirtualBox, and Ansible, as the current version of Drupal VM is tested with the latest releases. As of August 2015: Vagrant 1.7.4, VirtualBox 5.0.2, and Ansible 1.9.2.*
 
 
diff --git a/docs/other/windows.md b/docs/other/windows.md
index 5ed4a803d..b74c688cc 100644
--- a/docs/other/windows.md
+++ b/docs/other/windows.md
@@ -32,3 +32,6 @@ Some Windows users have reported running into an issue where an authentication f
   1. Delete `~/.vagrant.d/insecure_private_key`
   2. Run `vagrant ssh-config`
   3. Restart the VM with `vagrant reload`
+
+### Required PowerShell Version
+If you are running Windows 7 and vagrant up hangs, you may need to upgrade PowerShell. Windows 7 ships with PowerShell 2.0, but PowerShell 3.0 or higher is needed. For Windows 7, you can upgrade to PowerShell 4.0 which is part of the [Windows Management Framework](http://www.microsoft.com/en-us/download/details.aspx?id=40855).

From 43da06d92316eebb2abbecd813a4d5dc74a279fc Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 9 Sep 2015 10:23:39 -0500
Subject: [PATCH 0043/1273] Issue #210: Remove id from example shares, as it
 causes more problems than it solves.

---
 example.config.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/example.config.yml b/example.config.yml
index b0a4c186c..577f9504a 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -23,7 +23,6 @@ vagrant_synced_folders:
   # build_makefile: is 'true'.
   - local_path: ~/Sites/drupalvm
     destination: /var/www
-    id: drupal
     type: nfs
     create: true
 

From 70b3e9e3b88a31aec13edd913ee4fcf7a1e599fe Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 14 Sep 2015 10:19:04 -0500
Subject: [PATCH 0044/1273] Issue #227: Specify latest stable version of
 Node.js by default.

---
 example.config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/example.config.yml b/example.config.yml
index 577f9504a..ca2a0aae4 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -121,6 +121,7 @@ extra_packages:
   - unzip
 
 # `nodejs` must be in installed_extras for this to work.
+nodejs_version: "0.12"
 nodejs_npm_global_packages: []
 
 # `ruby` must be in installed_extras for this to work.

From d7b8db396406ead299bc8973b96f6bae89430e82 Mon Sep 17 00:00:00 2001
From: Joe Stewart <joe.stewart@mediacurrent.com>
Date: Mon, 14 Sep 2015 13:37:39 -0500
Subject: [PATCH 0045/1273] Display DrupalVM logo using Markdown.

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

diff --git a/README.md b/README.md
index 68b33da40..9c1bd62c1 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-<p align="center"><img src="https://raw.githubusercontent.com/geerlingguy/drupal-vm/master/docs/images/drupal-vm-logo.png" alt="Drupal VM Logo" /></p>
+![Drupal VM Logo](https://raw.githubusercontent.com/geerlingguy/drupal-vm/master/docs/images/drupal-vm-logo.png)
 
 [![Build Status](https://travis-ci.org/geerlingguy/drupal-vm.svg?branch=master)](https://travis-ci.org/geerlingguy/drupal-vm) [![Documentation Status](https://readthedocs.org/projects/drupal-vm/badge/?version=latest)](http://docs.drupalvm.com)
 

From d1fc24c8ad73ff96ce5d08e902cc151d6d95f96a Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 21 Sep 2015 13:22:23 -0500
Subject: [PATCH 0046/1273] Fixes #249: Remove special setting for KVM
 virtualization.

---
 Vagrantfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Vagrantfile b/Vagrantfile
index 785b11c76..fe2e8bbfd 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -94,7 +94,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     v.cpus = vconfig['vagrant_cpus']
     v.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
     v.customize ["modifyvm", :id, "--ioapic", "on"]
-    v.customize ["modifyvm", :id, "--paravirtprovider", "kvm"]
   end
 
   # Parallels.

From 041b5f6c3351d6b6ead7c668358a5df438d3321c Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 21 Sep 2015 22:25:41 -0500
Subject: [PATCH 0047/1273] Issue #89: Add Nginx support to Drupal VM.

---
 example.config.yml                         | 18 +++++
 provisioning/playbook.yml                  |  5 +-
 provisioning/requirements.txt              |  1 +
 provisioning/tasks/nginx.yml               | 12 +++
 provisioning/tasks/www.yml                 |  1 +
 provisioning/templates/nginx-vhost.conf.j2 | 93 ++++++++++++++++++++++
 6 files changed, 129 insertions(+), 1 deletion(-)
 create mode 100644 provisioning/tasks/nginx.yml
 create mode 100644 provisioning/templates/nginx-vhost.conf.j2

diff --git a/example.config.yml b/example.config.yml
index ca2a0aae4..24c197d07 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -30,6 +30,9 @@ vagrant_synced_folders:
 vagrant_memory: 1024
 vagrant_cpus: 2
 
+# The web server software to use. Can be either 'apache' or 'nginx'.
+drupalvm_webserver: apache
+
 # Set this to false if you are using a different site deployment strategy and
 # would like to configure 'vagrant_synced_folders' and 'apache_vhosts' manually.
 build_makefile: true
@@ -88,6 +91,21 @@ apache_mods_enabled:
   - ssl.load
   - rewrite.load
 
+# Nginx hosts. Each site will get a server entry using the configuration defined
+# here. Set the 'is_drupal' property to true to use a Drupal-optimized Nginx
+# virtual host configuration.
+nginx_hosts:
+  - listen: "80 default_server"
+    server_name: "{{ drupal_domain }}"
+    root: "{{ drupal_core_path }}"
+    is_drupal: true
+
+  - listen: "80"
+    server_name: "pimpmylog.drupalvm.dev"
+    root: "/usr/share/php/pimpmylog"
+
+nginx_remove_default_vhost: true
+
 # MySQL Databases and users. If build_makefile: is true, first database will
 # be used for the makefile-built site.
 mysql_databases:
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 86adb74de..fe10dd20f 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -16,7 +16,8 @@
     - geerlingguy.firewall
     - geerlingguy.git
     - geerlingguy.postfix
-    - geerlingguy.apache
+    - { role: geerlingguy.apache, when: drupalvm_webserver == 'apache' }
+    - { role: geerlingguy.nginx, when: drupalvm_webserver == 'nginx' }
     - geerlingguy.mysql
     - geerlingguy.php
     - geerlingguy.php-pecl
@@ -52,6 +53,8 @@
     - include: tasks/sshd.yml
     - include: tasks/extras.yml
     - include: tasks/www.yml
+    - include: tasks/nginx.yml
+      when: drupalvm_webserver == 'nginx'
     - include: tasks/apparmor.yml
       when: ansible_os_family == 'Debian'
 
diff --git a/provisioning/requirements.txt b/provisioning/requirements.txt
index 8a2056d84..17b866e16 100644
--- a/provisioning/requirements.txt
+++ b/provisioning/requirements.txt
@@ -11,6 +11,7 @@ geerlingguy.java
 geerlingguy.mailhog
 geerlingguy.memcached
 geerlingguy.mysql
+geerlingguy.nginx
 geerlingguy.nodejs
 geerlingguy.php
 geerlingguy.php-memcached
diff --git a/provisioning/tasks/nginx.yml b/provisioning/tasks/nginx.yml
new file mode 100644
index 000000000..3b41d7923
--- /dev/null
+++ b/provisioning/tasks/nginx.yml
@@ -0,0 +1,12 @@
+---
+# TODO - Make this work with CentOS / RHEL!
+- name: Copy Nginx vhosts into place.
+  template:
+    src: ../templates/nginx-vhost.conf.j2
+    dest: "/etc/nginx/sites-enabled/{{ item.server_name }}.conf"
+    force: yes
+    owner: root
+    group: root
+    mode: 0644
+  with_items: nginx_hosts
+  notify: restart nginx
diff --git a/provisioning/tasks/www.yml b/provisioning/tasks/www.yml
index d1b23d07d..8fed05c83 100644
--- a/provisioning/tasks/www.yml
+++ b/provisioning/tasks/www.yml
@@ -21,3 +21,4 @@
     state: directory
     mode: 0755
     recurse: true
+  when: drupalvm_webserver == 'apache'
diff --git a/provisioning/templates/nginx-vhost.conf.j2 b/provisioning/templates/nginx-vhost.conf.j2
new file mode 100644
index 000000000..b0fdca0cf
--- /dev/null
+++ b/provisioning/templates/nginx-vhost.conf.j2
@@ -0,0 +1,93 @@
+{% if item.server_name_redirect is defined %}
+server {
+    listen       80;
+    server_name  {{ item.server_name_redirect }};
+    return       301 http://{{ item.server_name }}$request_uri;
+}
+{% endif %}
+
+server {
+    listen {{ item.listen }};
+
+    server_name {{ item.server_name }};
+    error_log /var/log/nginx/error.log info;
+    root {{ item.root }};
+    index index.php index.html index.htm;
+
+{% if item.is_drupal is defined and item.is_drupal %}
+    location / {
+        # Don't touch PHP for static content.
+        try_files $uri @rewrite;
+    }
+
+    # Use fastcgi for all php files.
+    location ~ \.php$ {
+        # Secure *.php files.
+        try_files $uri = 404;
+        fastcgi_split_path_info ^(.+\.php)(/.+)$;
+
+        fastcgi_pass unix:/var/run/php5-fpm.sock;
+        fastcgi_index index.php;
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        fastcgi_read_timeout 120;
+        include fastcgi_params;
+    }
+
+    location @rewrite {
+        # For D7 and above:
+        rewrite ^ /index.php;
+
+        # For Drupal 6 and below:
+        #rewrite ^/(.*)$ /index.php?q=$1;
+    }
+
+    location ~ ^/sites/.*/files/styles/ {
+        try_files $uri @rewrite;
+    }
+
+    location = /favicon.ico {
+        log_not_found off;
+        access_log off;
+    }
+
+    location = /robots.txt {
+        allow all;
+        log_not_found off;
+        access_log off;
+    }
+
+    location ~ (^|/)\. {
+        return 403;
+    }
+
+    location ~* \.(js|css|png|jpg|jpeg|gif|ico)$ {
+        expires max;
+        log_not_found off;
+    }
+{% endif %}
+
+    gzip on;
+    gzip_proxied any;
+    gzip_static on;
+    gzip_http_version 1.0;
+    gzip_disable "MSIE [1-6]\.";
+    gzip_vary on;
+    gzip_comp_level 6;
+    gzip_types
+        text/plain
+        text/css
+        text/xml
+        text/javascript
+        application/javascript
+        application/x-javascript
+        application/json
+        application/xml
+        application/xml+rss
+        application/xhtml+xml
+        application/x-font-ttf
+        application/x-font-opentype
+        image/svg+xml
+        image/x-icon;
+    gzip_buffers 16 8k;
+    gzip_min_length 512;
+}

From a24a3b82efc44df4c0c360ac9c68bdc8198ba944 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 21 Sep 2015 22:53:00 -0500
Subject: [PATCH 0048/1273] Issue #89: Cleaner implementation of Nginx hosts
 and config.

---
 Vagrantfile                                | 18 +++++++++++++-----
 example.config.yml                         | 17 ++++++++++-------
 provisioning/playbook.yml                  |  2 --
 provisioning/tasks/nginx.yml               | 12 ------------
 provisioning/tasks/www.yml                 | 12 ++++++++++++
 provisioning/templates/nginx-vhost.conf.j2 |  4 ++--
 6 files changed, 37 insertions(+), 28 deletions(-)
 delete mode 100644 provisioning/tasks/nginx.yml

diff --git a/Vagrantfile b/Vagrantfile
index fe2e8bbfd..7409b5976 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -41,13 +41,21 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   config.vm.box = vconfig['vagrant_box']
 
-  # If hostsupdater plugin is installed, add all servernames as aliases.
+  # If hostsupdater plugin is installed, add all server names as aliases.
   if Vagrant.has_plugin?("vagrant-hostsupdater")
     config.hostsupdater.aliases = []
-    for host in vconfig['apache_vhosts']
-      # Add all the hosts that aren't defined as Ansible vars.
-      unless host['servername'].include? "{{"
-        config.hostsupdater.aliases.push(host['servername'])
+    # Add all hosts that aren't defined as Ansible vars.
+    if vconfig['drupalvm_webserver'] == "apache"
+      for host in vconfig['apache_vhosts']
+        unless host['servername'].include? "{{"
+          config.hostsupdater.aliases.push(host['servername'])
+        end
+      end
+    else
+      for host in vconfig['nginx_hosts']
+        unless host['server_name'].include? "{{"
+          config.hostsupdater.aliases.push(host['server_name'])
+        end
       end
     end
   end
diff --git a/example.config.yml b/example.config.yml
index 24c197d07..82bf2a436 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -92,17 +92,20 @@ apache_mods_enabled:
   - rewrite.load
 
 # Nginx hosts. Each site will get a server entry using the configuration defined
-# here. Set the 'is_drupal' property to true to use a Drupal-optimized Nginx
-# virtual host configuration.
+# here. Set the 'is_php' property for document roots that contain PHP apps like
+# Drupal.
 nginx_hosts:
-  - listen: "80 default_server"
-    server_name: "{{ drupal_domain }}"
+  - server_name: "{{ drupal_domain }}"
     root: "{{ drupal_core_path }}"
-    is_drupal: true
+    is_php: true
 
-  - listen: "80"
-    server_name: "pimpmylog.drupalvm.dev"
+  - server_name: "xhprof.drupalvm.dev"
+    root: "/usr/share/php/xhprof_html"
+    is_php: true
+
+  - server_name: "pimpmylog.drupalvm.dev"
     root: "/usr/share/php/pimpmylog"
+    is_php: true
 
 nginx_remove_default_vhost: true
 
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index fe10dd20f..60b00def0 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -53,8 +53,6 @@
     - include: tasks/sshd.yml
     - include: tasks/extras.yml
     - include: tasks/www.yml
-    - include: tasks/nginx.yml
-      when: drupalvm_webserver == 'nginx'
     - include: tasks/apparmor.yml
       when: ansible_os_family == 'Debian'
 
diff --git a/provisioning/tasks/nginx.yml b/provisioning/tasks/nginx.yml
deleted file mode 100644
index 3b41d7923..000000000
--- a/provisioning/tasks/nginx.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-# TODO - Make this work with CentOS / RHEL!
-- name: Copy Nginx vhosts into place.
-  template:
-    src: ../templates/nginx-vhost.conf.j2
-    dest: "/etc/nginx/sites-enabled/{{ item.server_name }}.conf"
-    force: yes
-    owner: root
-    group: root
-    mode: 0644
-  with_items: nginx_hosts
-  notify: restart nginx
diff --git a/provisioning/tasks/www.yml b/provisioning/tasks/www.yml
index 8fed05c83..159b709ec 100644
--- a/provisioning/tasks/www.yml
+++ b/provisioning/tasks/www.yml
@@ -22,3 +22,15 @@
     mode: 0755
     recurse: true
   when: drupalvm_webserver == 'apache'
+
+- name: Copy Nginx vhosts into place.
+  template:
+    src: ../templates/nginx-vhost.conf.j2
+    dest: "{{ nginx_vhost_path }}/{{ item.server_name }}.conf"
+    force: yes
+    owner: root
+    group: root
+    mode: 0644
+  with_items: nginx_hosts
+  notify: restart nginx
+  when: drupalvm_webserver == 'nginx'
diff --git a/provisioning/templates/nginx-vhost.conf.j2 b/provisioning/templates/nginx-vhost.conf.j2
index b0fdca0cf..ef1d24685 100644
--- a/provisioning/templates/nginx-vhost.conf.j2
+++ b/provisioning/templates/nginx-vhost.conf.j2
@@ -7,14 +7,14 @@ server {
 {% endif %}
 
 server {
-    listen {{ item.listen }};
+    listen {{ item.listen | default("80") }};
 
     server_name {{ item.server_name }};
     error_log /var/log/nginx/error.log info;
     root {{ item.root }};
     index index.php index.html index.htm;
 
-{% if item.is_drupal is defined and item.is_drupal %}
+{% if item.is_php is defined and item.is_php %}
     location / {
         # Don't touch PHP for static content.
         try_files $uri @rewrite;

From 6430c22232c89cacbf90d64996b71c75818c9197 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 21 Sep 2015 23:02:05 -0500
Subject: [PATCH 0049/1273] Issue #89: Add Nginx and Apache webserver
 configuration documentation.

---
 docs/other/webservers.md | 17 +++++++++++++++++
 mkdocs.yml               |  1 +
 2 files changed, 18 insertions(+)
 create mode 100644 docs/other/webservers.md

diff --git a/docs/other/webservers.md b/docs/other/webservers.md
new file mode 100644
index 000000000..1609cbbf4
--- /dev/null
+++ b/docs/other/webservers.md
@@ -0,0 +1,17 @@
+Drupal VM's configuration works with multiple operating systems _and_ with multiple webservers. You can switch between Apache and Nginx (depending on which server you prefer) with ease.
+
+All you need to do is change the `drupalvm_webserver` variable inside your customized `config.yml`, choosing either `apache` or `nginx`.
+
+Because the webservers are configured somewhat differently, there are a few things you should configure depending on which webserver you use.
+
+## Using Apache
+
+You have complete control over all aspects of Apache VirtualHosts using the `apache_vhosts` configuration. A few simple examples are shown in `example.config.yml`, but this configuration can be much more complex.
+
+See the examples included in the [`geerlingguy.apache`](https://github.com/geerlingguy/ansible-role-apache) Ansible role's README for more info, as well as many other variables you can override to configure Apache exactly how you like it.
+
+## Using Nginx
+
+Because Nginx server directives behave a little differently than Apache's VirtualHosts, Drupal VM includes a custom Drupal-optimized Nginx server block configuration, and you can control all the servers ('virtual hosts') Nginx will run using the `nginx_hosts` configuration. A few simple examples are shown in `example.config.yml`, but you have some extra flexibility if you need it. See the `nginx-vhost.conf.j2` template for more information.
+
+Also, see the examples included in the [`geerlingguy.nginx`](https://github.com/geerlingguy/ansible-role-nginx) Ansible role's README for more info, as well as many other variables you can override to configure Nginx exactly how you like it.
diff --git a/mkdocs.yml b/mkdocs.yml
index f8721d58a..62b9a8aca 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -29,6 +29,7 @@ pages:
     - 'Test with Behat and Selenium': 'extras/behat.md'
   - Other Information:
     - 'Using Different Base OSes': 'other/base-os.md'
+    - 'Using Different Webservers': 'other/webservers.md'
     - 'PHP 7 on Drupal VM': 'other/php-7.md'
     - 'Networking Notes': 'other/networking.md'
     - 'Drupal 6 Notes': 'other/drupal-6.md'

From fb4f88d3b387f8e209a969f14f6bcf6bab1e22cd Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 21 Sep 2015 23:15:13 -0500
Subject: [PATCH 0050/1273] Fixes #89: Add possibility to use NGINX.

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9c1bd62c1..bbd520e88 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ This project aims to make spinning up a simple local Drupal test/development env
 
 It will install the following on an Ubuntu 14.04 (by default) linux VM:
 
-  - Apache 2.4.x
+  - Apache 2.4.x (or Nginx 1.x)
   - PHP 5.5.x (configurable)
   - MySQL 5.5.x
   - Drush (configurable)
@@ -77,7 +77,7 @@ Note: *If there are any errors during the course of running `vagrant up`, and it
 ### 3 - Configure your host machine to access the VM.
 
   1. [Edit your hosts file](http://www.rackspace.com/knowledge_center/article/how-do-i-modify-my-hosts-file), adding the line `192.168.88.88  drupalvm.dev` so you can connect to the VM.
-    - You can have Vagrant automatically configure your hosts file if you install the `hostsupdater` plugin (`vagrant plugin install vagrant-hostsupdater`). All hosts defined in `apache_vhosts` will be automatically managed.
+    - You can have Vagrant automatically configure your hosts file if you install the `hostsupdater` plugin (`vagrant plugin install vagrant-hostsupdater`). All hosts defined in `apache_vhosts` or `nginx_hosts` will be automatically managed.
     - You can also have Vagrant automatically assign an available IP address to your VM if you install the `auto_network` plugin (`vagrant plugin install vagrant-auto_network`), and set `vagrant_ip` to `0.0.0.0` inside `config.yml`.
   2. Open your browser and access [http://drupalvm.dev/](http://drupalvm.dev/). The default login for the admin account is `admin` for both the username and password.
 

From 8e106073f431b881db43d319d1d8a131a28c9e00 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 22 Sep 2015 09:45:09 -0500
Subject: [PATCH 0051/1273] Fixes #251: Make Adminer config work better across
 webservers.

---
 example.config.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/example.config.yml b/example.config.yml
index 82bf2a436..f8083f40c 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -79,6 +79,9 @@ apache_vhosts:
   - servername: "{{ drupal_domain }}"
     documentroot: "{{ drupal_core_path }}"
 
+  - servername: "adminer.drupalvm.dev"
+    documentroot: "/opt/adminer"
+
   - servername: "xhprof.drupalvm.dev"
     documentroot: "/usr/share/php/xhprof_html"
 
@@ -99,6 +102,10 @@ nginx_hosts:
     root: "{{ drupal_core_path }}"
     is_php: true
 
+  - server_name: "adminer.drupalvm.dev"
+    root: "/opt/adminer"
+    is_php: true
+
   - server_name: "xhprof.drupalvm.dev"
     root: "/usr/share/php/xhprof_html"
     is_php: true
@@ -190,7 +197,7 @@ mysql_root_password: root
 mysql_slow_query_log_enabled: true
 mysql_slow_query_time: 2
 mysql_wait_timeout: 300
-adminer_add_apache_config: true
+adminer_install_filename: index.php
 
 # Varnish Configuration.
 varnish_listen_port: "81"

From abc41381b3c76ec331d621165f9144e05436b9d2 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 22 Sep 2015 09:47:20 -0500
Subject: [PATCH 0052/1273] Issue #251: Fix Adminer documentation.

---
 docs/extras/mysql.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/extras/mysql.md b/docs/extras/mysql.md
index e3b985813..e5062bb54 100644
--- a/docs/extras/mysql.md
+++ b/docs/extras/mysql.md
@@ -2,7 +2,7 @@ By default, this VM is set up so you can manage MySQL databases on your own. The
 
 ## Connect using Adminer
 
-If you have `adminer` listed as one of the `installed_extras` inside `config.yml`, you can use Adminer's web-based interface to interact with databases. With Drupal VM running, visit `http://drupalvm.dev/adminer/`, and log in with `root` as the username and the password you set in `config.yml` (`mysql_root_password`). Leave the "Server" field blank. The "Database" field is optional.
+If you have `adminer` listed as one of the `installed_extras` inside `config.yml`, you can use Adminer's web-based interface to interact with databases. With Drupal VM running, visit `http://adminer.drupalvm.dev/`, and log in with `root` as the username and the password you set in `config.yml` (`mysql_root_password`). Leave the "Server" field blank. The "Database" field is optional.
 
 More about how to use Adminer: [Adminer website](http://www.adminer.org/).
 

From de115e3a21488631d378ac73a56f04c43b36c4db Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 22 Sep 2015 09:55:54 -0500
Subject: [PATCH 0053/1273] Fixes #227: Document Nodejs usage and Node/Ruby
 inclusion.

---
 README.md             |  2 ++
 docs/extras/nodejs.md | 20 ++++++++++++++++++++
 mkdocs.yml            |  1 +
 3 files changed, 23 insertions(+)
 create mode 100644 docs/extras/nodejs.md

diff --git a/README.md b/README.md
index bbd520e88..232146370 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,9 @@ It will install the following on an Ubuntu 14.04 (by default) linux VM:
   - Optional:
     - Varnish 4.x
     - Apache Solr 4.10.x (configurable)
+    - Node.js
     - Selenium, for testing your sites via Behat
+    - Ruby
     - Memcached
     - XHProf, for profiling your code
     - XDebug, for debugging your code
diff --git a/docs/extras/nodejs.md b/docs/extras/nodejs.md
new file mode 100644
index 000000000..132b59cab
--- /dev/null
+++ b/docs/extras/nodejs.md
@@ -0,0 +1,20 @@
+Node.js is used for many different purposes, but with Drupal, it is most often used as part of a toolset for Front End development or certain CI tasks.
+
+Drupal VM includes built-in support for Node.js—all you need to do is make sure `nodejs` is listed in the list of `installed_extras` inside `config.yml` before your provision Drupal VM.
+
+## Choosing a version of Node.js
+
+You can choose a version of Node.js to install using the `nodejs_version` variable in `config.yml`. See the `geerlingguy.nodejs` role documentation for all the currently-available versions for your OS.
+
+```yaml
+nodejs_version: "0.12"
+```
+
+## Installing global packages via NPM
+
+To install packages globally, you can add them to the list of `nodejs_npm_global_packages` in `config.yml`. As an example, many developers use `phantomjs` as a ghost web driver for Behat tests inside Drupal VM. To install it globally, add it to the list:
+
+```yaml
+nodejs_npm_global_packages:
+  - name: phantomjs
+```
diff --git a/mkdocs.yml b/mkdocs.yml
index 62b9a8aca..5c29f2c6a 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -22,6 +22,7 @@ pages:
     - 'Use Drupal Console with Drupal VM': 'extras/drupal-console.md'
     - 'Use Varnish with Drupal VM': 'extras/varnish.md'
     - 'Use MariaDB instead of MySQL': 'extras/mariadb.md'
+    - 'Use Node.js and NPM': 'extras/nodejs.md'
     - 'View Logs with Pimp my Log': 'extras/pimpmylog.md'
     - 'Profile Code with XHProf': 'extras/xhprof.md'
     - 'Debug Code with XDebug': 'extras/xdebug.md'

From 78f4fe734f8be747a0d9bfd8c6e499e8adb49368 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 22 Sep 2015 21:18:38 -0500
Subject: [PATCH 0054/1273] Fixes #235: Improve Git permissions guidance for
 Windows users.

---
 README.md             |  1 -
 docs/other/windows.md | 13 +++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index ab09ddfe7..232146370 100644
--- a/README.md
+++ b/README.md
@@ -62,7 +62,6 @@ Note for Linux users: *If NFS is not already installed on your host, you will ne
 
 Note on versions: *Please make sure you're running the latest stable version of Vagrant, VirtualBox, and Ansible, as the current version of Drupal VM is tested with the latest releases. As of August 2015: Vagrant 1.7.4, VirtualBox 5.0.2, and Ansible 1.9.2.*
 
-
 ### 2 - Build the Virtual Machine
 
   1. Download this project and put it wherever you want.
diff --git a/docs/other/windows.md b/docs/other/windows.md
index b74c688cc..df981706c 100644
--- a/docs/other/windows.md
+++ b/docs/other/windows.md
@@ -13,9 +13,13 @@ There are two parts to this:
   1. VirtualBox does not allow gets VMs to create symlinks in synced folders by default.
   2. Windows does not allow the creation of symlinks unless your local policy allows it; see [TechNet article](https://technet.microsoft.com/en-us/library/dn221947%28v=ws.10%29.aspx). Even if local policy allows it, many users experience problems in the creation of symlinks.
 
-### GIT & Permissions
+### Git and File permissions
 
-Do not work with git inside the synced folder inside the VM. Always use git on the Windows side. Otherwise the difference in permissions systems will make git think all your files have always been modified. It will also set the wrong permissions on any file you commit from inside the VM.
+If you're using a synced folder for your project, you should choose to either work _only_ inside the VM, or _only_ on the host machine. Don't commit changes both inside the VM and on the host unless you know what you're doing and have Git configured properly for Unix vs. Windows line endings. File permissions and line endings can be changed in ways that can break your project if you're not careful!
+
+You should probably disable Git's `fileMode` option inside the VM and on your host machine if you're running Windows and making changes to a Git repository:
+
+    git config core.fileMode false
 
 ### Long Paths
 
@@ -33,5 +37,6 @@ Some Windows users have reported running into an issue where an authentication f
   2. Run `vagrant ssh-config`
   3. Restart the VM with `vagrant reload`
 
-### Required PowerShell Version
-If you are running Windows 7 and vagrant up hangs, you may need to upgrade PowerShell. Windows 7 ships with PowerShell 2.0, but PowerShell 3.0 or higher is needed. For Windows 7, you can upgrade to PowerShell 4.0 which is part of the [Windows Management Framework](http://www.microsoft.com/en-us/download/details.aspx?id=40855).
+### Windows 7 requires PowerShell upgrade
+
+If you are running Windows 7 and `vagrant up` hangs, you may need to upgrade PowerShell. Windows 7 ships with PowerShell 2.0, but PowerShell 3.0 or higher is required. For Windows 7, you can upgrade to PowerShell 4.0 which is part of the [Windows Management Framework](http://www.microsoft.com/en-us/download/details.aspx?id=40855).

From 0d9deeed305959fa2b8480fe7aab23b33503315d Mon Sep 17 00:00:00 2001
From: Thom Toogood <thomtoogood@gmail.com>
Date: Wed, 23 Sep 2015 15:11:11 +0200
Subject: [PATCH 0055/1273] Updated requirements to use YAML.

---
 .travis.yml                   |  2 +-
 README.md                     |  2 +-
 provisioning/requirements.txt | 28 ----------------------------
 provisioning/requirements.yml | 29 +++++++++++++++++++++++++++++
 4 files changed, 31 insertions(+), 30 deletions(-)
 delete mode 100644 provisioning/requirements.txt
 create mode 100644 provisioning/requirements.yml

diff --git a/.travis.yml b/.travis.yml
index e14aae626..08ff1da89 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@ script:
   - cp example.drupal.make.yml drupal.make.yml
 
   # Make sure Ansible requirements install correctly.
-  - 'ansible-galaxy install -r provisioning/requirements.txt'
+  - 'ansible-galaxy install -r provisioning/requirements.yml'
 
   # Run Ansible's syntax and playbook check on the main playbook.
   - 'ansible-playbook -i "localhost," -c local provisioning/playbook.yml --syntax-check'
diff --git a/README.md b/README.md
index 9c1bd62c1..148555345 100644
--- a/README.md
+++ b/README.md
@@ -70,7 +70,7 @@ Note on versions: *Please make sure you're running the latest stable version of
   4. Open Terminal, cd to this directory (containing the `Vagrantfile` and this README file).
   5. Type in `vagrant up`, and let Vagrant do its magic.
 
-If you have Ansible installed on your host machine: Run `$ sudo ansible-galaxy install -r provisioning/requirements.txt --force` prior to step 5 (`vagrant up`), otherwise Ansible will complain about missing roles.
+If you have Ansible installed on your host machine: Run `$ sudo ansible-galaxy install -r provisioning/requirements.yml --force` prior to step 5 (`vagrant up`), otherwise Ansible will complain about missing roles.
 
 Note: *If there are any errors during the course of running `vagrant up`, and it drops you back to your command prompt, just run `vagrant provision` to continue building the VM from where you left off. If there are still errors after doing this a few times, post an issue to this project's issue queue on GitHub with the error.*
 
diff --git a/provisioning/requirements.txt b/provisioning/requirements.txt
deleted file mode 100644
index 17b866e16..000000000
--- a/provisioning/requirements.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-arknoll.selenium
-geerlingguy.adminer
-geerlingguy.apache
-geerlingguy.composer
-geerlingguy.daemonize
-geerlingguy.drupal-console
-geerlingguy.drush
-geerlingguy.firewall
-geerlingguy.git
-geerlingguy.java
-geerlingguy.mailhog
-geerlingguy.memcached
-geerlingguy.mysql
-geerlingguy.nginx
-geerlingguy.nodejs
-geerlingguy.php
-geerlingguy.php-memcached
-geerlingguy.php-mysql
-geerlingguy.php-pecl
-geerlingguy.php-xdebug
-geerlingguy.php-xhprof
-geerlingguy.pimpmylog
-geerlingguy.postfix
-geerlingguy.repo-remi
-geerlingguy.ruby
-geerlingguy.security
-geerlingguy.solr
-geerlingguy.varnish
diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
new file mode 100644
index 000000000..cddb54586
--- /dev/null
+++ b/provisioning/requirements.yml
@@ -0,0 +1,29 @@
+---
+- src: arknoll.selenium
+- src: geerlingguy.adminer
+- src: geerlingguy.apache
+- src: geerlingguy.composer
+- src: geerlingguy.daemonize
+- src: geerlingguy.drupal-console
+- src: geerlingguy.drush
+- src: geerlingguy.firewall
+- src: geerlingguy.git
+- src: geerlingguy.java
+- src: geerlingguy.mailhog
+- src: geerlingguy.memcached
+- src: geerlingguy.mysql
+- src: geerlingguy.nginx
+- src: geerlingguy.nodejs
+- src: geerlingguy.php
+- src: geerlingguy.php-memcached
+- src: geerlingguy.php-mysql
+- src: geerlingguy.php-pecl
+- src: geerlingguy.php-xdebug
+- src: geerlingguy.php-xhprof
+- src: geerlingguy.pimpmylog
+- src: geerlingguy.postfix
+- src: geerlingguy.repo-remi
+- src: geerlingguy.ruby
+- src: geerlingguy.security
+- src: geerlingguy.solr
+- src: geerlingguy.varnish
\ No newline at end of file

From 9a54c12680ec47d100173aa5497f31a8bd7edde2 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 23 Sep 2015 09:13:20 -0500
Subject: [PATCH 0056/1273] PR #248 Cleanup: Add extra newline at EOF.

---
 provisioning/requirements.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index cddb54586..1542a8a29 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -26,4 +26,4 @@
 - src: geerlingguy.ruby
 - src: geerlingguy.security
 - src: geerlingguy.solr
-- src: geerlingguy.varnish
\ No newline at end of file
+- src: geerlingguy.varnish

From 86d86e72f73c0587b9ff956a983ea80578c13067 Mon Sep 17 00:00:00 2001
From: Rafal B <rafal.baba@capgemini.com>
Date: Mon, 7 Sep 2015 15:02:15 +0100
Subject: [PATCH 0057/1273] Added ansible task which copies known_hosts file
 from host to guest

---
 Vagrantfile                 |  3 +++
 example.config.yml          |  4 ++++
 provisioning/tasks/sshd.yml | 15 +++++++++++++++
 3 files changed, 22 insertions(+)

diff --git a/Vagrantfile b/Vagrantfile
index 4ca0a106d..0d6e82d40 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -61,6 +61,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     config.vm.provision "ansible" do |ansible|
       ansible.playbook = "#{dir}/provisioning/playbook.yml"
       ansible.sudo = true
+      ansible.extra_vars = {
+        known_hosts_path: vconfig['known_hosts_path']
+      }
     end
   # Provision using shell provisioner and JJG-Ansible-Windows otherwise.
   else
diff --git a/example.config.yml b/example.config.yml
index da1925dfa..52a33f3d6 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -22,6 +22,10 @@ vagrant_synced_folders:
     type: nfs
     create: true
 
+# Source location of known_hosts file on your machine.
+# The location might be different on Windows, change it if you need.
+known_hosts_path: ~/.ssh/known_hosts
+
 # Memory and CPU to use for this VM.
 vagrant_memory: 1024
 vagrant_cpus: 2
diff --git a/provisioning/tasks/sshd.yml b/provisioning/tasks/sshd.yml
index 262430b0c..53e8eddf3 100644
--- a/provisioning/tasks/sshd.yml
+++ b/provisioning/tasks/sshd.yml
@@ -5,3 +5,18 @@
     regexp: "^AcceptEnv LANG"
     state: absent
     validate: "/usr/sbin/sshd -T -f %s"
+
+# Copy over known_hosts.
+- name: Check if known_hosts file is present.
+  stat: "path={{ known_hosts_path }}"
+  register: known_hosts
+  connection: local
+  sudo: no
+
+- name: Copy known_hosts file from host into Drupal VM.
+  copy:
+    src: "{{ known_hosts_path }}"
+    dest: ~/.ssh/known_hosts
+    mode: 0644
+  sudo: no
+  when: known_hosts.stat.exists

From 83a88d2c68d263b6e1f8d996c35a4aec922ab625 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 28 Sep 2015 21:21:53 -0500
Subject: [PATCH 0058/1273] Revert "Pass the port number from the Vagrant
 autogenerated inventory"

---
 provisioning/templates/drupalvm.aliases.drushrc.php.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/templates/drupalvm.aliases.drushrc.php.j2 b/provisioning/templates/drupalvm.aliases.drushrc.php.j2
index eab5d77af..9f1138518 100644
--- a/provisioning/templates/drupalvm.aliases.drushrc.php.j2
+++ b/provisioning/templates/drupalvm.aliases.drushrc.php.j2
@@ -12,7 +12,7 @@ $aliases['{{ vhost.servername }}'] = array(
   'root' => '{{ vhost.documentroot }}',
   'remote-host' => '{{ vhost.servername }}',
   'remote-user' => 'vagrant',
-  'ssh-options' => '-p {{ ansible_ssh_port }} -o PasswordAuthentication=no -i ~/.vagrant.d/insecure_private_key',
+  'ssh-options' => '-o PasswordAuthentication=no -i ~/.vagrant.d/insecure_private_key',
 );
 
 {% endfor %}

From c459e3dde68d468beab725fa6773a16a2a852595 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 3 Oct 2015 21:39:55 -0500
Subject: [PATCH 0059/1273] Security fix per
 https://www.drupal.org/node/2508591.

---
 provisioning/templates/nginx-vhost.conf.j2 | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/provisioning/templates/nginx-vhost.conf.j2 b/provisioning/templates/nginx-vhost.conf.j2
index ef1d24685..683607d72 100644
--- a/provisioning/templates/nginx-vhost.conf.j2
+++ b/provisioning/templates/nginx-vhost.conf.j2
@@ -20,6 +20,12 @@ server {
         try_files $uri @rewrite;
     }
 
+    # Don't allow direct access to the vendor directory.
+    location ~ /vendor {
+        deny all;
+        return 404;
+    }
+
     # Use fastcgi for all php files.
     location ~ \.php$ {
         # Secure *.php files.

From 1ee6cae49c74b3b502c7294630d13e29e560190e Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 3 Oct 2015 22:10:57 -0500
Subject: [PATCH 0060/1273] Update config for security of vendor directory.

---
 provisioning/templates/nginx-vhost.conf.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/templates/nginx-vhost.conf.j2 b/provisioning/templates/nginx-vhost.conf.j2
index 683607d72..6440d073b 100644
--- a/provisioning/templates/nginx-vhost.conf.j2
+++ b/provisioning/templates/nginx-vhost.conf.j2
@@ -21,7 +21,7 @@ server {
     }
 
     # Don't allow direct access to the vendor directory.
-    location ~ /vendor {
+    location ~ /vendor/.*\.php$ {
         deny all;
         return 404;
     }

From 02d7264bbc49aeffa577a46eac76a0b69a7d67b0 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 3 Oct 2015 22:18:44 -0500
Subject: [PATCH 0061/1273] Update description of security directive in nginx
 config.

---
 provisioning/templates/nginx-vhost.conf.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/templates/nginx-vhost.conf.j2 b/provisioning/templates/nginx-vhost.conf.j2
index 6440d073b..7810ac3de 100644
--- a/provisioning/templates/nginx-vhost.conf.j2
+++ b/provisioning/templates/nginx-vhost.conf.j2
@@ -20,7 +20,7 @@ server {
         try_files $uri @rewrite;
     }
 
-    # Don't allow direct access to the vendor directory.
+    # Don't allow direct access to PHP files in the vendor directory.
     location ~ /vendor/.*\.php$ {
         deny all;
         return 404;

From 9a7f5bfe1b915d83c08d7b3c49036159e8862c86 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 7 Oct 2015 07:18:52 -0400
Subject: [PATCH 0062/1273] Updated README.md.

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 85a7ce82a..1d31d6054 100644
--- a/README.md
+++ b/README.md
@@ -9,15 +9,15 @@ This project aims to make spinning up a simple local Drupal test/development env
 It will install the following on an Ubuntu 14.04 (by default) linux VM:
 
   - Apache 2.4.x (or Nginx 1.x)
-  - PHP 5.5.x (configurable)
+  - PHP 5.6.x (configurable)
   - MySQL 5.5.x
   - Drush (configurable)
   - Drupal Console (if using Drupal 8+)
   - Drupal 6.x, 7.x, or 8.x.x (configurable)
   - Optional:
-    - Varnish 4.x
+    - Varnish 4.x (configurable)
     - Apache Solr 4.10.x (configurable)
-    - Node.js
+    - Node.js 0.12 (configurable)
     - Selenium, for testing your sites via Behat
     - Ruby
     - Memcached

From f787d1f2a51616cac3702895efe408a02f3ad3ce Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 7 Oct 2015 13:35:07 -0400
Subject: [PATCH 0063/1273] Cleanup for PR #234.

---
 Vagrantfile                 |  3 ---
 example.config.yml          |  9 ++++-----
 provisioning/tasks/sshd.yml | 11 +++++------
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 97e9c15d8..7409b5976 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -76,9 +76,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     config.vm.provision "ansible" do |ansible|
       ansible.playbook = "#{dir}/provisioning/playbook.yml"
       ansible.sudo = true
-      ansible.extra_vars = {
-        known_hosts_path: vconfig['known_hosts_path']
-      }
     end
   # Provision using shell provisioner and JJG-Ansible-Windows otherwise.
   else
diff --git a/example.config.yml b/example.config.yml
index daa6724fd..1622df80a 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -26,10 +26,6 @@ vagrant_synced_folders:
     type: nfs
     create: true
 
-# Source location of known_hosts file on your machine.
-# The location might be different on Windows, change it if you need.
-known_hosts_path: ~/.ssh/known_hosts
-
 # Memory and CPU to use for this VM.
 vagrant_memory: 1024
 vagrant_cpus: 2
@@ -228,5 +224,8 @@ solr_version: "4.10.4"
 solr_xms: "64M"
 solr_xmx: "128M"
 
-# Selenium configuration
+# Selenium configuration.
 selenium_version: 2.46.0
+
+# Other configuration.
+known_hosts_path: ~/.ssh/known_hosts
diff --git a/provisioning/tasks/sshd.yml b/provisioning/tasks/sshd.yml
index 53e8eddf3..1d8f4c5e3 100644
--- a/provisioning/tasks/sshd.yml
+++ b/provisioning/tasks/sshd.yml
@@ -6,17 +6,16 @@
     state: absent
     validate: "/usr/sbin/sshd -T -f %s"
 
-# Copy over known_hosts.
-- name: Check if known_hosts file is present.
-  stat: "path={{ known_hosts_path }}"
-  register: known_hosts
+- name: Check if local known_hosts file is present.
+  stat: "path={{ known_hosts_path | default('~/.ssh/known_hosts') }}"
+  register: known_hosts_file
   connection: local
   sudo: no
 
 - name: Copy known_hosts file from host into Drupal VM.
   copy:
-    src: "{{ known_hosts_path }}"
+    src: "{{ known_hosts_path | default('~/.ssh/known_hosts') }}"
     dest: ~/.ssh/known_hosts
     mode: 0644
   sudo: no
-  when: known_hosts.stat.exists
+  when: known_hosts_file.stat.exists

From a0070b034aa561e153f006b86fd0f48f6036c247 Mon Sep 17 00:00:00 2001
From: Alexander Ross <github.119x@bleen.net>
Date: Thu, 15 Oct 2015 12:15:41 -0400
Subject: [PATCH 0064/1273] Minor grammatical errors

---
 docs/extras/mysql.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/extras/mysql.md b/docs/extras/mysql.md
index e5062bb54..4a18ed96b 100644
--- a/docs/extras/mysql.md
+++ b/docs/extras/mysql.md
@@ -1,4 +1,4 @@
-By default, this VM is set up so you can manage MySQL databases on your own. The default root MySQL user credentials are `root` for username and password, but you can change the password via `config.yml` (changing the `mysql_root_password` variable). I use the [Sequel Pro](http://www.sequelpro.com/) (Mac-only) to connect and manage databases, and Drush to sync databases (sometimes I'll just do a dump and import, but Drush is usually quicker, and is easier to do over and over again when you need it).
+By default, this VM is set up so you can manage MySQL databases on your own. The default root MySQL user credentials are `root` for username and password, but you can change the password via `config.yml` (changing the `mysql_root_password` variable). I use [Sequel Pro](http://www.sequelpro.com/) (Mac-only) to connect to and manage databases, and Drush to sync databases (sometimes I'll just do a dump and import, but Drush is usually quicker, and is easier to do over and over again when you need it).
 
 ## Connect using Adminer
 

From e4dcdee5efc4d4e944e80f8936957fc289c170bf Mon Sep 17 00:00:00 2001
From: Scott Reese <scott.reese@acquia.com>
Date: Mon, 19 Oct 2015 14:24:36 -0700
Subject: [PATCH 0065/1273] Updates to examples and syntax highlighting.

* Updated behat.yml to include the needed contexts to load and use the DrupalExtension driver.
* Updated examples to point to features/web since that is what behat.yml is set up for.
* Added syntax to code fences to help fix formatting on the web page.
---
 docs/extras/behat.md | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/docs/extras/behat.md b/docs/extras/behat.md
index 246dcb471..6ad471e7e 100644
--- a/docs/extras/behat.md
+++ b/docs/extras/behat.md
@@ -34,12 +34,17 @@ Using the default Drupal site as an example (it's installed in `/var/www/drupal`
 
   1. Create a `behat.yml` file inside the docroot of your site (e.g. create this file alongside the rest of the Drupal codebase at `/var/www/drupal/behat.yml`), with the following contents:
 
-    ```
+    ```yaml
     default:
       suites:
         web_features:
           paths: [ %paths.base%/features/web ]
-          contexts: [ WebContext ]
+          contexts:
+            - WebContext
+            - Drupal\DrupalExtension\Context\DrupalContext
+            - Drupal\DrupalExtension\Context\MinkContext
+            - Drupal\DrupalExtension\Context\MessageContext
+            - Drupal\DrupalExtension\Context\DrushContext
       extensions:
         Behat\MinkExtension:
           goutte: ~
@@ -52,12 +57,14 @@ Using the default Drupal site as an example (it's installed in `/var/www/drupal`
           api_driver: 'drupal'
           drupal:
             drupal_root: '/var/www/drupal'
+          region_map:
+            content: "#content"
     ```
   
   2. Log into Drupal VM with `vagrant ssh`, change directory to the Drupal site root (`cd /var/www/drupal`), then run `behat --init` to initialize the `features` folder where you will place test cases.
-  3. From either inside the VM or on the host machine, open up the new `features` folder Behat just created, and create a new `drupal` folder inside. Inside _that_ folder, create `HomeContent.feature` with the following contents:
+  3. From either inside the VM or on the host machine, open up the new `features/web` folder Behat just created. Inside _that_ folder, create `HomeContent.feature` with the following contents:
 
-    ```
+    ```gherkin
     Feature: Test DrupalContext
       In order to prove the Behat is working correctly in Drupal VM
       As a developer
@@ -73,7 +80,7 @@ Using the default Drupal site as an example (it's installed in `/var/www/drupal`
 
 If everything was done correctly, you should see:
 
-```
+```console
 $ behat
 Feature: Test DrupalContext
   In order to prove the Behat is working correctly in Drupal VM
@@ -92,4 +99,4 @@ Feature: Test DrupalContext
 Hooray! Now you're ready to get started testing ALL THE THINGS! Check out the following resources for more information about Behat and Drupal:
 
   - [Behat 3.0 Documentation](http://behat.readthedocs.org/en/v3.0/)
-  - [Drupal Extension Documentation](https://behat-drupal-extension.readthedocs.org/en/3.0/)
\ No newline at end of file
+  - [Drupal Extension Documentation](https://behat-drupal-extension.readthedocs.org/en/3.0/)

From e7e775cfba20e3f9fcff557e2f781f22c244d8e0 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 19 Oct 2015 16:52:54 -0500
Subject: [PATCH 0066/1273] gs

---
 docs/extras/behat.md | 54 ++++++++++++++++++++++----------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/docs/extras/behat.md b/docs/extras/behat.md
index 6ad471e7e..c153e8b8d 100644
--- a/docs/extras/behat.md
+++ b/docs/extras/behat.md
@@ -34,33 +34,33 @@ Using the default Drupal site as an example (it's installed in `/var/www/drupal`
 
   1. Create a `behat.yml` file inside the docroot of your site (e.g. create this file alongside the rest of the Drupal codebase at `/var/www/drupal/behat.yml`), with the following contents:
 
-    ```yaml
-    default:
-      suites:
-        web_features:
-          paths: [ %paths.base%/features/web ]
-          contexts:
-            - WebContext
-            - Drupal\DrupalExtension\Context\DrupalContext
-            - Drupal\DrupalExtension\Context\MinkContext
-            - Drupal\DrupalExtension\Context\MessageContext
-            - Drupal\DrupalExtension\Context\DrushContext
-      extensions:
-        Behat\MinkExtension:
-          goutte: ~
-          javascript_session: selenium2
-          selenium2:
-            wd_host: http://drupalvm.dev:4444/wd/hub
-          base_url: http://drupalvm.dev
-        Drupal\DrupalExtension:
-          blackbox: ~
-          api_driver: 'drupal'
-          drupal:
-            drupal_root: '/var/www/drupal'
-          region_map:
-            content: "#content"
-    ```
-  
+        ```yaml
+        default:
+          suites:
+            web_features:
+              paths: [ %paths.base%/features/web ]
+              contexts:
+                - WebContext
+                - Drupal\DrupalExtension\Context\DrupalContext
+                - Drupal\DrupalExtension\Context\MinkContext
+                - Drupal\DrupalExtension\Context\MessageContext
+                - Drupal\DrupalExtension\Context\DrushContext
+          extensions:
+            Behat\MinkExtension:
+              goutte: ~
+              javascript_session: selenium2
+              selenium2:
+                wd_host: http://drupalvm.dev:4444/wd/hub
+              base_url: http://drupalvm.dev
+            Drupal\DrupalExtension:
+              blackbox: ~
+              api_driver: 'drupal'
+              drupal:
+                drupal_root: '/var/www/drupal'
+              region_map:
+                content: "#content"
+        ```
+
   2. Log into Drupal VM with `vagrant ssh`, change directory to the Drupal site root (`cd /var/www/drupal`), then run `behat --init` to initialize the `features` folder where you will place test cases.
   3. From either inside the VM or on the host machine, open up the new `features/web` folder Behat just created. Inside _that_ folder, create `HomeContent.feature` with the following contents:
 

From 4bdad302f59f72f564df4eb4474a66697ed7272d Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 19 Oct 2015 16:54:14 -0500
Subject: [PATCH 0067/1273] Better formatting of Behat example.

---
 docs/extras/behat.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/extras/behat.md b/docs/extras/behat.md
index c153e8b8d..81d37d145 100644
--- a/docs/extras/behat.md
+++ b/docs/extras/behat.md
@@ -34,7 +34,6 @@ Using the default Drupal site as an example (it's installed in `/var/www/drupal`
 
   1. Create a `behat.yml` file inside the docroot of your site (e.g. create this file alongside the rest of the Drupal codebase at `/var/www/drupal/behat.yml`), with the following contents:
 
-        ```yaml
         default:
           suites:
             web_features:
@@ -59,7 +58,6 @@ Using the default Drupal site as an example (it's installed in `/var/www/drupal`
                 drupal_root: '/var/www/drupal'
               region_map:
                 content: "#content"
-        ```
 
   2. Log into Drupal VM with `vagrant ssh`, change directory to the Drupal site root (`cd /var/www/drupal`), then run `behat --init` to initialize the `features` folder where you will place test cases.
   3. From either inside the VM or on the host machine, open up the new `features/web` folder Behat just created. Inside _that_ folder, create `HomeContent.feature` with the following contents:

From 1ea6c51cdb1d2304cfe947300ac53e23c8343af7 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Tue, 20 Oct 2015 17:16:42 +0100
Subject: [PATCH 0068/1273] Add documentation and example of rsync
 excluded_paths

---
 docs/extras/syncing-folders.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/docs/extras/syncing-folders.md b/docs/extras/syncing-folders.md
index 65288e9a7..258bca15b 100644
--- a/docs/extras/syncing-folders.md
+++ b/docs/extras/syncing-folders.md
@@ -26,6 +26,23 @@ Generally speaking:
   - Rsync offers the best performance inside the VM, but sync is currently one-way-only (from host to VM), which can make certain development workflows burdensome
   - Native shared folders offer abysmal performance; only use this mechanism as a last resort!
 
+If you are using rsync, it is advised to exclude certain directories so that they aren't synced. These include version control directories, database exports and Drupal's files directory.
+
+```yaml
+vagrant_synced_folders:
+  - local_path: ~/Sites/drupalvm/drupal
+    destination: /var/www
+    id: drupal
+    type: rsync
+    excluded_paths:
+      - drupal/private
+      - drupal/public/.git
+      - drupal/public/sites/default/files
+      - drupal/tmp
+```
+
+This example assumes that you have Drupal in a directory called `drupal/public`.
+
 ## Synced Folder Troubleshooting
 
 There are a number of issues people encounter with synced folders from time to time. The most frequent issues are listed below with possible solutions:

From 2152f645186b22277add0a7e99e892a5c0a79203 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 30 Oct 2015 13:23:44 -0500
Subject: [PATCH 0069/1273] Fixes #280: Code blocks in Behat docs are formatted
 incorrectly.

---
 docs/extras/behat.md | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/docs/extras/behat.md b/docs/extras/behat.md
index 81d37d145..257ef5beb 100644
--- a/docs/extras/behat.md
+++ b/docs/extras/behat.md
@@ -62,18 +62,15 @@ Using the default Drupal site as an example (it's installed in `/var/www/drupal`
   2. Log into Drupal VM with `vagrant ssh`, change directory to the Drupal site root (`cd /var/www/drupal`), then run `behat --init` to initialize the `features` folder where you will place test cases.
   3. From either inside the VM or on the host machine, open up the new `features/web` folder Behat just created. Inside _that_ folder, create `HomeContent.feature` with the following contents:
 
-    ```gherkin
-    Feature: Test DrupalContext
-      In order to prove the Behat is working correctly in Drupal VM
-      As a developer
-      I need to run a simple interface test
-
-      Scenario: Viewing content in a region
-        Given I am on the homepage
-        Then I should see "No front page content has been created yet" in the "content"
-
-    ```
-  
+        Feature: Test DrupalContext
+          In order to prove the Behat is working correctly in Drupal VM
+          As a developer
+          I need to run a simple interface test
+        
+          Scenario: Viewing content in a region
+            Given I am on the homepage
+            Then I should see "No front page content has been created yet" in the "content"
+
   4. Now, inside Drupal VM, change directory to `/var/www/drupal` again, and run the command `behat` (which runs all the tests you've created—which should just be one so far).
 
 If everything was done correctly, you should see:

From de87433762186488c5e7abd31468ef10b92ce3af Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 31 Oct 2015 21:10:09 -0500
Subject: [PATCH 0070/1273] Fixes #290: For Windows, VT-x is disabled in the
 bios for both all cpu modes.

---
 docs/other/windows.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/other/windows.md b/docs/other/windows.md
index df981706c..7a7c01ece 100644
--- a/docs/other/windows.md
+++ b/docs/other/windows.md
@@ -40,3 +40,7 @@ Some Windows users have reported running into an issue where an authentication f
 ### Windows 7 requires PowerShell upgrade
 
 If you are running Windows 7 and `vagrant up` hangs, you may need to upgrade PowerShell. Windows 7 ships with PowerShell 2.0, but PowerShell 3.0 or higher is required. For Windows 7, you can upgrade to PowerShell 4.0 which is part of the [Windows Management Framework](http://www.microsoft.com/en-us/download/details.aspx?id=40855).
+
+## Intel VT-x virtualization support
+
+On some laptops, Intel VT-x virtualization (which is built into most modern Intel processors) is enabled by default. This allows VirtualBox to run virtual machines efficiently using the CPU itself instead of software CPU emulation. If you get a message like "VT-x is disabled in the bios for both all cpu modes" or something similar, you may need to enter your computer's BIOS settings and enable this virtualization support.

From 89aee26c26d75fa4c29cf5b4a75cc437588dae1e Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 31 Oct 2015 22:52:12 -0500
Subject: [PATCH 0071/1273] Fixes #291: Add instructions for Windows and
 hostsupdater usage.

---
 docs/other/windows.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/other/windows.md b/docs/other/windows.md
index 7a7c01ece..2cad541fc 100644
--- a/docs/other/windows.md
+++ b/docs/other/windows.md
@@ -41,6 +41,13 @@ Some Windows users have reported running into an issue where an authentication f
 
 If you are running Windows 7 and `vagrant up` hangs, you may need to upgrade PowerShell. Windows 7 ships with PowerShell 2.0, but PowerShell 3.0 or higher is required. For Windows 7, you can upgrade to PowerShell 4.0 which is part of the [Windows Management Framework](http://www.microsoft.com/en-us/download/details.aspx?id=40855).
 
+## Hosts file updates
+
+If you install the `vagrant-hostsupdater` plugin, you might get a permissions error when Vagrant tries changing the hosts file. On a Mac or Linux workstation, you're prompted for a sudo password so the change can be made, but on Windows, you have to do one of the following to make sure hostsupdater works correctly:
+
+  1. Run PowerShell or whatever CLI you use with Vagrant as an administrator. Right click on the application and select 'Run as administrator', then proceed with `vagrant` commands as normal.
+  2. Change the permissions on the hosts file so anyone can edit the file (this has security implications, so it's best to use option 1 unless you know what you're doing).
+
 ## Intel VT-x virtualization support
 
 On some laptops, Intel VT-x virtualization (which is built into most modern Intel processors) is enabled by default. This allows VirtualBox to run virtual machines efficiently using the CPU itself instead of software CPU emulation. If you get a message like "VT-x is disabled in the bios for both all cpu modes" or something similar, you may need to enter your computer's BIOS settings and enable this virtualization support.

From 00f373ecc5693a62afa9dbf1ae14a9f37ab5f0a1 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 2 Nov 2015 22:36:36 -0600
Subject: [PATCH 0072/1273] Issue #297: Add notes about Windows performance
 improvements.

---
 docs/other/windows.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/other/windows.md b/docs/other/windows.md
index 2cad541fc..25d2dc446 100644
--- a/docs/other/windows.md
+++ b/docs/other/windows.md
@@ -4,6 +4,14 @@ There are a few caveats when using Drupal VM on Windows, and this page will try
 
 Most issues have to do synced folders. These are the most common ones:
 
+### Performance
+
+By default, if you use the 'NFS' synced folder type, Vagrant will ignore this directive and use the native (usually slow) VirtualBox shared folder system instead. You can get higher performance by doing one of the following (all of these steps require a full VM reload (`vagrant reload`) to take effect):
+
+  1. **Install the `vagrant-winnfsd` plugin**. See the 'NFS' section later for more details and caveats.
+  2. **Use `smb` for the synced folder's type.**
+  2. **Use `rsync` for the synced folder's type.** This requires that you have `rsync` available on your Windows workstation, which you can get if you install a substitute CLI like [Cygwin](https://www.cygwin.com/).
+
 ### Symbolic Links
 
 Creating symbolic links in a shared folder will fail with a permission or protocol error.

From d0279e4d45d9db74c859293d3dba5d47b013e7d6 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 11 Nov 2015 13:32:03 -0600
Subject: [PATCH 0073/1273] Update Ansible for DevOps book links.

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 1d31d6054..c1f816ba8 100644
--- a/README.md
+++ b/README.md
@@ -125,7 +125,7 @@ Drupal VM is built to integrate with every developer's workflow. Many guides for
   - When you rebuild the VM (e.g. `vagrant destroy` and then another `vagrant up`), make sure you clear out the contents of the `drupal` folder on your host machine, or Drupal will return some errors when the VM is rebuilt (it won't reinstall Drupal cleanly).
   - You can change the installed version of Drupal or drush, or any other configuration options, by editing the variables within `config.yml`.
   - Find out more about local development with Vagrant + VirtualBox + Ansible in this presentation: [Local Development Environments - Vagrant, VirtualBox and Ansible](http://www.slideshare.net/geerlingguy/local-development-on-virtual-machines-vagrant-virtualbox-and-ansible).
-  - Learn about how Ansible can accelerate your ability to innovate and manage your infrastructure by reading [Ansible for DevOps](https://leanpub.com/ansible-for-devops).
+  - Learn about how Ansible can accelerate your ability to innovate and manage your infrastructure by reading [Ansible for DevOps](http://www.ansiblefordevops.com/).
 
 ## License
 
@@ -133,4 +133,4 @@ This project is licensed under the MIT open source license.
 
 ## About the Author
 
-[Jeff Geerling](http://jeffgeerling.com/), owner of [Midwestern Mac, LLC](http://www.midwesternmac.com/), created this project in 2014 so he could accelerate his Drupal core and contrib development workflow. This project, and others like it, are also featured as examples in Jeff's book, [Ansible for DevOps](https://leanpub.com/ansible-for-devops).
+[Jeff Geerling](http://jeffgeerling.com/), owner of [Midwestern Mac, LLC](http://www.midwesternmac.com/), created this project in 2014 so he could accelerate his Drupal core and contrib development workflow. This project, and others like it, are also featured as examples in Jeff's book, [Ansible for DevOps](http://www.ansiblefordevops.com/).

From e4ee925186449414612c8cc1d90cada8863f40de Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 11 Nov 2015 14:06:49 -0600
Subject: [PATCH 0074/1273] Fixes #247: Ensure Apache is installed task fails
 due to permissions on /var/www.

---
 example.config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/example.config.yml b/example.config.yml
index 1622df80a..bfeb4a2be 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -22,7 +22,7 @@ vagrant_synced_folders:
   # The first synced folder will be used for the default Drupal installation, if
   # build_makefile: is 'true'.
   - local_path: ~/Sites/drupalvm
-    destination: /var/www
+    destination: /var/www/drupalvm
     type: nfs
     create: true
 
@@ -45,7 +45,7 @@ install_site: true
 # Settings for building a Drupal site from a makefile (if 'build_makefile:'
 # is 'true').
 drupal_major_version: 8
-drupal_core_path: "/var/www/drupal"
+drupal_core_path: "/var/www/drupalvm/drupal"
 drupal_domain: "drupalvm.dev"
 drupal_site_name: "Drupal"
 drupal_install_profile: standard

From 8c6544ecfe5ea93a538444c2a7c6354a08cc8057 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 11 Nov 2015 15:20:10 -0600
Subject: [PATCH 0075/1273] Updated README to add Ansible role installation to
 Quick Start Guide with a note.

---
 README.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index c1f816ba8..799eb8471 100644
--- a/README.md
+++ b/README.md
@@ -70,9 +70,8 @@ Note on versions: *Please make sure you're running the latest stable version of
     - Copy `example.config.yml` to `config.yml`.
   3. Create a local directory where Drupal will be installed and configure the path to that directory in `config.yml` (`local_path`, inside `vagrant_synced_folders`).
   4. Open Terminal, cd to this directory (containing the `Vagrantfile` and this README file).
-  5. Type in `vagrant up`, and let Vagrant do its magic.
-
-If you have Ansible installed on your host machine: Run `$ sudo ansible-galaxy install -r provisioning/requirements.yml --force` prior to step 5 (`vagrant up`), otherwise Ansible will complain about missing roles.
+  5. (If you have Ansible installed on Mac/Linux) Run `$ sudo ansible-galaxy install -r provisioning/requirements.yml --force`.
+  6. Type in `vagrant up`, and let Vagrant do its magic.
 
 Note: *If there are any errors during the course of running `vagrant up`, and it drops you back to your command prompt, just run `vagrant provision` to continue building the VM from where you left off. If there are still errors after doing this a few times, post an issue to this project's issue queue on GitHub with the error.*
 

From d127436a913583a95015c349315366fe2912a1d1 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 11 Nov 2015 15:58:38 -0600
Subject: [PATCH 0076/1273] Fixes #301 and Fixes #245: Document common Linux
 gotchas and tips.

---
 docs/other/linux.md | 67 +++++++++++++++++++++++++++++++++++++++++++++
 mkdocs.yml          |  1 +
 2 files changed, 68 insertions(+)
 create mode 100644 docs/other/linux.md

diff --git a/docs/other/linux.md b/docs/other/linux.md
new file mode 100644
index 000000000..3d83c6c15
--- /dev/null
+++ b/docs/other/linux.md
@@ -0,0 +1,67 @@
+There are a few caveats when using Drupal VM on Linux, and this page will try to identify the main gotchas or optimization tips for those wishing to use Drupal VM on a Linux host.
+
+## Platform-specific Install Instructions
+
+### All Linux flavors
+
+Always make sure your workstation is up to date (e.g. `apt-get update && apt-get upgrade` on Debian-like systems, or `dnf upgrade` or `yum upgrade` on Fedora/RedHat-like systems). There are sometimes bugs in the base OS packages (e.g. [this NFS-related bug](https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1508510)) that can be resolved by a simple upgrade.
+
+### Ubuntu
+
+Ubuntu 15.10 for Desktop (and some other versions) doesn't include NFS support by default, so if you get a message like `It appears your machine doesn't support NFS`, then you should do the following to install NFS server: `sudo apt-get install -y nfs-server`.
+
+### Fedora
+
+Under Fedora, you might encounter a message like the following upon the first time you use VirtualBox or Vagrant:
+
+```
+$ vagrant status
+VirtualBox is complaining that the kernel module is not loaded. Please
+run `VBoxManage --version` or open the VirtualBox GUI to see the error
+message which should contain instructions on how to fix this error.
+```
+
+In this case, you need to install your system's appropriate kernel module, and you'll also need to install `gcc` and run a specific VirtualBox installation script (or reinstall VirtualBox entirely) so the kernel module is loaded correctly. Do the following:
+
+  1. `sudo dnf install "kernel-devel-uname-r == $(uname -r)"`
+  2. `sudo dnf install gcc`
+  3. `sudo /var/lib/vboxdrv.sh setup`
+
+Periodically, when you upgrade your system's Linux kernel, you might need to run steps 2 and 3 above again, or you can uninstall and reinstall VirtualBox (e.g. `sudo dnf remove VirtualBox && sudo dnf install VirtualBox`).
+
+## Synced Folders
+
+Most issues have to do synced folders. These are the most common ones:
+
+### 'Mounting NFS shared folders...' hangs
+
+There are a few different reasons this particular problem can occur. You may run into the error below during `vagrant up`:
+
+```
+The following SSH command responded with a non-zero exit status.
+Vagrant assumes that this means the command failed!
+
+mount -o '' 192.168.88.1:'/Users/myusername/Sites/drupalvm' /var/www/drupalvm
+
+Stdout from the command:
+
+
+
+Stderr from the command:
+
+stdin: is not a tty
+mount.nfs: Connection timed out
+```
+
+If you get this message, then it's likely that either NFS isn't running correctly on your host, certain ports are protocols are being blocked by the system firewall, or you need to add additional mount options to your `vagrant_synced_folders` configuration. Try the following fixes:
+
+  1. On Ubuntu, if you get a message like `It appears your machine doesn't support NFS`, run `sudo apt-get install -y nfs-server`.
+  2. Install the `vagrant-vbguest` plugin, which will make sure you are running the latest version of the VirualBox Guest Additions inside the VM (this can solve many different problems!).
+  3. Make sure the `vboxnet` interfaces are not being blocked by your system firewall. For Fedora (and many flavors of Linux), check out this guide for more: [Get Vagrant's NFS working under Fedora 20](http://blog.bak1an.site/blog/2014/03/23/fedora-vagrant-nfs/).
+  4. Add `mount_options: ['vers=3']` to your synced folder definition in config.yml after the other options like `local_path`, `destination`, and `type`.
+
+After attempting any of the above fixes, run `vagrant reload --provision` to restart the VM and attempt mounting the synced folder again, or `vagrant destroy -f && vagrant up` to rebuild the VM from scratch.
+
+## Intel VT-x virtualization support
+
+On some laptops, Intel VT-x virtualization (which is built into most modern Intel processors) is enabled by default. This allows VirtualBox to run virtual machines efficiently using the CPU itself instead of software CPU emulation. If you get a message like "VT-x is disabled in the bios for both all cpu modes" or something similar, you may need to enter your computer's BIOS or UEFI settings and enable this virtualization support.
diff --git a/mkdocs.yml b/mkdocs.yml
index 5c29f2c6a..cfcaa89c7 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -34,6 +34,7 @@ pages:
     - 'PHP 7 on Drupal VM': 'other/php-7.md'
     - 'Networking Notes': 'other/networking.md'
     - 'Drupal 6 Notes': 'other/drupal-6.md'
+    - 'Linux Notes': 'other/linux.md'
     - 'Windows Notes': 'other/windows.md'
     - 'Cloning Drupal VM with newd': 'other/cloning-with-newd.md'
     - 'Vagrant and VirtualBox Tips': 'other/vagrant-virtualbox.md'

From c43e2083716d19ededa51eb0bd626c0d1a3a4ea8 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 12 Nov 2015 21:07:36 -0600
Subject: [PATCH 0077/1273] Issue #77: Xdebug PHP .ini files are not in cli
 configuration by default.

---
 example.config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/example.config.yml b/example.config.yml
index bfeb4a2be..c59b4a9ff 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -212,7 +212,7 @@ pimpmylog_grant_all_privs: true
 # XDebug configuration. XDebug is disabled by default for better performance.
 php_xdebug_default_enable: 0
 php_xdebug_coverage_enable: 0
-php_xdebug_cli_enable: 0
+php_xdebug_cli_enable: 1
 php_xdebug_remote_enable: 1
 php_xdebug_remote_connect_back: 1
 # Use PHPSTORM for PHPStorm, sublime.xdebug for Sublime Text.

From 8dbc69b10a587eec390335b6c8cdec572786816a Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 12 Nov 2015 22:51:37 -0600
Subject: [PATCH 0078/1273] Issue #77: Default php_enable_php_fpm to 1 so
 xdebug config works OOTB.

---
 example.config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/example.config.yml b/example.config.yml
index c59b4a9ff..3c8831c61 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -180,6 +180,7 @@ php_version: "5.6"
 php_memory_limit: "192M"
 php_display_errors: "On"
 php_display_startup_errors: "On"
+php_enable_php_fpm: 1
 php_realpath_cache_size: "1024K"
 php_sendmail_path: "/usr/sbin/ssmtp -t"
 php_opcache_enabled_in_ini: true

From 10160db65d13a5dff355147eeab7d7134b7ee80c Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 12 Nov 2015 23:06:12 -0600
Subject: [PATCH 0079/1273] Fixes #308: Add .idea and .project to .gitignore.

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 4d91e90e0..bff5f4950 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 .DS_Store
+.idea/
+.project/
 .vagrant/
 vagrant_ansible_inventory_default
 config.yml

From 6f4c2483d47eccb6a4da0ae236ee433f3efaab8f Mon Sep 17 00:00:00 2001
From: Moshe Weitzman <weitzman@tejasa.com>
Date: Thu, 3 Dec 2015 12:22:57 -0500
Subject: [PATCH 0080/1273] Remove 'id' from code comment

Followup to 43da06d92316eebb2abbecd813a4d5dc74a279fc
---
 example.config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/example.config.yml b/example.config.yml
index 3c8831c61..3bcb6d6cd 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -15,7 +15,7 @@ vagrant_ip: 192.168.88.88
 # See: https://docs.vagrantup.com/v2/networking/public_network.html
 vagrant_public_ip: ""
 
-# A list of synced folders, with the keys 'local_path', 'destination', 'id', and
+# A list of synced folders, with the keys 'local_path', 'destination', and
 # a 'type' of [nfs|rsync|smb] (leave empty for slow native shares). See
 # http://docs.drupalvm.com/en/latest/extras/syncing-folders/ for more info.
 vagrant_synced_folders:

From 07488d2b11a5a8deeebf83b95e00c300ee23f961 Mon Sep 17 00:00:00 2001
From: Chapabu <chapabu101@gmail.com>
Date: Fri, 4 Dec 2015 09:36:38 +0000
Subject: [PATCH 0081/1273] Remove PHP 7 RC comments from docs

Removed "PHP 7 is out soon" comments.
---
 docs/other/php-7.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/other/php-7.md b/docs/other/php-7.md
index 35d969ca4..a65334ad0 100644
--- a/docs/other/php-7.md
+++ b/docs/other/php-7.md
@@ -1,6 +1,6 @@
 Many users have requested the ability to easily install PHP 7.x in addition to the already easy-to-configure options of 5.3, 5.4, 5.5, and 5.6. This page will guide you through how to get PHP 7 running on Drupal VM in a few different ways, depending on what type of installation you need.
 
-_At this time (summer 2015), PHP 7 is still in the release candidate stage, and all support is experimental and prone to breaking. Please don't try running PHP 7 on production environments yet!_
+_At this time (Winter 2015), PHP 7 has only recently been released, and all support is experimental and prone to breaking._
 
 ## Ubuntu 14.04
 
@@ -23,7 +23,7 @@ php_packages:
 php_mysql_package: php-mysql
 ```
 
-Note that there can still be a few inconsistencies with this configuration, especially as PHP 7.0.0 is still in 'release candidate status'. You can also build from source using the same/included `geerlingguy.php` Ansible role, but that process is a bit more involved and for power users comfortable with the process.
+Note that there can still be a few inconsistencies with this configuration, especially as PHP 7.0.0 has only recently been released. You can also build from source using the same/included `geerlingguy.php` Ansible role, but that process is a bit more involved and for power users comfortable with the process.
 
 ## RedHat/CentOS 7
 

From 6869c5e07694748597121f3d22143be6eac567d1 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 7 Dec 2015 11:21:35 -0600
Subject: [PATCH 0082/1273] Issue #332: PHP7 causes fpm error.

---
 docs/other/php-7.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/other/php-7.md b/docs/other/php-7.md
index a65334ad0..ec455b882 100644
--- a/docs/other/php-7.md
+++ b/docs/other/php-7.md
@@ -21,6 +21,7 @@ php_packages:
   - php-json
   - php-opcache
 php_mysql_package: php-mysql
+php_fpm_daemon: php7.0-fpm
 ```
 
 Note that there can still be a few inconsistencies with this configuration, especially as PHP 7.0.0 has only recently been released. You can also build from source using the same/included `geerlingguy.php` Ansible role, but that process is a bit more involved and for power users comfortable with the process.

From 5c41a93a5da0d50cc08e9328d25f475e785d1f5e Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 7 Dec 2015 11:25:04 -0600
Subject: [PATCH 0083/1273] Issue #278: Make Drupal Console install optional.

---
 README.md                 | 2 +-
 example.config.yml        | 1 +
 provisioning/playbook.yml | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 799eb8471..43370eaba 100644
--- a/README.md
+++ b/README.md
@@ -12,9 +12,9 @@ It will install the following on an Ubuntu 14.04 (by default) linux VM:
   - PHP 5.6.x (configurable)
   - MySQL 5.5.x
   - Drush (configurable)
-  - Drupal Console (if using Drupal 8+)
   - Drupal 6.x, 7.x, or 8.x.x (configurable)
   - Optional:
+    - Drupal Console
     - Varnish 4.x (configurable)
     - Apache Solr 4.10.x (configurable)
     - Node.js 0.12 (configurable)
diff --git a/example.config.yml b/example.config.yml
index 3bcb6d6cd..0c2a46fb5 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -133,6 +133,7 @@ mysql_users:
 # to install *any* extras, make set this value to an empty set, e.g. `[]`.
 installed_extras:
   - adminer
+  - drupalconsole
   - mailhog
   - memcached
   # - nodejs
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 60b00def0..b3e49d7a8 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -24,9 +24,9 @@
     - geerlingguy.php-mysql
     - geerlingguy.composer
     - geerlingguy.drush
-    - { role: geerlingguy.drupal-console, when: drupal_major_version > 7 }
 
     # Conditionally-installed roles.
+    - { role: geerlingguy.drupal-console, when: 'drupal_major_version > 7 and "drupalconsole" in installed_extras' }
     - { role: geerlingguy.memcached, when: '"memcached" in installed_extras' }
     - { role: geerlingguy.php-memcached, when: '"memcached" in installed_extras' }
     - { role: geerlingguy.php-xdebug, when: '"xdebug" in installed_extras' }

From f2b164e34ea9c033799add9aa14b349c58abeb13 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 7 Dec 2015 11:31:45 -0600
Subject: [PATCH 0084/1273] Fixes #332: Update documentation for running PHP
 7.0.0+ on Drupal VM.

---
 docs/other/php-7.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/other/php-7.md b/docs/other/php-7.md
index ec455b882..30169fd1c 100644
--- a/docs/other/php-7.md
+++ b/docs/other/php-7.md
@@ -24,7 +24,9 @@ php_mysql_package: php-mysql
 php_fpm_daemon: php7.0-fpm
 ```
 
-Note that there can still be a few inconsistencies with this configuration, especially as PHP 7.0.0 has only recently been released. You can also build from source using the same/included `geerlingguy.php` Ansible role, but that process is a bit more involved and for power users comfortable with the process.
+Also, comment out `memcached` from the `installed_extras` list, as the PHP Memcached extension is not yet available for PHP 7 (as of late 2015).
+
+You can also build from source using the same/included `geerlingguy.php` Ansible role, but that process is a bit more involved and for power users comfortable with the process.
 
 ## RedHat/CentOS 7
 

From bb729ababf329cad36f4a973dfdfb07021070b0f Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 7 Dec 2015 16:49:21 -0600
Subject: [PATCH 0085/1273] Issue #332: Clean up docs for PHP7 and fix CentOS
 repo name.

---
 docs/other/php-7.md                | 43 +++++-------------------------
 provisioning/tasks/init-redhat.yml |  2 +-
 2 files changed, 7 insertions(+), 38 deletions(-)

diff --git a/docs/other/php-7.md b/docs/other/php-7.md
index 30169fd1c..52cdbe26e 100644
--- a/docs/other/php-7.md
+++ b/docs/other/php-7.md
@@ -1,6 +1,6 @@
-Many users have requested the ability to easily install PHP 7.x in addition to the already easy-to-configure options of 5.3, 5.4, 5.5, and 5.6. This page will guide you through how to get PHP 7 running on Drupal VM in a few different ways, depending on what type of installation you need.
+Drupal VM fully supports PHP 7, but currently defaults to 5.6 in order to maximize compatibility with older Drupal 6 and 7 sites. Soon, Drupal VM will change its defaults to install PHP 7.x instead of 5.x, but until then, follow the instructions below to use PHP 7.
 
-_At this time (Winter 2015), PHP 7 has only recently been released, and all support is experimental and prone to breaking._
+_Note: If you have Ansible installed on your host machine, make sure you're running the latest version of all Ansible role dependencies by running `ansible-galaxy install -r provisioning/requirements.txt --force` inside the root Drupal VM project folder._
 
 ## Ubuntu 14.04
 
@@ -30,39 +30,8 @@ You can also build from source using the same/included `geerlingguy.php` Ansible
 
 ## RedHat/CentOS 7
 
-After configuring Drupal VM to [use a different base OS](https://github.com/geerlingguy/drupal-vm/wiki/Using-Different-Base-OSes) (in this case, CentOS 7), you need to do the following to get PHP 7 running inside the VM:
+Remi's RPM repository is included with Drupal VM, and you can make the following changes to use it to install PHP 7:
 
-  1. Make the changes to `config.yml` defined in the code block at the end of these instructions ('Changes to make PHP 7 work...').
-
-  2. At this time, automatic install of `xhprof` and `xdebug` are unsupported. Make sure these options are commented or removed from the `installed_extras` setting in `config.yml`.
-
-  3. Run the normal `vagrant up` as you would with PHP 5.x, but when provisioning fails (usually on the Composer step), log into the VM with `vagrant ssh`, and run the following two commands:
-    ```
-    sudo ln -s /usr/bin/php70 /usr/bin/php
-    sudo systemctl restart httpd.service
-    ```
-
-  4. Log back out (type `exit` to exit the session in the VM) and run `vagrant provision`. This should pick back up where the provisioning left off earlier, and complete installation.
-
-Note: Make sure you're running the latest version of all Ansible role dependencies by running `ansible-galaxy install -r provisioning/requirements.txt --force` inside the root Drupal VM project folder.
-
-    # Changes to make PHP 7 work in CentOS via Remi's repo.
-    php_executable: php70
-    php_packages:
-      - php70
-      - php70-php
-      - php70-fakepear
-      - php70-php-devel
-      - php70-php-gd
-      - php70-php-imap
-      - php70-php-ldap
-      - php70-php-mbstring
-      - php70-php-pdo
-      - php70-php-process
-      - php70-php-xml
-      - php70-php-xmlrpc
-    php_mysql_package: php70-php-mysqlnd
-
-## Zend nightly PHP 7 builds
-
-Zend has a repository with [nightly PHP 7 builds](http://php7.zend.com/repo.php) for either RHEL/CentOS 7 or Debian 8/Ubuntu 14.04, but the repository requires some manual configuration and setup and is not going to be officially supported as a PHP 7 installation method within Drupal VM.
+  1. Make sure you've followed the directions for switching to CentOS 7 in the [use a different base OS](https://github.com/geerlingguy/drupal-vm/wiki/Using-Different-Base-OSes) guide.
+  2. Change `php_version` inside `config.yml` to `"7.0"`.
+  3. Comment `xhprof`, `xdebug`, and `memcached` from the `installed_extras` in `config.yml`, as they're not yet supported.
diff --git a/provisioning/tasks/init-redhat.yml b/provisioning/tasks/init-redhat.yml
index b95ca9383..5e3a72533 100644
--- a/provisioning/tasks/init-redhat.yml
+++ b/provisioning/tasks/init-redhat.yml
@@ -18,5 +18,5 @@
   when: php_version == "5.6"
 
 - name: Enable remi repo for PHP 7.0.
-  set_fact: php_enablerepo="remi,remi-test"
+  set_fact: php_enablerepo="remi,remi-php70"
   when: php_version == "7.0"

From 809475e96db9647b5893f1379dd5c17e29f649db Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 10 Dec 2015 23:29:23 -0600
Subject: [PATCH 0086/1273] Fixes #174: Add ability to provide custom shell
 scripts to run after provisioning.

---
 .gitignore                |  1 +
 docs/extras/scripts.md    | 14 ++++++++++++++
 example.config.yml        |  5 +++++
 mkdocs.yml                |  1 +
 provisioning/playbook.yml |  4 ++++
 5 files changed, 25 insertions(+)
 create mode 100644 docs/extras/scripts.md

diff --git a/.gitignore b/.gitignore
index bff5f4950..0c92992e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ vagrant_ansible_inventory_default
 config.yml
 drupal.make.yml
 examples/prod/inventory
+scripts/
\ No newline at end of file
diff --git a/docs/extras/scripts.md b/docs/extras/scripts.md
new file mode 100644
index 000000000..2b9d4fd5d
--- /dev/null
+++ b/docs/extras/scripts.md
@@ -0,0 +1,14 @@
+Drupal VM allows you to run extra shell scripts at the end of the provisioning process, in case you need to do extra setup, further configure the VM, or install extra software outside the purview of Drupal VM.
+
+To use an extra script, configure the path to the script (relative to `provisioning/playbook.yml`) in `config.yml`:
+
+```yaml
+post_provision_scripts:
+  - "../scripts/post-provision.sh"
+```
+
+The above example results in a `post-provision.sh` script running after the main Drupal VM setup is complete. Note that post provision scripts run _every_ time you the VM is provisioned provision the environment (e.g. when you run `vagrant up` or `vagrant provision`).
+
+You can define as many scripts as you would like, and any arguments after the path will be passed to the shell script itself (e.g. `"- "../scripts/setup-paths.sh --option"`).
+
+Place your post-provision scripts inside a `scripts` directory in the root of your Drupal VM project directory; this directory is gitignored, so you can continue to update Drupal VM without overwriting your scripts.
diff --git a/example.config.yml b/example.config.yml
index 0c2a46fb5..c7e5feecb 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -194,6 +194,11 @@ composer_home_path: '/home/vagrant/.composer'
 # composer_global_packages:
 #   - { name: phpunit/phpunit, release: '@stable' }
 
+# Run specified scripts after VM is provisioned. Path is relative to the
+# `provisioning/playbook.yml` file.
+post_provision_scripts: []
+  # - "../examples/scripts/configure-solr.sh"
+
 # MySQL Configuration.
 mysql_root_password: root
 mysql_slow_query_log_enabled: true
diff --git a/mkdocs.yml b/mkdocs.yml
index cfcaa89c7..dc7253602 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -28,6 +28,7 @@ pages:
     - 'Debug Code with XDebug': 'extras/xdebug.md'
     - 'Catch Emails with MailHog': 'extras/mailhog.md'
     - 'Test with Behat and Selenium': 'extras/behat.md'
+    - 'Add Post-Provision Scripts': 'extras/scripts.md'
   - Other Information:
     - 'Using Different Base OSes': 'other/base-os.md'
     - 'Using Different Webservers': 'other/webservers.md'
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index b3e49d7a8..049d2561c 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -66,3 +66,7 @@
 
     - include: tasks/drush-aliases.yml
     - include: tasks/cron.yml
+
+    - name: Run configured post-provision shell scripts.
+      script: "{{ item }}"
+      with_items: post_provision_scripts

From 71512f9cd5763b041e89a70ade24de77e3068cf3 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 11 Dec 2015 09:21:38 -0600
Subject: [PATCH 0087/1273] Fixes #344: Document unsupported PHP extensions for
 PHP 7.

---
 docs/other/php-7.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/other/php-7.md b/docs/other/php-7.md
index 52cdbe26e..3262f9ca9 100644
--- a/docs/other/php-7.md
+++ b/docs/other/php-7.md
@@ -24,7 +24,7 @@ php_mysql_package: php-mysql
 php_fpm_daemon: php7.0-fpm
 ```
 
-Also, comment out `memcached` from the `installed_extras` list, as the PHP Memcached extension is not yet available for PHP 7 (as of late 2015).
+Also, comment out `xhprof`, `xdebug`, and `memcached` from the `installed_extras` list, as these extensions are not yet supported for PHP 7 (as of late 2015).
 
 You can also build from source using the same/included `geerlingguy.php` Ansible role, but that process is a bit more involved and for power users comfortable with the process.
 
@@ -34,4 +34,4 @@ Remi's RPM repository is included with Drupal VM, and you can make the following
 
   1. Make sure you've followed the directions for switching to CentOS 7 in the [use a different base OS](https://github.com/geerlingguy/drupal-vm/wiki/Using-Different-Base-OSes) guide.
   2. Change `php_version` inside `config.yml` to `"7.0"`.
-  3. Comment `xhprof`, `xdebug`, and `memcached` from the `installed_extras` in `config.yml`, as they're not yet supported.
+  3. Comment out `xhprof`, `xdebug`, and `memcached` from the `installed_extras` list, as these extensions are not yet supported for PHP 7 (as of late 2015).

From 8bb9f1cffead7eabfcbcea364f505698353c5a9f Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 12 Dec 2015 22:43:00 -0600
Subject: [PATCH 0088/1273] Fixes #289: Add Redis as optional install.

---
 README.md                     | 18 ++----------------
 docs/other/php-7.md           |  4 ++--
 example.config.yml            |  1 +
 provisioning/playbook.yml     |  2 ++
 provisioning/requirements.yml |  2 ++
 5 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 43370eaba..8b59b38a0 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,7 @@ It will install the following on an Ubuntu 14.04 (by default) linux VM:
     - Selenium, for testing your sites via Behat
     - Ruby
     - Memcached
+    - Redis
     - XHProf, for profiling your code
     - XDebug, for debugging your code
     - Adminer, for accessing databases directly
@@ -101,22 +102,7 @@ If you don't want or need one or more of these extras, just delete them or comme
 
 ## Using Drupal VM
 
-Drupal VM is built to integrate with every developer's workflow. Many guides for using Drupal VM for common development tasks are available on the [Drupal VM documentation site](http://docs.drupalvm.com):
-
-  - [Syncing Folders](http://docs.drupalvm.com/en/latest/extras/syncing-folders/)
-  - [Connect to the MySQL Database](http://docs.drupalvm.com/en/latest/extras/mysql/)
-  - [Use Apache Solr for Search](http://docs.drupalvm.com/en/latest/extras/solr/)
-  - [Use Drush with Drupal VM](http://docs.drupalvm.com/en/latest/extras/drush/)
-  - [Use Drupal Console with Drupal VM](http://docs.drupalvm.com/en/latest/extras/drupal-console/)
-  - [Use Varnish with Drupal VM](http://docs.drupalvm.com/en/latest/extras/varnish/)
-  - [Use MariaDB instead of MySQL](http://docs.drupalvm.com/en/latest/extras/mariadb/)
-  - [View Logs with Pimp my Log](http://docs.drupalvm.com/en/latest/extras/pimpmylog/)
-  - [Profile Code with XHProf](http://docs.drupalvm.com/en/latest/extras/xhprof/)
-  - [Debug Code with XDebug](http://docs.drupalvm.com/en/latest/extras/xdebug/)
-  - [Catch Emails with MailHog](http://docs.drupalvm.com/en/latest/extras/mailhog/)
-  - [Test with Behat and Selenium](http://docs.drupalvm.com/en/latest/extras/behat/)
-  - [PHP 7 on Drupal VM](http://docs.drupalvm.com/en/latest/other/php-7/)
-  - [Drupal 6 Notes](http://docs.drupalvm.com/en/latest/other/drupal-6/)
+Drupal VM is built to integrate with every developer's workflow. Many guides for using Drupal VM for common development tasks are available on the [Drupal VM documentation site](http://docs.drupalvm.com).
 
 ## Other Notes
 
diff --git a/docs/other/php-7.md b/docs/other/php-7.md
index 3262f9ca9..bc72412d7 100644
--- a/docs/other/php-7.md
+++ b/docs/other/php-7.md
@@ -24,7 +24,7 @@ php_mysql_package: php-mysql
 php_fpm_daemon: php7.0-fpm
 ```
 
-Also, comment out `xhprof`, `xdebug`, and `memcached` from the `installed_extras` list, as these extensions are not yet supported for PHP 7 (as of late 2015).
+Also, comment out `xhprof`, `xdebug`, `redis` and `memcached` from the `installed_extras` list, as these extensions are not yet supported for PHP 7 (as of late 2015).
 
 You can also build from source using the same/included `geerlingguy.php` Ansible role, but that process is a bit more involved and for power users comfortable with the process.
 
@@ -34,4 +34,4 @@ Remi's RPM repository is included with Drupal VM, and you can make the following
 
   1. Make sure you've followed the directions for switching to CentOS 7 in the [use a different base OS](https://github.com/geerlingguy/drupal-vm/wiki/Using-Different-Base-OSes) guide.
   2. Change `php_version` inside `config.yml` to `"7.0"`.
-  3. Comment out `xhprof`, `xdebug`, and `memcached` from the `installed_extras` list, as these extensions are not yet supported for PHP 7 (as of late 2015).
+  3. Comment out `xhprof`, `xdebug`, `redis` and `memcached` from the `installed_extras` list, as these extensions are not yet supported for PHP 7 (as of late 2015).
diff --git a/example.config.yml b/example.config.yml
index c7e5feecb..f09475c7e 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -138,6 +138,7 @@ installed_extras:
   - memcached
   # - nodejs
   - pimpmylog
+  # - redis
   # - ruby
   # - selenium
   # - solr
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 049d2561c..4d908cdd6 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -36,6 +36,8 @@
     - { role: geerlingguy.daemonize, when: '"mailhog" in installed_extras' }
     - { role: geerlingguy.mailhog, when: '"mailhog" in installed_extras' }
     - { role: geerlingguy.nodejs, when: '"nodejs" in installed_extras' }
+    - { role: geerlingguy.redis, when: '"redis" in installed_extras' }
+    - { role: geerlingguy.php-redis, when: '"redis" in installed_extras' }
     - { role: geerlingguy.ruby, when: '"ruby" in installed_extras' }
     - { role: geerlingguy.java, when: '"solr" in installed_extras or "selenium" in installed_extras' }
     - { role: arknoll.selenium, when: '"selenium" in installed_extras' }
diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 1542a8a29..418c6776a 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -18,10 +18,12 @@
 - src: geerlingguy.php-memcached
 - src: geerlingguy.php-mysql
 - src: geerlingguy.php-pecl
+- src: geerlingguy.php-redis
 - src: geerlingguy.php-xdebug
 - src: geerlingguy.php-xhprof
 - src: geerlingguy.pimpmylog
 - src: geerlingguy.postfix
+- src: geerlingguy.redis
 - src: geerlingguy.repo-remi
 - src: geerlingguy.ruby
 - src: geerlingguy.security

From e99ae7150adb9efb6c9dc3ea9c02447043da164a Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 14 Dec 2015 08:58:20 -0600
Subject: [PATCH 0089/1273] Fixes #337: PHP 7 documentation needs updating for
 Nginx.

---
 docs/other/php-7.md                        | 14 ++++++++------
 example.config.yml                         |  2 +-
 examples/acquia/acquia.overrides.yml       |  2 +-
 provisioning/playbook.yml                  |  5 +++++
 provisioning/tasks/init-debian.yml         |  1 -
 provisioning/templates/nginx-vhost.conf.j2 |  6 +++++-
 6 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/docs/other/php-7.md b/docs/other/php-7.md
index bc72412d7..6e5f4a0b8 100644
--- a/docs/other/php-7.md
+++ b/docs/other/php-7.md
@@ -15,12 +15,12 @@ php_packages:
   - php7.0-dev
   - php7.0-fpm
   - libpcre3-dev
-  - php-gd
-  - php-curl
-  - php-imap
-  - php-json
-  - php-opcache
-php_mysql_package: php-mysql
+  - php7.0-gd
+  - php7.0-curl
+  - php7.0-imap
+  - php7.0-json
+  - php7.0-opcache
+php_mysql_package: php7.0-mysql
 php_fpm_daemon: php7.0-fpm
 ```
 
@@ -28,6 +28,8 @@ Also, comment out `xhprof`, `xdebug`, `redis` and `memcached` from the `installe
 
 You can also build from source using the same/included `geerlingguy.php` Ansible role, but that process is a bit more involved and for power users comfortable with the process.
 
+**If you're using Nginx** instead of Apache, don't include `libapache2-mod-php7.0` in the `php_packages` list in `config.yml`.
+
 ## RedHat/CentOS 7
 
 Remi's RPM repository is included with Drupal VM, and you can make the following changes to use it to install PHP 7:
diff --git a/example.config.yml b/example.config.yml
index f09475c7e..6c2659de2 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -182,7 +182,7 @@ php_version: "5.6"
 php_memory_limit: "192M"
 php_display_errors: "On"
 php_display_startup_errors: "On"
-php_enable_php_fpm: 1
+php_enable_php_fpm: true
 php_realpath_cache_size: "1024K"
 php_sendmail_path: "/usr/sbin/ssmtp -t"
 php_opcache_enabled_in_ini: true
diff --git a/examples/acquia/acquia.overrides.yml b/examples/acquia/acquia.overrides.yml
index 1cfb9a67b..bcc7cdb85 100644
--- a/examples/acquia/acquia.overrides.yml
+++ b/examples/acquia/acquia.overrides.yml
@@ -1,4 +1,4 @@
 ---
 vagrant_box: geerlingguy/ubuntu1204
-php_version: "5.5"
+php_version: "5.6"
 solr_version: "4.5.1"
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 4d908cdd6..159061292 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -10,6 +10,11 @@
     - include: tasks/init-redhat.yml
       when: ansible_os_family == 'RedHat'
 
+    - name: Set the PHP webserver daemon correctly when nginx is in use.
+      set_fact:
+        php_webserver_daemon: nginx
+      when: drupalvm_webserver == 'nginx'
+
   roles:
     # Essential roles.
     - { role: geerlingguy.repo-remi, when: ansible_os_family == 'RedHat' }
diff --git a/provisioning/tasks/init-debian.yml b/provisioning/tasks/init-debian.yml
index 74f842232..7a848f3a3 100644
--- a/provisioning/tasks/init-debian.yml
+++ b/provisioning/tasks/init-debian.yml
@@ -21,7 +21,6 @@
   apt_repository: repo='ppa:ondrej/php5-5.6'
   when: php_version == "5.6"
 
-# Experimental.
 - name: Add repository for PHP 7.0.
   apt_repository: repo='ppa:ondrej/php-7.0'
   when: php_version == "7.0"
diff --git a/provisioning/templates/nginx-vhost.conf.j2 b/provisioning/templates/nginx-vhost.conf.j2
index 7810ac3de..0250d97b6 100644
--- a/provisioning/templates/nginx-vhost.conf.j2
+++ b/provisioning/templates/nginx-vhost.conf.j2
@@ -32,7 +32,11 @@ server {
         try_files $uri = 404;
         fastcgi_split_path_info ^(.+\.php)(/.+)$;
 
-        fastcgi_pass unix:/var/run/php5-fpm.sock;
+        {% if php_version == "7.0" and ansible_distribution == "Ubuntu" %}
+        fastcgi_pass unix:/var/run/php/{{ php_fpm_daemon }}.sock;
+        {% else %}
+        fastcgi_pass unix:/var/run/{{ php_fpm_daemon }}.sock;
+        {% endif %}
         fastcgi_index index.php;
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
         fastcgi_read_timeout 120;

From e68f4f0fd2a340e815a236582b83ca63e008ff1e Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 14 Dec 2015 22:14:22 -0600
Subject: [PATCH 0090/1273] Support Nginx + CentOS 7 + PHP 7 a little nicer.

---
 provisioning/templates/nginx-vhost.conf.j2 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/provisioning/templates/nginx-vhost.conf.j2 b/provisioning/templates/nginx-vhost.conf.j2
index 0250d97b6..772f96429 100644
--- a/provisioning/templates/nginx-vhost.conf.j2
+++ b/provisioning/templates/nginx-vhost.conf.j2
@@ -34,6 +34,8 @@ server {
 
         {% if php_version == "7.0" and ansible_distribution == "Ubuntu" %}
         fastcgi_pass unix:/var/run/php/{{ php_fpm_daemon }}.sock;
+        {% elif php_version == "7.0" and ansible_distribution == "CentOS" %}
+        fastcgi_pass 127.0.0.1:9000;
         {% else %}
         fastcgi_pass unix:/var/run/{{ php_fpm_daemon }}.sock;
         {% endif %}

From 50b9ed496c2288b69b151046ff6d4589dfbdd52a Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 14 Dec 2015 23:02:42 -0600
Subject: [PATCH 0091/1273] Remove (Experimental) for PHP 7.0 support. It's
 official.

---
 example.config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/example.config.yml b/example.config.yml
index 6c2659de2..63a2f9665 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -177,7 +177,7 @@ firewall_allowed_tcp_ports:
   - "8983"
 firewall_log_dropped_packets: false
 
-# PHP Configuration. Currently-supported versions: 5.5, 5.6, 7.0 (experimental).
+# PHP Configuration. Currently-supported versions: 5.5, 5.6, 7.0.
 php_version: "5.6"
 php_memory_limit: "192M"
 php_display_errors: "On"

From 374eab31f14c5c14ad2a833e7f5d28d43b7ddb07 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 14 Dec 2015 23:12:25 -0600
Subject: [PATCH 0092/1273] Support Nginx + CentOS 7 + PHP 5 a little nicer.

---
 provisioning/templates/nginx-vhost.conf.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/templates/nginx-vhost.conf.j2 b/provisioning/templates/nginx-vhost.conf.j2
index 772f96429..8d0b57ac6 100644
--- a/provisioning/templates/nginx-vhost.conf.j2
+++ b/provisioning/templates/nginx-vhost.conf.j2
@@ -34,7 +34,7 @@ server {
 
         {% if php_version == "7.0" and ansible_distribution == "Ubuntu" %}
         fastcgi_pass unix:/var/run/php/{{ php_fpm_daemon }}.sock;
-        {% elif php_version == "7.0" and ansible_distribution == "CentOS" %}
+        {% elif ansible_distribution == "CentOS" %}
         fastcgi_pass 127.0.0.1:9000;
         {% else %}
         fastcgi_pass unix:/var/run/{{ php_fpm_daemon }}.sock;

From 4a5f4865dc9fe41ab9fa6d3b2952824eccfd7ab3 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 18 Dec 2015 13:54:59 -0600
Subject: [PATCH 0093/1273] Issue #174: Add example scripts.

---
 examples/scripts/README.md         | 18 +++++++++++++++
 examples/scripts/configure-solr.sh | 35 ++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 examples/scripts/README.md
 create mode 100755 examples/scripts/configure-solr.sh

diff --git a/examples/scripts/README.md b/examples/scripts/README.md
new file mode 100644
index 000000000..8d91b5182
--- /dev/null
+++ b/examples/scripts/README.md
@@ -0,0 +1,18 @@
+# Example Scripts for Drupal VM
+
+## Post-Provision Scripts
+
+Drupal VM allows you to run extra shell scripts at the end of the provisioning process, in case you need to do extra custom setup, configure your environment, or install extra software outside the purview of Drupal VM.
+
+To use an extra script, configure the path to the script (relative to `provisioning/playbook.yml`) in `config.yml`:
+
+```yaml
+post_provision_scripts:
+  - "../examples/post-provision.sh"
+```
+
+The above example results in the example `post-provision.sh` script running after the main Drupal VM setup is complete. Note that this script would run _every_ time you provision the environment (e.g. once when you run `vagrant up`, then again every time you run `vagrant provision` again).
+
+You can define as many scripts as you would like, and any arguments after the path will be passed to the shell script itself (e.g. `"../examples/post-provision.sh --option"`).
+
+Generally, you should place your post-provision scripts inside a `scripts` directory in the root of your Drupal VM project directory; this directory is gitignored, so you can continue to update Drupal VM without accidentally overwriting your scripts.
diff --git a/examples/scripts/configure-solr.sh b/examples/scripts/configure-solr.sh
new file mode 100755
index 000000000..c7e26dc8c
--- /dev/null
+++ b/examples/scripts/configure-solr.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+#
+# Example shell script to run post-provisioning.
+#
+# This script configures the default Apache Solr search core to use one of the
+# Drupal Solr module's configurations. This shell script presumes you have
+# `solr` in the `installed_extras`, and is currently set up for the D7 versions
+# of Apache Solr Search or Search API Solr.
+
+SOLR_SETUP_COMPLETE_FILE=/etc/drupal_vm_solr_config_complete
+
+# Search API Solr module.
+SOLR_DOWNLOAD=http://ftp.drupal.org/files/projects/search_api_solr-8.x-1.x-dev.tar.gz
+SOLR_DOWNLOAD_DIR=/tmp
+SOLR_MODULE_NAME=search_api_solr
+
+# Check to see if we've already performed this setup.
+if [ ! -e "$SOLR_SETUP_COMPLETE_FILE" ]; then
+  # Download and expand the Solr module.
+  wget -qO- $SOLR_DOWNLOAD | tar xvz -C $SOLR_DOWNLOAD_DIR
+
+  # Copy the Solr configuration into place over the default `collection1` core.
+  sudo cp -a $SOLR_DOWNLOAD_DIR/$SOLR_MODULE_NAME/solr-conf/4.x/. /var/solr/collection1/conf/
+
+  # Fix file permissions.
+  sudo chown -R solr:solr /var/solr/collection1/conf
+
+  # Restart Apache Solr.
+  sudo service solr restart
+
+  # Create a file to indicate this script has already run.
+  sudo touch $SOLR_SETUP_COMPLETE_FILE
+else
+  exit 0
+fi

From 1b6e7b421b95ded6cfd50a9fb8597c0ce388ac60 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 18 Dec 2015 23:47:43 -0600
Subject: [PATCH 0094/1273] Fixes #350: Update Nginx vhost template for more
 optimal Drupal 8 usage.

---
 provisioning/templates/nginx-vhost.conf.j2 | 24 ++++++++++------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/provisioning/templates/nginx-vhost.conf.j2 b/provisioning/templates/nginx-vhost.conf.j2
index 8d0b57ac6..062a804e3 100644
--- a/provisioning/templates/nginx-vhost.conf.j2
+++ b/provisioning/templates/nginx-vhost.conf.j2
@@ -17,7 +17,7 @@ server {
 {% if item.is_php is defined and item.is_php %}
     location / {
         # Don't touch PHP for static content.
-        try_files $uri @rewrite;
+        try_files $uri /index.php?$query_string;
     }
 
     # Don't allow direct access to PHP files in the vendor directory.
@@ -27,22 +27,20 @@ server {
     }
 
     # Use fastcgi for all php files.
-    location ~ \.php$ {
-        # Secure *.php files.
-        try_files $uri = 404;
-        fastcgi_split_path_info ^(.+\.php)(/.+)$;
-
-        {% if php_version == "7.0" and ansible_distribution == "Ubuntu" %}
-        fastcgi_pass unix:/var/run/php/{{ php_fpm_daemon }}.sock;
-        {% elif ansible_distribution == "CentOS" %}
-        fastcgi_pass 127.0.0.1:9000;
-        {% else %}
-        fastcgi_pass unix:/var/run/{{ php_fpm_daemon }}.sock;
-        {% endif %}
+    location ~ \.php$|^/update.php {
+        fastcgi_split_path_info ^(.+?\.php)(|/.*)$;
         fastcgi_index index.php;
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        fastcgi_intercept_errors on;
         fastcgi_read_timeout 120;
         include fastcgi_params;
+{% if php_version == "7.0" and ansible_distribution == "Ubuntu" %}
+        fastcgi_pass unix:/var/run/php/{{ php_fpm_daemon }}.sock;
+{% elif ansible_distribution == "CentOS" %}
+        fastcgi_pass 127.0.0.1:9000;
+{% else %}
+        fastcgi_pass unix:/var/run/{{ php_fpm_daemon }}.sock;
+{% endif %}
     }
 
     location @rewrite {

From 4893876c5f685dfa3e07646dcc3be22570200675 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 20 Dec 2015 14:42:51 -0600
Subject: [PATCH 0095/1273] Issue #350 follow-up: Don't leave in D6 Nginx
 config.

---
 provisioning/templates/nginx-vhost.conf.j2 | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/provisioning/templates/nginx-vhost.conf.j2 b/provisioning/templates/nginx-vhost.conf.j2
index 062a804e3..fbd8136a6 100644
--- a/provisioning/templates/nginx-vhost.conf.j2
+++ b/provisioning/templates/nginx-vhost.conf.j2
@@ -44,11 +44,7 @@ server {
     }
 
     location @rewrite {
-        # For D7 and above:
         rewrite ^ /index.php;
-
-        # For Drupal 6 and below:
-        #rewrite ^/(.*)$ /index.php?q=$1;
     }
 
     location ~ ^/sites/.*/files/styles/ {

From cacf9ebd50ae3fcd408b657e8ba81079a90e8988 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 20 Dec 2015 14:44:18 -0600
Subject: [PATCH 0096/1273] Issue #350 follow-up: adjust SCRIPT_FILENAME for
 Nginx vhost.

---
 provisioning/templates/nginx-vhost.conf.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/templates/nginx-vhost.conf.j2 b/provisioning/templates/nginx-vhost.conf.j2
index fbd8136a6..56f318ed6 100644
--- a/provisioning/templates/nginx-vhost.conf.j2
+++ b/provisioning/templates/nginx-vhost.conf.j2
@@ -30,7 +30,7 @@ server {
     location ~ \.php$|^/update.php {
         fastcgi_split_path_info ^(.+?\.php)(|/.*)$;
         fastcgi_index index.php;
-        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        fastcgi_param SCRIPT_FILENAME $request_filename;
         fastcgi_intercept_errors on;
         fastcgi_read_timeout 120;
         include fastcgi_params;

From 27dca1678fc577e49bdd8c3f5d675609360d6560 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 22 Dec 2015 21:27:14 -0600
Subject: [PATCH 0097/1273] Fixes #356: Allow override of default /vagrant
 synced folder type.

---
 Vagrantfile        | 10 ++++++----
 example.config.yml |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 7409b5976..7bbd11e17 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -71,17 +71,19 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       mount_options: synced_folder.include?('mount_options') ? synced_folder['mount_options'] : []
   end
 
+  # Allow override of the default synced folder type.
+  config.vm.synced_folder ".", "/vagrant", type: vconfig.include?('vagrant_synced_folder_default_type') ? vconfig['vagrant_default_synced_folder_type'] : 'nfs'
+
   # Provision using Ansible provisioner if Ansible is installed on host.
   if which('ansible-playbook')
     config.vm.provision "ansible" do |ansible|
       ansible.playbook = "#{dir}/provisioning/playbook.yml"
       ansible.sudo = true
     end
-  # Provision using shell provisioner and JJG-Ansible-Windows otherwise.
+  # Provision using ansible_local provisioner otherwise.
   else
-    config.vm.provision "shell" do |sh|
-      sh.path = "#{dir}/provisioning/JJG-Ansible-Windows/windows.sh"
-      sh.args = "/provisioning/playbook.yml"
+    config.vm.provision "ansible_local" do |sh|
+      ansible.playbook = "provisioning/playbook.yml"
     end
   end
 
diff --git a/example.config.yml b/example.config.yml
index 63a2f9665..bdf571dab 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -3,6 +3,7 @@
 # geerlingguy/ubuntu1204, parallels/ubuntu-14.04, etc.
 vagrant_box: geerlingguy/ubuntu1404
 vagrant_user: vagrant
+vagrant_synced_folder_default_type: nfs
 
 # If you need to run multiple instances of Drupal VM, set a unique hostname,
 # machine name, and IP address for each instance.

From 283614aca52342d654d5dd72f0a11f01e928be2b Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 22 Dec 2015 22:09:31 -0600
Subject: [PATCH 0098/1273] Fixes #355: Use new ansible_local provisioner
 included with Vagrant 1.8.0+.

---
 .gitignore                                  |  3 +-
 README.md                                   |  2 +-
 Vagrantfile                                 | 12 +++--
 provisioning/JJG-Ansible-Windows/LICENSE    | 20 --------
 provisioning/JJG-Ansible-Windows/README.md  | 40 ---------------
 provisioning/JJG-Ansible-Windows/windows.sh | 57 ---------------------
 provisioning/playbook.yml                   |  1 +
 7 files changed, 12 insertions(+), 123 deletions(-)
 delete mode 100644 provisioning/JJG-Ansible-Windows/LICENSE
 delete mode 100644 provisioning/JJG-Ansible-Windows/README.md
 delete mode 100644 provisioning/JJG-Ansible-Windows/windows.sh

diff --git a/.gitignore b/.gitignore
index 0c92992e5..6c93190f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,5 @@ vagrant_ansible_inventory_default
 config.yml
 drupal.make.yml
 examples/prod/inventory
-scripts/
\ No newline at end of file
+scripts/
+roles/
diff --git a/README.md b/README.md
index 8b59b38a0..c1032ad36 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ Note for Faster Provisioning (Mac/Linux only): *[Install Ansible](http://docs.an
 
 Note for Linux users: *If NFS is not already installed on your host, you will need to install it to use the default NFS synced folder configuration. See guides for [Debian/Ubuntu](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-ubuntu-14-04), [Arch](https://wiki.archlinux.org/index.php/NFS#Installation), and [RHEL/CentOS](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-centos-6).*
 
-Note on versions: *Please make sure you're running the latest stable version of Vagrant, VirtualBox, and Ansible, as the current version of Drupal VM is tested with the latest releases. As of August 2015: Vagrant 1.7.4, VirtualBox 5.0.2, and Ansible 1.9.2.*
+Note on versions: *Please make sure you're running the latest stable version of Vagrant, VirtualBox, and Ansible, as the current version of Drupal VM is tested with the latest releases. As of August 2015: Vagrant 1.8.0, VirtualBox 5.0.10, and Ansible 1.9.4.*
 
 ### 2 - Build the Virtual Machine
 
diff --git a/Vagrantfile b/Vagrantfile
index 7bbd11e17..568c7315a 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -23,6 +23,8 @@ end
 vconfig = YAML::load_file("#{dir}/config.yml")
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+
+  # Networking configuration.
   config.vm.hostname = vconfig['vagrant_hostname']
   if vconfig['vagrant_ip'] == "0.0.0.0" && Vagrant.has_plugin?("vagrant-auto_network")
     config.vm.network :private_network, :ip => vconfig['vagrant_ip'], :auto_network => true
@@ -36,9 +38,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     config.vm.network :public_network, ip: vconfig['vagrant_public_ip']
   end
 
+  # SSH options.
   config.ssh.insert_key = false
   config.ssh.forward_agent = true
 
+  # Vagrant box.
   config.vm.box = vconfig['vagrant_box']
 
   # If hostsupdater plugin is installed, add all server names as aliases.
@@ -60,6 +64,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     end
   end
 
+  # Synced folders.
   for synced_folder in vconfig['vagrant_synced_folders'];
     config.vm.synced_folder synced_folder['local_path'], synced_folder['destination'],
       type: synced_folder['type'],
@@ -74,16 +79,15 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # Allow override of the default synced folder type.
   config.vm.synced_folder ".", "/vagrant", type: vconfig.include?('vagrant_synced_folder_default_type') ? vconfig['vagrant_default_synced_folder_type'] : 'nfs'
 
-  # Provision using Ansible provisioner if Ansible is installed on host.
+  # Provisioning. Use ansible if it's installed on host, ansible_local if not.
   if which('ansible-playbook')
     config.vm.provision "ansible" do |ansible|
       ansible.playbook = "#{dir}/provisioning/playbook.yml"
-      ansible.sudo = true
     end
-  # Provision using ansible_local provisioner otherwise.
   else
-    config.vm.provision "ansible_local" do |sh|
+    config.vm.provision "ansible_local" do |ansible|
       ansible.playbook = "provisioning/playbook.yml"
+      ansible.galaxy_role_file = "provisioning/requirements.yml"
     end
   end
 
diff --git a/provisioning/JJG-Ansible-Windows/LICENSE b/provisioning/JJG-Ansible-Windows/LICENSE
deleted file mode 100644
index 378188abb..000000000
--- a/provisioning/JJG-Ansible-Windows/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2014 Jeff Geerling
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/provisioning/JJG-Ansible-Windows/README.md b/provisioning/JJG-Ansible-Windows/README.md
deleted file mode 100644
index f3406ba45..000000000
--- a/provisioning/JJG-Ansible-Windows/README.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# JJG-Ansible-Windows
-
-Windows shell provisioning script to bootstrap Ansible from within a Vagrant VM running on Windows.
-
-This script is configured to use configure any Linux-based VM (Debian, Ubuntu, Fedora, RedHat, CentOS, etc.) so it can run Ansible playbooks from within the VM through Vagrant.
-
-Read more about this script, and other techniques for using Ansible within a Windows environment, on Server Check.in: [Running Ansible within Windows](https://servercheck.in/blog/running-ansible-within-windows).
-
-## Usage
-
-In your Vagrantfile, use a conditional provisioning statement if you want to use this script (which runs Ansible from within the VM instead of on your host—this example assumes your playbook is inside within a 'provisioning' folder, and this script is within provisioning/JJG-Ansible-Windows):
-
-```ruby
-# Use rbconfig to determine if we're on a windows host or not.
-require 'rbconfig'
-is_windows = (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
-if is_windows
-  # Provisioning configuration for shell script.
-  config.vm.provision "shell" do |sh|
-    sh.path = "provisioning/JJG-Ansible-Windows/windows.sh"
-    sh.args = "provisioning/playbook.yml"
-  end
-else
-  # Provisioning configuration for Ansible (for Mac/Linux hosts).
-  config.vm.provision "ansible" do |ansible|
-    ansible.playbook = "provisioning/playbook.yml"
-    ansible.sudo = true
-  end
-end
-```
-
-Note that the `windows.sh` script will run within the VM and will run the given playbook against localhost with `--connection=local` inside the VM. You shouldn't/can't pass a custom inventory file to the script, as you can using Vagrant's Ansible provisioner.
-
-### Role Requirements File
-
-If your playbook requires roles to be installed which are not present in a `roles` directory within the playbook's directory, then you should add the roles to a [role requirements](http://docs.ansible.com/galaxy.html#advanced-control-over-role-requirements-files) file. Place the resulting `requirements.txt` or `requirements.yml` file in the same directory as your playbook, and the roles will be installed automatically.
-
-## Licensing and More Info
-
-Created by [Jeff Geerling](http://jeffgeerling.com/) in 2014. Licensed under the MIT license; see the LICENSE file for more info.
diff --git a/provisioning/JJG-Ansible-Windows/windows.sh b/provisioning/JJG-Ansible-Windows/windows.sh
deleted file mode 100644
index f6d045eef..000000000
--- a/provisioning/JJG-Ansible-Windows/windows.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-#
-# Windows shell provisioner for Ansible playbooks, based on KSid's
-# windows-vagrant-ansible: https://github.com/KSid/windows-vagrant-ansible
-#
-# @see README.md
-# @author Jeff Geerling, 2014
-
-# Uncomment if behind a proxy server.
-# export {http,https,ftp}_proxy='http://username:password@proxy-host:80'
-
-ANSIBLE_PLAYBOOK=$1
-PLAYBOOK_DIR=${ANSIBLE_PLAYBOOK%/*}
-
-# Detect package management system.
-YUM=$(which yum 2>/dev/null)
-APT_GET=$(which apt-get 2>/dev/null)
-
-# Make sure Ansible playbook exists.
-if [ ! -f "/vagrant/$ANSIBLE_PLAYBOOK" ]; then
-  echo "Cannot find Ansible playbook."
-  exit 1
-fi
-
-# Install Ansible and its dependencies if it's not installed already.
-if ! command -v ansible >/dev/null; then
-  echo "Installing Ansible dependencies and Git."
-  if [[ ! -z ${YUM} ]]; then
-    yum install -y git python python-devel
-  elif [[ ! -z ${APT_GET} ]]; then
-    apt-get install -y git python python-dev
-  else
-    echo "Neither yum nor apt-get are available."
-    exit 1;
-  fi
-
-  echo "Installing pip via easy_install."
-  wget https://raw.githubusercontent.com/ActiveState/ez_setup/v0.9/ez_setup.py
-  python ez_setup.py && rm -f ez_setup.py
-  easy_install pip
-  # Make sure setuptools are installed crrectly.
-  pip install setuptools --no-use-wheel --upgrade
-
-  echo "Installing required python modules."
-  pip install paramiko pyyaml jinja2 markupsafe
-
-  echo "Installing Ansible."
-  pip install ansible
-fi
-
-# Install requirements.
-echo "Installing Ansible roles from requirements file, if available."
-find "/vagrant/$PLAYBOOK_DIR" \( -name "requirements.yml" -o -name "requirements.txt" \) -exec sudo ansible-galaxy install --ignore-errors -r {} \;
-
-# Run the playbook.
-echo "Running Ansible provisioner defined in Vagrantfile."
-ansible-playbook -i 'localhost,' "/vagrant/${ANSIBLE_PLAYBOOK}" --extra-vars "is_windows=true" --connection=local
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 159061292..8d50e52cb 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -1,5 +1,6 @@
 ---
 - hosts: all
+  sudo: yes
 
   vars_files:
     - ../config.yml

From 577071da98ca57938d9ea4a227544b55bfe018b3 Mon Sep 17 00:00:00 2001
From: Chris Martin <chris.martin@fourkitchens.com>
Date: Wed, 23 Dec 2015 01:33:48 -0600
Subject: [PATCH 0099/1273] Update xdebug.md for NetBeans Configuration

Thanks for making Drupal VM!  It is awesome and I was hoping to contribute back.
---
 docs/extras/xdebug.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docs/extras/xdebug.md b/docs/extras/xdebug.md
index 0a6adb3f5..ea65942f3 100644
--- a/docs/extras/xdebug.md
+++ b/docs/extras/xdebug.md
@@ -22,3 +22,14 @@ To use XDebug with Sublime Text, change the `php_xdebug_idekey` variable as show
 ```yaml
 php_xdebug_idekey: sublime.xdebug
 ```
+
+## NetBeans and XDebug with Drupal VM
+
+To use XDebug with NetBeans, change the variables below in `config.yml`, and then run `vagrant provision` to reconfigure the VM.
+
+NOTE: php_xdebug_remote_port: 9000 will need to be added to your `config.yml` below the idekey.
+
+```yaml
+php_xdebug_idekey: netbeans-xdebug
+php_xdebug_remote_port: 9000
+```

From 9b914c0682b8ff2af373cca168ee39aae4537517 Mon Sep 17 00:00:00 2001
From: Vitalii Chernomor <vitaliy.s.chernomor@gmail.com>
Date: Wed, 23 Dec 2015 15:19:16 +0200
Subject: [PATCH 0100/1273] Add .bundle to .gitignore.

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 6c93190f9..9b55c8c6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 .idea/
 .project/
 .vagrant/
+.bundle/
 vagrant_ansible_inventory_default
 config.yml
 drupal.make.yml

From 06ec267fb71534a9fa2cd5ca1cee51615d596363 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 2 Jan 2016 16:19:01 -0600
Subject: [PATCH 0101/1273] PR #363 cleanup-default port is 9000, so remove
 that config.

---
 docs/extras/xdebug.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/docs/extras/xdebug.md b/docs/extras/xdebug.md
index ea65942f3..51a419010 100644
--- a/docs/extras/xdebug.md
+++ b/docs/extras/xdebug.md
@@ -25,11 +25,8 @@ php_xdebug_idekey: sublime.xdebug
 
 ## NetBeans and XDebug with Drupal VM
 
-To use XDebug with NetBeans, change the variables below in `config.yml`, and then run `vagrant provision` to reconfigure the VM.
-
-NOTE: php_xdebug_remote_port: 9000 will need to be added to your `config.yml` below the idekey.
+To use XDebug with NetBeans, change the `php_xdebug_idekey` variable as shown below in `config.yml`, and then run `vagrant provision` to reconfigure the VM.
 
 ```yaml
 php_xdebug_idekey: netbeans-xdebug
-php_xdebug_remote_port: 9000
 ```

From 5f0d89010d52cbffe067abfbc135278cb06d9e8f Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 7 Jan 2016 10:35:46 -0600
Subject: [PATCH 0102/1273] Use vagrant user for ruby installed gems.

---
 example.config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/example.config.yml b/example.config.yml
index bdf571dab..eb8789802 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -156,6 +156,7 @@ nodejs_version: "0.12"
 nodejs_npm_global_packages: []
 
 # `ruby` must be in installed_extras for this to work.
+ruby_install_gems_user: "{{ vagrant_user }}"
 ruby_install_gems: []
 
 # You can configure almost anything else on the server in the rest of this file.

From 3e981e3208716e40a25b6b077d11086a40377978 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 12 Jan 2016 11:03:12 -0600
Subject: [PATCH 0103/1273] Use become instead of sudo.

---
 README.md                             |  2 +-
 provisioning/playbook.yml             |  2 +-
 provisioning/tasks/build-makefile.yml |  4 ++--
 provisioning/tasks/drush-aliases.yml  | 10 +++++-----
 provisioning/tasks/install-site.yml   |  6 +++---
 provisioning/tasks/sshd.yml           |  4 ++--
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index c1032ad36..af649be00 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ Note for Faster Provisioning (Mac/Linux only): *[Install Ansible](http://docs.an
 
 Note for Linux users: *If NFS is not already installed on your host, you will need to install it to use the default NFS synced folder configuration. See guides for [Debian/Ubuntu](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-ubuntu-14-04), [Arch](https://wiki.archlinux.org/index.php/NFS#Installation), and [RHEL/CentOS](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-centos-6).*
 
-Note on versions: *Please make sure you're running the latest stable version of Vagrant, VirtualBox, and Ansible, as the current version of Drupal VM is tested with the latest releases. As of August 2015: Vagrant 1.8.0, VirtualBox 5.0.10, and Ansible 1.9.4.*
+Note on versions: *Please make sure you're running the latest stable version of Vagrant, VirtualBox, and Ansible, as the current version of Drupal VM is tested with the latest releases. As of August 2015: Vagrant 1.8.0, VirtualBox 5.0.12, and Ansible 2.0.0.*
 
 ### 2 - Build the Virtual Machine
 
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 8d50e52cb..03c422f65 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -1,6 +1,6 @@
 ---
 - hosts: all
-  sudo: yes
+  become: yes
 
   vars_files:
     - ../config.yml
diff --git a/provisioning/tasks/build-makefile.yml b/provisioning/tasks/build-makefile.yml
index ef1be3a47..39cf33d98 100644
--- a/provisioning/tasks/build-makefile.yml
+++ b/provisioning/tasks/build-makefile.yml
@@ -4,7 +4,7 @@
     path: "{{ drupal_core_path }}"
     state: directory
     mode: 0775
-  sudo: no
+  become: no
   when: drupal_site.stat.exists == false
 
 - name: Generate Drupal site with drush makefile.
@@ -12,4 +12,4 @@
     {{ drush_path }} make -y {{ drush_makefile_path }} --no-gitinfofile
     chdir={{ drupal_core_path }}
   when: drupal_site.stat.exists == false
-  sudo: no
+  become: no
diff --git a/provisioning/tasks/drush-aliases.yml b/provisioning/tasks/drush-aliases.yml
index 9f89d03ba..71740ece9 100644
--- a/provisioning/tasks/drush-aliases.yml
+++ b/provisioning/tasks/drush-aliases.yml
@@ -1,13 +1,13 @@
 ---
 - name: Ensure drush directory exists for vagrant user inside VM.
   file: 'path="~/.drush" state=directory'
-  sudo: no
+  become: no
 
 - name: Configure drush aliases for vagrant user inside VM.
   template:
     src: ../templates/drupalvm-local.aliases.drushrc.php.j2
     dest: "~/.drush/{{ vagrant_machine_name }}.aliases.drushrc.php"
-  sudo: no
+  become: no
 
 - name: Ensure drush directory exists for root user inside VM.
   file: 'path="~/.drush" state=directory'
@@ -22,7 +22,7 @@
     path: ~/.drush
   register: local_drush_config_folder
   delegate_to: 127.0.0.1
-  sudo: no
+  become: no
   when: configure_local_drush_aliases
 
 - name: Create Drush configuration folder if it doesn't exist.
@@ -30,7 +30,7 @@
     path: ~/.drush
     state: directory
   delegate_to: 127.0.0.1
-  sudo: no
+  become: no
   when: configure_local_drush_aliases and (local_drush_config_folder.stat.exists == false)
 
 # Note that this doesn't work for Windows, since Ansible's running in the VM.
@@ -39,5 +39,5 @@
     src: ../templates/drupalvm.aliases.drushrc.php.j2
     dest: "~/.drush/{{ vagrant_machine_name }}.aliases.drushrc.php"
   delegate_to: 127.0.0.1
-  sudo: no
+  become: no
   when: configure_local_drush_aliases
diff --git a/provisioning/tasks/install-site.yml b/provisioning/tasks/install-site.yml
index b91c0e08d..9ddf99254 100644
--- a/provisioning/tasks/install-site.yml
+++ b/provisioning/tasks/install-site.yml
@@ -6,7 +6,7 @@
   register: drupal_site_installed
   failed_when: false
   changed_when: false
-  sudo: no
+  become: no
 
 - name: Install Drupal with drush.
   command: >
@@ -19,11 +19,11 @@
     chdir={{ drupal_core_path }}
   notify: restart webserver
   when: "'Successful' not in drupal_site_installed.stdout"
-  sudo: no
+  become: no
 
 - name: Install configured modules with drush.
   command: >
     {{ drush_path }} pm-enable -y {{ drupal_enable_modules | join(" ") }}
     chdir={{ drupal_core_path }}
   when: "'Successful' not in drupal_site_installed.stdout"
-  sudo: no
+  become: no
diff --git a/provisioning/tasks/sshd.yml b/provisioning/tasks/sshd.yml
index 1d8f4c5e3..be492d667 100644
--- a/provisioning/tasks/sshd.yml
+++ b/provisioning/tasks/sshd.yml
@@ -10,12 +10,12 @@
   stat: "path={{ known_hosts_path | default('~/.ssh/known_hosts') }}"
   register: known_hosts_file
   connection: local
-  sudo: no
+  become: no
 
 - name: Copy known_hosts file from host into Drupal VM.
   copy:
     src: "{{ known_hosts_path | default('~/.ssh/known_hosts') }}"
     dest: ~/.ssh/known_hosts
     mode: 0644
-  sudo: no
+  become: no
   when: known_hosts_file.stat.exists

From 434865124ea7c8da58edeee1a845070437bbd9b0 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 14 Jan 2016 22:42:47 -0600
Subject: [PATCH 0104/1273] Fixes #346: Switch Apache to use FPM instead of
 mod_php.

---
 docs/other/base-os.md                      | 2 ++
 example.config.yml                         | 2 ++
 provisioning/playbook.yml                  | 1 +
 provisioning/requirements.yml              | 1 +
 provisioning/templates/nginx-vhost.conf.j2 | 6 ------
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/other/base-os.md b/docs/other/base-os.md
index 3aaf61cbb..6646f1140 100644
--- a/docs/other/base-os.md
+++ b/docs/other/base-os.md
@@ -31,6 +31,8 @@ mysql_pid_file: /var/run/mariadb/mariadb.pid
 
 ## RedHat Enterprise Linux / CentOS 6
 
+**Apache without FastCGI**: If you want to use Apache with CentOS 6 on Drupal VM, you will need to modify the syntax of your `apache_vhosts` and remove the `ProxyPassMatch` parameters from each one. Alternatively, you can use Nginx with the default configuration by setting `drupalvm_webserver: nginx` inside `config.yml`.
+
 **PHP OpCache**: PHP's OpCache (if you're using PHP > 5.5) requires the following setting to be configured in `config.yml` (see upstream bug: [CentOS (6) needs additional php-opcache package](https://github.com/geerlingguy/ansible-role-php/issues/39)):
 
 ```yaml
diff --git a/example.config.yml b/example.config.yml
index eb8789802..c1ffbb779 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -79,6 +79,8 @@ configure_local_drush_aliases: true
 apache_vhosts:
   - servername: "{{ drupal_domain }}"
     documentroot: "{{ drupal_core_path }}"
+    extra_parameters: |
+          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ drupal_core_path }}"
 
   - servername: "adminer.drupalvm.dev"
     documentroot: "/opt/adminer"
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 03c422f65..9b197bcdc 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -23,6 +23,7 @@
     - geerlingguy.git
     - geerlingguy.postfix
     - { role: geerlingguy.apache, when: drupalvm_webserver == 'apache' }
+    - { role: geerlingguy.apache-php-fpm, when: drupalvm_webserver == 'apache' }
     - { role: geerlingguy.nginx, when: drupalvm_webserver == 'nginx' }
     - geerlingguy.mysql
     - geerlingguy.php
diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 418c6776a..3e6295a95 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -2,6 +2,7 @@
 - src: arknoll.selenium
 - src: geerlingguy.adminer
 - src: geerlingguy.apache
+- src: geerlingguy.apache-php-fpm
 - src: geerlingguy.composer
 - src: geerlingguy.daemonize
 - src: geerlingguy.drupal-console
diff --git a/provisioning/templates/nginx-vhost.conf.j2 b/provisioning/templates/nginx-vhost.conf.j2
index 56f318ed6..ef2873f0f 100644
--- a/provisioning/templates/nginx-vhost.conf.j2
+++ b/provisioning/templates/nginx-vhost.conf.j2
@@ -34,13 +34,7 @@ server {
         fastcgi_intercept_errors on;
         fastcgi_read_timeout 120;
         include fastcgi_params;
-{% if php_version == "7.0" and ansible_distribution == "Ubuntu" %}
-        fastcgi_pass unix:/var/run/php/{{ php_fpm_daemon }}.sock;
-{% elif ansible_distribution == "CentOS" %}
         fastcgi_pass 127.0.0.1:9000;
-{% else %}
-        fastcgi_pass unix:/var/run/{{ php_fpm_daemon }}.sock;
-{% endif %}
     }
 
     location @rewrite {

From 124d7a35650bac0252b732eb584bc71533ab083e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sun, 1 Nov 2015 11:09:36 -0500
Subject: [PATCH 0105/1273] add support for overriding any synced_folder option

---
 Vagrantfile                    |  7 ++++++-
 docs/extras/syncing-folders.md | 24 ++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/Vagrantfile b/Vagrantfile
index 568c7315a..3e8fcf875 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -66,7 +66,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   # Synced folders.
   for synced_folder in vconfig['vagrant_synced_folders'];
-    config.vm.synced_folder synced_folder['local_path'], synced_folder['destination'],
+    options = {
       type: synced_folder['type'],
       rsync__auto: "true",
       rsync__exclude: synced_folder['excluded_paths'],
@@ -74,6 +74,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       id: synced_folder['id'],
       create: synced_folder.include?('create') ? synced_folder['create'] : false,
       mount_options: synced_folder.include?('mount_options') ? synced_folder['mount_options'] : []
+    }
+    if synced_folder.include?('options_override');
+      options = options.merge(synced_folder['options_override'])
+    end
+    config.vm.synced_folder synced_folder['local_path'], synced_folder['destination'], options
   end
 
   # Allow override of the default synced folder type.
diff --git a/docs/extras/syncing-folders.md b/docs/extras/syncing-folders.md
index 258bca15b..0b0bf021b 100644
--- a/docs/extras/syncing-folders.md
+++ b/docs/extras/syncing-folders.md
@@ -12,6 +12,30 @@ vagrant_synced_folders:
 
 You can add as many synced folders as you'd like, and you can configure [any type of share](https://docs.vagrantup.com/v2/synced-folders/index.html) supported by Vagrant; just add another item to the list of `vagrant_synced_folders`.
 
+## Options
+
+The synced folder options exposed are `type`, `excluded_paths` (when using rsync), `id`, `create` and `mount_options`. Besides these there are some sane defaults set when using rsync. For example all files synced with rsync will be writable by everyone, thus allowing the web server to create files.
+
+### Overriding defaults
+
+If you feel the need to fine-tune some of the options not exposed, the entire options hash passed to Vagrant can be overriden using `options_override`.
+
+The merge of the default options and `options_override` is shallow, so you can use it to remove flags from eg. `rsync__args`.
+
+One scenario where this might be useful is when you are moving generated code from the virtual machine back to your local machine and you want the files to have appropriate permissions instead of the default 666/777.
+
+```yaml
+options_override:
+  # Disable the default recursive chown so that the files/ folder won't be affected
+  rsync__chown: false
+  rsync__args: [
+    "--verbose", "--archive", "--delete",
+    "--chmod=gu=rwX,o=rX", # 664 for files, 775 for directories
+    "--owner", "--group", # required for the following command
+    "--usermap=*:vagrant", "--groupmap=*:www-data"
+  ]
+```
+
 ## Synced Folder Performance
 
 Using different synced folder mechanisms can have a dramatic impact on your Drupal site's performance. Please read through the following blog posts for a thorough overview of synced folder performance:

From 4a74598269702798246d04e2311cadf1b0db6d0b Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 15 Jan 2016 17:21:26 -0600
Subject: [PATCH 0106/1273] Add autoCommit time limit reduction to example Solr
 setup script.

---
 examples/scripts/configure-solr.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/examples/scripts/configure-solr.sh b/examples/scripts/configure-solr.sh
index c7e26dc8c..77ca87c52 100755
--- a/examples/scripts/configure-solr.sh
+++ b/examples/scripts/configure-solr.sh
@@ -22,6 +22,9 @@ if [ ! -e "$SOLR_SETUP_COMPLETE_FILE" ]; then
   # Copy the Solr configuration into place over the default `collection1` core.
   sudo cp -a $SOLR_DOWNLOAD_DIR/$SOLR_MODULE_NAME/solr-conf/4.x/. /var/solr/collection1/conf/
 
+  # Adjust the autoCommit time so index changes are committed in 1s.
+  sudo sed -i 's/\(<maxTime>\)\([^<]*\)\(<[^>]*\)/\11000\3/g' /var/solr/collection1/conf/solrconfig.xml
+
   # Fix file permissions.
   sudo chown -R solr:solr /var/solr/collection1/conf
 

From 6c8d4b0abb3b488cd6084406e5863159c291adcf Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 25 Jan 2016 09:46:04 -0600
Subject: [PATCH 0107/1273] Fixes #393: Document required change to switch from
 PHP-FPM to mod_php for Apache.

---
 example.config.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/example.config.yml b/example.config.yml
index c1ffbb779..fe3e3e6be 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -186,7 +186,6 @@ php_version: "5.6"
 php_memory_limit: "192M"
 php_display_errors: "On"
 php_display_startup_errors: "On"
-php_enable_php_fpm: true
 php_realpath_cache_size: "1024K"
 php_sendmail_path: "/usr/sbin/ssmtp -t"
 php_opcache_enabled_in_ini: true
@@ -194,6 +193,11 @@ php_opcache_memory_consumption: "192"
 php_opcache_max_accelerated_files: 4096
 php_max_input_vars: "4000"
 
+# Drupal VM defaults to using PHP-FPM with either Apache or Nginx. If you wish
+# to instead use Apache + mod_php with an Ubuntu base box, make sure you add
+# libapache2-mod-php5 to `extra_packages` elsewhere in this config file.
+php_enable_php_fpm: true
+
 composer_path: /usr/bin/composer
 composer_home_path: '/home/vagrant/.composer'
 # composer_global_packages:

From 9b014eae9ae166c66b692ab0bb42881821b77c3d Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 25 Jan 2016 09:53:06 -0600
Subject: [PATCH 0108/1273] Fixes #387: Add php-fpm configuration for other
 default vhosts.

---
 example.config.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/example.config.yml b/example.config.yml
index fe3e3e6be..67bd26b37 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -84,12 +84,18 @@ apache_vhosts:
 
   - servername: "adminer.drupalvm.dev"
     documentroot: "/opt/adminer"
+    extra_parameters: |
+          ProxyPassMatch ^/(.*\.php(/.*)?)$ "unix:/var/run/php5-fpm.sock|fcgi://127.0.0.1:9000/opt/adminer"
 
   - servername: "xhprof.drupalvm.dev"
     documentroot: "/usr/share/php/xhprof_html"
+    extra_parameters: |
+          ProxyPassMatch ^/(.*\.php(/.*)?)$ "unix:/var/run/php5-fpm.sock|fcgi://127.0.0.1:9000/usr/share/php/xhprof_html"
 
   - servername: "pimpmylog.drupalvm.dev"
     documentroot: "/usr/share/php/pimpmylog"
+    extra_parameters: |
+          ProxyPassMatch ^/(.*\.php(/.*)?)$ "unix:/var/run/php5-fpm.sock|fcgi://127.0.0.1:9000/usr/share/php/pimpmylog"
 
 apache_remove_default_vhost: true
 apache_mods_enabled:
@@ -197,6 +203,7 @@ php_max_input_vars: "4000"
 # to instead use Apache + mod_php with an Ubuntu base box, make sure you add
 # libapache2-mod-php5 to `extra_packages` elsewhere in this config file.
 php_enable_php_fpm: true
+php_fpm_listen: "127.0.0.1:9000"
 
 composer_path: /usr/bin/composer
 composer_home_path: '/home/vagrant/.composer'

From d26736218f0e9020f8d87db1210b52bd481fb450 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Mon, 25 Jan 2016 16:38:12 -0500
Subject: [PATCH 0109/1273] docs: update vagrant_synced_folders defaults

- drupaltest.dev -> drupalvm.dev
- e4ee925186449414612c8cc1d90cada8863f40de
- 43da06d92316eebb2abbecd813a4d5dc74a279fc
---
 docs/deployment/drush-make.md     |  2 +-
 docs/deployment/local-codebase.md |  1 -
 docs/extras/behat.md              | 12 +++----
 docs/extras/drupal-console.md     |  4 +--
 docs/extras/drush.md              | 54 +++++++++++++++----------------
 docs/extras/mailhog.md            |  2 +-
 docs/extras/solr.md               |  2 +-
 docs/extras/syncing-folders.md    | 17 +++-------
 docs/other/cloning-with-newd.md   |  2 +-
 9 files changed, 43 insertions(+), 53 deletions(-)

diff --git a/docs/deployment/drush-make.md b/docs/deployment/drush-make.md
index b777221b9..433fc6808 100644
--- a/docs/deployment/drush-make.md
+++ b/docs/deployment/drush-make.md
@@ -1,4 +1,4 @@
-Drupal VM is configured by default to use a Drush make file to build a Drupal site on the VM inside `/var/www/drupal` (in a folder that's synced to your local machine, so you can work with the Drupal codebase either locally or inside the VM).
+Drupal VM is configured by default to use a Drush make file to build a Drupal site on the VM inside `/var/www/drupalvm/drupal` (in a folder that's synced to your local machine, so you can work with the Drupal codebase either locally or inside the VM).
 
 You can use any make file you want, just copy it or symlink it into the root of the Drupal VM folder with the filename `drupal.make.yml`. You can also set a separate path to the makefile using the `drush_makefile_path` variable.
 
diff --git a/docs/deployment/local-codebase.md b/docs/deployment/local-codebase.md
index 047ca54b1..67969733e 100644
--- a/docs/deployment/local-codebase.md
+++ b/docs/deployment/local-codebase.md
@@ -8,7 +8,6 @@ Update the `vagrant_synced_folders` configuration to sync your local Drupal code
 vagrant_synced_folders:
   - local_path: ~/Sites/my-drupal-site
     destination: /var/www/my-drupal-site
-    id: drupal
     type: nfs
 ```
 
diff --git a/docs/extras/behat.md b/docs/extras/behat.md
index 257ef5beb..32de03a38 100644
--- a/docs/extras/behat.md
+++ b/docs/extras/behat.md
@@ -30,9 +30,9 @@ _You can also include the `behat/*` and `drupal/drupal-extension` directly in yo
 
 ## Setting up Behat for your project
 
-Using the default Drupal site as an example (it's installed in `/var/www/drupal` by default, and is shared to `~/Sites/drupalvm/drupal` on your host machine), the following steps will help you get your first Behat tests up and running!
+Using the default Drupal site as an example (it's installed in `/var/www/drupalvm/drupal` by default, and is shared to `~/Sites/drupalvm/drupal` on your host machine), the following steps will help you get your first Behat tests up and running!
 
-  1. Create a `behat.yml` file inside the docroot of your site (e.g. create this file alongside the rest of the Drupal codebase at `/var/www/drupal/behat.yml`), with the following contents:
+  1. Create a `behat.yml` file inside the docroot of your site (e.g. create this file alongside the rest of the Drupal codebase at `/var/www/drupalvm/drupal/behat.yml`), with the following contents:
 
         default:
           suites:
@@ -55,23 +55,23 @@ Using the default Drupal site as an example (it's installed in `/var/www/drupal`
               blackbox: ~
               api_driver: 'drupal'
               drupal:
-                drupal_root: '/var/www/drupal'
+                drupal_root: '/var/www/drupalvm/drupal'
               region_map:
                 content: "#content"
 
-  2. Log into Drupal VM with `vagrant ssh`, change directory to the Drupal site root (`cd /var/www/drupal`), then run `behat --init` to initialize the `features` folder where you will place test cases.
+  2. Log into Drupal VM with `vagrant ssh`, change directory to the Drupal site root (`cd /var/www/drupalvm/drupal`), then run `behat --init` to initialize the `features` folder where you will place test cases.
   3. From either inside the VM or on the host machine, open up the new `features/web` folder Behat just created. Inside _that_ folder, create `HomeContent.feature` with the following contents:
 
         Feature: Test DrupalContext
           In order to prove the Behat is working correctly in Drupal VM
           As a developer
           I need to run a simple interface test
-        
+
           Scenario: Viewing content in a region
             Given I am on the homepage
             Then I should see "No front page content has been created yet" in the "content"
 
-  4. Now, inside Drupal VM, change directory to `/var/www/drupal` again, and run the command `behat` (which runs all the tests you've created—which should just be one so far).
+  4. Now, inside Drupal VM, change directory to `/var/www/drupalvm/drupal` again, and run the command `behat` (which runs all the tests you've created—which should just be one so far).
 
 If everything was done correctly, you should see:
 
diff --git a/docs/extras/drupal-console.md b/docs/extras/drupal-console.md
index 1b050744e..e6030cd56 100644
--- a/docs/extras/drupal-console.md
+++ b/docs/extras/drupal-console.md
@@ -5,13 +5,13 @@ Drupal VM will automatically install Drupal Console if you install Drupal 8 or l
 To use Drupal Console with a Drupal 8 site (in this case, using the default configuration that ships with Drupal VM):
 
   1. Log into the VM with `vagrant ssh`.
-  2. Change directory to the Drupal site's document root: `cd /var/www/drupal`.
+  2. Change directory to the Drupal site's document root: `cd /var/www/drupalvm/drupal`.
   3. Use Drupal console (e.g. `drupal cache:rebuild --cache=all`).
 
 You should see an output like:
 
 ```
-vagrant@drupaltest:/var/www/drupal$ drupal cache:rebuild --cache=all
+vagrant@drupalvm:/var/www/drupalvm/drupal$ drupal cache:rebuild --cache=all
 
 [+] Rebuilding cache(s), wait a moment please.
 [+] Done clearing cache(s).
diff --git a/docs/extras/drush.md b/docs/extras/drush.md
index 11879ce89..e29d6c0c3 100644
--- a/docs/extras/drush.md
+++ b/docs/extras/drush.md
@@ -1,34 +1,34 @@
 If you have Drush installed on your host workstation, and would like to interact with a Drupal site running inside Drupal VM, there are drush aliases automatically created by Drupal VM for each of the virtual hosts you have configured.
 
-With the example configuration, you can manage the example Drupal site using the Drush alias `@drupaltest.dev`. For example, to check if Drush can connect to the site in Drupal VM, run:
+With the example configuration, you can manage the example Drupal site using the Drush alias `@drupalvm.dev`. For example, to check if Drush can connect to the site in Drupal VM, run:
 
 ```
-$ drush @drupaltest.dev status
- Drupal version         :  8.0.0-dev                                                                                    
- Site URI               :  drupaltest.dev                                                                               
- Database driver        :  mysql                                                                                        
- Database hostname      :  localhost                                                                                    
- Database port          :                                                                                               
- Database username      :  drupal                                                                                       
- Database name          :  drupal                                                                                       
- Database               :  Connected                                                                                    
- Drupal bootstrap       :  Successful                                                                                   
- Drupal user            :  Anonymous                                                                                    
- Default theme          :  bartik                                                                                       
- Administration theme   :  seven                                                                                        
- PHP executable         :  /usr/bin/php                                                                                 
- PHP configuration      :  /etc/php5/cli/php.ini                                                                        
- PHP OS                 :  Linux                                                                                        
- Drush script           :  /usr/local/share/drush/drush.php                                                             
- Drush version          :  7.0-dev                                                                                      
- Drush temp directory   :  /tmp                                                                                         
- Drush configuration    :                                                                                               
- Drush alias files      :                                                                                               
- Drupal root            :  /var/www/drupal                                                                              
- Site path              :  sites/default                                                                                
- File directory path    :  sites/default/files                                                                          
- Temporary file         :  /tmp                                                                                         
- directory path                                                                                                         
+$ drush @drupalvm.dev status
+ Drupal version         :  8.0.0-dev
+ Site URI               :  drupalvm.dev
+ Database driver        :  mysql
+ Database hostname      :  localhost
+ Database port          :
+ Database username      :  drupal
+ Database name          :  drupal
+ Database               :  Connected
+ Drupal bootstrap       :  Successful
+ Drupal user            :  Anonymous
+ Default theme          :  bartik
+ Administration theme   :  seven
+ PHP executable         :  /usr/bin/php
+ PHP configuration      :  /etc/php5/cli/php.ini
+ PHP OS                 :  Linux
+ Drush script           :  /usr/local/share/drush/drush.php
+ Drush version          :  7.0-dev
+ Drush temp directory   :  /tmp
+ Drush configuration    :
+ Drush alias files      :
+ Drupal root            :  /var/www/drupalvm/drupal
+ Site path              :  sites/default
+ File directory path    :  sites/default/files
+ Temporary file         :  /tmp
+ directory path
  Active config path     :  [...]
  Staging config path    :  [...]
 ```
diff --git a/docs/extras/mailhog.md b/docs/extras/mailhog.md
index aea4a85dd..e7d5d0350 100644
--- a/docs/extras/mailhog.md
+++ b/docs/extras/mailhog.md
@@ -1,3 +1,3 @@
-By default, Drupal VM redirects all PHP emails to [MailHog](https://github.com/mailhog/MailHog) (instead of sending them to the outside world). You can access the MailHog UI at `http://drupaltest.dev:8025/` (or whatever domain you have configured in `config.yml`).
+By default, Drupal VM redirects all PHP emails to [MailHog](https://github.com/mailhog/MailHog) (instead of sending them to the outside world). You can access the MailHog UI at `http://drupalvm.dev:8025/` (or whatever domain you have configured in `config.yml`).
 
 You can override the default behavior of redirecting email to MailHog by editing or removing the `php_sendmail_path` inside `config.yml`, and you can choose to not install MailHog at all by removing it from `installed_extras` in `config.yml`.
\ No newline at end of file
diff --git a/docs/extras/solr.md b/docs/extras/solr.md
index 73119dfe7..3c4bf0598 100644
--- a/docs/extras/solr.md
+++ b/docs/extras/solr.md
@@ -6,7 +6,7 @@ The URL to connect to the local solr server (assuming you're using the default `
 
     http://localhost:8983/solr/collection1
 
-This will connect to the default search core (`collection1`) set up by Solr. If you are using a multisite installation and want to have a search core per Drupal site, you can add more cores through Apache Solr's admin interface (visit `http://drupaltest.dev:8983/solr/`), then connect to each core by adding the core name to the end of the above URL (e.g. `core2` would be `http://localhost:8983/solr/core2`).
+This will connect to the default search core (`collection1`) set up by Solr. If you are using a multisite installation and want to have a search core per Drupal site, you can add more cores through Apache Solr's admin interface (visit `http://drupalvm.dev:8983/solr/`), then connect to each core by adding the core name to the end of the above URL (e.g. `core2` would be `http://localhost:8983/solr/core2`).
 
 ## Configuring the Solr search core for Drupal
 
diff --git a/docs/extras/syncing-folders.md b/docs/extras/syncing-folders.md
index 0b0bf021b..b1581fad3 100644
--- a/docs/extras/syncing-folders.md
+++ b/docs/extras/syncing-folders.md
@@ -1,16 +1,15 @@
-You can share folders between your host computer and the VM in a variety of ways; the most commonly-used method is an NFS share. If you use Windows and encounter any problems with NFS, try switching to `smb`. The `example.config.yml` file contains an example `nfs` share that would sync the folder `~/Sites/drupalvm` on your host into the `/var/www` folder on Drupal VM.
+You can share folders between your host computer and the VM in a variety of ways; the most commonly-used method is an NFS share. If you use Windows and encounter any problems with NFS, try switching to `smb`. The `example.config.yml` file contains an example `nfs` share that would sync the folder `~/Sites/drupalvm` on your host into the `/var/www/drupalvm` folder on Drupal VM.
 
 If you want to use a different synced folder method (e.g. `smb`), you can change `type` to:
 
 ```yaml
 vagrant_synced_folders:
   - local_path: ~/Sites/drupalvm
-    destination: /var/www
-    id: drupal
+    destination: /var/www/drupalvm
     type: smb
 ```
 
-You can add as many synced folders as you'd like, and you can configure [any type of share](https://docs.vagrantup.com/v2/synced-folders/index.html) supported by Vagrant; just add another item to the list of `vagrant_synced_folders`.
+You can add as many synced folders as you'd like, and you can configure [any type of share](https://www.vagrantup.com/docs/synced-folders/index.html) supported by Vagrant; just add another item to the list of `vagrant_synced_folders`.
 
 ## Options
 
@@ -55,8 +54,7 @@ If you are using rsync, it is advised to exclude certain directories so that the
 ```yaml
 vagrant_synced_folders:
   - local_path: ~/Sites/drupalvm/drupal
-    destination: /var/www
-    id: drupal
+    destination: /var/www/drupalvm
     type: rsync
     excluded_paths:
       - drupal/private
@@ -79,7 +77,6 @@ You can use a native synced folder, which should work pretty flawlessly on any p
 vagrant_synced_folders:
   - local_path: docroot
     destination: /var/www/docroot
-    id: drupal
     type: ""
     create: true
 ```
@@ -104,12 +101,6 @@ mount_options: ["dmode=775,fmode=664"]
 
 See [this issue](https://github.com/geerlingguy/drupal-vm/issues/66) for more details.
 
-### VirtualBox Symbolic Links
-
-When using native VirtualBox shares, VirtualBox does not allow guest VMs to create symbolic links on synced folders for security reasons. On CentOS this prevents apache from installing since it will try to make a symlink inside `/var/www/` You can change the Drupal synced_folder to `/var/www/drupal` and the `drupal_core_path` to `/var/www/drupal/docroot` to work around this.
-
-There are many other potential [solutions](https://www.google.com/search?q=SharedFoldersEnableSymlinksCreate) available on the Internet.
-
 ### Other NFS-related errors
 
 If you're having other weird issues, and none of the above fixes helps, you might want to try a different synced folder method (see top of this page), or something like File Conveyor or a special rsync setup (see [here](http://wolfgangziegler.net/auto-rsync-local-changes-to-remote-server#comments) for some examples).
\ No newline at end of file
diff --git a/docs/other/cloning-with-newd.md b/docs/other/cloning-with-newd.md
index 298a65c7d..0a01a6e48 100644
--- a/docs/other/cloning-with-newd.md
+++ b/docs/other/cloning-with-newd.md
@@ -1,4 +1,4 @@
-@rgoodie created a function called `newd` that clones this repo, uses `sed` to change configuration to Drupal 7 if desired, renames the VM to something other than drupaltest.dev, and kicks off `vagrant up`.
+[@rgoodie](https://github.com/rgoodie) created a function called `newd` that clones this repo, uses `sed` to change configuration to Drupal 7 if desired, renames the VM to something other than drupalvm.dev, and kicks off `vagrant up`.
 
 Example:
 

From 3523ce2f875c1f96d030b6135777f450808cbf94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Mon, 25 Jan 2016 16:43:53 -0500
Subject: [PATCH 0110/1273] docs: fix syntax

---
 docs/deployment/local-codebase.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/deployment/local-codebase.md b/docs/deployment/local-codebase.md
index 67969733e..77e36c24e 100644
--- a/docs/deployment/local-codebase.md
+++ b/docs/deployment/local-codebase.md
@@ -21,7 +21,7 @@ build_makefile:: false
 install_site: false
 ```
 
-_If you aren't copying back a database, and want to have Drupal VM run `drush si` for your Drupal site, you can leave `install_site` set to `true` and it will run a site install on your Drupal codebase using the `drupal_*` config variables.
+If you aren't copying back a database, and want to have Drupal VM run `drush si` for your Drupal site, you can leave `install_site` set to `true` and it will run a site install on your Drupal codebase using the `drupal_*` config variables.
 
 ## Update `apache_vhosts`
 

From 22507ed1a219359d0902bef67f4583a06ddbdbcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Mon, 25 Jan 2016 16:44:32 -0500
Subject: [PATCH 0111/1273] docs: update apache_vhosts defaults

---
 docs/deployment/local-codebase.md |  6 ++++--
 docs/deployment/multisite.md      | 18 +++++++++++++-----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/docs/deployment/local-codebase.md b/docs/deployment/local-codebase.md
index 77e36c24e..7344895fa 100644
--- a/docs/deployment/local-codebase.md
+++ b/docs/deployment/local-codebase.md
@@ -29,8 +29,10 @@ Add your site to `apache_vhosts`, setting the `documentroot` to the same value a
 
 ```yaml
 apache_vhosts:
-  - {servername: "local.my-drupal-site.com", documentroot: "/var/www/my-drupal-site"}
-  - {servername: "local.xhprof.com", documentroot: "/usr/share/php/xhprof_html"}
+  - servername: "local.my-drupal-site.com"
+    documentroot: "/var/www/my-drupal-site"
+    extra_parameters: |
+          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ drupal_core_path }}"
 ```
 
 ## Update MySQL info
diff --git a/docs/deployment/multisite.md b/docs/deployment/multisite.md
index d1551378d..92a8d4834 100644
--- a/docs/deployment/multisite.md
+++ b/docs/deployment/multisite.md
@@ -1,11 +1,19 @@
-For multisite installations, make the changes outlined in the [Local Drupal codebase](https://github.com/geerlingguy/drupal-vm/wiki/Local-Drupal-codebase) guide, but, using the `apache_vhosts` variable, configure as many domains pointing to the same docroot as you need:
+For multisite installations, make the changes outlined in the [Local Drupal codebase](local-codebase.md) guide, but, using the `apache_vhosts` variable, configure as many domains pointing to the same docroot as you need:
 
 ```yaml
 apache_vhosts:
-  - {servername: "local.my-drupal-site.com", documentroot: "/var/www/my-drupal-site"}
-  - {servername: "local.second-drupal-site.com", documentroot: "/var/www/my-drupal-site"}
-  - {servername: "local.third-drupal-site.com", documentroot: "/var/www/my-drupal-site"}
-  - {servername: "local.xhprof.com", documentroot: "/usr/share/php/xhprof_html"}
+  - servername: "local.my-drupal-site.com"
+    documentroot: "/var/www/my-drupal-site"
+    extra_parameters: |
+          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ drupal_core_path }}"
+  - servername: "local.second-drupal-site.com"
+    documentroot: "/var/www/my-drupal-site"
+    extra_parameters: |
+          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ drupal_core_path }}"
+  - servername: "local.third-drupal-site.com"
+    documentroot: "/var/www/my-drupal-site"
+    extra_parameters: |
+          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ drupal_core_path }}"
 ```
 
 If you need additional databases and database users, add them to the list of `mysql_databases` and `mysql_users`:

From 86a797c36ba64d36f9865a9c368eff0d9a365eb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Mon, 25 Jan 2016 16:46:56 -0500
Subject: [PATCH 0112/1273] docs: fix links

---
 docs/deployment/local-codebase.md | 2 +-
 docs/extras/drupal-console.md     | 2 +-
 docs/extras/nodejs.md             | 2 +-
 docs/extras/syncing-folders.md    | 2 +-
 docs/other/cloning-with-newd.md   | 2 +-
 docs/other/linux.md               | 2 +-
 docs/other/php-7.md               | 2 +-
 docs/other/webservers.md          | 4 ++--
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/deployment/local-codebase.md b/docs/deployment/local-codebase.md
index 7344895fa..d8f85c2b1 100644
--- a/docs/deployment/local-codebase.md
+++ b/docs/deployment/local-codebase.md
@@ -41,4 +41,4 @@ If you have your Drupal site configured to use a special database and/or user/pa
 
 ## Build the VM, import your database
 
-Run `vagrant up` to build the VM with your codebase synced into the proper location. Once the VM is created, you can connect to the MySQL database (see the sidebar topic "MySQL - Connecting to the DB") and import your site's database to the Drupal VM, or use a command like `drush sql-sync` to copy a database from another server.
\ No newline at end of file
+Run `vagrant up` to build the VM with your codebase synced into the proper location. Once the VM is created, you can [connect to the MySQL database](../extras/mysql.md) and import your site's database to the Drupal VM, or use a command like `drush sql-sync` to copy a database from another server.
diff --git a/docs/extras/drupal-console.md b/docs/extras/drupal-console.md
index e6030cd56..7c0079691 100644
--- a/docs/extras/drupal-console.md
+++ b/docs/extras/drupal-console.md
@@ -1,4 +1,4 @@
-[Drupal Console](http://drupalconsole.com/) is a modern CLI for interacting with Drupal and scaffolding a site. It works only with Drupal 8+, and is built on top of the Symfony Console component.
+[Drupal Console](https://drupalconsole.com/) is a modern CLI for interacting with Drupal and scaffolding a site. It works only with Drupal 8+, and is built on top of the Symfony Console component.
 
 Drupal VM will automatically install Drupal Console if you install Drupal 8 or later in your VM (this is based on the value of the `drupal_major_version` variable inside `config.yml`.
 
diff --git a/docs/extras/nodejs.md b/docs/extras/nodejs.md
index 132b59cab..0f5ece5a9 100644
--- a/docs/extras/nodejs.md
+++ b/docs/extras/nodejs.md
@@ -4,7 +4,7 @@ Drupal VM includes built-in support for Node.js—all you need to do is make sur
 
 ## Choosing a version of Node.js
 
-You can choose a version of Node.js to install using the `nodejs_version` variable in `config.yml`. See the `geerlingguy.nodejs` role documentation for all the currently-available versions for your OS.
+You can choose a version of Node.js to install using the `nodejs_version` variable in `config.yml`. See the [`geerlingguy.nodejs` Ansible role's README](https://github.com/geerlingguy/ansible-role-nodejs#readme) for all the currently-available versions for your OS.
 
 ```yaml
 nodejs_version: "0.12"
diff --git a/docs/extras/syncing-folders.md b/docs/extras/syncing-folders.md
index b1581fad3..90a31d40e 100644
--- a/docs/extras/syncing-folders.md
+++ b/docs/extras/syncing-folders.md
@@ -40,7 +40,7 @@ options_override:
 Using different synced folder mechanisms can have a dramatic impact on your Drupal site's performance. Please read through the following blog posts for a thorough overview of synced folder performance:
 
   - [Comparing filesystem performance in Virtual Machines](http://mitchellh.com/comparing-filesystem-performance-in-virtual-machines)
-  - [NFS, rsync, and shared folder performance in Vagrant VMs](http://www.midwesternmac.com/blogs/jeff-geerling/nfs-rsync-and-shared-folder)
+  - [NFS, rsync, and shared folder performance in Vagrant VMs](http://www.jeffgeerling.com/blogs/jeff-geerling/nfs-rsync-and-shared-folder)
 
 Generally speaking:
 
diff --git a/docs/other/cloning-with-newd.md b/docs/other/cloning-with-newd.md
index 0a01a6e48..286b8f835 100644
--- a/docs/other/cloning-with-newd.md
+++ b/docs/other/cloning-with-newd.md
@@ -10,6 +10,6 @@ $ newd 7 test-fieldformatter
 $ newd 8 drupal8test
 ```
 
-The source code for this new bash function (you could add it to your own `.bash_profile` or `.profile`) is located here: https://gist.github.com/rgoodie/9966f30b404a4daa59e1
+The source code for this new bash function (you could add it to your own `.bash_profile` or `.profile`) is located [in this gist](https://gist.github.com/rgoodie/9966f30b404a4daa59e1).
 
 Do you have your own wrapper script or other helpers to help you manage instances of Drupal VM? Please share it on this page!
\ No newline at end of file
diff --git a/docs/other/linux.md b/docs/other/linux.md
index 3d83c6c15..843dc975a 100644
--- a/docs/other/linux.md
+++ b/docs/other/linux.md
@@ -57,7 +57,7 @@ If you get this message, then it's likely that either NFS isn't running correctl
 
   1. On Ubuntu, if you get a message like `It appears your machine doesn't support NFS`, run `sudo apt-get install -y nfs-server`.
   2. Install the `vagrant-vbguest` plugin, which will make sure you are running the latest version of the VirualBox Guest Additions inside the VM (this can solve many different problems!).
-  3. Make sure the `vboxnet` interfaces are not being blocked by your system firewall. For Fedora (and many flavors of Linux), check out this guide for more: [Get Vagrant's NFS working under Fedora 20](http://blog.bak1an.site/blog/2014/03/23/fedora-vagrant-nfs/).
+  3. Make sure the `vboxnet` interfaces are not being blocked by your system firewall. For Fedora (and many flavors of Linux), check out this guide for more: [Get Vagrant's NFS working under Fedora 20](https://web.archive.org/web/20150706105420/http://blog.bak1an.so/blog/2014/03/23/fedora-vagrant-nfs/).
   4. Add `mount_options: ['vers=3']` to your synced folder definition in config.yml after the other options like `local_path`, `destination`, and `type`.
 
 After attempting any of the above fixes, run `vagrant reload --provision` to restart the VM and attempt mounting the synced folder again, or `vagrant destroy -f && vagrant up` to rebuild the VM from scratch.
diff --git a/docs/other/php-7.md b/docs/other/php-7.md
index 6e5f4a0b8..811f5d429 100644
--- a/docs/other/php-7.md
+++ b/docs/other/php-7.md
@@ -34,6 +34,6 @@ You can also build from source using the same/included `geerlingguy.php` Ansible
 
 Remi's RPM repository is included with Drupal VM, and you can make the following changes to use it to install PHP 7:
 
-  1. Make sure you've followed the directions for switching to CentOS 7 in the [use a different base OS](https://github.com/geerlingguy/drupal-vm/wiki/Using-Different-Base-OSes) guide.
+  1. Make sure you've followed the directions for switching to CentOS 7 in the [use a different base OS](base-os.md) guide.
   2. Change `php_version` inside `config.yml` to `"7.0"`.
   3. Comment out `xhprof`, `xdebug`, `redis` and `memcached` from the `installed_extras` list, as these extensions are not yet supported for PHP 7 (as of late 2015).
diff --git a/docs/other/webservers.md b/docs/other/webservers.md
index 1609cbbf4..3011c021d 100644
--- a/docs/other/webservers.md
+++ b/docs/other/webservers.md
@@ -8,10 +8,10 @@ Because the webservers are configured somewhat differently, there are a few thin
 
 You have complete control over all aspects of Apache VirtualHosts using the `apache_vhosts` configuration. A few simple examples are shown in `example.config.yml`, but this configuration can be much more complex.
 
-See the examples included in the [`geerlingguy.apache`](https://github.com/geerlingguy/ansible-role-apache) Ansible role's README for more info, as well as many other variables you can override to configure Apache exactly how you like it.
+See the examples included in the [`geerlingguy.apache` Ansible role's README](https://github.com/geerlingguy/ansible-role-apache#readme) for more info, as well as many other variables you can override to configure Apache exactly how you like it.
 
 ## Using Nginx
 
 Because Nginx server directives behave a little differently than Apache's VirtualHosts, Drupal VM includes a custom Drupal-optimized Nginx server block configuration, and you can control all the servers ('virtual hosts') Nginx will run using the `nginx_hosts` configuration. A few simple examples are shown in `example.config.yml`, but you have some extra flexibility if you need it. See the `nginx-vhost.conf.j2` template for more information.
 
-Also, see the examples included in the [`geerlingguy.nginx`](https://github.com/geerlingguy/ansible-role-nginx) Ansible role's README for more info, as well as many other variables you can override to configure Nginx exactly how you like it.
+Also, see the examples included in the [`geerlingguy.nginx` Ansible role's README](https://github.com/geerlingguy/ansible-role-nginx#readme) for more info, as well as many other variables you can override to configure Nginx exactly how you like it.

From cf1655cb7f9100b24f0f545f9e221a355fe15de3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Mon, 25 Jan 2016 16:47:27 -0500
Subject: [PATCH 0113/1273] docs: mention the bundled post provisioning script
 for configuring solr

---
 docs/extras/solr.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/extras/solr.md b/docs/extras/solr.md
index 3c4bf0598..0fd47a8ea 100644
--- a/docs/extras/solr.md
+++ b/docs/extras/solr.md
@@ -10,7 +10,12 @@ This will connect to the default search core (`collection1`) set up by Solr. If
 
 ## Configuring the Solr search core for Drupal
 
-Before Drupal content can be indexed correctly into Apache Solr, you will need to copy the Drupal Apache Solr Search or Search API Apache Solr configuration into place, and restart Apache Solr. This process will soon be automated, but for now, please perform the steps outlined in step 5 in this blog post (which should work with Drupal VM): [Solr for Drupal Developers, Part 3: Testing Solr locally](http://www.midwesternmac.com/blogs/jeff-geerling/solr-drupal-developers-part-3).
+Before Drupal content can be indexed correctly into Apache Solr, you will need to copy the Drupal Apache Solr Search or Search API Apache Solr configuration into place, and restart Apache Solr. Drupal VM comes with an example post provision script for automating this. Simply add it to `post_provision_scripts`:
+
+```yaml
+post_provision_scripts:
+ - "../examples/scripts/configure-solr.sh"
+```
 
 ## Extra Solr configuration
 

From 51d20900335f223a7473fe00ffa5c02570031464 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Mon, 25 Jan 2016 16:49:51 -0500
Subject: [PATCH 0114/1273] docs: remove mention of long paths issue

Vagrant 1.8 is already a requirement
---
 docs/other/windows.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docs/other/windows.md b/docs/other/windows.md
index 25d2dc446..ee4b4d2ac 100644
--- a/docs/other/windows.md
+++ b/docs/other/windows.md
@@ -29,10 +29,6 @@ You should probably disable Git's `fileMode` option inside the VM and on your ho
 
     git config core.fileMode false
 
-### Long Paths
-
-Creating long paths inside a shared folder will fail if the length exceeds 260 characters. This usually happens when using npm. This should be solved in Vagrant 1.7.3, but if you're running an older version, you can manually make the changes here: https://github.com/mitchellh/vagrant/pull/5495/files
-
 ### NFS
 
 You can use the [vagrant-winnfsd](https://github.com/GM-Alex/vagrant-winnfsd) plugin to get NFS support on windows. Be aware that there are multiple issues logged against both the plugin and the winnfsd project, so no guarantees.

From 1486bd7f23f88fe6c8b0b20c4b232947824aef4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Tue, 26 Jan 2016 10:10:28 -0500
Subject: [PATCH 0115/1273] Bring README.md up to date. Closes #357 [ci skip]

---
 README.md | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index af649be00..38f0434a4 100644
--- a/README.md
+++ b/README.md
@@ -52,16 +52,16 @@ If you want to switch from Drupal 8 (default) to Drupal 7 or 6 on the initial in
 
 This Quick Start Guide will help you quickly build a Drupal 8 site on the Drupal VM using the included example Drush make file. You can also use the Drupal VM with a [Local Drupal codebase](http://docs.drupalvm.com/en/latest/deployment/local-codebase/) or even a [Drupal multisite installation](http://docs.drupalvm.com/en/latest/deployment/multisite/).
 
-### 1 - Install dependencies (VirtualBox and Vagrant)
+### 1 - Install dependencies (Vagrant)
 
-  1. Download and install [VirtualBox](https://www.virtualbox.org/wiki/Downloads) (Drupal VM also works with Parallels or VMware, if you have the [Vagrant VMware integration plugin](http://www.vagrantup.com/vmware)).
-  2. Download and install [Vagrant](http://www.vagrantup.com/downloads.html).
+Download and install [Vagrant](https://www.vagrantup.com/downloads.html).
+- Vagrant will automatically install [VirtualBox](https://www.virtualbox.org/wiki/Downloads) if no providers are available (Drupal VM also works with Parallels or VMware, if you have the [Vagrant VMware integration plugin](http://www.vagrantup.com/vmware)).
 
 Note for Faster Provisioning (Mac/Linux only): *[Install Ansible](http://docs.ansible.com/intro_installation.html) on your host machine, so Drupal VM can run the provisioning steps locally instead of inside the VM.*
 
 Note for Linux users: *If NFS is not already installed on your host, you will need to install it to use the default NFS synced folder configuration. See guides for [Debian/Ubuntu](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-ubuntu-14-04), [Arch](https://wiki.archlinux.org/index.php/NFS#Installation), and [RHEL/CentOS](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-centos-6).*
 
-Note on versions: *Please make sure you're running the latest stable version of Vagrant, VirtualBox, and Ansible, as the current version of Drupal VM is tested with the latest releases. As of August 2015: Vagrant 1.8.0, VirtualBox 5.0.12, and Ansible 2.0.0.*
+Note on versions: *Please make sure you're running the latest stable version of Vagrant, VirtualBox, and Ansible, as the current version of Drupal VM is tested with the latest releases. As of February 2016: Vagrant 1.8.2, VirtualBox 5.0.14, and Ansible 2.0.0.*
 
 ### 2 - Build the Virtual Machine
 
@@ -89,11 +89,15 @@ By default, this VM includes the extras listed in the `config.yml` option `insta
 
     installed_extras:
       - adminer
+      - drupalconsole
       - mailhog
       - memcached
+      # - nodejs
       - pimpmylog
-      # - solr
+      # - redis
+      # - ruby
       # - selenium
+      # - solr
       - varnish
       - xdebug
       - xhprof
@@ -118,4 +122,4 @@ This project is licensed under the MIT open source license.
 
 ## About the Author
 
-[Jeff Geerling](http://jeffgeerling.com/), owner of [Midwestern Mac, LLC](http://www.midwesternmac.com/), created this project in 2014 so he could accelerate his Drupal core and contrib development workflow. This project, and others like it, are also featured as examples in Jeff's book, [Ansible for DevOps](http://www.ansiblefordevops.com/).
+[Jeff Geerling](http://www.jeffgeerling.com/), owner of [Midwestern Mac, LLC](http://www.midwesternmac.com/), created this project in 2014 so he could accelerate his Drupal core and contrib development workflow. This project, and others like it, are also featured as examples in Jeff's book, [Ansible for DevOps](http://www.ansiblefordevops.com/).

From 4bc7309cde839d8dd1d965da2b59a62583d511d9 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 26 Jan 2016 14:00:25 -0600
Subject: [PATCH 0116/1273] Fixes #381: Update xhprof docs to mention disabling
 xdebug.

---
 docs/extras/xhprof.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/extras/xhprof.md b/docs/extras/xhprof.md
index 19b43a882..74d724881 100644
--- a/docs/extras/xhprof.md
+++ b/docs/extras/xhprof.md
@@ -1,5 +1,7 @@
 As a prerequisite, make sure you have `xhprof` in the `installed_extras` list inside `config.yml` (So the PHP XHProf extension is installed on Drupal VM).
 
+**Note**: You should disable `xdebug` when enabling/using XHProf, because it is known to have issues running alongside XHProf, and makes test results less reliable and slower than they should be.
+
 ## XHProf module
 
 The easiest way to use XHProf to profile your PHP code on a Drupal site is to install the [XHProf](https://www.drupal.org/project/xhprof) module, then in XHProf's configuration (at `/admin/config/development/xhprof`), check the 'Enable profiling of page views and drush requests' checkbox.
@@ -11,4 +13,4 @@ The XHProf module doesn't yet include support for callgraphs, but there's an iss
 The Devel module also *used* to provide XHProf configuration, and setting the options below would allow Devel's XHProf integration to work correctly with Drupal VM's XHProf installation:
 
   - **xhprof directory**: `/usr/share/php`
-  - **XHProf URL**: `http://xhprof.drupalvm.dev/` (assuming this domain is configured in `apache_vhosts` inside `config.yml`)
+  - **XHProf URL**: `http://xhprof.drupalvm.dev` (assuming this domain is configured in `apache_vhosts` inside `config.yml`)

From c1fa34e1904cf7051d144cf871c88b7305539443 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 26 Jan 2016 19:10:30 -0600
Subject: [PATCH 0117/1273] Fixes #394: Fix paths for special domains.

---
 example.config.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/example.config.yml b/example.config.yml
index 67bd26b37..97ec3dda2 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -85,17 +85,17 @@ apache_vhosts:
   - servername: "adminer.drupalvm.dev"
     documentroot: "/opt/adminer"
     extra_parameters: |
-          ProxyPassMatch ^/(.*\.php(/.*)?)$ "unix:/var/run/php5-fpm.sock|fcgi://127.0.0.1:9000/opt/adminer"
+          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000/opt/adminer"
 
   - servername: "xhprof.drupalvm.dev"
     documentroot: "/usr/share/php/xhprof_html"
     extra_parameters: |
-          ProxyPassMatch ^/(.*\.php(/.*)?)$ "unix:/var/run/php5-fpm.sock|fcgi://127.0.0.1:9000/usr/share/php/xhprof_html"
+          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000/usr/share/php/xhprof_html"
 
   - servername: "pimpmylog.drupalvm.dev"
     documentroot: "/usr/share/php/pimpmylog"
     extra_parameters: |
-          ProxyPassMatch ^/(.*\.php(/.*)?)$ "unix:/var/run/php5-fpm.sock|fcgi://127.0.0.1:9000/usr/share/php/pimpmylog"
+          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000/usr/share/php/pimpmylog"
 
 apache_remove_default_vhost: true
 apache_mods_enabled:

From 8a05b75dcf51ebe8db1910718f1252f89f024a32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 28 Jan 2016 18:31:38 -0500
Subject: [PATCH 0118/1273] add support for sourcing a local Vagrantfile

---
 .gitignore                      |  1 +
 Vagrantfile                     |  5 +++++
 docs/other/local-vagrantfile.md | 20 ++++++++++++++++++++
 mkdocs.yml                      |  1 +
 4 files changed, 27 insertions(+)
 create mode 100644 docs/other/local-vagrantfile.md

diff --git a/.gitignore b/.gitignore
index 9b55c8c6e..b48a04283 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 vagrant_ansible_inventory_default
 config.yml
 drupal.make.yml
+Vagrantfile.local
 examples/prod/inventory
 scripts/
 roles/
diff --git a/Vagrantfile b/Vagrantfile
index 3e8fcf875..d10077d71 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -126,4 +126,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # Set the name of the VM. See: http://stackoverflow.com/a/17864388/100134
   config.vm.define vconfig['vagrant_machine_name'] do |d|
   end
+
+  # Allow an untracked Vagrantfile to modify the configurations
+  if File.exist?('Vagrantfile.local')
+    eval File.read 'Vagrantfile.local'
+  end
 end
diff --git a/docs/other/local-vagrantfile.md b/docs/other/local-vagrantfile.md
new file mode 100644
index 000000000..bc5940fb8
--- /dev/null
+++ b/docs/other/local-vagrantfile.md
@@ -0,0 +1,20 @@
+Out of the box Drupal VM supports having VirtualBox, Parallels as well as VMware as a provider. Besides these there are multitude of others available (for example `vagrant-aws`, `vagrant-digitalocean`).
+
+If you want to use an unsupported provider, or otherwise modify the vagrant configuration in a way that is not exposed by Drupal VM, you can create a `Vagrantfile.local` in the root directory of this project.
+
+The file will be sourced at the end of the `Vagrant.configure` block so you will have access to Vagrant's `config.vm` object as well as the contents of the `config.yml` file within the `vconfig` hash.
+
+To add a configuration just create a `Vagrantfile.local` in the root like so:
+
+```ruby
+config.vm.provider :virtualbox do |v|
+  # Enable GUI mode instead of running a headless machine.
+  v.gui = true
+
+  # Reduce disk usage of multiple boxes by sharing a master VM.
+  v.linked_clone = true
+
+  # Cap the host CPU execution at 50% usage.
+  v.customize ["modifyvm", :id, "--cpuexecutioncap", "50"]
+end
+```
diff --git a/mkdocs.yml b/mkdocs.yml
index dc7253602..285442986 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -32,6 +32,7 @@ pages:
   - Other Information:
     - 'Using Different Base OSes': 'other/base-os.md'
     - 'Using Different Webservers': 'other/webservers.md'
+    - 'Using a local Vagrantfile': 'other/local-vagrantfile.md'
     - 'PHP 7 on Drupal VM': 'other/php-7.md'
     - 'Networking Notes': 'other/networking.md'
     - 'Drupal 6 Notes': 'other/drupal-6.md'

From 972e60f56066c8df1c237b50e27978beff0a1cfd Mon Sep 17 00:00:00 2001
From: Tyler Marshall <tymarshall1@hotmail.com>
Date: Thu, 28 Jan 2016 19:19:21 -0500
Subject: [PATCH 0119/1273] docs: add example of using vagrant-aws provisioner

---
 docs/other/local-vagrantfile.md | 35 +++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/docs/other/local-vagrantfile.md b/docs/other/local-vagrantfile.md
index bc5940fb8..210558667 100644
--- a/docs/other/local-vagrantfile.md
+++ b/docs/other/local-vagrantfile.md
@@ -18,3 +18,38 @@ config.vm.provider :virtualbox do |v|
   v.customize ["modifyvm", :id, "--cpuexecutioncap", "50"]
 end
 ```
+
+## Example: Using the `vagrant-aws` provider
+
+Add the following variables to your `config.yml`.
+
+```yaml
+aws_keypair_name: 'keypair'
+aws_ami: 'ami-7747d01e'
+aws_tags_name: 'Drupal VM'
+aws_ssh_username: 'ubuntu'
+aws_ssh_private_key: '~/.ssh/aws.pem'
+```
+
+Create a `Vagrantfile.local` in the root directory of your project.
+
+```ruby
+config.vm.provider :aws do |aws, override|
+  override.nfs.functional = false
+
+  aws.access_key_id = ENV['AWS_ACCESS_KEY_ID']
+  aws.secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
+  aws.keypair_name = vconfig['aws_keypair_name']
+  aws.tags['Name'] = vconfig['aws_tags_name']
+  aws.ami = vconfig['aws_ami']
+
+  override.ssh.username = vconfig['aws_ssh_username']
+  override.ssh.private_key_path = vconfig['aws_ssh_private_key']
+end
+```
+
+Add the `AWS_ACCESS_KEY_ID` and the `AWS_SECRET_ACCESS_KEY` environment variables to your shell.
+
+Then run `vagrant up --provider=aws` to provision the instance.
+
+_For additional configuring options read the [Vagrant AWS Provider's README](https://github.com/mitchellh/vagrant-aws#readme)_

From d455f20552cf5395d14643d81cd890fd23c04889 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 28 Jan 2016 21:50:57 -0600
Subject: [PATCH 0120/1273] Fixes #400: Use Vagrant 1.8 linked clonse feature
 for VirtualBox.

---
 Vagrantfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Vagrantfile b/Vagrantfile
index d10077d71..f9f77e16a 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -108,6 +108,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   # VirtualBox.
   config.vm.provider :virtualbox do |v|
+    v.linked_clone = true if Vagrant::VERSION =~ /^1.8/
     v.name = vconfig['vagrant_hostname']
     v.memory = vconfig['vagrant_memory']
     v.cpus = vconfig['vagrant_cpus']

From fb8a616935c33380d9085b513cb3cfafe07b0797 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 28 Jan 2016 22:34:43 -0600
Subject: [PATCH 0121/1273] Helps with #379: Add proxy and proxy_fcgi modules
 to example config.

---
 example.config.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/example.config.yml b/example.config.yml
index 97ec3dda2..3072d807f 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -102,6 +102,8 @@ apache_mods_enabled:
   - expires.load
   - ssl.load
   - rewrite.load
+  - proxy.load
+  - proxy_fcgi.load
 
 # Nginx hosts. Each site will get a server entry using the configuration defined
 # here. Set the 'is_php' property for document roots that contain PHP apps like

From 4b04538a2dd412cecd4d62ca6e298dd6fba4c767 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Fri, 29 Jan 2016 18:17:51 -0500
Subject: [PATCH 0122/1273] Helps with #379: Set drush_version explicitly to a
 string

---
 example.config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/example.config.yml b/example.config.yml
index 3072d807f..0a0f1e0b0 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -172,7 +172,7 @@ ruby_install_gems: []
 # You can configure almost anything else on the server in the rest of this file.
 extra_security_enabled: false
 
-drush_version: master
+drush_version: "master"
 drush_keep_updated: true
 drush_composer_cli_options: "--prefer-dist --no-interaction"
 

From e5058d03a1684ce59a6b84852856ca84e9c6c093 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sun, 31 Jan 2016 12:15:13 -0500
Subject: [PATCH 0123/1273] replace jinja variables in config

---
 Vagrantfile        | 35 +++++++++++++++++++++++++++--------
 example.config.yml | 14 +++++++-------
 2 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index f9f77e16a..0a689f286 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -14,6 +14,16 @@ def which(cmd)
   return nil
 end
 
+def walk(obj, &fn)
+  if obj.is_a?(Array)
+    obj.map { |value| walk(value, &fn) }
+  elsif obj.is_a?(Hash)
+    obj.each_pair { |key, value| obj[key] = walk(value, &fn) }
+  else
+    obj = fn.call(obj)
+  end
+end
+
 # Use config.yml for basic VM configuration.
 require 'yaml'
 dir = File.dirname(File.expand_path(__FILE__))
@@ -22,6 +32,14 @@ if !File.exist?("#{dir}/config.yml")
 end
 vconfig = YAML::load_file("#{dir}/config.yml")
 
+# Replace jinja variables in config.
+vconfig = walk(vconfig) do |value|
+  while value.is_a?(String) && value.match(/{{ .* }}/)
+    value = value.gsub(/{{ (.*?) }}/) { |match| match = vconfig[$1] }
+  end
+  value
+end
+
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   # Networking configuration.
@@ -47,21 +65,22 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   # If hostsupdater plugin is installed, add all server names as aliases.
   if Vagrant.has_plugin?("vagrant-hostsupdater")
-    config.hostsupdater.aliases = []
-    # Add all hosts that aren't defined as Ansible vars.
+    aliases = []
+    blacklist = [config.vm.hostname, vconfig['vagrant_ip']]
     if vconfig['drupalvm_webserver'] == "apache"
-      for host in vconfig['apache_vhosts']
-        unless host['servername'].include? "{{"
-          config.hostsupdater.aliases.push(host['servername'])
+      vconfig['apache_vhosts'].each do |host|
+        unless blacklist.include?(host['servername'])
+          aliases.push(host['servername'])
         end
       end
     else
-      for host in vconfig['nginx_hosts']
-        unless host['server_name'].include? "{{"
-          config.hostsupdater.aliases.push(host['server_name'])
+      vconfig['nginx_hosts'].each do |host|
+        unless blacklist.include?(host['server_name'])
+          aliases.push(host['server_name'])
         end
       end
     end
+    config.hostsupdater.aliases = aliases.uniq
   end
 
   # Synced folders.
diff --git a/example.config.yml b/example.config.yml
index 0a0f1e0b0..b801b0566 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -47,7 +47,7 @@ install_site: true
 # is 'true').
 drupal_major_version: 8
 drupal_core_path: "/var/www/drupalvm/drupal"
-drupal_domain: "drupalvm.dev"
+drupal_domain: "{{ vagrant_machine_name }}"
 drupal_site_name: "Drupal"
 drupal_install_profile: standard
 drupal_enable_modules: [ 'devel' ]
@@ -82,17 +82,17 @@ apache_vhosts:
     extra_parameters: |
           ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ drupal_core_path }}"
 
-  - servername: "adminer.drupalvm.dev"
+  - servername: "adminer.{{ vagrant_machine_name }}"
     documentroot: "/opt/adminer"
     extra_parameters: |
           ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000/opt/adminer"
 
-  - servername: "xhprof.drupalvm.dev"
+  - servername: "xhprof.{{ vagrant_machine_name }}"
     documentroot: "/usr/share/php/xhprof_html"
     extra_parameters: |
           ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000/usr/share/php/xhprof_html"
 
-  - servername: "pimpmylog.drupalvm.dev"
+  - servername: "pimpmylog.{{ vagrant_machine_name }}"
     documentroot: "/usr/share/php/pimpmylog"
     extra_parameters: |
           ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000/usr/share/php/pimpmylog"
@@ -113,15 +113,15 @@ nginx_hosts:
     root: "{{ drupal_core_path }}"
     is_php: true
 
-  - server_name: "adminer.drupalvm.dev"
+  - server_name: "adminer.{{ vagrant_machine_name }}"
     root: "/opt/adminer"
     is_php: true
 
-  - server_name: "xhprof.drupalvm.dev"
+  - server_name: "xhprof.{{ vagrant_machine_name }}"
     root: "/usr/share/php/xhprof_html"
     is_php: true
 
-  - server_name: "pimpmylog.drupalvm.dev"
+  - server_name: "pimpmylog.{{ vagrant_machine_name }}"
     root: "/usr/share/php/pimpmylog"
     is_php: true
 

From eddeb9f34c81ca82a40c4edb40aa92a959b560af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sun, 31 Jan 2016 12:15:38 -0500
Subject: [PATCH 0124/1273] add apache serveraliases to hostsupdater

---
 Vagrantfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Vagrantfile b/Vagrantfile
index 0a689f286..2a1995986 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -72,6 +72,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
         unless blacklist.include?(host['servername'])
           aliases.push(host['servername'])
         end
+        aliases.concat(host['serveralias'].split()) if host['serveralias']
       end
     else
       vconfig['nginx_hosts'].each do |host|

From 19ad2df8f27a26e6a8ca4da964eec48c21c7451c Mon Sep 17 00:00:00 2001
From: Aleksey Tkachenko <cyberpank@gmail.com>
Date: Mon, 1 Feb 2016 18:20:47 +0100
Subject: [PATCH 0125/1273] Updates documentation about PHP 7 configuration

---
 docs/other/php-7.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/other/php-7.md b/docs/other/php-7.md
index 811f5d429..bc1b80022 100644
--- a/docs/other/php-7.md
+++ b/docs/other/php-7.md
@@ -22,6 +22,7 @@ php_packages:
   - php7.0-opcache
 php_mysql_package: php7.0-mysql
 php_fpm_daemon: php7.0-fpm
+php_fpm_pool_conf_path: "/etc/php/7.0/fpm/pool.d/www.conf"
 ```
 
 Also, comment out `xhprof`, `xdebug`, `redis` and `memcached` from the `installed_extras` list, as these extensions are not yet supported for PHP 7 (as of late 2015).

From 42d554d9c2287a5efe76636ec890e701c4744159 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Mon, 1 Feb 2016 13:08:33 -0500
Subject: [PATCH 0126/1273] use variables for docroots

---
 docs/other/base-os.md              |  4 ----
 example.config.yml                 | 18 +++++++++---------
 provisioning/tasks/init-debian.yml |  5 +++++
 provisioning/tasks/init-redhat.yml |  5 +++++
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/docs/other/base-os.md b/docs/other/base-os.md
index 6646f1140..623888819 100644
--- a/docs/other/base-os.md
+++ b/docs/other/base-os.md
@@ -27,8 +27,6 @@ mysql_syslog_tag: mariadb
 mysql_pid_file: /var/run/mariadb/mariadb.pid
 ```
 
-**XHProf**: XHProf is installed in a different directory for RedHat/CentOS (as opposed to Debian/Ubuntu), you will need to update the `"xhprof.drupalvm.dev"` vhost to point to the `documentroot` `"/usr/share/pear/xhprof_html"`.
-
 ## RedHat Enterprise Linux / CentOS 6
 
 **Apache without FastCGI**: If you want to use Apache with CentOS 6 on Drupal VM, you will need to modify the syntax of your `apache_vhosts` and remove the `ProxyPassMatch` parameters from each one. Alternatively, you can use Nginx with the default configuration by setting `drupalvm_webserver: nginx` inside `config.yml`.
@@ -38,5 +36,3 @@ mysql_pid_file: /var/run/mariadb/mariadb.pid
 ```yaml
 php_opcache_enabled_in_ini: false
 ```
-
-**XHProf**: XHProf is installed in a different directory for RedHat/CentOS (as opposed to Debian/Ubuntu), you will need to update the `"xhprof.drupalvm.dev"` vhost to point to the `documentroot` `"/usr/share/pear/xhprof_html"`.
\ No newline at end of file
diff --git a/example.config.yml b/example.config.yml
index b801b0566..a43eb711d 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -83,19 +83,19 @@ apache_vhosts:
           ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ drupal_core_path }}"
 
   - servername: "adminer.{{ vagrant_machine_name }}"
-    documentroot: "/opt/adminer"
+    documentroot: "{{ adminer_install_dir }}"
     extra_parameters: |
-          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000/opt/adminer"
+          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ adminer_install_dir }}"
 
   - servername: "xhprof.{{ vagrant_machine_name }}"
-    documentroot: "/usr/share/php/xhprof_html"
+    documentroot: "{{ php_xhprof_html_dir }}"
     extra_parameters: |
-          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000/usr/share/php/xhprof_html"
+          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ php_xhprof_html_dir }}"
 
   - servername: "pimpmylog.{{ vagrant_machine_name }}"
-    documentroot: "/usr/share/php/pimpmylog"
+    documentroot: "{{ pimpmylog_install_dir }}"
     extra_parameters: |
-          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000/usr/share/php/pimpmylog"
+          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ pimpmylog_install_dir }}"
 
 apache_remove_default_vhost: true
 apache_mods_enabled:
@@ -114,15 +114,15 @@ nginx_hosts:
     is_php: true
 
   - server_name: "adminer.{{ vagrant_machine_name }}"
-    root: "/opt/adminer"
+    root: "{{ adminer_install_dir }}"
     is_php: true
 
   - server_name: "xhprof.{{ vagrant_machine_name }}"
-    root: "/usr/share/php/xhprof_html"
+    root: "{{ php_xhprof_html_dir }}"
     is_php: true
 
   - server_name: "pimpmylog.{{ vagrant_machine_name }}"
-    root: "/usr/share/php/pimpmylog"
+    root: "{{ pimpmylog_install_dir }}"
     is_php: true
 
 nginx_remove_default_vhost: true
diff --git a/provisioning/tasks/init-debian.yml b/provisioning/tasks/init-debian.yml
index 7a848f3a3..14735b49d 100644
--- a/provisioning/tasks/init-debian.yml
+++ b/provisioning/tasks/init-debian.yml
@@ -24,3 +24,8 @@
 - name: Add repository for PHP 7.0.
   apt_repository: repo='ppa:ondrej/php-7.0'
   when: php_version == "7.0"
+
+- name: Define php_xhprof_html_dir.
+  set_fact:
+    php_xhprof_html_dir: "/usr/share/php/xhprof_html"
+  when: php_xhprof_html_dir is not defined
diff --git a/provisioning/tasks/init-redhat.yml b/provisioning/tasks/init-redhat.yml
index 5e3a72533..2c45a511b 100644
--- a/provisioning/tasks/init-redhat.yml
+++ b/provisioning/tasks/init-redhat.yml
@@ -20,3 +20,8 @@
 - name: Enable remi repo for PHP 7.0.
   set_fact: php_enablerepo="remi,remi-php70"
   when: php_version == "7.0"
+
+- name: Define php_xhprof_html_dir.
+  set_fact:
+    php_xhprof_html_dir: "/usr/share/pear/xhprof_html"
+  when: php_xhprof_html_dir is not defined

From edb628eb40e92d014878b9c2065ee0989909f3b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 30 Jan 2016 14:52:54 -0500
Subject: [PATCH 0127/1273] Issue #300: Fix drush aliases not scaffolded for
 nginx hosts

---
 .../drupalvm-local.aliases.drushrc.php.j2     | 20 ++++++++++++----
 .../templates/drupalvm.aliases.drushrc.php.j2 | 23 +++++++++++++------
 2 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2 b/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2
index 20c40ed63..45d94ec80 100644
--- a/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2
+++ b/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2
@@ -6,10 +6,20 @@
  * @see example.aliases.drushrc.php.
  */
 
-{% for vhost in apache_vhosts %}
-$aliases['{{ vhost.servername }}'] = array(
-  'uri' => '{{ vhost.servername }}',
-  'root' => '{{ vhost.documentroot }}',
+{% macro alias(host, root) %}
+$aliases['{{ host }}'] = array(
+  'uri' => '{{ host }}',
+  'root' => '{{ root }}',
 );
 
-{% endfor %}
+{% endmacro %}
+
+{%- if drupalvm_webserver == 'apache' -%}
+  {%- for vhost in apache_vhosts -%}
+   {{ alias(vhost.servername, vhost.documentroot) }}
+  {%- endfor -%}
+{%- elif drupalvm_webserver == 'nginx' -%}
+  {%- for host in nginx_hosts -%}
+    {{ alias(host.server_name, host.root) }}
+  {%- endfor -%}
+{%- endif -%}
diff --git a/provisioning/templates/drupalvm.aliases.drushrc.php.j2 b/provisioning/templates/drupalvm.aliases.drushrc.php.j2
index 9f1138518..3e02de98d 100644
--- a/provisioning/templates/drupalvm.aliases.drushrc.php.j2
+++ b/provisioning/templates/drupalvm.aliases.drushrc.php.j2
@@ -5,14 +5,23 @@
  *
  * @see example.aliases.drushrc.php.
  */
-
-{% for vhost in apache_vhosts %}
-$aliases['{{ vhost.servername }}'] = array(
-  'uri' => '{{ vhost.servername }}',
-  'root' => '{{ vhost.documentroot }}',
-  'remote-host' => '{{ vhost.servername }}',
+{% macro alias(host, root) %}
+$aliases['{{ host }}'] = array(
+  'uri' => '{{ host }}',
+  'root' => '{{ root }}',
+  'remote-host' => '{{ host }}',
   'remote-user' => 'vagrant',
   'ssh-options' => '-o PasswordAuthentication=no -i ~/.vagrant.d/insecure_private_key',
 );
 
-{% endfor %}
+{% endmacro %}
+
+{%- if drupalvm_webserver == 'apache' -%}
+  {%- for vhost in apache_vhosts -%}
+   {{ alias(vhost.servername, vhost.documentroot) }}
+  {%- endfor -%}
+{%- elif drupalvm_webserver == 'nginx' -%}
+  {%- for host in nginx_hosts -%}
+    {{ alias(host.server_name, host.root) }}
+  {%- endfor -%}
+{%- endif -%}

From d3c993363fb76a80f69bd49650fba0b5fd84b1eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 30 Jan 2016 14:57:25 -0500
Subject: [PATCH 0128/1273] Skip drush aliases for development tool hosts

---
 .../templates/drupalvm-local.aliases.drushrc.php.j2 | 10 ++++++++--
 .../templates/drupalvm.aliases.drushrc.php.j2       | 13 ++++++++++---
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2 b/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2
index 45d94ec80..3c690f17a 100644
--- a/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2
+++ b/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2
@@ -6,6 +6,8 @@
  * @see example.aliases.drushrc.php.
  */
 
+{% set devtool_docroots = [adminer_install_dir, pimpmylog_install_dir, php_xhprof_html_dir] %}
+
 {% macro alias(host, root) %}
 $aliases['{{ host }}'] = array(
   'uri' => '{{ host }}',
@@ -16,10 +18,14 @@ $aliases['{{ host }}'] = array(
 
 {%- if drupalvm_webserver == 'apache' -%}
   {%- for vhost in apache_vhosts -%}
-   {{ alias(vhost.servername, vhost.documentroot) }}
+    {%- if vhost.documentroot not in devtool_docroots -%}
+      {{ alias(vhost.servername, vhost.documentroot) }}
+    {%- endif -%}
   {%- endfor -%}
 {%- elif drupalvm_webserver == 'nginx' -%}
   {%- for host in nginx_hosts -%}
-    {{ alias(host.server_name, host.root) }}
+    {%- if host.root not in devtool_docroots -%}
+      {{ alias(host.server_name, host.root) }}
+    {%- endif -%}
   {%- endfor -%}
 {%- endif -%}
diff --git a/provisioning/templates/drupalvm.aliases.drushrc.php.j2 b/provisioning/templates/drupalvm.aliases.drushrc.php.j2
index 3e02de98d..b5e86455e 100644
--- a/provisioning/templates/drupalvm.aliases.drushrc.php.j2
+++ b/provisioning/templates/drupalvm.aliases.drushrc.php.j2
@@ -5,12 +5,15 @@
  *
  * @see example.aliases.drushrc.php.
  */
+
+{% set devtool_docroots = [adminer_install_dir, pimpmylog_install_dir, php_xhprof_html_dir] %}
+
 {% macro alias(host, root) %}
 $aliases['{{ host }}'] = array(
   'uri' => '{{ host }}',
   'root' => '{{ root }}',
   'remote-host' => '{{ host }}',
-  'remote-user' => 'vagrant',
+  'remote-user' => '{{ vagrant_user }}',
   'ssh-options' => '-o PasswordAuthentication=no -i ~/.vagrant.d/insecure_private_key',
 );
 
@@ -18,10 +21,14 @@ $aliases['{{ host }}'] = array(
 
 {%- if drupalvm_webserver == 'apache' -%}
   {%- for vhost in apache_vhosts -%}
-   {{ alias(vhost.servername, vhost.documentroot) }}
+    {%- if vhost.documentroot not in devtool_docroots -%}
+      {{ alias(vhost.servername, vhost.documentroot) }}
+    {%- endif -%}
   {%- endfor -%}
 {%- elif drupalvm_webserver == 'nginx' -%}
   {%- for host in nginx_hosts -%}
-    {{ alias(host.server_name, host.root) }}
+    {%- if host.root not in devtool_docroots -%}
+      {{ alias(host.server_name, host.root) }}
+    {%- endif -%}
   {%- endfor -%}
 {%- endif -%}

From 4da53e4a5794062c9aabe1cef3724c0ab3a80e3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Mon, 1 Feb 2016 15:51:33 -0500
Subject: [PATCH 0129/1273] Follow-up #410: Use vagrant hostname instead of
 machine name for servernames

---
 example.config.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/example.config.yml b/example.config.yml
index a43eb711d..ffe1ab947 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -47,7 +47,7 @@ install_site: true
 # is 'true').
 drupal_major_version: 8
 drupal_core_path: "/var/www/drupalvm/drupal"
-drupal_domain: "{{ vagrant_machine_name }}"
+drupal_domain: "{{ vagrant_hostname }}"
 drupal_site_name: "Drupal"
 drupal_install_profile: standard
 drupal_enable_modules: [ 'devel' ]
@@ -82,17 +82,17 @@ apache_vhosts:
     extra_parameters: |
           ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ drupal_core_path }}"
 
-  - servername: "adminer.{{ vagrant_machine_name }}"
+  - servername: "adminer.{{ vagrant_hostname }}"
     documentroot: "{{ adminer_install_dir }}"
     extra_parameters: |
           ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ adminer_install_dir }}"
 
-  - servername: "xhprof.{{ vagrant_machine_name }}"
+  - servername: "xhprof.{{ vagrant_hostname }}"
     documentroot: "{{ php_xhprof_html_dir }}"
     extra_parameters: |
           ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ php_xhprof_html_dir }}"
 
-  - servername: "pimpmylog.{{ vagrant_machine_name }}"
+  - servername: "pimpmylog.{{ vagrant_hostname }}"
     documentroot: "{{ pimpmylog_install_dir }}"
     extra_parameters: |
           ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ pimpmylog_install_dir }}"
@@ -113,15 +113,15 @@ nginx_hosts:
     root: "{{ drupal_core_path }}"
     is_php: true
 
-  - server_name: "adminer.{{ vagrant_machine_name }}"
+  - server_name: "adminer.{{ vagrant_hostname }}"
     root: "{{ adminer_install_dir }}"
     is_php: true
 
-  - server_name: "xhprof.{{ vagrant_machine_name }}"
+  - server_name: "xhprof.{{ vagrant_hostname }}"
     root: "{{ php_xhprof_html_dir }}"
     is_php: true
 
-  - server_name: "pimpmylog.{{ vagrant_machine_name }}"
+  - server_name: "pimpmylog.{{ vagrant_hostname }}"
     root: "{{ pimpmylog_install_dir }}"
     is_php: true
 

From e11b685f591a397824d8e2a2de0bcc995f0cde35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Mon, 1 Feb 2016 16:24:47 -0500
Subject: [PATCH 0130/1273] Fix build_makefile in a non-vagrant environment

---
 example.config.yml                    | 2 +-
 provisioning/tasks/build-makefile.yml | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/example.config.yml b/example.config.yml
index ffe1ab947..f04ed951b 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -37,7 +37,7 @@ drupalvm_webserver: apache
 # Set this to false if you are using a different site deployment strategy and
 # would like to configure 'vagrant_synced_folders' and 'apache_vhosts' manually.
 build_makefile: true
-drush_makefile_path: /vagrant/drupal.make.yml
+drush_makefile_path: ../../drupal.make.yml
 
 # Set this to false if you don't need to install drupal (using the drupal_*
 # settings below), but instead copy down a database (e.g. using drush sql-sync).
diff --git a/provisioning/tasks/build-makefile.yml b/provisioning/tasks/build-makefile.yml
index 39cf33d98..b41cf5774 100644
--- a/provisioning/tasks/build-makefile.yml
+++ b/provisioning/tasks/build-makefile.yml
@@ -1,4 +1,10 @@
 ---
+- name: Copy drush makefile into place.
+  copy:
+    src: "{{ drush_makefile_path }}"
+    dest: /tmp/drupal.make.yml
+  when: drupal_site.stat.exists == false
+
 - name: Ensure drupal_core_path directory exists.
   file:
     path: "{{ drupal_core_path }}"
@@ -9,7 +15,7 @@
 
 - name: Generate Drupal site with drush makefile.
   command: >
-    {{ drush_path }} make -y {{ drush_makefile_path }} --no-gitinfofile
+    {{ drush_path }} make -y /tmp/drupal.make.yml --no-gitinfofile
     chdir={{ drupal_core_path }}
   when: drupal_site.stat.exists == false
   become: no

From 43914c513a02ee00593c447e6befc72f044812a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Mon, 1 Feb 2016 16:25:27 -0500
Subject: [PATCH 0131/1273] Keep the local drush alias when provisioning
 locally

---
 provisioning/tasks/drush-aliases.yml | 36 ++++++++++++++--------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/provisioning/tasks/drush-aliases.yml b/provisioning/tasks/drush-aliases.yml
index 71740ece9..86a5145f3 100644
--- a/provisioning/tasks/drush-aliases.yml
+++ b/provisioning/tasks/drush-aliases.yml
@@ -1,22 +1,4 @@
 ---
-- name: Ensure drush directory exists for vagrant user inside VM.
-  file: 'path="~/.drush" state=directory'
-  become: no
-
-- name: Configure drush aliases for vagrant user inside VM.
-  template:
-    src: ../templates/drupalvm-local.aliases.drushrc.php.j2
-    dest: "~/.drush/{{ vagrant_machine_name }}.aliases.drushrc.php"
-  become: no
-
-- name: Ensure drush directory exists for root user inside VM.
-  file: 'path="~/.drush" state=directory'
-
-- name: Configure drush aliases for root user inside VM.
-  template:
-    src: ../templates/drupalvm-local.aliases.drushrc.php.j2
-    dest: "~/.drush/{{ vagrant_machine_name }}.aliases.drushrc.php"
-
 - name: Check if local Drush configuration folder exists.
   stat:
     path: ~/.drush
@@ -41,3 +23,21 @@
   delegate_to: 127.0.0.1
   become: no
   when: configure_local_drush_aliases
+
+- name: Ensure drush directory exists for vagrant user inside VM.
+  file: 'path="~/.drush" state=directory'
+  become: no
+
+- name: Configure drush aliases for vagrant user inside VM.
+  template:
+    src: ../templates/drupalvm-local.aliases.drushrc.php.j2
+    dest: "~/.drush/{{ vagrant_machine_name }}.aliases.drushrc.php"
+  become: no
+
+- name: Ensure drush directory exists for root user inside VM.
+  file: 'path="~/.drush" state=directory'
+
+- name: Configure drush aliases for root user inside VM.
+  template:
+    src: ../templates/drupalvm-local.aliases.drushrc.php.j2
+    dest: "~/.drush/{{ vagrant_machine_name }}.aliases.drushrc.php"

From 987d8573475b0dae82e523079db8787d27f815b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Mon, 1 Feb 2016 16:26:51 -0500
Subject: [PATCH 0132/1273] Add docker based test setup

---
 .travis.yml                   | 112 ++++++++++++++++++++++++++++------
 tests/Dockerfile.centos-6     |  15 +++++
 tests/Dockerfile.centos-7     |  27 ++++++++
 tests/Dockerfile.ubuntu-12.04 |  11 ++++
 tests/Dockerfile.ubuntu-14.04 |  11 ++++
 tests/centos-7-vars.yml       |  10 +++
 6 files changed, 168 insertions(+), 18 deletions(-)
 create mode 100644 tests/Dockerfile.centos-6
 create mode 100644 tests/Dockerfile.centos-7
 create mode 100644 tests/Dockerfile.ubuntu-12.04
 create mode 100644 tests/Dockerfile.ubuntu-14.04
 create mode 100644 tests/centos-7-vars.yml

diff --git a/.travis.yml b/.travis.yml
index 08ff1da89..9f296e826 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,27 +1,103 @@
----
-language: python
-python: "2.7"
+sudo: required
 
-install:
-  # Install Ansible.
-  - pip install ansible
+env:
+  global:
+    - CONFIG: example.config.yml
+      MAKEFILE: example.drupal.make.yml
+      HOSTNAME: drupalvm.dev
+      MACHINE_NAME: drupalvm
+  matrix:
+    - distribution: centos
+      version: 6
+      init: /sbin/init
+      run_opts: "--privileged"
+    - distribution: centos
+      version: 7
+      init: /usr/lib/systemd/systemd
+      run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+      additional_vars: "centos-7-vars.yml"
+  # - distribution: ubuntu
+  #   version: 14.04
+  #   init: /sbin/init
+  #   run_opts: "--privileged"
+  # - distribution: ubuntu
+  #   version: 12.04
+  #   init: /sbin/init
+  #   run_opts: "--privileged"
 
-  # Add ansible.cfg to set local roles path.
-  - "{ echo '[defaults]'; echo 'roles_path = ../'; } >> ansible.cfg"
+services:
+  - docker
+
+before_install:
+  # Pull container
+  - 'sudo docker pull ${distribution}:${version}'
+  # Customize container
+  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
 
 script:
-  # Copy example files into place.
-  - cp example.config.yml config.yml
-  - cp example.drupal.make.yml drupal.make.yml
+  - container_id=$(mktemp)
+
+  # Run container in detached state
+  - 'sudo docker run --detach --volume="${PWD}":/var/www/drupalvm/:rw ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+
+  # Set hostname.
+  - 'sudo docker exec "$(cat ${container_id})" hostname ${HOSTNAME}'
+
+  # Setup directories.
+  - 'sudo docker exec "$(cat ${container_id})" mkdir -p /var/www/drupalvm/drupal'
+
+  # Install dependencies.
+  - 'sudo docker exec "$(cat ${container_id})" ansible-galaxy install -r /var/www/drupalvm/provisioning/requirements.yml'
 
-  # Make sure Ansible requirements install correctly.
-  - 'ansible-galaxy install -r provisioning/requirements.yml'
+  # Copy configuration files into place.
+  - 'sudo docker exec "$(cat ${container_id})" cp /var/www/drupalvm/$CONFIG /var/www/drupalvm/config.yml'
+  - 'sudo docker exec "$(cat ${container_id})" cp /var/www/drupalvm/$MAKEFILE /var/www/drupalvm/drupal.make.yml'
 
-  # Run Ansible's syntax and playbook check on the main playbook.
-  - 'ansible-playbook -i "localhost," -c local provisioning/playbook.yml --syntax-check'
+  # Append additional variables if set.
+  - '[[ $additional_vars ]] && sudo docker exec "$(cat ${container_id})" bash -c "cat /var/www/drupalvm/tests/${additional_vars} >> /var/www/drupalvm/config.yml"'
 
-  # Check the config file and drupal make file YAML syntax.
+  # Ansible syntax check.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /var/www/drupalvm/provisioning/playbook.yml --syntax-check'
+
+  # Run the playbook with ansible-playbook.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /var/www/drupalvm/provisioning/playbook.yml'
+
+  # Run the integration tests
   - >
-    python -c "import yaml; yaml.load( open('example.config.yml', 'r'), Loader=yaml.CLoader  )"
+    sudo docker exec "$(cat ${container_id})" curl -s --header Host:${HOSTNAME} localhost
+    | grep -q '<title>Welcome to Drupal'
+    && (echo 'Drupal install pass' && exit 0)
+    || (echo 'Drupal install fail' && exit 1)
+
   - >
-    python -c "import yaml; yaml.load( open('example.drupal.make.yml', 'r'), Loader=yaml.CLoader  )"
+    sudo docker exec "$(cat ${container_id})" curl -s --header Host:adminer.${HOSTNAME} localhost
+    | grep -q '<title>Login - Adminer'
+    && (echo 'Admin install pass' && exit 0)
+    || (echo 'Adminer install fail' && exit 1)
+
+  - >
+    sudo docker exec "$(cat ${container_id})" curl -s --header Host:pimpmylog.${HOSTNAME} localhost
+    | grep -q '<title>Pimp my Log'
+    && (echo 'Pimp my Log install pass' && exit 0)
+    || (echo 'Pimp my Log install fail' && exit 1)
+
+  - >
+    sudo docker exec "$(cat ${container_id})" curl -s --header Host:xhprof.${HOSTNAME} localhost
+    | grep -q '<title>XHProf'
+    && (echo 'XHProf install pass' && exit 0)
+    || (echo 'XHProf install fail' && exit 1)
+
+  - >
+    sudo docker exec "$(cat ${container_id})" curl -s localhost:8025
+    | grep -q '<title>MailHog'
+    && (echo 'MailHog install pass' && exit 0)
+    || (echo 'MailHog install fail' && exit 1)
+
+  - >
+    sudo docker exec "$(cat ${container_id})" drush @${MACHINE_NAME}.${HOSTNAME} status
+    | grep -q 'Drupal bootstrap.*Successful'
+    && (echo 'Drush install pass' && exit 0)
+    || (echo 'Drush install fail' && exit 1)
+
+  # Clean up
+  - 'sudo docker stop "$(cat ${container_id})"'
diff --git a/tests/Dockerfile.centos-6 b/tests/Dockerfile.centos-6
new file mode 100644
index 000000000..0746e50de
--- /dev/null
+++ b/tests/Dockerfile.centos-6
@@ -0,0 +1,15 @@
+FROM centos:6
+
+# Install Ansible
+RUN yum -y update; yum clean all;
+RUN yum -y install epel-release
+RUN yum -y install git ansible sudo which curl tar unzip xz logrotate
+RUN yum clean all
+
+# Disable requiretty
+RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
+
+# Install Ansible inventory file
+RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
+
+CMD ["/usr/sbin/init"]
diff --git a/tests/Dockerfile.centos-7 b/tests/Dockerfile.centos-7
new file mode 100644
index 000000000..b3259e736
--- /dev/null
+++ b/tests/Dockerfile.centos-7
@@ -0,0 +1,27 @@
+FROM centos:7
+
+# Install systemd -- See https://hub.docker.com/_/centos/
+RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
+RUN yum -y update; yum clean all; \
+(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
+rm -f /lib/systemd/system/multi-user.target.wants/*; \
+rm -f /etc/systemd/system/*.wants/*; \
+rm -f /lib/systemd/system/local-fs.target.wants/*; \
+rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
+rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
+rm -f /lib/systemd/system/basic.target.wants/*; \
+rm -f /lib/systemd/system/anaconda.target.wants/*;
+
+# Install Ansible
+RUN yum -y install epel-release
+RUN yum -y install git ansible sudo which curl tar unzip xz logrotate initscripts
+RUN yum clean all
+
+# Disable requiretty
+RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
+
+# Install Ansible inventory file
+RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
+
+VOLUME ["/sys/fs/cgroup"]
+CMD ["/usr/sbin/init"]
diff --git a/tests/Dockerfile.ubuntu-12.04 b/tests/Dockerfile.ubuntu-12.04
new file mode 100644
index 000000000..001e03f7e
--- /dev/null
+++ b/tests/Dockerfile.ubuntu-12.04
@@ -0,0 +1,11 @@
+FROM ubuntu:12.04
+RUN apt-get update
+
+# Install Ansible
+RUN apt-get install -y software-properties-common python-software-properties git
+RUN apt-add-repository -y ppa:ansible/ansible
+RUN apt-get update
+RUN apt-get install -y ansible ufw curl
+
+# Install Ansible inventory file
+RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/tests/Dockerfile.ubuntu-14.04 b/tests/Dockerfile.ubuntu-14.04
new file mode 100644
index 000000000..607180f93
--- /dev/null
+++ b/tests/Dockerfile.ubuntu-14.04
@@ -0,0 +1,11 @@
+FROM ubuntu:14.04
+RUN apt-get update
+
+# Install Ansible
+RUN apt-get install -y software-properties-common git
+RUN apt-add-repository -y ppa:ansible/ansible
+RUN apt-get update
+RUN apt-get install -y ansible ufw curl
+
+# Install Ansible inventory file
+RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/tests/centos-7-vars.yml b/tests/centos-7-vars.yml
new file mode 100644
index 000000000..0b90cd6be
--- /dev/null
+++ b/tests/centos-7-vars.yml
@@ -0,0 +1,10 @@
+mysql_packages:
+  - mariadb
+  - mariadb-server
+  - mariadb-libs
+  - MySQL-python
+  - perl-DBD-MySQL
+mysql_daemon: mariadb
+mysql_log_error: /var/log/mariadb/mariadb.log
+mysql_syslog_tag: mariadb
+mysql_pid_file: /var/run/mariadb/mariadb.pid

From cb3d7aca15d6320dee110a9187179c5a3a9e3a89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Fri, 5 Feb 2016 12:31:01 -0500
Subject: [PATCH 0133/1273] Add a test for nginx

---
 .travis.yml             | 3 ++-
 tests/centos-6-vars.yml | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 tests/centos-6-vars.yml

diff --git a/.travis.yml b/.travis.yml
index 9f296e826..b2e58a442 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,7 @@ env:
       version: 6
       init: /sbin/init
       run_opts: "--privileged"
+      additional_vars: "centos-6-vars.yml"
     - distribution: centos
       version: 7
       init: /usr/lib/systemd/systemd
@@ -54,7 +55,7 @@ script:
   - 'sudo docker exec "$(cat ${container_id})" cp /var/www/drupalvm/$MAKEFILE /var/www/drupalvm/drupal.make.yml'
 
   # Append additional variables if set.
-  - '[[ $additional_vars ]] && sudo docker exec "$(cat ${container_id})" bash -c "cat /var/www/drupalvm/tests/${additional_vars} >> /var/www/drupalvm/config.yml"'
+  - '[[ $additional_vars ]] && sudo docker exec "$(cat ${container_id})" bash -c "cat /var/www/drupalvm/tests/${additional_vars} >> /var/www/drupalvm/config.yml" || true'
 
   # Ansible syntax check.
   - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /var/www/drupalvm/provisioning/playbook.yml --syntax-check'
diff --git a/tests/centos-6-vars.yml b/tests/centos-6-vars.yml
new file mode 100644
index 000000000..848ddb468
--- /dev/null
+++ b/tests/centos-6-vars.yml
@@ -0,0 +1 @@
+drupalvm_webserver: nginx

From 5e4c9c1f112f348a3e0762d05001dc64e07ecebf Mon Sep 17 00:00:00 2001
From: Michael Mallett <mike@generalpie.com>
Date: Wed, 10 Feb 2016 17:56:11 +0700
Subject: [PATCH 0134/1273] Check for post_provisioning_scripts being defined
 before attempting to run them

---
 provisioning/playbook.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 9b197bcdc..ea3ae3d52 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -79,3 +79,4 @@
     - name: Run configured post-provision shell scripts.
       script: "{{ item }}"
       with_items: post_provision_scripts
+      when: post_provision_scripts is defined

From 62505bc856e182d59308d69ca80edd81456c74b1 Mon Sep 17 00:00:00 2001
From: Oliver Davies <o.davies@ctidigital.com>
Date: Wed, 10 Feb 2016 19:52:06 +0000
Subject: [PATCH 0135/1273] Use php_fpm_listen

---
 provisioning/templates/nginx-vhost.conf.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/templates/nginx-vhost.conf.j2 b/provisioning/templates/nginx-vhost.conf.j2
index ef2873f0f..60c4d8ed5 100644
--- a/provisioning/templates/nginx-vhost.conf.j2
+++ b/provisioning/templates/nginx-vhost.conf.j2
@@ -34,7 +34,7 @@ server {
         fastcgi_intercept_errors on;
         fastcgi_read_timeout 120;
         include fastcgi_params;
-        fastcgi_pass 127.0.0.1:9000;
+        fastcgi_pass {{ php_fpm_listen }};
     }
 
     location @rewrite {

From 97f97b066f9ec4681a29dd006a3090836c8b9a1a Mon Sep 17 00:00:00 2001
From: Steve Purkiss <steve@purkiss.com>
Date: Thu, 11 Feb 2016 14:19:44 +0000
Subject: [PATCH 0136/1273] Update drupal-console.md

Drupal Console Cache Rebuild Syntax Update
---
 docs/extras/drupal-console.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/extras/drupal-console.md b/docs/extras/drupal-console.md
index 7c0079691..dc2e7f564 100644
--- a/docs/extras/drupal-console.md
+++ b/docs/extras/drupal-console.md
@@ -6,15 +6,15 @@ To use Drupal Console with a Drupal 8 site (in this case, using the default conf
 
   1. Log into the VM with `vagrant ssh`.
   2. Change directory to the Drupal site's document root: `cd /var/www/drupalvm/drupal`.
-  3. Use Drupal console (e.g. `drupal cache:rebuild --cache=all`).
+  3. Use Drupal console (e.g. `drupal cache:rebuild all`).
 
 You should see an output like:
 
 ```
-vagrant@drupalvm:/var/www/drupalvm/drupal$ drupal cache:rebuild --cache=all
+vagrant@drupalvm:/var/www/drupalvm/drupal$ drupal cache:rebuild all
 
 [+] Rebuilding cache(s), wait a moment please.
 [+] Done clearing cache(s).
 
  The command was executed successfully!
-```
\ No newline at end of file
+```

From 4d4b214042f43c0eda052725c44dfda166182aef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Tue, 26 Jan 2016 09:51:13 -0500
Subject: [PATCH 0137/1273] Add a dashboard

---
 example.config.yml                            |   7 +
 provisioning/playbook.yml                     |   1 +
 provisioning/tasks/dashboard.yml              |  11 +
 provisioning/templates/dashboard.html.j2      | 317 ++++++++++++++++++
 .../drupalvm-local.aliases.drushrc.php.j2     |   2 +-
 .../templates/drupalvm.aliases.drushrc.php.j2 |   2 +-
 6 files changed, 338 insertions(+), 2 deletions(-)
 create mode 100644 provisioning/tasks/dashboard.yml
 create mode 100644 provisioning/templates/dashboard.html.j2

diff --git a/example.config.yml b/example.config.yml
index f04ed951b..55ba95e31 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -97,6 +97,9 @@ apache_vhosts:
     extra_parameters: |
           ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ pimpmylog_install_dir }}"
 
+  - servername: "{{ vagrant_ip }}"
+    documentroot: "{{ dashboard_install_dir }}"
+
 apache_remove_default_vhost: true
 apache_mods_enabled:
   - expires.load
@@ -125,6 +128,9 @@ nginx_hosts:
     root: "{{ pimpmylog_install_dir }}"
     is_php: true
 
+  - server_name: "{{ vagrant_ip }}"
+    root: "{{ dashboard_install_dir }}"
+
 nginx_remove_default_vhost: true
 
 # MySQL Databases and users. If build_makefile: is true, first database will
@@ -253,4 +259,5 @@ solr_xmx: "128M"
 selenium_version: 2.46.0
 
 # Other configuration.
+dashboard_install_dir: /var/www/dashboard
 known_hosts_path: ~/.ssh/known_hosts
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index ea3ae3d52..763ca31c6 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -75,6 +75,7 @@
 
     - include: tasks/drush-aliases.yml
     - include: tasks/cron.yml
+    - include: tasks/dashboard.yml
 
     - name: Run configured post-provision shell scripts.
       script: "{{ item }}"
diff --git a/provisioning/tasks/dashboard.yml b/provisioning/tasks/dashboard.yml
new file mode 100644
index 000000000..4be3504f0
--- /dev/null
+++ b/provisioning/tasks/dashboard.yml
@@ -0,0 +1,11 @@
+- name: Ensure the dashboard directory exists
+  file:
+    path: "{{ dashboard_install_dir }}"
+    state: directory
+    mode: 0755
+
+- name: Copy dashboard page into place.
+  template:
+    src: ../templates/dashboard.html.j2
+    dest: "{{ dashboard_install_dir }}/index.html"
+    mode: 0644
diff --git a/provisioning/templates/dashboard.html.j2 b/provisioning/templates/dashboard.html.j2
new file mode 100644
index 000000000..cb2aae8c7
--- /dev/null
+++ b/provisioning/templates/dashboard.html.j2
@@ -0,0 +1,317 @@
+<!DOCTYPE html>
+  <head>
+    <title>Drupal VM</title>
+    <meta charset="utf-8">
+    <style>
+      .section-host {
+        font-family: monospace;
+        list-style-type: none;
+        padding: 0;
+        margin: 0;
+      }
+      /* minor fallback styling for when loaded without an internet connection */
+      .panel, .jumbotron, .well {
+        margin-bottom: 20px;
+      }
+      td, th {
+        padding: 8px;
+      }
+    </style>
+  </head>
+  <body>
+    {%
+      set devtool_docroots = [
+        adminer_install_dir if 'adminer' in installed_extras else '',
+        php_xhprof_html_dir if 'xhprof' in installed_extras else '',
+        pimpmylog_install_dir if 'pimpmylog' in installed_extras else '',
+        dashboard_install_dir
+      ]
+    %}
+
+    {# Returns the hosts server name based on the document root #}
+    {%- macro getServernameFromDocroot(path) -%}
+      {%- if drupalvm_webserver == 'apache' -%}
+        {%- for host in apache_vhosts -%}
+          {%- if host.documentroot == path -%}
+            {{ host.servername }}
+          {%- endif -%}
+        {%- endfor -%}
+      {%- elif drupalvm_webserver == 'nginx' -%}
+        {%- for host in nginx_hosts -%}
+          {%- if host.root == path -%}
+            {{ host.server_name }}
+          {%- endif -%}
+        {%- endfor -%}
+      {%- endif -%}
+    {%- endmacro -%}
+
+    {%- macro printSite(servername, docroot) -%}
+      {%- if docroot not in devtool_docroots -%}
+        <tr>
+          <td><a href="http://{{ servername }}">{{ servername }}</a></td>
+          <td><code>{{ docroot }}</code></td>
+        {% if configure_local_drush_aliases %}
+          <td><code>drush @{{ vagrant_machine_name }}.{{ servername }}</code></td>
+        {% endif %}
+        </tr>
+      {% endif %}
+    {%- endmacro %}
+
+    {%- macro sectionHost() -%}
+      <ul class="section-host">
+        {% if drupalvm_webserver == 'apache' -%}
+          {%- for host in apache_vhosts -%}
+            {%- if host.documentroot != dashboard_install_dir -%}
+              <li>{{ host.servername }} {{ vagrant_ip }}</li>
+            {%- endif -%}
+            {% if host.serveralias is defined -%}
+              {%- for alias in host.serveralias.split() -%}
+                <li>{{ alias }} {{ vagrant_ip }}</li>
+              {%- endfor -%}
+            {%- endif %}
+          {%- endfor -%}
+        {%- elif drupalvm_webserver == 'nginx' -%}
+          {%- for host in nginx_hosts -%}
+            {%- if host.root != dashboard_install_dir -%}
+              <li>{{ host.server_name }} {{ vagrant_ip }}</li>
+            {%- endif -%}
+          {%- endfor -%}
+        {%- endif %}
+      </ul>
+    {%- endmacro -%}
+
+    {%- macro sectionSiteList() -%}
+      <table class="table">
+        <thead>
+          <tr>
+            <th>Hostname</th>
+            <th>Document Root</th>
+            {% if configure_local_drush_aliases -%}
+              <th>Drush alias</th>
+            {%- endif %}
+        </thead>
+        <tbody>
+          {% if drupalvm_webserver == 'apache' -%}
+            {%- for host in apache_vhosts -%}
+              {{ printSite(host.servername, host.documentroot) }}
+            {%- endfor -%}
+          {%- elif drupalvm_webserver == 'nginx' -%}
+            {%- for host in nginx_hosts -%}
+              {{ printSite(host.server_name, host.root) }}
+            {%- endfor -%}
+          {%- endif %}
+        </tbody>
+      </table>
+    {%- endmacro -%}
+
+    {%- macro sectionDevelopmentTools() -%}
+      <table class="table">
+        {% if 'adminer' in installed_extras -%}
+          {% set servername %}{{ getServernameFromDocroot(adminer_install_dir) }}/{{ adminer_install_filename }}{% endset %}
+          {%- if servername != "/{{ adminer_install_filename }}" -%}
+            <tr>
+              <th>Adminer</th>
+              <td><a href="http://{{ servername }}">{{ servername }}</a></td>
+              <td class="text-right">
+                <a href="http://{{ servername }}" class="btn btn-success btn-xs" role="button">Open</a>
+                <a href="http://docs.drupalvm.com/en/latest/extras/mysql/#connect-using-adminer" target="_blank" class="btn btn-info btn-xs" role="button">Documentation</a>
+              </td>
+            </tr>
+          {%- endif -%}
+        {%- endif %}
+        {% if 'mailhog' in installed_extras -%}
+          {% set servername %}{{ vagrant_hostname }}:8025{% endset %}
+          {%- if servername != ":8025" -%}
+            <tr>
+              <th>MailHog</th>
+              <td><a href="http://{{ servername }}">{{ servername }}</a></td>
+              <td class="text-right">
+                <a href="http://{{ servername }}" class="btn btn-success btn-xs" role="button">Open</a>
+                <a href="http://docs.drupalvm.com/en/latest/extras/mailhog/" target="_blank" class="btn btn-info btn-xs" role="button">Documentation</a>
+              </td>
+            </tr>
+          {%- endif -%}
+        {%- endif %}
+        {% if 'pimpmylog' in installed_extras -%}
+          {% set servername = getServernameFromDocroot(pimpmylog_install_dir) %}
+          {%- if servername -%}
+            <tr>
+              <th>PimpMyLog</th>
+              <td><a href="http://{{ servername }}">{{ servername }}</a></td>
+              <td class="text-right">
+                <a href="http://{{ servername }}" class="btn btn-success btn-xs" role="button">Open</a>
+                <a href="http://docs.drupalvm.com/en/latest/extras/pimpmylog/" target="_blank" class="btn btn-info btn-xs" role="button">Documentation</a>
+              </td>
+            </tr>
+          {%- endif -%}
+        {%- endif %}
+        {% if 'solr' in installed_extras -%}
+          {% set servername %}{{ vagrant_hostname }}:{{ solr_port }}/solr/{% endset %}
+          <tr>
+            <th>Solr</th>
+            <td><a href="http://{{ servername }}">{{ servername }}</a></td>
+            <td class="text-right">
+              <a href="http://{{ servername }}" class="btn btn-success btn-xs" role="button">Open</a>
+              <a href="http://docs.drupalvm.com/en/latest/extras/solr/" target="_blank" class="btn btn-info btn-xs" role="button">Documentation</a>
+            </td>
+          </tr>
+        {%- endif %}
+        {% if 'xhprof' in installed_extras -%}
+          {% set servername = getServernameFromDocroot(php_xhprof_html_dir) %}
+          {%- if servername -%}
+            <tr>
+              <th>XHProf</th>
+              <td><a href="http://{{ servername }}">{{ servername }}</a></td>
+              <td class="text-right">
+                <a href="http://{{ servername }}" class="btn btn-success btn-xs" role="button">Open</a>
+                <a href="http://docs.drupalvm.com/en/latest/extras/xhprof/" target="_blank" class="btn btn-info btn-xs" role="button">Documentation</a>
+              </td>
+            </tr>
+          {%- endif -%}
+        {%- endif %}
+      </table>
+    {%- endmacro -%}
+
+    {%- macro sectionDatabaseConnection() -%}
+      <table class="table">
+        <tr>
+          <th>MySQL Hostname</th>
+          <td><code>127.0.0.1</code></td>
+        </tr>
+        <tr>
+          <th>MySQL Port</th>
+          <td><code>{{ mysql_port }}</code></td>
+        </tr>
+        <tr>
+          <th>MySQL Username</th>
+          <td><code>{{ mysql_root_username }}</code></td>
+        </tr>
+        <tr>
+          <th>MySQL Password</th>
+          <td><code>{{ mysql_root_password }}</code></td>
+        </tr>
+        <tr>
+          <th>SSH Hostname</th>
+          <td><code>{{ vagrant_ip }}</code></td>
+        </tr>
+        <tr>
+          <th>SSH Username</th>
+          <td><code>{{ vagrant_user }}</code></td>
+        </tr>
+        <tr>
+          <th>SSH Private Key</th>
+          <td><code>~/.vagrant.d/insecure_private_key</code></td>
+        </tr>
+      </table>
+    {%- endmacro -%}
+
+    {%- macro sectionDatabaseList() -%}
+      <table class="table">
+        <thead>
+          <tr>
+            <th>Database name</th>
+            {% if 'adminer' in installed_extras -%}
+              <th></th>
+            {%- endif %}
+          </tr>
+        </thead>
+        <tbody>
+          {% for database in mysql_databases -%}
+            <tr>
+              <td><code>{{ database.name }}</code></td>
+              {% if 'adminer' in installed_extras -%}
+              <td>
+                <a href="http://{{ getServernameFromDocroot(adminer_install_dir) }}/{{ adminer_install_filename }}?username={{ mysql_root_username }}&db={{ database.name }}" class="btn btn-success btn-xs" role="button">Adminer</a>
+              </td>
+              {%- endif %}
+            </tr>
+          {%- endfor %}
+        </tbody>
+      </table>
+    {%- endmacro -%}
+
+    {%- macro sectionDatabaseUserList() -%}
+      <table class="table">
+        <thead>
+          <tr>
+            <th>Username</th>
+            <th>Password</th>
+          </tr>
+        </thead>
+        <tbody>
+          {% for user in mysql_users -%}
+            <tr>
+              <td><code>{{ user.name }}</code></td>
+              <td><code>{{ user.password }}</code></td>
+            </tr>
+          {%- endfor %}
+        </tbody>
+      </table>
+    {%- endmacro -%}
+
+    <div class="container">
+
+      <div class="row">
+        <div class="col-md-12">
+          <section class="jumbotron">
+            <div class="row">
+              <div class="col-md-7 text-center">
+                <img src="http://docs.drupalvm.com/en/latest/images/drupal-vm-logo.png" alt="Drupal VM" title="Welcome to Drupal VM">
+                <p><a href="https://github.com/geerlingguy/drupal-vm">Drupal VM</a> is a VM for local Drupal development, built with Vagrant + Ansible.</p>
+                <p><a class="btn btn-primary btn-lg" href="http://docs.drupalvm.com/en/latest/" role="button">Read the documentation</a></p>
+              </div>
+
+              <div class="col-md-5">
+                <h5>/etc/hosts</h5>
+                <section class="well small">
+                  {{ sectionHost() }}
+                </section>
+                <small>Unless you're using the <a href="https://github.com/cogitatio/vagrant-hostsupdater" target="_blank">vagrant-hostsupdater</a> plugin, add the following to your host machine's hosts file.</small>
+              </div>
+            </div>
+          </section>
+        </div>
+      </div>
+
+      <div class="row">
+        <div class="col-md-7">
+
+          <section class="panel panel-default">
+            <div class="panel-heading">Your sites</div>
+            <div class="panel-body">
+              {{ sectionSiteList() }}
+            </div>
+          </section>
+
+          <section class="panel panel-default">
+            <div class="panel-heading">Development tools</div>
+            <div class="panel-body">
+              {{ sectionDevelopmentTools() }}
+            </div>
+          </section>
+        </div>
+
+        <div class="col-md-5">
+          <section class="panel panel-default">
+            <div class="panel-heading">MySQL connection information</div>
+            <div class="panel-body">
+              {{ sectionDatabaseConnection() }}
+            </div>
+          </section>
+
+          <section class="panel panel-default">
+            <div class="panel-heading">Databases</div>
+            <div class="panel-body">
+              {{ sectionDatabaseList() }}
+
+              {{ sectionDatabaseUserList() }}
+            </div>
+          </section>
+        </div>
+      </div>
+
+    </div>
+
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
+  </body>
+</html>
diff --git a/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2 b/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2
index 3c690f17a..ea82a09db 100644
--- a/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2
+++ b/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2
@@ -6,7 +6,7 @@
  * @see example.aliases.drushrc.php.
  */
 
-{% set devtool_docroots = [adminer_install_dir, pimpmylog_install_dir, php_xhprof_html_dir] %}
+{% set devtool_docroots = [adminer_install_dir, pimpmylog_install_dir, php_xhprof_html_dir, dashboard_install_dir] %}
 
 {% macro alias(host, root) %}
 $aliases['{{ host }}'] = array(
diff --git a/provisioning/templates/drupalvm.aliases.drushrc.php.j2 b/provisioning/templates/drupalvm.aliases.drushrc.php.j2
index b5e86455e..45151b91c 100644
--- a/provisioning/templates/drupalvm.aliases.drushrc.php.j2
+++ b/provisioning/templates/drupalvm.aliases.drushrc.php.j2
@@ -6,7 +6,7 @@
  * @see example.aliases.drushrc.php.
  */
 
-{% set devtool_docroots = [adminer_install_dir, pimpmylog_install_dir, php_xhprof_html_dir] %}
+{% set devtool_docroots = [adminer_install_dir, pimpmylog_install_dir, php_xhprof_html_dir, dashboard_install_dir] %}
 
 {% macro alias(host, root) %}
 $aliases['{{ host }}'] = array(

From 69c2c35a4bb6767fbfed45f3b9cfc1e5770916a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Fri, 12 Feb 2016 09:08:40 -0500
Subject: [PATCH 0138/1273] Add a test for the dashboard

---
 .travis.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index b2e58a442..fe14982b4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ env:
       MAKEFILE: example.drupal.make.yml
       HOSTNAME: drupalvm.dev
       MACHINE_NAME: drupalvm
+      IP: 192.168.88.88
   matrix:
     - distribution: centos
       version: 6
@@ -94,6 +95,12 @@ script:
     && (echo 'MailHog install pass' && exit 0)
     || (echo 'MailHog install fail' && exit 1)
 
+  - >
+    sudo docker exec "$(cat ${container_id})" curl -s --header Host:${IP} localhost
+    | grep -q "<li>${HOSTNAME} ${IP}</li>"
+    && (echo 'Dashboard install pass' && exit 0)
+    || (echo 'Dashboard install fail' && exit 1)
+
   - >
     sudo docker exec "$(cat ${container_id})" drush @${MACHINE_NAME}.${HOSTNAME} status
     | grep -q 'Drupal bootstrap.*Successful'

From ac94d7e1977f0d9ac0a8bf595b254998507ff6fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Fri, 12 Feb 2016 10:39:12 -0500
Subject: [PATCH 0139/1273] Use macros instead of block set tag

---
 provisioning/templates/dashboard.html.j2 | 38 ++++++++++++------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/provisioning/templates/dashboard.html.j2 b/provisioning/templates/dashboard.html.j2
index cb2aae8c7..5512aaade 100644
--- a/provisioning/templates/dashboard.html.j2
+++ b/provisioning/templates/dashboard.html.j2
@@ -107,63 +107,63 @@
     {%- macro sectionDevelopmentTools() -%}
       <table class="table">
         {% if 'adminer' in installed_extras -%}
-          {% set servername %}{{ getServernameFromDocroot(adminer_install_dir) }}/{{ adminer_install_filename }}{% endset %}
-          {%- if servername != "/{{ adminer_install_filename }}" -%}
+          {% macro servername() %}{{ getServernameFromDocroot(adminer_install_dir) }}/{{ adminer_install_filename }}{% endmacro %}
+          {%- if servername() != "/{{ adminer_install_filename }}" -%}
             <tr>
               <th>Adminer</th>
-              <td><a href="http://{{ servername }}">{{ servername }}</a></td>
+              <td><a href="http://{{ servername() }}">{{ servername() }}</a></td>
               <td class="text-right">
-                <a href="http://{{ servername }}" class="btn btn-success btn-xs" role="button">Open</a>
+                <a href="http://{{ servername() }}" class="btn btn-success btn-xs" role="button">Open</a>
                 <a href="http://docs.drupalvm.com/en/latest/extras/mysql/#connect-using-adminer" target="_blank" class="btn btn-info btn-xs" role="button">Documentation</a>
               </td>
             </tr>
           {%- endif -%}
         {%- endif %}
         {% if 'mailhog' in installed_extras -%}
-          {% set servername %}{{ vagrant_hostname }}:8025{% endset %}
-          {%- if servername != ":8025" -%}
+          {% macro servername() %}{{ vagrant_hostname }}:8025{% endmacro %}
+          {%- if servername() != ":8025" -%}
             <tr>
               <th>MailHog</th>
-              <td><a href="http://{{ servername }}">{{ servername }}</a></td>
+              <td><a href="http://{{ servername() }}">{{ servername() }}</a></td>
               <td class="text-right">
-                <a href="http://{{ servername }}" class="btn btn-success btn-xs" role="button">Open</a>
+                <a href="http://{{ servername() }}" class="btn btn-success btn-xs" role="button">Open</a>
                 <a href="http://docs.drupalvm.com/en/latest/extras/mailhog/" target="_blank" class="btn btn-info btn-xs" role="button">Documentation</a>
               </td>
             </tr>
           {%- endif -%}
         {%- endif %}
         {% if 'pimpmylog' in installed_extras -%}
-          {% set servername = getServernameFromDocroot(pimpmylog_install_dir) %}
-          {%- if servername -%}
+          {% macro servername() %}{{ getServernameFromDocroot(pimpmylog_install_dir) }}{% endmacro %}
+          {%- if servername() -%}
             <tr>
               <th>PimpMyLog</th>
-              <td><a href="http://{{ servername }}">{{ servername }}</a></td>
+              <td><a href="http://{{ servername() }}">{{ servername() }}</a></td>
               <td class="text-right">
-                <a href="http://{{ servername }}" class="btn btn-success btn-xs" role="button">Open</a>
+                <a href="http://{{ servername() }}" class="btn btn-success btn-xs" role="button">Open</a>
                 <a href="http://docs.drupalvm.com/en/latest/extras/pimpmylog/" target="_blank" class="btn btn-info btn-xs" role="button">Documentation</a>
               </td>
             </tr>
           {%- endif -%}
         {%- endif %}
         {% if 'solr' in installed_extras -%}
-          {% set servername %}{{ vagrant_hostname }}:{{ solr_port }}/solr/{% endset %}
+          {% macro servername() %}{{ vagrant_hostname }}:{{ solr_port }}/solr/{% endmacro %}
           <tr>
             <th>Solr</th>
-            <td><a href="http://{{ servername }}">{{ servername }}</a></td>
+            <td><a href="http://{{ servername() }}">{{ servername() }}</a></td>
             <td class="text-right">
-              <a href="http://{{ servername }}" class="btn btn-success btn-xs" role="button">Open</a>
+              <a href="http://{{ servername() }}" class="btn btn-success btn-xs" role="button">Open</a>
               <a href="http://docs.drupalvm.com/en/latest/extras/solr/" target="_blank" class="btn btn-info btn-xs" role="button">Documentation</a>
             </td>
           </tr>
         {%- endif %}
         {% if 'xhprof' in installed_extras -%}
-          {% set servername = getServernameFromDocroot(php_xhprof_html_dir) %}
-          {%- if servername -%}
+          {% macro servername() %}{{ getServernameFromDocroot(php_xhprof_html_dir) }}{% endmacro %}
+          {%- if servername() -%}
             <tr>
               <th>XHProf</th>
-              <td><a href="http://{{ servername }}">{{ servername }}</a></td>
+              <td><a href="http://{{ servername() }}">{{ servername() }}</a></td>
               <td class="text-right">
-                <a href="http://{{ servername }}" class="btn btn-success btn-xs" role="button">Open</a>
+                <a href="http://{{ servername() }}" class="btn btn-success btn-xs" role="button">Open</a>
                 <a href="http://docs.drupalvm.com/en/latest/extras/xhprof/" target="_blank" class="btn btn-info btn-xs" role="button">Documentation</a>
               </td>
             </tr>

From 8265f232e457d5ab4282c49777d0542a313d84fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Fri, 12 Feb 2016 16:08:16 -0500
Subject: [PATCH 0140/1273] Make the docroot_install_dir variable backwards
 compatible

---
 provisioning/playbook.yml                             |  3 +++
 provisioning/templates/dashboard.html.j2              | 11 +----------
 .../templates/drupalvm-local.aliases.drushrc.php.j2   |  6 ++----
 .../templates/drupalvm.aliases.drushrc.php.j2         |  6 ++----
 provisioning/vars/main.yml                            |  6 ++++++
 5 files changed, 14 insertions(+), 18 deletions(-)
 create mode 100644 provisioning/vars/main.yml

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 763ca31c6..8b6838fb3 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -3,6 +3,7 @@
   become: yes
 
   vars_files:
+    - vars/main.yml
     - ../config.yml
 
   pre_tasks:
@@ -75,7 +76,9 @@
 
     - include: tasks/drush-aliases.yml
     - include: tasks/cron.yml
+
     - include: tasks/dashboard.yml
+      when: dashboard_install_dir is defined
 
     - name: Run configured post-provision shell scripts.
       script: "{{ item }}"
diff --git a/provisioning/templates/dashboard.html.j2 b/provisioning/templates/dashboard.html.j2
index 5512aaade..1dda79a86 100644
--- a/provisioning/templates/dashboard.html.j2
+++ b/provisioning/templates/dashboard.html.j2
@@ -19,15 +19,6 @@
     </style>
   </head>
   <body>
-    {%
-      set devtool_docroots = [
-        adminer_install_dir if 'adminer' in installed_extras else '',
-        php_xhprof_html_dir if 'xhprof' in installed_extras else '',
-        pimpmylog_install_dir if 'pimpmylog' in installed_extras else '',
-        dashboard_install_dir
-      ]
-    %}
-
     {# Returns the hosts server name based on the document root #}
     {%- macro getServernameFromDocroot(path) -%}
       {%- if drupalvm_webserver == 'apache' -%}
@@ -46,7 +37,7 @@
     {%- endmacro -%}
 
     {%- macro printSite(servername, docroot) -%}
-      {%- if docroot not in devtool_docroots -%}
+      {%- if docroot not in _devtool_docroots -%}
         <tr>
           <td><a href="http://{{ servername }}">{{ servername }}</a></td>
           <td><code>{{ docroot }}</code></td>
diff --git a/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2 b/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2
index ea82a09db..2881b49ec 100644
--- a/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2
+++ b/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2
@@ -6,8 +6,6 @@
  * @see example.aliases.drushrc.php.
  */
 
-{% set devtool_docroots = [adminer_install_dir, pimpmylog_install_dir, php_xhprof_html_dir, dashboard_install_dir] %}
-
 {% macro alias(host, root) %}
 $aliases['{{ host }}'] = array(
   'uri' => '{{ host }}',
@@ -18,13 +16,13 @@ $aliases['{{ host }}'] = array(
 
 {%- if drupalvm_webserver == 'apache' -%}
   {%- for vhost in apache_vhosts -%}
-    {%- if vhost.documentroot not in devtool_docroots -%}
+    {%- if vhost.documentroot not in _devtool_docroots -%}
       {{ alias(vhost.servername, vhost.documentroot) }}
     {%- endif -%}
   {%- endfor -%}
 {%- elif drupalvm_webserver == 'nginx' -%}
   {%- for host in nginx_hosts -%}
-    {%- if host.root not in devtool_docroots -%}
+    {%- if host.root not in _devtool_docroots -%}
       {{ alias(host.server_name, host.root) }}
     {%- endif -%}
   {%- endfor -%}
diff --git a/provisioning/templates/drupalvm.aliases.drushrc.php.j2 b/provisioning/templates/drupalvm.aliases.drushrc.php.j2
index 45151b91c..88145c181 100644
--- a/provisioning/templates/drupalvm.aliases.drushrc.php.j2
+++ b/provisioning/templates/drupalvm.aliases.drushrc.php.j2
@@ -6,8 +6,6 @@
  * @see example.aliases.drushrc.php.
  */
 
-{% set devtool_docroots = [adminer_install_dir, pimpmylog_install_dir, php_xhprof_html_dir, dashboard_install_dir] %}
-
 {% macro alias(host, root) %}
 $aliases['{{ host }}'] = array(
   'uri' => '{{ host }}',
@@ -21,13 +19,13 @@ $aliases['{{ host }}'] = array(
 
 {%- if drupalvm_webserver == 'apache' -%}
   {%- for vhost in apache_vhosts -%}
-    {%- if vhost.documentroot not in devtool_docroots -%}
+    {%- if vhost.documentroot not in _devtool_docroots -%}
       {{ alias(vhost.servername, vhost.documentroot) }}
     {%- endif -%}
   {%- endfor -%}
 {%- elif drupalvm_webserver == 'nginx' -%}
   {%- for host in nginx_hosts -%}
-    {%- if host.root not in devtool_docroots -%}
+    {%- if host.root not in _devtool_docroots -%}
       {{ alias(host.server_name, host.root) }}
     {%- endif -%}
   {%- endfor -%}
diff --git a/provisioning/vars/main.yml b/provisioning/vars/main.yml
new file mode 100644
index 000000000..905659ad0
--- /dev/null
+++ b/provisioning/vars/main.yml
@@ -0,0 +1,6 @@
+---
+_devtool_docroots:
+  - "{{ adminer_install_dir }}"
+  - "{{ pimpmylog_install_dir }}"
+  - "{{ php_xhprof_html_dir }}"
+  - "{{ dashboard_install_dir|default('') }}"

From 7d4ff24d2c294b28c827bb3ab78738e552ff6b4f Mon Sep 17 00:00:00 2001
From: "Shawn S. Smiley" <shawn.smiley@achieveinternet.com>
Date: Mon, 15 Feb 2016 19:51:56 -0500
Subject: [PATCH 0141/1273] Add docs about using SSL vhosts

---
 docs/extras/ssl.md | 11 +++++++++++
 mkdocs.yml         |  1 +
 2 files changed, 12 insertions(+)
 create mode 100644 docs/extras/ssl.md

diff --git a/docs/extras/ssl.md b/docs/extras/ssl.md
new file mode 100644
index 000000000..13653ae9e
--- /dev/null
+++ b/docs/extras/ssl.md
@@ -0,0 +1,11 @@
+If you are using Ubuntu as your base OS and you want to get started quickly with a local development environment you can use the snakeoil certificate that is already generated.
+
+```yaml
+apache_vhosts_ssl:
+  - servername: "{{ drupal_domain }}"
+    documentroot: "{{ drupal_core_path }}"
+    certificate_file: "/etc/ssl/certs/ssl-cert-snakeoil.pem"
+    certificate_key_file: "/etc/ssl/private/ssl-cert-snakeoil.key"
+    extra_parameters: |
+          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ drupal_core_path }}"
+```
diff --git a/mkdocs.yml b/mkdocs.yml
index 285442986..cf1c81fed 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -23,6 +23,7 @@ pages:
     - 'Use Varnish with Drupal VM': 'extras/varnish.md'
     - 'Use MariaDB instead of MySQL': 'extras/mariadb.md'
     - 'Use Node.js and NPM': 'extras/nodejs.md'
+    - 'Use SSL vhosts with Apache': 'extras/ssl.md'
     - 'View Logs with Pimp my Log': 'extras/pimpmylog.md'
     - 'Profile Code with XHProf': 'extras/xhprof.md'
     - 'Debug Code with XDebug': 'extras/xdebug.md'

From 491ae5e053365ca0eb7dcda8d40ffa33ed57e9bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Mon, 15 Feb 2016 19:53:03 -0500
Subject: [PATCH 0142/1273] Add SSL docs about generating a certificate for
 CentOS

---
 docs/extras/ssl.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/docs/extras/ssl.md b/docs/extras/ssl.md
index 13653ae9e..709cbae31 100644
--- a/docs/extras/ssl.md
+++ b/docs/extras/ssl.md
@@ -1,3 +1,25 @@
+To enable SSL support for you virtual hosts you first need a certificate file. You can generate a self-signed certificate with a command like
+
+    openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout example.key -out example.crt
+
+Place the files in your project directory and add the following to your `config.yml`.
+
+```yaml
+apache_vhosts_ssl:
+  - servername: "{{ drupal_domain }}"
+    documentroot: "{{ drupal_core_path }}"
+    certificate_file: "/vagrant/example.crt"
+    certificate_key_file: "/vagrant/example.key"
+    extra_parameters: |
+          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ drupal_core_path }}"
+```
+
+_If you're using an actual production certificate you should of course **NOT** track it in git but transfer it to the VM before running `vagrant provision`_
+
+For a list of all configuration options see the [`geerlingguy.apache` Ansible role's README](https://github.com/geerlingguy/ansible-role-apache#readme).
+
+### Using Ubuntu's snakeoil certificate
+
 If you are using Ubuntu as your base OS and you want to get started quickly with a local development environment you can use the snakeoil certificate that is already generated.
 
 ```yaml

From 2f08088f5b9094f5876f28b74aa8fc6cd382646d Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 16 Feb 2016 11:07:03 -0600
Subject: [PATCH 0143/1273] Fixes #352 and Fixes #440: Update docs on tools
 that integrate with Drupal VM.

---
 docs/other/cloning-with-newd.md | 15 ---------
 docs/other/management-tools.md  | 59 +++++++++++++++++++++++++++++++++
 mkdocs.yml                      |  2 +-
 3 files changed, 60 insertions(+), 16 deletions(-)
 delete mode 100644 docs/other/cloning-with-newd.md
 create mode 100644 docs/other/management-tools.md

diff --git a/docs/other/cloning-with-newd.md b/docs/other/cloning-with-newd.md
deleted file mode 100644
index 286b8f835..000000000
--- a/docs/other/cloning-with-newd.md
+++ /dev/null
@@ -1,15 +0,0 @@
-[@rgoodie](https://github.com/rgoodie) created a function called `newd` that clones this repo, uses `sed` to change configuration to Drupal 7 if desired, renames the VM to something other than drupalvm.dev, and kicks off `vagrant up`.
-
-Example:
-
-```
-# Create a new Drupal VM named 'test-fieldformatter' with Drupal 7.
-$ newd 7 test-fieldformatter
-
-# Create a new Drupal VM named 'drupal8test' with Drupal 8.
-$ newd 8 drupal8test
-```
-
-The source code for this new bash function (you could add it to your own `.bash_profile` or `.profile`) is located [in this gist](https://gist.github.com/rgoodie/9966f30b404a4daa59e1).
-
-Do you have your own wrapper script or other helpers to help you manage instances of Drupal VM? Please share it on this page!
\ No newline at end of file
diff --git a/docs/other/management-tools.md b/docs/other/management-tools.md
new file mode 100644
index 000000000..14e7d5c4d
--- /dev/null
+++ b/docs/other/management-tools.md
@@ -0,0 +1,59 @@
+There are some upstream tools which aid in the creation and management of Drupal VM instances. Some of the more popular tools are listed here.
+
+If you know of any other tools to help manage Drupal VM, please add them to this page!
+
+## Lunchbox
+
+[Lunchbox](https://github.com/LunchboxDevTools/lunchbox) is a wrapper for the Drupal VM project to manage your Drupal development process. It is a Node.js-based GUI to assist in setting up Drupal VM and creating and managing instances.
+
+## Drupal VM Config Generator
+
+[Drupal VM Config Generator](https://github.com/opdavies/drupal-vm-config-generator) is a Symfony Console application that manages and customises configuration files for Drupal VM projects.
+
+You can either use the interactive console UI to build configurations, or pass options directly to the `drupalvm-generate` command.
+
+Examples:
+
+```
+drupalvm-generate \
+  --hostname=example.com \
+  --machine-name=example \
+  --ip-address=192.168.88.88 \
+  --cpus=1 \
+  --memory=512 \
+  --webserver=nginx \
+  --domain=example.com \
+  --path=../site \
+  --destination=/var/www/site \
+  --docroot=/var/www/site/drupal \
+  --drupal-version=8 \
+  --build-makefile=no \
+  --install-site=true \
+  --installed-extras=xdebug,xhprof \
+  --force
+```
+
+## Drupal VM Generator
+
+[generator-drupalvm](https://github.com/kevinquillen/generator-drupalvm) is a Yeoman generator for quickly spawning configured VMs or new projects using Drupal VM.
+
+Examples:
+
+```
+# Generate a new Drupal VM instance in the current directory.
+$ yo drupalvm
+```
+
+## Newd
+
+[`newd`](https://gist.github.com/rgoodie/9966f30b404a4daa59e1) is a bash function that quickly clones the Drupal VM repo wherever you need it, configures important bits, and then kicks off `vagrant up`.
+
+Examples:
+
+```
+# Create a new Drupal VM named 'test-fieldformatter' with Drupal 7.
+$ newd 7 test-fieldformatter
+
+# Create a new Drupal VM named 'drupal8test' with Drupal 8.
+$ newd 8 drupal8test
+```
diff --git a/mkdocs.yml b/mkdocs.yml
index 285442986..083e69937 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -34,9 +34,9 @@ pages:
     - 'Using Different Webservers': 'other/webservers.md'
     - 'Using a local Vagrantfile': 'other/local-vagrantfile.md'
     - 'PHP 7 on Drupal VM': 'other/php-7.md'
+    - 'Drupal VM Management Tools': 'other/management-tools.md'
     - 'Networking Notes': 'other/networking.md'
     - 'Drupal 6 Notes': 'other/drupal-6.md'
     - 'Linux Notes': 'other/linux.md'
     - 'Windows Notes': 'other/windows.md'
-    - 'Cloning Drupal VM with newd': 'other/cloning-with-newd.md'
     - 'Vagrant and VirtualBox Tips': 'other/vagrant-virtualbox.md'

From de7f1417edd1f35310b08471bb979ad40abb3592 Mon Sep 17 00:00:00 2001
From: Frank Anderson <frobdfas@gmail.com>
Date: Wed, 17 Feb 2016 14:41:53 -0800
Subject: [PATCH 0144/1273] Update example.config.yml

Added version numbers to the nodejs version description. To stem confusion from #417
---
 example.config.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/example.config.yml b/example.config.yml
index f04ed951b..96829a786 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -161,7 +161,11 @@ installed_extras:
 extra_packages:
   - unzip
 
-# `nodejs` must be in installed_extras for this to work.
+# `nodejs` must be in installed_extras for this to work. This currently only 
+# runs on the initial provision. If the version needs to chanage 'nvm' will need
+# to be installed and configured manually.
+# The nodejs role uses the Nodesource binary sources 
+# 4.x, 5.x, 0.12, or 0.10 are acceptable versions.
 nodejs_version: "0.12"
 nodejs_npm_global_packages: []
 

From bdbfe00140713e933f21d672530779eb042a475c Mon Sep 17 00:00:00 2001
From: Frank Anderson <frobdfas@gmail.com>
Date: Wed, 17 Feb 2016 14:58:17 -0800
Subject: [PATCH 0145/1273] Update example.config.yml

---
 example.config.yml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/example.config.yml b/example.config.yml
index 96829a786..292f95300 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -161,11 +161,8 @@ installed_extras:
 extra_packages:
   - unzip
 
-# `nodejs` must be in installed_extras for this to work. This currently only 
-# runs on the initial provision. If the version needs to chanage 'nvm' will need
-# to be installed and configured manually.
-# The nodejs role uses the Nodesource binary sources 
-# 4.x, 5.x, 0.12, or 0.10 are acceptable versions.
+# `nodejs` must be in installed_extras for this to work. Valid examples: "0.10",
+# "0.12", "4.x", "5.x".
 nodejs_version: "0.12"
 nodejs_npm_global_packages: []
 

From 4599d02b5dbadc30545b1229f2acfb68d59e9ec4 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 17 Feb 2016 23:59:12 -0600
Subject: [PATCH 0146/1273] Fixes #445: Switch back to JJG-Ansible-Windows to
 stop the bleeding.

---
 Vagrantfile                                 | 15 +++--
 provisioning/JJG-Ansible-Windows/LICENSE    | 20 +++++++
 provisioning/JJG-Ansible-Windows/README.md  | 42 +++++++++++++
 provisioning/JJG-Ansible-Windows/windows.sh | 66 +++++++++++++++++++++
 4 files changed, 139 insertions(+), 4 deletions(-)
 create mode 100755 provisioning/JJG-Ansible-Windows/LICENSE
 create mode 100755 provisioning/JJG-Ansible-Windows/README.md
 create mode 100755 provisioning/JJG-Ansible-Windows/windows.sh

diff --git a/Vagrantfile b/Vagrantfile
index 2a1995986..76bc87fde 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -104,17 +104,24 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # Allow override of the default synced folder type.
   config.vm.synced_folder ".", "/vagrant", type: vconfig.include?('vagrant_synced_folder_default_type') ? vconfig['vagrant_default_synced_folder_type'] : 'nfs'
 
-  # Provisioning. Use ansible if it's installed on host, ansible_local if not.
+  # Provisioning. Use ansible if it's installed, JJG-Ansible-Windows if not.
   if which('ansible-playbook')
     config.vm.provision "ansible" do |ansible|
       ansible.playbook = "#{dir}/provisioning/playbook.yml"
     end
   else
-    config.vm.provision "ansible_local" do |ansible|
-      ansible.playbook = "provisioning/playbook.yml"
-      ansible.galaxy_role_file = "provisioning/requirements.yml"
+    config.vm.provision "shell" do |sh|
+      sh.path = "#{dir}/provisioning/JJG-Ansible-Windows/windows.sh"
+      sh.args = "/provisioning/playbook.yml"
     end
   end
+  # ansible_local provisioner is broken in Vagrant < 1.8.2.
+  # else
+  #   config.vm.provision "ansible_local" do |ansible|
+  #     ansible.playbook = "provisioning/playbook.yml"
+  #     ansible.galaxy_role_file = "provisioning/requirements.yml"
+  #   end
+  # end
 
   # VMware Fusion.
   config.vm.provider :vmware_fusion do |v, override|
diff --git a/provisioning/JJG-Ansible-Windows/LICENSE b/provisioning/JJG-Ansible-Windows/LICENSE
new file mode 100755
index 000000000..378188abb
--- /dev/null
+++ b/provisioning/JJG-Ansible-Windows/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Jeff Geerling
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/provisioning/JJG-Ansible-Windows/README.md b/provisioning/JJG-Ansible-Windows/README.md
new file mode 100755
index 000000000..c64b4a664
--- /dev/null
+++ b/provisioning/JJG-Ansible-Windows/README.md
@@ -0,0 +1,42 @@
+# JJG-Ansible-Windows
+
+> **Important Note**: Vagrant now includes an [`ansible_local` provisioner](https://docs.vagrantup.com/v2/provisioning/ansible_local.html), which provides a much more reliable Ansible provisioning experience within a Vagrant VM. This project will likely no longer be updated for use beyond Vagrant 1.7.x.
+
+Windows shell provisioning script to bootstrap Ansible from within a Vagrant VM running on Windows.
+
+This script is configured to use configure any Linux-based VM (Debian, Ubuntu, Fedora, RedHat, CentOS, etc.) so it can run Ansible playbooks from within the VM through Vagrant.
+
+Read more about this script, and other techniques for using Ansible within a Windows environment, on Server Check.in: [Running Ansible within Windows](https://servercheck.in/blog/running-ansible-within-windows).
+
+## Usage
+
+In your Vagrantfile, use a conditional provisioning statement if you want to use this script (which runs Ansible from within the VM instead of on your host—this example assumes your playbook is inside within a 'provisioning' folder, and this script is within provisioning/JJG-Ansible-Windows):
+
+```ruby
+# Use rbconfig to determine if we're on a windows host or not.
+require 'rbconfig'
+is_windows = (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
+if is_windows
+  # Provisioning configuration for shell script.
+  config.vm.provision "shell" do |sh|
+    sh.path = "provisioning/JJG-Ansible-Windows/windows.sh"
+    sh.args = "provisioning/playbook.yml"
+  end
+else
+  # Provisioning configuration for Ansible (for Mac/Linux hosts).
+  config.vm.provision "ansible" do |ansible|
+    ansible.playbook = "provisioning/playbook.yml"
+    ansible.sudo = true
+  end
+end
+```
+
+Note that the `windows.sh` script will run within the VM and will run the given playbook against localhost with `--connection=local` inside the VM. You shouldn't/can't pass a custom inventory file to the script, as you can using Vagrant's Ansible provisioner.
+
+### Role Requirements File
+
+If your playbook requires roles to be installed which are not present in a `roles` directory within the playbook's directory, then you should add the roles to a [role requirements](http://docs.ansible.com/galaxy.html#advanced-control-over-role-requirements-files) file. Place the resulting `requirements.txt` or `requirements.yml` file in the same directory as your playbook, and the roles will be installed automatically.
+
+## Licensing and More Info
+
+Created by [Jeff Geerling](http://jeffgeerling.com/) in 2014. Licensed under the MIT license; see the LICENSE file for more info.
diff --git a/provisioning/JJG-Ansible-Windows/windows.sh b/provisioning/JJG-Ansible-Windows/windows.sh
new file mode 100755
index 000000000..c8a375af0
--- /dev/null
+++ b/provisioning/JJG-Ansible-Windows/windows.sh
@@ -0,0 +1,66 @@
+#!/bin/bash
+#
+# Windows shell provisioner for Ansible playbooks, based on KSid's
+# windows-vagrant-ansible: https://github.com/KSid/windows-vagrant-ansible
+#
+# @see README.md
+# @author Jeff Geerling, 2014
+
+# Uncomment if behind a proxy server.
+# export {http,https,ftp}_proxy='http://username:password@proxy-host:80'
+
+ANSIBLE_PLAYBOOK=$1
+PLAYBOOK_DIR=${ANSIBLE_PLAYBOOK%/*}
+
+# Detect package management system.
+YUM=$(which yum 2>/dev/null)
+APT_GET=$(which apt-get 2>/dev/null)
+
+# Make sure Ansible playbook exists.
+if [ ! -f "/vagrant/$ANSIBLE_PLAYBOOK" ]; then
+  echo "Cannot find Ansible playbook."
+  exit 1
+fi
+
+# Install Ansible and its dependencies if it's not installed already.
+if ! command -v ansible >/dev/null; then
+  echo "Installing Ansible dependencies and Git."
+  if [[ ! -z ${YUM} ]]; then
+    yum install -y git python python-devel
+  elif [[ ! -z ${APT_GET} ]]; then
+    apt-get update
+    apt-get install -y git python python-dev
+  else
+    echo "Neither yum nor apt-get are available."
+    exit 1;
+  fi
+
+  echo "Installing pip via easy_install."
+  wget https://raw.githubusercontent.com/ActiveState/ez_setup/v0.9/ez_setup.py
+  python ez_setup.py && rm -f ez_setup.py
+  easy_install pip
+
+  # Make sure setuptools are installed crrectly.
+  pip install setuptools --no-use-wheel --upgrade
+
+  # Install GCC / required build tools.
+  if [[ ! -z $YUM ]]; then
+    yum install -y gcc
+  elif [[ ! -z $APT_GET ]]; then
+    apt-get install -y build-essential
+  fi
+
+  echo "Installing required python modules."
+  pip install paramiko pyyaml jinja2 markupsafe
+
+  echo "Installing Ansible."
+  pip install ansible
+fi
+
+# Install requirements.
+echo "Installing Ansible roles from requirements file, if available."
+find "/vagrant/$PLAYBOOK_DIR" \( -name "requirements.yml" -o -name "requirements.txt" \) -exec sudo ansible-galaxy install --ignore-errors -r {} \;
+
+# Run the playbook.
+echo "Running Ansible provisioner defined in Vagrantfile."
+ansible-playbook -i 'localhost,' "/vagrant/${ANSIBLE_PLAYBOOK}" --extra-vars "is_windows=true" --connection=local

From ec96163cb057fe7a5cba3306fa09f2c2f302a3dc Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 18 Feb 2016 00:00:33 -0600
Subject: [PATCH 0147/1273] PR #396 Follow-up to fix Vagrant version.

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

diff --git a/README.md b/README.md
index 38f0434a4..8c541eaa3 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ Note for Faster Provisioning (Mac/Linux only): *[Install Ansible](http://docs.an
 
 Note for Linux users: *If NFS is not already installed on your host, you will need to install it to use the default NFS synced folder configuration. See guides for [Debian/Ubuntu](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-ubuntu-14-04), [Arch](https://wiki.archlinux.org/index.php/NFS#Installation), and [RHEL/CentOS](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-centos-6).*
 
-Note on versions: *Please make sure you're running the latest stable version of Vagrant, VirtualBox, and Ansible, as the current version of Drupal VM is tested with the latest releases. As of February 2016: Vagrant 1.8.2, VirtualBox 5.0.14, and Ansible 2.0.0.*
+Note on versions: *Please make sure you're running the latest stable version of Vagrant, VirtualBox, and Ansible, as the current version of Drupal VM is tested with the latest releases. As of February 2016: Vagrant 1.8.1, VirtualBox 5.0.14, and Ansible 2.0.0.*
 
 ### 2 - Build the Virtual Machine
 

From 4608c2eea02bbb271a303c6728e14d15298bd9c1 Mon Sep 17 00:00:00 2001
From: Jeroen van de Schraaf <jvdschraaf@ibuildings.nl>
Date: Thu, 18 Feb 2016 13:34:34 +0100
Subject: [PATCH 0148/1273] Add support for vagrant-hostmanager plugin.

---
 Vagrantfile | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 76bc87fde..686a9576b 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -63,25 +63,30 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # Vagrant box.
   config.vm.box = vconfig['vagrant_box']
 
-  # If hostsupdater plugin is installed, add all server names as aliases.
-  if Vagrant.has_plugin?("vagrant-hostsupdater")
-    aliases = []
-    blacklist = [config.vm.hostname, vconfig['vagrant_ip']]
-    if vconfig['drupalvm_webserver'] == "apache"
-      vconfig['apache_vhosts'].each do |host|
-        unless blacklist.include?(host['servername'])
-          aliases.push(host['servername'])
-        end
-        aliases.concat(host['serveralias'].split()) if host['serveralias']
+  # If a hostsfile manager plugin is installed, add all server names as aliases.
+  aliases = []
+  blacklist = [config.vm.hostname, vconfig['vagrant_ip']]
+  if vconfig['drupalvm_webserver'] == "apache"
+    vconfig['apache_vhosts'].each do |host|
+      unless blacklist.include?(host['servername'])
+        aliases.push(host['servername'])
       end
-    else
-      vconfig['nginx_hosts'].each do |host|
-        unless blacklist.include?(host['server_name'])
-          aliases.push(host['server_name'])
-        end
+      aliases.concat(host['serveralias'].split()) if host['serveralias']
+    end
+  else
+    vconfig['nginx_hosts'].each do |host|
+      unless blacklist.include?(host['server_name'])
+        aliases.push(host['server_name'])
       end
     end
+  end
+
+  if Vagrant.has_plugin?("vagrant-hostsupdater")
     config.hostsupdater.aliases = aliases.uniq
+  elsif Vagrant.has_plugin?("vagrant-hostmanager")
+    config.hostmanager.enabled = true
+    config.hostmanager.manage_host = true
+    config.hostmanager.aliases = aliases.uniq
   end
 
   # Synced folders.

From c778ab383da4039de924531f5ef93d4af23fac50 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 18 Feb 2016 09:54:12 -0600
Subject: [PATCH 0149/1273] PR #453 and Issue #451: Document support for
 vagrant-hostmanager plugin.

---
 README.md                                | 2 +-
 docs/other/windows.md                    | 2 +-
 provisioning/templates/dashboard.html.j2 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 8c541eaa3..ed616bb87 100644
--- a/README.md
+++ b/README.md
@@ -79,7 +79,7 @@ Note: *If there are any errors during the course of running `vagrant up`, and it
 ### 3 - Configure your host machine to access the VM.
 
   1. [Edit your hosts file](http://www.rackspace.com/knowledge_center/article/how-do-i-modify-my-hosts-file), adding the line `192.168.88.88  drupalvm.dev` so you can connect to the VM.
-    - You can have Vagrant automatically configure your hosts file if you install the `hostsupdater` plugin (`vagrant plugin install vagrant-hostsupdater`). All hosts defined in `apache_vhosts` or `nginx_hosts` will be automatically managed.
+    - You can have Vagrant automatically configure your hosts file if you install the `hostsupdater` plugin (`vagrant plugin install vagrant-hostsupdater`). All hosts defined in `apache_vhosts` or `nginx_hosts` will be automatically managed. The `vagrant-hostmanager` plugin is also supported.
     - You can also have Vagrant automatically assign an available IP address to your VM if you install the `auto_network` plugin (`vagrant plugin install vagrant-auto_network`), and set `vagrant_ip` to `0.0.0.0` inside `config.yml`.
   2. Open your browser and access [http://drupalvm.dev/](http://drupalvm.dev/). The default login for the admin account is `admin` for both the username and password.
 
diff --git a/docs/other/windows.md b/docs/other/windows.md
index ee4b4d2ac..0bb6f9381 100644
--- a/docs/other/windows.md
+++ b/docs/other/windows.md
@@ -47,7 +47,7 @@ If you are running Windows 7 and `vagrant up` hangs, you may need to upgrade Pow
 
 ## Hosts file updates
 
-If you install the `vagrant-hostsupdater` plugin, you might get a permissions error when Vagrant tries changing the hosts file. On a Mac or Linux workstation, you're prompted for a sudo password so the change can be made, but on Windows, you have to do one of the following to make sure hostsupdater works correctly:
+If you install either the `vagrant-hostsupdater` or `vagrant-hostmanager` plugin, you might get a permissions error when Vagrant tries changing the hosts file. On a Mac or Linux workstation, you're prompted for a sudo password so the change can be made, but on Windows, you have to do one of the following to make sure hostsupdater works correctly:
 
   1. Run PowerShell or whatever CLI you use with Vagrant as an administrator. Right click on the application and select 'Run as administrator', then proceed with `vagrant` commands as normal.
   2. Change the permissions on the hosts file so anyone can edit the file (this has security implications, so it's best to use option 1 unless you know what you're doing).
diff --git a/provisioning/templates/dashboard.html.j2 b/provisioning/templates/dashboard.html.j2
index 1dda79a86..22cec2245 100644
--- a/provisioning/templates/dashboard.html.j2
+++ b/provisioning/templates/dashboard.html.j2
@@ -257,7 +257,7 @@
                 <section class="well small">
                   {{ sectionHost() }}
                 </section>
-                <small>Unless you're using the <a href="https://github.com/cogitatio/vagrant-hostsupdater" target="_blank">vagrant-hostsupdater</a> plugin, add the following to your host machine's hosts file.</small>
+                <small>Unless you're using the <a href="https://github.com/cogitatio/vagrant-hostsupdater" target="_blank">vagrant-hostsupdater</a> or <a href="https://github.com/smdahlen/vagrant-hostmanager" target="_blank">vagrant-hostmanager</a> plugin, add the lines above to your host machine's hosts file.</small>
               </div>
             </div>
           </section>

From 8802b9a5186df5873aa5826642dd8cff42970c3a Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 18 Feb 2016 10:31:23 -0600
Subject: [PATCH 0150/1273] Fixes #451: Link dashboard page logo to
 drupalvm.com.

---
 provisioning/templates/dashboard.html.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/templates/dashboard.html.j2 b/provisioning/templates/dashboard.html.j2
index 22cec2245..15fa52f9e 100644
--- a/provisioning/templates/dashboard.html.j2
+++ b/provisioning/templates/dashboard.html.j2
@@ -247,7 +247,7 @@
           <section class="jumbotron">
             <div class="row">
               <div class="col-md-7 text-center">
-                <img src="http://docs.drupalvm.com/en/latest/images/drupal-vm-logo.png" alt="Drupal VM" title="Welcome to Drupal VM">
+                <a href="http://www.drupalvm.com/"><img src="http://docs.drupalvm.com/en/latest/images/drupal-vm-logo.png" alt="Drupal VM" title="Welcome to Drupal VM"></a>
                 <p><a href="https://github.com/geerlingguy/drupal-vm">Drupal VM</a> is a VM for local Drupal development, built with Vagrant + Ansible.</p>
                 <p><a class="btn btn-primary btn-lg" href="http://docs.drupalvm.com/en/latest/" role="button">Read the documentation</a></p>
               </div>

From 5cc51fb7a00fc5543a9e14d8dfe96d095197d51f Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 19 Feb 2016 12:02:05 -0600
Subject: [PATCH 0151/1273] Fixes #433: Add alternative WinNFSD documentation
 and mention Cmder.

---
 docs/other/windows.md | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/docs/other/windows.md b/docs/other/windows.md
index 0bb6f9381..d54e5bdc4 100644
--- a/docs/other/windows.md
+++ b/docs/other/windows.md
@@ -1,5 +1,12 @@
 There are a few caveats when using Drupal VM on Windows, and this page will try to identify the main gotchas or optimization tips for those wishing to use Drupal VM on a Windows host.
 
+## Command line environment
+
+You can use PowerShell, Git Bash, Git Shell, or other PowerShell-based environments with Drupal VM and Vagrant; however you might want to consider using a more POSIX-like environment so you can more easily work with Drupal VM:
+
+  - [Cmder](http://cmder.net/) includes built-in git and SSH support, so you can do most things that you need without any additional plugins.
+  - [Cygwin](https://www.cygwin.com/) allows you to install a large variety of linux packages inside its bash environment, though it can be a little more tricky to manage and is less integrated into the Windows environment.
+
 ## Synced Folders
 
 Most issues have to do synced folders. These are the most common ones:
@@ -10,7 +17,7 @@ By default, if you use the 'NFS' synced folder type, Vagrant will ignore this di
 
   1. **Install the `vagrant-winnfsd` plugin**. See the 'NFS' section later for more details and caveats.
   2. **Use `smb` for the synced folder's type.**
-  2. **Use `rsync` for the synced folder's type.** This requires that you have `rsync` available on your Windows workstation, which you can get if you install a substitute CLI like [Cygwin](https://www.cygwin.com/).
+  2. **Use `rsync` for the synced folder's type.** This requires that you have `rsync` available on your Windows workstation, which you can get if you install a substitute CLI like [Cygwin](https://www.cygwin.com/) or [Cmder](http://cmder.net/).
 
 ### Symbolic Links
 
@@ -33,6 +40,10 @@ You should probably disable Git's `fileMode` option inside the VM and on your ho
 
 You can use the [vagrant-winnfsd](https://github.com/GM-Alex/vagrant-winnfsd) plugin to get NFS support on windows. Be aware that there are multiple issues logged against both the plugin and the winnfsd project, so no guarantees.
 
+#### Using WinNFSD without `vagrant-winnfsd`
+
+Another option for the more adventurous is to manually install and configure WinNFSD, and manually mount the shares within your VM. This requires a bit more work, but could be more stable on Windows; see this blog post for more details: [Windows + Vagrant + WinNFSD without file update problems](https://hollyit.net/blog/windowsvagrantwinnfsd-without-file-update-problems).
+
 ### "Authentication failure" on vagrant up
 
 Some Windows users have reported running into an issue where an authentication failure is reported once the VM is booted (e.g. `drupalvm: Warning: Authentication failure. Retrying...` — see [#170](https://github.com/geerlingguy/drupal-vm/issues/170)). To fix this, do the following:
@@ -50,7 +61,7 @@ If you are running Windows 7 and `vagrant up` hangs, you may need to upgrade Pow
 If you install either the `vagrant-hostsupdater` or `vagrant-hostmanager` plugin, you might get a permissions error when Vagrant tries changing the hosts file. On a Mac or Linux workstation, you're prompted for a sudo password so the change can be made, but on Windows, you have to do one of the following to make sure hostsupdater works correctly:
 
   1. Run PowerShell or whatever CLI you use with Vagrant as an administrator. Right click on the application and select 'Run as administrator', then proceed with `vagrant` commands as normal.
-  2. Change the permissions on the hosts file so anyone can edit the file (this has security implications, so it's best to use option 1 unless you know what you're doing).
+  2. Change the permissions on the hosts file so your account has permission to edit the file (this has security implications, so it's best to use option 1 unless you know what you're doing). To do this, open `%SystemRoot%\system32\drivers\etc` in Windows Explorer, right-click the `hosts` file, and under Security, add your account and give yourself full access to the file.
 
 ## Intel VT-x virtualization support
 

From 532ccf77a2354ae249c00c4c9b87434e82809623 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 19 Feb 2016 12:16:05 -0600
Subject: [PATCH 0152/1273] Fixes #454: Add minimum system requirements.

---
 README.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/README.md b/README.md
index ed616bb87..21b90d26a 100644
--- a/README.md
+++ b/README.md
@@ -108,6 +108,16 @@ If you don't want or need one or more of these extras, just delete them or comme
 
 Drupal VM is built to integrate with every developer's workflow. Many guides for using Drupal VM for common development tasks are available on the [Drupal VM documentation site](http://docs.drupalvm.com).
 
+## System Requirements
+
+Drupal VM runs on almost any modern computer that can run VirtualBox and Vagrant, however for the best out-of-the-box experience, it's recommended you have a computer with at least:
+
+  - Intel Core i5, i7 or better processor
+  - At least 4 GB RAM (higher is better)
+  - An SSD (for greater speed with synced folders)
+
+If you have an older processor or a processor without VT-x virtualization support (e.g. the i3), you can still use Drupal VM, but you will need to switch the `vagrant_box` in `config.yml` to use a 3rd party 32-bit box, like `ubuntu/trusty32` or `hashicorp/precise32`.
+
 ## Other Notes
 
   - To shut down the virtual machine, enter `vagrant halt` in the Terminal in the same folder that has the `Vagrantfile`. To destroy it completely (if you want to save a little disk space, or want to rebuild it from scratch with `vagrant up` again), type in `vagrant destroy`.

From e9c5cefd32cdff73e021c21929e38591294e8759 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 20 Feb 2016 22:37:06 -0600
Subject: [PATCH 0153/1273] Fixes #84: Make Drupal VM prod-ready (with a
 DigitalOcean guide).

---
 .gitignore                               |  1 +
 examples/prod/README.md                  | 55 ++++++++++++++++++------
 examples/prod/bootstrap/example.vars.yml | 15 +++++++
 examples/prod/bootstrap/init.yml         | 30 +++++++++++++
 examples/prod/example.inventory          |  2 +-
 examples/prod/prod.overrides.yml         |  7 ++-
 provisioning/tasks/build-makefile.yml    | 11 ++++-
 7 files changed, 103 insertions(+), 18 deletions(-)
 create mode 100644 examples/prod/bootstrap/example.vars.yml
 create mode 100644 examples/prod/bootstrap/init.yml

diff --git a/.gitignore b/.gitignore
index b48a04283..c864bfad7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,5 +8,6 @@ config.yml
 drupal.make.yml
 Vagrantfile.local
 examples/prod/inventory
+examples/prod/bootstrap/vars.yml
 scripts/
 roles/
diff --git a/examples/prod/README.md b/examples/prod/README.md
index cb31e308e..71a8bd413 100644
--- a/examples/prod/README.md
+++ b/examples/prod/README.md
@@ -1,10 +1,12 @@
 # Drupal VM Production Configuration Example
 
+> **Important**: This feature is currently in 'experimental' status, and the security of your servers is _your_ responsibility.
+
 This directory contains an example production configuration for Drupal VM which can be used to deploy Drupal VM to a production environment on a cloud provider like DigitalOcean, Linode, or AWS.
 
-This README file contains instructions for how you can use this configuration file to build a Drupal environment on DigitalOcean.
+This README file contains instructions for how you can use this configuration file to build a Drupal environment with Drupal VM on DigitalOcean.
 
-## Creating a DigitalOcean Droplet
+## Create a DigitalOcean Droplet
 
 If you don't already have a DigitalOcean account, create one (you can use geerlingguy's [affiliate link](https://www.digitalocean.com/?refcode=b9c57af84643) to sign up, otherwise, visit the normal [DigitalOcean Sign Up form](https://cloud.digitalocean.com/registrations/new).
 
@@ -12,24 +14,24 @@ Make sure you have an SSH key you can use to connect to your DigitalOcean drople
 
 Once you are logged into DigitalOcean and have added your SSH key, click the 'Create Droplet' button on your Droplets page. For the Droplet, choose the following options:
 
-  - **Hostname**: Choose a hostname for your site (e.g. `example.drupalvm.com`)
+  - **Image**: Choose `Ubuntu 14.04.x x64`
   - **Size**: 1 GB / 1 CPU (currently $10/month; you can choose a higher plan if needed)
   - **Region**: Choose whatever region is geographically nearest to you and your site visitors
   - **Settings**: (Nothing here affects how Drupal VM works, choose what you'd like)
-  - **Image**: Choose `Ubuntu 14.04 x64`
   - **Add SSH Keys**: Select the SSH key you added to your account earlier.
+  - **Hostname**: Choose a hostname for your site (e.g. `example.drupalvm.com`)
 
 Click 'Create Droplet', and wait a minute or so while the Droplet is booted. Once it's booted, make sure you can log into it from your local computer:
 
-    ssh root@[droplet-hostname]
+    ssh root@[droplet-hostname-or-ip]
 
-(Make sure you replace `[droplet-hostname]`) with the hostname or IP address of your Droplet!)
+(Make sure you replace `[droplet-hostname-or-ip]`) with the hostname or IP address of your Droplet!)
 
 If you get a warning like "the authenticity of the host can't be established", answer yes to the prompt and hit enter. You should now be logged into the Droplet. Log back out by typing `exit` at the prompt and hitting return.
 
 Your DigitalOcean Droplet is booted and ready to have Drupal VM installed on it.
 
-## Customizing `config.yml` and `inventory` for production
+## Customize `config.yml` and `inventory` for production
 
 Just like you would with the normal `example.config.yml`, you need to copy the file to `config.yml`, then go through `prod.overrides.yml` (in this directory), and make sure to update your `config.yml`, making sure all the variables are set to match `prod.overrides.yml`.
 
@@ -38,18 +40,43 @@ The changes outlined in `prod.overrides.yml` disable development-environment too
 The only other thing you need to do is copy the inventory file `example.inventory` to `inventory` (so it is located at `prod/inventory`). By default, it reads:
 
     [drupalvm]
-    1.2.3.4 ansible_ssh_user=root
+    1.2.3.4 ansible_ssh_user=my_admin_username
+
+Change the host `1.2.3.4` to either the IP address or the hostname of your DigitalOcean Droplet. Remember that if you would like to use a hostname, you need to make sure the hostname actually resolves to your Droplet's IP address, either in your domain's public DNS configuration, or via your local hosts file.
+
+## Initialize the server with an administrative account
+
+> Note: This guide assumes you have Ansible [installed](http://docs.ansible.com/ansible/intro_installation.html) on your host machine.
+
+The first step in setting up Drupal VM on the cloud server is to initialize the server with an administrative account (which is separate from the `root` user account for better security).
 
-Change the host `1.2.3.4` to either the IP address or the hostname of your DigitalOcean Droplet. Remember that if you would like to use a hostname, you need to make sure that hostname actually resolves to your Droplet's IP address, either in your domain's public DNS configuration, or via your local hosts file.
+Inside the `examples/prod/bootstrap` folder, copy the `example.vars.yml` file to `vars.yml` and update the variables in that file for your own administrative account (make sure especially to update the `admin_password` value!).
 
-## Provisioning Drupal VM on the Droplet
+Then, run the following command within Drupal VM's root directory (the folder containing the `Vagrantfile`):
 
-Run the following command within this project's root directory (the folder containing the `Vagrantfile`):
+    ansible-playbook -i examples/prod/inventory examples/prod/bootstrap/init.yml -e "ansible_ssh_user=root"
 
-    ansible-playbook -i examples/prod/inventory provisioning/playbook.yml --sudo
+Once the initialization is complete, you can test your new admin login with `ssh my_admin_username@droplet-hostname-or-ip`. You should be logged in via your existing SSH key. Log back out with `exit`.
+
+## Provision Drupal VM on the Droplet
+
+Run the following command within Drupal VM's root directory (the folder containing the `Vagrantfile`):
+
+    ansible-playbook -i examples/prod/inventory provisioning/playbook.yml --sudo --ask-sudo-pass
+
+Ansible will prompt you for your admin account's `sudo` password (the same as the password you encrypted and saved as `admin_password`). Enter it and press return.
 
 After a few minutes, your Drupal-VM-in-the-cloud Droplet should be fully configured to match your local development environment! You can visit your Droplet and access the fresh Drupal site just like you would locally (e.g. `http://example.drupalvm.com/`).
 
-## Going Further
+## Known issues
+
+  - The `files` folder that is generated during the initial Drupal installation is set to be owned by the admin account; to make it work (and to allow Drupal to generate stylesheets and files correctly), you have to manually log into the server and run `sudo chown -R www-data:www-data /var/www/drupalvm/drupal/sites/default/files` after initial provisioning is complete.
+  - You can't synchronize folders between your host machine and DigitalOcean (at least not in any sane way); so you'll need to either have Drupal VM install a site from a given Drush make file or composer.json, or deploy your site yourself.
+  - The way you build a production Drupal VM instance (vs. a local instance) is a little bit of a kludge. Follow https://github.com/geerlingguy/drupal-vm/issues/455 to track progress on a more streamlined process.
+  - Drupal VM doesn't include any kind of backup system. You should use one if you have any kind of important data on your server!
+
+## Go Further
+
+You can use Ubuntu 12.04, Ubuntu 14.04, CentOS 6 or CentOS 7 when you build the DigitalOcean Droplet. Just like with Drupal VM running locally, you can customize almost every aspect of the server!
 
-You may want to customize your configuration further, to make sure Drupal VM is tuned for your specific Drupal site's needs, or you may want to change things and make the server configuration more flexible, etc. For all that, the book [Ansible for DevOps](http://ansiblefordevops.com/) will give you a great introduction to using Ansible to make Drupal VM and the included Ansible configuration do exactly what you need!
+You may want to customize your configuration even further, to make sure Drupal VM is tuned for your specific Drupal site's needs, or you may want to change things and make the server configuration more flexible, etc. For all that, the book [Ansible for DevOps](http://ansiblefordevops.com/) will give you a great introduction to using Ansible to make Drupal VM and the included Ansible configuration do exactly what you need!
diff --git a/examples/prod/bootstrap/example.vars.yml b/examples/prod/bootstrap/example.vars.yml
new file mode 100644
index 000000000..ac61fef4e
--- /dev/null
+++ b/examples/prod/bootstrap/example.vars.yml
@@ -0,0 +1,15 @@
+---
+admin_user: my_admin_username
+
+# On RHEL/CentOS, 'wheel'; on Debian/Ubuntu, 'root'.
+admin_group: root
+
+# IMPORTANT: Configure your own password for the admin user account. To generate
+# a password hash, use either of the following commands:
+#   - `openssl passwd -1 [password]`
+#   - `mkpasswd --method=SHA-512`.
+admin_password: $1$HgT69GsW$qZ8FUJHafZZWD76KXgAZO/
+
+# Configuration for copying local public SSH key to admin's authorized_keys.
+admin_copy_ssh_pubkey: true
+admin_pubkey: ~/.ssh/id_rsa.pub
diff --git a/examples/prod/bootstrap/init.yml b/examples/prod/bootstrap/init.yml
new file mode 100644
index 000000000..5bdfc3bdf
--- /dev/null
+++ b/examples/prod/bootstrap/init.yml
@@ -0,0 +1,30 @@
+---
+- hosts: drupalvm
+
+  vars_files:
+    - vars.yml
+
+  tasks:
+    - name: Create admin user account.
+      user:
+        name: "{{ admin_user }}"
+        createhome: yes
+        home: "/home/{{ admin_user }}"
+        generate_ssh_key: yes
+        ssh_key_comment: "ansible-{{ inventory_hostname }}"
+        password: "{{ admin_password }}"
+        groups: "{{ admin_group }}"
+        shell: /bin/bash
+
+    - name: Add local SSH public key to admin account authorized_keys.
+      authorized_key:
+        user: "{{ admin_user }}"
+        key: "{{ lookup('file', '{{ admin_pubkey }}') }}"
+        manage_dir: yes
+
+    - name: Disable requiretty.
+      lineinfile:
+        dest: /etc/sudoers
+        regexp: '^Defaults.+requiretty'
+        line: 'Defaults    !requiretty'
+        state: present
diff --git a/examples/prod/example.inventory b/examples/prod/example.inventory
index a5967b064..9a10cfe60 100644
--- a/examples/prod/example.inventory
+++ b/examples/prod/example.inventory
@@ -1,2 +1,2 @@
 [drupalvm]
-1.2.3.4 ansible_ssh_user=root
+1.2.3.4 ansible_ssh_user=my_admin_username
diff --git a/examples/prod/prod.overrides.yml b/examples/prod/prod.overrides.yml
index 40b3e9b4a..d93b55a22 100644
--- a/examples/prod/prod.overrides.yml
+++ b/examples/prod/prod.overrides.yml
@@ -11,10 +11,14 @@ mysql_root_password: root
 # Only install extras that you will need/use on your site, and don't install
 # development-related software on production environments!
 installed_extras:
-  - memcached
+  # - memcached
+  # - redis
   # - solr
   - varnish
 
+# Disable the dashboard page. Also remove any unneeded virtualhosts.
+dashboard_install_dir: ''
+
 # Enable a more hardened security configuration.
 extra_security_enabled: true
 
@@ -23,7 +27,6 @@ firewall_allowed_tcp_ports:
   - "22"
   - "80"
   - "443"
-  - "8983"
 firewall_log_dropped_packets: true
 
 # Set Apache to listen on port 81 (internal only), and Varnish on 80.
diff --git a/provisioning/tasks/build-makefile.yml b/provisioning/tasks/build-makefile.yml
index b41cf5774..838c602f8 100644
--- a/provisioning/tasks/build-makefile.yml
+++ b/provisioning/tasks/build-makefile.yml
@@ -9,8 +9,17 @@
   file:
     path: "{{ drupal_core_path }}"
     state: directory
+    recurse: yes
+    mode: 0775
+  when: drupal_site.stat.exists == false
+
+- name: Ensure drupal_core_path directory is owned by ssh user.
+  file:
+    path: "{{ drupal_core_path }}"
+    state: directory
+    owner: "{{ ansible_ssh_user }}"
+    group: "{{ ansible_ssh_user }}"
     mode: 0775
-  become: no
   when: drupal_site.stat.exists == false
 
 - name: Generate Drupal site with drush makefile.

From 724b410cf872fb11fdca530472ca952c18f36e4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sun, 21 Feb 2016 00:29:45 -0500
Subject: [PATCH 0154/1273] Add custom initctl script for fixing docker tests
 on ubuntu 14.04

---
 .travis.yml                   |  8 ++++----
 tests/Dockerfile.ubuntu-14.04 |  3 +++
 tests/initctl_faker           | 23 +++++++++++++++++++++++
 3 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 tests/initctl_faker

diff --git a/.travis.yml b/.travis.yml
index fe14982b4..ba68b012f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,10 +18,10 @@ env:
       init: /usr/lib/systemd/systemd
       run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
       additional_vars: "centos-7-vars.yml"
-  # - distribution: ubuntu
-  #   version: 14.04
-  #   init: /sbin/init
-  #   run_opts: "--privileged"
+    - distribution: ubuntu
+      version: 14.04
+      init: /sbin/init
+      run_opts: "--privileged"
   # - distribution: ubuntu
   #   version: 12.04
   #   init: /sbin/init
diff --git a/tests/Dockerfile.ubuntu-14.04 b/tests/Dockerfile.ubuntu-14.04
index 607180f93..266f96287 100644
--- a/tests/Dockerfile.ubuntu-14.04
+++ b/tests/Dockerfile.ubuntu-14.04
@@ -7,5 +7,8 @@ RUN apt-add-repository -y ppa:ansible/ansible
 RUN apt-get update
 RUN apt-get install -y ansible ufw curl
 
+COPY initctl_faker .
+RUN chmod +x initctl_faker && rm -fr /sbin/initctl && ln -s /initctl_faker /sbin/initctl
+
 # Install Ansible inventory file
 RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/tests/initctl_faker b/tests/initctl_faker
new file mode 100644
index 000000000..a2267f30d
--- /dev/null
+++ b/tests/initctl_faker
@@ -0,0 +1,23 @@
+#!/bin/sh
+ALIAS_CMD="$(echo ""$0"" | sed -e 's?/sbin/??')"
+
+case "$ALIAS_CMD" in
+    start|stop|restart|reload|status)
+        exec service $1 $ALIAS_CMD
+        ;;
+esac
+
+case "$1" in
+    list )
+        exec service --status-all
+        ;;
+    reload-configuration )
+        exec service $2 restart
+        ;;
+    start|stop|restart|reload|status)
+        exec service $2 $1
+        ;;
+    \?)
+        exit 0
+        ;;
+esac

From 84b3ad6cf65fb87ac60777c5aca55bb82a45b4aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sun, 21 Feb 2016 08:40:44 -0500
Subject: [PATCH 0155/1273] Detect whether AppArmor is installed before
 attempting to interact with it

---
 provisioning/tasks/apparmor.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/provisioning/tasks/apparmor.yml b/provisioning/tasks/apparmor.yml
index 926f65cf6..516ebf054 100644
--- a/provisioning/tasks/apparmor.yml
+++ b/provisioning/tasks/apparmor.yml
@@ -1,12 +1,17 @@
 ---
+- name: Detect if AppArmor is installed.
+  stat:
+    path: /etc/init.d/apparmor
+  register: apparmor_installed
+
 - name: Ensure MySQL AppArmor profile is disabled (for slow query log).
   file:
     path: /etc/apparmor.d/disable/usr.sbin.mysqld
     src: /etc/apparmor.d/usr.sbin.mysqld
     state: link
   register: mysql_apparmor
-  when: mysql_slow_query_log_enabled
+  when: mysql_slow_query_log_enabled and apparmor_installed.stat.exists
 
-- name: Restart AppArmor if necessary.
+- name: Restart the AppArmor if necessary.
   service: name=apparmor state=restarted
   when: mysql_apparmor.changed

From 363e2c744ca2fbd4efb9cc145550750730f00809 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 21 Feb 2016 20:28:20 -0600
Subject: [PATCH 0156/1273] Fixes #434: Ditch slow CentOS 6 test build and test
 Nginx with Ubuntu 14.04.

---
 .travis.yml                   | 18 +++++++-----------
 tests/Dockerfile.centos-6     | 15 ---------------
 tests/Dockerfile.ubuntu-12.04 | 11 -----------
 tests/centos-6-vars.yml       |  1 -
 tests/centos-7-vars.yml       |  1 +
 5 files changed, 8 insertions(+), 38 deletions(-)
 delete mode 100644 tests/Dockerfile.centos-6
 delete mode 100644 tests/Dockerfile.ubuntu-12.04
 delete mode 100644 tests/centos-6-vars.yml

diff --git a/.travis.yml b/.travis.yml
index ba68b012f..681cb63c6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,24 +8,20 @@ env:
       MACHINE_NAME: drupalvm
       IP: 192.168.88.88
   matrix:
-    - distribution: centos
-      version: 6
+    - distribution: ubuntu
+      version: 14.04
       init: /sbin/init
       run_opts: "--privileged"
-      additional_vars: "centos-6-vars.yml"
+    - distribution: ubuntu
+      version: 14.04
+      init: /sbin/init
+      run_opts: "--privileged"
+      additional_vars: ubuntu-14-nginx.yml
     - distribution: centos
       version: 7
       init: /usr/lib/systemd/systemd
       run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
       additional_vars: "centos-7-vars.yml"
-    - distribution: ubuntu
-      version: 14.04
-      init: /sbin/init
-      run_opts: "--privileged"
-  # - distribution: ubuntu
-  #   version: 12.04
-  #   init: /sbin/init
-  #   run_opts: "--privileged"
 
 services:
   - docker
diff --git a/tests/Dockerfile.centos-6 b/tests/Dockerfile.centos-6
deleted file mode 100644
index 0746e50de..000000000
--- a/tests/Dockerfile.centos-6
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM centos:6
-
-# Install Ansible
-RUN yum -y update; yum clean all;
-RUN yum -y install epel-release
-RUN yum -y install git ansible sudo which curl tar unzip xz logrotate
-RUN yum clean all
-
-# Disable requiretty
-RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
-
-# Install Ansible inventory file
-RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
-
-CMD ["/usr/sbin/init"]
diff --git a/tests/Dockerfile.ubuntu-12.04 b/tests/Dockerfile.ubuntu-12.04
deleted file mode 100644
index 001e03f7e..000000000
--- a/tests/Dockerfile.ubuntu-12.04
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM ubuntu:12.04
-RUN apt-get update
-
-# Install Ansible
-RUN apt-get install -y software-properties-common python-software-properties git
-RUN apt-add-repository -y ppa:ansible/ansible
-RUN apt-get update
-RUN apt-get install -y ansible ufw curl
-
-# Install Ansible inventory file
-RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/tests/centos-6-vars.yml b/tests/centos-6-vars.yml
deleted file mode 100644
index 848ddb468..000000000
--- a/tests/centos-6-vars.yml
+++ /dev/null
@@ -1 +0,0 @@
-drupalvm_webserver: nginx
diff --git a/tests/centos-7-vars.yml b/tests/centos-7-vars.yml
index 0b90cd6be..1b0b69304 100644
--- a/tests/centos-7-vars.yml
+++ b/tests/centos-7-vars.yml
@@ -1,3 +1,4 @@
+---
 mysql_packages:
   - mariadb
   - mariadb-server

From 3046b6bdaf35d1ca7f6a9214e0e6a2f0b051b76f Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 21 Feb 2016 20:38:03 -0600
Subject: [PATCH 0157/1273] Issue #434: Fix syntax error with include method.

---
 .travis.yml               | 1 +
 tests/centos-7-vars.yml   | 1 -
 tests/ubuntu-14-nginx.yml | 1 +
 3 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 tests/ubuntu-14-nginx.yml

diff --git a/.travis.yml b/.travis.yml
index 681cb63c6..edb277b5f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+---
 sudo: required
 
 env:
diff --git a/tests/centos-7-vars.yml b/tests/centos-7-vars.yml
index 1b0b69304..0b90cd6be 100644
--- a/tests/centos-7-vars.yml
+++ b/tests/centos-7-vars.yml
@@ -1,4 +1,3 @@
----
 mysql_packages:
   - mariadb
   - mariadb-server
diff --git a/tests/ubuntu-14-nginx.yml b/tests/ubuntu-14-nginx.yml
new file mode 100644
index 000000000..848ddb468
--- /dev/null
+++ b/tests/ubuntu-14-nginx.yml
@@ -0,0 +1 @@
+drupalvm_webserver: nginx

From 2c886c81f27bc61911a3c63d3aa5ab7d458485d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Tue, 23 Feb 2016 07:35:10 -0500
Subject: [PATCH 0158/1273] Issue #461: Fix variable typo for
 vagrant_synced_folder_default_type

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

diff --git a/Vagrantfile b/Vagrantfile
index 686a9576b..216e4fcc2 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -107,7 +107,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   end
 
   # Allow override of the default synced folder type.
-  config.vm.synced_folder ".", "/vagrant", type: vconfig.include?('vagrant_synced_folder_default_type') ? vconfig['vagrant_default_synced_folder_type'] : 'nfs'
+  config.vm.synced_folder ".", "/vagrant", type: vconfig.include?('vagrant_synced_folder_default_type') ? vconfig['vagrant_synced_folder_default_type'] : 'nfs'
 
   # Provisioning. Use ansible if it's installed, JJG-Ansible-Windows if not.
   if which('ansible-playbook')

From 72c4197e179b11f7a58e8b32e76fb7a6e9919d9b Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 23 Feb 2016 15:26:14 -0600
Subject: [PATCH 0159/1273] Fixes #464: Make sure drupal_core_path is created
 in Vagrant successfully.

---
 provisioning/tasks/build-makefile.yml | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/provisioning/tasks/build-makefile.yml b/provisioning/tasks/build-makefile.yml
index 838c602f8..0c503acd2 100644
--- a/provisioning/tasks/build-makefile.yml
+++ b/provisioning/tasks/build-makefile.yml
@@ -11,15 +11,7 @@
     state: directory
     recurse: yes
     mode: 0775
-  when: drupal_site.stat.exists == false
-
-- name: Ensure drupal_core_path directory is owned by ssh user.
-  file:
-    path: "{{ drupal_core_path }}"
-    state: directory
-    owner: "{{ ansible_ssh_user }}"
-    group: "{{ ansible_ssh_user }}"
-    mode: 0775
+  become: no
   when: drupal_site.stat.exists == false
 
 - name: Generate Drupal site with drush makefile.

From bf4a99d23ca4f20f109ea0ccb179275d9347c0ba Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 23 Feb 2016 15:29:08 -0600
Subject: [PATCH 0160/1273] Fixes #463: Dashboard doesn't appear if using
 autonetwork plugin, add dashboard. to vhost.

---
 example.config.yml         | 5 +++--
 provisioning/tasks/www.yml | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/example.config.yml b/example.config.yml
index 8f24386ee..62c7201d4 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -9,7 +9,7 @@ vagrant_synced_folder_default_type: nfs
 # machine name, and IP address for each instance.
 vagrant_hostname: drupalvm.dev
 vagrant_machine_name: drupalvm
-vagrant_ip: 192.168.88.88
+vagrant_ip: 0.0.0.0
 
 # Allow Drupal VM to be accessed via a public network interface on your host.
 # Vagrant boxes are insecure by default, so be careful. You've been warned!
@@ -98,6 +98,7 @@ apache_vhosts:
           ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ pimpmylog_install_dir }}"
 
   - servername: "{{ vagrant_ip }}"
+    serveralias: "dashboard.{{ vagrant_hostname }}"
     documentroot: "{{ dashboard_install_dir }}"
 
 apache_remove_default_vhost: true
@@ -128,7 +129,7 @@ nginx_hosts:
     root: "{{ pimpmylog_install_dir }}"
     is_php: true
 
-  - server_name: "{{ vagrant_ip }}"
+  - server_name: "{{ vagrant_ip }} dashboard.{{ vagrant_hostname }}"
     root: "{{ dashboard_install_dir }}"
 
 nginx_remove_default_vhost: true
diff --git a/provisioning/tasks/www.yml b/provisioning/tasks/www.yml
index 159b709ec..775653b63 100644
--- a/provisioning/tasks/www.yml
+++ b/provisioning/tasks/www.yml
@@ -26,7 +26,7 @@
 - name: Copy Nginx vhosts into place.
   template:
     src: ../templates/nginx-vhost.conf.j2
-    dest: "{{ nginx_vhost_path }}/{{ item.server_name }}.conf"
+    dest: "{{ nginx_vhost_path }}/{{ item.server_name.split(' ')[0] }}.conf"
     force: yes
     owner: root
     group: root

From 12c8ca6b098ea99db9ce5644c59768a8ddb5e3f4 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 23 Feb 2016 16:13:54 -0600
Subject: [PATCH 0161/1273] Fix default IP - related to work in #463.

---
 example.config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/example.config.yml b/example.config.yml
index 62c7201d4..b4e407b42 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -9,7 +9,7 @@ vagrant_synced_folder_default_type: nfs
 # machine name, and IP address for each instance.
 vagrant_hostname: drupalvm.dev
 vagrant_machine_name: drupalvm
-vagrant_ip: 0.0.0.0
+vagrant_ip: 192.168.88.88
 
 # Allow Drupal VM to be accessed via a public network interface on your host.
 # Vagrant boxes are insecure by default, so be careful. You've been warned!

From deae528bb0438058180fd14996c56748267ad152 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 24 Feb 2016 10:37:06 -0600
Subject: [PATCH 0162/1273] Update PHP 7 install documentation to reflect
 unneccessary Apache PHP mod.

---
 docs/other/php-7.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/docs/other/php-7.md b/docs/other/php-7.md
index bc1b80022..6ee43fe78 100644
--- a/docs/other/php-7.md
+++ b/docs/other/php-7.md
@@ -9,7 +9,6 @@ Ondřej Surý's PPA for PHP 7.0 is included with Drupal VM, and you can make the
 ```yaml
 php_version: "7.0"
 php_packages:
-  - libapache2-mod-php7.0
   - php7.0-common
   - php7.0-cli
   - php7.0-dev
@@ -29,12 +28,10 @@ Also, comment out `xhprof`, `xdebug`, `redis` and `memcached` from the `installe
 
 You can also build from source using the same/included `geerlingguy.php` Ansible role, but that process is a bit more involved and for power users comfortable with the process.
 
-**If you're using Nginx** instead of Apache, don't include `libapache2-mod-php7.0` in the `php_packages` list in `config.yml`.
-
 ## RedHat/CentOS 7
 
 Remi's RPM repository is included with Drupal VM, and you can make the following changes to use it to install PHP 7:
 
   1. Make sure you've followed the directions for switching to CentOS 7 in the [use a different base OS](base-os.md) guide.
   2. Change `php_version` inside `config.yml` to `"7.0"`.
-  3. Comment out `xhprof`, `xdebug`, `redis` and `memcached` from the `installed_extras` list, as these extensions are not yet supported for PHP 7 (as of late 2015).
+  3. Comment out `xhprof`, `xdebug`, `redis` and `memcached` from the `installed_extras` list, as these extensions are not yet supported for PHP 7 (as of early 2016).

From 39b16d6e65a36efbef86ce734dbc721901c4a0ac Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 24 Feb 2016 12:07:04 -0600
Subject: [PATCH 0163/1273] Issue #455: Add notes to get effective DigitalOcean
 instance running.

---
 examples/prod/README.md          | 9 ++++++++-
 examples/prod/prod.overrides.yml | 8 ++++++++
 provisioning/playbook.yml        | 2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/examples/prod/README.md b/examples/prod/README.md
index 71a8bd413..be0664bbd 100644
--- a/examples/prod/README.md
+++ b/examples/prod/README.md
@@ -70,7 +70,14 @@ After a few minutes, your Drupal-VM-in-the-cloud Droplet should be fully configu
 
 ## Known issues
 
-  - The `files` folder that is generated during the initial Drupal installation is set to be owned by the admin account; to make it work (and to allow Drupal to generate stylesheets and files correctly), you have to manually log into the server and run `sudo chown -R www-data:www-data /var/www/drupalvm/drupal/sites/default/files` after initial provisioning is complete.
+  - You may need to manually create the `drupal_core_path` directory on the server at this time; it's not always created automatically due to permissions errors.
+  - The `files` folder that is generated during the initial Drupal installation is set to be owned by the admin account; to make it work (and to allow Drupal to generate stylesheets and files correctly), you have to manually log into the server and run the following two commands after provisioning is complete:
+
+      ```
+      $ sudo chown -R www-data /var/www/drupalvm/drupal/sites/default/files
+      $ sudo chmod -R 0700 /var/www/drupalvm/drupal/sites/default/files
+      ```
+
   - You can't synchronize folders between your host machine and DigitalOcean (at least not in any sane way); so you'll need to either have Drupal VM install a site from a given Drush make file or composer.json, or deploy your site yourself.
   - The way you build a production Drupal VM instance (vs. a local instance) is a little bit of a kludge. Follow https://github.com/geerlingguy/drupal-vm/issues/455 to track progress on a more streamlined process.
   - Drupal VM doesn't include any kind of backup system. You should use one if you have any kind of important data on your server!
diff --git a/examples/prod/prod.overrides.yml b/examples/prod/prod.overrides.yml
index d93b55a22..29b416a36 100644
--- a/examples/prod/prod.overrides.yml
+++ b/examples/prod/prod.overrides.yml
@@ -2,6 +2,14 @@
 # Normally, this would be set to the hostname of your DigitalOcean Droplet.
 drupal_domain: "drupalvm.dev"
 
+# Delete all the `apache_vhosts` or `nginx_hosts` you don't need. If only
+# installing a single Drupal site, the variable should look like this (Apache):
+apache_vhosts:
+  - servername: "{{ drupal_domain }}"
+    documentroot: "{{ drupal_core_path }}"
+    extra_parameters: |
+          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ drupal_core_path }}"
+
 # Since this will be a publicly-accessible instance of Drupal VM, make sure you
 # configure secure passwords, especially for Drupal and MySQL!
 drupal_account_pass: admin
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 8b6838fb3..d4e6318e4 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -78,7 +78,7 @@
     - include: tasks/cron.yml
 
     - include: tasks/dashboard.yml
-      when: dashboard_install_dir is defined
+      when: dashboard_install_dir is defined and dashboard_install_dir != ''
 
     - name: Run configured post-provision shell scripts.
       script: "{{ item }}"

From d16ba5c5cc51d89eb6b9443d7d04568f720e563b Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 24 Feb 2016 15:58:12 -0600
Subject: [PATCH 0164/1273] Some simple updates to Quick Start Guide.

---
 README.md | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 21b90d26a..a75572eff 100644
--- a/README.md
+++ b/README.md
@@ -52,16 +52,17 @@ If you want to switch from Drupal 8 (default) to Drupal 7 or 6 on the initial in
 
 This Quick Start Guide will help you quickly build a Drupal 8 site on the Drupal VM using the included example Drush make file. You can also use the Drupal VM with a [Local Drupal codebase](http://docs.drupalvm.com/en/latest/deployment/local-codebase/) or even a [Drupal multisite installation](http://docs.drupalvm.com/en/latest/deployment/multisite/).
 
-### 1 - Install dependencies (Vagrant)
+### 1 - Install Vagrant
 
 Download and install [Vagrant](https://www.vagrantup.com/downloads.html).
-- Vagrant will automatically install [VirtualBox](https://www.virtualbox.org/wiki/Downloads) if no providers are available (Drupal VM also works with Parallels or VMware, if you have the [Vagrant VMware integration plugin](http://www.vagrantup.com/vmware)).
 
-Note for Faster Provisioning (Mac/Linux only): *[Install Ansible](http://docs.ansible.com/intro_installation.html) on your host machine, so Drupal VM can run the provisioning steps locally instead of inside the VM.*
+Vagrant will automatically install [VirtualBox](https://www.virtualbox.org/wiki/Downloads) if no providers are available (Drupal VM also works with Parallels or VMware, if you have the [Vagrant VMware integration plugin](http://www.vagrantup.com/vmware)).
 
-Note for Linux users: *If NFS is not already installed on your host, you will need to install it to use the default NFS synced folder configuration. See guides for [Debian/Ubuntu](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-ubuntu-14-04), [Arch](https://wiki.archlinux.org/index.php/NFS#Installation), and [RHEL/CentOS](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-centos-6).*
+Notes:
 
-Note on versions: *Please make sure you're running the latest stable version of Vagrant, VirtualBox, and Ansible, as the current version of Drupal VM is tested with the latest releases. As of February 2016: Vagrant 1.8.1, VirtualBox 5.0.14, and Ansible 2.0.0.*
+  - **For faster provisioning** (Mac/Linux only): *[Install Ansible](http://docs.ansible.com/intro_installation.html) on your host machine, so Drupal VM can run the provisioning steps locally instead of inside the VM.*
+  - **NFS on Linux**: *If NFS is not already installed on your host, you will need to install it to use the default NFS synced folder configuration. See guides for [Debian/Ubuntu](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-ubuntu-14-04), [Arch](https://wiki.archlinux.org/index.php/NFS#Installation), and [RHEL/CentOS](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-centos-6).*
+  - **Versions**: *Make sure you're running the latest releases of Vagrant, VirtualBox, and Ansible—as of February 2016, Drupal VM recommends: Vagrant 1.8.1, VirtualBox 5.0.14, and Ansible 2.0.0.*
 
 ### 2 - Build the Virtual Machine
 
@@ -70,7 +71,7 @@ Note on versions: *Please make sure you're running the latest stable version of
     - Copy `example.drupal.make.yml` to `drupal.make.yml`.
     - Copy `example.config.yml` to `config.yml`.
   3. Create a local directory where Drupal will be installed and configure the path to that directory in `config.yml` (`local_path`, inside `vagrant_synced_folders`).
-  4. Open Terminal, cd to this directory (containing the `Vagrantfile` and this README file).
+  4. Open Terminal, `cd` to this directory (containing the `Vagrantfile` and this README file).
   5. (If you have Ansible installed on Mac/Linux) Run `$ sudo ansible-galaxy install -r provisioning/requirements.yml --force`.
   6. Type in `vagrant up`, and let Vagrant do its magic.
 

From 08a73eb968d457bfe62737f404e5b64c263bfcbd Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 24 Feb 2016 21:42:16 -0600
Subject: [PATCH 0165/1273] Fixes #469: Flip the order of ip and hostname for
 hosts file in Dashboard.

---
 provisioning/templates/dashboard.html.j2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/provisioning/templates/dashboard.html.j2 b/provisioning/templates/dashboard.html.j2
index 15fa52f9e..44d983da4 100644
--- a/provisioning/templates/dashboard.html.j2
+++ b/provisioning/templates/dashboard.html.j2
@@ -53,7 +53,7 @@
         {% if drupalvm_webserver == 'apache' -%}
           {%- for host in apache_vhosts -%}
             {%- if host.documentroot != dashboard_install_dir -%}
-              <li>{{ host.servername }} {{ vagrant_ip }}</li>
+              <li>{{ vagrant_ip }} {{ host.servername }}</li>
             {%- endif -%}
             {% if host.serveralias is defined -%}
               {%- for alias in host.serveralias.split() -%}
@@ -64,7 +64,7 @@
         {%- elif drupalvm_webserver == 'nginx' -%}
           {%- for host in nginx_hosts -%}
             {%- if host.root != dashboard_install_dir -%}
-              <li>{{ host.server_name }} {{ vagrant_ip }}</li>
+              <li>{{ vagrant_ip }} {{ host.server_name }}</li>
             {%- endif -%}
           {%- endfor -%}
         {%- endif %}

From 35f1a2bd20f5787762ac3e329a3e0bfbfc79671b Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 25 Feb 2016 10:41:43 -0600
Subject: [PATCH 0166/1273] Issue #469: Fix failing tests.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index edb277b5f..edc35739c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -94,7 +94,7 @@ script:
 
   - >
     sudo docker exec "$(cat ${container_id})" curl -s --header Host:${IP} localhost
-    | grep -q "<li>${HOSTNAME} ${IP}</li>"
+    | grep -q "<li>${IP} ${HOSTNAME}</li>"
     && (echo 'Dashboard install pass' && exit 0)
     || (echo 'Dashboard install fail' && exit 1)
 

From 090f43afcac64bb6edfbaef631f730d88e62a1f0 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 25 Feb 2016 12:43:53 -0600
Subject: [PATCH 0167/1273] Issue #454: Clarify system requirements.

---
 README.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/README.md b/README.md
index a75572eff..e327559ae 100644
--- a/README.md
+++ b/README.md
@@ -113,12 +113,10 @@ Drupal VM is built to integrate with every developer's workflow. Many guides for
 
 Drupal VM runs on almost any modern computer that can run VirtualBox and Vagrant, however for the best out-of-the-box experience, it's recommended you have a computer with at least:
 
-  - Intel Core i5, i7 or better processor
+  - Intel Core processor with VT-x enabled
   - At least 4 GB RAM (higher is better)
   - An SSD (for greater speed with synced folders)
 
-If you have an older processor or a processor without VT-x virtualization support (e.g. the i3), you can still use Drupal VM, but you will need to switch the `vagrant_box` in `config.yml` to use a 3rd party 32-bit box, like `ubuntu/trusty32` or `hashicorp/precise32`.
-
 ## Other Notes
 
   - To shut down the virtual machine, enter `vagrant halt` in the Terminal in the same folder that has the `Vagrantfile`. To destroy it completely (if you want to save a little disk space, or want to rebuild it from scratch with `vagrant up` again), type in `vagrant destroy`.

From 99b7323e399ef897ebb1ecfaa6a676164e2120b5 Mon Sep 17 00:00:00 2001
From: Ferenc Nemeth <ferenc.nemeth@cheppers.com>
Date: Fri, 26 Feb 2016 10:02:04 -0500
Subject: [PATCH 0168/1273] Ruby coding style fixes in Vagrantfile

---
 Vagrantfile | 64 +++++++++++++++++++++++++----------------------------
 1 file changed, 30 insertions(+), 34 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 216e4fcc2..b872b141f 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,17 +1,17 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
-VAGRANTFILE_API_VERSION = "2"
+VAGRANTFILE_API_VERSION = '2'
 
 # Cross-platform way of finding an executable in the $PATH.
 def which(cmd)
   exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
   ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
-    exts.each { |ext|
+    exts.each do |ext|
       exe = File.join(path, "#{cmd}#{ext}")
       return exe if File.executable?(exe) && !File.directory?(exe)
-    }
+    end
   end
-  return nil
+  nil
 end
 
 def walk(obj, &fn)
@@ -20,37 +20,36 @@ def walk(obj, &fn)
   elsif obj.is_a?(Hash)
     obj.each_pair { |key, value| obj[key] = walk(value, &fn) }
   else
-    obj = fn.call(obj)
+    obj = yield(obj)
   end
 end
 
 # Use config.yml for basic VM configuration.
 require 'yaml'
 dir = File.dirname(File.expand_path(__FILE__))
-if !File.exist?("#{dir}/config.yml")
+unless File.exist?("#{dir}/config.yml")
   raise 'Configuration file not found! Please copy example.config.yml to config.yml and try again.'
 end
-vconfig = YAML::load_file("#{dir}/config.yml")
+vconfig = YAML.load_file("#{dir}/config.yml")
 
 # Replace jinja variables in config.
 vconfig = walk(vconfig) do |value|
   while value.is_a?(String) && value.match(/{{ .* }}/)
-    value = value.gsub(/{{ (.*?) }}/) { |match| match = vconfig[$1] }
+    value = value.gsub(/{{ (.*?) }}/) { vconfig[Regexp.last_match(1)] }
   end
   value
 end
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-
   # Networking configuration.
   config.vm.hostname = vconfig['vagrant_hostname']
-  if vconfig['vagrant_ip'] == "0.0.0.0" && Vagrant.has_plugin?("vagrant-auto_network")
-    config.vm.network :private_network, :ip => vconfig['vagrant_ip'], :auto_network => true
+  if vconfig['vagrant_ip'] == '0.0.0.0' && Vagrant.has_plugin?('vagrant-auto_network')
+    config.vm.network :private_network, ip: vconfig['vagrant_ip'], auto_network: true
   else
     config.vm.network :private_network, ip: vconfig['vagrant_ip']
   end
 
-  if !vconfig['vagrant_public_ip'].empty? && vconfig['vagrant_public_ip'] == "0.0.0.0"
+  if !vconfig['vagrant_public_ip'].empty? && vconfig['vagrant_public_ip'] == '0.0.0.0'
     config.vm.network :public_network
   elsif !vconfig['vagrant_public_ip'].empty?
     config.vm.network :public_network, ip: vconfig['vagrant_public_ip']
@@ -66,12 +65,12 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # If a hostsfile manager plugin is installed, add all server names as aliases.
   aliases = []
   blacklist = [config.vm.hostname, vconfig['vagrant_ip']]
-  if vconfig['drupalvm_webserver'] == "apache"
+  if vconfig['drupalvm_webserver'] == 'apache'
     vconfig['apache_vhosts'].each do |host|
       unless blacklist.include?(host['servername'])
         aliases.push(host['servername'])
       end
-      aliases.concat(host['serveralias'].split()) if host['serveralias']
+      aliases.concat(host['serveralias'].split) if host['serveralias']
     end
   else
     vconfig['nginx_hosts'].each do |host|
@@ -81,43 +80,43 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     end
   end
 
-  if Vagrant.has_plugin?("vagrant-hostsupdater")
+  if Vagrant.has_plugin?('vagrant-hostsupdater')
     config.hostsupdater.aliases = aliases.uniq
-  elsif Vagrant.has_plugin?("vagrant-hostmanager")
+  elsif Vagrant.has_plugin?('vagrant-hostmanager')
     config.hostmanager.enabled = true
     config.hostmanager.manage_host = true
     config.hostmanager.aliases = aliases.uniq
   end
 
   # Synced folders.
-  for synced_folder in vconfig['vagrant_synced_folders'];
+  vconfig['vagrant_synced_folders'].each do |synced_folder|
     options = {
       type: synced_folder['type'],
-      rsync__auto: "true",
+      rsync__auto: 'true',
       rsync__exclude: synced_folder['excluded_paths'],
-      rsync__args: ["--verbose", "--archive", "--delete", "-z", "--chmod=ugo=rwX"],
+      rsync__args: ['--verbose', '--archive', '--delete', '-z', '--chmod=ugo=rwX'],
       id: synced_folder['id'],
       create: synced_folder.include?('create') ? synced_folder['create'] : false,
       mount_options: synced_folder.include?('mount_options') ? synced_folder['mount_options'] : []
     }
-    if synced_folder.include?('options_override');
+    if synced_folder.include?('options_override')
       options = options.merge(synced_folder['options_override'])
     end
     config.vm.synced_folder synced_folder['local_path'], synced_folder['destination'], options
   end
 
   # Allow override of the default synced folder type.
-  config.vm.synced_folder ".", "/vagrant", type: vconfig.include?('vagrant_synced_folder_default_type') ? vconfig['vagrant_synced_folder_default_type'] : 'nfs'
+  config.vm.synced_folder '.', '/vagrant', type: vconfig.include?('vagrant_synced_folder_default_type') ? vconfig['vagrant_synced_folder_default_type'] : 'nfs'
 
   # Provisioning. Use ansible if it's installed, JJG-Ansible-Windows if not.
   if which('ansible-playbook')
-    config.vm.provision "ansible" do |ansible|
+    config.vm.provision 'ansible' do |ansible|
       ansible.playbook = "#{dir}/provisioning/playbook.yml"
     end
   else
-    config.vm.provision "shell" do |sh|
+    config.vm.provision 'shell' do |sh|
       sh.path = "#{dir}/provisioning/JJG-Ansible-Windows/windows.sh"
-      sh.args = "/provisioning/playbook.yml"
+      sh.args = '/provisioning/playbook.yml'
     end
   end
   # ansible_local provisioner is broken in Vagrant < 1.8.2.
@@ -131,11 +130,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # VMware Fusion.
   config.vm.provider :vmware_fusion do |v, override|
     # HGFS kernel module currently doesn't load correctly for native shares.
-    override.vm.synced_folder ".", "/vagrant", type: 'nfs'
+    override.vm.synced_folder '.', '/vagrant', type: 'nfs'
 
     v.gui = false
-    v.vmx["memsize"] = vconfig['vagrant_memory']
-    v.vmx["numvcpus"] = vconfig['vagrant_cpus']
+    v.vmx['memsize'] = vconfig['vagrant_memory']
+    v.vmx['numvcpus'] = vconfig['vagrant_cpus']
   end
 
   # VirtualBox.
@@ -144,8 +143,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     v.name = vconfig['vagrant_hostname']
     v.memory = vconfig['vagrant_memory']
     v.cpus = vconfig['vagrant_cpus']
-    v.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
-    v.customize ["modifyvm", :id, "--ioapic", "on"]
+    v.customize ['modifyvm', :id, '--natdnshostresolver1', 'on']
+    v.customize ['modifyvm', :id, '--ioapic', 'on']
   end
 
   # Parallels.
@@ -157,11 +156,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   end
 
   # Set the name of the VM. See: http://stackoverflow.com/a/17864388/100134
-  config.vm.define vconfig['vagrant_machine_name'] do |d|
-  end
+  config.vm.define vconfig['vagrant_machine_name']
 
   # Allow an untracked Vagrantfile to modify the configurations
-  if File.exist?('Vagrantfile.local')
-    eval File.read 'Vagrantfile.local'
-  end
+  eval File.read 'Vagrantfile.local' if File.exist?('Vagrantfile.local')
 end

From 043918eba0ac1801599c97cc6672412840e0ed39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Fri, 26 Feb 2016 10:10:12 -0500
Subject: [PATCH 0169/1273] Lint Vagrantfile on travis

---
 .travis.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index edc35739c..f620f595b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,6 +32,8 @@ before_install:
   - 'sudo docker pull ${distribution}:${version}'
   # Customize container
   - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+  # Install lint tools.
+  - 'gem install rubocop'
 
 script:
   - container_id=$(mktemp)
@@ -55,6 +57,9 @@ script:
   # Append additional variables if set.
   - '[[ $additional_vars ]] && sudo docker exec "$(cat ${container_id})" bash -c "cat /var/www/drupalvm/tests/${additional_vars} >> /var/www/drupalvm/config.yml" || true'
 
+  # Vagrantfile syntax check
+  - 'rubocop --except LineLength,Eval,MutableConstant'
+
   # Ansible syntax check.
   - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /var/www/drupalvm/provisioning/playbook.yml --syntax-check'
 

From 131f200b9a416faee3457ec43aba314aae8579e6 Mon Sep 17 00:00:00 2001
From: unknown <jwinter@L-5CG5041Y15.troopers.state.nyenet>
Date: Fri, 26 Feb 2016 10:50:55 -0500
Subject: [PATCH 0170/1273] Adding a note about the drush aliases NOT being
 valid for Windows by default.

---
 provisioning/templates/dashboard.html.j2 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/provisioning/templates/dashboard.html.j2 b/provisioning/templates/dashboard.html.j2
index 44d983da4..376a4202e 100644
--- a/provisioning/templates/dashboard.html.j2
+++ b/provisioning/templates/dashboard.html.j2
@@ -78,7 +78,7 @@
             <th>Hostname</th>
             <th>Document Root</th>
             {% if configure_local_drush_aliases -%}
-              <th>Drush alias</th>
+              <th>Drush alias*</th>
             {%- endif %}
         </thead>
         <tbody>
@@ -91,6 +91,7 @@
               {{ printSite(host.server_name, host.root) }}
             {%- endfor -%}
           {%- endif %}
+          <tr><td colspan=3><small>*Note: Drush aliases are NOT created automatically on Windows. This is due to Ansible running from within the VM.</small></td></tr>
         </tbody>
       </table>
     {%- endmacro -%}

From 5049189f249637f51a10e3c008f61d0812961495 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 26 Feb 2016 16:37:55 -0600
Subject: [PATCH 0171/1273] PR #473: Better wording for aliases without Ansible
 on host.

---
 provisioning/templates/dashboard.html.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/templates/dashboard.html.j2 b/provisioning/templates/dashboard.html.j2
index 376a4202e..eeb0515bd 100644
--- a/provisioning/templates/dashboard.html.j2
+++ b/provisioning/templates/dashboard.html.j2
@@ -91,7 +91,7 @@
               {{ printSite(host.server_name, host.root) }}
             {%- endfor -%}
           {%- endif %}
-          <tr><td colspan=3><small>*Note: Drush aliases are NOT created automatically on Windows. This is due to Ansible running from within the VM.</small></td></tr>
+          <tr><td colspan=3><small>*Note: On Windows or when you don't have Ansible installed on your host, Drush aliases are only created inside the VM.</small></td></tr>
         </tbody>
       </table>
     {%- endmacro -%}

From 724ecacc5bc89660cdcf573bf8ea40f563afb1ef Mon Sep 17 00:00:00 2001
From: slimatic <salim.31@gmail.com>
Date: Sat, 27 Feb 2016 08:08:30 -0500
Subject: [PATCH 0172/1273] Update scripts.md

Corrected the wording for post provisioning scripts. Made it clearer to understand.
---
 docs/extras/scripts.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/extras/scripts.md b/docs/extras/scripts.md
index 2b9d4fd5d..ae08e490f 100644
--- a/docs/extras/scripts.md
+++ b/docs/extras/scripts.md
@@ -7,7 +7,7 @@ post_provision_scripts:
   - "../scripts/post-provision.sh"
 ```
 
-The above example results in a `post-provision.sh` script running after the main Drupal VM setup is complete. Note that post provision scripts run _every_ time you the VM is provisioned provision the environment (e.g. when you run `vagrant up` or `vagrant provision`).
+The above example results in a `post-provision.sh` script running after the main Drupal VM setup is complete. Note that post provision scripts run _every_ time you start the VM (`vagrant up`) or provision the environment (`vagrant provision`).
 
 You can define as many scripts as you would like, and any arguments after the path will be passed to the shell script itself (e.g. `"- "../scripts/setup-paths.sh --option"`).
 

From 5e766621838f88d4938ad61c66981195a610cf87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 27 Feb 2016 15:47:31 -0500
Subject: [PATCH 0173/1273] Issue #479: Fix incorrect ip/name order for apache
 aliases in dashboard

---
 provisioning/templates/dashboard.html.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/templates/dashboard.html.j2 b/provisioning/templates/dashboard.html.j2
index eeb0515bd..ab472a366 100644
--- a/provisioning/templates/dashboard.html.j2
+++ b/provisioning/templates/dashboard.html.j2
@@ -57,7 +57,7 @@
             {%- endif -%}
             {% if host.serveralias is defined -%}
               {%- for alias in host.serveralias.split() -%}
-                <li>{{ alias }} {{ vagrant_ip }}</li>
+                <li>{{ vagrant_ip }} {{ alias }}</li>
               {%- endfor -%}
             {%- endif %}
           {%- endfor -%}

From ec553232d37339432dc416a68c9b9db3bdc56887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 27 Feb 2016 15:58:43 -0500
Subject: [PATCH 0174/1273] Support nginx aliases in dashboard, hostsupdater
 and drush aliases

---
 Vagrantfile                                   | 15 +++++------
 provisioning/templates/dashboard.html.j2      | 27 ++++++++++++++-----
 .../drupalvm-local.aliases.drushrc.php.j2     |  2 +-
 .../templates/drupalvm.aliases.drushrc.php.j2 |  2 +-
 4 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index b872b141f..9ef14ab6e 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -64,28 +64,25 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   # If a hostsfile manager plugin is installed, add all server names as aliases.
   aliases = []
-  blacklist = [config.vm.hostname, vconfig['vagrant_ip']]
   if vconfig['drupalvm_webserver'] == 'apache'
     vconfig['apache_vhosts'].each do |host|
-      unless blacklist.include?(host['servername'])
-        aliases.push(host['servername'])
-      end
+      aliases.push(host['servername'])
       aliases.concat(host['serveralias'].split) if host['serveralias']
     end
   else
     vconfig['nginx_hosts'].each do |host|
-      unless blacklist.include?(host['server_name'])
-        aliases.push(host['server_name'])
-      end
+      aliases.concat(host['server_name'].split)
+      aliases.concat(host['server_name_redirect'].split) if host['server_name_redirect']
     end
   end
+  aliases = aliases.uniq - [config.vm.hostname, vconfig['vagrant_ip']]
 
   if Vagrant.has_plugin?('vagrant-hostsupdater')
-    config.hostsupdater.aliases = aliases.uniq
+    config.hostsupdater.aliases = aliases
   elsif Vagrant.has_plugin?('vagrant-hostmanager')
     config.hostmanager.enabled = true
     config.hostmanager.manage_host = true
-    config.hostmanager.aliases = aliases.uniq
+    config.hostmanager.aliases = aliases
   end
 
   # Synced folders.
diff --git a/provisioning/templates/dashboard.html.j2 b/provisioning/templates/dashboard.html.j2
index ab472a366..194895896 100644
--- a/provisioning/templates/dashboard.html.j2
+++ b/provisioning/templates/dashboard.html.j2
@@ -48,24 +48,37 @@
       {% endif %}
     {%- endmacro %}
 
+    {%- macro printHostsEntry(ip, servername) -%}
+      {%- if servername != ip -%}
+        <li>{{ ip }} {{ servername }}</li>
+      {%- endif -%}
+    {%- endmacro %}
+
     {%- macro sectionHost() -%}
       <ul class="section-host">
         {% if drupalvm_webserver == 'apache' -%}
           {%- for host in apache_vhosts -%}
-            {%- if host.documentroot != dashboard_install_dir -%}
-              <li>{{ vagrant_ip }} {{ host.servername }}</li>
-            {%- endif -%}
+
+            {{ printHostsEntry(vagrant_ip, host.servername) }}
             {% if host.serveralias is defined -%}
               {%- for alias in host.serveralias.split() -%}
-                <li>{{ vagrant_ip }} {{ alias }}</li>
+                {{ printHostsEntry(vagrant_ip, alias) }}
               {%- endfor -%}
             {%- endif %}
+
           {%- endfor -%}
         {%- elif drupalvm_webserver == 'nginx' -%}
           {%- for host in nginx_hosts -%}
-            {%- if host.root != dashboard_install_dir -%}
-              <li>{{ vagrant_ip }} {{ host.server_name }}</li>
-            {%- endif -%}
+
+            {% for server_name in host.server_name.split(' ') -%}
+              {{ printHostsEntry(vagrant_ip, server_name) }}
+            {%- endfor %}
+            {% if host.server_name_redirect is defined -%}
+              {%- for server_name in host.server_name_redirect.split(' ') -%}
+                {{ printHostsEntry(vagrant_ip, server_name) }}
+              {%- endfor -%}
+            {%- endif %}
+
           {%- endfor -%}
         {%- endif %}
       </ul>
diff --git a/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2 b/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2
index 2881b49ec..9acb46a51 100644
--- a/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2
+++ b/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2
@@ -23,7 +23,7 @@ $aliases['{{ host }}'] = array(
 {%- elif drupalvm_webserver == 'nginx' -%}
   {%- for host in nginx_hosts -%}
     {%- if host.root not in _devtool_docroots -%}
-      {{ alias(host.server_name, host.root) }}
+      {{ alias(host.server_name.split(' ')[0], host.root) }}
     {%- endif -%}
   {%- endfor -%}
 {%- endif -%}
diff --git a/provisioning/templates/drupalvm.aliases.drushrc.php.j2 b/provisioning/templates/drupalvm.aliases.drushrc.php.j2
index 88145c181..e534f0b74 100644
--- a/provisioning/templates/drupalvm.aliases.drushrc.php.j2
+++ b/provisioning/templates/drupalvm.aliases.drushrc.php.j2
@@ -26,7 +26,7 @@ $aliases['{{ host }}'] = array(
 {%- elif drupalvm_webserver == 'nginx' -%}
   {%- for host in nginx_hosts -%}
     {%- if host.root not in _devtool_docroots -%}
-      {{ alias(host.server_name, host.root) }}
+      {{ alias(host.server_name.split(' ')[0], host.root) }}
     {%- endif -%}
   {%- endfor -%}
 {%- endif -%}

From 7796012ab1c95055f643f7e2e77b95381644ad9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sun, 28 Feb 2016 22:17:47 -0500
Subject: [PATCH 0175/1273] fix nginx redirects not working when using aliases

---
 provisioning/templates/nginx-vhost.conf.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/templates/nginx-vhost.conf.j2 b/provisioning/templates/nginx-vhost.conf.j2
index 60c4d8ed5..7f37bc349 100644
--- a/provisioning/templates/nginx-vhost.conf.j2
+++ b/provisioning/templates/nginx-vhost.conf.j2
@@ -2,7 +2,7 @@
 server {
     listen       80;
     server_name  {{ item.server_name_redirect }};
-    return       301 http://{{ item.server_name }}$request_uri;
+    return       301 http://{{ item.server_name.split(' ')[0] }}$request_uri;
 }
 {% endif %}
 

From cc54a3a9b346bedbecbbb3c40923d6e7dfbb43ad Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 28 Feb 2016 21:42:29 -0600
Subject: [PATCH 0176/1273] PR #478 follow-up for exact scenario.

---
 docs/extras/scripts.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/extras/scripts.md b/docs/extras/scripts.md
index ae08e490f..2ae9b6f29 100644
--- a/docs/extras/scripts.md
+++ b/docs/extras/scripts.md
@@ -7,7 +7,7 @@ post_provision_scripts:
   - "../scripts/post-provision.sh"
 ```
 
-The above example results in a `post-provision.sh` script running after the main Drupal VM setup is complete. Note that post provision scripts run _every_ time you start the VM (`vagrant up`) or provision the environment (`vagrant provision`).
+The above example results in a `post-provision.sh` script running after the main Drupal VM setup is complete. Post provision scripts run after the first `vagrant up`, and then any time you run Vagrant provisioning (e.g. `vagrant provision` or `vagrant up --provision`).
 
 You can define as many scripts as you would like, and any arguments after the path will be passed to the shell script itself (e.g. `"- "../scripts/setup-paths.sh --option"`).
 

From 6cf35ffcf088c2a7ec95f45e5f56c9774774246a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sun, 28 Feb 2016 22:44:44 -0500
Subject: [PATCH 0177/1273] add drush aliases for webserver aliases to support
 multisite

---
 .../drupalvm-local.aliases.drushrc.php.j2         | 15 ++++++++++-----
 .../templates/drupalvm.aliases.drushrc.php.j2     | 15 ++++++++++-----
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2 b/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2
index 9acb46a51..a0d6ae238 100644
--- a/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2
+++ b/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2
@@ -7,23 +7,28 @@
  */
 
 {% macro alias(host, root) %}
+{%- if root not in _devtool_docroots %}
 $aliases['{{ host }}'] = array(
   'uri' => '{{ host }}',
   'root' => '{{ root }}',
 );
 
+{% endif -%}
 {% endmacro %}
 
 {%- if drupalvm_webserver == 'apache' -%}
   {%- for vhost in apache_vhosts -%}
-    {%- if vhost.documentroot not in _devtool_docroots -%}
-      {{ alias(vhost.servername, vhost.documentroot) }}
+    {{ alias(vhost.servername, vhost.documentroot) }}
+    {%- if vhost.serveralias is defined -%}
+      {%- for serveralias in vhost.serveralias.split() -%}
+        {{ alias(serveralias, vhost.documentroot) }}
+      {%- endfor -%}
     {%- endif -%}
   {%- endfor -%}
 {%- elif drupalvm_webserver == 'nginx' -%}
   {%- for host in nginx_hosts -%}
-    {%- if host.root not in _devtool_docroots -%}
-      {{ alias(host.server_name.split(' ')[0], host.root) }}
-    {%- endif -%}
+    {%- for server_name in host.server_name.split() -%}
+      {{ alias(server_name, host.root) }}
+    {%- endfor -%}
   {%- endfor -%}
 {%- endif -%}
diff --git a/provisioning/templates/drupalvm.aliases.drushrc.php.j2 b/provisioning/templates/drupalvm.aliases.drushrc.php.j2
index e534f0b74..bf9ff810d 100644
--- a/provisioning/templates/drupalvm.aliases.drushrc.php.j2
+++ b/provisioning/templates/drupalvm.aliases.drushrc.php.j2
@@ -7,6 +7,7 @@
  */
 
 {% macro alias(host, root) %}
+{%- if root not in _devtool_docroots %}
 $aliases['{{ host }}'] = array(
   'uri' => '{{ host }}',
   'root' => '{{ root }}',
@@ -15,18 +16,22 @@ $aliases['{{ host }}'] = array(
   'ssh-options' => '-o PasswordAuthentication=no -i ~/.vagrant.d/insecure_private_key',
 );
 
+{% endif -%}
 {% endmacro %}
 
 {%- if drupalvm_webserver == 'apache' -%}
   {%- for vhost in apache_vhosts -%}
-    {%- if vhost.documentroot not in _devtool_docroots -%}
-      {{ alias(vhost.servername, vhost.documentroot) }}
+    {{ alias(vhost.servername, vhost.documentroot) }}
+    {%- if vhost.serveralias is defined -%}
+      {%- for serveralias in vhost.serveralias.split() -%}
+        {{ alias(serveralias, vhost.documentroot) }}
+      {%- endfor -%}
     {%- endif -%}
   {%- endfor -%}
 {%- elif drupalvm_webserver == 'nginx' -%}
   {%- for host in nginx_hosts -%}
-    {%- if host.root not in _devtool_docroots -%}
-      {{ alias(host.server_name.split(' ')[0], host.root) }}
-    {%- endif -%}
+    {%- for server_name in host.server_name.split() -%}
+      {{ alias(server_name, host.root) }}
+    {%- endfor -%}
   {%- endfor -%}
 {%- endif -%}

From 4efd6540fdc2b1014809da00dd4428f824c857c1 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 28 Feb 2016 23:26:49 -0600
Subject: [PATCH 0178/1273] Fix deprecation warnings in Drupal VM tasks.

---
 provisioning/playbook.yml     | 2 +-
 provisioning/tasks/cron.yml   | 2 +-
 provisioning/tasks/extras.yml | 4 ++--
 provisioning/tasks/www.yml    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index d4e6318e4..1b7d3ab99 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -82,5 +82,5 @@
 
     - name: Run configured post-provision shell scripts.
       script: "{{ item }}"
-      with_items: post_provision_scripts
+      with_items: "{{ post_provision_scripts }}"
       when: post_provision_scripts is defined
diff --git a/provisioning/tasks/cron.yml b/provisioning/tasks/cron.yml
index 4fdfdf8e5..5d3725650 100644
--- a/provisioning/tasks/cron.yml
+++ b/provisioning/tasks/cron.yml
@@ -9,5 +9,5 @@
     month: "{{ item.month | default('*') }}"
     job: "{{ item.job }}"
     state: "{{ item.state | default('present') }}"
-  with_items: drupalvm_cron_jobs
+  with_items: "{{ drupalvm_cron_jobs }}"
   when: drupalvm_cron_jobs is defined
diff --git a/provisioning/tasks/extras.yml b/provisioning/tasks/extras.yml
index a7b7e7b74..b82c71f23 100644
--- a/provisioning/tasks/extras.yml
+++ b/provisioning/tasks/extras.yml
@@ -1,10 +1,10 @@
 ---
 - name: Install extra apt packages (if any are configured).
   apt: "name={{ item }} state=installed"
-  with_items: extra_packages | list
+  with_items: "{{ extra_packages | list }}"
   when: ansible_os_family == 'Debian' and extra_packages | length
 
 - name: Install extra yum packages (if any are configured).
   yum: "name={{ item }} state=installed"
-  with_items: extra_packages | list
+  with_items: "{{ extra_packages | list }}"
   when: ansible_os_family == 'RedHat' and extra_packages | length
diff --git a/provisioning/tasks/www.yml b/provisioning/tasks/www.yml
index 775653b63..9e410c1cc 100644
--- a/provisioning/tasks/www.yml
+++ b/provisioning/tasks/www.yml
@@ -31,6 +31,6 @@
     owner: root
     group: root
     mode: 0644
-  with_items: nginx_hosts
+  with_items: "{{ nginx_hosts }}"
   notify: restart nginx
   when: drupalvm_webserver == 'nginx'

From 812dcd02818dce37b9da907de5e35fe3882f051d Mon Sep 17 00:00:00 2001
From: Steve Purkiss <steve@purkiss.com>
Date: Tue, 1 Mar 2016 18:54:51 +0000
Subject: [PATCH 0179/1273] Update php-7.md

requirements.txt->yml
---
 docs/other/php-7.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/other/php-7.md b/docs/other/php-7.md
index 6ee43fe78..6dac51ed4 100644
--- a/docs/other/php-7.md
+++ b/docs/other/php-7.md
@@ -1,6 +1,6 @@
 Drupal VM fully supports PHP 7, but currently defaults to 5.6 in order to maximize compatibility with older Drupal 6 and 7 sites. Soon, Drupal VM will change its defaults to install PHP 7.x instead of 5.x, but until then, follow the instructions below to use PHP 7.
 
-_Note: If you have Ansible installed on your host machine, make sure you're running the latest version of all Ansible role dependencies by running `ansible-galaxy install -r provisioning/requirements.txt --force` inside the root Drupal VM project folder._
+_Note: If you have Ansible installed on your host machine, make sure you're running the latest version of all Ansible role dependencies by running `ansible-galaxy install -r provisioning/requirements.yml --force` inside the root Drupal VM project folder._
 
 ## Ubuntu 14.04
 

From 1bcc3d0aefeca7f4e45e5412ec2e3e41e9e7a77b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Tue, 1 Mar 2016 16:22:44 -0500
Subject: [PATCH 0180/1273] Fix centos tests failing due to galaxy bug

---
 tests/Dockerfile.centos-7 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/Dockerfile.centos-7 b/tests/Dockerfile.centos-7
index b3259e736..3cbb03045 100644
--- a/tests/Dockerfile.centos-7
+++ b/tests/Dockerfile.centos-7
@@ -14,13 +14,17 @@ rm -f /lib/systemd/system/anaconda.target.wants/*;
 
 # Install Ansible
 RUN yum -y install epel-release
-RUN yum -y install git ansible sudo which curl tar unzip xz logrotate initscripts
+RUN yum -y install git sudo which curl tar unzip xz logrotate initscripts
+RUN yum -y install python-setuptools gcc sudo libffi-devel python-devel openssl-devel
 RUN yum clean all
+RUN easy_install pip
+RUN pip install ansible
 
 # Disable requiretty
 RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
 
 # Install Ansible inventory file
+RUN mkdir -p /etc/ansible
 RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
 
 VOLUME ["/sys/fs/cgroup"]

From 65575ed488bbe9b90983e82cbe0f246344cd74df Mon Sep 17 00:00:00 2001
From: Thom Toogood <thomtoogood@gmail.com>
Date: Wed, 2 Mar 2016 18:57:58 +1100
Subject: [PATCH 0181/1273] Updated PHP7 PPA.

---
 provisioning/tasks/init-debian.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/tasks/init-debian.yml b/provisioning/tasks/init-debian.yml
index 14735b49d..b705971ac 100644
--- a/provisioning/tasks/init-debian.yml
+++ b/provisioning/tasks/init-debian.yml
@@ -22,7 +22,7 @@
   when: php_version == "5.6"
 
 - name: Add repository for PHP 7.0.
-  apt_repository: repo='ppa:ondrej/php-7.0'
+  apt_repository: repo='ppa:ondrej/php'
   when: php_version == "7.0"
 
 - name: Define php_xhprof_html_dir.

From 4f2d0f9ecb09fb5061fcf46dd708b44d3f6b170f Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 2 Mar 2016 10:38:45 -0600
Subject: [PATCH 0182/1273] PR #492 follow-up and Fixes #491: Update docs and
 add php7.0-xml for Ubuntu.

---
 docs/other/php-7.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/other/php-7.md b/docs/other/php-7.md
index 6dac51ed4..3270e58ec 100644
--- a/docs/other/php-7.md
+++ b/docs/other/php-7.md
@@ -19,6 +19,7 @@ php_packages:
   - php7.0-imap
   - php7.0-json
   - php7.0-opcache
+  - php7.0-xml
 php_mysql_package: php7.0-mysql
 php_fpm_daemon: php7.0-fpm
 php_fpm_pool_conf_path: "/etc/php/7.0/fpm/pool.d/www.conf"

From 0946a7cf4b93b3ddf761285d4d07d7dc80afa873 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 3 Mar 2016 23:16:39 -0500
Subject: [PATCH 0183/1273] Fixes #495: Set composer owner to vagrant user

---
 example.config.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/example.config.yml b/example.config.yml
index b4e407b42..38f42301c 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -216,7 +216,9 @@ php_enable_php_fpm: true
 php_fpm_listen: "127.0.0.1:9000"
 
 composer_path: /usr/bin/composer
-composer_home_path: '/home/vagrant/.composer'
+composer_home_path: "/home/{{ vagrant_user }}/.composer"
+composer_home_owner: "{{ vagrant_user }}"
+composer_home_group: "{{ vagrant_user }}"
 # composer_global_packages:
 #   - { name: phpunit/phpunit, release: '@stable' }
 

From 7060d7e5d4ce21707604e9bd1380e024015e435b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 3 Mar 2016 23:34:39 -0500
Subject: [PATCH 0184/1273] Fix incorrect gems/composer user when installing
 with ansible directly

---
 example.config.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/example.config.yml b/example.config.yml
index 38f42301c..65077598c 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -174,7 +174,7 @@ nodejs_version: "0.12"
 nodejs_npm_global_packages: []
 
 # `ruby` must be in installed_extras for this to work.
-ruby_install_gems_user: "{{ vagrant_user }}"
+ruby_install_gems_user: "{{ ansible_ssh_user }}"
 ruby_install_gems: []
 
 # You can configure almost anything else on the server in the rest of this file.
@@ -216,9 +216,9 @@ php_enable_php_fpm: true
 php_fpm_listen: "127.0.0.1:9000"
 
 composer_path: /usr/bin/composer
-composer_home_path: "/home/{{ vagrant_user }}/.composer"
-composer_home_owner: "{{ vagrant_user }}"
-composer_home_group: "{{ vagrant_user }}"
+composer_home_path: "/home/{{ ansible_ssh_user }}/.composer"
+composer_home_owner: "{{ ansible_ssh_user }}"
+composer_home_group: "{{ ansible_ssh_user }}"
 # composer_global_packages:
 #   - { name: phpunit/phpunit, release: '@stable' }
 

From 160787715f457fc1d27414143896967d27af8517 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Fri, 4 Mar 2016 13:38:19 -0500
Subject: [PATCH 0185/1273] fix incorrect user when installing locally

---
 .travis.yml                | 3 ++-
 example.config.yml         | 8 ++++----
 provisioning/vars/main.yml | 2 ++
 tests/test-vars.yml        | 1 +
 4 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 tests/test-vars.yml

diff --git a/.travis.yml b/.travis.yml
index f620f595b..e42e246f4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -54,7 +54,8 @@ script:
   - 'sudo docker exec "$(cat ${container_id})" cp /var/www/drupalvm/$CONFIG /var/www/drupalvm/config.yml'
   - 'sudo docker exec "$(cat ${container_id})" cp /var/www/drupalvm/$MAKEFILE /var/www/drupalvm/drupal.make.yml'
 
-  # Append additional variables if set.
+  # Append additional variables.
+  - 'sudo docker exec "$(cat ${container_id})" bash -c "cat /var/www/drupalvm/tests/test-vars.yml >> /var/www/drupalvm/config.yml" || true'
   - '[[ $additional_vars ]] && sudo docker exec "$(cat ${container_id})" bash -c "cat /var/www/drupalvm/tests/${additional_vars} >> /var/www/drupalvm/config.yml" || true'
 
   # Vagrantfile syntax check
diff --git a/example.config.yml b/example.config.yml
index 65077598c..3affc9e40 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -174,7 +174,7 @@ nodejs_version: "0.12"
 nodejs_npm_global_packages: []
 
 # `ruby` must be in installed_extras for this to work.
-ruby_install_gems_user: "{{ ansible_ssh_user }}"
+ruby_install_gems_user: "{{ drupalvm_user }}"
 ruby_install_gems: []
 
 # You can configure almost anything else on the server in the rest of this file.
@@ -216,9 +216,9 @@ php_enable_php_fpm: true
 php_fpm_listen: "127.0.0.1:9000"
 
 composer_path: /usr/bin/composer
-composer_home_path: "/home/{{ ansible_ssh_user }}/.composer"
-composer_home_owner: "{{ ansible_ssh_user }}"
-composer_home_group: "{{ ansible_ssh_user }}"
+composer_home_path: "/home/{{ drupalvm_user }}/.composer"
+composer_home_owner: "{{ drupalvm_user }}"
+composer_home_group: "{{ drupalvm_user }}"
 # composer_global_packages:
 #   - { name: phpunit/phpunit, release: '@stable' }
 
diff --git a/provisioning/vars/main.yml b/provisioning/vars/main.yml
index 905659ad0..6f2ea140e 100644
--- a/provisioning/vars/main.yml
+++ b/provisioning/vars/main.yml
@@ -4,3 +4,5 @@ _devtool_docroots:
   - "{{ pimpmylog_install_dir }}"
   - "{{ php_xhprof_html_dir }}"
   - "{{ dashboard_install_dir|default('') }}"
+
+drupalvm_user: "{{ ansible_ssh_user | default(ansible_env.SUDO_USER, true) | default(ansible_env.USER, true) | default(ansible_user_id) }}"
diff --git a/tests/test-vars.yml b/tests/test-vars.yml
new file mode 100644
index 000000000..3c765fddb
--- /dev/null
+++ b/tests/test-vars.yml
@@ -0,0 +1 @@
+composer_home_path: "/{{ drupalvm_user }}/.composer"

From 9ada7ab8c5e6731c7c8362a9e09ad65fc5142308 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 5 Mar 2016 17:18:19 -0600
Subject: [PATCH 0186/1273] Update PHP 7.0 docs to include mbstring extension.

---
 docs/other/php-7.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/other/php-7.md b/docs/other/php-7.md
index 3270e58ec..457d5a153 100644
--- a/docs/other/php-7.md
+++ b/docs/other/php-7.md
@@ -20,6 +20,7 @@ php_packages:
   - php7.0-json
   - php7.0-opcache
   - php7.0-xml
+  - php7.0-mbstring
 php_mysql_package: php7.0-mysql
 php_fpm_daemon: php7.0-fpm
 php_fpm_pool_conf_path: "/etc/php/7.0/fpm/pool.d/www.conf"

From 1fd29267125e2750fd100f9159939ee3401c0c80 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 10 Mar 2016 10:24:47 -0600
Subject: [PATCH 0187/1273] Update default Drupal core branch to 8.1.x.

---
 example.drupal.make.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/example.drupal.make.yml b/example.drupal.make.yml
index 8c564b851..8f705de48 100644
--- a/example.drupal.make.yml
+++ b/example.drupal.make.yml
@@ -14,7 +14,7 @@ projects:
     type: "core"
     download:
       # Drupal core branch (e.g. "6.x", "7.x", "8.0.x").
-      branch: "8.0.x"
+      branch: "8.1.x"
       working-copy: true
 
   # Other modules.

From 0cc7868e69d64a13c70f7ccfb4ba4e8aee71157e Mon Sep 17 00:00:00 2001
From: Jean Valverde <Mogtofu33@users.noreply.github.com>
Date: Tue, 15 Mar 2016 11:18:51 +0100
Subject: [PATCH 0188/1273] Update windows.md

Add Windows Winnfsd information and vagrant-winnfsd fork suggestion.
---
 docs/other/windows.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/docs/other/windows.md b/docs/other/windows.md
index d54e5bdc4..e3238e41f 100644
--- a/docs/other/windows.md
+++ b/docs/other/windows.md
@@ -44,6 +44,27 @@ You can use the [vagrant-winnfsd](https://github.com/GM-Alex/vagrant-winnfsd) pl
 
 Another option for the more adventurous is to manually install and configure WinNFSD, and manually mount the shares within your VM. This requires a bit more work, but could be more stable on Windows; see this blog post for more details: [Windows + Vagrant + WinNFSD without file update problems](https://hollyit.net/blog/windowsvagrantwinnfsd-without-file-update-problems).
 
+There is a fork of vagrant-winnfsd that add logging and debug https://github.com/GuyPaddock/vagrant-winnfsd, replace in your .vagrant.d\gems\gems folder to test it.
+
+The best config is to mount only one folder with nfs see [vagrant-winnfsd issue #12](https://github.com/winnfsd/vagrant-winnfsd/issues/12#issuecomment-78195957), so you need to adapt your config and set vagrant folder to native:
+
+    vagrant_synced_folder_default_type: ""
+
+Add mount_options to your synced folder to avoid an error:
+
+    type: nfs
+    mount_options: ["rw","vers=3","udp","nolock"]
+
+In your Vagrantfile.local, add user access to vagrant:
+
+    config.winnfsd.uid=900
+    config.winnfsd.gid=900
+
+If you are using the fork of vagrant-winnfsd, you can set aditionnal options and use logging="on" in case of problem in your Vagrantfile.local:
+
+    config.winnfsd.logging="off"
+    config.winnfsd.halt_on_reload="on"
+
 ### "Authentication failure" on vagrant up
 
 Some Windows users have reported running into an issue where an authentication failure is reported once the VM is booted (e.g. `drupalvm: Warning: Authentication failure. Retrying...` — see [#170](https://github.com/geerlingguy/drupal-vm/issues/170)). To fix this, do the following:

From 187825e2ecd832e8593fc82797454d25a3161159 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 17 Mar 2016 12:33:43 -0500
Subject: [PATCH 0189/1273] Fixes #515: Install drupal with Drush fails due to
 8.1.x composer install requirement.

---
 .gitignore                            |  1 +
 provisioning/tasks/build-makefile.yml | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/.gitignore b/.gitignore
index c864bfad7..3958f643a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 .project/
 .vagrant/
 .bundle/
+*.retry
 vagrant_ansible_inventory_default
 config.yml
 drupal.make.yml
diff --git a/provisioning/tasks/build-makefile.yml b/provisioning/tasks/build-makefile.yml
index 0c503acd2..c74c9ce6f 100644
--- a/provisioning/tasks/build-makefile.yml
+++ b/provisioning/tasks/build-makefile.yml
@@ -20,3 +20,15 @@
     chdir={{ drupal_core_path }}
   when: drupal_site.stat.exists == false
   become: no
+
+- name: Check if a composer.json file is present.
+  stat: "path={{ drupal_core_path }}/composer.json"
+  register: drupal_core_composer_file
+  when: drupal_site.stat.exists == false
+
+- name: Run composer install if composer.json is present.
+  command: >
+    composer install
+    chdir={{ drupal_core_path }}
+  when: drupal_site.stat.exists == false and drupal_core_composer_file.stat.exists == true
+  become: no

From f9ed87f146c46518df82d0964a1821f177a79eb1 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 17 Mar 2016 14:08:18 -0500
Subject: [PATCH 0190/1273] Fixes #499: Allow Drupal VM to work on Debian base
 boxes.

---
 docs/other/base-os.md              | 2 ++
 provisioning/tasks/init-debian.yml | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/docs/other/base-os.md b/docs/other/base-os.md
index 623888819..17ff0b4f9 100644
--- a/docs/other/base-os.md
+++ b/docs/other/base-os.md
@@ -9,6 +9,8 @@ Currently-supported OSes are:
 
 For certain OSes, there are a couple other caveats and tweaks you may need to perform to get things running smoothly—the main features and latest development is only guaranteed to work with the default OS as configured in `example.config.yml`.
 
+Some other OSes should work, but are not regularly tested with Drupal VM, including Debian 8/Jessie (`debian/jessie64`) and Debian 7/Wheezy (`debian/wheezy64`).
+
 ## RedHat Enterprise Linux / CentOS 7
 
 **MySQL/MariaDB**: RHEL/CentOS 7 switched from using MySQL as the default database system to using MariaDB, so to make sure everything is configured properly, you need to add the following to `config.yml` so MariaDB installs correctly:
diff --git a/provisioning/tasks/init-debian.yml b/provisioning/tasks/init-debian.yml
index b705971ac..02b4d8a06 100644
--- a/provisioning/tasks/init-debian.yml
+++ b/provisioning/tasks/init-debian.yml
@@ -12,18 +12,19 @@
 
 - name: Disable the ufw firewall (since we use a simple iptables firewall).
   service: name=ufw state=stopped
+  when: ansible_distribution == "Ubuntu"
 
 - name: Add repository for PHP 5.5.
   apt_repository: repo='ppa:ondrej/php5'
-  when: php_version == "5.5"
+  when: php_version == "5.5" and ansible_distribution == "Ubuntu"
 
 - name: Add repository for PHP 5.6.
   apt_repository: repo='ppa:ondrej/php5-5.6'
-  when: php_version == "5.6"
+  when: php_version == "5.6" and ansible_distribution == "Ubuntu"
 
 - name: Add repository for PHP 7.0.
   apt_repository: repo='ppa:ondrej/php'
-  when: php_version == "7.0"
+  when: php_version == "7.0" and ansible_distribution == "Ubuntu"
 
 - name: Define php_xhprof_html_dir.
   set_fact:

From d93a31d245048eb8e22ef10c7f8c1b2d0e8d8d1a Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 17 Mar 2016 16:29:51 -0500
Subject: [PATCH 0191/1273] Expand documentation around the XHProf module.

---
 docs/extras/xhprof.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/extras/xhprof.md b/docs/extras/xhprof.md
index 74d724881..972a49201 100644
--- a/docs/extras/xhprof.md
+++ b/docs/extras/xhprof.md
@@ -6,7 +6,9 @@ As a prerequisite, make sure you have `xhprof` in the `installed_extras` list in
 
 The easiest way to use XHProf to profile your PHP code on a Drupal site is to install the [XHProf](https://www.drupal.org/project/xhprof) module, then in XHProf's configuration (at `/admin/config/development/xhprof`), check the 'Enable profiling of page views and drush requests' checkbox.
 
-The XHProf module doesn't yet include support for callgraphs, but there's an issue to [add callgraph support](https://www.drupal.org/node/1470740).
+The XHProf module doesn't include built-in support for callgraphs, but there's an issue to [add callgraph support](https://www.drupal.org/node/1470740).
+
+You can view callgraphs (and a listing of all stored runs) using Drupal VM's own XHProf installation by visiting `http://xhprof.drupalvm.dev/` and clicking on the relevant run, then clicking the "[View Full Callgraph]" link.
 
 ## Devel module (deprecated)
 

From d9a56d8867683f2fb013b0c8f3415beba79172b2 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 20 Mar 2016 20:42:14 -0500
Subject: [PATCH 0192/1273] Fixes #519: Ensure Parallels guest tools are
 installed and up to date.

---
 Vagrantfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Vagrantfile b/Vagrantfile
index 9ef14ab6e..e68861320 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -150,6 +150,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     p.name = vconfig['vagrant_hostname']
     p.memory = vconfig['vagrant_memory']
     p.cpus = vconfig['vagrant_cpus']
+    p.update_guest_tools = true
   end
 
   # Set the name of the VM. See: http://stackoverflow.com/a/17864388/100134

From 6081d58e7b09032f53833ac6aa695625d588a5d9 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 21 Mar 2016 16:01:50 -0500
Subject: [PATCH 0193/1273] Issue #397: Add basic Varnish cache tag support
 with BANs.

---
 provisioning/templates/drupalvm.vcl.j2 | 31 ++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/provisioning/templates/drupalvm.vcl.j2 b/provisioning/templates/drupalvm.vcl.j2
index 29ede513f..6125d1f78 100644
--- a/provisioning/templates/drupalvm.vcl.j2
+++ b/provisioning/templates/drupalvm.vcl.j2
@@ -34,6 +34,26 @@ sub vcl_recv {
         return (hash);
     }
 
+    # Only allow BAN requests from IP addresses in the 'purge' ACL.
+    if (req.method == "BAN") {
+        # Same ACL check as above:
+        if (!client.ip ~ purge) {
+            return (synth(403, "Not allowed."));
+        }
+
+        # Logic for the ban, using the X-Drupal-Cache-Tags header. For more info
+        # read through https://github.com/geerlingguy/drupal-vm/issues/397.
+        if (req.http.X-Drupal-Cache-Tags) {
+            ban("obj.http.X-Drupal-Cache-Tags ~ " + req.http.X-Drupal-Cache-Tags);
+        }
+        else {
+            return (synth(403, "X-Drupal-Cache-Tags header missing."));
+        }
+
+        # Throw a synthetic page so the request won't go to the backend.
+        return (synth(200, "Ban added."));
+    }
+
     # Only cache GET and HEAD requests (pass through POST requests).
     if (req.method != "GET" && req.method != "HEAD") {
         return (pass);
@@ -90,6 +110,13 @@ sub vcl_recv {
 
 # Set a header to track a cache HITs and MISSes.
 sub vcl_deliver {
+    # Remove ban-lurker friendly custom headers when delivering to client.
+    unset resp.http.X-Url;
+    unset resp.http.X-Host;
+    # Uncomment on production (when not debugging).
+    # unset resp.http.X-Drupal-Cache-Tags;
+    # unset resp.http.X-Drupal-Cache-Contexts;
+
     if (obj.hits > 0) {
         set resp.http.X-Varnish-Cache = "HIT";
     }
@@ -100,6 +127,10 @@ sub vcl_deliver {
 
 # Instruct Varnish what to do in the case of certain backend responses (beresp).
 sub vcl_backend_response {
+    # Set ban-lurker friendly custom headers.
+    set beresp.http.X-Url = bereq.url;
+    set beresp.http.X-Host = bereq.http.host;
+
     # Cache 404s, 301s, at 500s with a short lifetime to protect the backend.
     if (beresp.status == 404 || beresp.status == 301 || beresp.status == 500) {
         set beresp.ttl = 10m;

From f7e708db80a392d5d53863191f5af8e5dd273c3f Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 21 Mar 2016 22:47:30 -0500
Subject: [PATCH 0194/1273] Issue #397: Use X-Cache-Tags instead of
 X-Drupal-Cache-Tags for BANs.

---
 provisioning/templates/drupalvm.vcl.j2 | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/provisioning/templates/drupalvm.vcl.j2 b/provisioning/templates/drupalvm.vcl.j2
index 6125d1f78..93e27341c 100644
--- a/provisioning/templates/drupalvm.vcl.j2
+++ b/provisioning/templates/drupalvm.vcl.j2
@@ -41,13 +41,13 @@ sub vcl_recv {
             return (synth(403, "Not allowed."));
         }
 
-        # Logic for the ban, using the X-Drupal-Cache-Tags header. For more info
-        # read through https://github.com/geerlingguy/drupal-vm/issues/397.
-        if (req.http.X-Drupal-Cache-Tags) {
-            ban("obj.http.X-Drupal-Cache-Tags ~ " + req.http.X-Drupal-Cache-Tags);
+        # Logic for the ban, using the X-Cache-Tags header. For more info, see
+        # https://github.com/geerlingguy/drupal-vm/issues/397.
+        if (req.http.X-Cache-Tags) {
+            ban("obj.http.X-Cache-Tags ~ " + req.http.X-Cache-Tags);
         }
         else {
-            return (synth(403, "X-Drupal-Cache-Tags header missing."));
+            return (synth(403, "X-Cache-Tags header missing."));
         }
 
         # Throw a synthetic page so the request won't go to the backend.
@@ -114,8 +114,7 @@ sub vcl_deliver {
     unset resp.http.X-Url;
     unset resp.http.X-Host;
     # Uncomment on production (when not debugging).
-    # unset resp.http.X-Drupal-Cache-Tags;
-    # unset resp.http.X-Drupal-Cache-Contexts;
+    # unset resp.http.X-Cache-Tags;
 
     if (obj.hits > 0) {
         set resp.http.X-Varnish-Cache = "HIT";

From 9754228e7e934c4f6c1f9d62a7160873836f883b Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 22 Mar 2016 10:44:40 -0500
Subject: [PATCH 0195/1273] Fixes #397: Add cache tag support to default
 Varnish config.

---
 provisioning/templates/drupalvm.vcl.j2 | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/provisioning/templates/drupalvm.vcl.j2 b/provisioning/templates/drupalvm.vcl.j2
index 93e27341c..e515d2a65 100644
--- a/provisioning/templates/drupalvm.vcl.j2
+++ b/provisioning/templates/drupalvm.vcl.j2
@@ -41,13 +41,13 @@ sub vcl_recv {
             return (synth(403, "Not allowed."));
         }
 
-        # Logic for the ban, using the X-Cache-Tags header. For more info, see
-        # https://github.com/geerlingguy/drupal-vm/issues/397.
-        if (req.http.X-Cache-Tags) {
-            ban("obj.http.X-Cache-Tags ~ " + req.http.X-Cache-Tags);
+        # Logic for the ban, using the X-Drupal-Cache-Tags header. For more info
+        # see https://github.com/geerlingguy/drupal-vm/issues/397.
+        if (req.http.X-Drupal-Cache-Tags) {
+            ban("obj.http.X-Drupal-Cache-Tags ~ " + req.http.X-Drupal-Cache-Tags);
         }
         else {
-            return (synth(403, "X-Cache-Tags header missing."));
+            return (synth(403, "X-Drupal-Cache-Tags header missing."));
         }
 
         # Throw a synthetic page so the request won't go to the backend.
@@ -113,8 +113,9 @@ sub vcl_deliver {
     # Remove ban-lurker friendly custom headers when delivering to client.
     unset resp.http.X-Url;
     unset resp.http.X-Host;
-    # Uncomment on production (when not debugging).
-    # unset resp.http.X-Cache-Tags;
+    # Comment these for easier Drupal cache tag debugging in development.
+    unset resp.http.X-Drupal-Cache-Tags;
+    unset resp.http.X-Drupal-Cache-Contexts;
 
     if (obj.hits > 0) {
         set resp.http.X-Varnish-Cache = "HIT";

From 22832033a2eae0ab6deee74238a736e2d1934294 Mon Sep 17 00:00:00 2001
From: Jean Valverde <Mogtofu33@users.noreply.github.com>
Date: Thu, 24 Mar 2016 18:41:10 +1300
Subject: [PATCH 0196/1273] Update windows.md

Update my poor english sentence!
---
 docs/other/windows.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/other/windows.md b/docs/other/windows.md
index e3238e41f..42373784e 100644
--- a/docs/other/windows.md
+++ b/docs/other/windows.md
@@ -44,7 +44,7 @@ You can use the [vagrant-winnfsd](https://github.com/GM-Alex/vagrant-winnfsd) pl
 
 Another option for the more adventurous is to manually install and configure WinNFSD, and manually mount the shares within your VM. This requires a bit more work, but could be more stable on Windows; see this blog post for more details: [Windows + Vagrant + WinNFSD without file update problems](https://hollyit.net/blog/windowsvagrantwinnfsd-without-file-update-problems).
 
-There is a fork of vagrant-winnfsd that add logging and debug https://github.com/GuyPaddock/vagrant-winnfsd, replace in your .vagrant.d\gems\gems folder to test it.
+GuyPaddock's fork of [vagrant-winnfsd](https://github.com/GuyPaddock/vagrant-winnfsd) adds logging and debug messages. You can replace the vagrant-winnfsd gem inside .vagrant.d\gems\gems to use it instead.
 
 The best config is to mount only one folder with nfs see [vagrant-winnfsd issue #12](https://github.com/winnfsd/vagrant-winnfsd/issues/12#issuecomment-78195957), so you need to adapt your config and set vagrant folder to native:
 

From 0c0671023030e7e0d4fdf039354505af8b4c7c94 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 24 Mar 2016 12:35:55 -0500
Subject: [PATCH 0197/1273] Fixes #529: Use Purge-Cache-Tags instead of
 X-Drupal-Cache-Tags for Varnish tags.

---
 provisioning/templates/drupalvm.vcl.j2 | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/provisioning/templates/drupalvm.vcl.j2 b/provisioning/templates/drupalvm.vcl.j2
index e515d2a65..8b5f76e93 100644
--- a/provisioning/templates/drupalvm.vcl.j2
+++ b/provisioning/templates/drupalvm.vcl.j2
@@ -41,13 +41,13 @@ sub vcl_recv {
             return (synth(403, "Not allowed."));
         }
 
-        # Logic for the ban, using the X-Drupal-Cache-Tags header. For more info
+        # Logic for the ban, using the Purge-Cache-Tags header. For more info
         # see https://github.com/geerlingguy/drupal-vm/issues/397.
-        if (req.http.X-Drupal-Cache-Tags) {
-            ban("obj.http.X-Drupal-Cache-Tags ~ " + req.http.X-Drupal-Cache-Tags);
+        if (req.http.Purge-Cache-Tags) {
+            ban("obj.http.Purge-Cache-Tags ~ " + req.http.Purge-Cache-Tags);
         }
         else {
-            return (synth(403, "X-Drupal-Cache-Tags header missing."));
+            return (synth(403, "Purge-Cache-Tags header missing."));
         }
 
         # Throw a synthetic page so the request won't go to the backend.
@@ -113,9 +113,7 @@ sub vcl_deliver {
     # Remove ban-lurker friendly custom headers when delivering to client.
     unset resp.http.X-Url;
     unset resp.http.X-Host;
-    # Comment these for easier Drupal cache tag debugging in development.
-    unset resp.http.X-Drupal-Cache-Tags;
-    unset resp.http.X-Drupal-Cache-Contexts;
+    unset resp.http.Purge-Cache-Tags;
 
     if (obj.hits > 0) {
         set resp.http.X-Varnish-Cache = "HIT";

From 2bc896658adc94a92de9ac917bca780341b98642 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 26 Mar 2016 12:08:44 -0500
Subject: [PATCH 0198/1273] Issue #527: Add Varnish support for BigPipe
 streaming.

---
 provisioning/templates/drupalvm.vcl.j2 | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/provisioning/templates/drupalvm.vcl.j2 b/provisioning/templates/drupalvm.vcl.j2
index 8b5f76e93..90400c4ff 100644
--- a/provisioning/templates/drupalvm.vcl.j2
+++ b/provisioning/templates/drupalvm.vcl.j2
@@ -134,6 +134,12 @@ sub vcl_backend_response {
         set beresp.ttl = 10m;
     }
 
+    # Enable streaming directly to backend for BigPipe responses.
+    if (beresp.http.Surrogate-Control ~ "BigPipe/1.0") {
+        set beresp.do_stream = true;
+        set beresp.ttl = 0s;
+    }
+
     # Don't allow static files to set cookies.
     # (?i) denotes case insensitive in PCRE (perl compatible regular expressions).
     # This list of extensions appears twice, once here and again in vcl_recv so

From 4ed1eda0db7f501caadd1e56307f419344746484 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 28 Mar 2016 20:50:00 -0400
Subject: [PATCH 0199/1273] Fixes #531: Use stable official Nginx release
 instead of system package.

---
 example.config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/example.config.yml b/example.config.yml
index 3affc9e40..6948db62f 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -133,6 +133,7 @@ nginx_hosts:
     root: "{{ dashboard_install_dir }}"
 
 nginx_remove_default_vhost: true
+nginx_ppa_use: true
 
 # MySQL Databases and users. If build_makefile: is true, first database will
 # be used for the makefile-built site.

From d116204f6f18bd03809d9f9448892e4adf71c0c3 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 28 Mar 2016 22:13:47 -0400
Subject: [PATCH 0200/1273] Fixes #527: Support BigPipe streaming in Drupal VM
 - Varnish VCL and docs update.

---
 docs/other/bigpipe.md | 35 +++++++++++++++++++++++++++++++++++
 mkdocs.yml            |  1 +
 2 files changed, 36 insertions(+)
 create mode 100644 docs/other/bigpipe.md

diff --git a/docs/other/bigpipe.md b/docs/other/bigpipe.md
new file mode 100644
index 000000000..9ab3af9f1
--- /dev/null
+++ b/docs/other/bigpipe.md
@@ -0,0 +1,35 @@
+[BigPipe](https://www.drupal.org/documentation/modules/big_pipe) is a Drupal module that was added as an 'experimental' module in Drupal 8.1. BigPipe allows PHP responses to be streamed in-progress so authenticated end users can recieve a cached response very quickly, with placeholders for more dynamic (harder to cache) content that are filled in during the same request.
+
+To do this, BigPipe requires an environment configured to allow the authenticated request response to be streamed from PHP all the way through to the client. All parts of the web stack that intermediate the connection have to have output buffering disabled so the response stream can flow through.
+
+Drupal VM's default configuration uses Apache's `mod_proxy_fastcgi` module, which doesn't allow output buffering to be disabled, so to use BigPipe with Drupal VM, you will need to either switch to Nginx or make a few modifications to the Apache configuration.
+
+Drupal VM's Varnish configuration works with BigPipe out of the box, as it allows the backend response to be streamed whenever BigPipe is enabled (it outputs a `Surrogate-Control: BigPipe/1.0` header to tell Varnish when to stream the response).
+
+## PHP configuration
+
+BigPipe requires PHP's output buffering to be disabled. To do this, add the following line to `config.yml` with the other PHP configuration settings:
+
+    php_output_buffering: "Off"
+
+(You also need to make sure `zlib.output_compression` is `Off`—but that's the default, so you shouldn't need to change anything else in the PHP configuration).
+
+## Nginx configuration
+
+There is no extra configuration required to get BigPipe working with Nginx.
+
+Nginx is the recommended way to use BigPipe, for the following reasons:
+
+  - It's easier to configure Nginx to handle hundreds (or more) concurrent connections through to PHP-FPM than `mod_php`, and more widely used than the other compatible Apache CGI modules `mod_fcgid` and `mod_fastcgi`
+  - Nginx intelligently disables output buffering and gzip if the `X-Accel-Buffering: no` header is present (BigPipe sets this header automatically). This means gzip and buffering can be enabled for most requests, and disabled on-the-fly by BigPipe.
+
+## Apache configuration
+
+There are a few ways you can configure Apache to work with a streamed response, but Drupal VM's default configuration uses `mod_proxy_fastcgi`, which is incompatible with BigPipe.
+
+If you don't want to use Nginx (which requires no special configuration), you can switch Apache to use `mod_php` by making the following changes in `config.yml`:
+
+  1. Add `libapache2-mod-php5` to `extra_packages` in `config.yml`.
+  2. Delete the `extra_parameters` under any Drupal site in the list of `apache_vhosts` (so there is no `ProxyPassMatch` rule).
+
+You can also disable PHP-FPM and remove the two `proxy` entries from `apache_mods_enabled` if you don't want to use PHP-FPM with Apache at all, but that's optional; it won't break anything to run Apache with `mod_php` and `mod_proxy_fastcgi` at the same time.
diff --git a/mkdocs.yml b/mkdocs.yml
index bd0beaceb..797d5d2e6 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -35,6 +35,7 @@ pages:
     - 'Using Different Webservers': 'other/webservers.md'
     - 'Using a local Vagrantfile': 'other/local-vagrantfile.md'
     - 'PHP 7 on Drupal VM': 'other/php-7.md'
+    - 'BigPipe with Drupal VM': 'other/bigpipe.md'
     - 'Drupal VM Management Tools': 'other/management-tools.md'
     - 'Networking Notes': 'other/networking.md'
     - 'Drupal 6 Notes': 'other/drupal-6.md'

From 2264d6e07f13bf58ba564112c01373fc78a1c790 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 29 Mar 2016 18:14:09 -0400
Subject: [PATCH 0201/1273] Fixes #532: Clean up BigPipe documentation for
 Apache and Nginx.

---
 docs/other/bigpipe.md | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/docs/other/bigpipe.md b/docs/other/bigpipe.md
index 9ab3af9f1..84cd09659 100644
--- a/docs/other/bigpipe.md
+++ b/docs/other/bigpipe.md
@@ -2,17 +2,13 @@
 
 To do this, BigPipe requires an environment configured to allow the authenticated request response to be streamed from PHP all the way through to the client. All parts of the web stack that intermediate the connection have to have output buffering disabled so the response stream can flow through.
 
-Drupal VM's default configuration uses Apache's `mod_proxy_fastcgi` module, which doesn't allow output buffering to be disabled, so to use BigPipe with Drupal VM, you will need to either switch to Nginx or make a few modifications to the Apache configuration.
+Drupal VM's default configuration uses Apache with the `mod_proxy_fastcgi` module to connect to PHP-FPM, which isn't the most optimal configuration for BigPipe, and requires gzip compression to be disabled, so you should either switch to Nginx or consider further customizing the Apache configuration.
 
 Drupal VM's Varnish configuration works with BigPipe out of the box, as it allows the backend response to be streamed whenever BigPipe is enabled (it outputs a `Surrogate-Control: BigPipe/1.0` header to tell Varnish when to stream the response).
 
 ## PHP configuration
 
-BigPipe requires PHP's output buffering to be disabled. To do this, add the following line to `config.yml` with the other PHP configuration settings:
-
-    php_output_buffering: "Off"
-
-(You also need to make sure `zlib.output_compression` is `Off`—but that's the default, so you shouldn't need to change anything else in the PHP configuration).
+BigPipe doesn't require any particular modifications to PHP in Drupal VM's default configuration. However, for some test scenarios, you can disable php's `output_buffering` entirely by setting `php_output_buffering: "Off"` in `config.yml`.
 
 ## Nginx configuration
 
@@ -25,9 +21,17 @@ Nginx is the recommended way to use BigPipe, for the following reasons:
 
 ## Apache configuration
 
-There are a few ways you can configure Apache to work with a streamed response, but Drupal VM's default configuration uses `mod_proxy_fastcgi`, which is incompatible with BigPipe.
+Apache has three primary means of interacting with PHP applications like Drupal: `mod_php`, `mod_fastcgi`, and `mod_proxy_fcgi`. Drupal VM uses `mod_proxy_fcgi`, which is the most widely used and supported method of using Apache with PHP-FPM for the best scalability and memory management with Apache + PHP.
+
+For all of these methods, you have to make sure `mod_deflate` gzip compression is disabled; you can do this by adding the following line immediately after the `ProxyPassMatch` line under a host in the `apache_vhosts` list inside `config.yml`:
+
+    SetEnv no-gzip 1
+
+This will disable the `mod_deflate` module for any requests inside that directory.
+
+> Even without gzip, `mod_proxy_fcgi` buffers responses in a minimum of 4096-byte chunks. Most BigPipe usage deals with chunks of content larger than that, but if you're testing PHP's output buffering and notice that Apache delivers the entire page at once instead of flushing output immediately, you might be running into this buffer. See [this issue](https://github.com/geerlingguy/drupal-vm/issues/532#issuecomment-203128163) for more information.
 
-If you don't want to use Nginx (which requires no special configuration), you can switch Apache to use `mod_php` by making the following changes in `config.yml`:
+If you want to switch Apache to use `mod_php` instead of proxying requests through PHP-FPM, you can make the following changes in `config.yml`:
 
   1. Add `libapache2-mod-php5` to `extra_packages` in `config.yml`.
   2. Delete the `extra_parameters` under any Drupal site in the list of `apache_vhosts` (so there is no `ProxyPassMatch` rule).

From 45480a840f2d775fc4f4d23926215fd32a39ec56 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 30 Mar 2016 22:40:23 -0400
Subject: [PATCH 0202/1273] Issue #532: Clean up BigPipe docs further.

---
 docs/other/bigpipe.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/other/bigpipe.md b/docs/other/bigpipe.md
index 84cd09659..82315dfd5 100644
--- a/docs/other/bigpipe.md
+++ b/docs/other/bigpipe.md
@@ -8,7 +8,7 @@ Drupal VM's Varnish configuration works with BigPipe out of the box, as it allow
 
 ## PHP configuration
 
-BigPipe doesn't require any particular modifications to PHP in Drupal VM's default configuration. However, for some test scenarios, you can disable php's `output_buffering` entirely by setting `php_output_buffering: "Off"` in `config.yml`.
+BigPipe doesn't require any particular modifications to PHP in Drupal VM's default configuration. However, for some scenarios, you might want to disable php's `output_buffering` entirely by setting `php_output_buffering: "Off"` in `config.yml`, or change the `output_buffering` level from it's default of `4096` bytes.
 
 ## Nginx configuration
 
@@ -29,8 +29,6 @@ For all of these methods, you have to make sure `mod_deflate` gzip compression i
 
 This will disable the `mod_deflate` module for any requests inside that directory.
 
-> Even without gzip, `mod_proxy_fcgi` buffers responses in a minimum of 4096-byte chunks. Most BigPipe usage deals with chunks of content larger than that, but if you're testing PHP's output buffering and notice that Apache delivers the entire page at once instead of flushing output immediately, you might be running into this buffer. See [this issue](https://github.com/geerlingguy/drupal-vm/issues/532#issuecomment-203128163) for more information.
-
 If you want to switch Apache to use `mod_php` instead of proxying requests through PHP-FPM, you can make the following changes in `config.yml`:
 
   1. Add `libapache2-mod-php5` to `extra_packages` in `config.yml`.

From ff65a2eaad7fdd78669e51c19d43d7e92af90d00 Mon Sep 17 00:00:00 2001
From: Nate Haug <nate@quicksketch.org>
Date: Fri, 1 Apr 2016 19:53:13 -0700
Subject: [PATCH 0203/1273] Issue #540: Clarify PHP 7 requirements.

---
 example.config.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/example.config.yml b/example.config.yml
index 6948db62f..ad1c61a67 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -199,6 +199,8 @@ firewall_allowed_tcp_ports:
 firewall_log_dropped_packets: false
 
 # PHP Configuration. Currently-supported versions: 5.5, 5.6, 7.0.
+# PHP 7.0 requires a few additional changes. See the documentation at
+# http://docs.drupalvm.com/en/latest/other/php-7/
 php_version: "5.6"
 php_memory_limit: "192M"
 php_display_errors: "On"

From fd162438d6d1d8fe26d886f07b3d952dc95f7ad7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 7 Apr 2016 14:47:32 -0500
Subject: [PATCH 0204/1273] Issue #550: Make unzip a dependency

---
 example.config.yml                 | 3 +--
 provisioning/tasks/init-debian.yml | 1 +
 provisioning/tasks/init-redhat.yml | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/example.config.yml b/example.config.yml
index ad1c61a67..d3083e0a0 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -166,8 +166,7 @@ installed_extras:
   - xhprof
 
 # Add any extra apt or yum packages you would like installed.
-extra_packages:
-  - unzip
+extra_packages: []
 
 # `nodejs` must be in installed_extras for this to work. Valid examples: "0.10",
 # "0.12", "4.x", "5.x".
diff --git a/provisioning/tasks/init-debian.yml b/provisioning/tasks/init-debian.yml
index 02b4d8a06..a57a059ac 100644
--- a/provisioning/tasks/init-debian.yml
+++ b/provisioning/tasks/init-debian.yml
@@ -9,6 +9,7 @@
     - python-apt
     - python-pycurl
     - build-essential
+    - unzip
 
 - name: Disable the ufw firewall (since we use a simple iptables firewall).
   service: name=ufw state=stopped
diff --git a/provisioning/tasks/init-redhat.yml b/provisioning/tasks/init-redhat.yml
index 2c45a511b..387a02353 100644
--- a/provisioning/tasks/init-redhat.yml
+++ b/provisioning/tasks/init-redhat.yml
@@ -5,6 +5,7 @@
     - "curl"
     - "python-pycurl"
     - "@development"
+    - "unzip"
 
 - name: Enable remi repo for MySQL.
   set_fact: mysql_enablerepo="remi"

From c58c2d8481acc266f224f02f418a2c728c2e3e15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 7 Apr 2016 17:13:35 -0500
Subject: [PATCH 0205/1273] Fix drush core-rsync not expanding ~ to $HOME

---
 provisioning/templates/drupalvm.aliases.drushrc.php.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/templates/drupalvm.aliases.drushrc.php.j2 b/provisioning/templates/drupalvm.aliases.drushrc.php.j2
index bf9ff810d..cc9249bf6 100644
--- a/provisioning/templates/drupalvm.aliases.drushrc.php.j2
+++ b/provisioning/templates/drupalvm.aliases.drushrc.php.j2
@@ -13,7 +13,7 @@ $aliases['{{ host }}'] = array(
   'root' => '{{ root }}',
   'remote-host' => '{{ host }}',
   'remote-user' => '{{ vagrant_user }}',
-  'ssh-options' => '-o PasswordAuthentication=no -i ~/.vagrant.d/insecure_private_key',
+  'ssh-options' => '-o PasswordAuthentication=no -i ' . drush_server_home() . '/.vagrant.d/insecure_private_key',
 );
 
 {% endif -%}

From ca349e2a83ca25703ebc47bf68fe8d8de5c98486 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 9 Apr 2016 12:01:44 -0500
Subject: [PATCH 0206/1273] Issue #406: Add docs about sql-sync workaround for
 older drush versions [ci skip]

---
 docs/deployment/local-codebase.md |  2 +-
 docs/extras/drush.md              | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/docs/deployment/local-codebase.md b/docs/deployment/local-codebase.md
index d8f85c2b1..71c8f7d4e 100644
--- a/docs/deployment/local-codebase.md
+++ b/docs/deployment/local-codebase.md
@@ -41,4 +41,4 @@ If you have your Drupal site configured to use a special database and/or user/pa
 
 ## Build the VM, import your database
 
-Run `vagrant up` to build the VM with your codebase synced into the proper location. Once the VM is created, you can [connect to the MySQL database](../extras/mysql.md) and import your site's database to the Drupal VM, or use a command like `drush sql-sync` to copy a database from another server.
+Run `vagrant up` to build the VM with your codebase synced into the proper location. Once the VM is created, you can [connect to the MySQL database](../extras/mysql.md) and import your site's database to the Drupal VM, or use a [command like `drush sql-sync`](../extras/drush.md#using-sql-sync) to copy a database from another server.
diff --git a/docs/extras/drush.md b/docs/extras/drush.md
index e29d6c0c3..85b6abea5 100644
--- a/docs/extras/drush.md
+++ b/docs/extras/drush.md
@@ -35,4 +35,16 @@ $ drush @drupalvm.dev status
 
 Drupal VM automatically generates a drush alias file in `~/.drush/drupalvm.aliases.drushrc.php` with an alias for every site you have defined in the `apache_vhosts` variable.
 
-You can disable Drupal VM's automatic Drush alias file management if you want to manage drush aliases on your own. Just set the `configure_local_drush_aliases` variable in `config.yml` to `false`.
\ No newline at end of file
+You can disable Drupal VM's automatic Drush alias file management if you want to manage drush aliases on your own. Just set the `configure_local_drush_aliases` variable in `config.yml` to `false`.
+
+## Using sql-sync
+
+For sql-sync to work between two remotes make sure you are running Drush 8.0.3 or later on your host and your guest machine, as well as 7.1.0 or later on the remote.
+
+If you're locked to an older version of Drush, it is likely that Drush will try to run the command from the `@destination` instead of from your host computer, which means you need to move your `@remote` alias to Drupal VM as well. You can place the file in any of the [directories that drush searches](https://github.com/drush-ops/drush/blob/5a1328d6e9cb919a286e70360df159d1b4b15d3e/examples/example.aliases.drushrc.php#L43:L51), for example `/home/vagrant/.drush/<remote-alias>.aliases.drushrc.php`.
+
+If you're still having issues, you can avoid `sql-sync` entirely and simply pipe the mysqldump output yourself with:
+
+```
+drush @remote sql-dump | drush @durpalvm.drupalvm.dev sql-cli
+```

From 88375d594b292d77289e6c65f1edd73116d635d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 9 Apr 2016 15:32:01 -0500
Subject: [PATCH 0207/1273] Fixes #530: Add docs for arch linux where python 3
 is the default [ci skip]

---
 docs/other/linux.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/other/linux.md b/docs/other/linux.md
index 843dc975a..9ab7fd61d 100644
--- a/docs/other/linux.md
+++ b/docs/other/linux.md
@@ -29,6 +29,14 @@ In this case, you need to install your system's appropriate kernel module, and y
 
 Periodically, when you upgrade your system's Linux kernel, you might need to run steps 2 and 3 above again, or you can uninstall and reinstall VirtualBox (e.g. `sudo dnf remove VirtualBox && sudo dnf install VirtualBox`).
 
+### Arch Linux
+
+Arch Linux uses Python 3 as the default while Ansible requires Python 2. To get around parse errors you need to specify that the `python2` binary should be used instead of the default `python`. Add the following to your `config.yml`:
+
+```
+ansible_python_interpreter: "/usr/bin/env python2"
+```
+
 ## Synced Folders
 
 Most issues have to do synced folders. These are the most common ones:

From 1cdea04d1dc6fd59617300bb71244ed4986a04ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 9 Apr 2016 15:59:39 -0500
Subject: [PATCH 0208/1273] Fixes #424: Fix NPM packages being installed under
 root user

---
 example.config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/example.config.yml b/example.config.yml
index d3083e0a0..ceebd40cf 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -172,6 +172,7 @@ extra_packages: []
 # "0.12", "4.x", "5.x".
 nodejs_version: "0.12"
 nodejs_npm_global_packages: []
+nodejs_install_npm_user: "{{ drupalvm_user }}"
 
 # `ruby` must be in installed_extras for this to work.
 ruby_install_gems_user: "{{ drupalvm_user }}"

From e304e4ae946af10e92e10a7dcd0fd302eb12db5a Mon Sep 17 00:00:00 2001
From: Iain Houston <iainhouston@mac.com>
Date: Sun, 10 Apr 2016 20:30:29 +0100
Subject: [PATCH 0209/1273] Update php-7.md

The main change is to document the `php_conf_paths` and `php_extension_conf_paths` you need to get `php.ini` settings etc into the right directories. Also added a note to say that Xdebug 2.4.0 works with PHP7.0 ... but this would depend upon another pull request I made for `ansible-role-php-xdebug`
---
 docs/other/php-7.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/docs/other/php-7.md b/docs/other/php-7.md
index 457d5a153..51ff4c673 100644
--- a/docs/other/php-7.md
+++ b/docs/other/php-7.md
@@ -23,11 +23,21 @@ php_packages:
   - php7.0-mbstring
 php_mysql_package: php7.0-mysql
 php_fpm_daemon: php7.0-fpm
+php_conf_paths: 
+  - /etc/php/7.0/fpm
+  - /etc/php/7.0/apache2
+  - /etc/php/7.0/cli
+php_extension_conf_paths:
+  - /etc/php/7.0/fpm/conf.d
+  - /etc/php/7.0/apache2/conf.d
+  - /etc/php/7.0/cli/conf.d
 php_fpm_pool_conf_path: "/etc/php/7.0/fpm/pool.d/www.conf"
 ```
 
 Also, comment out `xhprof`, `xdebug`, `redis` and `memcached` from the `installed_extras` list, as these extensions are not yet supported for PHP 7 (as of late 2015).
 
+Xdebug 2.4.0 works with PHP 7.0. Sources available at https://xdebug.org/files/xdebug-2.4.0.tgz but you'll need to update `ansible-role-php-xdebug` to pick the source from there.
+
 You can also build from source using the same/included `geerlingguy.php` Ansible role, but that process is a bit more involved and for power users comfortable with the process.
 
 ## RedHat/CentOS 7

From 349b84e375e870f3c02fc2696aca729aff232794 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 10 Apr 2016 22:18:02 -0500
Subject: [PATCH 0210/1273] PR #556 grammar/spellcheck fixes.

---
 docs/extras/drush.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/extras/drush.md b/docs/extras/drush.md
index 85b6abea5..9aabd7cb7 100644
--- a/docs/extras/drush.md
+++ b/docs/extras/drush.md
@@ -41,10 +41,10 @@ You can disable Drupal VM's automatic Drush alias file management if you want to
 
 For sql-sync to work between two remotes make sure you are running Drush 8.0.3 or later on your host and your guest machine, as well as 7.1.0 or later on the remote.
 
-If you're locked to an older version of Drush, it is likely that Drush will try to run the command from the `@destination` instead of from your host computer, which means you need to move your `@remote` alias to Drupal VM as well. You can place the file in any of the [directories that drush searches](https://github.com/drush-ops/drush/blob/5a1328d6e9cb919a286e70360df159d1b4b15d3e/examples/example.aliases.drushrc.php#L43:L51), for example `/home/vagrant/.drush/<remote-alias>.aliases.drushrc.php`.
+If you're locked to an older version of Drush, it is likely that Drush will try to run the command from the `@destination` instead of from your host computer, which means you need to move your `@remote` alias to Drupal VM as well. You can place the file in any of the [directories Drush searches](https://github.com/drush-ops/drush/blob/5a1328d6e9cb919a286e70360df159d1b4b15d3e/examples/example.aliases.drushrc.php#L43:L51), for example `/home/vagrant/.drush/<remote-alias>.aliases.drushrc.php`.
 
-If you're still having issues, you can avoid `sql-sync` entirely and simply pipe the mysqldump output yourself with:
+If you're still having issues, you can avoid `sql-sync` entirely and pipe the mysqldump output yourself with:
 
 ```
-drush @remote sql-dump | drush @durpalvm.drupalvm.dev sql-cli
+drush @remote sql-dump | drush @drupalvm.drupalvm.dev sql-cli
 ```

From 2a1b864f9c531458f4414d5aec4f5fbc43e659be Mon Sep 17 00:00:00 2001
From: Iain Houston <iainhouston@mac.com>
Date: Mon, 11 Apr 2016 08:30:37 +0100
Subject: [PATCH 0211/1273] Remove redundant comment re Xdebug 2.4.0

---
 docs/other/php-7.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/other/php-7.md b/docs/other/php-7.md
index 51ff4c673..3ba122295 100644
--- a/docs/other/php-7.md
+++ b/docs/other/php-7.md
@@ -36,8 +36,6 @@ php_fpm_pool_conf_path: "/etc/php/7.0/fpm/pool.d/www.conf"
 
 Also, comment out `xhprof`, `xdebug`, `redis` and `memcached` from the `installed_extras` list, as these extensions are not yet supported for PHP 7 (as of late 2015).
 
-Xdebug 2.4.0 works with PHP 7.0. Sources available at https://xdebug.org/files/xdebug-2.4.0.tgz but you'll need to update `ansible-role-php-xdebug` to pick the source from there.
-
 You can also build from source using the same/included `geerlingguy.php` Ansible role, but that process is a bit more involved and for power users comfortable with the process.
 
 ## RedHat/CentOS 7

From ad5792da978192e18f8c836b74200d937113c94b Mon Sep 17 00:00:00 2001
From: Iain Houston <iainhouston@mac.com>
Date: Mon, 11 Apr 2016 09:08:35 +0100
Subject: [PATCH 0212/1273] OK to use Xdebug 2.4.0 with PHP 7.0

---
 docs/other/php-7.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/other/php-7.md b/docs/other/php-7.md
index 3ba122295..77b0a5503 100644
--- a/docs/other/php-7.md
+++ b/docs/other/php-7.md
@@ -34,7 +34,7 @@ php_extension_conf_paths:
 php_fpm_pool_conf_path: "/etc/php/7.0/fpm/pool.d/www.conf"
 ```
 
-Also, comment out `xhprof`, `xdebug`, `redis` and `memcached` from the `installed_extras` list, as these extensions are not yet supported for PHP 7 (as of late 2015).
+Also, comment out `xhprof`, `redis` and `memcached` from the `installed_extras` list, as these extensions are not yet supported for PHP 7 (as of late 2015).
 
 You can also build from source using the same/included `geerlingguy.php` Ansible role, but that process is a bit more involved and for power users comfortable with the process.
 

From 71bac517ec7aebba46f7f66981585a69c789e999 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 11 Apr 2016 09:54:35 -0500
Subject: [PATCH 0213/1273] Fix trailing space from PR #560.

---
 docs/other/php-7.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/other/php-7.md b/docs/other/php-7.md
index 77b0a5503..5a185895f 100644
--- a/docs/other/php-7.md
+++ b/docs/other/php-7.md
@@ -23,7 +23,7 @@ php_packages:
   - php7.0-mbstring
 php_mysql_package: php7.0-mysql
 php_fpm_daemon: php7.0-fpm
-php_conf_paths: 
+php_conf_paths:
   - /etc/php/7.0/fpm
   - /etc/php/7.0/apache2
   - /etc/php/7.0/cli

From 641ca2f132d65d1b55980b5331c9626184e11601 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 12 Apr 2016 10:07:26 -0500
Subject: [PATCH 0214/1273] Issue #562: Update JJG-Ansible-Windows to fix pip
 install.

---
 provisioning/JJG-Ansible-Windows/LICENSE    |  0
 provisioning/JJG-Ansible-Windows/README.md  |  0
 provisioning/JJG-Ansible-Windows/windows.sh | 29 +++++++++++++++------
 3 files changed, 21 insertions(+), 8 deletions(-)
 mode change 100755 => 100644 provisioning/JJG-Ansible-Windows/LICENSE
 mode change 100755 => 100644 provisioning/JJG-Ansible-Windows/README.md
 mode change 100755 => 100644 provisioning/JJG-Ansible-Windows/windows.sh

diff --git a/provisioning/JJG-Ansible-Windows/LICENSE b/provisioning/JJG-Ansible-Windows/LICENSE
old mode 100755
new mode 100644
diff --git a/provisioning/JJG-Ansible-Windows/README.md b/provisioning/JJG-Ansible-Windows/README.md
old mode 100755
new mode 100644
diff --git a/provisioning/JJG-Ansible-Windows/windows.sh b/provisioning/JJG-Ansible-Windows/windows.sh
old mode 100755
new mode 100644
index c8a375af0..728b63cd5
--- a/provisioning/JJG-Ansible-Windows/windows.sh
+++ b/provisioning/JJG-Ansible-Windows/windows.sh
@@ -9,6 +9,23 @@
 # Uncomment if behind a proxy server.
 # export {http,https,ftp}_proxy='http://username:password@proxy-host:80'
 
+args=()
+extra_vars=("is_windows=true")
+
+# Process and remove all flags.
+while (($#)); do
+  case $1 in
+    --extra-vars=*) extra_vars+=("${1#*=}") ;;
+    --extra-vars|-e) shift; extra_vars+=("$1") ;;
+    -*) echo "invalid option: $1" >&2; exit 1 ;;
+    *) args+=("$1") ;;
+  esac
+  shift
+done
+
+# Restore the arguments without flags.
+set -- "${args[@]}"
+
 ANSIBLE_PLAYBOOK=$1
 PLAYBOOK_DIR=${ANSIBLE_PLAYBOOK%/*}
 
@@ -35,13 +52,9 @@ if ! command -v ansible >/dev/null; then
     exit 1;
   fi
 
-  echo "Installing pip via easy_install."
-  wget https://raw.githubusercontent.com/ActiveState/ez_setup/v0.9/ez_setup.py
-  python ez_setup.py && rm -f ez_setup.py
-  easy_install pip
-
-  # Make sure setuptools are installed crrectly.
-  pip install setuptools --no-use-wheel --upgrade
+  echo "Installing pip."
+  wget https://bootstrap.pypa.io/get-pip.py
+  python get-pip.py && rm -f get-pip.py
 
   # Install GCC / required build tools.
   if [[ ! -z $YUM ]]; then
@@ -63,4 +76,4 @@ find "/vagrant/$PLAYBOOK_DIR" \( -name "requirements.yml" -o -name "requirements
 
 # Run the playbook.
 echo "Running Ansible provisioner defined in Vagrantfile."
-ansible-playbook -i 'localhost,' "/vagrant/${ANSIBLE_PLAYBOOK}" --extra-vars "is_windows=true" --connection=local
+ansible-playbook -i 'localhost,' "/vagrant/${ANSIBLE_PLAYBOOK}" --extra-vars "${extra_vars[*]}" --connection=local

From 542de12a0e662816a704273dde8a7c6a295c9af1 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 22 Apr 2016 15:30:52 -0500
Subject: [PATCH 0215/1273] Fixes #573: Support Ubuntu 16.04 LTS Xenial.

---
 docs/other/base-os.md | 14 ++++++++++++++
 example.config.yml    |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/docs/other/base-os.md b/docs/other/base-os.md
index 17ff0b4f9..d796baaf2 100644
--- a/docs/other/base-os.md
+++ b/docs/other/base-os.md
@@ -2,6 +2,7 @@ Drupal VM's configuration is designed to work with RedHat and Debian-compatible
 
 Currently-supported OSes are:
 
+  - Ubuntu 16.04
   - Ubuntu 14.04 (default)
   - Ubuntu 12.04
   - RedHat Enterprise Linux / CentOS 7
@@ -11,6 +12,19 @@ For certain OSes, there are a couple other caveats and tweaks you may need to pe
 
 Some other OSes should work, but are not regularly tested with Drupal VM, including Debian 8/Jessie (`debian/jessie64`) and Debian 7/Wheezy (`debian/wheezy64`).
 
+## Ubuntu 16.04 Xenial LTS
+
+Ubuntu 16.04 is the latest LTS release, and there are a few changes currently required to make sure Drupal VM runs smoothly on it. Note also that Ubuntu 16.04 defaults to PHP 7; older versions of PHP will not be supported on this OS.
+
+**Redis**: If using redis, add the line `php_redis_package: php-redis` to `config.yml` before provisioning.
+
+Installed extras that are currently unsupported on Ubuntu 16.04:
+
+  - `memcached`
+  - `selenium`
+  - `varnish`
+  - `xhprof`
+
 ## RedHat Enterprise Linux / CentOS 7
 
 **MySQL/MariaDB**: RHEL/CentOS 7 switched from using MySQL as the default database system to using MariaDB, so to make sure everything is configured properly, you need to add the following to `config.yml` so MariaDB installs correctly:
diff --git a/example.config.yml b/example.config.yml
index ceebd40cf..c744738a4 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -1,6 +1,6 @@
 ---
 # `vagrant_box` can also be set to geerlingguy/centos6, geerlingguy/centos7,
-# geerlingguy/ubuntu1204, parallels/ubuntu-14.04, etc.
+# geerlingguy/ubuntu1604, geerlingguy/ubuntu1204, parallels/ubuntu-14.04, etc.
 vagrant_box: geerlingguy/ubuntu1404
 vagrant_user: vagrant
 vagrant_synced_folder_default_type: nfs

From e7d2fb4bcabc114a9ce376c7efcceb74abdf3f32 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 2 May 2016 10:13:41 -0500
Subject: [PATCH 0216/1273] Update base OS documentation based on upstream
 MySQL configuration update.

---
 docs/other/base-os.md | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/docs/other/base-os.md b/docs/other/base-os.md
index d796baaf2..7822c336b 100644
--- a/docs/other/base-os.md
+++ b/docs/other/base-os.md
@@ -25,23 +25,17 @@ Installed extras that are currently unsupported on Ubuntu 16.04:
   - `varnish`
   - `xhprof`
 
-## RedHat Enterprise Linux / CentOS 7
+## Ubuntu 14.04 Trusty LTS
 
-**MySQL/MariaDB**: RHEL/CentOS 7 switched from using MySQL as the default database system to using MariaDB, so to make sure everything is configured properly, you need to add the following to `config.yml` so MariaDB installs correctly:
+Everything should work out of the box with Ubuntu 14.04.
 
-```yaml
-mysql_packages:
-  - mariadb
-  - mariadb-server
-  - mariadb-libs
-  - MySQL-python
-  - perl-DBD-MySQL
-mysql_daemon: mariadb
-mysql_socket: /var/lib/mysql/mysql.sock
-mysql_log_error: /var/log/mariadb/mariadb.log
-mysql_syslog_tag: mariadb
-mysql_pid_file: /var/run/mariadb/mariadb.pid
-```
+## Ubuntu 12.04 Precise LTS
+
+Everything should work out of the box with Ubuntu 12.04.
+
+## RedHat Enterprise Linux / CentOS 7
+
+Everything should work out of the box with RHEL 7.
 
 ## RedHat Enterprise Linux / CentOS 6
 

From 8543f926e4a3adf70d0bd1a4e399720e0699e978 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 2 May 2016 10:40:23 -0500
Subject: [PATCH 0217/1273] Update configuration for CentOS 7 tests with
 MariaDB defaults.

---
 .travis.yml             |  1 -
 tests/centos-7-vars.yml | 10 ----------
 2 files changed, 11 deletions(-)
 delete mode 100644 tests/centos-7-vars.yml

diff --git a/.travis.yml b/.travis.yml
index e42e246f4..f18b1cee8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,6 @@ env:
       version: 7
       init: /usr/lib/systemd/systemd
       run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-      additional_vars: "centos-7-vars.yml"
 
 services:
   - docker
diff --git a/tests/centos-7-vars.yml b/tests/centos-7-vars.yml
deleted file mode 100644
index 0b90cd6be..000000000
--- a/tests/centos-7-vars.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-mysql_packages:
-  - mariadb
-  - mariadb-server
-  - mariadb-libs
-  - MySQL-python
-  - perl-DBD-MySQL
-mysql_daemon: mariadb
-mysql_log_error: /var/log/mariadb/mariadb.log
-mysql_syslog_tag: mariadb
-mysql_pid_file: /var/run/mariadb/mariadb.pid

From 678bb07ca3bdcc52e40179d236944f6d12b2e21a Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 2 May 2016 11:21:49 -0500
Subject: [PATCH 0218/1273] Try to fix broken CentOS setuptools installation.

---
 tests/Dockerfile.centos-7 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/Dockerfile.centos-7 b/tests/Dockerfile.centos-7
index 3cbb03045..9dda3efa4 100644
--- a/tests/Dockerfile.centos-7
+++ b/tests/Dockerfile.centos-7
@@ -20,6 +20,9 @@ RUN yum clean all
 RUN easy_install pip
 RUN pip install ansible
 
+# Fix weird issue with setuptools
+RUN pip install --upgrade setuptools --user python
+
 # Disable requiretty
 RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
 

From 2a2d81833ad5e52f8dbd9cb42aeffbdb36d883dd Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 2 May 2016 11:31:22 -0500
Subject: [PATCH 0219/1273] Install redhat-lsb-core for MySQL role to work
 correctly on RHEL.

---
 tests/Dockerfile.centos-7 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/Dockerfile.centos-7 b/tests/Dockerfile.centos-7
index 9dda3efa4..8c9e9d61a 100644
--- a/tests/Dockerfile.centos-7
+++ b/tests/Dockerfile.centos-7
@@ -12,6 +12,8 @@ rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
 rm -f /lib/systemd/system/basic.target.wants/*; \
 rm -f /lib/systemd/system/anaconda.target.wants/*;
 
+RUN yum -y install redhat-lsb-core
+
 # Install Ansible
 RUN yum -y install epel-release
 RUN yum -y install git sudo which curl tar unzip xz logrotate initscripts

From 759353b5d4fb3ee6d3c0d8ae218a18059b1163bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Tue, 3 May 2016 19:22:34 -0500
Subject: [PATCH 0220/1273] Improve multisite docs by matching ProxyPassMatch
 with documentroot value [ci skip]

---
 docs/deployment/multisite.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/deployment/multisite.md b/docs/deployment/multisite.md
index 92a8d4834..7df856b2f 100644
--- a/docs/deployment/multisite.md
+++ b/docs/deployment/multisite.md
@@ -5,15 +5,17 @@ apache_vhosts:
   - servername: "local.my-drupal-site.com"
     documentroot: "/var/www/my-drupal-site"
     extra_parameters: |
-          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ drupal_core_path }}"
+          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000/var/www/my-drupal-site"
+
   - servername: "local.second-drupal-site.com"
     documentroot: "/var/www/my-drupal-site"
     extra_parameters: |
-          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ drupal_core_path }}"
+          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000/var/www/my-drupal-site"
+
   - servername: "local.third-drupal-site.com"
     documentroot: "/var/www/my-drupal-site"
     extra_parameters: |
-          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ drupal_core_path }}"
+          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000/var/www/my-drupal-site"
 ```
 
 If you need additional databases and database users, add them to the list of `mysql_databases` and `mysql_users`:

From 1c927e21400e3ff392adef171135d270d3c11bad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Tue, 3 May 2016 20:18:44 -0500
Subject: [PATCH 0221/1273] Attempt at making basic setup docs more
 understandable [ci skip]

---
 docs/deployment/local-codebase.md | 33 +++++++++++++++++++++++++++----
 docs/deployment/multisite.md      | 19 +++++++++++-------
 2 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/docs/deployment/local-codebase.md b/docs/deployment/local-codebase.md
index 71c8f7d4e..837d53583 100644
--- a/docs/deployment/local-codebase.md
+++ b/docs/deployment/local-codebase.md
@@ -23,16 +23,41 @@ install_site: false
 
 If you aren't copying back a database, and want to have Drupal VM run `drush si` for your Drupal site, you can leave `install_site` set to `true` and it will run a site install on your Drupal codebase using the `drupal_*` config variables.
 
-## Update `apache_vhosts`
+## Update `drupal_core_path`
 
-Add your site to `apache_vhosts`, setting the `documentroot` to the same value as the `destination` of the synced folder you configured earlier:
+Set `drupal_core_path` to the same value as the `destination` of the synced folder you configured earlier:
 
 ```yaml
+drupal_core_path: "/var/www/my-drupal-site"
+```
+
+This variable will be used for the document root of the webserver.
+
+## Set the domain
+
+By default the domain of your site will be `drupalvm.dev` but you can change it by setting `drupal_domain` to the domain of your choice:
+
+```
+drupal_domain: "local.my-drupal-site.com"
+```
+
+If you prefer using your domain as the root of all extra packages installed, ie. `adminer`, `xhprof` and `pimpmylog`, set it as the value of `vagrant_hostname` instead.
+
+```
+vagrant_hostname: "my-drupal-site.com"
+
 apache_vhosts:
-  - servername: "local.my-drupal-site.com"
-    documentroot: "/var/www/my-drupal-site"
+  # Resolves to http://my-drupal-site.com/
+  - servername: "{{ drupal_domain }}"
+    documentroot: "{{ drupal_core_path }}"
     extra_parameters: |
           ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ drupal_core_path }}"
+
+  # Resolves to http://adminer.my-drupal-site.com/
+  - servername: "adminer.{{ vagrant_hostname }}"
+    documentroot: "{{ adminer_install_dir }}"
+    extra_parameters: |
+          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ adminer_install_dir }}"
 ```
 
 ## Update MySQL info
diff --git a/docs/deployment/multisite.md b/docs/deployment/multisite.md
index 7df856b2f..0a4471cf8 100644
--- a/docs/deployment/multisite.md
+++ b/docs/deployment/multisite.md
@@ -1,21 +1,26 @@
 For multisite installations, make the changes outlined in the [Local Drupal codebase](local-codebase.md) guide, but, using the `apache_vhosts` variable, configure as many domains pointing to the same docroot as you need:
 
 ```yaml
+drupal_core_path: "/var/www/my-drupal-site"
+
+...
+
 apache_vhosts:
-  - servername: "local.my-drupal-site.com"
-    documentroot: "/var/www/my-drupal-site"
+  # Drupal VM's default domain, evaluating to whatever `vagrant_hostname` is set to (drupalvm.dev by default).
+  - servername: "{{ drupal_domain }}"
+    documentroot: "{{ drupal_core_path }}"
     extra_parameters: |
-          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000/var/www/my-drupal-site"
+          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ drupal_core_path }}"
 
   - servername: "local.second-drupal-site.com"
-    documentroot: "/var/www/my-drupal-site"
+    documentroot: "{{ drupal_core_path }}"
     extra_parameters: |
-          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000/var/www/my-drupal-site"
+          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ drupal_core_path }}"
 
   - servername: "local.third-drupal-site.com"
-    documentroot: "/var/www/my-drupal-site"
+    documentroot: "{{ drupal_core_path }}"
     extra_parameters: |
-          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000/var/www/my-drupal-site"
+          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ drupal_core_path }}"
 ```
 
 If you need additional databases and database users, add them to the list of `mysql_databases` and `mysql_users`:

From 1b4136231f31b453799ca23d719caee7e03b3a70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Tue, 3 May 2016 20:19:04 -0500
Subject: [PATCH 0222/1273] Docs: Update some examples [ci skip]

---
 docs/extras/syncing-folders.md  | 4 +++-
 docs/other/local-vagrantfile.md | 3 ---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/docs/extras/syncing-folders.md b/docs/extras/syncing-folders.md
index 90a31d40e..dc0f1fe30 100644
--- a/docs/extras/syncing-folders.md
+++ b/docs/extras/syncing-folders.md
@@ -7,6 +7,7 @@ vagrant_synced_folders:
   - local_path: ~/Sites/drupalvm
     destination: /var/www/drupalvm
     type: smb
+    create: true
 ```
 
 You can add as many synced folders as you'd like, and you can configure [any type of share](https://www.vagrantup.com/docs/synced-folders/index.html) supported by Vagrant; just add another item to the list of `vagrant_synced_folders`.
@@ -53,9 +54,10 @@ If you are using rsync, it is advised to exclude certain directories so that the
 
 ```yaml
 vagrant_synced_folders:
-  - local_path: ~/Sites/drupalvm/drupal
+  - local_path: ~/Sites/drupalvm
     destination: /var/www/drupalvm
     type: rsync
+    create: true
     excluded_paths:
       - drupal/private
       - drupal/public/.git
diff --git a/docs/other/local-vagrantfile.md b/docs/other/local-vagrantfile.md
index 210558667..80ed5e28c 100644
--- a/docs/other/local-vagrantfile.md
+++ b/docs/other/local-vagrantfile.md
@@ -11,9 +11,6 @@ config.vm.provider :virtualbox do |v|
   # Enable GUI mode instead of running a headless machine.
   v.gui = true
 
-  # Reduce disk usage of multiple boxes by sharing a master VM.
-  v.linked_clone = true
-
   # Cap the host CPU execution at 50% usage.
   v.customize ["modifyvm", :id, "--cpuexecutioncap", "50"]
 end

From 828dbab6d50785c7da14a8177f5e268c1bac1648 Mon Sep 17 00:00:00 2001
From: Scott Rigby <scott@r6by.com>
Date: Wed, 4 May 2016 13:13:08 -0400
Subject: [PATCH 0223/1273] New Relic support, conditionally-installed

---
 example.config.yml        | 5 +++++
 provisioning/playbook.yml | 1 +
 2 files changed, 6 insertions(+)

diff --git a/example.config.yml b/example.config.yml
index c744738a4..6c4058ae9 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -155,6 +155,7 @@ installed_extras:
   - drupalconsole
   - mailhog
   - memcached
+  # - newrelic
   # - nodejs
   - pimpmylog
   # - redis
@@ -168,6 +169,10 @@ installed_extras:
 # Add any extra apt or yum packages you would like installed.
 extra_packages: []
 
+# `newrelic` must be in installed_extras for this to work.
+# See all vars: https://github.com/weareinteractive/ansible-newrelic#variables
+newrelic_license_key: yourkey
+
 # `nodejs` must be in installed_extras for this to work. Valid examples: "0.10",
 # "0.12", "4.x", "5.x".
 nodejs_version: "0.12"
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 1b7d3ab99..fe595a915 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -43,6 +43,7 @@
     - { role: geerlingguy.pimpmylog, when: '"pimpmylog" in installed_extras' }
     - { role: geerlingguy.daemonize, when: '"mailhog" in installed_extras' }
     - { role: geerlingguy.mailhog, when: '"mailhog" in installed_extras' }
+    - { role: franklinkim.newrelic, when: '"newrelic" in installed_extras' }
     - { role: geerlingguy.nodejs, when: '"nodejs" in installed_extras' }
     - { role: geerlingguy.redis, when: '"redis" in installed_extras' }
     - { role: geerlingguy.php-redis, when: '"redis" in installed_extras' }

From 12584985fdf2022c3cf0fae46b1dbf1a0a3013ad Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 4 May 2016 12:54:52 -0500
Subject: [PATCH 0224/1273] Remove installation of redhat-lsb-core.

---
 tests/Dockerfile.centos-7 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/Dockerfile.centos-7 b/tests/Dockerfile.centos-7
index 8c9e9d61a..9dda3efa4 100644
--- a/tests/Dockerfile.centos-7
+++ b/tests/Dockerfile.centos-7
@@ -12,8 +12,6 @@ rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
 rm -f /lib/systemd/system/basic.target.wants/*; \
 rm -f /lib/systemd/system/anaconda.target.wants/*;
 
-RUN yum -y install redhat-lsb-core
-
 # Install Ansible
 RUN yum -y install epel-release
 RUN yum -y install git sudo which curl tar unzip xz logrotate initscripts

From f3a465db8f359166a6ce37a98cf9429b8e34d84c Mon Sep 17 00:00:00 2001
From: Scott Rigby <scott@r6by.com>
Date: Wed, 4 May 2016 15:07:42 -0400
Subject: [PATCH 0225/1273] Add newrelic to requirements

---
 provisioning/requirements.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 3e6295a95..64d103839 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -1,5 +1,6 @@
 ---
 - src: arknoll.selenium
+- src: franklinkim.newrelic
 - src: geerlingguy.adminer
 - src: geerlingguy.apache
 - src: geerlingguy.apache-php-fpm

From d72058f9bfb0c01daf691b4943b3da129aff7837 Mon Sep 17 00:00:00 2001
From: Scott Rigby <scott@r6by.com>
Date: Wed, 4 May 2016 15:25:27 -0400
Subject: [PATCH 0226/1273] Move New Relic documentation to docs/extras

---
 docs/extras/newrelic.md | 21 +++++++++++++++++++++
 example.config.yml      |  4 ----
 2 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 docs/extras/newrelic.md

diff --git a/docs/extras/newrelic.md b/docs/extras/newrelic.md
new file mode 100644
index 000000000..8d8ec1c1c
--- /dev/null
+++ b/docs/extras/newrelic.md
@@ -0,0 +1,21 @@
+The New Relic PHP agent monitors your application to help you identify and solve performance issues.
+
+## Getting Started - Installing Prerequisites
+
+To make New Relic available globally for all your projects within Drupal VM, make the following changes inside `config.yml`, then run `vagrant up` (or `vagrant provision` if the VM is already built):
+
+```yaml
+# Make sure newrelic is not commented out in the list of installed_extras:
+installed_extras:
+  [...]
+  - newrelic
+  [...]
+
+# Set vars for your New Relic account:
+# `newrelic` must be in installed_extras for this to work.
+newrelic_license_key: yourkey
+# Customize any additional vars relevant to your project needs.
+# See all vars: https://github.com/weareinteractive/ansible-newrelic#variables
+```
+
+See [New Relic for PHP](https://docs.newrelic.com/docs/agents/php-agent/getting-started/new-relic-php) for help getting started.
diff --git a/example.config.yml b/example.config.yml
index 6c4058ae9..9d0ad78b4 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -169,10 +169,6 @@ installed_extras:
 # Add any extra apt or yum packages you would like installed.
 extra_packages: []
 
-# `newrelic` must be in installed_extras for this to work.
-# See all vars: https://github.com/weareinteractive/ansible-newrelic#variables
-newrelic_license_key: yourkey
-
 # `nodejs` must be in installed_extras for this to work. Valid examples: "0.10",
 # "0.12", "4.x", "5.x".
 nodejs_version: "0.12"

From 58495a54727734ca5953836d1eb77d83e0af4d3d Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 6 May 2016 11:22:04 -0500
Subject: [PATCH 0227/1273] Fixes #589: Use Apache 2.4 in Ubuntu 12.04.

---
 provisioning/tasks/init-debian.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/provisioning/tasks/init-debian.yml b/provisioning/tasks/init-debian.yml
index a57a059ac..5f0e680f7 100644
--- a/provisioning/tasks/init-debian.yml
+++ b/provisioning/tasks/init-debian.yml
@@ -15,6 +15,10 @@
   service: name=ufw state=stopped
   when: ansible_distribution == "Ubuntu"
 
+- name: Add repository for Apache 2.4 on Ubuntu 12.
+  apt_repository: repo='ppa:ondrej/apache2'
+  when: ansible_distribution_release == "precise" and ansible_distribution == "Ubuntu"
+
 - name: Add repository for PHP 5.5.
   apt_repository: repo='ppa:ondrej/php5'
   when: php_version == "5.5" and ansible_distribution == "Ubuntu"

From 4120f76d65a4f1737472e611fc7b5bb64a0b9fcb Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 7 May 2016 21:08:00 -0500
Subject: [PATCH 0228/1273] Fixes #597: Add a note about vagrant ssh.

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

diff --git a/README.md b/README.md
index e327559ae..f69e8a913 100644
--- a/README.md
+++ b/README.md
@@ -120,6 +120,7 @@ Drupal VM runs on almost any modern computer that can run VirtualBox and Vagrant
 ## Other Notes
 
   - To shut down the virtual machine, enter `vagrant halt` in the Terminal in the same folder that has the `Vagrantfile`. To destroy it completely (if you want to save a little disk space, or want to rebuild it from scratch with `vagrant up` again), type in `vagrant destroy`.
+  - To log into the virtual machine, enter `vagrant ssh`. You can also get the machine's SSH connection details with `vagrant ssh-config`.
   - When you rebuild the VM (e.g. `vagrant destroy` and then another `vagrant up`), make sure you clear out the contents of the `drupal` folder on your host machine, or Drupal will return some errors when the VM is rebuilt (it won't reinstall Drupal cleanly).
   - You can change the installed version of Drupal or drush, or any other configuration options, by editing the variables within `config.yml`.
   - Find out more about local development with Vagrant + VirtualBox + Ansible in this presentation: [Local Development Environments - Vagrant, VirtualBox and Ansible](http://www.slideshare.net/geerlingguy/local-development-on-virtual-machines-vagrant-virtualbox-and-ansible).

From 3d1f71928f3dae6053e52ba8bd191e7b3b3000e3 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 10 May 2016 07:58:53 -0500
Subject: [PATCH 0229/1273] Fixes #598: Add support for pre_provision_scripts.

---
 example.config.yml        | 5 +++--
 provisioning/playbook.yml | 5 +++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/example.config.yml b/example.config.yml
index 9d0ad78b4..8f4073559 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -226,8 +226,9 @@ composer_home_group: "{{ drupalvm_user }}"
 # composer_global_packages:
 #   - { name: phpunit/phpunit, release: '@stable' }
 
-# Run specified scripts after VM is provisioned. Path is relative to the
-# `provisioning/playbook.yml` file.
+# Run specified scripts before or after VM is provisioned. Path is relative to
+# the `provisioning/playbook.yml` file.
+pre_provision_scripts: []
 post_provision_scripts: []
   # - "../examples/scripts/configure-solr.sh"
 
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index fe595a915..b0c34c7f2 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -12,6 +12,11 @@
     - include: tasks/init-redhat.yml
       when: ansible_os_family == 'RedHat'
 
+    - name: Run configured pre-provision shell scripts.
+      script: "{{ item }}"
+      with_items: "{{ pre_provision_scripts }}"
+      when: pre_provision_scripts is defined
+
     - name: Set the PHP webserver daemon correctly when nginx is in use.
       set_fact:
         php_webserver_daemon: nginx

From 72c6f0957223f08c7534e2d8e9b288ec97ac632e Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 10 May 2016 08:06:23 -0500
Subject: [PATCH 0230/1273] PR #513: Fix style and content in Windows NFSD
 documentation.

---
 docs/other/windows.md | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/docs/other/windows.md b/docs/other/windows.md
index 42373784e..25d1cb851 100644
--- a/docs/other/windows.md
+++ b/docs/other/windows.md
@@ -44,27 +44,20 @@ You can use the [vagrant-winnfsd](https://github.com/GM-Alex/vagrant-winnfsd) pl
 
 Another option for the more adventurous is to manually install and configure WinNFSD, and manually mount the shares within your VM. This requires a bit more work, but could be more stable on Windows; see this blog post for more details: [Windows + Vagrant + WinNFSD without file update problems](https://hollyit.net/blog/windowsvagrantwinnfsd-without-file-update-problems).
 
-GuyPaddock's fork of [vagrant-winnfsd](https://github.com/GuyPaddock/vagrant-winnfsd) adds logging and debug messages. You can replace the vagrant-winnfsd gem inside .vagrant.d\gems\gems to use it instead.
-
-The best config is to mount only one folder with nfs see [vagrant-winnfsd issue #12](https://github.com/winnfsd/vagrant-winnfsd/issues/12#issuecomment-78195957), so you need to adapt your config and set vagrant folder to native:
+GuyPaddock's [fork of `vagrant-winnfsd`](https://github.com/GuyPaddock/vagrant-winnfsd) adds logging and debug messages. You can replace the vagrant-winnfsd gem inside `.vagrant.d\gems\gems` to use it instead. For further caveats, please read through [vagrant-winnfsd issue #12](https://github.com/winnfsd/vagrant-winnfsd/issues/12#issuecomment-78195957), and make the following changes to `config.yml`:
 
     vagrant_synced_folder_default_type: ""
 
-Add mount_options to your synced folder to avoid an error:
+Add `mount_options` to your synced folder to avoid an error:
 
     type: nfs
     mount_options: ["rw","vers=3","udp","nolock"]
 
-In your Vagrantfile.local, add user access to vagrant:
+In a custom `Vagrantfile.local`, add user access to Vagrant:
 
     config.winnfsd.uid=900
     config.winnfsd.gid=900
 
-If you are using the fork of vagrant-winnfsd, you can set aditionnal options and use logging="on" in case of problem in your Vagrantfile.local:
-
-    config.winnfsd.logging="off"
-    config.winnfsd.halt_on_reload="on"
-
 ### "Authentication failure" on vagrant up
 
 Some Windows users have reported running into an issue where an authentication failure is reported once the VM is booted (e.g. `drupalvm: Warning: Authentication failure. Retrying...` — see [#170](https://github.com/geerlingguy/drupal-vm/issues/170)). To fix this, do the following:

From 9749414255ba42782bca4d38165cccd2c4d99e08 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 10 May 2016 08:16:03 -0500
Subject: [PATCH 0231/1273] Fixes #594: Update JJG-Ansible-Windows to 1.3.0.

---
 provisioning/JJG-Ansible-Windows/windows.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/JJG-Ansible-Windows/windows.sh b/provisioning/JJG-Ansible-Windows/windows.sh
index 728b63cd5..bab2355b0 100644
--- a/provisioning/JJG-Ansible-Windows/windows.sh
+++ b/provisioning/JJG-Ansible-Windows/windows.sh
@@ -72,7 +72,7 @@ fi
 
 # Install requirements.
 echo "Installing Ansible roles from requirements file, if available."
-find "/vagrant/$PLAYBOOK_DIR" \( -name "requirements.yml" -o -name "requirements.txt" \) -exec sudo ansible-galaxy install --ignore-errors -r {} \;
+find "/vagrant/$PLAYBOOK_DIR" \( -name "requirements.yml" -o -name "requirements.txt" \) -exec sudo ansible-galaxy install --force --ignore-errors -r {} \;
 
 # Run the playbook.
 echo "Running Ansible provisioner defined in Vagrantfile."

From 4e0b4a0e486daed65050847ba337f355ee002717 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 10 May 2016 08:27:43 -0500
Subject: [PATCH 0232/1273] Fixes #536: Document Drupal VM upgrade process.

---
 README.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/README.md b/README.md
index f69e8a913..e7e33be9e 100644
--- a/README.md
+++ b/README.md
@@ -109,6 +109,17 @@ If you don't want or need one or more of these extras, just delete them or comme
 
 Drupal VM is built to integrate with every developer's workflow. Many guides for using Drupal VM for common development tasks are available on the [Drupal VM documentation site](http://docs.drupalvm.com).
 
+## Updating Drupal VM
+
+Drupal VM follows semantic versioning, which means your configuration should continue working (potentially with very minor modifications) throughout a major release cycle. Here is the process to follow when updating Drupal VM between minor releases:
+
+  1. Read through the [release notes](https://github.com/geerlingguy/drupal-vm/releases) and add/modify `config.yml` variables mentioned therein.
+  2. Do a diff of my config.yml with the updated example.config.yml (e.g. `curl https://raw.githubusercontent.com/geerlingguy/drupal-vm/master/example.config.yml | git diff --no-index config.yml -`).
+  3. If Ansible is installed, update all roles locally (`sudo ansible-galaxy install -r provisioning/requirements.yml --force`).
+  4. Run `vagrant provision` to provision the VM, incorporating all the latest changes.
+
+For major version upgrades (e.g. 2.x.x to 3.x.x), it may be simpler to destroy the VM (`vagrant destroy`) then build a fresh new VM (`vagrant up`) using the new version of Drupal VM.
+
 ## System Requirements
 
 Drupal VM runs on almost any modern computer that can run VirtualBox and Vagrant, however for the best out-of-the-box experience, it's recommended you have a computer with at least:

From 4534ca8a250e7278cf0035ff2de33dfbc267c87c Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 10 May 2016 08:48:15 -0500
Subject: [PATCH 0233/1273] Fixes #505: Add ansible.cfg file to set a
 roles_path in Drupal VM directory.

---
 ansible.cfg | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 ansible.cfg

diff --git a/ansible.cfg b/ansible.cfg
new file mode 100644
index 000000000..002a50dd5
--- /dev/null
+++ b/ansible.cfg
@@ -0,0 +1,2 @@
+[defaults]
+roles_path = ./roles

From 0ec0790ca50fbf9414fc441f626acc2ea4326d43 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 10 May 2016 08:54:04 -0500
Subject: [PATCH 0234/1273] Issue #505: Remove sudo from ansible-galaxy command
 documentation.

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index e7e33be9e..f3ce080db 100644
--- a/README.md
+++ b/README.md
@@ -72,7 +72,7 @@ Notes:
     - Copy `example.config.yml` to `config.yml`.
   3. Create a local directory where Drupal will be installed and configure the path to that directory in `config.yml` (`local_path`, inside `vagrant_synced_folders`).
   4. Open Terminal, `cd` to this directory (containing the `Vagrantfile` and this README file).
-  5. (If you have Ansible installed on Mac/Linux) Run `$ sudo ansible-galaxy install -r provisioning/requirements.yml --force`.
+  5. (If you have Ansible installed on Mac/Linux) Run `$ ansible-galaxy install -r provisioning/requirements.yml --force`.
   6. Type in `vagrant up`, and let Vagrant do its magic.
 
 Note: *If there are any errors during the course of running `vagrant up`, and it drops you back to your command prompt, just run `vagrant provision` to continue building the VM from where you left off. If there are still errors after doing this a few times, post an issue to this project's issue queue on GitHub with the error.*
@@ -115,7 +115,7 @@ Drupal VM follows semantic versioning, which means your configuration should con
 
   1. Read through the [release notes](https://github.com/geerlingguy/drupal-vm/releases) and add/modify `config.yml` variables mentioned therein.
   2. Do a diff of my config.yml with the updated example.config.yml (e.g. `curl https://raw.githubusercontent.com/geerlingguy/drupal-vm/master/example.config.yml | git diff --no-index config.yml -`).
-  3. If Ansible is installed, update all roles locally (`sudo ansible-galaxy install -r provisioning/requirements.yml --force`).
+  3. If Ansible is installed, update all roles locally (`ansible-galaxy install -r provisioning/requirements.yml --force`).
   4. Run `vagrant provision` to provision the VM, incorporating all the latest changes.
 
 For major version upgrades (e.g. 2.x.x to 3.x.x), it may be simpler to destroy the VM (`vagrant destroy`) then build a fresh new VM (`vagrant up`) using the new version of Drupal VM.

From 3ce2be1aea995a473f9cb799bee7338774595ca4 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 10 May 2016 17:59:18 -0500
Subject: [PATCH 0235/1273] Fixes #526: Add Blackfire.io support to Drupal VM.

---
 docs/extras/profile-code.md   | 50 +++++++++++++++++++++++++++++++++++
 docs/extras/xhprof.md         | 18 -------------
 example.config.yml            |  1 +
 mkdocs.yml                    |  2 +-
 provisioning/playbook.yml     |  1 +
 provisioning/requirements.yml |  1 +
 6 files changed, 54 insertions(+), 19 deletions(-)
 create mode 100644 docs/extras/profile-code.md
 delete mode 100644 docs/extras/xhprof.md

diff --git a/docs/extras/profile-code.md b/docs/extras/profile-code.md
new file mode 100644
index 000000000..28d6a0c54
--- /dev/null
+++ b/docs/extras/profile-code.md
@@ -0,0 +1,50 @@
+You can profile your code using one of the supported profiling tools included in Drupal VM.
+
+As a prerequisite, you need to make sure the profiler you'd like to use is listed (and not commented out) in `installed_extras` inside `config.yml` (So the appropriate software is installed on Drupal VM).
+
+**Note**: You should only enable one code profiler at a time—e.g. when using Blackfire, disable XHProf and XDebug.
+
+## Blackfire
+
+[Blackfire.io](https://blackfire.io/) is a service that allows code profiling to be stored and analyzed via an online profile on the Blackfire.io website.
+
+It doesn't require any additional Drupal modules to use, but once you've made sure `blackfire` is in the list of `installed_extras` in `config.yml` (and Drupal VM has been provisioned), you need to log into Drupal VM and [run the setup steps outlined on the Blackfire Ansible role's README](https://github.com/geerlingguy/ansible-role-blackfire#requirements).
+
+Once you've configured your environment for your own Blackfire account, you can profile a request with Blackfire by running something like the following example (within Drupal VM, after logging in with `vagrant ssh`):
+
+```
+$ blackfire curl http://drupalvm.dev/
+Profiling: [########################################] 10/10
+Blackfire cURL completed
+Graph URL https://blackfire.io/profiles/[UUID]/graph
+
+Wall Time     151ms
+CPU Time      130ms
+I/O Time     20.9ms
+Memory        1.5MB
+Network         n/a     n/a       -
+SQL             n/a       -
+```
+
+## XHProf
+
+[XHProf](http://xhprof.io/) allows easy code profiling and can be used in many different ways. Ensure `xhprof` is in the list of `installed_extras` inside `config.yml`.
+
+### XHProf module
+
+The easiest way to use XHProf to profile your PHP code on a Drupal site is to install the [XHProf](https://www.drupal.org/project/xhprof) module, then in XHProf's configuration (at `/admin/config/development/xhprof`), check the 'Enable profiling of page views and drush requests' checkbox.
+
+The XHProf module doesn't include built-in support for callgraphs, but there's an issue to [add callgraph support](https://www.drupal.org/node/1470740).
+
+You can view callgraphs (and a listing of all stored runs) using Drupal VM's own XHProf installation by visiting `http://xhprof.drupalvm.dev/` and clicking on the relevant run, then clicking the "[View Full Callgraph]" link.
+
+### Devel module (deprecated)
+
+The Devel module also *used* to provide XHProf configuration, and setting the options below would allow Devel's XHProf integration to work correctly with Drupal VM's XHProf installation:
+
+  - **xhprof directory**: `/usr/share/php`
+  - **XHProf URL**: `http://xhprof.drupalvm.dev` (assuming this domain is configured in `apache_vhosts` inside `config.yml`)
+
+## XDebug
+
+[XDebug](https://xdebug.org/) is a debugger and profiler for PHP. While most people use it only for debugging purposes, you can also use it for profiling. It's not as commonly used for profiling as either Blackfire or XHProf, but it works!
diff --git a/docs/extras/xhprof.md b/docs/extras/xhprof.md
deleted file mode 100644
index 972a49201..000000000
--- a/docs/extras/xhprof.md
+++ /dev/null
@@ -1,18 +0,0 @@
-As a prerequisite, make sure you have `xhprof` in the `installed_extras` list inside `config.yml` (So the PHP XHProf extension is installed on Drupal VM).
-
-**Note**: You should disable `xdebug` when enabling/using XHProf, because it is known to have issues running alongside XHProf, and makes test results less reliable and slower than they should be.
-
-## XHProf module
-
-The easiest way to use XHProf to profile your PHP code on a Drupal site is to install the [XHProf](https://www.drupal.org/project/xhprof) module, then in XHProf's configuration (at `/admin/config/development/xhprof`), check the 'Enable profiling of page views and drush requests' checkbox.
-
-The XHProf module doesn't include built-in support for callgraphs, but there's an issue to [add callgraph support](https://www.drupal.org/node/1470740).
-
-You can view callgraphs (and a listing of all stored runs) using Drupal VM's own XHProf installation by visiting `http://xhprof.drupalvm.dev/` and clicking on the relevant run, then clicking the "[View Full Callgraph]" link.
-
-## Devel module (deprecated)
-
-The Devel module also *used* to provide XHProf configuration, and setting the options below would allow Devel's XHProf integration to work correctly with Drupal VM's XHProf installation:
-
-  - **xhprof directory**: `/usr/share/php`
-  - **XHProf URL**: `http://xhprof.drupalvm.dev` (assuming this domain is configured in `apache_vhosts` inside `config.yml`)
diff --git a/example.config.yml b/example.config.yml
index 9d0ad78b4..24f6413c6 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -152,6 +152,7 @@ mysql_users:
 # to install *any* extras, make set this value to an empty set, e.g. `[]`.
 installed_extras:
   - adminer
+  # - blackfire
   - drupalconsole
   - mailhog
   - memcached
diff --git a/mkdocs.yml b/mkdocs.yml
index 797d5d2e6..6e12f4fe9 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -25,7 +25,7 @@ pages:
     - 'Use Node.js and NPM': 'extras/nodejs.md'
     - 'Use SSL vhosts with Apache': 'extras/ssl.md'
     - 'View Logs with Pimp my Log': 'extras/pimpmylog.md'
-    - 'Profile Code with XHProf': 'extras/xhprof.md'
+    - 'Profile Code - XHProf, Blackfire, Xdebug': 'extras/profile-code.md'
     - 'Debug Code with XDebug': 'extras/xdebug.md'
     - 'Catch Emails with MailHog': 'extras/mailhog.md'
     - 'Test with Behat and Selenium': 'extras/behat.md'
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index fe595a915..4679c48bb 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -39,6 +39,7 @@
     - { role: geerlingguy.php-memcached, when: '"memcached" in installed_extras' }
     - { role: geerlingguy.php-xdebug, when: '"xdebug" in installed_extras' }
     - { role: geerlingguy.php-xhprof, when: '"xhprof" in installed_extras' }
+    - { role: geerlingguy.blackfire, when: '"blackfire" in installed_extras' }
     - { role: geerlingguy.adminer, when: '"adminer" in installed_extras' }
     - { role: geerlingguy.pimpmylog, when: '"pimpmylog" in installed_extras' }
     - { role: geerlingguy.daemonize, when: '"mailhog" in installed_extras' }
diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 64d103839..cdde642e7 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -4,6 +4,7 @@
 - src: geerlingguy.adminer
 - src: geerlingguy.apache
 - src: geerlingguy.apache-php-fpm
+- src: geerlingguy.blackfire
 - src: geerlingguy.composer
 - src: geerlingguy.daemonize
 - src: geerlingguy.drupal-console

From 0156a796b2ada0843ee3590a9c0b907c925670aa Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 10 May 2016 23:08:00 -0500
Subject: [PATCH 0236/1273] Fixes #523: Fix documentation for adding
 drupal-extension and dependencies.

---
 docs/extras/behat.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/docs/extras/behat.md b/docs/extras/behat.md
index 32de03a38..40a39018d 100644
--- a/docs/extras/behat.md
+++ b/docs/extras/behat.md
@@ -13,9 +13,6 @@ installed_extras:
 
 # Make sure the following four packages are in composer_global_packages:
 composer_global_packages:
-  - { name: behat/mink, release: '1.5.*@stable' }
-  - { name: behat/mink-goutte-driver, release: '*' }
-  - { name: behat/mink-selenium2-driver, release: '*' }
   - { name: drupal/drupal-extension, release: '*' }
 ```
 
@@ -26,7 +23,7 @@ $ behat --version
 behat version 3.0.15
 ```
 
-_You can also include the `behat/*` and `drupal/drupal-extension` directly in your project's `composer.json` file, and install the dependencies per-project. Either option (installing globally, like above, or installing per-project) is perfectly acceptable._
+_You can also include `drupal/drupal-extension` directly in your project's `composer.json` file, and install the dependencies per-project. Either option (installing globally, like above, or installing per-project) is perfectly acceptable._
 
 ## Setting up Behat for your project
 

From f4364f3d0d71ed8d7298ee5a2cd8a887f418e31d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 11 May 2016 15:08:21 -0500
Subject: [PATCH 0237/1273] Fix misleading error message when attempting to
 install drupal without a codebase

---
 provisioning/tasks/install-site.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/tasks/install-site.yml b/provisioning/tasks/install-site.yml
index 9ddf99254..a5f1c1bc1 100644
--- a/provisioning/tasks/install-site.yml
+++ b/provisioning/tasks/install-site.yml
@@ -4,7 +4,7 @@
     {{ drush_path }} status bootstrap
     chdir={{ drupal_core_path }}
   register: drupal_site_installed
-  failed_when: false
+  failed_when: "drupal_site_installed.stdout is undefined"
   changed_when: false
   become: no
 

From a04c0d0e8ef993832e4627bdf581f24efcade352 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 11 May 2016 22:05:44 -0500
Subject: [PATCH 0238/1273] Fixes #608: Lock Ansible role versions to a
 specific release.

---
 provisioning/requirements.yml | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index cdde642e7..6ee82d0af 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -1,34 +1,67 @@
 ---
 - src: arknoll.selenium
+  version: 1.2.0
 - src: franklinkim.newrelic
+  version: 1.2.0
 - src: geerlingguy.adminer
+  version: 1.1.0
 - src: geerlingguy.apache
+  version: 1.7.2
 - src: geerlingguy.apache-php-fpm
+  version: 1.0.2
 - src: geerlingguy.blackfire
+  version: 1.0.0
 - src: geerlingguy.composer
+  version: 1.4.0
 - src: geerlingguy.daemonize
+  version: 1.1.0
 - src: geerlingguy.drupal-console
+  version: 1.0.7
 - src: geerlingguy.drush
+  version: 1.1.2
 - src: geerlingguy.firewall
+  version: 1.0.9
 - src: geerlingguy.git
+  version: 1.1.1
 - src: geerlingguy.java
+  version: 1.4.0
 - src: geerlingguy.mailhog
+  version: 1.1.0
 - src: geerlingguy.memcached
+  version: 1.0.4
 - src: geerlingguy.mysql
+  version: 2.2.1
 - src: geerlingguy.nginx
+  version: 1.9.2
 - src: geerlingguy.nodejs
+  version: 3.0.0
 - src: geerlingguy.php
+  version: 2.0.3
 - src: geerlingguy.php-memcached
+  version: 1.1.0
 - src: geerlingguy.php-mysql
+  version: 1.2.0
 - src: geerlingguy.php-pecl
+  version: 1.2.1
 - src: geerlingguy.php-redis
+  version: 2.0.0
 - src: geerlingguy.php-xdebug
+  version: 2.1.0
 - src: geerlingguy.php-xhprof
+  version: 2.1.0
 - src: geerlingguy.pimpmylog
+  version: 1.0.2
 - src: geerlingguy.postfix
+  version: 1.1.0
 - src: geerlingguy.redis
+  version: 1.2.0
 - src: geerlingguy.repo-remi
+  version: 1.2.0
 - src: geerlingguy.ruby
+  version: 2.3.1
 - src: geerlingguy.security
+  version: 1.2.0
 - src: geerlingguy.solr
+  version: 2.1.0
 - src: geerlingguy.varnish
+  version: 1.5.0

From 36f0eaee50ececd8c359795c8cb551626c78fd66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 9 Apr 2016 18:27:00 -0500
Subject: [PATCH 0239/1273] Issue #455: Add support for local.config.yml and
 prod.config.yml

---
 Vagrantfile               | 9 +++++++--
 provisioning/playbook.yml | 5 +++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index e68861320..691ef00d8 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -24,13 +24,18 @@ def walk(obj, &fn)
   end
 end
 
-# Use config.yml for basic VM configuration.
+# Use config.yml, prod.config.yml and local.config.yml for VM configuration.
 require 'yaml'
+vconfig = {}
 dir = File.dirname(File.expand_path(__FILE__))
 unless File.exist?("#{dir}/config.yml")
   raise 'Configuration file not found! Please copy example.config.yml to config.yml and try again.'
 end
-vconfig = YAML.load_file("#{dir}/config.yml")
+['config.yml', 'prod.config.yml', 'local.config.yml'].each do |file|
+  if File.exist?("#{dir}/#{file}")
+    vconfig.merge!(YAML.load_file("#{dir}/#{file}"))
+  end
+end
 
 # Replace jinja variables in config.
 vconfig = walk(vconfig) do |value|
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 97cf21ff1..0d4dec07e 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -7,6 +7,11 @@
     - ../config.yml
 
   pre_tasks:
+    - include_vars: "{{ item }}"
+      with_fileglob:
+        - ../../prod.config.yml
+        - ../../local.config.yml
+
     - include: tasks/init-debian.yml
       when: ansible_os_family == 'Debian'
     - include: tasks/init-redhat.yml

From e5a4fc4711dbaf3ca309530d65c99f6258230d15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 12 May 2016 14:05:14 -0500
Subject: [PATCH 0240/1273] Cleanup code to distinguish optional config files
 from the required config.yml

---
 Vagrantfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 691ef00d8..57cb580fe 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -26,12 +26,13 @@ end
 
 # Use config.yml, prod.config.yml and local.config.yml for VM configuration.
 require 'yaml'
-vconfig = {}
 dir = File.dirname(File.expand_path(__FILE__))
 unless File.exist?("#{dir}/config.yml")
   raise 'Configuration file not found! Please copy example.config.yml to config.yml and try again.'
 end
-['config.yml', 'prod.config.yml', 'local.config.yml'].each do |file|
+vconfig = YAML.load_file("#{dir}/config.yml")
+# Include environment config files if available.
+['prod.config.yml', 'local.config.yml'].each do |file|
   if File.exist?("#{dir}/#{file}")
     vconfig.merge!(YAML.load_file("#{dir}/#{file}"))
   end

From 92dd354ab93192d5c8125e3ca17768fc4fe61f3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 12 May 2016 15:08:00 -0500
Subject: [PATCH 0241/1273] Remove support for prod.config.yml for now

---
 Vagrantfile               | 10 ++++------
 provisioning/playbook.yml |  1 -
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 57cb580fe..5e0ff5c45 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -24,18 +24,16 @@ def walk(obj, &fn)
   end
 end
 
-# Use config.yml, prod.config.yml and local.config.yml for VM configuration.
+# Use config.yml and local.config.yml for VM configuration.
 require 'yaml'
 dir = File.dirname(File.expand_path(__FILE__))
 unless File.exist?("#{dir}/config.yml")
   raise 'Configuration file not found! Please copy example.config.yml to config.yml and try again.'
 end
 vconfig = YAML.load_file("#{dir}/config.yml")
-# Include environment config files if available.
-['prod.config.yml', 'local.config.yml'].each do |file|
-  if File.exist?("#{dir}/#{file}")
-    vconfig.merge!(YAML.load_file("#{dir}/#{file}"))
-  end
+# Include a local.config.yml file if available.
+if File.exist?("#{dir}/local.config.yml")
+  vconfig.merge!(YAML.load_file("#{dir}/local.config.yml"))
 end
 
 # Replace jinja variables in config.
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 0d4dec07e..aa4ebbd63 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -9,7 +9,6 @@
   pre_tasks:
     - include_vars: "{{ item }}"
       with_fileglob:
-        - ../../prod.config.yml
         - ../../local.config.yml
 
     - include: tasks/init-debian.yml

From a7a308677d50369187c76a33aad4d6dd1ec6a010 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 12 May 2016 15:10:16 -0500
Subject: [PATCH 0242/1273] Add documentation about local.config.yml [ci skip]

---
 ...ntfile.md => overriding-configurations.md} | 23 ++++++++++++++++++-
 mkdocs.yml                                    |  2 +-
 2 files changed, 23 insertions(+), 2 deletions(-)
 rename docs/other/{local-vagrantfile.md => overriding-configurations.md} (67%)

diff --git a/docs/other/local-vagrantfile.md b/docs/other/overriding-configurations.md
similarity index 67%
rename from docs/other/local-vagrantfile.md
rename to docs/other/overriding-configurations.md
index 80ed5e28c..dbf982e0c 100644
--- a/docs/other/local-vagrantfile.md
+++ b/docs/other/overriding-configurations.md
@@ -1,3 +1,24 @@
+## Overriding variables in `config.yml` with a `local.config.yml`
+
+If available, Drupal VM will also load a `local.config.yml` after having loaded the main `config.yml`. Using this file you can override variables previously defined in `config.yml`. For teams who are sharing a VM configuration, this is a good place to configure anything that's specific to your own environment.
+
+```yaml
+# Increase the memory available to your Drupal site.
+vagrant_memory: 1536
+php_memory_limit: "512M"
+
+# Override the synced folders to use rsync instead of NFS.
+vagrant_synced_folders:
+  - local_path: ~/Sites/drupalvm
+    destination: /var/www/drupalvm
+    type: rsync
+    create: true
+```
+
+_Note: The merge of the variables in these two files is shallow, so if you want to override a single item in a list, you will need to re-define all items in that list._
+
+## Extending the `Vagrantfile` with `Vagrantfile.local`
+
 Out of the box Drupal VM supports having VirtualBox, Parallels as well as VMware as a provider. Besides these there are multitude of others available (for example `vagrant-aws`, `vagrant-digitalocean`).
 
 If you want to use an unsupported provider, or otherwise modify the vagrant configuration in a way that is not exposed by Drupal VM, you can create a `Vagrantfile.local` in the root directory of this project.
@@ -16,7 +37,7 @@ config.vm.provider :virtualbox do |v|
 end
 ```
 
-## Example: Using the `vagrant-aws` provider
+### Example: Using the `vagrant-aws` provider
 
 Add the following variables to your `config.yml`.
 
diff --git a/mkdocs.yml b/mkdocs.yml
index 6e12f4fe9..2bf8e10fb 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -33,7 +33,7 @@ pages:
   - Other Information:
     - 'Using Different Base OSes': 'other/base-os.md'
     - 'Using Different Webservers': 'other/webservers.md'
-    - 'Using a local Vagrantfile': 'other/local-vagrantfile.md'
+    - 'Overriding configurations': 'other/overriding-configurations.md'
     - 'PHP 7 on Drupal VM': 'other/php-7.md'
     - 'BigPipe with Drupal VM': 'other/bigpipe.md'
     - 'Drupal VM Management Tools': 'other/management-tools.md'

From 2d94c77235636d14bb9fcb451f153976a679cf32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 12 May 2016 15:37:44 -0500
Subject: [PATCH 0243/1273] Issue #614: Install cron jobs as the SSH user
 instead of as root

---
 example.config.yml          | 4 ++--
 provisioning/tasks/cron.yml | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/example.config.yml b/example.config.yml
index 9bebf5871..448f80ed6 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -60,8 +60,8 @@ drupal_mysql_database: drupal
 # Additional arguments or options to pass to `drush site-install`.
 drupal_site_install_extra_args: []
 
-# Cron jobs are added to the root user's crontab. Keys include name (required),
-# minute, hour, day, weekday, month, job (required), and state.
+# Cron jobs are added to the vagrant user's crontab. Keys include name
+# (required), minute, hour, day, weekday, month, job (required), and state.
 drupalvm_cron_jobs: []
   # - {
   #   name: "Drupal Cron",
diff --git a/provisioning/tasks/cron.yml b/provisioning/tasks/cron.yml
index 5d3725650..96f726425 100644
--- a/provisioning/tasks/cron.yml
+++ b/provisioning/tasks/cron.yml
@@ -1,5 +1,5 @@
 ---
-- name: Ensure configured cron jobs exist in root account's crontab.
+- name: Ensure configured cron jobs exist in user account's crontab.
   cron:
     name: "{{ item.name }}"
     minute: "{{ item.minute | default('*') }}"
@@ -11,3 +11,4 @@
     state: "{{ item.state | default('present') }}"
   with_items: "{{ drupalvm_cron_jobs }}"
   when: drupalvm_cron_jobs is defined
+  become: no

From afff8c5875178e056a139f321253134e6c229ca9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 11 May 2016 22:20:11 -0500
Subject: [PATCH 0244/1273] Followup #608: Automate ansible-galaxy install step

---
 README.md                               | 6 ++----
 Vagrantfile                             | 1 +
 docs/other/overriding-configurations.md | 3 +++
 docs/other/php-7.md                     | 2 --
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index f3ce080db..b90a5aa28 100644
--- a/README.md
+++ b/README.md
@@ -72,8 +72,7 @@ Notes:
     - Copy `example.config.yml` to `config.yml`.
   3. Create a local directory where Drupal will be installed and configure the path to that directory in `config.yml` (`local_path`, inside `vagrant_synced_folders`).
   4. Open Terminal, `cd` to this directory (containing the `Vagrantfile` and this README file).
-  5. (If you have Ansible installed on Mac/Linux) Run `$ ansible-galaxy install -r provisioning/requirements.yml --force`.
-  6. Type in `vagrant up`, and let Vagrant do its magic.
+  5. Type in `vagrant up`, and let Vagrant do its magic.
 
 Note: *If there are any errors during the course of running `vagrant up`, and it drops you back to your command prompt, just run `vagrant provision` to continue building the VM from where you left off. If there are still errors after doing this a few times, post an issue to this project's issue queue on GitHub with the error.*
 
@@ -115,8 +114,7 @@ Drupal VM follows semantic versioning, which means your configuration should con
 
   1. Read through the [release notes](https://github.com/geerlingguy/drupal-vm/releases) and add/modify `config.yml` variables mentioned therein.
   2. Do a diff of my config.yml with the updated example.config.yml (e.g. `curl https://raw.githubusercontent.com/geerlingguy/drupal-vm/master/example.config.yml | git diff --no-index config.yml -`).
-  3. If Ansible is installed, update all roles locally (`ansible-galaxy install -r provisioning/requirements.yml --force`).
-  4. Run `vagrant provision` to provision the VM, incorporating all the latest changes.
+  3. Run `vagrant provision` to provision the VM, incorporating all the latest changes.
 
 For major version upgrades (e.g. 2.x.x to 3.x.x), it may be simpler to destroy the VM (`vagrant destroy`) then build a fresh new VM (`vagrant up`) using the new version of Drupal VM.
 
diff --git a/Vagrantfile b/Vagrantfile
index 5e0ff5c45..ffac05663 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -113,6 +113,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   if which('ansible-playbook')
     config.vm.provision 'ansible' do |ansible|
       ansible.playbook = "#{dir}/provisioning/playbook.yml"
+      ansible.galaxy_role_file = "#{dir}/provisioning/requirements.yml"
     end
   else
     config.vm.provision 'shell' do |sh|
diff --git a/docs/other/overriding-configurations.md b/docs/other/overriding-configurations.md
index dbf982e0c..118a65008 100644
--- a/docs/other/overriding-configurations.md
+++ b/docs/other/overriding-configurations.md
@@ -35,6 +35,9 @@ config.vm.provider :virtualbox do |v|
   # Cap the host CPU execution at 50% usage.
   v.customize ["modifyvm", :id, "--cpuexecutioncap", "50"]
 end
+
+# Disable the galaxy role re-installation during provisions.
+config.vm.provisioners[0].config.galaxy_role_file = nil
 ```
 
 ### Example: Using the `vagrant-aws` provider
diff --git a/docs/other/php-7.md b/docs/other/php-7.md
index 5a185895f..dbab3a23c 100644
--- a/docs/other/php-7.md
+++ b/docs/other/php-7.md
@@ -1,7 +1,5 @@
 Drupal VM fully supports PHP 7, but currently defaults to 5.6 in order to maximize compatibility with older Drupal 6 and 7 sites. Soon, Drupal VM will change its defaults to install PHP 7.x instead of 5.x, but until then, follow the instructions below to use PHP 7.
 
-_Note: If you have Ansible installed on your host machine, make sure you're running the latest version of all Ansible role dependencies by running `ansible-galaxy install -r provisioning/requirements.yml --force` inside the root Drupal VM project folder._
-
 ## Ubuntu 14.04
 
 Ondřej Surý's PPA for PHP 7.0 is included with Drupal VM, and you can make the following changes/additions to `config.yml` to use it:

From 157b0edc1e247ffa30b375846069364c30cb1e02 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 12 May 2016 07:55:47 -0500
Subject: [PATCH 0245/1273] Issue #609: Switch all defaults to Ubuntu 16.04 and
 PHP 7.

---
 README.md                     |  7 +++---
 docs/other/php-56.md          | 44 ++++++++++++++++++++++++++++++++++
 docs/other/php-7.md           | 45 -----------------------------------
 example.config.yml            | 17 +++++++------
 mkdocs.yml                    |  2 +-
 provisioning/requirements.yml |  4 ++--
 6 files changed, 59 insertions(+), 60 deletions(-)
 create mode 100644 docs/other/php-56.md
 delete mode 100644 docs/other/php-7.md

diff --git a/README.md b/README.md
index b90a5aa28..109fe4043 100644
--- a/README.md
+++ b/README.md
@@ -9,10 +9,10 @@ This project aims to make spinning up a simple local Drupal test/development env
 It will install the following on an Ubuntu 14.04 (by default) linux VM:
 
   - Apache 2.4.x (or Nginx 1.x)
-  - PHP 5.6.x (configurable)
-  - MySQL 5.5.x
+  - PHP 7.0.x (configurable)
+  - MySQL 5.7.x
   - Drush (configurable)
-  - Drupal 6.x, 7.x, or 8.x.x (configurable)
+  - Drupal 7.x, or 8.x.x (configurable)
   - Optional:
     - Drupal Console
     - Varnish 4.x (configurable)
@@ -23,6 +23,7 @@ It will install the following on an Ubuntu 14.04 (by default) linux VM:
     - Memcached
     - Redis
     - XHProf, for profiling your code
+    - Blackfire, for profiling your code
     - XDebug, for debugging your code
     - Adminer, for accessing databases directly
     - Pimp my Log, for easy viewing of log files
diff --git a/docs/other/php-56.md b/docs/other/php-56.md
new file mode 100644
index 000000000..c91374a99
--- /dev/null
+++ b/docs/other/php-56.md
@@ -0,0 +1,44 @@
+Drupal VM defaults to PHP 7, but you can install and use 5.6 if you need to maximize compatibility with older Drupal 6 and 7 sites.
+
+_Note: If you have Ansible installed on your host machine, make sure you're running the latest version of all Ansible role dependencies by running `ansible-galaxy install -r provisioning/requirements.yml --force` inside the root Drupal VM project folder._
+
+## Ubuntu 16.04
+
+Ubuntu 16.04 Xenial defaults to PHP 7.0 in it's system packages. No older versions of PHP will be supported if using this base box.
+
+## Ubuntu 14.04
+
+Ondřej Surý's PPA for PHP 7.0 is used to install PHP 7, but you can switch to using different 5.6 packages instead by making the following changes to `config.yml`:
+
+```yaml
+php_version: "5.6"
+php_packages:
+  - php5
+  - php5-mcrypt
+  - php5-cli
+  - php5-common
+  - php5-curl
+  - php5-dev
+  - php5-fpm
+  - php5-gd
+  - php-pear
+  - libpcre3-dev
+php_conf_paths:
+  - /etc/php5/fpm
+  - /etc/php5/apache2
+  - /etc/php5/cli
+php_extension_conf_paths:
+  - /etc/php5/fpm/conf.d
+  - /etc/php5/apache2/conf.d
+  - /etc/php5/cli/conf.d
+php_fpm_daemon: php5-fpm
+php_fpm_conf_path: "/etc/php5/fpm"
+php_mysql_package: php5-mysql
+```
+
+## RedHat/CentOS 7
+
+Remi's RPM repository is included with Drupal VM, and you can make the following changes to use it to install PHP 5.6 instead of 7:
+
+  1. Make sure you've followed the directions for switching to CentOS 7 in the [use a different base OS](base-os.md) guide.
+  2. Change `php_version` inside `config.yml` to `"5.6"`.
diff --git a/docs/other/php-7.md b/docs/other/php-7.md
deleted file mode 100644
index dbab3a23c..000000000
--- a/docs/other/php-7.md
+++ /dev/null
@@ -1,45 +0,0 @@
-Drupal VM fully supports PHP 7, but currently defaults to 5.6 in order to maximize compatibility with older Drupal 6 and 7 sites. Soon, Drupal VM will change its defaults to install PHP 7.x instead of 5.x, but until then, follow the instructions below to use PHP 7.
-
-## Ubuntu 14.04
-
-Ondřej Surý's PPA for PHP 7.0 is included with Drupal VM, and you can make the following changes/additions to `config.yml` to use it:
-
-```yaml
-php_version: "7.0"
-php_packages:
-  - php7.0-common
-  - php7.0-cli
-  - php7.0-dev
-  - php7.0-fpm
-  - libpcre3-dev
-  - php7.0-gd
-  - php7.0-curl
-  - php7.0-imap
-  - php7.0-json
-  - php7.0-opcache
-  - php7.0-xml
-  - php7.0-mbstring
-php_mysql_package: php7.0-mysql
-php_fpm_daemon: php7.0-fpm
-php_conf_paths:
-  - /etc/php/7.0/fpm
-  - /etc/php/7.0/apache2
-  - /etc/php/7.0/cli
-php_extension_conf_paths:
-  - /etc/php/7.0/fpm/conf.d
-  - /etc/php/7.0/apache2/conf.d
-  - /etc/php/7.0/cli/conf.d
-php_fpm_pool_conf_path: "/etc/php/7.0/fpm/pool.d/www.conf"
-```
-
-Also, comment out `xhprof`, `redis` and `memcached` from the `installed_extras` list, as these extensions are not yet supported for PHP 7 (as of late 2015).
-
-You can also build from source using the same/included `geerlingguy.php` Ansible role, but that process is a bit more involved and for power users comfortable with the process.
-
-## RedHat/CentOS 7
-
-Remi's RPM repository is included with Drupal VM, and you can make the following changes to use it to install PHP 7:
-
-  1. Make sure you've followed the directions for switching to CentOS 7 in the [use a different base OS](base-os.md) guide.
-  2. Change `php_version` inside `config.yml` to `"7.0"`.
-  3. Comment out `xhprof`, `xdebug`, `redis` and `memcached` from the `installed_extras` list, as these extensions are not yet supported for PHP 7 (as of early 2016).
diff --git a/example.config.yml b/example.config.yml
index 448f80ed6..066c006cc 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -1,7 +1,7 @@
 ---
 # `vagrant_box` can also be set to geerlingguy/centos6, geerlingguy/centos7,
-# geerlingguy/ubuntu1604, geerlingguy/ubuntu1204, parallels/ubuntu-14.04, etc.
-vagrant_box: geerlingguy/ubuntu1404
+# geerlingguy/ubuntu1404, geerlingguy/ubuntu1204, parallels/ubuntu-14.04, etc.
+vagrant_box: geerlingguy/ubuntu1604
 vagrant_user: vagrant
 vagrant_synced_folder_default_type: nfs
 
@@ -155,7 +155,7 @@ installed_extras:
   # - blackfire
   - drupalconsole
   - mailhog
-  - memcached
+  # - memcached
   # - newrelic
   # - nodejs
   - pimpmylog
@@ -164,8 +164,8 @@ installed_extras:
   # - selenium
   # - solr
   - varnish
-  - xdebug
-  - xhprof
+  # - xdebug
+  # - xhprof
 
 # Add any extra apt or yum packages you would like installed.
 extra_packages: []
@@ -200,10 +200,9 @@ firewall_allowed_tcp_ports:
   - "8983"
 firewall_log_dropped_packets: false
 
-# PHP Configuration. Currently-supported versions: 5.5, 5.6, 7.0.
-# PHP 7.0 requires a few additional changes. See the documentation at
-# http://docs.drupalvm.com/en/latest/other/php-7/
-php_version: "5.6"
+# PHP Configuration. Currently-supported versions: 5.6, 7.0.
+# To use 5.6, see: http://docs.drupalvm.com/en/latest/other/php-56/
+php_version: "7.0"
 php_memory_limit: "192M"
 php_display_errors: "On"
 php_display_startup_errors: "On"
diff --git a/mkdocs.yml b/mkdocs.yml
index 2bf8e10fb..4ec6a3334 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -34,7 +34,7 @@ pages:
     - 'Using Different Base OSes': 'other/base-os.md'
     - 'Using Different Webservers': 'other/webservers.md'
     - 'Overriding configurations': 'other/overriding-configurations.md'
-    - 'PHP 7 on Drupal VM': 'other/php-7.md'
+    - 'PHP 5.6 on Drupal VM': 'other/php-56.md'
     - 'BigPipe with Drupal VM': 'other/bigpipe.md'
     - 'Drupal VM Management Tools': 'other/management-tools.md'
     - 'Networking Notes': 'other/networking.md'
diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 6ee82d0af..db3b0a260 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -36,11 +36,11 @@
 - src: geerlingguy.nodejs
   version: 3.0.0
 - src: geerlingguy.php
-  version: 2.0.3
+  version: 3.0.0
 - src: geerlingguy.php-memcached
   version: 1.1.0
 - src: geerlingguy.php-mysql
-  version: 1.2.0
+  version: 2.0.0
 - src: geerlingguy.php-pecl
   version: 1.2.1
 - src: geerlingguy.php-redis

From 6309cb9b6764a93b77dcdcfccec7889b7b853316 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 12 May 2016 08:00:30 -0500
Subject: [PATCH 0246/1273] Issue #609: Clean up some references to / usage of
 PHP < 7.

---
 examples/acquia/README.md          | 2 +-
 provisioning/tasks/init-debian.yml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/acquia/README.md b/examples/acquia/README.md
index cbb1ebd41..74f546dd8 100644
--- a/examples/acquia/README.md
+++ b/examples/acquia/README.md
@@ -4,7 +4,7 @@ This directory contains example configuration changes for the default Drupal VM
 
   - Ubuntu 12.04.5 LTS
   - Apache 2.2.22
-  - PHP 5.5.23
+  - PHP 5.6.21
   - MySQL/Percona 5.5.24
   - Apache Solr 4.5.1
 
diff --git a/provisioning/tasks/init-debian.yml b/provisioning/tasks/init-debian.yml
index 5f0e680f7..10e774ad1 100644
--- a/provisioning/tasks/init-debian.yml
+++ b/provisioning/tasks/init-debian.yml
@@ -21,15 +21,15 @@
 
 - name: Add repository for PHP 5.5.
   apt_repository: repo='ppa:ondrej/php5'
-  when: php_version == "5.5" and ansible_distribution == "Ubuntu"
+  when: php_version == "5.5" and ansible_distribution == "Ubuntu" and ansible_distribution_version == "12.04"
 
 - name: Add repository for PHP 5.6.
   apt_repository: repo='ppa:ondrej/php5-5.6'
-  when: php_version == "5.6" and ansible_distribution == "Ubuntu"
+  when: php_version == "5.6" and ansible_distribution == "Ubuntu" and ansible_distribution_version != "16.04"
 
 - name: Add repository for PHP 7.0.
   apt_repository: repo='ppa:ondrej/php'
-  when: php_version == "7.0" and ansible_distribution == "Ubuntu"
+  when: php_version == "7.0" and ansible_distribution == "Ubuntu" and ansible_distribution_version != "16.04"
 
 - name: Define php_xhprof_html_dir.
   set_fact:

From 0de0926ff7acc1a99443bca54adc3e27d5143053 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 12 May 2016 09:33:36 -0500
Subject: [PATCH 0247/1273] Bump requirements for php-redis and php-memcached
 roles.

---
 provisioning/requirements.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index db3b0a260..bc4278f63 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -38,13 +38,13 @@
 - src: geerlingguy.php
   version: 3.0.0
 - src: geerlingguy.php-memcached
-  version: 1.1.0
+  version: 2.0.0
 - src: geerlingguy.php-mysql
   version: 2.0.0
 - src: geerlingguy.php-pecl
   version: 1.2.1
 - src: geerlingguy.php-redis
-  version: 2.0.0
+  version: 3.0.0
 - src: geerlingguy.php-xdebug
   version: 2.1.0
 - src: geerlingguy.php-xhprof

From f1b55957275ebe3571b2332128a5d784d95992c8 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 12 May 2016 15:05:46 -0500
Subject: [PATCH 0248/1273] Bump version requirement for php-xhprof role.

---
 provisioning/requirements.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index bc4278f63..cd2a18768 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -48,7 +48,7 @@
 - src: geerlingguy.php-xdebug
   version: 2.1.0
 - src: geerlingguy.php-xhprof
-  version: 2.1.0
+  version: 2.1.1
 - src: geerlingguy.pimpmylog
   version: 1.0.2
 - src: geerlingguy.postfix

From d765963f690e2a3765202e9fc1b2b8618ceee7fd Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 13 May 2016 07:47:09 -0500
Subject: [PATCH 0249/1273] Fixes #609: Fix a couple things that were breaking.

---
 example.config.yml            | 3 +++
 provisioning/requirements.yml | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/example.config.yml b/example.config.yml
index 066c006cc..12ee43c50 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -259,6 +259,9 @@ php_xdebug_remote_connect_back: 1
 php_xdebug_idekey: PHPSTORM
 php_xdebug_max_nesting_level: 256
 
+# XHProf configuration.
+xhprof_output_dir: /var/tmp
+
 # Solr Configuration (if enabled above).
 solr_version: "4.10.4"
 solr_xms: "64M"
diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index cd2a18768..f17ed03ab 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -36,7 +36,7 @@
 - src: geerlingguy.nodejs
   version: 3.0.0
 - src: geerlingguy.php
-  version: 3.0.0
+  version: 3.0.1
 - src: geerlingguy.php-memcached
   version: 2.0.0
 - src: geerlingguy.php-mysql
@@ -48,7 +48,7 @@
 - src: geerlingguy.php-xdebug
   version: 2.1.0
 - src: geerlingguy.php-xhprof
-  version: 2.1.1
+  version: 2.1.2
 - src: geerlingguy.pimpmylog
   version: 1.0.2
 - src: geerlingguy.postfix

From 61f5802d1fa1943adcf513c0119f23ef5efe498b Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 13 May 2016 08:46:27 -0500
Subject: [PATCH 0250/1273] Remove unneeded xhprof var.

---
 example.config.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/example.config.yml b/example.config.yml
index 12ee43c50..066c006cc 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -259,9 +259,6 @@ php_xdebug_remote_connect_back: 1
 php_xdebug_idekey: PHPSTORM
 php_xdebug_max_nesting_level: 256
 
-# XHProf configuration.
-xhprof_output_dir: /var/tmp
-
 # Solr Configuration (if enabled above).
 solr_version: "4.10.4"
 solr_xms: "64M"

From 8289d2a2afd394bb9be9088fbf457202c8b899ff Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 13 May 2016 10:26:04 -0500
Subject: [PATCH 0251/1273] Update Base OS documentation.

---
 docs/other/base-os.md | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/docs/other/base-os.md b/docs/other/base-os.md
index 7822c336b..89dc935cc 100644
--- a/docs/other/base-os.md
+++ b/docs/other/base-os.md
@@ -2,8 +2,8 @@ Drupal VM's configuration is designed to work with RedHat and Debian-compatible
 
 Currently-supported OSes are:
 
-  - Ubuntu 16.04
-  - Ubuntu 14.04 (default)
+  - Ubuntu 16.04 (default)
+  - Ubuntu 14.04
   - Ubuntu 12.04
   - RedHat Enterprise Linux / CentOS 7
   - RedHat Enterprise Linux / CentOS 6
@@ -14,16 +14,7 @@ Some other OSes should work, but are not regularly tested with Drupal VM, includ
 
 ## Ubuntu 16.04 Xenial LTS
 
-Ubuntu 16.04 is the latest LTS release, and there are a few changes currently required to make sure Drupal VM runs smoothly on it. Note also that Ubuntu 16.04 defaults to PHP 7; older versions of PHP will not be supported on this OS.
-
-**Redis**: If using redis, add the line `php_redis_package: php-redis` to `config.yml` before provisioning.
-
-Installed extras that are currently unsupported on Ubuntu 16.04:
-
-  - `memcached`
-  - `selenium`
-  - `varnish`
-  - `xhprof`
+Everything should work out of the box with Ubuntu 16.04.
 
 ## Ubuntu 14.04 Trusty LTS
 

From 490749de70722a3bf48861d8fd2714abe6667464 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 13 May 2016 10:27:07 -0500
Subject: [PATCH 0252/1273] Bump PHP role version to 3.0.2.

---
 provisioning/requirements.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index f17ed03ab..5bb78e58b 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -36,7 +36,7 @@
 - src: geerlingguy.nodejs
   version: 3.0.0
 - src: geerlingguy.php
-  version: 3.0.1
+  version: 3.0.2
 - src: geerlingguy.php-memcached
   version: 2.0.0
 - src: geerlingguy.php-mysql

From ad6ee6fd488e7bcef9f4c4404a41bd0bac11b20a Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 13 May 2016 10:49:20 -0500
Subject: [PATCH 0253/1273] Remove XHProf integration test temporarily.

---
 .travis.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f18b1cee8..31a0e0ff6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -85,11 +85,11 @@ script:
     && (echo 'Pimp my Log install pass' && exit 0)
     || (echo 'Pimp my Log install fail' && exit 1)
 
-  - >
-    sudo docker exec "$(cat ${container_id})" curl -s --header Host:xhprof.${HOSTNAME} localhost
-    | grep -q '<title>XHProf'
-    && (echo 'XHProf install pass' && exit 0)
-    || (echo 'XHProf install fail' && exit 1)
+  # - >
+  #   sudo docker exec "$(cat ${container_id})" curl -s --header Host:xhprof.${HOSTNAME} localhost
+  #   | grep -q '<title>XHProf'
+  #   && (echo 'XHProf install pass' && exit 0)
+  #   || (echo 'XHProf install fail' && exit 1)
 
   - >
     sudo docker exec "$(cat ${container_id})" curl -s localhost:8025

From 077ddbc85a9dc1101b8cc0a036e7b20222ebfb48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 14 May 2016 07:37:13 -0500
Subject: [PATCH 0254/1273] Issue #616: Switch travis tests from Ubuntu 14.04
 to 16.04

---
 .travis.yml                                                | 6 +++---
 tests/{Dockerfile.ubuntu-14.04 => Dockerfile.ubuntu-16.04} | 2 +-
 tests/{ubuntu-14-nginx.yml => ubuntu-16-nginx.yml}         | 0
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename tests/{Dockerfile.ubuntu-14.04 => Dockerfile.ubuntu-16.04} (95%)
 rename tests/{ubuntu-14-nginx.yml => ubuntu-16-nginx.yml} (100%)

diff --git a/.travis.yml b/.travis.yml
index 31a0e0ff6..25b0ca25f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,14 +10,14 @@ env:
       IP: 192.168.88.88
   matrix:
     - distribution: ubuntu
-      version: 14.04
+      version: 16.04
       init: /sbin/init
       run_opts: "--privileged"
     - distribution: ubuntu
-      version: 14.04
+      version: 16.04
       init: /sbin/init
       run_opts: "--privileged"
-      additional_vars: ubuntu-14-nginx.yml
+      additional_vars: ubuntu-16-nginx.yml
     - distribution: centos
       version: 7
       init: /usr/lib/systemd/systemd
diff --git a/tests/Dockerfile.ubuntu-14.04 b/tests/Dockerfile.ubuntu-16.04
similarity index 95%
rename from tests/Dockerfile.ubuntu-14.04
rename to tests/Dockerfile.ubuntu-16.04
index 266f96287..443cc58b2 100644
--- a/tests/Dockerfile.ubuntu-14.04
+++ b/tests/Dockerfile.ubuntu-16.04
@@ -1,4 +1,4 @@
-FROM ubuntu:14.04
+FROM ubuntu:16.04
 RUN apt-get update
 
 # Install Ansible
diff --git a/tests/ubuntu-14-nginx.yml b/tests/ubuntu-16-nginx.yml
similarity index 100%
rename from tests/ubuntu-14-nginx.yml
rename to tests/ubuntu-16-nginx.yml

From 42148c327cd0725b4e9a0d5bb666aa34b0d732e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 14 May 2016 07:48:58 -0500
Subject: [PATCH 0255/1273] Use local.config.yml in travis tests

---
 .travis.yml                               | 7 +++----
 tests/{test-vars.yml => local.config.yml} | 1 +
 tests/ubuntu-16-nginx.config.yml          | 3 +++
 tests/ubuntu-16-nginx.yml                 | 1 -
 4 files changed, 7 insertions(+), 5 deletions(-)
 rename tests/{test-vars.yml => local.config.yml} (92%)
 create mode 100644 tests/ubuntu-16-nginx.config.yml
 delete mode 100644 tests/ubuntu-16-nginx.yml

diff --git a/.travis.yml b/.travis.yml
index 25b0ca25f..cfc1ae5d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,7 @@ env:
       version: 16.04
       init: /sbin/init
       run_opts: "--privileged"
-      additional_vars: ubuntu-16-nginx.yml
+      local_config: ubuntu-16-nginx.config.yml
     - distribution: centos
       version: 7
       init: /usr/lib/systemd/systemd
@@ -53,9 +53,8 @@ script:
   - 'sudo docker exec "$(cat ${container_id})" cp /var/www/drupalvm/$CONFIG /var/www/drupalvm/config.yml'
   - 'sudo docker exec "$(cat ${container_id})" cp /var/www/drupalvm/$MAKEFILE /var/www/drupalvm/drupal.make.yml'
 
-  # Append additional variables.
-  - 'sudo docker exec "$(cat ${container_id})" bash -c "cat /var/www/drupalvm/tests/test-vars.yml >> /var/www/drupalvm/config.yml" || true'
-  - '[[ $additional_vars ]] && sudo docker exec "$(cat ${container_id})" bash -c "cat /var/www/drupalvm/tests/${additional_vars} >> /var/www/drupalvm/config.yml" || true'
+  # Override configuration variables.
+  - 'sudo docker exec "$(cat ${container_id})" bash -c "cp /var/www/drupalvm/tests/${local_config:-local.config.yml} /var/www/drupalvm/local.config.yml" || true'
 
   # Vagrantfile syntax check
   - 'rubocop --except LineLength,Eval,MutableConstant'
diff --git a/tests/test-vars.yml b/tests/local.config.yml
similarity index 92%
rename from tests/test-vars.yml
rename to tests/local.config.yml
index 3c765fddb..3344edd2f 100644
--- a/tests/test-vars.yml
+++ b/tests/local.config.yml
@@ -1 +1,2 @@
+---
 composer_home_path: "/{{ drupalvm_user }}/.composer"
diff --git a/tests/ubuntu-16-nginx.config.yml b/tests/ubuntu-16-nginx.config.yml
new file mode 100644
index 000000000..35deff7cc
--- /dev/null
+++ b/tests/ubuntu-16-nginx.config.yml
@@ -0,0 +1,3 @@
+---
+composer_home_path: "/{{ drupalvm_user }}/.composer"
+drupalvm_webserver: nginx
diff --git a/tests/ubuntu-16-nginx.yml b/tests/ubuntu-16-nginx.yml
deleted file mode 100644
index 848ddb468..000000000
--- a/tests/ubuntu-16-nginx.yml
+++ /dev/null
@@ -1 +0,0 @@
-drupalvm_webserver: nginx

From eaa0c43ba2da869b0dbf81a7d8b7137e9c92d1e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 14 May 2016 07:56:25 -0500
Subject: [PATCH 0256/1273] Issue #616: Bring README up to date [ci skip]

---
 README.md | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 109fe4043..134340329 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 
 This project aims to make spinning up a simple local Drupal test/development environment incredibly quick and easy, and to introduce new developers to the wonderful world of Drupal development on local virtual machines (instead of crufty old MAMP/WAMP-based development).
 
-It will install the following on an Ubuntu 14.04 (by default) linux VM:
+It will install the following on an Ubuntu 16.04 (by default) linux VM:
 
   - Apache 2.4.x (or Nginx 1.x)
   - PHP 7.0.x (configurable)
@@ -44,7 +44,7 @@ There are a couple places where you can customize the VM for your needs:
   - `config.yml`: Contains variables like the VM domain name and IP address, PHP and MySQL configuration, etc.
   - `drupal.make.yml`: Contains configuration for the Drupal core version, modules, and patches that will be downloaded on Drupal's initial installation (more about [Drush make files](https://www.drupal.org/node/1432374)).
 
-If you want to switch from Drupal 8 (default) to Drupal 7 or 6 on the initial install, do the following:
+If you want to switch from Drupal 8 (default) to Drupal 7 on the initial install, do the following:
 
   1. Update the Drupal `version` and `core` inside the `drupal.make.yml` file.
   2. Update `drupal_major_version` inside `config.yml`.
@@ -90,9 +90,11 @@ By default, this VM includes the extras listed in the `config.yml` option `insta
 
     installed_extras:
       - adminer
+      # - blackfire
       - drupalconsole
       - mailhog
-      - memcached
+      # - memcached
+      # - newrelic
       # - nodejs
       - pimpmylog
       # - redis
@@ -100,8 +102,8 @@ By default, this VM includes the extras listed in the `config.yml` option `insta
       # - selenium
       # - solr
       - varnish
-      - xdebug
-      - xhprof
+      # - xdebug
+      # - xhprof
 
 If you don't want or need one or more of these extras, just delete them or comment them from the list. This is helpful if you want to reduce PHP memory usage or otherwise conserve system resources.
 

From 0583bea6669106b99f4084e184a7b570bbc4b500 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 14 May 2016 08:12:33 -0500
Subject: [PATCH 0257/1273] Use stock ansible in travis ubuntu 16 for now

---
 tests/Dockerfile.ubuntu-16.04 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/Dockerfile.ubuntu-16.04 b/tests/Dockerfile.ubuntu-16.04
index 443cc58b2..9313987fb 100644
--- a/tests/Dockerfile.ubuntu-16.04
+++ b/tests/Dockerfile.ubuntu-16.04
@@ -3,7 +3,9 @@ RUN apt-get update
 
 # Install Ansible
 RUN apt-get install -y software-properties-common git
-RUN apt-add-repository -y ppa:ansible/ansible
+# The ansible repository does not provide deb packages for Xenial yet
+# https://github.com/ansible/ansible/issues/15524
+# RUN apt-add-repository -y ppa:ansible/ansible
 RUN apt-get update
 RUN apt-get install -y ansible ufw curl
 

From 8f7ea72a0137e538ee0340e3d0b836eee3a54ace Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 14 May 2016 08:09:03 -0500
Subject: [PATCH 0258/1273] Issue #616: Update docs [ci skip]

---
 docs/extras/mariadb.md |  2 +-
 docs/extras/scripts.md | 10 +++++++---
 docs/extras/varnish.md |  4 ++--
 docs/other/bigpipe.md  |  2 +-
 example.config.yml     |  2 +-
 mkdocs.yml             |  2 +-
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/docs/extras/mariadb.md b/docs/extras/mariadb.md
index 4989bf833..44ab0a268 100644
--- a/docs/extras/mariadb.md
+++ b/docs/extras/mariadb.md
@@ -9,7 +9,7 @@ mysql_packages:
   - python-mysqldb
 ```
 
-This set of packages works out of the box with the default Ubuntu 14.04 installation that comes with Drupal VM.
+This set of packages works out of the box with Ubuntu 14.04 as well as the default Ubuntu 16.04 installation that comes with Drupal VM.
 
 Alternatively, if you want to use RedHat 7 or CentOS 7 instead of Ubuntu, you can set the following variables to install and configure MariaDB instead of MySQL:
 
diff --git a/docs/extras/scripts.md b/docs/extras/scripts.md
index 2ae9b6f29..cb45c1a13 100644
--- a/docs/extras/scripts.md
+++ b/docs/extras/scripts.md
@@ -1,14 +1,18 @@
-Drupal VM allows you to run extra shell scripts at the end of the provisioning process, in case you need to do extra setup, further configure the VM, or install extra software outside the purview of Drupal VM.
+Drupal VM allows you to run extra shell scripts in the beginning and at the end of the provisioning process, in case you need to do extra setup, further configure the VM, or install extra software outside the purview of Drupal VM.
 
 To use an extra script, configure the path to the script (relative to `provisioning/playbook.yml`) in `config.yml`:
 
 ```yaml
+pre_provision_scripts:
+  - "../scripts/pre-provision.sh"
 post_provision_scripts:
   - "../scripts/post-provision.sh"
 ```
 
-The above example results in a `post-provision.sh` script running after the main Drupal VM setup is complete. Post provision scripts run after the first `vagrant up`, and then any time you run Vagrant provisioning (e.g. `vagrant provision` or `vagrant up --provision`).
+The above example results in a `pre-provision.sh` script running before the provisioning starts and a `post-provision.sh` script running after the main Drupal VM setup is complete. Pre and post provision scripts run after the first `vagrant up`, and then any time you run Vagrant provisioning (e.g. `vagrant provision` or `vagrant up --provision`).
+
+_Note: The pre provision scripts run before any other packages are installed. If you want to use commands such as `git`, you need to install the packages yourself._
 
 You can define as many scripts as you would like, and any arguments after the path will be passed to the shell script itself (e.g. `"- "../scripts/setup-paths.sh --option"`).
 
-Place your post-provision scripts inside a `scripts` directory in the root of your Drupal VM project directory; this directory is gitignored, so you can continue to update Drupal VM without overwriting your scripts.
+Place your pre and post provision scripts inside a `scripts` directory in the root of your Drupal VM project directory; this directory is gitignored, so you can continue to update Drupal VM without overwriting your scripts.
diff --git a/docs/extras/varnish.md b/docs/extras/varnish.md
index 95e1be858..a1b416c71 100644
--- a/docs/extras/varnish.md
+++ b/docs/extras/varnish.md
@@ -25,8 +25,8 @@ In order for Varnish to actually do anything helpful (instead of just pass throu
 You will also need to make a few small changes to your site's `settings.php` configuration to make Drupal work correctly behind a reverse proxy like Varnish:
 
 ```php
-$conf['reverse_proxy'] = TRUE;
-$conf['reverse_proxy_addresses'] = array('127.0.0.1');
+$settings['reverse_proxy'] = TRUE;
+$settings['reverse_proxy_addresses'] = array('127.0.0.1');
 ```
 
 If you don't set these values, Drupal will think all requests are coming from `127.0.0.1`. There are other settings you can change to make Drupal not store copies of cached pages in the Database (since Varnish is caching everything, this is redundant), but those other settings are not covered here.
\ No newline at end of file
diff --git a/docs/other/bigpipe.md b/docs/other/bigpipe.md
index 82315dfd5..08af8704e 100644
--- a/docs/other/bigpipe.md
+++ b/docs/other/bigpipe.md
@@ -31,7 +31,7 @@ This will disable the `mod_deflate` module for any requests inside that director
 
 If you want to switch Apache to use `mod_php` instead of proxying requests through PHP-FPM, you can make the following changes in `config.yml`:
 
-  1. Add `libapache2-mod-php5` to `extra_packages` in `config.yml`.
+  1. Add `libapache2-mod-php7.0` to `extra_packages` in `config.yml`.
   2. Delete the `extra_parameters` under any Drupal site in the list of `apache_vhosts` (so there is no `ProxyPassMatch` rule).
 
 You can also disable PHP-FPM and remove the two `proxy` entries from `apache_mods_enabled` if you don't want to use PHP-FPM with Apache at all, but that's optional; it won't break anything to run Apache with `mod_php` and `mod_proxy_fastcgi` at the same time.
diff --git a/example.config.yml b/example.config.yml
index 066c006cc..7d4dcb602 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -215,7 +215,7 @@ php_max_input_vars: "4000"
 
 # Drupal VM defaults to using PHP-FPM with either Apache or Nginx. If you wish
 # to instead use Apache + mod_php with an Ubuntu base box, make sure you add
-# libapache2-mod-php5 to `extra_packages` elsewhere in this config file.
+# libapache2-mod-php7.0 to `extra_packages` elsewhere in this config file.
 php_enable_php_fpm: true
 php_fpm_listen: "127.0.0.1:9000"
 
diff --git a/mkdocs.yml b/mkdocs.yml
index 4ec6a3334..0bea536fb 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -29,7 +29,7 @@ pages:
     - 'Debug Code with XDebug': 'extras/xdebug.md'
     - 'Catch Emails with MailHog': 'extras/mailhog.md'
     - 'Test with Behat and Selenium': 'extras/behat.md'
-    - 'Add Post-Provision Scripts': 'extras/scripts.md'
+    - 'Add Pre- and Post-Provision Scripts': 'extras/scripts.md'
   - Other Information:
     - 'Using Different Base OSes': 'other/base-os.md'
     - 'Using Different Webservers': 'other/webservers.md'

From 0ca7909328b0d949fe0e604620fd48fd5247e1c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 14 May 2016 08:36:12 -0500
Subject: [PATCH 0259/1273] Ensure sudo is available on Ubuntu

---
 provisioning/tasks/init-debian.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/provisioning/tasks/init-debian.yml b/provisioning/tasks/init-debian.yml
index 10e774ad1..b6bc20aa7 100644
--- a/provisioning/tasks/init-debian.yml
+++ b/provisioning/tasks/init-debian.yml
@@ -9,6 +9,7 @@
     - python-apt
     - python-pycurl
     - build-essential
+    - sudo
     - unzip
 
 - name: Disable the ufw firewall (since we use a simple iptables firewall).

From af9573da8c289936417880c9d9f460dcc6f27286 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 14 May 2016 09:00:50 -0500
Subject: [PATCH 0260/1273] Disable AppArmor in docker containers

---
 tests/Dockerfile.ubuntu-16.04 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/Dockerfile.ubuntu-16.04 b/tests/Dockerfile.ubuntu-16.04
index 9313987fb..b8f68786b 100644
--- a/tests/Dockerfile.ubuntu-16.04
+++ b/tests/Dockerfile.ubuntu-16.04
@@ -12,5 +12,8 @@ RUN apt-get install -y ansible ufw curl
 COPY initctl_faker .
 RUN chmod +x initctl_faker && rm -fr /sbin/initctl && ln -s /initctl_faker /sbin/initctl
 
+# Disable AppArmor as it doesn't work properly within Docker containers.
+RUN apt-get remove apparmor
+
 # Install Ansible inventory file
 RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts

From fd48808d9b13acb98b31e0eba679912dc8cbb4e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 14 May 2016 09:30:35 -0500
Subject: [PATCH 0261/1273] Install apparmor on docker containers

---
 tests/Dockerfile.ubuntu-16.04 | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tests/Dockerfile.ubuntu-16.04 b/tests/Dockerfile.ubuntu-16.04
index b8f68786b..bd524d0da 100644
--- a/tests/Dockerfile.ubuntu-16.04
+++ b/tests/Dockerfile.ubuntu-16.04
@@ -7,13 +7,10 @@ RUN apt-get install -y software-properties-common git
 # https://github.com/ansible/ansible/issues/15524
 # RUN apt-add-repository -y ppa:ansible/ansible
 RUN apt-get update
-RUN apt-get install -y ansible ufw curl
+RUN apt-get install -y ansible ufw curl apparmor apparmor-profiles
 
 COPY initctl_faker .
 RUN chmod +x initctl_faker && rm -fr /sbin/initctl && ln -s /initctl_faker /sbin/initctl
 
-# Disable AppArmor as it doesn't work properly within Docker containers.
-RUN apt-get remove apparmor
-
 # Install Ansible inventory file
 RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts

From 99d01b26ec26a5fd46e80f0db7f238a9bd854cd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 14 May 2016 09:49:35 -0500
Subject: [PATCH 0262/1273] Update apparmor detection

---
 provisioning/tasks/apparmor.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/provisioning/tasks/apparmor.yml b/provisioning/tasks/apparmor.yml
index 516ebf054..80f7125bd 100644
--- a/provisioning/tasks/apparmor.yml
+++ b/provisioning/tasks/apparmor.yml
@@ -1,8 +1,9 @@
 ---
-- name: Detect if AppArmor is installed.
-  stat:
-    path: /etc/init.d/apparmor
-  register: apparmor_installed
+- name: Detect if AppArmor is loaded.
+  command: apparmor_status
+  register: apparmor_status
+  failed_when: false
+  changed_when: false
 
 - name: Ensure MySQL AppArmor profile is disabled (for slow query log).
   file:
@@ -10,7 +11,7 @@
     src: /etc/apparmor.d/usr.sbin.mysqld
     state: link
   register: mysql_apparmor
-  when: mysql_slow_query_log_enabled and apparmor_installed.stat.exists
+  when: "mysql_slow_query_log_enabled and apparmor_status.stdout is defined and 'is loaded' in apparmor_status.stdout"
 
 - name: Restart the AppArmor if necessary.
   service: name=apparmor state=restarted

From 85dd47df9be648d4b30db3c1bd09531ba6baccd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 14 May 2016 10:07:29 -0500
Subject: [PATCH 0263/1273] Ignore apparmor tasks if service is not working

---
 provisioning/tasks/apparmor.yml | 6 +++---
 tests/Dockerfile.ubuntu-16.04   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/provisioning/tasks/apparmor.yml b/provisioning/tasks/apparmor.yml
index 80f7125bd..fc8711da0 100644
--- a/provisioning/tasks/apparmor.yml
+++ b/provisioning/tasks/apparmor.yml
@@ -1,6 +1,6 @@
 ---
-- name: Detect if AppArmor is loaded.
-  command: apparmor_status
+- name: Detect if AppArmor is working.
+  command: service apparmor status
   register: apparmor_status
   failed_when: false
   changed_when: false
@@ -11,7 +11,7 @@
     src: /etc/apparmor.d/usr.sbin.mysqld
     state: link
   register: mysql_apparmor
-  when: "mysql_slow_query_log_enabled and apparmor_status.stdout is defined and 'is loaded' in apparmor_status.stdout"
+  when: "mysql_slow_query_log_enabled and apparmor_status.rc == 0"
 
 - name: Restart the AppArmor if necessary.
   service: name=apparmor state=restarted
diff --git a/tests/Dockerfile.ubuntu-16.04 b/tests/Dockerfile.ubuntu-16.04
index bd524d0da..9313987fb 100644
--- a/tests/Dockerfile.ubuntu-16.04
+++ b/tests/Dockerfile.ubuntu-16.04
@@ -7,7 +7,7 @@ RUN apt-get install -y software-properties-common git
 # https://github.com/ansible/ansible/issues/15524
 # RUN apt-add-repository -y ppa:ansible/ansible
 RUN apt-get update
-RUN apt-get install -y ansible ufw curl apparmor apparmor-profiles
+RUN apt-get install -y ansible ufw curl
 
 COPY initctl_faker .
 RUN chmod +x initctl_faker && rm -fr /sbin/initctl && ln -s /initctl_faker /sbin/initctl

From 4fc722e30dff6f923b129395fd5e9a801f24aae5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 14 May 2016 10:20:07 -0500
Subject: [PATCH 0264/1273] Update PHP 5.6 configurations [ci skip]

---
 docs/other/php-56.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/other/php-56.md b/docs/other/php-56.md
index c91374a99..946f8b7c4 100644
--- a/docs/other/php-56.md
+++ b/docs/other/php-56.md
@@ -34,8 +34,14 @@ php_extension_conf_paths:
 php_fpm_daemon: php5-fpm
 php_fpm_conf_path: "/etc/php5/fpm"
 php_mysql_package: php5-mysql
+php_memcached_package: php5-memcached
+
+xhprof_download_url: https://github.com/phacility/xhprof/archive/master.tar.gz
+xhprof_download_folder_name: xhprof-master
 ```
 
+If you're using Apache with `mod_php` you should also add `libapache2-mod-php5` to the `php_packages` list.
+
 ## RedHat/CentOS 7
 
 Remi's RPM repository is included with Drupal VM, and you can make the following changes to use it to install PHP 5.6 instead of 7:

From c74ce96458f7c3b6fea4f92baf13baa62e96781b Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 13 May 2016 17:10:54 -0500
Subject: [PATCH 0265/1273] Issue #616: Re-enable the XHProf integration test.

---
 .travis.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cfc1ae5d3..99c431c5d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -84,11 +84,11 @@ script:
     && (echo 'Pimp my Log install pass' && exit 0)
     || (echo 'Pimp my Log install fail' && exit 1)
 
-  # - >
-  #   sudo docker exec "$(cat ${container_id})" curl -s --header Host:xhprof.${HOSTNAME} localhost
-  #   | grep -q '<title>XHProf'
-  #   && (echo 'XHProf install pass' && exit 0)
-  #   || (echo 'XHProf install fail' && exit 1)
+  - >
+    sudo docker exec "$(cat ${container_id})" curl -s --header Host:xhprof.${HOSTNAME} localhost
+    | grep -q '<title>XHProf'
+    && (echo 'XHProf install pass' && exit 0)
+    || (echo 'XHProf install fail' && exit 1)
 
   - >
     sudo docker exec "$(cat ${container_id})" curl -s localhost:8025

From 554bf2c91dae0314e94867a1fc0db396a6e0df5c Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 13 May 2016 23:11:49 -0500
Subject: [PATCH 0266/1273] Install xhprof when testing.

---
 tests/local.config.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/local.config.yml b/tests/local.config.yml
index 3344edd2f..0a5484114 100644
--- a/tests/local.config.yml
+++ b/tests/local.config.yml
@@ -1,2 +1,10 @@
 ---
 composer_home_path: "/{{ drupalvm_user }}/.composer"
+
+installed_extras:
+  - adminer
+  - drupalconsole
+  - mailhog
+  - pimpmylog
+  - varnish
+  - xhprof

From 5cc599f3e775db4308960d2597d8f1f8a2a0ea9a Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 14 May 2016 21:27:01 -0500
Subject: [PATCH 0267/1273] Issue #522: Document PHP5 SQLite module for PHP 5.x
 on Debian.

---
 docs/other/php-56.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/other/php-56.md b/docs/other/php-56.md
index 946f8b7c4..0d5726214 100644
--- a/docs/other/php-56.md
+++ b/docs/other/php-56.md
@@ -21,6 +21,7 @@ php_packages:
   - php5-dev
   - php5-fpm
   - php5-gd
+  - php5-sqlite
   - php-pear
   - libpcre3-dev
 php_conf_paths:

From 3fcd2c0ba63067c503609e3bc8385a836358e120 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 14 May 2016 21:29:30 -0500
Subject: [PATCH 0268/1273] Fixes #522: Add SQLite to Drupal VM.

---
 README.md          | 1 +
 example.config.yml | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 134340329..bf5abc30f 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,7 @@ It will install the following on an Ubuntu 16.04 (by default) linux VM:
     - Ruby
     - Memcached
     - Redis
+    - SQLite
     - XHProf, for profiling your code
     - Blackfire, for profiling your code
     - XDebug, for debugging your code
diff --git a/example.config.yml b/example.config.yml
index 7d4dcb602..c36529e95 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -168,7 +168,8 @@ installed_extras:
   # - xhprof
 
 # Add any extra apt or yum packages you would like installed.
-extra_packages: []
+extra_packages:
+  - sqlite
 
 # `nodejs` must be in installed_extras for this to work. Valid examples: "0.10",
 # "0.12", "4.x", "5.x".

From 143eed451649effbb1aad29dc24a3afe015ef3d7 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 14 May 2016 21:49:51 -0500
Subject: [PATCH 0269/1273] Issue #616: Add XHProf for all tests.

---
 tests/ubuntu-16-nginx.config.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/ubuntu-16-nginx.config.yml b/tests/ubuntu-16-nginx.config.yml
index 35deff7cc..525fedad3 100644
--- a/tests/ubuntu-16-nginx.config.yml
+++ b/tests/ubuntu-16-nginx.config.yml
@@ -1,3 +1,11 @@
 ---
 composer_home_path: "/{{ drupalvm_user }}/.composer"
 drupalvm_webserver: nginx
+
+installed_extras:
+  - adminer
+  - drupalconsole
+  - mailhog
+  - pimpmylog
+  - varnish
+  - xhprof

From b6fdaefe5a24cfaa58f6bc90dfcfad55521a4838 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 14 May 2016 21:54:11 -0500
Subject: [PATCH 0270/1273] Add local.config.yml to gitignore.

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 3958f643a..ee6483792 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 .bundle/
 *.retry
 vagrant_ansible_inventory_default
+local.config.yml
 config.yml
 drupal.make.yml
 Vagrantfile.local

From e8a0191b1a936121943e4862c293ee9ffd0d90f9 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 14 May 2016 22:00:57 -0500
Subject: [PATCH 0271/1273] Update role requirements for PHP 3.0.3 role version
 - for SQLite support.

---
 provisioning/requirements.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 5bb78e58b..c232939ca 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -36,7 +36,7 @@
 - src: geerlingguy.nodejs
   version: 3.0.0
 - src: geerlingguy.php
-  version: 3.0.2
+  version: 3.0.3
 - src: geerlingguy.php-memcached
   version: 2.0.0
 - src: geerlingguy.php-mysql

From 58f8722c36ad0ac0e2357a5cc3d6fe1aab2ffc06 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 14 May 2016 22:21:00 -0500
Subject: [PATCH 0272/1273] Update to JJG-Ansible-Windows 2.0.0.

---
 Vagrantfile                                 | 2 +-
 provisioning/JJG-Ansible-Windows/README.md  | 2 +-
 provisioning/JJG-Ansible-Windows/windows.sh | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index ffac05663..4a9dd83f0 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -118,7 +118,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   else
     config.vm.provision 'shell' do |sh|
       sh.path = "#{dir}/provisioning/JJG-Ansible-Windows/windows.sh"
-      sh.args = '/provisioning/playbook.yml'
+      sh.args = '/vagrant/provisioning/playbook.yml'
     end
   end
   # ansible_local provisioner is broken in Vagrant < 1.8.2.
diff --git a/provisioning/JJG-Ansible-Windows/README.md b/provisioning/JJG-Ansible-Windows/README.md
index c64b4a664..e7548efaf 100644
--- a/provisioning/JJG-Ansible-Windows/README.md
+++ b/provisioning/JJG-Ansible-Windows/README.md
@@ -20,7 +20,7 @@ if is_windows
   # Provisioning configuration for shell script.
   config.vm.provision "shell" do |sh|
     sh.path = "provisioning/JJG-Ansible-Windows/windows.sh"
-    sh.args = "provisioning/playbook.yml"
+    sh.args = "/vagrant/provisioning/playbook.yml"
   end
 else
   # Provisioning configuration for Ansible (for Mac/Linux hosts).
diff --git a/provisioning/JJG-Ansible-Windows/windows.sh b/provisioning/JJG-Ansible-Windows/windows.sh
index bab2355b0..1cc2a749a 100644
--- a/provisioning/JJG-Ansible-Windows/windows.sh
+++ b/provisioning/JJG-Ansible-Windows/windows.sh
@@ -34,7 +34,7 @@ YUM=$(which yum 2>/dev/null)
 APT_GET=$(which apt-get 2>/dev/null)
 
 # Make sure Ansible playbook exists.
-if [ ! -f "/vagrant/$ANSIBLE_PLAYBOOK" ]; then
+if [ ! -f "$ANSIBLE_PLAYBOOK" ]; then
   echo "Cannot find Ansible playbook."
   exit 1
 fi
@@ -72,8 +72,8 @@ fi
 
 # Install requirements.
 echo "Installing Ansible roles from requirements file, if available."
-find "/vagrant/$PLAYBOOK_DIR" \( -name "requirements.yml" -o -name "requirements.txt" \) -exec sudo ansible-galaxy install --force --ignore-errors -r {} \;
+find "$PLAYBOOK_DIR" \( -name "requirements.yml" -o -name "requirements.txt" \) -exec sudo ansible-galaxy install --force --ignore-errors -r {} \;
 
 # Run the playbook.
 echo "Running Ansible provisioner defined in Vagrantfile."
-ansible-playbook -i 'localhost,' "/vagrant/${ANSIBLE_PLAYBOOK}" --extra-vars "${extra_vars[*]}" --connection=local
+ansible-playbook -i 'localhost,' "${ANSIBLE_PLAYBOOK}" --extra-vars "${extra_vars[*]}" --connection=local

From 5090b1efb35af59c86595dbafc1c17187ac822fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 30 Apr 2016 13:46:48 -0500
Subject: [PATCH 0273/1273] Add support for storing drupal vm in a subdirectory

---
 Vagrantfile                            | 42 ++++++++++-------
 docs/other/drupalvm-in-subdirectory.md | 64 ++++++++++++++++++++++++++
 mkdocs.yml                             |  1 +
 provisioning/playbook.yml              |  2 +-
 4 files changed, 92 insertions(+), 17 deletions(-)
 create mode 100644 docs/other/drupalvm-in-subdirectory.md

diff --git a/Vagrantfile b/Vagrantfile
index 4a9dd83f0..2863a3a03 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -24,17 +24,21 @@ def walk(obj, &fn)
   end
 end
 
+require 'pathname'
+host_drupalvm_root  = File.dirname(File.expand_path(__FILE__))
+host_project_root   = ENV['DRUPALVM_PROJECT_ROOT'] || host_drupalvm_root
+guest_drupalvm_root = "/vagrant/#{Pathname.new(host_drupalvm_root).relative_path_from(Pathname.new(host_project_root))}"
+guest_project_root  = '/vagrant'
+
+host_vconfig_path  = ENV['DRUPALVM_CONFIG'] ? "#{host_project_root}/#{ENV['DRUPALVM_CONFIG']}"  : "#{host_drupalvm_root}/config.yml"
+guest_vconfig_path = ENV['DRUPALVM_CONFIG'] ? "#{guest_project_root}/#{ENV['DRUPALVM_CONFIG']}" : "#{guest_drupalvm_root}/config.yml"
+
 # Use config.yml and local.config.yml for VM configuration.
 require 'yaml'
-dir = File.dirname(File.expand_path(__FILE__))
-unless File.exist?("#{dir}/config.yml")
+unless File.exist?(host_vconfig_path)
   raise 'Configuration file not found! Please copy example.config.yml to config.yml and try again.'
 end
-vconfig = YAML.load_file("#{dir}/config.yml")
-# Include a local.config.yml file if available.
-if File.exist?("#{dir}/local.config.yml")
-  vconfig.merge!(YAML.load_file("#{dir}/local.config.yml"))
-end
+vconfig = YAML.load_file(host_vconfig_path)
 
 # Replace jinja variables in config.
 vconfig = walk(vconfig) do |value|
@@ -107,32 +111,38 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   end
 
   # Allow override of the default synced folder type.
-  config.vm.synced_folder '.', '/vagrant', type: vconfig.include?('vagrant_synced_folder_default_type') ? vconfig['vagrant_synced_folder_default_type'] : 'nfs'
+  config.vm.synced_folder host_project_root, '/vagrant', type: vconfig.include?('vagrant_synced_folder_default_type') ? vconfig['vagrant_synced_folder_default_type'] : 'nfs'
 
   # Provisioning. Use ansible if it's installed, JJG-Ansible-Windows if not.
   if which('ansible-playbook')
     config.vm.provision 'ansible' do |ansible|
-      ansible.playbook = "#{dir}/provisioning/playbook.yml"
-      ansible.galaxy_role_file = "#{dir}/provisioning/requirements.yml"
+      ansible.playbook = "#{host_drupalvm_root}/provisioning/playbook.yml"
+      ansible.galaxy_role_file = "#{host_drupalvm_root}/provisioning/requirements.yml"
+      ansible.extra_vars = {
+        config_file: host_vconfig_path
+      }
     end
   else
     config.vm.provision 'shell' do |sh|
-      sh.path = "#{dir}/provisioning/JJG-Ansible-Windows/windows.sh"
-      sh.args = '/vagrant/provisioning/playbook.yml'
+      sh.path = "#{host_drupalvm_root}/provisioning/JJG-Ansible-Windows/windows.sh"
+      sh.args = "-e 'config_file=#{guest_vconfig_path}' #{guest_drupalvm_root}/provisioning/playbook.yml"
     end
   end
   # ansible_local provisioner is broken in Vagrant < 1.8.2.
   # else
   #   config.vm.provision "ansible_local" do |ansible|
-  #     ansible.playbook = "provisioning/playbook.yml"
-  #     ansible.galaxy_role_file = "provisioning/requirements.yml"
+  #     ansible.playbook = "#{guest_drupalvm_root}/provisioning/playbook.yml"
+  #     ansible.galaxy_role_file = "#{guest_drupalvm_root}/provisioning/requirements.yml"
+  #     ansible.extra_vars = {
+  #       config_file: guest_vconfig_path
+  #     }
   #   end
   # end
 
   # VMware Fusion.
   config.vm.provider :vmware_fusion do |v, override|
     # HGFS kernel module currently doesn't load correctly for native shares.
-    override.vm.synced_folder '.', '/vagrant', type: 'nfs'
+    override.vm.synced_folder host_project_root, '/vagrant', type: 'nfs'
 
     v.gui = false
     v.vmx['memsize'] = vconfig['vagrant_memory']
@@ -162,5 +172,5 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.define vconfig['vagrant_machine_name']
 
   # Allow an untracked Vagrantfile to modify the configurations
-  eval File.read 'Vagrantfile.local' if File.exist?('Vagrantfile.local')
+  eval File.read "#{host_project_root}/Vagrantfile.local" if File.exist?("#{host_project_root}/Vagrantfile.local")
 end
diff --git a/docs/other/drupalvm-in-subdirectory.md b/docs/other/drupalvm-in-subdirectory.md
new file mode 100644
index 000000000..2016a31ce
--- /dev/null
+++ b/docs/other/drupalvm-in-subdirectory.md
@@ -0,0 +1,64 @@
+To make it easier bringing in Drupal VM updates to an existing project, you might consider a slightly more complex setup. Instead of mixing your project's files with Drupal VM's configuration files, you can separate the two with the help of a delegating `Vagrantfile`.
+
+### Steps for setting up a decoupled project structure:
+
+Add Drupal VM as a git submodule (or other) to a subdirectory, in this case we'll name the subdirectory `box/`.
+
+```
+├── docroot
+│   ├── ...
+│   └── index.php
+└── box
+    ├── ...
+    ├── example.config.yml
+    └── Vagrantfile
+```
+
+Add an configure the `config.yml` anywhere you like, in this example we'll place it in `config/drupalvm.config.yml`.
+
+```
+├── config
+│   ├── ...
+│   └── drupalvm.config.yml
+├── docroot
+│   ├── ...
+│   └── index.php
+└── box
+    ├── ...
+    ├── example.config.yml
+    └── Vagrantfile
+```
+
+Create a delegating `Vagrantfile` with the environment variables `DRUPALVM_PROJECT_ROOT` and `DRUPALVM_CONFIG`. Place this file in your project's root directory.
+
+```ruby
+# The absolute path to the root directory of the project. Both Drupal VM and
+# the config file need to be contained within this path.
+ENV['DRUPALVM_PROJECT_ROOT'] = "#{__dir__}"
+# The relative path from the project root to to config file.
+ENV['DRUPALVM_CONFIG'] = "config/drupalvm.config.yml"
+# Load the real Vagrantfile
+load "#{__dir__}/box/Vagrantfile"
+```
+
+```
+├───Vagrantfile
+├── config
+│   ├── ...
+│   └── drupalvm.config.yml
+├── docroot
+│   ├── ...
+│   └── index.php
+└── box
+    ├── ...
+    ├── example.config.yml
+    └── Vagrantfile
+```
+
+When you issue `vagrant` commands anywhere in your project tree this file will be detected and used as a delegator for Drupal VM's own Vagrantfile.
+
+Finally, provision the VM using the delegating `Vagrantfile`. _Important_, you should never issue `vagrant` commands through the `box/Vagrantfile` directly. If you do, it will create a secondary VM in the `box/` directory.
+
+```sh
+vagrant up
+```
diff --git a/mkdocs.yml b/mkdocs.yml
index 0bea536fb..c9abe7daf 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -42,3 +42,4 @@ pages:
     - 'Linux Notes': 'other/linux.md'
     - 'Windows Notes': 'other/windows.md'
     - 'Vagrant and VirtualBox Tips': 'other/vagrant-virtualbox.md'
+    - 'Storing Drupal VM in a subdirectory': 'other/drupalvm-in-subdirectory.md'
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index aa4ebbd63..2aba42455 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -4,9 +4,9 @@
 
   vars_files:
     - vars/main.yml
-    - ../config.yml
 
   pre_tasks:
+    - include_vars: "{{ config_file | default('../config.yml') }}"
     - include_vars: "{{ item }}"
       with_fileglob:
         - ../../local.config.yml

From 1ba43a740290ed126c99b3a5fb4e8ecc0959cf7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Fri, 13 May 2016 11:41:45 -0500
Subject: [PATCH 0274/1273] Fix conflicts and update logic to use a config
 directory instead

---
 Vagrantfile                                |  49 ++++---
 docs/other/drupalvm-composer-dependency.md | 147 +++++++++++++++++++++
 docs/other/drupalvm-in-subdirectory.md     |  64 ---------
 mkdocs.yml                                 |   2 +-
 provisioning/playbook.yml                  |   7 +-
 5 files changed, 180 insertions(+), 89 deletions(-)
 create mode 100644 docs/other/drupalvm-composer-dependency.md
 delete mode 100644 docs/other/drupalvm-in-subdirectory.md

diff --git a/Vagrantfile b/Vagrantfile
index 2863a3a03..3873ee00d 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -2,6 +2,16 @@
 # vi: set ft=ruby :
 VAGRANTFILE_API_VERSION = '2'
 
+# Absolute paths on the host machine.
+host_drupalvm_dir = File.dirname(File.expand_path(__FILE__))
+host_project_dir = ENV['DRUPALVM_PROJECT_ROOT'] || host_drupalvm_dir
+host_config_dir = ENV['DRUPALVM_CONFIG_DIR'] ? "#{host_project_dir}/#{ENV['DRUPALVM_CONFIG_DIR']}" : host_project_dir
+
+# Absolute paths on the guest machine.
+guest_project_dir = '/vagrant'
+guest_drupalvm_dir = ENV['DRUPALVM_DIR'] ? "/vagrant/#{ENV['DRUPALVM_DIR']}" : guest_project_dir
+guest_config_dir = ENV['DRUPALVM_CONFIG_DIR'] ? "/vagrant/#{ENV['DRUPALVM_CONFIG_DIR']}" : guest_project_dir
+
 # Cross-platform way of finding an executable in the $PATH.
 def which(cmd)
   exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
@@ -24,21 +34,16 @@ def walk(obj, &fn)
   end
 end
 
-require 'pathname'
-host_drupalvm_root  = File.dirname(File.expand_path(__FILE__))
-host_project_root   = ENV['DRUPALVM_PROJECT_ROOT'] || host_drupalvm_root
-guest_drupalvm_root = "/vagrant/#{Pathname.new(host_drupalvm_root).relative_path_from(Pathname.new(host_project_root))}"
-guest_project_root  = '/vagrant'
-
-host_vconfig_path  = ENV['DRUPALVM_CONFIG'] ? "#{host_project_root}/#{ENV['DRUPALVM_CONFIG']}"  : "#{host_drupalvm_root}/config.yml"
-guest_vconfig_path = ENV['DRUPALVM_CONFIG'] ? "#{guest_project_root}/#{ENV['DRUPALVM_CONFIG']}" : "#{guest_drupalvm_root}/config.yml"
-
 # Use config.yml and local.config.yml for VM configuration.
 require 'yaml'
-unless File.exist?(host_vconfig_path)
+unless File.exist?("#{host_config_dir}/config.yml")
   raise 'Configuration file not found! Please copy example.config.yml to config.yml and try again.'
 end
-vconfig = YAML.load_file(host_vconfig_path)
+vconfig = YAML.load_file("#{host_config_dir}/config.yml")
+# Include a local.config.yml file if available.
+if File.exist?("#{host_config_dir}/local.config.yml")
+  vconfig.merge!(YAML.load_file("#{host_config_dir}/local.config.yml"))
+end
 
 # Replace jinja variables in config.
 vconfig = walk(vconfig) do |value|
@@ -111,30 +116,30 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   end
 
   # Allow override of the default synced folder type.
-  config.vm.synced_folder host_project_root, '/vagrant', type: vconfig.include?('vagrant_synced_folder_default_type') ? vconfig['vagrant_synced_folder_default_type'] : 'nfs'
+  config.vm.synced_folder host_project_dir, '/vagrant', type: vconfig.include?('vagrant_synced_folder_default_type') ? vconfig['vagrant_synced_folder_default_type'] : 'nfs'
 
   # Provisioning. Use ansible if it's installed, JJG-Ansible-Windows if not.
   if which('ansible-playbook')
     config.vm.provision 'ansible' do |ansible|
-      ansible.playbook = "#{host_drupalvm_root}/provisioning/playbook.yml"
-      ansible.galaxy_role_file = "#{host_drupalvm_root}/provisioning/requirements.yml"
+      ansible.playbook = "#{host_drupalvm_dir}/provisioning/playbook.yml"
+      ansible.galaxy_role_file = "#{host_drupalvm_dir}/provisioning/requirements.yml"
       ansible.extra_vars = {
-        config_file: host_vconfig_path
+        config_dir: host_config_dir
       }
     end
   else
     config.vm.provision 'shell' do |sh|
-      sh.path = "#{host_drupalvm_root}/provisioning/JJG-Ansible-Windows/windows.sh"
-      sh.args = "-e 'config_file=#{guest_vconfig_path}' #{guest_drupalvm_root}/provisioning/playbook.yml"
+      sh.path = "#{host_drupalvm_dir}/provisioning/JJG-Ansible-Windows/windows.sh"
+      sh.args = "-e 'config_dir=\"#{guest_config_dir}\"' #{guest_drupalvm_dir}/provisioning/playbook.yml"
     end
   end
   # ansible_local provisioner is broken in Vagrant < 1.8.2.
   # else
   #   config.vm.provision "ansible_local" do |ansible|
-  #     ansible.playbook = "#{guest_drupalvm_root}/provisioning/playbook.yml"
-  #     ansible.galaxy_role_file = "#{guest_drupalvm_root}/provisioning/requirements.yml"
+  #     ansible.playbook = "#{guest_drupalvm_dir}/provisioning/playbook.yml"
+  #     ansible.galaxy_role_file = "#{guest_drupalvm_dir}/provisioning/requirements.yml"
   #     ansible.extra_vars = {
-  #       config_file: guest_vconfig_path
+  #       config_dir: guest_config_dir
   #     }
   #   end
   # end
@@ -142,7 +147,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # VMware Fusion.
   config.vm.provider :vmware_fusion do |v, override|
     # HGFS kernel module currently doesn't load correctly for native shares.
-    override.vm.synced_folder host_project_root, '/vagrant', type: 'nfs'
+    override.vm.synced_folder host_project_dir, '/vagrant', type: 'nfs'
 
     v.gui = false
     v.vmx['memsize'] = vconfig['vagrant_memory']
@@ -172,5 +177,5 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.define vconfig['vagrant_machine_name']
 
   # Allow an untracked Vagrantfile to modify the configurations
-  eval File.read "#{host_project_root}/Vagrantfile.local" if File.exist?("#{host_project_root}/Vagrantfile.local")
+  eval File.read "#{host_config_dir}/Vagrantfile.local" if File.exist?("#{host_config_dir}/Vagrantfile.local")
 end
diff --git a/docs/other/drupalvm-composer-dependency.md b/docs/other/drupalvm-composer-dependency.md
new file mode 100644
index 000000000..974e3c062
--- /dev/null
+++ b/docs/other/drupalvm-composer-dependency.md
@@ -0,0 +1,147 @@
+To make future Drupal VM updates easier to integrate with an existing project, you might consider the more complex setup of installing Drupal VM as a `composer` dependency. Using a delegating `Vagrantfile` you are able to run `vagrant` commands anywhere in your project as well as separate your custom configuration files from Drupal VM's own files.
+
+### Add Drupal VM as a Composer dependency
+
+Add Drupal VM as a development dependency to your `composer.json`.
+
+```
+composer require --dev geerlingguy/drupal-vm
+```
+
+### Setup your configuration files
+
+Add and configure the `config.yml` anywhere you like, in this example we place it in a `config/` directory. If you're using `build_makefile`, this would also be a good location for the `drupal.make.yml` file.
+
+_Note: This will be the directory where Drupal VM looks for other local configuration files as well. Such as [`local.config.yml` and `Vagrantfile.local`](overriding-configurations.md)._
+
+```
+├── config/
+│   ├── config.yml
+│   ├── drupal.make.yml
+│   ├── local.config.yml
+│   └── Vagrantfile.local
+├── docroot/
+│   ├── ...
+│   └── index.php
+└── vendor/
+    ├── ...
+    └── geerlingguy/
+        └── drupal-vm/
+```
+
+If you're using `pre_provision_scripts`, `post_provision_scripts` or `drush_makefile_path` you also need to adjust their paths to take into account the new directory structure. The examples used in `example.config.yml` assume the files are located in the Drupal VM directory.
+
+```yaml
+# The default provided in `example.config.yml`:
+drush_makefile_path: ../../drupal.make.yml
+# With Drupal VM as a Composer dependency:
+drush_makefile_path: ../../../../../config/drupal.make.yml
+
+post_provision_scripts:
+  # The default provided in `example.config.yml`:
+  - "../../examples/scripts/configure-solr.sh"
+  # With Drupal VM as a Composer dependency:
+  - "../../../../../examples/scripts/configure-solr.sh"
+```
+
+### Create a delegating `Vagrantfile`
+
+Create a delegating `Vagrantfile` that will catch all your `vagrant` commands and send them to Drupal VM's own `Vagrantfile`. Place this file in your project's root directory.
+
+```ruby
+# The absolute path to the root directory of the project. Both Drupal VM and
+# the config file need to be contained within this path.
+ENV['DRUPALVM_PROJECT_ROOT'] = "#{__dir__}"
+# The relative path from the project root to the config directory where you
+# placed your config.yml file.
+ENV['DRUPALVM_CONFIG_DIR'] = "config"
+# The relative path from the project root to the directory where Drupal VM is located.
+ENV['DRUPALVM_DIR'] = "vendor/geerlingguy/drupal-vm"
+
+# Load the real Vagrantfile
+load "#{__dir__}/#{ENV['DRUPALVM_DIR']}/Vagrantfile"
+```
+
+When you issue `vagrant` commands anywhere in your project tree this file will be detected and used as a delegator for Drupal VM's own Vagrantfile.
+
+Your project structure should now look like this:
+
+```
+├── Vagrantfile
+├── composer.json
+├── config/
+│   ├── config.yml
+│   ├── drupal.make.yml
+│   ├── local.config.yml
+│   └── Vagrantfile.local
+├── docroot/
+│   ├── ...
+│   └── index.php
+└── vendor/
+    ├── ...
+    └── geerlingguy/
+        └── drupal-vm/
+```
+
+### Provision the VM
+
+Finally provision the VM using the delegating `Vagrantfile`.
+
+```sh
+vagrant up
+```
+
+_Important: you should never issue `vagrant` commands through Drupal VM's own `Vagrantfile` from now on. If you do, it will create a secondary VM in that directory._
+
+## Drupal VM without composer
+
+If you don't use `composer` in your project you can still download  Drupal VM (or add it as a git submodule) to any subdirectory in your project. As an example let's name that directory `box/`.
+
+```
+├── docroot/
+│   ├── ...
+│   └── index.php
+└── box/
+    ├── ...
+    ├── example.config.yml
+    └── Vagrantfile
+```
+
+Configure your `config.yml` like mentioned in the `composer` section above but adjust the paths for this directory structure instead.
+
+```yaml
+# The default provided in `example.config.yml`:
+drush_makefile_path: ../../drupal.make.yml
+# With Drupal VM in a toplevel subdirectory
+drush_makefile_path: ../../../config/drupal.make.yml
+
+post_provision_scripts:
+  # The default provided in `example.config.yml`:
+  - "../../examples/scripts/configure-solr.sh"
+  # With Drupal VM in a toplevel subdirectory
+  - "../../../examples/scripts/configure-solr.sh"
+```
+
+Your directory structure should now look like this:
+
+```
+├── Vagrantfile
+├── config/
+│   ├── drupal.make.yml
+│   ├── config.yml
+│   ├── local.config.yml
+│   └── Vagrantfile.local
+├── docroot/
+│   ├── ...
+│   └── index.php
+└── box/
+    ├── ...
+    ├── example.config.yml
+    └── Vagrantfile
+```
+
+Provision the VM using the delegating `Vagrantfile`.
+
+```sh
+vagrant up
+```
diff --git a/docs/other/drupalvm-in-subdirectory.md b/docs/other/drupalvm-in-subdirectory.md
deleted file mode 100644
index 2016a31ce..000000000
--- a/docs/other/drupalvm-in-subdirectory.md
+++ /dev/null
@@ -1,64 +0,0 @@
-To make it easier bringing in Drupal VM updates to an existing project, you might consider a slightly more complex setup. Instead of mixing your project's files with Drupal VM's configuration files, you can separate the two with the help of a delegating `Vagrantfile`.
-
-### Steps for setting up a decoupled project structure:
-
-Add Drupal VM as a git submodule (or other) to a subdirectory, in this case we'll name the subdirectory `box/`.
-
-```
-├── docroot
-│   ├── ...
-│   └── index.php
-└── box
-    ├── ...
-    ├── example.config.yml
-    └── Vagrantfile
-```
-
-Add an configure the `config.yml` anywhere you like, in this example we'll place it in `config/drupalvm.config.yml`.
-
-```
-├── config
-│   ├── ...
-│   └── drupalvm.config.yml
-├── docroot
-│   ├── ...
-│   └── index.php
-└── box
-    ├── ...
-    ├── example.config.yml
-    └── Vagrantfile
-```
-
-Create a delegating `Vagrantfile` with the environment variables `DRUPALVM_PROJECT_ROOT` and `DRUPALVM_CONFIG`. Place this file in your project's root directory.
-
-```ruby
-# The absolute path to the root directory of the project. Both Drupal VM and
-# the config file need to be contained within this path.
-ENV['DRUPALVM_PROJECT_ROOT'] = "#{__dir__}"
-# The relative path from the project root to to config file.
-ENV['DRUPALVM_CONFIG'] = "config/drupalvm.config.yml"
-# Load the real Vagrantfile
-load "#{__dir__}/box/Vagrantfile"
-```
-
-```
-├───Vagrantfile
-├── config
-│   ├── ...
-│   └── drupalvm.config.yml
-├── docroot
-│   ├── ...
-│   └── index.php
-└── box
-    ├── ...
-    ├── example.config.yml
-    └── Vagrantfile
-```
-
-When you issue `vagrant` commands anywhere in your project tree this file will be detected and used as a delegator for Drupal VM's own Vagrantfile.
-
-Finally, provision the VM using the delegating `Vagrantfile`. _Important_, you should never issue `vagrant` commands through the `box/Vagrantfile` directly. If you do, it will create a secondary VM in the `box/` directory.
-
-```sh
-vagrant up
-```
diff --git a/mkdocs.yml b/mkdocs.yml
index c9abe7daf..a802b3eee 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -34,6 +34,7 @@ pages:
     - 'Using Different Base OSes': 'other/base-os.md'
     - 'Using Different Webservers': 'other/webservers.md'
     - 'Overriding configurations': 'other/overriding-configurations.md'
+    - 'Installing Drupal VM as a Composer Dependency': 'other/drupalvm-composer-dependency.md'
     - 'PHP 5.6 on Drupal VM': 'other/php-56.md'
     - 'BigPipe with Drupal VM': 'other/bigpipe.md'
     - 'Drupal VM Management Tools': 'other/management-tools.md'
@@ -42,4 +43,3 @@ pages:
     - 'Linux Notes': 'other/linux.md'
     - 'Windows Notes': 'other/windows.md'
     - 'Vagrant and VirtualBox Tips': 'other/vagrant-virtualbox.md'
-    - 'Storing Drupal VM in a subdirectory': 'other/drupalvm-in-subdirectory.md'
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 2aba42455..ec66a9284 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -6,10 +6,13 @@
     - vars/main.yml
 
   pre_tasks:
-    - include_vars: "{{ config_file | default('../config.yml') }}"
+    - include_vars: "{{ item }}"
+      with_items:
+        - "{{ config_dir | default('..') }}/config.yml"
+
     - include_vars: "{{ item }}"
       with_fileglob:
-        - ../../local.config.yml
+        - "{{ config_dir | default('../..') }}/local.config.yml"
 
     - include: tasks/init-debian.yml
       when: ansible_os_family == 'Debian'

From a9817037e7b3f92a71134b4ea91a82bf85df64c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Fri, 13 May 2016 15:40:19 -0500
Subject: [PATCH 0275/1273] Add composer.json

---
 composer.json | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 composer.json

diff --git a/composer.json b/composer.json
new file mode 100644
index 000000000..1cb824071
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,20 @@
+{
+    "name": "geerlingguy/drupal-vm",
+    "type": "project",
+    "description": "A VM for local Drupal development, built with Vagrant + Ansible",
+    "keywords": ["vagrant", "vm", "virtual machine", "drupal"],
+    "homepage": "http://www.drupalvm.com",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Jeff Geerling",
+            "homepage": "http://www.jeffgeerling.com"
+        }
+    ],
+    "support": {
+        "issues": "https://github.com/geerlingguy/drupal-vm/issues",
+        "source": "https://github.com/geerlingguy/drupal-vm",
+        "docs": "http://docs.drupalvm.com"
+    },
+    "require": {}
+}

From baa20ca870343de4b2a84943b02c9482cdf08255 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 14 May 2016 22:07:41 -0500
Subject: [PATCH 0276/1273] Add myself shamelessly as an author to
 composer.json [ci skip]

---
 composer.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/composer.json b/composer.json
index 1cb824071..8e4b76057 100644
--- a/composer.json
+++ b/composer.json
@@ -9,6 +9,10 @@
         {
             "name": "Jeff Geerling",
             "homepage": "http://www.jeffgeerling.com"
+        },
+        {
+            "name": "Oskar Schöldström",
+            "homepage": "http://oxy.fi"
         }
     ],
     "support": {

From 8aae19414f424ac8eeeffba083f669a6f50e9d49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sun, 15 May 2016 09:03:52 -0500
Subject: [PATCH 0277/1273] Docs: Simplify path configurations with config_dir
 variable

---
 docs/other/drupalvm-composer-dependency.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/other/drupalvm-composer-dependency.md b/docs/other/drupalvm-composer-dependency.md
index 974e3c062..f6d6c9848 100644
--- a/docs/other/drupalvm-composer-dependency.md
+++ b/docs/other/drupalvm-composer-dependency.md
@@ -29,19 +29,19 @@ _Note: This will be the directory where Drupal VM looks for other local configur
         └── drupal-vm/
 ```
 
-If you're using `pre_provision_scripts`, `post_provision_scripts` or `drush_makefile_path` you also need to adjust their paths to take into account the new directory structure. The examples used in `example.config.yml` assume the files are located in the Drupal VM directory.
+If you're using `pre_provision_scripts`, `post_provision_scripts` or `drush_makefile_path` you also need to adjust their paths to take into account the new directory structure. The examples used in `example.config.yml` assume the files are located in the Drupal VM directory. If you use relative paths you need to the ascend the directory tree as far as the project root, but using the `config_dir` variable you get the absolute path of where you `config.yml` is located.
 
 ```yaml
 # The default provided in `example.config.yml`:
 drush_makefile_path: ../../drupal.make.yml
 # With Drupal VM as a Composer dependency:
-drush_makefile_path: ../../../../../config/drupal.make.yml
+drush_makefile_path: "{{ config_dir }}/drupal.make.yml"
 
 post_provision_scripts:
   # The default provided in `example.config.yml`:
   - "../../examples/scripts/configure-solr.sh"
   # With Drupal VM as a Composer dependency:
-  - "../../../../../examples/scripts/configure-solr.sh"
+  - "{{ config_dir }}/../examples/scripts/configure-solr.sh"
 ```
 
 ### Create a delegating `Vagrantfile`
@@ -107,19 +107,19 @@ If you don't use `composer` in your project you can still download  Drupal VM (o
     └── Vagrantfile
 ```
 
-Configure your `config.yml` like mentioned in the `composer` section above but adjust the paths for this directory structure instead.
+Configure your `config.yml` as mentioned in the [`composer` section](#setup-your-configuration-files) above.
 
 ```yaml
 # The default provided in `example.config.yml`:
 drush_makefile_path: ../../drupal.make.yml
 # With Drupal VM in a toplevel subdirectory
-drush_makefile_path: ../../../config/drupal.make.yml
+drush_makefile_path: "{{ config_dir }}/drupal.make.yml"
 
 post_provision_scripts:
   # The default provided in `example.config.yml`:
   - "../../examples/scripts/configure-solr.sh"
   # With Drupal VM in a toplevel subdirectory
-  - "../../../examples/scripts/configure-solr.sh"
+  - "{{ config_dir }}/../examples/scripts/configure-solr.sh"
 ```
 
 Your directory structure should now look like this:

From 9b35344b0f20e7ecfa35fadca7bd2dbdfb8a5092 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sun, 15 May 2016 09:19:15 -0500
Subject: [PATCH 0278/1273] Cleanup config_dir usage

---
 provisioning/playbook.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index ec66a9284..1d8790160 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -6,13 +6,18 @@
     - vars/main.yml
 
   pre_tasks:
+    - name: Define config_dir.
+      set_fact:
+        config_dir: "{{ playbook_dir }}/.."
+      when: config_dir is not defined
+
     - include_vars: "{{ item }}"
       with_items:
-        - "{{ config_dir | default('..') }}/config.yml"
+        - "{{ config_dir }}/config.yml"
 
     - include_vars: "{{ item }}"
       with_fileglob:
-        - "{{ config_dir | default('../..') }}/local.config.yml"
+        - "{{ config_dir }}/local.config.yml"
 
     - include: tasks/init-debian.yml
       when: ansible_os_family == 'Debian'

From b793d0d565705bd2f439c51f3772421976b18d14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sun, 15 May 2016 09:44:42 -0500
Subject: [PATCH 0279/1273] Add travis test for specifying a different
 config_dir

---
 .travis.yml                      | 26 ++++++++++++++++++--------
 tests/ubuntu-16-nginx.config.yml |  2 ++
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 99c431c5d..771c664f3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@ env:
       HOSTNAME: drupalvm.dev
       MACHINE_NAME: drupalvm
       IP: 192.168.88.88
+      DRUPALVM_DIR: /var/www/drupalvm
   matrix:
     - distribution: ubuntu
       version: 16.04
@@ -18,6 +19,7 @@ env:
       init: /sbin/init
       run_opts: "--privileged"
       local_config: ubuntu-16-nginx.config.yml
+      config_dir: /var/www/drupalvm/config
     - distribution: centos
       version: 7
       init: /usr/lib/systemd/systemd
@@ -38,32 +40,40 @@ script:
   - container_id=$(mktemp)
 
   # Run container in detached state
-  - 'sudo docker run --detach --volume="${PWD}":/var/www/drupalvm/:rw ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+  - 'sudo docker run --detach --volume="${PWD}":${DRUPALVM_DIR}/:rw ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
 
   # Set hostname.
   - 'sudo docker exec "$(cat ${container_id})" hostname ${HOSTNAME}'
 
   # Setup directories.
-  - 'sudo docker exec "$(cat ${container_id})" mkdir -p /var/www/drupalvm/drupal'
+  - 'sudo docker exec "$(cat ${container_id})" mkdir -p ${DRUPALVM_DIR}/drupal'
 
   # Install dependencies.
-  - 'sudo docker exec "$(cat ${container_id})" ansible-galaxy install -r /var/www/drupalvm/provisioning/requirements.yml'
+  - 'sudo docker exec "$(cat ${container_id})" ansible-galaxy install -r ${DRUPALVM_DIR}/provisioning/requirements.yml'
+
+  # Setup config directory.
+  - '[[ ! -z "${config_dir}" ]] && sudo docker exec "$(cat ${container_id})" mkdir -p ${config_dir} || true'
 
   # Copy configuration files into place.
-  - 'sudo docker exec "$(cat ${container_id})" cp /var/www/drupalvm/$CONFIG /var/www/drupalvm/config.yml'
-  - 'sudo docker exec "$(cat ${container_id})" cp /var/www/drupalvm/$MAKEFILE /var/www/drupalvm/drupal.make.yml'
+  - 'sudo docker exec "$(cat ${container_id})" cp ${DRUPALVM_DIR}/${CONFIG} ${config_dir:-$DRUPALVM_DIR}/config.yml'
+  - 'sudo docker exec "$(cat ${container_id})" cp ${DRUPALVM_DIR}/${MAKEFILE} ${config_dir:-$DRUPALVM_DIR}/drupal.make.yml'
 
   # Override configuration variables.
-  - 'sudo docker exec "$(cat ${container_id})" bash -c "cp /var/www/drupalvm/tests/${local_config:-local.config.yml} /var/www/drupalvm/local.config.yml" || true'
+  - 'sudo docker exec "$(cat ${container_id})" bash -c "cp ${DRUPALVM_DIR}/tests/${local_config:-local.config.yml} ${config_dir:-$DRUPALVM_DIR}/local.config.yml"'
 
   # Vagrantfile syntax check
   - 'rubocop --except LineLength,Eval,MutableConstant'
 
   # Ansible syntax check.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /var/www/drupalvm/provisioning/playbook.yml --syntax-check'
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook ${DRUPALVM_DIR}/provisioning/playbook.yml --syntax-check'
 
   # Run the playbook with ansible-playbook.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /var/www/drupalvm/provisioning/playbook.yml'
+  - >
+    if [ ! -z "${config_dir}" ]; then
+      sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook ${DRUPALVM_DIR}/provisioning/playbook.yml --extra-vars="config_dir=${config_dir}";
+    else
+      sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook ${DRUPALVM_DIR}/provisioning/playbook.yml;
+    fi
 
   # Run the integration tests
   - >
diff --git a/tests/ubuntu-16-nginx.config.yml b/tests/ubuntu-16-nginx.config.yml
index 525fedad3..d90a143e1 100644
--- a/tests/ubuntu-16-nginx.config.yml
+++ b/tests/ubuntu-16-nginx.config.yml
@@ -1,5 +1,7 @@
 ---
 composer_home_path: "/{{ drupalvm_user }}/.composer"
+drush_makefile_path: "{{ config_dir }}/drupal.make.yml"
+
 drupalvm_webserver: nginx
 
 installed_extras:

From 14ac7b53b885d0cf92608be6b958b5a227dfa0d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sun, 15 May 2016 10:09:04 -0500
Subject: [PATCH 0280/1273] Default drush_makefile_path to the config_dir

---
 docs/other/drupalvm-composer-dependency.md | 14 ++------------
 example.config.yml                         |  2 +-
 tests/ubuntu-16-nginx.config.yml           |  2 --
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/docs/other/drupalvm-composer-dependency.md b/docs/other/drupalvm-composer-dependency.md
index f6d6c9848..ae4b305f1 100644
--- a/docs/other/drupalvm-composer-dependency.md
+++ b/docs/other/drupalvm-composer-dependency.md
@@ -10,7 +10,7 @@ composer require --dev geerlingguy/drupal-vm
 
 ### Setup your configuration files
 
-Add and configure the `config.yml` anywhere you like, in this example we place it in a `config/` directory. If you're using `build_makefile`, this would also be a good location for the `drupal.make.yml` file.
+Add and configure the `config.yml` anywhere you like, in this example we place it in a `config/` directory. If you're using `build_makefile` this will be the default location Drupal VM looks for the `drupal.make.yml` file.
 
 _Note: This will be the directory where Drupal VM looks for other local configuration files as well. Such as [`local.config.yml` and `Vagrantfile.local`](overriding-configurations.md)._
 
@@ -29,14 +29,9 @@ _Note: This will be the directory where Drupal VM looks for other local configur
         └── drupal-vm/
 ```
 
-If you're using `pre_provision_scripts`, `post_provision_scripts` or `drush_makefile_path` you also need to adjust their paths to take into account the new directory structure. The examples used in `example.config.yml` assume the files are located in the Drupal VM directory. If you use relative paths you need to the ascend the directory tree as far as the project root, but using the `config_dir` variable you get the absolute path of where you `config.yml` is located.
+If you're using `pre_provision_scripts` or `post_provision_scripts` you also need to adjust their paths to take into account the new directory structure. The examples used in `example.config.yml` assume the files are located in the Drupal VM directory. If you use relative paths you need to the ascend the directory tree as far as the project root, but using the `config_dir` variable you get the absolute path of where you `config.yml` is located.
 
 ```yaml
-# The default provided in `example.config.yml`:
-drush_makefile_path: ../../drupal.make.yml
-# With Drupal VM as a Composer dependency:
-drush_makefile_path: "{{ config_dir }}/drupal.make.yml"
-
 post_provision_scripts:
   # The default provided in `example.config.yml`:
   - "../../examples/scripts/configure-solr.sh"
@@ -110,11 +105,6 @@ If you don't use `composer` in your project you can still download  Drupal VM (o
 Configure your `config.yml` as mentioned in the [`composer` section](#setup-your-configuration-files) above.
 
 ```yaml
-# The default provided in `example.config.yml`:
-drush_makefile_path: ../../drupal.make.yml
-# With Drupal VM in a toplevel subdirectory
-drush_makefile_path: "{{ config_dir }}/drupal.make.yml"
-
 post_provision_scripts:
   # The default provided in `example.config.yml`:
   - "../../examples/scripts/configure-solr.sh"
diff --git a/example.config.yml b/example.config.yml
index c36529e95..9e5255fa1 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -37,7 +37,7 @@ drupalvm_webserver: apache
 # Set this to false if you are using a different site deployment strategy and
 # would like to configure 'vagrant_synced_folders' and 'apache_vhosts' manually.
 build_makefile: true
-drush_makefile_path: ../../drupal.make.yml
+drush_makefile_path: "{{ config_dir }}/drupal.make.yml"
 
 # Set this to false if you don't need to install drupal (using the drupal_*
 # settings below), but instead copy down a database (e.g. using drush sql-sync).
diff --git a/tests/ubuntu-16-nginx.config.yml b/tests/ubuntu-16-nginx.config.yml
index d90a143e1..525fedad3 100644
--- a/tests/ubuntu-16-nginx.config.yml
+++ b/tests/ubuntu-16-nginx.config.yml
@@ -1,7 +1,5 @@
 ---
 composer_home_path: "/{{ drupalvm_user }}/.composer"
-drush_makefile_path: "{{ config_dir }}/drupal.make.yml"
-
 drupalvm_webserver: nginx
 
 installed_extras:

From a4e8225cffc350699ac5a294b8f17614eed9520a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sun, 15 May 2016 10:16:27 -0500
Subject: [PATCH 0281/1273] Issue #618: Disable working-copy of drupal core by
 default

---
 example.drupal.make.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/example.drupal.make.yml b/example.drupal.make.yml
index 8f705de48..bc7db6129 100644
--- a/example.drupal.make.yml
+++ b/example.drupal.make.yml
@@ -15,7 +15,8 @@ projects:
     download:
       # Drupal core branch (e.g. "6.x", "7.x", "8.0.x").
       branch: "8.1.x"
-      working-copy: true
+      # Uncomment if you need a working git repository of Drupal core.
+      # working-copy: true
 
   # Other modules.
   devel: "1.x-dev"

From c6c0eb11efe9a5aa8b45f6f5f2b4a58f3d090b06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sun, 15 May 2016 15:41:25 -0500
Subject: [PATCH 0282/1273] Issue #618: Use the latest stable when downloading
 drupal core

---
 example.drupal.make.yml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/example.drupal.make.yml b/example.drupal.make.yml
index bc7db6129..942c48f2d 100644
--- a/example.drupal.make.yml
+++ b/example.drupal.make.yml
@@ -11,12 +11,14 @@ projects:
 
   # Core.
   drupal:
-    type: "core"
-    download:
-      # Drupal core branch (e.g. "6.x", "7.x", "8.0.x").
-      branch: "8.1.x"
-      # Uncomment if you need a working git repository of Drupal core.
-      # working-copy: true
+    version: 8.1
+    # Use this if you need a working git repository of Drupal core instead of
+    # the latest stable.
+    # type: "core"
+    # download:
+    #   # Drupal core branch (e.g. "6.x", "7.x", "8.0.x").
+    #   branch: "8.1.x"
+    #   working-copy: true
 
   # Other modules.
   devel: "1.x-dev"

From 62cf3ef83dd27625225666bc68d61453d7b79ae3 Mon Sep 17 00:00:00 2001
From: Thom Toogood <thomtoogood@gmail.com>
Date: Sat, 14 May 2016 16:55:06 +1000
Subject: [PATCH 0283/1273] Add support for custom pre/post ansible tasks.

---
 provisioning/playbook.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index aa4ebbd63..91606152c 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -21,6 +21,11 @@
       with_items: "{{ pre_provision_scripts }}"
       when: pre_provision_scripts is defined
 
+    - include: "{{ item }}"
+      with_fileglob:
+        - "{{ custom_pre_tasks_directory }}"
+      when: custom_pre_tasks_directory is defined
+
     - name: Set the PHP webserver daemon correctly when nginx is in use.
       set_fact:
         php_webserver_daemon: nginx
@@ -95,3 +100,8 @@
       script: "{{ item }}"
       with_items: "{{ post_provision_scripts }}"
       when: post_provision_scripts is defined
+
+    - include: "{{ item }}"
+      with_fileglob:
+        - "{{ custom_post_tasks_directory }}"
+      when: custom_post_tasks_directory is defined

From 475a7be214c7e24579c91ee4c9bbf798f871c374 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sun, 15 May 2016 20:03:40 -0500
Subject: [PATCH 0284/1273] Add docs on pre- and post-provision ansible task
 files

---
 docs/extras/scripts.md | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/docs/extras/scripts.md b/docs/extras/scripts.md
index cb45c1a13..767c07470 100644
--- a/docs/extras/scripts.md
+++ b/docs/extras/scripts.md
@@ -1,4 +1,6 @@
-Drupal VM allows you to run extra shell scripts in the beginning and at the end of the provisioning process, in case you need to do extra setup, further configure the VM, or install extra software outside the purview of Drupal VM.
+Drupal VM allows you to run extra shell scripts and ansible task files in the beginning and at the end of the provisioning process, in case you need to do extra setup, further configure the VM, or install extra software outside the purview of Drupal VM.
+
+## Shell scripts
 
 To use an extra script, configure the path to the script (relative to `provisioning/playbook.yml`) in `config.yml`:
 
@@ -16,3 +18,18 @@ _Note: The pre provision scripts run before any other packages are installed. If
 You can define as many scripts as you would like, and any arguments after the path will be passed to the shell script itself (e.g. `"- "../scripts/setup-paths.sh --option"`).
 
 Place your pre and post provision scripts inside a `scripts` directory in the root of your Drupal VM project directory; this directory is gitignored, so you can continue to update Drupal VM without overwriting your scripts.
+
+## Ansible task files
+
+To use an extra ansible task file, configure the path to the file (relative to `provisioning/files/`) in `config.yml`:
+
+```yaml
+custom_pre_tasks_directory: "../../scripts/pre/*"
+custom_post_tasks_directory: "../../scripts/post-provision.yml"
+```
+
+The path will be evaluated as a [glob pattern](https://docs.python.org/2/library/glob.html) so you can point to a single file or a directory matching a set of files.
+
+The files matched will run in alphabetical order, and as with shell scripts, pre-provision task files will run before any other packages are installed.
+
+_Note: Unlike pre- and post-provision scripts, extra task files will be relative to `provisioning/files/` instead of `provisioning/`._

From 0e1d3f031191cc9d1efa493fa7c6e7fa50fef5e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sun, 15 May 2016 20:07:02 -0500
Subject: [PATCH 0285/1273] Rename to align with pre- and post provision script
 variables

---
 docs/extras/scripts.md    |  4 ++--
 provisioning/playbook.yml | 14 ++++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/docs/extras/scripts.md b/docs/extras/scripts.md
index 767c07470..00948a970 100644
--- a/docs/extras/scripts.md
+++ b/docs/extras/scripts.md
@@ -24,8 +24,8 @@ Place your pre and post provision scripts inside a `scripts` directory in the ro
 To use an extra ansible task file, configure the path to the file (relative to `provisioning/files/`) in `config.yml`:
 
 ```yaml
-custom_pre_tasks_directory: "../../scripts/pre/*"
-custom_post_tasks_directory: "../../scripts/post-provision.yml"
+pre_provision_tasks_dir: "../../scripts/pre/*"
+post_provision_tasks_dir: "../../scripts/post-provision.yml"
 ```
 
 The path will be evaluated as a [glob pattern](https://docs.python.org/2/library/glob.html) so you can point to a single file or a directory matching a set of files.
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 91606152c..f36484456 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -21,10 +21,11 @@
       with_items: "{{ pre_provision_scripts }}"
       when: pre_provision_scripts is defined
 
-    - include: "{{ item }}"
+    - name: Run configured pre-provision ansible task files.
+      include: "{{ item }}"
       with_fileglob:
-        - "{{ custom_pre_tasks_directory }}"
-      when: custom_pre_tasks_directory is defined
+        - "{{ pre_provision_tasks_dir }}"
+      when: pre_provision_tasks_dir is defined
 
     - name: Set the PHP webserver daemon correctly when nginx is in use.
       set_fact:
@@ -101,7 +102,8 @@
       with_items: "{{ post_provision_scripts }}"
       when: post_provision_scripts is defined
 
-    - include: "{{ item }}"
+    - name: Run configured post-provision ansible task files.
+      include: "{{ item }}"
       with_fileglob:
-        - "{{ custom_post_tasks_directory }}"
-      when: custom_post_tasks_directory is defined
+        - "{{ post_provision_tasks_dir }}"
+      when: post_provision_tasks_dir is defined

From 65ebeb1a71d3c0cd7b869b226845db034bf18540 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sun, 15 May 2016 21:33:49 -0500
Subject: [PATCH 0286/1273] Fix undefined provision variables not skipping
 tasks

---
 provisioning/playbook.yml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index f36484456..5eda4be6d 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -18,14 +18,12 @@
 
     - name: Run configured pre-provision shell scripts.
       script: "{{ item }}"
-      with_items: "{{ pre_provision_scripts }}"
-      when: pre_provision_scripts is defined
+      with_items: "{{ pre_provision_scripts|default(omit) }}"
 
     - name: Run configured pre-provision ansible task files.
       include: "{{ item }}"
       with_fileglob:
-        - "{{ pre_provision_tasks_dir }}"
-      when: pre_provision_tasks_dir is defined
+        - "{{ pre_provision_tasks_dir|default(omit) }}"
 
     - name: Set the PHP webserver daemon correctly when nginx is in use.
       set_fact:
@@ -99,11 +97,9 @@
 
     - name: Run configured post-provision shell scripts.
       script: "{{ item }}"
-      with_items: "{{ post_provision_scripts }}"
-      when: post_provision_scripts is defined
+      with_items: "{{ post_provision_scripts|default(omit) }}"
 
     - name: Run configured post-provision ansible task files.
       include: "{{ item }}"
       with_fileglob:
-        - "{{ post_provision_tasks_dir }}"
-      when: post_provision_tasks_dir is defined
+        - "{{ post_provision_tasks_dir|default(omit) }}"

From 1deae639aac7f65d92a4065e46571d23e9b5e7bb Mon Sep 17 00:00:00 2001
From: Rodrigo Elizeu Goncalves <rodrigoeg@ciandt.com>
Date: Mon, 16 May 2016 19:43:58 -0300
Subject: [PATCH 0287/1273] Issue #635: Documentation for PHP 5.6 does not have
 php_fpm_pool_conf_path

---
 docs/other/php-56.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/other/php-56.md b/docs/other/php-56.md
index 0d5726214..80112eaa3 100644
--- a/docs/other/php-56.md
+++ b/docs/other/php-56.md
@@ -34,6 +34,7 @@ php_extension_conf_paths:
   - /etc/php5/cli/conf.d
 php_fpm_daemon: php5-fpm
 php_fpm_conf_path: "/etc/php5/fpm"
+php_fpm_pool_conf_path: "/etc/php5/fpm/pool.d/www.conf"
 php_mysql_package: php5-mysql
 php_memcached_package: php5-memcached
 

From bc7ba214f016a92aeb2b0b99949b27ff3dc7300c Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 17 May 2016 09:45:21 -0500
Subject: [PATCH 0288/1273] Update PHP 5.6 usage docs for installed_extras.

---
 docs/other/php-56.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/docs/other/php-56.md b/docs/other/php-56.md
index 80112eaa3..4cdb2645d 100644
--- a/docs/other/php-56.md
+++ b/docs/other/php-56.md
@@ -44,6 +44,20 @@ xhprof_download_folder_name: xhprof-master
 
 If you're using Apache with `mod_php` you should also add `libapache2-mod-php5` to the `php_packages` list.
 
+Also, if you're using one of the `installed_extras`, you may need to update the package names accordingly:
+
+```yaml
+# If you install `redis`:
+php_redis_package: php5-redis
+
+# If you install `memcached`:
+php_memcached_package: php5-memcached
+
+# If you install `xhprof`:
+xhprof_download_url: https://github.com/phacility/xhprof/archive/master.tar.gz
+xhprof_download_folder_name: xhprof-master
+```
+
 ## RedHat/CentOS 7
 
 Remi's RPM repository is included with Drupal VM, and you can make the following changes to use it to install PHP 5.6 instead of 7:

From 8faa99714fac2e06ab952aae2b6fd49321396a9c Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 17 May 2016 09:52:16 -0500
Subject: [PATCH 0289/1273] Update to JJG-Ansible-Windows 2.0.1.

---
 provisioning/JJG-Ansible-Windows/windows.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/provisioning/JJG-Ansible-Windows/windows.sh b/provisioning/JJG-Ansible-Windows/windows.sh
index 1cc2a749a..a96d5169e 100644
--- a/provisioning/JJG-Ansible-Windows/windows.sh
+++ b/provisioning/JJG-Ansible-Windows/windows.sh
@@ -56,11 +56,11 @@ if ! command -v ansible >/dev/null; then
   wget https://bootstrap.pypa.io/get-pip.py
   python get-pip.py && rm -f get-pip.py
 
-  # Install GCC / required build tools.
+  echo "Installing required build tools."
   if [[ ! -z $YUM ]]; then
-    yum install -y gcc
+    yum install -y gcc libffi-devel openssl-devel
   elif [[ ! -z $APT_GET ]]; then
-    apt-get install -y build-essential
+    apt-get install -y build-essential libssl-dev libffi-dev
   fi
 
   echo "Installing required python modules."

From d00eebecd3d130028729afbeefda59c40db6e3b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Tue, 17 May 2016 22:33:01 -0500
Subject: [PATCH 0290/1273] Issue #641: Fix so that optional variables are in
 fact optional

---
 provisioning/playbook.yml   | 4 ++--
 provisioning/tasks/cron.yml | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 5eda4be6d..163c63d5f 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -18,7 +18,7 @@
 
     - name: Run configured pre-provision shell scripts.
       script: "{{ item }}"
-      with_items: "{{ pre_provision_scripts|default(omit) }}"
+      with_items: "{{ pre_provision_scripts|default([]) }}"
 
     - name: Run configured pre-provision ansible task files.
       include: "{{ item }}"
@@ -97,7 +97,7 @@
 
     - name: Run configured post-provision shell scripts.
       script: "{{ item }}"
-      with_items: "{{ post_provision_scripts|default(omit) }}"
+      with_items: "{{ post_provision_scripts|default([]) }}"
 
     - name: Run configured post-provision ansible task files.
       include: "{{ item }}"
diff --git a/provisioning/tasks/cron.yml b/provisioning/tasks/cron.yml
index 96f726425..f015cde16 100644
--- a/provisioning/tasks/cron.yml
+++ b/provisioning/tasks/cron.yml
@@ -9,6 +9,5 @@
     month: "{{ item.month | default('*') }}"
     job: "{{ item.job }}"
     state: "{{ item.state | default('present') }}"
-  with_items: "{{ drupalvm_cron_jobs }}"
-  when: drupalvm_cron_jobs is defined
+  with_items: "{{ drupalvm_cron_jobs|default([]) }}"
   become: no

From 1efae870f14fa41a84edea6641ecaabdb50f46f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 18 May 2016 16:37:04 -0500
Subject: [PATCH 0291/1273] Make config.yml optional by always loading default
 configurations

---
 .travis.yml                              |  6 +++---
 Vagrantfile                              | 15 +++++++--------
 example.config.yml => default.config.yml |  0
 provisioning/playbook.yml                |  6 ++----
 tests/{local.config.yml => config.yml}   |  0
 tests/ubuntu-16-nginx.config.yml         |  9 ---------
 6 files changed, 12 insertions(+), 24 deletions(-)
 rename example.config.yml => default.config.yml (100%)
 rename tests/{local.config.yml => config.yml} (100%)

diff --git a/.travis.yml b/.travis.yml
index 771c664f3..4fd1c1096 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ sudo: required
 
 env:
   global:
-    - CONFIG: example.config.yml
+    - CONFIG: tests/config.yml
       MAKEFILE: example.drupal.make.yml
       HOSTNAME: drupalvm.dev
       MACHINE_NAME: drupalvm
@@ -18,7 +18,7 @@ env:
       version: 16.04
       init: /sbin/init
       run_opts: "--privileged"
-      local_config: ubuntu-16-nginx.config.yml
+      local_config: tests/ubuntu-16-nginx.config.yml
       config_dir: /var/www/drupalvm/config
     - distribution: centos
       version: 7
@@ -59,7 +59,7 @@ script:
   - 'sudo docker exec "$(cat ${container_id})" cp ${DRUPALVM_DIR}/${MAKEFILE} ${config_dir:-$DRUPALVM_DIR}/drupal.make.yml'
 
   # Override configuration variables.
-  - 'sudo docker exec "$(cat ${container_id})" bash -c "cp ${DRUPALVM_DIR}/tests/${local_config:-local.config.yml} ${config_dir:-$DRUPALVM_DIR}/local.config.yml"'
+  - '[[ ! -z "${local_config}" ]] && sudo docker exec "$(cat ${container_id})" bash -c "cp ${DRUPALVM_DIR}/${local_config} ${config_dir:-$DRUPALVM_DIR}/local.config.yml" || true'
 
   # Vagrantfile syntax check
   - 'rubocop --except LineLength,Eval,MutableConstant'
diff --git a/Vagrantfile b/Vagrantfile
index 3873ee00d..769c148c0 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -34,15 +34,14 @@ def walk(obj, &fn)
   end
 end
 
-# Use config.yml and local.config.yml for VM configuration.
 require 'yaml'
-unless File.exist?("#{host_config_dir}/config.yml")
-  raise 'Configuration file not found! Please copy example.config.yml to config.yml and try again.'
-end
-vconfig = YAML.load_file("#{host_config_dir}/config.yml")
-# Include a local.config.yml file if available.
-if File.exist?("#{host_config_dir}/local.config.yml")
-  vconfig.merge!(YAML.load_file("#{host_config_dir}/local.config.yml"))
+# Load default VM configurations.
+vconfig = YAML.load_file("#{host_drupalvm_dir}/default.config.yml")
+# Use optional config.yml and local.config.yml for configuration overrides.
+['config.yml', 'local.config.yml'].each do |config_file|
+  if File.exist?("#{host_config_dir}/#{config_file}")
+    vconfig.merge!(YAML.load_file("#{host_config_dir}/#{config_file}"))
+  end
 end
 
 # Replace jinja variables in config.
diff --git a/example.config.yml b/default.config.yml
similarity index 100%
rename from example.config.yml
rename to default.config.yml
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 296f5d445..453fcc50a 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -4,6 +4,7 @@
 
   vars_files:
     - vars/main.yml
+    - ../default.config.yml
 
   pre_tasks:
     - name: Define config_dir.
@@ -11,12 +12,9 @@
         config_dir: "{{ playbook_dir }}/.."
       when: config_dir is not defined
 
-    - include_vars: "{{ item }}"
-      with_items:
-        - "{{ config_dir }}/config.yml"
-
     - include_vars: "{{ item }}"
       with_fileglob:
+        - "{{ config_dir }}/config.yml"
         - "{{ config_dir }}/local.config.yml"
 
     - include: tasks/init-debian.yml
diff --git a/tests/local.config.yml b/tests/config.yml
similarity index 100%
rename from tests/local.config.yml
rename to tests/config.yml
diff --git a/tests/ubuntu-16-nginx.config.yml b/tests/ubuntu-16-nginx.config.yml
index 525fedad3..44ee51312 100644
--- a/tests/ubuntu-16-nginx.config.yml
+++ b/tests/ubuntu-16-nginx.config.yml
@@ -1,11 +1,2 @@
 ---
-composer_home_path: "/{{ drupalvm_user }}/.composer"
 drupalvm_webserver: nginx
-
-installed_extras:
-  - adminer
-  - drupalconsole
-  - mailhog
-  - pimpmylog
-  - varnish
-  - xhprof

From 7b85babbf02ba6639bd1245858b53f52b09b4161 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 18 May 2016 17:56:59 -0500
Subject: [PATCH 0292/1273] Rename example.config.yml to default.config.yml

---
 README.md                                  |  6 +++---
 docs/deployment/drush-make.md              |  2 +-
 docs/extras/syncing-folders.md             |  4 ++--
 docs/extras/varnish.md                     |  2 +-
 docs/other/base-os.md                      |  2 +-
 docs/other/drupalvm-composer-dependency.md | 10 +++++-----
 docs/other/webservers.md                   |  4 ++--
 examples/acquia/README.md                  |  4 ++--
 examples/prod/README.md                    |  2 +-
 9 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index bf5abc30f..9f286892a 100644
--- a/README.md
+++ b/README.md
@@ -69,9 +69,9 @@ Notes:
 ### 2 - Build the Virtual Machine
 
   1. Download this project and put it wherever you want.
-  2. Make copies of both of the `example.*` files, and modify to your liking:
+  2. Make copies of both example configuration files, and modify to your liking:
     - Copy `example.drupal.make.yml` to `drupal.make.yml`.
-    - Copy `example.config.yml` to `config.yml`.
+    - Copy `default.config.yml` to `config.yml`.
   3. Create a local directory where Drupal will be installed and configure the path to that directory in `config.yml` (`local_path`, inside `vagrant_synced_folders`).
   4. Open Terminal, `cd` to this directory (containing the `Vagrantfile` and this README file).
   5. Type in `vagrant up`, and let Vagrant do its magic.
@@ -117,7 +117,7 @@ Drupal VM is built to integrate with every developer's workflow. Many guides for
 Drupal VM follows semantic versioning, which means your configuration should continue working (potentially with very minor modifications) throughout a major release cycle. Here is the process to follow when updating Drupal VM between minor releases:
 
   1. Read through the [release notes](https://github.com/geerlingguy/drupal-vm/releases) and add/modify `config.yml` variables mentioned therein.
-  2. Do a diff of my config.yml with the updated example.config.yml (e.g. `curl https://raw.githubusercontent.com/geerlingguy/drupal-vm/master/example.config.yml | git diff --no-index config.yml -`).
+  2. Do a diff of your `config.yml` with the updated `default.config.yml` (e.g. `curl https://raw.githubusercontent.com/geerlingguy/drupal-vm/master/default.config.yml | git diff --no-index config.yml -`).
   3. Run `vagrant provision` to provision the VM, incorporating all the latest changes.
 
 For major version upgrades (e.g. 2.x.x to 3.x.x), it may be simpler to destroy the VM (`vagrant destroy`) then build a fresh new VM (`vagrant up`) using the new version of Drupal VM.
diff --git a/docs/deployment/drush-make.md b/docs/deployment/drush-make.md
index 433fc6808..40d0d50b4 100644
--- a/docs/deployment/drush-make.md
+++ b/docs/deployment/drush-make.md
@@ -2,4 +2,4 @@ Drupal VM is configured by default to use a Drush make file to build a Drupal si
 
 You can use any make file you want, just copy it or symlink it into the root of the Drupal VM folder with the filename `drupal.make.yml`. You can also set a separate path to the makefile using the `drush_makefile_path` variable.
 
-Leave the rest of the settings in `config.yml` as defaults from `example.config.yml`, or tweak the settings as you'd like, then run `vagrant up` as in the Quick Start Guide. Within a few minutes, you should have your site running and available at the `drupal_domain` configured in `config.yml`.
\ No newline at end of file
+Leave the rest of the settings in `config.yml` as defaults from `default.config.yml`, or tweak the settings as you'd like, then run `vagrant up` as in the Quick Start Guide. Within a few minutes, you should have your site running and available at the `drupal_domain` configured in `config.yml`.
diff --git a/docs/extras/syncing-folders.md b/docs/extras/syncing-folders.md
index dc0f1fe30..e29b3e6b8 100644
--- a/docs/extras/syncing-folders.md
+++ b/docs/extras/syncing-folders.md
@@ -1,4 +1,4 @@
-You can share folders between your host computer and the VM in a variety of ways; the most commonly-used method is an NFS share. If you use Windows and encounter any problems with NFS, try switching to `smb`. The `example.config.yml` file contains an example `nfs` share that would sync the folder `~/Sites/drupalvm` on your host into the `/var/www/drupalvm` folder on Drupal VM.
+You can share folders between your host computer and the VM in a variety of ways; the most commonly-used method is an NFS share. If you use Windows and encounter any problems with NFS, try switching to `smb`. The `default.config.yml` file contains an example `nfs` share that would sync the folder `~/Sites/drupalvm` on your host into the `/var/www/drupalvm` folder on Drupal VM.
 
 If you want to use a different synced folder method (e.g. `smb`), you can change `type` to:
 
@@ -105,4 +105,4 @@ See [this issue](https://github.com/geerlingguy/drupal-vm/issues/66) for more de
 
 ### Other NFS-related errors
 
-If you're having other weird issues, and none of the above fixes helps, you might want to try a different synced folder method (see top of this page), or something like File Conveyor or a special rsync setup (see [here](http://wolfgangziegler.net/auto-rsync-local-changes-to-remote-server#comments) for some examples).
\ No newline at end of file
+If you're having other weird issues, and none of the above fixes helps, you might want to try a different synced folder method (see top of this page), or something like File Conveyor or a special rsync setup (see [here](http://wolfgangziegler.net/auto-rsync-local-changes-to-remote-server#comments) for some examples).
diff --git a/docs/extras/varnish.md b/docs/extras/varnish.md
index a1b416c71..38b0cf677 100644
--- a/docs/extras/varnish.md
+++ b/docs/extras/varnish.md
@@ -2,7 +2,7 @@
 
 To enable Varnish, make sure `varnish` is in the list of your `installed_extras` in `config.yml`, and run `vagrant provision`.
 
-There are a few varnish configuration variables further down in `example.config.yml` that you may wish to configure. You can use your own `.vcl` file template (instead of the generic Drupal 7-focused generic one) by editing the `varnish_default_vcl_template_path`, and you can use a different port for Varnish by changing `varnish_listen_port`.
+There are a few varnish configuration variables further down in `default.config.yml` that you may wish to configure. You can use your own `.vcl` file template (instead of the generic Drupal 7-focused generic one) by editing the `varnish_default_vcl_template_path`, and you can use a different port for Varnish by changing `varnish_listen_port`.
 
 If you'd like to use Varnish on port 80, and switch Apache to a different backend port, you can do so pretty easily; just make sure you have the following values set in your `config.yml` file, and run `vagrant provision` to have Ansible make the necessary changes:
 
diff --git a/docs/other/base-os.md b/docs/other/base-os.md
index 89dc935cc..482a1795b 100644
--- a/docs/other/base-os.md
+++ b/docs/other/base-os.md
@@ -8,7 +8,7 @@ Currently-supported OSes are:
   - RedHat Enterprise Linux / CentOS 7
   - RedHat Enterprise Linux / CentOS 6
 
-For certain OSes, there are a couple other caveats and tweaks you may need to perform to get things running smoothly—the main features and latest development is only guaranteed to work with the default OS as configured in `example.config.yml`.
+For certain OSes, there are a couple other caveats and tweaks you may need to perform to get things running smoothly—the main features and latest development is only guaranteed to work with the default OS as configured in `default.config.yml`.
 
 Some other OSes should work, but are not regularly tested with Drupal VM, including Debian 8/Jessie (`debian/jessie64`) and Debian 7/Wheezy (`debian/wheezy64`).
 
diff --git a/docs/other/drupalvm-composer-dependency.md b/docs/other/drupalvm-composer-dependency.md
index ae4b305f1..e6d58c64f 100644
--- a/docs/other/drupalvm-composer-dependency.md
+++ b/docs/other/drupalvm-composer-dependency.md
@@ -29,11 +29,11 @@ _Note: This will be the directory where Drupal VM looks for other local configur
         └── drupal-vm/
 ```
 
-If you're using `pre_provision_scripts` or `post_provision_scripts` you also need to adjust their paths to take into account the new directory structure. The examples used in `example.config.yml` assume the files are located in the Drupal VM directory. If you use relative paths you need to the ascend the directory tree as far as the project root, but using the `config_dir` variable you get the absolute path of where you `config.yml` is located.
+If you're using `pre_provision_scripts` or `post_provision_scripts` you also need to adjust their paths to take into account the new directory structure. The examples used in `default.config.yml` assume the files are located in the Drupal VM directory. If you use relative paths you need to the ascend the directory tree as far as the project root, but using the `config_dir` variable you get the absolute path of where you `config.yml` is located.
 
 ```yaml
 post_provision_scripts:
-  # The default provided in `example.config.yml`:
+  # The default provided in `default.config.yml`:
   - "../../examples/scripts/configure-solr.sh"
   # With Drupal VM as a Composer dependency:
   - "{{ config_dir }}/../examples/scripts/configure-solr.sh"
@@ -98,7 +98,7 @@ If you don't use `composer` in your project you can still download  Drupal VM (o
 │   └── index.php
 └── box/
     ├── ...
-    ├── example.config.yml
+    ├── default.config.yml
     └── Vagrantfile
 ```
 
@@ -106,7 +106,7 @@ Configure your `config.yml` as mentioned in the [`composer` section](#setup-your
 
 ```yaml
 post_provision_scripts:
-  # The default provided in `example.config.yml`:
+  # The default provided in `default.config.yml`:
   - "../../examples/scripts/configure-solr.sh"
   # With Drupal VM in a toplevel subdirectory
   - "{{ config_dir }}/../examples/scripts/configure-solr.sh"
@@ -126,7 +126,7 @@ Your directory structure should now look like this:
 │   └── index.php
 └── box/
     ├── ...
-    ├── example.config.yml
+    ├── default.config.yml
     └── Vagrantfile
 ```
 
diff --git a/docs/other/webservers.md b/docs/other/webservers.md
index 3011c021d..bd2b24245 100644
--- a/docs/other/webservers.md
+++ b/docs/other/webservers.md
@@ -6,12 +6,12 @@ Because the webservers are configured somewhat differently, there are a few thin
 
 ## Using Apache
 
-You have complete control over all aspects of Apache VirtualHosts using the `apache_vhosts` configuration. A few simple examples are shown in `example.config.yml`, but this configuration can be much more complex.
+You have complete control over all aspects of Apache VirtualHosts using the `apache_vhosts` configuration. A few simple examples are shown in `default.config.yml`, but this configuration can be much more complex.
 
 See the examples included in the [`geerlingguy.apache` Ansible role's README](https://github.com/geerlingguy/ansible-role-apache#readme) for more info, as well as many other variables you can override to configure Apache exactly how you like it.
 
 ## Using Nginx
 
-Because Nginx server directives behave a little differently than Apache's VirtualHosts, Drupal VM includes a custom Drupal-optimized Nginx server block configuration, and you can control all the servers ('virtual hosts') Nginx will run using the `nginx_hosts` configuration. A few simple examples are shown in `example.config.yml`, but you have some extra flexibility if you need it. See the `nginx-vhost.conf.j2` template for more information.
+Because Nginx server directives behave a little differently than Apache's VirtualHosts, Drupal VM includes a custom Drupal-optimized Nginx server block configuration, and you can control all the servers ('virtual hosts') Nginx will run using the `nginx_hosts` configuration. A few simple examples are shown in `default.config.yml`, but you have some extra flexibility if you need it. See the `nginx-vhost.conf.j2` template for more information.
 
 Also, see the examples included in the [`geerlingguy.nginx` Ansible role's README](https://github.com/geerlingguy/ansible-role-nginx#readme) for more info, as well as many other variables you can override to configure Nginx exactly how you like it.
diff --git a/examples/acquia/README.md b/examples/acquia/README.md
index 74f546dd8..159563278 100644
--- a/examples/acquia/README.md
+++ b/examples/acquia/README.md
@@ -1,6 +1,6 @@
 # Acquia Cloud Drupal VM Configuration Example
 
-This directory contains example configuration changes for the default Drupal VM `example.config.yml` file which emulate the default Acquia Cloud environment with Drupal VM:
+This directory contains example configuration changes for the default Drupal VM `default.config.yml` file which emulate the default Acquia Cloud environment with Drupal VM:
 
   - Ubuntu 12.04.5 LTS
   - Apache 2.2.22
@@ -8,4 +8,4 @@ This directory contains example configuration changes for the default Drupal VM
   - MySQL/Percona 5.5.24
   - Apache Solr 4.5.1
 
-To use these overrides, copy `example.config.yml` to `config.yml` as you would normally, but make sure the variables defined in `acquia.overrides.yml` are defined with the same values in your `config.yml` file.
+To use these overrides, copy `default.config.yml` to `config.yml` as you would normally, but make sure the variables defined in `acquia.overrides.yml` are defined with the same values in your `config.yml` file.
diff --git a/examples/prod/README.md b/examples/prod/README.md
index be0664bbd..2f0221a57 100644
--- a/examples/prod/README.md
+++ b/examples/prod/README.md
@@ -33,7 +33,7 @@ Your DigitalOcean Droplet is booted and ready to have Drupal VM installed on it.
 
 ## Customize `config.yml` and `inventory` for production
 
-Just like you would with the normal `example.config.yml`, you need to copy the file to `config.yml`, then go through `prod.overrides.yml` (in this directory), and make sure to update your `config.yml`, making sure all the variables are set to match `prod.overrides.yml`.
+Just like you would with the normal `default.config.yml`, you need to copy the file to `config.yml`, then go through `prod.overrides.yml` (in this directory), and make sure to update your `config.yml`, making sure all the variables are set to match `prod.overrides.yml`.
 
 The changes outlined in `prod.overrides.yml` disable development-environment tools (like Pimp My Log and Adminer) and add extra security hardening configuration (via the `extra_security_enabled` variable).
 

From 82b932ecdf3e7363f1894d13740384efa9800f34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 18 May 2016 18:42:48 -0500
Subject: [PATCH 0293/1273] Update docs taking into account default.config.yml
 [ci skip]

---
 docs/deployment/drush-make.md                 |  2 +-
 examples/acquia/README.md                     |  4 +--
 examples/acquia/acquia.config.yml             | 32 +++++++++++++++++++
 examples/acquia/acquia.overrides.yml          |  4 ---
 examples/prod/README.md                       |  8 ++---
 .../{prod.overrides.yml => prod.config.yml}   |  4 +--
 6 files changed, 41 insertions(+), 13 deletions(-)
 create mode 100644 examples/acquia/acquia.config.yml
 delete mode 100644 examples/acquia/acquia.overrides.yml
 rename examples/prod/{prod.overrides.yml => prod.config.yml} (89%)

diff --git a/docs/deployment/drush-make.md b/docs/deployment/drush-make.md
index 40d0d50b4..8ce4e93a1 100644
--- a/docs/deployment/drush-make.md
+++ b/docs/deployment/drush-make.md
@@ -2,4 +2,4 @@ Drupal VM is configured by default to use a Drush make file to build a Drupal si
 
 You can use any make file you want, just copy it or symlink it into the root of the Drupal VM folder with the filename `drupal.make.yml`. You can also set a separate path to the makefile using the `drush_makefile_path` variable.
 
-Leave the rest of the settings in `config.yml` as defaults from `default.config.yml`, or tweak the settings as you'd like, then run `vagrant up` as in the Quick Start Guide. Within a few minutes, you should have your site running and available at the `drupal_domain` configured in `config.yml`.
+Have a look at the defaults in `default.config.yml` and tweak the settings as you'd like in your `config.yml`, then run `vagrant up` as in the Quick Start Guide. Within a few minutes, you should have your site running and available at the `drupal_domain` configured in `config.yml`, falling back to the default `http://drupalvm.dev` set in `default.config.yml`.
diff --git a/examples/acquia/README.md b/examples/acquia/README.md
index 159563278..9d4244ae9 100644
--- a/examples/acquia/README.md
+++ b/examples/acquia/README.md
@@ -1,6 +1,6 @@
 # Acquia Cloud Drupal VM Configuration Example
 
-This directory contains example configuration changes for the default Drupal VM `default.config.yml` file which emulate the default Acquia Cloud environment with Drupal VM:
+This directory contains example configuration overrides for the default Drupal VM `default.config.yml` file which emulate the default Acquia Cloud environment with Drupal VM:
 
   - Ubuntu 12.04.5 LTS
   - Apache 2.2.22
@@ -8,4 +8,4 @@ This directory contains example configuration changes for the default Drupal VM
   - MySQL/Percona 5.5.24
   - Apache Solr 4.5.1
 
-To use these overrides, copy `default.config.yml` to `config.yml` as you would normally, but make sure the variables defined in `acquia.overrides.yml` are defined with the same values in your `config.yml` file.
+To use these overrides, copy `acquia.config.yml` to `config.yml`, and by looking at `default.config.yml` add any other overrides you'd like. Whatever variables you have set in `config.yml` will override the defaults set by `default.config.yml`.
diff --git a/examples/acquia/acquia.config.yml b/examples/acquia/acquia.config.yml
new file mode 100644
index 000000000..90ab4533a
--- /dev/null
+++ b/examples/acquia/acquia.config.yml
@@ -0,0 +1,32 @@
+---
+vagrant_box: geerlingguy/ubuntu1204
+solr_version: "4.5.1"
+
+php_version: "5.6"
+php_packages:
+  - php5
+  - php5-mcrypt
+  - php5-cli
+  - php5-common
+  - php5-curl
+  - php5-dev
+  - php5-fpm
+  - php5-gd
+  - php5-sqlite
+  - php-pear
+  - libpcre3-dev
+php_conf_paths:
+  - /etc/php5/fpm
+  - /etc/php5/apache2
+  - /etc/php5/cli
+php_extension_conf_paths:
+  - /etc/php5/fpm/conf.d
+  - /etc/php5/apache2/conf.d
+  - /etc/php5/cli/conf.d
+php_fpm_daemon: php5-fpm
+php_fpm_conf_path: "/etc/php5/fpm"
+php_fpm_pool_conf_path: "/etc/php5/fpm/pool.d/www.conf"
+php_mysql_package: php5-mysql
+
+installed_extras:
+  - solr
diff --git a/examples/acquia/acquia.overrides.yml b/examples/acquia/acquia.overrides.yml
deleted file mode 100644
index bcc7cdb85..000000000
--- a/examples/acquia/acquia.overrides.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-vagrant_box: geerlingguy/ubuntu1204
-php_version: "5.6"
-solr_version: "4.5.1"
diff --git a/examples/prod/README.md b/examples/prod/README.md
index 2f0221a57..a159a2927 100644
--- a/examples/prod/README.md
+++ b/examples/prod/README.md
@@ -14,7 +14,7 @@ Make sure you have an SSH key you can use to connect to your DigitalOcean drople
 
 Once you are logged into DigitalOcean and have added your SSH key, click the 'Create Droplet' button on your Droplets page. For the Droplet, choose the following options:
 
-  - **Image**: Choose `Ubuntu 14.04.x x64`
+  - **Image**: Choose `Ubuntu 16.04.x x64`
   - **Size**: 1 GB / 1 CPU (currently $10/month; you can choose a higher plan if needed)
   - **Region**: Choose whatever region is geographically nearest to you and your site visitors
   - **Settings**: (Nothing here affects how Drupal VM works, choose what you'd like)
@@ -33,9 +33,9 @@ Your DigitalOcean Droplet is booted and ready to have Drupal VM installed on it.
 
 ## Customize `config.yml` and `inventory` for production
 
-Just like you would with the normal `default.config.yml`, you need to copy the file to `config.yml`, then go through `prod.overrides.yml` (in this directory), and make sure to update your `config.yml`, making sure all the variables are set to match `prod.overrides.yml`.
+Copy `prod.config.yml` to `config.yml`, and by looking at `default.config.yml` add any other overrides you'd like. Whatever variables you have set in `config.yml` will override the defaults set by `default.config.yml`.
 
-The changes outlined in `prod.overrides.yml` disable development-environment tools (like Pimp My Log and Adminer) and add extra security hardening configuration (via the `extra_security_enabled` variable).
+The changes outlined in `prod.config.yml` disable development-environment tools (like Pimp My Log and Adminer) and add extra security hardening configuration (via the `extra_security_enabled` variable).
 
 The only other thing you need to do is copy the inventory file `example.inventory` to `inventory` (so it is located at `prod/inventory`). By default, it reads:
 
@@ -84,6 +84,6 @@ After a few minutes, your Drupal-VM-in-the-cloud Droplet should be fully configu
 
 ## Go Further
 
-You can use Ubuntu 12.04, Ubuntu 14.04, CentOS 6 or CentOS 7 when you build the DigitalOcean Droplet. Just like with Drupal VM running locally, you can customize almost every aspect of the server!
+You can use Ubuntu 12.04, Ubuntu 14.04, Ubuntu 16.04, CentOS 6 or CentOS 7 when you build the DigitalOcean Droplet. Just like with Drupal VM running locally, you can customize almost every aspect of the server!
 
 You may want to customize your configuration even further, to make sure Drupal VM is tuned for your specific Drupal site's needs, or you may want to change things and make the server configuration more flexible, etc. For all that, the book [Ansible for DevOps](http://ansiblefordevops.com/) will give you a great introduction to using Ansible to make Drupal VM and the included Ansible configuration do exactly what you need!
diff --git a/examples/prod/prod.overrides.yml b/examples/prod/prod.config.yml
similarity index 89%
rename from examples/prod/prod.overrides.yml
rename to examples/prod/prod.config.yml
index 29b416a36..6018785ef 100644
--- a/examples/prod/prod.overrides.yml
+++ b/examples/prod/prod.config.yml
@@ -2,8 +2,8 @@
 # Normally, this would be set to the hostname of your DigitalOcean Droplet.
 drupal_domain: "drupalvm.dev"
 
-# Delete all the `apache_vhosts` or `nginx_hosts` you don't need. If only
-# installing a single Drupal site, the variable should look like this (Apache):
+# Add only the `apache_vhosts` or `nginx_hosts` you need. If installing a
+# single Drupal site, the variable should look like this (Apache):
 apache_vhosts:
   - servername: "{{ drupal_domain }}"
     documentroot: "{{ drupal_core_path }}"

From 4b7a2d4d7f84024ac14d10abacb5629ec6676664 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 18 May 2016 18:43:10 -0500
Subject: [PATCH 0294/1273] Remove duplicate PHP variables in php 5.6 docs [ci
 skip]

---
 docs/other/php-56.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docs/other/php-56.md b/docs/other/php-56.md
index 4cdb2645d..1a4394d9a 100644
--- a/docs/other/php-56.md
+++ b/docs/other/php-56.md
@@ -36,10 +36,6 @@ php_fpm_daemon: php5-fpm
 php_fpm_conf_path: "/etc/php5/fpm"
 php_fpm_pool_conf_path: "/etc/php5/fpm/pool.d/www.conf"
 php_mysql_package: php5-mysql
-php_memcached_package: php5-memcached
-
-xhprof_download_url: https://github.com/phacility/xhprof/archive/master.tar.gz
-xhprof_download_folder_name: xhprof-master
 ```
 
 If you're using Apache with `mod_php` you should also add `libapache2-mod-php5` to the `php_packages` list.

From 16c2de1891f98a4da67182b7eed9c64668281df6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 18 May 2016 19:00:14 -0500
Subject: [PATCH 0295/1273] Add docs on config.yml being optional [ci skip]

---
 docs/other/overriding-configurations.md | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/docs/other/overriding-configurations.md b/docs/other/overriding-configurations.md
index 118a65008..12dfbaf72 100644
--- a/docs/other/overriding-configurations.md
+++ b/docs/other/overriding-configurations.md
@@ -1,4 +1,14 @@
-## Overriding variables in `config.yml` with a `local.config.yml`
+## Overriding Drupal VM's `default.config.yml` with `config.yml`
+
+If available, Drupal VM will load a `config.yml` where you can override any of the defaults set in `default.config.yml`. Commonly this is a copy of `default.config.yml` with the values tweaked to your own project. For an easier upgrade path you would only set the values you are actually overriding.
+
+```yaml
+vagrant_box: geerlingguy/centos7
+vagrant_hostname: my-custom-site.dev
+vagrant_machine_name: my_custom_site
+```
+
+## Overriding variables with a `local.config.yml`
 
 If available, Drupal VM will also load a `local.config.yml` after having loaded the main `config.yml`. Using this file you can override variables previously defined in `config.yml`. For teams who are sharing a VM configuration, this is a good place to configure anything that's specific to your own environment.
 

From 9053c102a6060690a9ecf052d49e35cd8bafba71 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 19 May 2016 11:08:14 -0500
Subject: [PATCH 0296/1273] Issue #619: Fix OPcache CLI error by using new PHP
 version.

---
 provisioning/requirements.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index c232939ca..1ae96f135 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -36,7 +36,7 @@
 - src: geerlingguy.nodejs
   version: 3.0.0
 - src: geerlingguy.php
-  version: 3.0.3
+  version: 3.0.4
 - src: geerlingguy.php-memcached
   version: 2.0.0
 - src: geerlingguy.php-mysql

From 78677683d302027ca7c5b4f605a8bf0ef50b5ea0 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 19 May 2016 11:13:59 -0500
Subject: [PATCH 0297/1273] Update Varnish role version.

---
 provisioning/requirements.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 1ae96f135..485c7fd50 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -64,4 +64,4 @@
 - src: geerlingguy.solr
   version: 2.1.0
 - src: geerlingguy.varnish
-  version: 1.5.0
+  version: 1.6.0

From f8899949522afc16670c9ed4259df4aafb93fcff Mon Sep 17 00:00:00 2001
From: Joe Stewart <joe.stewart@mediacurrent.com>
Date: Fri, 20 May 2016 17:01:03 -0500
Subject: [PATCH 0298/1273] Docs: Install php5-apcu. [ci skip]

---
 docs/other/php-56.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/other/php-56.md b/docs/other/php-56.md
index 4cdb2645d..4df5b353c 100644
--- a/docs/other/php-56.md
+++ b/docs/other/php-56.md
@@ -14,6 +14,7 @@ Ondřej Surý's PPA for PHP 7.0 is used to install PHP 7, but you can switch to
 php_version: "5.6"
 php_packages:
   - php5
+  - php5-apcu
   - php5-mcrypt
   - php5-cli
   - php5-common

From 856e8d704e42859a87806ff4d8c6a9313dcc1ede Mon Sep 17 00:00:00 2001
From: Dan Bohea <git@bohea.co.uk>
Date: Wed, 25 May 2016 09:17:43 +0100
Subject: [PATCH 0299/1273] Setting configure_local_drush_aliases to false now
 behaves as expected.

- Fixes #662
---
 provisioning/tasks/drush-aliases.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/provisioning/tasks/drush-aliases.yml b/provisioning/tasks/drush-aliases.yml
index 86a5145f3..a9d85a62a 100644
--- a/provisioning/tasks/drush-aliases.yml
+++ b/provisioning/tasks/drush-aliases.yml
@@ -33,6 +33,7 @@
     src: ../templates/drupalvm-local.aliases.drushrc.php.j2
     dest: "~/.drush/{{ vagrant_machine_name }}.aliases.drushrc.php"
   become: no
+  when: configure_local_drush_aliases
 
 - name: Ensure drush directory exists for root user inside VM.
   file: 'path="~/.drush" state=directory'
@@ -41,3 +42,4 @@
   template:
     src: ../templates/drupalvm-local.aliases.drushrc.php.j2
     dest: "~/.drush/{{ vagrant_machine_name }}.aliases.drushrc.php"
+  when: configure_local_drush_aliases

From 9a079dd97eef03128e0b6f631f0177cfff5108ac Mon Sep 17 00:00:00 2001
From: Richard Robinson <richardrobinsonx@users.noreply.github.com>
Date: Sun, 29 May 2016 22:39:52 -0500
Subject: [PATCH 0300/1273] Update drush.md

Apparently Ansible is required to make this happen and it doesn't mention it in the documentation.
---
 docs/extras/drush.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/extras/drush.md b/docs/extras/drush.md
index 9aabd7cb7..de68518a9 100644
--- a/docs/extras/drush.md
+++ b/docs/extras/drush.md
@@ -1,4 +1,4 @@
-If you have Drush installed on your host workstation, and would like to interact with a Drupal site running inside Drupal VM, there are drush aliases automatically created by Drupal VM for each of the virtual hosts you have configured.
+If you have Drush and Ansible installed on your host workstation, and would like to interact with a Drupal site running inside Drupal VM, there are drush aliases automatically created by Drupal VM for each of the virtual hosts you have configured.
 
 With the example configuration, you can manage the example Drupal site using the Drush alias `@drupalvm.dev`. For example, to check if Drush can connect to the site in Drupal VM, run:
 

From cd51252f700082d845211c45351a4cc2d1ed69a6 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 31 May 2016 23:21:47 -0500
Subject: [PATCH 0301/1273] Fixes #654: Remove ansible.cfg because role install
 is handled by Vagrant.

---
 ansible.cfg | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 ansible.cfg

diff --git a/ansible.cfg b/ansible.cfg
deleted file mode 100644
index 002a50dd5..000000000
--- a/ansible.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[defaults]
-roles_path = ./roles

From 1dfc78dcf60c4834559f2ba54039146e6149213c Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 31 May 2016 23:35:07 -0500
Subject: [PATCH 0302/1273] Update README to add a link explaining config
 overrides.

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

diff --git a/README.md b/README.md
index 9f286892a..d0b684e46 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ Full Drupal VM documentation is available at http://docs.drupalvm.com/
 
 There are a couple places where you can customize the VM for your needs:
 
-  - `config.yml`: Contains variables like the VM domain name and IP address, PHP and MySQL configuration, etc.
+  - `config.yml`: Override any of the default VM configuration from `default.config.yml`; customize almost any aspect of any software installed in the VM (more about [overriding configurations](http://docs.drupalvm.com/en/latest/other/overriding-configurations/).
   - `drupal.make.yml`: Contains configuration for the Drupal core version, modules, and patches that will be downloaded on Drupal's initial installation (more about [Drush make files](https://www.drupal.org/node/1432374)).
 
 If you want to switch from Drupal 8 (default) to Drupal 7 on the initial install, do the following:

From cdbb0a139d6416ab63187d8fe7db0534f677f771 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 1 Jun 2016 18:55:35 -0400
Subject: [PATCH 0303/1273] Issue #683: Change the default synced directory to
 drupal vm's own directory

---
 default.config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/default.config.yml b/default.config.yml
index 9e5255fa1..99d298328 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -21,8 +21,8 @@ vagrant_public_ip: ""
 # http://docs.drupalvm.com/en/latest/extras/syncing-folders/ for more info.
 vagrant_synced_folders:
   # The first synced folder will be used for the default Drupal installation, if
-  # build_makefile: is 'true'.
-  - local_path: ~/Sites/drupalvm
+  # build_makefile: is 'true'. By default it's set to the drupal-vm folder.
+  - local_path: .
     destination: /var/www/drupalvm
     type: nfs
     create: true

From 347817639b86311977109405dd9105841faab560 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 1 Jun 2016 19:06:14 -0400
Subject: [PATCH 0304/1273] Issue #683: Update docs with the new default synced
 folder path.

---
 docs/extras/behat.md                    |  2 +-
 docs/extras/syncing-folders.md          | 10 +++++-----
 docs/other/overriding-configurations.md |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/extras/behat.md b/docs/extras/behat.md
index 40a39018d..904548a2d 100644
--- a/docs/extras/behat.md
+++ b/docs/extras/behat.md
@@ -27,7 +27,7 @@ _You can also include `drupal/drupal-extension` directly in your project's `comp
 
 ## Setting up Behat for your project
 
-Using the default Drupal site as an example (it's installed in `/var/www/drupalvm/drupal` by default, and is shared to `~/Sites/drupalvm/drupal` on your host machine), the following steps will help you get your first Behat tests up and running!
+Using the default Drupal site as an example (it's installed in `/var/www/drupalvm/drupal` by default, and is shared to the `./drupal` folder inside the drupal-vm directory on your host machine), the following steps will help you get your first Behat tests up and running!
 
   1. Create a `behat.yml` file inside the docroot of your site (e.g. create this file alongside the rest of the Drupal codebase at `/var/www/drupalvm/drupal/behat.yml`), with the following contents:
 
diff --git a/docs/extras/syncing-folders.md b/docs/extras/syncing-folders.md
index e29b3e6b8..37a11c011 100644
--- a/docs/extras/syncing-folders.md
+++ b/docs/extras/syncing-folders.md
@@ -1,10 +1,10 @@
-You can share folders between your host computer and the VM in a variety of ways; the most commonly-used method is an NFS share. If you use Windows and encounter any problems with NFS, try switching to `smb`. The `default.config.yml` file contains an example `nfs` share that would sync the folder `~/Sites/drupalvm` on your host into the `/var/www/drupalvm` folder on Drupal VM.
+You can share folders between your host computer and the VM in a variety of ways; the most commonly-used method is an NFS share. If you use Windows and encounter any problems with NFS, try switching to `smb`. The `default.config.yml` file contains an example `nfs` share that would sync the entire drupal-vm directory (configured as the relative path `.`) on your host into the `/var/www/drupalvm` folder on Virtual Machine.
 
 If you want to use a different synced folder method (e.g. `smb`), you can change `type` to:
 
 ```yaml
 vagrant_synced_folders:
-  - local_path: ~/Sites/drupalvm
+  - local_path: .
     destination: /var/www/drupalvm
     type: smb
     create: true
@@ -54,7 +54,7 @@ If you are using rsync, it is advised to exclude certain directories so that the
 
 ```yaml
 vagrant_synced_folders:
-  - local_path: ~/Sites/drupalvm
+  - local_path: .
     destination: /var/www/drupalvm
     type: rsync
     create: true
@@ -73,11 +73,11 @@ There are a number of issues people encounter with synced folders from time to t
 
 ### Using Native Synced Folders
 
-You can use a native synced folder, which should work pretty flawlessly on any platform, but with a potential serious performance downside (compared to other synced folder methods). Just set `type` to `""`, and you can even put the synced folder inside the drupal-vm folder using a relative path, like:
+You can use a native synced folder, which should work pretty flawlessly on any platform, but with a potential serious performance downside (compared to other synced folder methods). Just set `type` to `""`.
 
 ```yaml
 vagrant_synced_folders:
-  - local_path: docroot
+  - local_path: .
     destination: /var/www/docroot
     type: ""
     create: true
diff --git a/docs/other/overriding-configurations.md b/docs/other/overriding-configurations.md
index 12dfbaf72..43f698720 100644
--- a/docs/other/overriding-configurations.md
+++ b/docs/other/overriding-configurations.md
@@ -19,7 +19,7 @@ php_memory_limit: "512M"
 
 # Override the synced folders to use rsync instead of NFS.
 vagrant_synced_folders:
-  - local_path: ~/Sites/drupalvm
+  - local_path: .
     destination: /var/www/drupalvm
     type: rsync
     create: true

From 8d7104d3c10a11fa3b76844c4f68f110059c09f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 1 Jun 2016 19:31:17 -0400
Subject: [PATCH 0305/1273] Issue #666: Add docs on how to run custom playbooks
 [ci skip]

---
 docs/extras/scripts.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/docs/extras/scripts.md b/docs/extras/scripts.md
index 00948a970..ea2f4699f 100644
--- a/docs/extras/scripts.md
+++ b/docs/extras/scripts.md
@@ -33,3 +33,19 @@ The path will be evaluated as a [glob pattern](https://docs.python.org/2/library
 The files matched will run in alphabetical order, and as with shell scripts, pre-provision task files will run before any other packages are installed.
 
 _Note: Unlike pre- and post-provision scripts, extra task files will be relative to `provisioning/files/` instead of `provisioning/`._
+
+
+## Ansible playbooks
+
+Out of the box Drupal VM does not support running additional playbooks or adding your own roles but using [`Vagrantfile.local`](../other/overriding-configurations.md#extending-the-vagrantfile-with-vagrantfilelocal) you can add any number of additional provisioners to vagrant.
+
+As an example you might have a `local.playbook.yml` with it's own dependencies defined in `local.requirements.yml`. Place both of these next to your `config.yml` and add the following `Vagrantfile.local`.
+
+```rb
+config.vm.provision 'ansible' do |ansible|
+  ansible.playbook = "#{host_config_dir}/local.playbook.yml"
+  ansible.galaxy_role_file = "#{host_config_dir}/local.requirements.yml"
+end
+```
+
+When you run `vagrant provision` this playbook will run after Drupal VM's own playbook.

From 9edb853377b68bef558fe3c52a7eb35072d56509 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 2 Jun 2016 15:40:24 -0500
Subject: [PATCH 0306/1273] Issue #668: Default to Solr 5.x.

---
 default.config.yml                | 2 +-
 examples/acquia/acquia.config.yml | 5 ++++-
 provisioning/requirements.yml     | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/default.config.yml b/default.config.yml
index 9e5255fa1..8e2a15bde 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -261,7 +261,7 @@ php_xdebug_idekey: PHPSTORM
 php_xdebug_max_nesting_level: 256
 
 # Solr Configuration (if enabled above).
-solr_version: "4.10.4"
+solr_version: "5.5.1"
 solr_xms: "64M"
 solr_xmx: "128M"
 
diff --git a/examples/acquia/acquia.config.yml b/examples/acquia/acquia.config.yml
index 90ab4533a..d20c09df3 100644
--- a/examples/acquia/acquia.config.yml
+++ b/examples/acquia/acquia.config.yml
@@ -1,7 +1,8 @@
 ---
+# Acquia Cloud uses Ubuntu 12.04 LTS.
 vagrant_box: geerlingguy/ubuntu1204
-solr_version: "4.5.1"
 
+# Acquia Cloud defaults to PHP 5.6.
 php_version: "5.6"
 php_packages:
   - php5
@@ -28,5 +29,7 @@ php_fpm_conf_path: "/etc/php5/fpm"
 php_fpm_pool_conf_path: "/etc/php5/fpm/pool.d/www.conf"
 php_mysql_package: php5-mysql
 
+# Acquia Cloud Search defaults to Solr 4.x.
+solr_version: "4.5.1"
 installed_extras:
   - solr
diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 485c7fd50..8def01576 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -62,6 +62,6 @@
 - src: geerlingguy.security
   version: 1.2.0
 - src: geerlingguy.solr
-  version: 2.1.0
+  version: 3.1.0
 - src: geerlingguy.varnish
   version: 1.6.0

From a1bf8a405d0e422c0e6d5545a431dbb6f7c2bb28 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 2 Jun 2016 22:09:30 -0500
Subject: [PATCH 0307/1273] Fixes #668: Update configure-solr script for Solr
 5.x.

---
 examples/scripts/configure-solr.sh | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/examples/scripts/configure-solr.sh b/examples/scripts/configure-solr.sh
index 77ca87c52..df659e8b2 100755
--- a/examples/scripts/configure-solr.sh
+++ b/examples/scripts/configure-solr.sh
@@ -10,9 +10,11 @@
 SOLR_SETUP_COMPLETE_FILE=/etc/drupal_vm_solr_config_complete
 
 # Search API Solr module.
-SOLR_DOWNLOAD=http://ftp.drupal.org/files/projects/search_api_solr-8.x-1.x-dev.tar.gz
-SOLR_DOWNLOAD_DIR=/tmp
-SOLR_MODULE_NAME=search_api_solr
+SOLR_DOWNLOAD="http://ftp.drupal.org/files/projects/search_api_solr-8.x-1.x-dev.tar.gz"
+SOLR_DOWNLOAD_DIR="/tmp"
+SOLR_MODULE_NAME="search_api_solr"
+SOLR_VERSION="5.x"
+SOLR_CORE_PATH="/var/solr/data/collection1"
 
 # Check to see if we've already performed this setup.
 if [ ! -e "$SOLR_SETUP_COMPLETE_FILE" ]; then
@@ -20,13 +22,13 @@ if [ ! -e "$SOLR_SETUP_COMPLETE_FILE" ]; then
   wget -qO- $SOLR_DOWNLOAD | tar xvz -C $SOLR_DOWNLOAD_DIR
 
   # Copy the Solr configuration into place over the default `collection1` core.
-  sudo cp -a $SOLR_DOWNLOAD_DIR/$SOLR_MODULE_NAME/solr-conf/4.x/. /var/solr/collection1/conf/
+  sudo cp -a $SOLR_DOWNLOAD_DIR/$SOLR_MODULE_NAME/solr-conf/$SOLR_VERSION/. $SOLR_CORE_PATH/conf/
 
   # Adjust the autoCommit time so index changes are committed in 1s.
-  sudo sed -i 's/\(<maxTime>\)\([^<]*\)\(<[^>]*\)/\11000\3/g' /var/solr/collection1/conf/solrconfig.xml
+  sudo sed -i 's/\(<maxTime>\)\([^<]*\)\(<[^>]*\)/\11000\3/g' $SOLR_CORE_PATH/conf/solrconfig.xml
 
   # Fix file permissions.
-  sudo chown -R solr:solr /var/solr/collection1/conf
+  sudo chown -R solr:solr $SOLR_CORE_PATH/conf
 
   # Restart Apache Solr.
   sudo service solr restart

From 0f1f1303d6692e8c57dfb16f3b437d68a850ca52 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 2 Jun 2016 22:16:48 -0500
Subject: [PATCH 0308/1273] Fixes #651: Document Acquia's BLT project.

---
 docs/other/management-tools.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/other/management-tools.md b/docs/other/management-tools.md
index 14e7d5c4d..e87195ef0 100644
--- a/docs/other/management-tools.md
+++ b/docs/other/management-tools.md
@@ -6,6 +6,10 @@ If you know of any other tools to help manage Drupal VM, please add them to this
 
 [Lunchbox](https://github.com/LunchboxDevTools/lunchbox) is a wrapper for the Drupal VM project to manage your Drupal development process. It is a Node.js-based GUI to assist in setting up Drupal VM and creating and managing instances.
 
+## Acquia BLT
+
+[BLT (Build and Launch Tool)](https://github.com/acquia/blt) is a project from Acquia that builds a Drupal project repository, and can optionally include Drupal VM as part of the project. There is an open PR that may [use Composer to add Drupal VM as a project dependency automatically](https://github.com/acquia/blt/pull/93).
+
 ## Drupal VM Config Generator
 
 [Drupal VM Config Generator](https://github.com/opdavies/drupal-vm-config-generator) is a Symfony Console application that manages and customises configuration files for Drupal VM projects.

From 5aaed59a8ae372b62566ec58310ec770122cce96 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 2 Jun 2016 23:08:55 -0500
Subject: [PATCH 0309/1273] Ignore generated Drupal project directory.

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index ee6483792..c0f8665af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ examples/prod/inventory
 examples/prod/bootstrap/vars.yml
 scripts/
 roles/
+drupal/

From f76446f350ae466dc57ece9ab1ca6040a0f2c109 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 2 Jun 2016 23:09:27 -0500
Subject: [PATCH 0310/1273] Fixes #642: Add PHP information to the dashboard.

---
 default.config.yml                        |  3 ++
 provisioning/tasks/dashboard.yml          |  9 +++++-
 provisioning/templates/dashboard.html.j2  | 36 ++++++++++++++++++++++-
 provisioning/templates/server-info.php.j2 |  1 +
 4 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 provisioning/templates/server-info.php.j2

diff --git a/default.config.yml b/default.config.yml
index 9be98cf75..6f433612e 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -100,6 +100,9 @@ apache_vhosts:
   - servername: "{{ vagrant_ip }}"
     serveralias: "dashboard.{{ vagrant_hostname }}"
     documentroot: "{{ dashboard_install_dir }}"
+    extra_parameters: |
+          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ dashboard_install_dir }}"
+          DirectoryIndex index.html
 
 apache_remove_default_vhost: true
 apache_mods_enabled:
diff --git a/provisioning/tasks/dashboard.yml b/provisioning/tasks/dashboard.yml
index 4be3504f0..164b07aa8 100644
--- a/provisioning/tasks/dashboard.yml
+++ b/provisioning/tasks/dashboard.yml
@@ -1,4 +1,5 @@
-- name: Ensure the dashboard directory exists
+---
+- name: Ensure the dashboard directory exists.
   file:
     path: "{{ dashboard_install_dir }}"
     state: directory
@@ -9,3 +10,9 @@
     src: ../templates/dashboard.html.j2
     dest: "{{ dashboard_install_dir }}/index.html"
     mode: 0644
+
+- name: Copy phpinfo file into place.
+  copy:
+    src: ../templates/server-info.php.j2
+    dest: "{{ dashboard_install_dir }}/server-info.php"
+    mode: 0644
diff --git a/provisioning/templates/dashboard.html.j2 b/provisioning/templates/dashboard.html.j2
index 194895896..237ffab74 100644
--- a/provisioning/templates/dashboard.html.j2
+++ b/provisioning/templates/dashboard.html.j2
@@ -104,13 +104,18 @@
               {{ printSite(host.server_name, host.root) }}
             {%- endfor -%}
           {%- endif %}
-          <tr><td colspan=3><small>*Note: On Windows or when you don't have Ansible installed on your host, Drush aliases are only created inside the VM.</small></td></tr>
+          <tr><td colspan=3><small>*Note: If Ansible isn't installed installed on your host, Drush aliases are only created inside the VM.</small></td></tr>
         </tbody>
       </table>
     {%- endmacro -%}
 
     {%- macro sectionDevelopmentTools() -%}
       <table class="table">
+        {% if not installed_extras -%}
+          <tr>
+            <td>There are no development tools installed inside the VM.</td>
+          </tr>
+        {%- endif -%}
         {% if 'adminer' in installed_extras -%}
           {% macro servername() %}{{ getServernameFromDocroot(adminer_install_dir) }}/{{ adminer_install_filename }}{% endmacro %}
           {%- if servername() != "/{{ adminer_install_filename }}" -%}
@@ -177,6 +182,28 @@
       </table>
     {%- endmacro -%}
 
+    {%- macro sectionPhpInformation() -%}
+      <table class="table">
+        <tr>
+          <th>PHP Version</th>
+          <td><code>{{ php_version }}</code></td>
+        </tr>
+        <tr>
+          <th>Webserver</th>
+          <td><code>{{ drupalvm_webserver|capitalize }}</code></td>
+        </tr>
+        <tr>
+          <th>Memory limit</th>
+          <td><code>{{ php_memory_limit }}</code></td>
+        </tr>
+        <tr>
+          <th>PHP-FPM enabled</th>
+          <td><code>{{ 'yes' if php_enable_php_fpm else 'no' }}</code></td>
+        </tr>
+        <tr><td colspan=2><small><a href="/server-info.php">View more details in the server's phpinfo() report</a>.</small></td></tr>
+      </table>
+    {%- endmacro -%}
+
     {%- macro sectionDatabaseConnection() -%}
       <table class="table">
         <tr>
@@ -294,6 +321,13 @@
               {{ sectionDevelopmentTools() }}
             </div>
           </section>
+
+          <section class="panel panel-default">
+            <div class="panel-heading">PHP information</div>
+            <div class="panel-body">
+              {{ sectionPhpInformation() }}
+            </div>
+          </section>
         </div>
 
         <div class="col-md-5">
diff --git a/provisioning/templates/server-info.php.j2 b/provisioning/templates/server-info.php.j2
new file mode 100644
index 000000000..147cebcdd
--- /dev/null
+++ b/provisioning/templates/server-info.php.j2
@@ -0,0 +1 @@
+<?php phpinfo(); ?>

From 37cf5eac595d3d54c6b76ae33fe8af6771fdd57c Mon Sep 17 00:00:00 2001
From: Dan Bohea <git@bohea.co.uk>
Date: Sat, 4 Jun 2016 14:27:05 +0100
Subject: [PATCH 0311/1273] configure_local_drush_aliases renamed to
 configure_drush_aliases

- Addresses #662
- Includes shim as this is a breaking change
---
 docs/extras/drush.md                     |  2 +-
 example.config.yml                       |  2 +-
 provisioning/tasks/drush-aliases.yml     | 16 +++++++++++-----
 provisioning/templates/dashboard.html.j2 |  4 ++--
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/docs/extras/drush.md b/docs/extras/drush.md
index 9aabd7cb7..6f3368428 100644
--- a/docs/extras/drush.md
+++ b/docs/extras/drush.md
@@ -35,7 +35,7 @@ $ drush @drupalvm.dev status
 
 Drupal VM automatically generates a drush alias file in `~/.drush/drupalvm.aliases.drushrc.php` with an alias for every site you have defined in the `apache_vhosts` variable.
 
-You can disable Drupal VM's automatic Drush alias file management if you want to manage drush aliases on your own. Just set the `configure_local_drush_aliases` variable in `config.yml` to `false`.
+You can disable Drupal VM's automatic Drush alias file management if you want to manage drush aliases on your own. Just set the `configure_drush_aliases` variable in `config.yml` to `false`.
 
 ## Using sql-sync
 
diff --git a/example.config.yml b/example.config.yml
index 9e5255fa1..45cef2244 100644
--- a/example.config.yml
+++ b/example.config.yml
@@ -71,7 +71,7 @@ drupalvm_cron_jobs: []
 
 # Drupal VM automatically creates a drush alias file in your ~/.drush folder if
 # this variable is 'true'.
-configure_local_drush_aliases: true
+configure_drush_aliases: true
 
 # Apache VirtualHosts. Add one for each site you are running inside the VM. For
 # multisite deployments, you can point multiple servernames at one documentroot.
diff --git a/provisioning/tasks/drush-aliases.yml b/provisioning/tasks/drush-aliases.yml
index a9d85a62a..3021f9180 100644
--- a/provisioning/tasks/drush-aliases.yml
+++ b/provisioning/tasks/drush-aliases.yml
@@ -1,11 +1,17 @@
 ---
+# TODO: Deprecate legacy variable & remove shim in next major release.
+- name: Shim for legacy configure_local_drush_aliases variable.
+  set_fact:
+    configure_drush_aliases: "{{ configure_local_drush_aliases }}"
+  when: configure_local_drush_aliases is defined and configure_drush_aliases is undefined
+
 - name: Check if local Drush configuration folder exists.
   stat:
     path: ~/.drush
   register: local_drush_config_folder
   delegate_to: 127.0.0.1
   become: no
-  when: configure_local_drush_aliases
+  when: configure_drush_aliases
 
 - name: Create Drush configuration folder if it doesn't exist.
   file:
@@ -13,7 +19,7 @@
     state: directory
   delegate_to: 127.0.0.1
   become: no
-  when: configure_local_drush_aliases and (local_drush_config_folder.stat.exists == false)
+  when: configure_drush_aliases and (local_drush_config_folder.stat.exists == false)
 
 # Note that this doesn't work for Windows, since Ansible's running in the VM.
 - name: Configure host machine drush aliases.
@@ -22,7 +28,7 @@
     dest: "~/.drush/{{ vagrant_machine_name }}.aliases.drushrc.php"
   delegate_to: 127.0.0.1
   become: no
-  when: configure_local_drush_aliases
+  when: configure_drush_aliases
 
 - name: Ensure drush directory exists for vagrant user inside VM.
   file: 'path="~/.drush" state=directory'
@@ -33,7 +39,7 @@
     src: ../templates/drupalvm-local.aliases.drushrc.php.j2
     dest: "~/.drush/{{ vagrant_machine_name }}.aliases.drushrc.php"
   become: no
-  when: configure_local_drush_aliases
+  when: configure_drush_aliases
 
 - name: Ensure drush directory exists for root user inside VM.
   file: 'path="~/.drush" state=directory'
@@ -42,4 +48,4 @@
   template:
     src: ../templates/drupalvm-local.aliases.drushrc.php.j2
     dest: "~/.drush/{{ vagrant_machine_name }}.aliases.drushrc.php"
-  when: configure_local_drush_aliases
+  when: configure_drush_aliases
diff --git a/provisioning/templates/dashboard.html.j2 b/provisioning/templates/dashboard.html.j2
index 194895896..1f4dafb60 100644
--- a/provisioning/templates/dashboard.html.j2
+++ b/provisioning/templates/dashboard.html.j2
@@ -41,7 +41,7 @@
         <tr>
           <td><a href="http://{{ servername }}">{{ servername }}</a></td>
           <td><code>{{ docroot }}</code></td>
-        {% if configure_local_drush_aliases %}
+        {% if configure_drush_aliases %}
           <td><code>drush @{{ vagrant_machine_name }}.{{ servername }}</code></td>
         {% endif %}
         </tr>
@@ -90,7 +90,7 @@
           <tr>
             <th>Hostname</th>
             <th>Document Root</th>
-            {% if configure_local_drush_aliases -%}
+            {% if configure_drush_aliases -%}
               <th>Drush alias*</th>
             {%- endif %}
         </thead>

From 00360526670a068509bbffdd615c20425c0dd33a Mon Sep 17 00:00:00 2001
From: Dan Bohea <git@bohea.co.uk>
Date: Sat, 4 Jun 2016 14:27:05 +0100
Subject: [PATCH 0312/1273] configure_local_drush_aliases renamed to
 configure_drush_aliases

- Addresses #662
- Includes shim as this is a breaking change
---
 default.config.yml                       |  2 +-
 docs/extras/drush.md                     |  2 +-
 provisioning/tasks/drush-aliases.yml     | 16 +++++++++++-----
 provisioning/templates/dashboard.html.j2 |  4 ++--
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/default.config.yml b/default.config.yml
index 6f433612e..4b2e46e05 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -71,7 +71,7 @@ drupalvm_cron_jobs: []
 
 # Drupal VM automatically creates a drush alias file in your ~/.drush folder if
 # this variable is 'true'.
-configure_local_drush_aliases: true
+configure_drush_aliases: true
 
 # Apache VirtualHosts. Add one for each site you are running inside the VM. For
 # multisite deployments, you can point multiple servernames at one documentroot.
diff --git a/docs/extras/drush.md b/docs/extras/drush.md
index de68518a9..c0b6ab96c 100644
--- a/docs/extras/drush.md
+++ b/docs/extras/drush.md
@@ -35,7 +35,7 @@ $ drush @drupalvm.dev status
 
 Drupal VM automatically generates a drush alias file in `~/.drush/drupalvm.aliases.drushrc.php` with an alias for every site you have defined in the `apache_vhosts` variable.
 
-You can disable Drupal VM's automatic Drush alias file management if you want to manage drush aliases on your own. Just set the `configure_local_drush_aliases` variable in `config.yml` to `false`.
+You can disable Drupal VM's automatic Drush alias file management if you want to manage drush aliases on your own. Just set the `configure_drush_aliases` variable in `config.yml` to `false`.
 
 ## Using sql-sync
 
diff --git a/provisioning/tasks/drush-aliases.yml b/provisioning/tasks/drush-aliases.yml
index a9d85a62a..3021f9180 100644
--- a/provisioning/tasks/drush-aliases.yml
+++ b/provisioning/tasks/drush-aliases.yml
@@ -1,11 +1,17 @@
 ---
+# TODO: Deprecate legacy variable & remove shim in next major release.
+- name: Shim for legacy configure_local_drush_aliases variable.
+  set_fact:
+    configure_drush_aliases: "{{ configure_local_drush_aliases }}"
+  when: configure_local_drush_aliases is defined and configure_drush_aliases is undefined
+
 - name: Check if local Drush configuration folder exists.
   stat:
     path: ~/.drush
   register: local_drush_config_folder
   delegate_to: 127.0.0.1
   become: no
-  when: configure_local_drush_aliases
+  when: configure_drush_aliases
 
 - name: Create Drush configuration folder if it doesn't exist.
   file:
@@ -13,7 +19,7 @@
     state: directory
   delegate_to: 127.0.0.1
   become: no
-  when: configure_local_drush_aliases and (local_drush_config_folder.stat.exists == false)
+  when: configure_drush_aliases and (local_drush_config_folder.stat.exists == false)
 
 # Note that this doesn't work for Windows, since Ansible's running in the VM.
 - name: Configure host machine drush aliases.
@@ -22,7 +28,7 @@
     dest: "~/.drush/{{ vagrant_machine_name }}.aliases.drushrc.php"
   delegate_to: 127.0.0.1
   become: no
-  when: configure_local_drush_aliases
+  when: configure_drush_aliases
 
 - name: Ensure drush directory exists for vagrant user inside VM.
   file: 'path="~/.drush" state=directory'
@@ -33,7 +39,7 @@
     src: ../templates/drupalvm-local.aliases.drushrc.php.j2
     dest: "~/.drush/{{ vagrant_machine_name }}.aliases.drushrc.php"
   become: no
-  when: configure_local_drush_aliases
+  when: configure_drush_aliases
 
 - name: Ensure drush directory exists for root user inside VM.
   file: 'path="~/.drush" state=directory'
@@ -42,4 +48,4 @@
   template:
     src: ../templates/drupalvm-local.aliases.drushrc.php.j2
     dest: "~/.drush/{{ vagrant_machine_name }}.aliases.drushrc.php"
-  when: configure_local_drush_aliases
+  when: configure_drush_aliases
diff --git a/provisioning/templates/dashboard.html.j2 b/provisioning/templates/dashboard.html.j2
index 237ffab74..db8e0894a 100644
--- a/provisioning/templates/dashboard.html.j2
+++ b/provisioning/templates/dashboard.html.j2
@@ -41,7 +41,7 @@
         <tr>
           <td><a href="http://{{ servername }}">{{ servername }}</a></td>
           <td><code>{{ docroot }}</code></td>
-        {% if configure_local_drush_aliases %}
+        {% if configure_drush_aliases %}
           <td><code>drush @{{ vagrant_machine_name }}.{{ servername }}</code></td>
         {% endif %}
         </tr>
@@ -90,7 +90,7 @@
           <tr>
             <th>Hostname</th>
             <th>Document Root</th>
-            {% if configure_local_drush_aliases -%}
+            {% if configure_drush_aliases -%}
               <th>Drush alias*</th>
             {%- endif %}
         </thead>

From 25c32df8a4610855ad4c4d3b4e96ce28889977fa Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 4 Jun 2016 16:32:54 -0500
Subject: [PATCH 0313/1273] Fixes #696: Document getting xhprof to work with
 PHP 5.6.

---
 docs/extras/profile-code.md | 9 ++++++++-
 docs/other/php-56.md        | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/docs/extras/profile-code.md b/docs/extras/profile-code.md
index 28d6a0c54..32d2a2a01 100644
--- a/docs/extras/profile-code.md
+++ b/docs/extras/profile-code.md
@@ -28,7 +28,14 @@ SQL             n/a       -
 
 ## XHProf
 
-[XHProf](http://xhprof.io/) allows easy code profiling and can be used in many different ways. Ensure `xhprof` is in the list of `installed_extras` inside `config.yml`.
+[XHProf](http://xhprof.io/) allows easy code profiling and can be used in many different ways. Ensure `xhprof` is in the list of `installed_extras` inside `config.yml`, and if you're using PHP 5.6, make sure you also add the following variables inside `config.yml`:
+
+```
+xhprof_download_url: https://github.com/phacility/xhprof/archive/master.tar.gz
+xhprof_download_folder_name: xhprof-master
+```
+
+This will ensure the version of XHProf installed is compatible with the older version of PHP.
 
 ### XHProf module
 
diff --git a/docs/other/php-56.md b/docs/other/php-56.md
index 4ede21643..4fecd645f 100644
--- a/docs/other/php-56.md
+++ b/docs/other/php-56.md
@@ -6,7 +6,7 @@ _Note: If you have Ansible installed on your host machine, make sure you're runn
 
 Ubuntu 16.04 Xenial defaults to PHP 7.0 in it's system packages. No older versions of PHP will be supported if using this base box.
 
-## Ubuntu 14.04
+## Ubuntu 14.04 / Ubuntu 12.04
 
 Ondřej Surý's PPA for PHP 7.0 is used to install PHP 7, but you can switch to using different 5.6 packages instead by making the following changes to `config.yml`:
 

From dd8e8eaf3d92d284cc4da0b7fca848a53119c1e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 4 Jun 2016 21:25:42 -0400
Subject: [PATCH 0314/1273] Issue #284: Add docs about vagrant-bindfs

---
 docs/extras/syncing-folders.md | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/docs/extras/syncing-folders.md b/docs/extras/syncing-folders.md
index 37a11c011..cacda49a7 100644
--- a/docs/extras/syncing-folders.md
+++ b/docs/extras/syncing-folders.md
@@ -103,6 +103,30 @@ mount_options: ["dmode=775,fmode=664"]
 
 See [this issue](https://github.com/geerlingguy/drupal-vm/issues/66) for more details.
 
+### Using [`vagrant-bindfs`](https://github.com/gael-ian/vagrant-bindfs) to work around permissions-related errors
+
+If you're using NFS synced folders the mounted directories will use the same numeric permissions on the guest VM as on the host OS. If you're on OSX for instance, your files within the VM would be owned by 501:20. To correct these permissions you can use the [`vagrant-bindfs` plugin](https://github.com/gael-ian/vagrant-bindfs) to mount your NFS folders to a temporary location and then re-mount them to the actual destination with the correct ownership.
+
+First install the plugin with `vagrant plugin install vagrant-bindfs` and then add a `Vagrantfile.local` with the following:
+
+```rb
+vconfig['vagrant_synced_folders'].each do |synced_folder|
+  case synced_folder['type']
+  when "nfs"
+    guest_path = synced_folder['destination']
+    host_path = File.expand_path(synced_folder['local_path'])
+    config.vm.synced_folders[guest_path][:guestpath] = "/var/nfs#{host_path}"
+    config.bindfs.bind_folder "/var/nfs#{host_path}", guest_path,
+      u: 'vagrant',
+      g: 'www-data',
+      perms: 'u=rwX:g=rwD',
+      o: 'nonempty'
+    config.nfs.map_uid = Process.uid
+    config.nfs.map_gid = Process.gid
+  end
+end
+```
+
 ### Other NFS-related errors
 
 If you're having other weird issues, and none of the above fixes helps, you might want to try a different synced folder method (see top of this page), or something like File Conveyor or a special rsync setup (see [here](http://wolfgangziegler.net/auto-rsync-local-changes-to-remote-server#comments) for some examples).

From dedb5204f6cf085e0a2ed14812e3106cde2fdfa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Fri, 3 Jun 2016 13:06:17 -0400
Subject: [PATCH 0315/1273] Add support for composer-based drupal site builds

---
 .travis.yml                                   |  2 +
 README.md                                     |  2 +-
 default.config.yml                            | 27 +++++--
 docs/deployment/composer.md                   | 71 +++++++++++++++++++
 example.drupal.composer.json                  | 35 +++++++++
 mkdocs.yml                                    |  1 +
 provisioning/playbook.yml                     | 13 ++++
 provisioning/tasks/build-composer-project.yml | 15 ++++
 provisioning/tasks/build-composer.yml         | 29 ++++++++
 provisioning/tasks/build-makefile.yml         | 10 +--
 tests/ubuntu-16-nginx.config.yml              |  5 ++
 11 files changed, 197 insertions(+), 13 deletions(-)
 create mode 100644 docs/deployment/composer.md
 create mode 100644 example.drupal.composer.json
 create mode 100644 provisioning/tasks/build-composer-project.yml
 create mode 100644 provisioning/tasks/build-composer.yml

diff --git a/.travis.yml b/.travis.yml
index 4fd1c1096..3a8ab7b07 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ env:
   global:
     - CONFIG: tests/config.yml
       MAKEFILE: example.drupal.make.yml
+      COMPOSERFILE: example.drupal.composer.json
       HOSTNAME: drupalvm.dev
       MACHINE_NAME: drupalvm
       IP: 192.168.88.88
@@ -57,6 +58,7 @@ script:
   # Copy configuration files into place.
   - 'sudo docker exec "$(cat ${container_id})" cp ${DRUPALVM_DIR}/${CONFIG} ${config_dir:-$DRUPALVM_DIR}/config.yml'
   - 'sudo docker exec "$(cat ${container_id})" cp ${DRUPALVM_DIR}/${MAKEFILE} ${config_dir:-$DRUPALVM_DIR}/drupal.make.yml'
+  - 'sudo docker exec "$(cat ${container_id})" cp ${DRUPALVM_DIR}/${COMPOSERFILE} ${config_dir:-$DRUPALVM_DIR}/drupal.composer.json'
 
   # Override configuration variables.
   - '[[ ! -z "${local_config}" ]] && sudo docker exec "$(cat ${container_id})" bash -c "cp ${DRUPALVM_DIR}/${local_config} ${config_dir:-$DRUPALVM_DIR}/local.config.yml" || true'
diff --git a/README.md b/README.md
index d0b684e46..9a81d8c56 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ If you want to switch from Drupal 8 (default) to Drupal 7 on the initial install
 
 ## Quick Start Guide
 
-This Quick Start Guide will help you quickly build a Drupal 8 site on the Drupal VM using the included example Drush make file. You can also use the Drupal VM with a [Local Drupal codebase](http://docs.drupalvm.com/en/latest/deployment/local-codebase/) or even a [Drupal multisite installation](http://docs.drupalvm.com/en/latest/deployment/multisite/).
+This Quick Start Guide will help you quickly build a Drupal 8 site on the Drupal VM using the included example Drush make file. You can also use the Drupal VM with a [Composer based installation](http://docs.drupalvm.com/en/latest/deployment/composer/), with a [Local Drupal codebase](http://docs.drupalvm.com/en/latest/deployment/local-codebase/) or even a [Drupal multisite installation](http://docs.drupalvm.com/en/latest/deployment/multisite/).
 
 ### 1 - Install Vagrant
 
diff --git a/default.config.yml b/default.config.yml
index 4b2e46e05..212fa082e 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -21,7 +21,8 @@ vagrant_public_ip: ""
 # http://docs.drupalvm.com/en/latest/extras/syncing-folders/ for more info.
 vagrant_synced_folders:
   # The first synced folder will be used for the default Drupal installation, if
-  # build_makefile: is 'true'. By default it's set to the drupal-vm folder.
+  # any of the build_* settings are 'true'. By default the folder is set to
+  # the drupal-vm folder.
   - local_path: .
     destination: /var/www/drupalvm
     type: nfs
@@ -34,17 +35,29 @@ vagrant_cpus: 2
 # The web server software to use. Can be either 'apache' or 'nginx'.
 drupalvm_webserver: apache
 
-# Set this to false if you are using a different site deployment strategy and
+# Set this to 'false' if you are using a different site deployment strategy and
 # would like to configure 'vagrant_synced_folders' and 'apache_vhosts' manually.
 build_makefile: true
 drush_makefile_path: "{{ config_dir }}/drupal.make.yml"
 
-# Set this to false if you don't need to install drupal (using the drupal_*
+# Set 'build_makefile' to 'false' and this to 'true' if you are using a
+# composer based site deployment strategy.
+build_composer: false
+drupal_composer_path: "{{ config_dir }}/drupal.composer.json"
+drupal_composer_install_dir: "/var/www/drupalvm/drupal"
+drupal_composer_dependencies: []
+
+# Set this to 'true' and 'build_makefile', 'build_composer' to 'false' if you
+# are using Composer's create-project as a site deployment strategy.
+build_composer_project: false
+drupal_composer_project_package: ""
+drupal_composer_project_options: "--prefer-dist --stability dev --no-interaction"
+
+# Set this to 'false' if you don't need to install drupal (using the drupal_*
 # settings below), but instead copy down a database (e.g. using drush sql-sync).
 install_site: true
 
-# Settings for building a Drupal site from a makefile (if 'build_makefile:'
-# is 'true').
+# Settings for installing a Drupal site (if 'install_site:' is 'true').
 drupal_major_version: 8
 drupal_core_path: "/var/www/drupalvm/drupal"
 drupal_domain: "{{ vagrant_hostname }}"
@@ -138,8 +151,8 @@ nginx_hosts:
 nginx_remove_default_vhost: true
 nginx_ppa_use: true
 
-# MySQL Databases and users. If build_makefile: is true, first database will
-# be used for the makefile-built site.
+# MySQL Databases and users. If 'install_site' is 'true', first database will
+# be used for the site.
 mysql_databases:
   - name: "{{ drupal_mysql_database }}"
     encoding: utf8
diff --git a/docs/deployment/composer.md b/docs/deployment/composer.md
new file mode 100644
index 000000000..49841b209
--- /dev/null
+++ b/docs/deployment/composer.md
@@ -0,0 +1,71 @@
+Drupal VM is configured to use [Drush make](drush-make.md) by default but supports building Drupal from a custom composer.json or creating a project from a composer package (`composer create-project`).
+
+## Using composer.json
+
+1. Copy `example.drupal.composer.json` to `drupal.composer.json` and modify it to your liking.
+2. Switch the build system by setting `build_makefile: false` and `build_composer: true` in your `config.yml`.
+3. Configure `drupal_core_path` to point to the webroot directory: `drupal_core_path: {{ drupal_composer_install_dir }}/docroot`
+
+```yaml
+build_makefile: false
+build_composer: true
+drupal_core_path: "{{ drupal_composer_install_dir }}/docroot"
+```
+
+_The file set in `drupal_composer_path` (which defaults to `drupal.composer.json`) will be copied from your host computer into the VM's `drupal_composer_install_dir` and renamed `composer.json`. If you already have a composer.json within that directory, you can set `drupal_composer_path: false`._
+
+## Using Composer when [Drupal VM is a composer dependency itself](../other/drupalvm-composer-dependency.md)
+
+In the scenario where you already have an existing `composer.json` in the root of your project, follow the usual steps for installing with a composer.json but instead of creating a `drupal.composer.json` file, disable the transfering of the file by setting `drupal_composer_path` to `false`, and change `drupal_composer_install_dir` to point to the the directory where it will be located. If `drupal_composer_path` is not truthy, Drupal VM assumes it already exists.
+
+```yaml
+build_makefile: false
+build_composer: true
+drupal_composer_path: false
+drupal_composer_install_dir: "/var/www/drupalvm"
+drupal_core_path: "{{ drupal_composer_install_dir }}/docroot"
+```
+
+## Creating a project from a composer package: `composer create-project`
+
+There's a couple of things you need to configure in your `config.yml`:
+
+- Switch the build system by setting `build_makefile: false`, `build_composer: false` and `build_composer_project: true`.
+- Configure the composer package in `drupal_composer_project_package`.
+- Additionally you can adjust the create-project CLI options in `drupal_composer_project_options` as well as add additional dependencies in `drupal_composer_dependencies`.
+- Ensure that the webroot configured in the composer package matches the one set in `drupal_core_path`.
+
+With [drupal-composer/drupal-project](https://github.com/drupal-composer/drupal-project) as an example your `config.yml` overrides would be:
+
+```yaml
+build_makefile: false
+build_composer: false
+build_composer_project: true
+
+drupal_composer_project_package: "drupal-composer/drupal-project:8.x-dev"
+# Added `--no-dev` to avoid installing development dependencies.
+drupal_composer_project_options: "--prefer-dist --stability dev --no-interaction --no-dev"
+drupal_composer_dependencies:
+  - "drupal/devel:8.*"
+
+drupal_core_path: "{{ drupal_composer_install_dir }}/web"
+```
+
+## Improving composer build performance
+
+Opting for composer based installs will most likely increase your VM's time to provision considerably.
+
+If you manage multiple VM's own your computer, you can use the [`vagrant-cachier` plugin](http://fgrehm.viewdocs.io/vagrant-cachier/) to share Composer's package cache across all VM's. The first build will be as slow as before but subsequent builds with the same `vagrant_box` (eg `geerlingguy/ubuntu1604`) will be much faster.
+
+1. Install the plugin on your host computer: `vagrant plugin install vagrant-cachier`
+2. Create a `Vagrantfile.local` next to your `config.yml` with the following:
+
+```rb
+config.cache.scope = :box
+config.cache.auto_detect = false
+config.cache.enable :generic, { :cache_dir => "/home/vagrant/.composer/cache"  }
+```
+
+_Note: Out of the box, sharing the Composer cache is not supported as the plugin requires PHP to be installed when the VM first boots up. This is why the generic cache bucket is used instead._
+
+_You can also use this plugin to share other package manager caches. For more information read the [documentation](http://fgrehm.viewdocs.io/vagrant-cachier/usage/)._
diff --git a/example.drupal.composer.json b/example.drupal.composer.json
new file mode 100644
index 000000000..528047ef7
--- /dev/null
+++ b/example.drupal.composer.json
@@ -0,0 +1,35 @@
+{
+    "name": "custom-project/drupal-vm",
+    "description": "",
+    "type": "project",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "",
+            "role": ""
+        }
+    ],
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "https://packagist.drupal-composer.org"
+        }
+    ],
+    "require": {
+        "composer/installers": "^1.0.20",
+        "drupal-composer/drupal-scaffold": "^2.0.1",
+        "drupal/core": "~8.0",
+        "drupal/devel": "8.*"
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true,
+    "extra": {
+        "installer-paths": {
+            "docroot/core": ["type:drupal-core"],
+            "docroot/modules/contrib/{$name}": ["type:drupal-module"],
+            "docroot/profiles/contrib/{$name}": ["type:drupal-profile"],
+            "docroot/themes/contrib/{$name}": ["type:drupal-theme"],
+            "drush/contrib/{$name}": ["type:drupal-drush"]
+        }
+    }
+}
diff --git a/mkdocs.yml b/mkdocs.yml
index a802b3eee..681311816 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -12,6 +12,7 @@ pages:
   - Home: 'index.md'
   - Drupal Deployment Strategies:
     - 'Drush Make file': 'deployment/drush-make.md'
+    - 'Composer': 'deployment/composer.md'
     - 'Local Drupal codebase': 'deployment/local-codebase.md'
     - 'Drupal multisite': 'deployment/multisite.md'
   - Extra Software and Setup:
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 453fcc50a..df50ee94c 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -80,6 +80,11 @@
     - name: Check if Drupal is already set up.
       stat: "path={{ drupal_core_path }}/index.php"
       register: drupal_site
+      ignore_errors: true
+
+    - name: Define drupal_site_exists
+      set_fact:
+        drupal_site_exists: "{{ drupal_site.stat.exists|default(false) }}"
 
     - include: tasks/sshd.yml
     - include: tasks/extras.yml
@@ -91,6 +96,14 @@
     - include: tasks/build-makefile.yml
       when: build_makefile
 
+    # Build with composer if configured.
+    - include: tasks/build-composer.yml
+      when: build_composer
+
+    # Build a composer project if configured.
+    - include: tasks/build-composer-project.yml
+      when: build_composer_project
+
     # Install site if configured.
     - include: tasks/install-site.yml
       when: install_site
diff --git a/provisioning/tasks/build-composer-project.yml b/provisioning/tasks/build-composer-project.yml
new file mode 100644
index 000000000..9964be1ff
--- /dev/null
+++ b/provisioning/tasks/build-composer-project.yml
@@ -0,0 +1,15 @@
+---
+- name: Generate Drupal project with composer package.
+  command: >
+    {{ composer_path }} create-project
+    {{ drupal_composer_project_package }} {{ drupal_composer_install_dir }}
+    {{ drupal_composer_project_options|default('--prefer-dist --no-interaction') }}
+  when: not drupal_site_exists
+  become: no
+
+- name: Install dependencies with composer require.
+  command: >
+    {{ composer_path }} require {{ item }}
+    chdir={{ drupal_composer_install_dir }}
+  with_items: "{{ drupal_composer_dependencies|default([]) }}"
+  become: no
diff --git a/provisioning/tasks/build-composer.yml b/provisioning/tasks/build-composer.yml
new file mode 100644
index 000000000..7602a3a7c
--- /dev/null
+++ b/provisioning/tasks/build-composer.yml
@@ -0,0 +1,29 @@
+---
+- name: Ensure drupal_composer_install_dir directory exists.
+  file:
+    path: "{{ drupal_composer_install_dir }}"
+    state: directory
+    mode: 0775
+  become: no
+  when: drupal_composer_path and not drupal_site_exists
+
+- name: Copy composer.json into place.
+  copy:
+    src: "{{ drupal_composer_path }}"
+    dest: "{{ drupal_composer_install_dir }}/composer.json"
+  when: drupal_composer_path and not drupal_site_exists
+  become: no
+
+- name: Run composer install.
+  command: >
+    composer install
+    chdir={{ drupal_composer_install_dir }}
+  when: not drupal_site_exists
+  become: no
+
+- name: Install dependencies with composer require.
+  command: >
+    {{ composer_path }} require {{ item }}
+    chdir={{ drupal_composer_install_dir }}
+  with_items: "{{ drupal_composer_dependencies|default([]) }}"
+  become: no
diff --git a/provisioning/tasks/build-makefile.yml b/provisioning/tasks/build-makefile.yml
index c74c9ce6f..862cb5acc 100644
--- a/provisioning/tasks/build-makefile.yml
+++ b/provisioning/tasks/build-makefile.yml
@@ -3,7 +3,7 @@
   copy:
     src: "{{ drush_makefile_path }}"
     dest: /tmp/drupal.make.yml
-  when: drupal_site.stat.exists == false
+  when: not drupal_site_exists
 
 - name: Ensure drupal_core_path directory exists.
   file:
@@ -12,23 +12,23 @@
     recurse: yes
     mode: 0775
   become: no
-  when: drupal_site.stat.exists == false
+  when: not drupal_site_exists
 
 - name: Generate Drupal site with drush makefile.
   command: >
     {{ drush_path }} make -y /tmp/drupal.make.yml --no-gitinfofile
     chdir={{ drupal_core_path }}
-  when: drupal_site.stat.exists == false
+  when: not drupal_site_exists
   become: no
 
 - name: Check if a composer.json file is present.
   stat: "path={{ drupal_core_path }}/composer.json"
   register: drupal_core_composer_file
-  when: drupal_site.stat.exists == false
+  when: not drupal_site_exists
 
 - name: Run composer install if composer.json is present.
   command: >
     composer install
     chdir={{ drupal_core_path }}
-  when: drupal_site.stat.exists == false and drupal_core_composer_file.stat.exists == true
+  when: not drupal_site_exists and drupal_core_composer_file.stat.exists
   become: no
diff --git a/tests/ubuntu-16-nginx.config.yml b/tests/ubuntu-16-nginx.config.yml
index 44ee51312..f1499c644 100644
--- a/tests/ubuntu-16-nginx.config.yml
+++ b/tests/ubuntu-16-nginx.config.yml
@@ -1,2 +1,7 @@
 ---
 drupalvm_webserver: nginx
+
+# Test composer based installation.
+build_makefile: false
+build_composer: true
+drupal_core_path: "{{ drupal_composer_install_dir }}/docroot"

From c5c8c8a19b87c09efd85fbcf3ec80211ce9b8025 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 4 Jun 2016 13:44:37 -0400
Subject: [PATCH 0316/1273] Add prestissimo as a default global composer
 package

---
 default.config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/default.config.yml b/default.config.yml
index 212fa082e..a9080bef6 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -240,8 +240,8 @@ composer_path: /usr/bin/composer
 composer_home_path: "/home/{{ drupalvm_user }}/.composer"
 composer_home_owner: "{{ drupalvm_user }}"
 composer_home_group: "{{ drupalvm_user }}"
-# composer_global_packages:
-#   - { name: phpunit/phpunit, release: '@stable' }
+composer_global_packages:
+  - { name: hirak/prestissimo, release: '^0.2' }
 
 # Run specified scripts before or after VM is provisioned. Path is relative to
 # the `provisioning/playbook.yml` file.

From d828f776bea10b4c988f8c2a21360ad257de322c Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 4 Jun 2016 21:42:48 -0500
Subject: [PATCH 0317/1273] Bump requirements for latest versions of PHP and
 Varnish roles.

---
 provisioning/requirements.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 8def01576..c4b47fe03 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -36,7 +36,7 @@
 - src: geerlingguy.nodejs
   version: 3.0.0
 - src: geerlingguy.php
-  version: 3.0.4
+  version: 3.1.0
 - src: geerlingguy.php-memcached
   version: 2.0.0
 - src: geerlingguy.php-mysql
@@ -64,4 +64,4 @@
 - src: geerlingguy.solr
   version: 3.1.0
 - src: geerlingguy.varnish
-  version: 1.6.0
+  version: 1.6.1

From d0cd3953679c31946726e8ccd11b9fed67eaceb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sun, 5 Jun 2016 10:50:33 -0400
Subject: [PATCH 0318/1273] Use composer project based site build as the
 default

---
 default.config.yml               | 13 +++++++------
 tests/ubuntu-16-nginx.config.yml |  8 ++++----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/default.config.yml b/default.config.yml
index a9080bef6..759c2f573 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -37,7 +37,7 @@ drupalvm_webserver: apache
 
 # Set this to 'false' if you are using a different site deployment strategy and
 # would like to configure 'vagrant_synced_folders' and 'apache_vhosts' manually.
-build_makefile: true
+build_makefile: false
 drush_makefile_path: "{{ config_dir }}/drupal.make.yml"
 
 # Set 'build_makefile' to 'false' and this to 'true' if you are using a
@@ -45,12 +45,13 @@ drush_makefile_path: "{{ config_dir }}/drupal.make.yml"
 build_composer: false
 drupal_composer_path: "{{ config_dir }}/drupal.composer.json"
 drupal_composer_install_dir: "/var/www/drupalvm/drupal"
-drupal_composer_dependencies: []
+drupal_composer_dependencies:
+  - "drupal/devel:8.*"
 
 # Set this to 'true' and 'build_makefile', 'build_composer' to 'false' if you
 # are using Composer's create-project as a site deployment strategy.
-build_composer_project: false
-drupal_composer_project_package: ""
+build_composer_project: true
+drupal_composer_project_package: "drupal-composer/drupal-project:8.x-dev"
 drupal_composer_project_options: "--prefer-dist --stability dev --no-interaction"
 
 # Set this to 'false' if you don't need to install drupal (using the drupal_*
@@ -59,7 +60,7 @@ install_site: true
 
 # Settings for installing a Drupal site (if 'install_site:' is 'true').
 drupal_major_version: 8
-drupal_core_path: "/var/www/drupalvm/drupal"
+drupal_core_path: "{{ drupal_composer_install_dir }}/web"
 drupal_domain: "{{ vagrant_hostname }}"
 drupal_site_name: "Drupal"
 drupal_install_profile: standard
@@ -241,7 +242,7 @@ composer_home_path: "/home/{{ drupalvm_user }}/.composer"
 composer_home_owner: "{{ drupalvm_user }}"
 composer_home_group: "{{ drupalvm_user }}"
 composer_global_packages:
-  - { name: hirak/prestissimo, release: '^0.2' }
+  - { name: hirak/prestissimo, release: '^0.3' }
 
 # Run specified scripts before or after VM is provisioned. Path is relative to
 # the `provisioning/playbook.yml` file.
diff --git a/tests/ubuntu-16-nginx.config.yml b/tests/ubuntu-16-nginx.config.yml
index f1499c644..c3c8833c5 100644
--- a/tests/ubuntu-16-nginx.config.yml
+++ b/tests/ubuntu-16-nginx.config.yml
@@ -1,7 +1,7 @@
 ---
 drupalvm_webserver: nginx
 
-# Test composer based installation.
-build_makefile: false
-build_composer: true
-drupal_core_path: "{{ drupal_composer_install_dir }}/docroot"
+# Test makefile based installation.
+build_makefile: true
+build_composer_project: false
+drupal_core_path: "/var/www/drupalvm/drupal"

From 52b7c02fedb85815df4120c7229fe381a6897009 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 5 Jun 2016 21:39:22 -0500
Subject: [PATCH 0319/1273] Fixes #702: Include default vagrant-cachier
 configuration.

---
 Vagrantfile | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/Vagrantfile b/Vagrantfile
index 769c148c0..432ab2bc1 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -175,6 +175,20 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # Set the name of the VM. See: http://stackoverflow.com/a/17864388/100134
   config.vm.define vconfig['vagrant_machine_name']
 
+  # Cache packages and dependencies if vagrant-cachier plugin is present.
+  if Vagrant.has_plugin?('vagrant-cachier')
+    config.cache.scope = :box
+    config.cache.auto_detect = false
+    config.cache.enable :apt
+    # Cache the composer directory.
+    config.cache.enable :generic, cache_dir: '/home/vagrant/.composer/cache'
+    # Cache via NFS shares.
+    config.cache.synced_folder_opts = {
+      type: :nfs,
+      mount_options: ['rw', 'vers=3', 'tcp', 'nolock']
+    }
+  end
+
   # Allow an untracked Vagrantfile to modify the configurations
   eval File.read "#{host_config_dir}/Vagrantfile.local" if File.exist?("#{host_config_dir}/Vagrantfile.local")
 end

From cc708d411497d4e2ef32f0cd1bc9ad04b17b3f2d Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 6 Jun 2016 09:28:16 -0500
Subject: [PATCH 0320/1273] Issue #704: Update documentation for Composer-based
 install default.

---
 docs/deployment/composer.md       | 27 ++++++++++-----------------
 docs/deployment/drush-make.md     |  4 ++--
 docs/deployment/local-codebase.md |  8 +++++---
 docs/deployment/multisite.md      |  2 +-
 4 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/docs/deployment/composer.md b/docs/deployment/composer.md
index 49841b209..e643f57cf 100644
--- a/docs/deployment/composer.md
+++ b/docs/deployment/composer.md
@@ -1,9 +1,9 @@
-Drupal VM is configured to use [Drush make](drush-make.md) by default but supports building Drupal from a custom composer.json or creating a project from a composer package (`composer create-project`).
+Drupal VM is configured to use `composer create-project` to build a Drupal 8 codebase by default but supports building Drupal from a custom composer.json or [Drush make file](drush-make.md).
 
 ## Using composer.json
 
 1. Copy `example.drupal.composer.json` to `drupal.composer.json` and modify it to your liking.
-2. Switch the build system by setting `build_makefile: false` and `build_composer: true` in your `config.yml`.
+2. Use the Composer build system by setting `build_composer: true` in your `config.yml` (make sure `build_makefile` is set to `false`).
 3. Configure `drupal_core_path` to point to the webroot directory: `drupal_core_path: {{ drupal_composer_install_dir }}/docroot`
 
 ```yaml
@@ -28,14 +28,14 @@ drupal_core_path: "{{ drupal_composer_install_dir }}/docroot"
 
 ## Creating a project from a composer package: `composer create-project`
 
-There's a couple of things you need to configure in your `config.yml`:
+This is the default Drupal VM build configuration, set up by the following settings in `config.yml`:
 
-- Switch the build system by setting `build_makefile: false`, `build_composer: false` and `build_composer_project: true`.
-- Configure the composer package in `drupal_composer_project_package`.
-- Additionally you can adjust the create-project CLI options in `drupal_composer_project_options` as well as add additional dependencies in `drupal_composer_dependencies`.
-- Ensure that the webroot configured in the composer package matches the one set in `drupal_core_path`.
+  - Composer will build the project if `build_composer_project` is `true`, and `build_makefile` and `build_composer` are both `false`.
+  - The Composer package is defined by `drupal_composer_project_package`.
+  - Adjust the create-project CLI options in `drupal_composer_project_options` as well as add additional dependencies in `drupal_composer_dependencies`.
+  - Ensure that the webroot configured in the Composer package matches the one set in `drupal_core_path`.
 
-With [drupal-composer/drupal-project](https://github.com/drupal-composer/drupal-project) as an example your `config.yml` overrides would be:
+With [drupal-composer/drupal-project](https://github.com/drupal-composer/drupal-project) as an example your `config.yml` settings would be:
 
 ```yaml
 build_makefile: false
@@ -57,15 +57,8 @@ Opting for composer based installs will most likely increase your VM's time to p
 
 If you manage multiple VM's own your computer, you can use the [`vagrant-cachier` plugin](http://fgrehm.viewdocs.io/vagrant-cachier/) to share Composer's package cache across all VM's. The first build will be as slow as before but subsequent builds with the same `vagrant_box` (eg `geerlingguy/ubuntu1604`) will be much faster.
 
-1. Install the plugin on your host computer: `vagrant plugin install vagrant-cachier`
-2. Create a `Vagrantfile.local` next to your `config.yml` with the following:
+Install the plugin on your host computer: `vagrant plugin install vagrant-cachier`.
 
-```rb
-config.cache.scope = :box
-config.cache.auto_detect = false
-config.cache.enable :generic, { :cache_dir => "/home/vagrant/.composer/cache"  }
-```
-
-_Note: Out of the box, sharing the Composer cache is not supported as the plugin requires PHP to be installed when the VM first boots up. This is why the generic cache bucket is used instead._
+Drupal VM's `Vagrantfile` includes the appropriate `vagrant-cachier` configuration to cache Composer and apt dependencies.
 
 _You can also use this plugin to share other package manager caches. For more information read the [documentation](http://fgrehm.viewdocs.io/vagrant-cachier/usage/)._
diff --git a/docs/deployment/drush-make.md b/docs/deployment/drush-make.md
index 8ce4e93a1..8627661fe 100644
--- a/docs/deployment/drush-make.md
+++ b/docs/deployment/drush-make.md
@@ -1,5 +1,5 @@
-Drupal VM is configured by default to use a Drush make file to build a Drupal site on the VM inside `/var/www/drupalvm/drupal` (in a folder that's synced to your local machine, so you can work with the Drupal codebase either locally or inside the VM).
+Drupal VM is configured to use Composer by default to build a Drupal site on the VM inside `/var/www/drupalvm/drupal` (in a folder that's synced to your local machine, so you can work with the Drupal codebase either locally or inside the VM).
 
-You can use any make file you want, just copy it or symlink it into the root of the Drupal VM folder with the filename `drupal.make.yml`. You can also set a separate path to the makefile using the `drush_makefile_path` variable.
+If you want to build a Drupal site using a [Drush make file](http://www.drush.org/en/master/make/) instead, you can either use the `example.drupal.make.yml` file as a base, or use your own Drush make file: just place it or symlink it into the root of the Drupal VM folder with the filename `drupal.make.yml`. You can also set a separate path to the makefile using the `drush_makefile_path` variable.
 
 Have a look at the defaults in `default.config.yml` and tweak the settings as you'd like in your `config.yml`, then run `vagrant up` as in the Quick Start Guide. Within a few minutes, you should have your site running and available at the `drupal_domain` configured in `config.yml`, falling back to the default `http://drupalvm.dev` set in `default.config.yml`.
diff --git a/docs/deployment/local-codebase.md b/docs/deployment/local-codebase.md
index 837d53583..97ecf34b9 100644
--- a/docs/deployment/local-codebase.md
+++ b/docs/deployment/local-codebase.md
@@ -11,12 +11,14 @@ vagrant_synced_folders:
     type: nfs
 ```
 
-## Disable the Drush make build and site install
+## Disable the Composer project build and site install
 
-Set `build_makefile` and `install_site` to `false`:
+Set all the `build_` variables and `install_site` to `false`:
 
 ```yaml
-build_makefile:: false
+build_makefile: false
+build_composer: false
+build_composer_project: true
 ...
 install_site: false
 ```
diff --git a/docs/deployment/multisite.md b/docs/deployment/multisite.md
index 0a4471cf8..15b96f95f 100644
--- a/docs/deployment/multisite.md
+++ b/docs/deployment/multisite.md
@@ -1,4 +1,4 @@
-For multisite installations, make the changes outlined in the [Local Drupal codebase](local-codebase.md) guide, but, using the `apache_vhosts` variable, configure as many domains pointing to the same docroot as you need:
+For multisite installations, make the changes outlined in the [Local Drupal codebase](local-codebase.md) guide, but, using the `apache_vhosts` variable (or `nginx_hosts` if using Nginx), configure as many domains pointing to the same docroot as you need:
 
 ```yaml
 drupal_core_path: "/var/www/my-drupal-site"

From f959339a292600cae08e28bde81e486b3b7b4d57 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 6 Jun 2016 09:37:33 -0500
Subject: [PATCH 0321/1273] Issue #704: Update README.md and quick start guide.

---
 README.md | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 9a81d8c56..004ff0426 100644
--- a/README.md
+++ b/README.md
@@ -43,16 +43,25 @@ Full Drupal VM documentation is available at http://docs.drupalvm.com/
 There are a couple places where you can customize the VM for your needs:
 
   - `config.yml`: Override any of the default VM configuration from `default.config.yml`; customize almost any aspect of any software installed in the VM (more about [overriding configurations](http://docs.drupalvm.com/en/latest/other/overriding-configurations/).
-  - `drupal.make.yml`: Contains configuration for the Drupal core version, modules, and patches that will be downloaded on Drupal's initial installation (more about [Drush make files](https://www.drupal.org/node/1432374)).
+  - `drupal.composer.json` or `drupal.make.yml`: Contains configuration for the Drupal core version, modules, and patches that will be downloaded on Drupal's initial installation (you can build using Composer, Drush make, or your own codebase).
 
 If you want to switch from Drupal 8 (default) to Drupal 7 on the initial install, do the following:
 
+  1. Switch to using a [Drush Make file](http://docs.drupalvm.com/en/latest/deployment/drush-make/).
   1. Update the Drupal `version` and `core` inside the `drupal.make.yml` file.
   2. Update `drupal_major_version` inside `config.yml`.
 
 ## Quick Start Guide
 
-This Quick Start Guide will help you quickly build a Drupal 8 site on the Drupal VM using the included example Drush make file. You can also use the Drupal VM with a [Composer based installation](http://docs.drupalvm.com/en/latest/deployment/composer/), with a [Local Drupal codebase](http://docs.drupalvm.com/en/latest/deployment/local-codebase/) or even a [Drupal multisite installation](http://docs.drupalvm.com/en/latest/deployment/multisite/).
+This Quick Start Guide will help you quickly build a Drupal 8 site on the Drupal VM using Composer with `drupal-project`. You can also use Drupal VM with [Composer](http://docs.drupalvm.com/en/latest/deployment/composer/), a [Drush Make file](http://docs.drupalvm.com/en/latest/deployment/drush-make/), with a [Local Drupal codebase](http://docs.drupalvm.com/en/latest/deployment/local-codebase/), or even a [Drupal multisite installation](http://docs.drupalvm.com/en/latest/deployment/multisite/).
+
+If you want to install a Drupal 8 site locally with minimal fuss, just:
+
+  1. Install Vagrant.
+  2. Download or clone this project to your workstation.
+  3. `cd` into this project directory and run `vagrant up`.
+
+But Drupal VM allows you to build your site exactly how you like, using whatever tools you need, with almost infinite flexibility and customization!
 
 ### 1 - Install Vagrant
 
@@ -64,14 +73,12 @@ Notes:
 
   - **For faster provisioning** (Mac/Linux only): *[Install Ansible](http://docs.ansible.com/intro_installation.html) on your host machine, so Drupal VM can run the provisioning steps locally instead of inside the VM.*
   - **NFS on Linux**: *If NFS is not already installed on your host, you will need to install it to use the default NFS synced folder configuration. See guides for [Debian/Ubuntu](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-ubuntu-14-04), [Arch](https://wiki.archlinux.org/index.php/NFS#Installation), and [RHEL/CentOS](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-centos-6).*
-  - **Versions**: *Make sure you're running the latest releases of Vagrant, VirtualBox, and Ansible—as of February 2016, Drupal VM recommends: Vagrant 1.8.1, VirtualBox 5.0.14, and Ansible 2.0.0.*
+  - **Versions**: *Make sure you're running the latest releases of Vagrant, VirtualBox, and Ansible—as of February 2016, Drupal VM recommends: Vagrant 1.8.1, VirtualBox 5.0.20, and Ansible 2.1.0.*
 
 ### 2 - Build the Virtual Machine
 
   1. Download this project and put it wherever you want.
-  2. Make copies of both example configuration files, and modify to your liking:
-    - Copy `example.drupal.make.yml` to `drupal.make.yml`.
-    - Copy `default.config.yml` to `config.yml`.
+  2. (Optional) Copy `default.config.yml` to `config.yml` and modify it to your liking.
   3. Create a local directory where Drupal will be installed and configure the path to that directory in `config.yml` (`local_path`, inside `vagrant_synced_folders`).
   4. Open Terminal, `cd` to this directory (containing the `Vagrantfile` and this README file).
   5. Type in `vagrant up`, and let Vagrant do its magic.
@@ -145,4 +152,4 @@ This project is licensed under the MIT open source license.
 
 ## About the Author
 
-[Jeff Geerling](http://www.jeffgeerling.com/), owner of [Midwestern Mac, LLC](http://www.midwesternmac.com/), created this project in 2014 so he could accelerate his Drupal core and contrib development workflow. This project, and others like it, are also featured as examples in Jeff's book, [Ansible for DevOps](http://www.ansiblefordevops.com/).
+[Jeff Geerling](http://www.jeffgeerling.com/) created Drupal VM in 2014 for a more efficient Drupal site and core/contrib development workflow. This project is featured as an example in [Ansible for DevOps](http://www.ansiblefordevops.com/).

From 80d3ae5550544bbb6792d7d63bdfc06b1b085181 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 6 Jun 2016 09:40:02 -0500
Subject: [PATCH 0322/1273] Issue #704: Update README.md for a little more
 clarity.

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 004ff0426..2b7973815 100644
--- a/README.md
+++ b/README.md
@@ -88,8 +88,8 @@ Note: *If there are any errors during the course of running `vagrant up`, and it
 ### 3 - Configure your host machine to access the VM.
 
   1. [Edit your hosts file](http://www.rackspace.com/knowledge_center/article/how-do-i-modify-my-hosts-file), adding the line `192.168.88.88  drupalvm.dev` so you can connect to the VM.
-    - You can have Vagrant automatically configure your hosts file if you install the `hostsupdater` plugin (`vagrant plugin install vagrant-hostsupdater`). All hosts defined in `apache_vhosts` or `nginx_hosts` will be automatically managed. The `vagrant-hostmanager` plugin is also supported.
-    - You can also have Vagrant automatically assign an available IP address to your VM if you install the `auto_network` plugin (`vagrant plugin install vagrant-auto_network`), and set `vagrant_ip` to `0.0.0.0` inside `config.yml`.
+    - You can have Vagrant automatically configure your hosts file if you install the `hostsupdater` plugin (`vagrant plugin install vagrant-hostsupdater`). All hosts defined in `apache_vhosts` or `nginx_hosts` will be automatically managed. `vagrant-hostmanager` is also supported.
+    - The `auto_network` plugin (`vagrant plugin install vagrant-auto_network`) can help with IP address management if you set `vagrant_ip` to `0.0.0.0` inside `config.yml`.
   2. Open your browser and access [http://drupalvm.dev/](http://drupalvm.dev/). The default login for the admin account is `admin` for both the username and password.
 
 ## Extra software/utilities

From 6f28daee2125ebdf186b5368caf44aae7d924e0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Mon, 6 Jun 2016 10:47:56 -0400
Subject: [PATCH 0323/1273] Add packagist badge

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

diff --git a/README.md b/README.md
index 2b7973815..c48f8142b 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ![Drupal VM Logo](https://raw.githubusercontent.com/geerlingguy/drupal-vm/master/docs/images/drupal-vm-logo.png)
 
-[![Build Status](https://travis-ci.org/geerlingguy/drupal-vm.svg?branch=master)](https://travis-ci.org/geerlingguy/drupal-vm) [![Documentation Status](https://readthedocs.org/projects/drupal-vm/badge/?version=latest)](http://docs.drupalvm.com)
+[![Build Status](https://travis-ci.org/geerlingguy/drupal-vm.svg?branch=master)](https://travis-ci.org/geerlingguy/drupal-vm) [![Documentation Status](https://readthedocs.org/projects/drupal-vm/badge/?version=latest)](http://docs.drupalvm.com) [![Packagist](https://img.shields.io/packagist/v/geerlingguy/drupal-vm.svg)](https://packagist.org/packages/geerlingguy/drupal-vm)
 
 [Drupal VM](http://www.drupalvm.com/) is A VM for local Drupal development, built with Vagrant + Ansible.
 

From 23f28df3700ba2909cd9e4ba01e90f162f93d282 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Mon, 6 Jun 2016 11:33:54 -0400
Subject: [PATCH 0324/1273] Issue #704: Expand some topics with more
 information

---
 README.md                     |  2 ++
 docs/deployment/drush-make.md | 17 +++++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 2b7973815..54d8c5a02 100644
--- a/README.md
+++ b/README.md
@@ -83,6 +83,8 @@ Notes:
   4. Open Terminal, `cd` to this directory (containing the `Vagrantfile` and this README file).
   5. Type in `vagrant up`, and let Vagrant do its magic.
 
+Once the process is complete, you will have a Drupal codebase available inside the `drupal/` directory of the project.
+
 Note: *If there are any errors during the course of running `vagrant up`, and it drops you back to your command prompt, just run `vagrant provision` to continue building the VM from where you left off. If there are still errors after doing this a few times, post an issue to this project's issue queue on GitHub with the error.*
 
 ### 3 - Configure your host machine to access the VM.
diff --git a/docs/deployment/drush-make.md b/docs/deployment/drush-make.md
index 8627661fe..78f0d0289 100644
--- a/docs/deployment/drush-make.md
+++ b/docs/deployment/drush-make.md
@@ -1,5 +1,18 @@
-Drupal VM is configured to use Composer by default to build a Drupal site on the VM inside `/var/www/drupalvm/drupal` (in a folder that's synced to your local machine, so you can work with the Drupal codebase either locally or inside the VM).
+Drupal VM is configured to use Composer by default to build a Drupal site on the VM inside `/var/www/drupalvm/drupal/web` (in a folder that's synced to your local machine, so you can work with the Drupal codebase either locally or inside the VM).
 
-If you want to build a Drupal site using a [Drush make file](http://www.drush.org/en/master/make/) instead, you can either use the `example.drupal.make.yml` file as a base, or use your own Drush make file: just place it or symlink it into the root of the Drupal VM folder with the filename `drupal.make.yml`. You can also set a separate path to the makefile using the `drush_makefile_path` variable.
+If you want to build a Drupal site using a [Drush make file](http://www.drush.org/en/master/make/) instead, set `build_composer_project: false`, `build_makefile: true` and either use the `example.drupal.make.yml` file as a base, or use your own Drush make file: just place it or symlink it into the root of the Drupal VM folder with the filename `drupal.make.yml`. You can also set a separate path to the makefile using the `drush_makefile_path` variable.
+
+```yaml
+build_composer_project: false
+build_makefile: true
+```
 
 Have a look at the defaults in `default.config.yml` and tweak the settings as you'd like in your `config.yml`, then run `vagrant up` as in the Quick Start Guide. Within a few minutes, you should have your site running and available at the `drupal_domain` configured in `config.yml`, falling back to the default `http://drupalvm.dev` set in `default.config.yml`.
+
+With the default settings the Drupal site will be built on the VM inside `/var/www/drupalvm/drupal/web` but the `web/` subdirectory is only required for `composer` based projects and you can simplify this directory structure by setting `drupal_core_path` to `/var/www/drupalvm/drupal`.
+
+```yaml
+build_composer_project: false
+build_makefile: true
+drush_core_path: "/var/www/drupalvm/drupal"
+```

From e1779d97b9d133a4618d89a042606e94a1386c88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Mon, 6 Jun 2016 11:34:44 -0400
Subject: [PATCH 0325/1273] Issue #704: Fix some issues with Composer docs and
 add acquia/lightning-project as example

---
 docs/deployment/composer.md       | 28 ++++++++++------------------
 docs/deployment/local-codebase.md |  2 +-
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/docs/deployment/composer.md b/docs/deployment/composer.md
index e643f57cf..3a53d1d43 100644
--- a/docs/deployment/composer.md
+++ b/docs/deployment/composer.md
@@ -3,23 +3,23 @@ Drupal VM is configured to use `composer create-project` to build a Drupal 8 cod
 ## Using composer.json
 
 1. Copy `example.drupal.composer.json` to `drupal.composer.json` and modify it to your liking.
-2. Use the Composer build system by setting `build_composer: true` in your `config.yml` (make sure `build_makefile` is set to `false`).
+2. Use the Composer build system by setting `build_composer: true` in your `config.yml` (make sure `build_makefile` and `build_composer_project` are set to `false`).
 3. Configure `drupal_core_path` to point to the webroot directory: `drupal_core_path: {{ drupal_composer_install_dir }}/docroot`
 
 ```yaml
-build_makefile: false
+build_composer_project: false
 build_composer: true
 drupal_core_path: "{{ drupal_composer_install_dir }}/docroot"
 ```
 
-_The file set in `drupal_composer_path` (which defaults to `drupal.composer.json`) will be copied from your host computer into the VM's `drupal_composer_install_dir` and renamed `composer.json`. If you already have a composer.json within that directory, you can set `drupal_composer_path: false`._
+_The file set in `drupal_composer_path` (which defaults to `drupal.composer.json`) will be copied from your host computer into the VM's `drupal_composer_install_dir` and renamed `composer.json`. If you already have a composer.json within that directory, set `drupal_composer_path: false`._
 
 ## Using Composer when [Drupal VM is a composer dependency itself](../other/drupalvm-composer-dependency.md)
 
-In the scenario where you already have an existing `composer.json` in the root of your project, follow the usual steps for installing with a composer.json but instead of creating a `drupal.composer.json` file, disable the transfering of the file by setting `drupal_composer_path` to `false`, and change `drupal_composer_install_dir` to point to the the directory where it will be located. If `drupal_composer_path` is not truthy, Drupal VM assumes it already exists.
+In the scenario where you already have an existing `composer.json` in the root of your project, follow the usual steps for installing with a composer.json but instead of creating a `drupal.composer.json` file, disable the transfering of the file by setting `drupal_composer_path: false`, and change `drupal_composer_install_dir` to point to the the directory where it will be located. If `drupal_composer_path` is not truthy, Drupal VM assumes it already exists.
 
 ```yaml
-build_makefile: false
+build_composer_project: false
 build_composer: true
 drupal_composer_path: false
 drupal_composer_install_dir: "/var/www/drupalvm"
@@ -33,22 +33,14 @@ This is the default Drupal VM build configuration, set up by the following setti
   - Composer will build the project if `build_composer_project` is `true`, and `build_makefile` and `build_composer` are both `false`.
   - The Composer package is defined by `drupal_composer_project_package`.
   - Adjust the create-project CLI options in `drupal_composer_project_options` as well as add additional dependencies in `drupal_composer_dependencies`.
-  - Ensure that the webroot configured in the Composer package matches the one set in `drupal_core_path`.
+  - Ensure that the webroot configured in the Composer package matches the one set in `drupal_core_path`. The default is set to `web/`.
 
-With [drupal-composer/drupal-project](https://github.com/drupal-composer/drupal-project) as an example your `config.yml` settings would be:
+With [acquia/lightning-project](https://github.com/acquia/lightning-project) as an example your `config.yml` settings would be:
 
 ```yaml
-build_makefile: false
-build_composer: false
-build_composer_project: true
-
-drupal_composer_project_package: "drupal-composer/drupal-project:8.x-dev"
-# Added `--no-dev` to avoid installing development dependencies.
-drupal_composer_project_options: "--prefer-dist --stability dev --no-interaction --no-dev"
-drupal_composer_dependencies:
-  - "drupal/devel:8.*"
-
-drupal_core_path: "{{ drupal_composer_install_dir }}/web"
+drupal_composer_project_package: "acquia/lightning-project:^8.1.0"
+drupal_composer_project_options: "--prefer-dist --stability rc --no-interaction"
+drupal_core_path: "{{ drupal_composer_install_dir }}/docroot"
 ```
 
 ## Improving composer build performance
diff --git a/docs/deployment/local-codebase.md b/docs/deployment/local-codebase.md
index 97ecf34b9..63fac15a3 100644
--- a/docs/deployment/local-codebase.md
+++ b/docs/deployment/local-codebase.md
@@ -18,7 +18,7 @@ Set all the `build_` variables and `install_site` to `false`:
 ```yaml
 build_makefile: false
 build_composer: false
-build_composer_project: true
+build_composer_project: false
 ...
 install_site: false
 ```

From 913be94c1b5f1e1ad643efd454561ae7768fbb32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Mon, 6 Jun 2016 11:35:44 -0400
Subject: [PATCH 0326/1273] Issue #704: Take root composer.json into account in
 docs on Drupal VM as a dependency

---
 docs/other/drupalvm-composer-dependency.md | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/docs/other/drupalvm-composer-dependency.md b/docs/other/drupalvm-composer-dependency.md
index e6d58c64f..5d143470e 100644
--- a/docs/other/drupalvm-composer-dependency.md
+++ b/docs/other/drupalvm-composer-dependency.md
@@ -15,9 +15,9 @@ Add and configure the `config.yml` anywhere you like, in this example we place i
 _Note: This will be the directory where Drupal VM looks for other local configuration files as well. Such as [`local.config.yml` and `Vagrantfile.local`](overriding-configurations.md)._
 
 ```
+├── composer.json
 ├── config/
 │   ├── config.yml
-│   ├── drupal.make.yml
 │   ├── local.config.yml
 │   └── Vagrantfile.local
 ├── docroot/
@@ -29,6 +29,16 @@ _Note: This will be the directory where Drupal VM looks for other local configur
         └── drupal-vm/
 ```
 
+Change the build strategy to use your `composer.json` file by setting:
+
+```yaml
+build_composer_project: false
+build_composer: true
+drupal_composer_path: false
+drupal_composer_install_dir: "/var/www/drupalvm"
+drupal_core_path: "{{ drupal_composer_install_dir }}/docroot"
+```
+
 If you're using `pre_provision_scripts` or `post_provision_scripts` you also need to adjust their paths to take into account the new directory structure. The examples used in `default.config.yml` assume the files are located in the Drupal VM directory. If you use relative paths you need to the ascend the directory tree as far as the project root, but using the `config_dir` variable you get the absolute path of where you `config.yml` is located.
 
 ```yaml
@@ -66,7 +76,6 @@ Your project structure should now look like this:
 ├── composer.json
 ├── config/
 │   ├── config.yml
-│   ├── drupal.make.yml
 │   ├── local.config.yml
 │   └── Vagrantfile.local
 ├── docroot/
@@ -117,7 +126,6 @@ Your directory structure should now look like this:
 ```
 ├── Vagrantfile
 ├── config/
-│   ├── drupal.make.yml
 │   ├── config.yml
 │   ├── local.config.yml
 │   └── Vagrantfile.local

From 7049d4ee761e07f7210a25228248c662c6907b46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Mon, 6 Jun 2016 14:11:49 -0400
Subject: [PATCH 0327/1273] Use packages.drupal.org composer repository in
 example

---
 example.drupal.composer.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/example.drupal.composer.json b/example.drupal.composer.json
index 528047ef7..451d63dd9 100644
--- a/example.drupal.composer.json
+++ b/example.drupal.composer.json
@@ -12,7 +12,7 @@
     "repositories": [
         {
             "type": "composer",
-            "url": "https://packagist.drupal-composer.org"
+            "url": "https://packages.drupal.org/8"
         }
     ],
     "require": {
@@ -21,6 +21,9 @@
         "drupal/core": "~8.0",
         "drupal/devel": "8.*"
     },
+    "replace": {
+        "drupal/drupal": "*"
+    },
     "minimum-stability": "dev",
     "prefer-stable": true,
     "extra": {

From 37536adf5865caec7b21b2a36a77f45937a38698 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 6 Jun 2016 17:00:06 -0500
Subject: [PATCH 0328/1273] Update Node.js role dependency to 3.1.0.

---
 provisioning/requirements.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index c4b47fe03..3d5543a5c 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -34,7 +34,7 @@
 - src: geerlingguy.nginx
   version: 1.9.2
 - src: geerlingguy.nodejs
-  version: 3.0.0
+  version: 3.1.0
 - src: geerlingguy.php
   version: 3.1.0
 - src: geerlingguy.php-memcached

From f4c4390e1e4e21dbf75b4e5b011f30426e37f972 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Mon, 6 Jun 2016 18:27:03 -0400
Subject: [PATCH 0329/1273] Issue #709: Add strict vagrant version requirement
 for easier debugging

---
 Vagrantfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Vagrantfile b/Vagrantfile
index 432ab2bc1..5e643b8ca 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,6 +1,7 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 VAGRANTFILE_API_VERSION = '2'
+Vagrant.require_version '>= 1.8.1'
 
 # Absolute paths on the host machine.
 host_drupalvm_dir = File.dirname(File.expand_path(__FILE__))

From b71252a87c2ef47dfca8ed8848d575673463fe15 Mon Sep 17 00:00:00 2001
From: Thom Toogood <thomtoogood@gmail.com>
Date: Thu, 9 Jun 2016 22:34:49 +1000
Subject: [PATCH 0330/1273] Set node global install directory to a location
 writable by the vagrant user.

---
 default.config.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/default.config.yml b/default.config.yml
index 759c2f573..45a3b8369 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -244,6 +244,9 @@ composer_home_group: "{{ drupalvm_user }}"
 composer_global_packages:
   - { name: hirak/prestissimo, release: '^0.3' }
 
+# NodeJS Configuration.
+npm_config_prefix: "~/.npm-global"
+
 # Run specified scripts before or after VM is provisioned. Path is relative to
 # the `provisioning/playbook.yml` file.
 pre_provision_scripts: []

From 1a346c5e208f9b0effe474e53e3400a21a98f986 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 9 Jun 2016 14:35:03 -0500
Subject: [PATCH 0331/1273] Update to latest PHP role version.

---
 provisioning/requirements.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 3d5543a5c..aefd3e827 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -36,7 +36,7 @@
 - src: geerlingguy.nodejs
   version: 3.1.0
 - src: geerlingguy.php
-  version: 3.1.0
+  version: 3.2.0
 - src: geerlingguy.php-memcached
   version: 2.0.0
 - src: geerlingguy.php-mysql

From eb45fc85392ceedced6ab77f58e7e7c85fd590b9 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 9 Jun 2016 15:57:36 -0500
Subject: [PATCH 0332/1273] PR #715 follow-up: Reorder vars in
 default.config.yml.

---
 default.config.yml | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/default.config.yml b/default.config.yml
index 45a3b8369..0a5c65ad7 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -188,16 +188,6 @@ installed_extras:
 extra_packages:
   - sqlite
 
-# `nodejs` must be in installed_extras for this to work. Valid examples: "0.10",
-# "0.12", "4.x", "5.x".
-nodejs_version: "0.12"
-nodejs_npm_global_packages: []
-nodejs_install_npm_user: "{{ drupalvm_user }}"
-
-# `ruby` must be in installed_extras for this to work.
-ruby_install_gems_user: "{{ drupalvm_user }}"
-ruby_install_gems: []
-
 # You can configure almost anything else on the server in the rest of this file.
 extra_security_enabled: false
 
@@ -244,9 +234,6 @@ composer_home_group: "{{ drupalvm_user }}"
 composer_global_packages:
   - { name: hirak/prestissimo, release: '^0.3' }
 
-# NodeJS Configuration.
-npm_config_prefix: "~/.npm-global"
-
 # Run specified scripts before or after VM is provisioned. Path is relative to
 # the `provisioning/playbook.yml` file.
 pre_provision_scripts: []
@@ -260,7 +247,18 @@ mysql_slow_query_time: 2
 mysql_wait_timeout: 300
 adminer_install_filename: index.php
 
-# Varnish Configuration.
+# Node.js configuration (if enabled above).
+# Valid examples: "0.10", "0.12", "4.x", "5.x".
+nodejs_version: "0.12"
+nodejs_npm_global_packages: []
+nodejs_install_npm_user: "{{ drupalvm_user }}"
+npm_config_prefix: "~/.npm-global"
+
+# Ruby Configuration (if enabled above).
+ruby_install_gems_user: "{{ drupalvm_user }}"
+ruby_install_gems: []
+
+# Varnish Configuration (if enabled above).
 varnish_listen_port: "81"
 varnish_default_vcl_template_path: templates/drupalvm.vcl.j2
 varnish_default_backend_host: "127.0.0.1"

From 7e6781552777bc0a33138579fbc426ce143b4813 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 9 Jun 2016 16:04:42 -0500
Subject: [PATCH 0333/1273] Bump Node.js role version to latest.

---
 provisioning/requirements.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index aefd3e827..e1e2c048a 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -34,7 +34,7 @@
 - src: geerlingguy.nginx
   version: 1.9.2
 - src: geerlingguy.nodejs
-  version: 3.1.0
+  version: 3.2.0
 - src: geerlingguy.php
   version: 3.2.0
 - src: geerlingguy.php-memcached

From b0f3cef98d8cf361ef03291600c906bdbb8f7767 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Fri, 10 Jun 2016 14:14:09 -0400
Subject: [PATCH 0334/1273] Add www.drupalvm.dev as a default webserver alias

---
 default.config.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/default.config.yml b/default.config.yml
index 0a5c65ad7..175241265 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -92,6 +92,7 @@ configure_drush_aliases: true
 # View the geerlingguy.apache Ansible Role README for more options.
 apache_vhosts:
   - servername: "{{ drupal_domain }}"
+    serveralias: "www.{{ drupal_domain }}"
     documentroot: "{{ drupal_core_path }}"
     extra_parameters: |
           ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ drupal_core_path }}"
@@ -130,7 +131,7 @@ apache_mods_enabled:
 # here. Set the 'is_php' property for document roots that contain PHP apps like
 # Drupal.
 nginx_hosts:
-  - server_name: "{{ drupal_domain }}"
+  - server_name: "{{ drupal_domain }} www.{{ drupal_domain }}"
     root: "{{ drupal_core_path }}"
     is_php: true
 

From 460e40c401cf177dc5f69adc71a29c3a8b4bef01 Mon Sep 17 00:00:00 2001
From: Dan Bohea <git@bohea.co.uk>
Date: Fri, 10 Jun 2016 22:00:58 +0100
Subject: [PATCH 0335/1273] Clearer comments: required vars in default.config
 sounded optional

- See #723
---
 default.config.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/default.config.yml b/default.config.yml
index 0a5c65ad7..1d7e8c036 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -58,18 +58,20 @@ drupal_composer_project_options: "--prefer-dist --stability dev --no-interaction
 # settings below), but instead copy down a database (e.g. using drush sql-sync).
 install_site: true
 
-# Settings for installing a Drupal site (if 'install_site:' is 'true').
-drupal_major_version: 8
+# Required Drupal settings.
 drupal_core_path: "{{ drupal_composer_install_dir }}/web"
+drupal_mysql_user: drupal
+drupal_mysql_password: drupal
+drupal_mysql_database: drupal
+
+# Settings for installing a Drupal site if 'install_site:' is 'true'.
+drupal_major_version: 8
 drupal_domain: "{{ vagrant_hostname }}"
 drupal_site_name: "Drupal"
 drupal_install_profile: standard
 drupal_enable_modules: [ 'devel' ]
 drupal_account_name: admin
 drupal_account_pass: admin
-drupal_mysql_user: drupal
-drupal_mysql_password: drupal
-drupal_mysql_database: drupal
 
 # Additional arguments or options to pass to `drush site-install`.
 drupal_site_install_extra_args: []

From d3cb7f68e6c9b6532416b8e5cbd84d22cf5150fa Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 10 Jun 2016 21:11:35 -0500
Subject: [PATCH 0336/1273] Bump PHP role version to latest bugfix release.

---
 provisioning/requirements.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index e1e2c048a..a47bafe95 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -36,7 +36,7 @@
 - src: geerlingguy.nodejs
   version: 3.2.0
 - src: geerlingguy.php
-  version: 3.2.0
+  version: 3.2.1
 - src: geerlingguy.php-memcached
   version: 2.0.0
 - src: geerlingguy.php-mysql

From ab5d8356345aaf8f24da9221dcf6668d0abf6003 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 12 Jun 2016 16:48:21 -0500
Subject: [PATCH 0337/1273] Bump MySQL role version to latest.

---
 provisioning/requirements.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index a47bafe95..d55076737 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -30,7 +30,7 @@
 - src: geerlingguy.memcached
   version: 1.0.4
 - src: geerlingguy.mysql
-  version: 2.2.1
+  version: 2.2.2
 - src: geerlingguy.nginx
   version: 1.9.2
 - src: geerlingguy.nodejs

From 9cfe62ca1863aefc9f8f4ba21bbb197813b2acb0 Mon Sep 17 00:00:00 2001
From: Thom Toogood <thomtoogood@gmail.com>
Date: Wed, 1 Jun 2016 07:44:43 +1000
Subject: [PATCH 0338/1273] Add ssh_home var as default pwd for SSH.

---
 default.config.yml          |  1 +
 provisioning/tasks/sshd.yml | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/default.config.yml b/default.config.yml
index 3681e7b38..05269d7a1 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -292,3 +292,4 @@ selenium_version: 2.46.0
 # Other configuration.
 dashboard_install_dir: /var/www/dashboard
 known_hosts_path: ~/.ssh/known_hosts
+#ssh_home: "{{ drupal_core_path }}"
diff --git a/provisioning/tasks/sshd.yml b/provisioning/tasks/sshd.yml
index be492d667..2006c2f59 100644
--- a/provisioning/tasks/sshd.yml
+++ b/provisioning/tasks/sshd.yml
@@ -19,3 +19,13 @@
     mode: 0644
   become: no
   when: known_hosts_file.stat.exists
+
+- name: Set SSH home directory.
+  lineinfile:
+    dest: "/home/{{ drupalvm_user }}/.bashrc"
+    state: present
+    create: yes
+    regexp: "^SSH_HOME="
+    line: "SSH_HOME={{ ssh_home }} && [ -e $SSH_HOME ] && cd $SSH_HOME"
+  become: no
+  when: ssh_home is defined

From 4ffd60d8b06af6cefd6acee4f4f893385eb6a374 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 12 Jun 2016 22:19:34 -0500
Subject: [PATCH 0339/1273] Fixes #726: Ensure correct permissions when using
 Composer create-project.

---
 provisioning/tasks/build-composer-project.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/provisioning/tasks/build-composer-project.yml b/provisioning/tasks/build-composer-project.yml
index 9964be1ff..17cda31f6 100644
--- a/provisioning/tasks/build-composer-project.yml
+++ b/provisioning/tasks/build-composer-project.yml
@@ -1,4 +1,13 @@
 ---
+- name: Ensure drupal_composer_install_dir directory has proper permissions.
+  file:
+    path: "{{ drupal_composer_install_dir }}"
+    state: directory
+    owner: "{{ drupalvm_user }}"
+    group: "{{ drupalvm_user }}"
+    mode: 0775
+  when: not drupal_site_exists
+
 - name: Generate Drupal project with composer package.
   command: >
     {{ composer_path }} create-project

From 6cc1f733507462b9497203016c27b91f8d6cf764 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 12 Jun 2016 22:50:19 -0500
Subject: [PATCH 0340/1273] Fixes #650: Bump MySQL role version to fix root
 user account password.

---
 provisioning/requirements.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index d55076737..49d632580 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -30,7 +30,7 @@
 - src: geerlingguy.memcached
   version: 1.0.4
 - src: geerlingguy.mysql
-  version: 2.2.2
+  version: 2.2.3
 - src: geerlingguy.nginx
   version: 1.9.2
 - src: geerlingguy.nodejs

From 01431ac449e55f82bb4b22768c9d780efd304491 Mon Sep 17 00:00:00 2001
From: Joe Bartlett <joe.bartlett@vml.com>
Date: Mon, 13 Jun 2016 10:58:10 -0500
Subject: [PATCH 0341/1273] Renewed from PR#721 - fixes zero (0.0.0.0) IP issue
 in dashboard template

---
 provisioning/templates/dashboard.html.j2 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/provisioning/templates/dashboard.html.j2 b/provisioning/templates/dashboard.html.j2
index db8e0894a..99eaf6e17 100644
--- a/provisioning/templates/dashboard.html.j2
+++ b/provisioning/templates/dashboard.html.j2
@@ -19,6 +19,10 @@
     </style>
   </head>
   <body>
+    {# Sets vagrant IP if equals 0.0.0.0 #}
+    {%- if vagrant_ip == '0.0.0.0' -%}
+      {%- set vagrant_ip = ansible_all_ipv4_addresses[1] -%}
+    {%- endif -%}
     {# Returns the hosts server name based on the document root #}
     {%- macro getServernameFromDocroot(path) -%}
       {%- if drupalvm_webserver == 'apache' -%}

From d95227588767c11863aeb7c7a1a1d4599011c2d7 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 13 Jun 2016 17:18:29 -0500
Subject: [PATCH 0342/1273] Issue #733: Update example composer.json to work
 with drupal.org packagist devel version.

---
 example.drupal.composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/example.drupal.composer.json b/example.drupal.composer.json
index 451d63dd9..4bea7ebaa 100644
--- a/example.drupal.composer.json
+++ b/example.drupal.composer.json
@@ -19,7 +19,7 @@
         "composer/installers": "^1.0.20",
         "drupal-composer/drupal-scaffold": "^2.0.1",
         "drupal/core": "~8.0",
-        "drupal/devel": "8.*"
+        "drupal/devel": "1.0.x-dev"
     },
     "replace": {
         "drupal/drupal": "*"

From b0f22726fdad529a62d00ceafa26c67e6eae019c Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 13 Jun 2016 17:22:20 -0500
Subject: [PATCH 0343/1273] Issue #733: Fix variable name in makefile docs.

---
 docs/deployment/drush-make.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/deployment/drush-make.md b/docs/deployment/drush-make.md
index 78f0d0289..7a167c17f 100644
--- a/docs/deployment/drush-make.md
+++ b/docs/deployment/drush-make.md
@@ -14,5 +14,5 @@ With the default settings the Drupal site will be built on the VM inside `/var/w
 ```yaml
 build_composer_project: false
 build_makefile: true
-drush_core_path: "/var/www/drupalvm/drupal"
+drupal_core_path: "/var/www/drupalvm/drupal"
 ```

From c6b64593f2b3f7efa6070f1039c28ac15da6a6f3 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 14 Jun 2016 13:04:32 -0500
Subject: [PATCH 0344/1273] Revert #726 Fix 2, Fixes #727.

---
 provisioning/tasks/build-composer-project.yml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/provisioning/tasks/build-composer-project.yml b/provisioning/tasks/build-composer-project.yml
index 17cda31f6..9964be1ff 100644
--- a/provisioning/tasks/build-composer-project.yml
+++ b/provisioning/tasks/build-composer-project.yml
@@ -1,13 +1,4 @@
 ---
-- name: Ensure drupal_composer_install_dir directory has proper permissions.
-  file:
-    path: "{{ drupal_composer_install_dir }}"
-    state: directory
-    owner: "{{ drupalvm_user }}"
-    group: "{{ drupalvm_user }}"
-    mode: 0775
-  when: not drupal_site_exists
-
 - name: Generate Drupal project with composer package.
   command: >
     {{ composer_path }} create-project

From d450252919b6c4c1847def347cfb7a979244bfb8 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 14 Jun 2016 13:36:19 -0500
Subject: [PATCH 0345/1273] Fixes #736: Windows and vagrant-cachier NFS
 hardcoding conflict.

---
 Vagrantfile | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 5e643b8ca..04ee296b6 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -183,11 +183,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     config.cache.enable :apt
     # Cache the composer directory.
     config.cache.enable :generic, cache_dir: '/home/vagrant/.composer/cache'
-    # Cache via NFS shares.
-    config.cache.synced_folder_opts = {
-      type: :nfs,
-      mount_options: ['rw', 'vers=3', 'tcp', 'nolock']
-    }
   end
 
   # Allow an untracked Vagrantfile to modify the configurations

From f16f8b548725c8890c612efafbc8d0194ad3334d Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 14 Jun 2016 16:35:45 -0500
Subject: [PATCH 0346/1273] Bump Ansible composer role requirement.

---
 provisioning/requirements.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 49d632580..88f7c2358 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -12,7 +12,7 @@
 - src: geerlingguy.blackfire
   version: 1.0.0
 - src: geerlingguy.composer
-  version: 1.4.0
+  version: 1.4.1
 - src: geerlingguy.daemonize
   version: 1.1.0
 - src: geerlingguy.drupal-console

From fdd347e6b27e3f754d131722959a5eca85317a46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 15 Jun 2016 08:01:33 -0400
Subject: [PATCH 0347/1273] Issue #734: Fix Vagrant 1.8.4 failing to mount NFS
 synced folders with empty mount_options

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

diff --git a/Vagrantfile b/Vagrantfile
index 5e643b8ca..56690baf3 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -107,7 +107,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       rsync__args: ['--verbose', '--archive', '--delete', '-z', '--chmod=ugo=rwX'],
       id: synced_folder['id'],
       create: synced_folder.include?('create') ? synced_folder['create'] : false,
-      mount_options: synced_folder.include?('mount_options') ? synced_folder['mount_options'] : []
+      mount_options: synced_folder.include?('mount_options') ? synced_folder['mount_options'] : nil
     }
     if synced_folder.include?('options_override')
       options = options.merge(synced_folder['options_override'])

From 1bff8189a6d66f40497c8afa2a6bfa04fa540d78 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 16 Jun 2016 14:52:28 -0500
Subject: [PATCH 0348/1273] Issue #733: Copy and move composer.json file so
 Windows composer install works.

---
 provisioning/tasks/build-composer.yml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/provisioning/tasks/build-composer.yml b/provisioning/tasks/build-composer.yml
index 7602a3a7c..b99b7a679 100644
--- a/provisioning/tasks/build-composer.yml
+++ b/provisioning/tasks/build-composer.yml
@@ -7,10 +7,17 @@
   become: no
   when: drupal_composer_path and not drupal_site_exists
 
-- name: Copy composer.json into place.
+# Use copy-and-move to prevent issues in Windows with VirtualBox. See:
+# https://github.com/ansible/ansible/issues/9526#issuecomment-62336962
+- name: Copy composer.json into temporary location.
   copy:
     src: "{{ drupal_composer_path }}"
-    dest: "{{ drupal_composer_install_dir }}/composer.json"
+    dest: "/tmp/drupalvm-composer.json"
+  when: drupal_composer_path and not drupal_site_exists
+  become: no
+
+- name: Move composer.json into place.
+  command: "mv /tmp/drupalvm-composer.json {{ drupal_composer_install_dir }}/composer.json"
   when: drupal_composer_path and not drupal_site_exists
   become: no
 

From 407b94c7c9a09c3ea740e456abb0fa4f0e82ec18 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 16 Jun 2016 16:12:12 -0500
Subject: [PATCH 0349/1273] Issue #733: Fix Drupal composer project build to
 work on slow Windows mounts.

---
 example.drupal.composer.json                  | 3 +++
 provisioning/tasks/build-composer-project.yml | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/example.drupal.composer.json b/example.drupal.composer.json
index 4bea7ebaa..02eb9386d 100644
--- a/example.drupal.composer.json
+++ b/example.drupal.composer.json
@@ -34,5 +34,8 @@
             "docroot/themes/contrib/{$name}": ["type:drupal-theme"],
             "drush/contrib/{$name}": ["type:drupal-drush"]
         }
+    },
+    "config": {
+        "process-timeout": 1200
     }
 }
diff --git a/provisioning/tasks/build-composer-project.yml b/provisioning/tasks/build-composer-project.yml
index 9964be1ff..9372c81f9 100644
--- a/provisioning/tasks/build-composer-project.yml
+++ b/provisioning/tasks/build-composer-project.yml
@@ -6,6 +6,8 @@
     {{ drupal_composer_project_options|default('--prefer-dist --no-interaction') }}
   when: not drupal_site_exists
   become: no
+  environment:
+      COMPOSER_PROCESS_TIMEOUT: 1200
 
 - name: Install dependencies with composer require.
   command: >

From c5ba5f8a2067b54e3e650545281a8eb097ea0efd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Fri, 17 Jun 2016 15:21:52 -0400
Subject: [PATCH 0350/1273] Issue #744: Fix npm_config_prefix directory created
 under root instead of vagrant

---
 default.config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.config.yml b/default.config.yml
index 05269d7a1..58c3eac14 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -255,7 +255,7 @@ adminer_install_filename: index.php
 nodejs_version: "0.12"
 nodejs_npm_global_packages: []
 nodejs_install_npm_user: "{{ drupalvm_user }}"
-npm_config_prefix: "~/.npm-global"
+npm_config_prefix: "/home/{{ drupalvm_user }}/.npm-global"
 
 # Ruby Configuration (if enabled above).
 ruby_install_gems_user: "{{ drupalvm_user }}"

From 1701f14cf1d28e1e976352c4f6cdaf05eccf6a35 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 22 Jun 2016 00:00:04 -0500
Subject: [PATCH 0351/1273] The macOS-ification of the brand.

---
 README.md                                  | 2 +-
 docs/extras/mysql.md                       | 2 +-
 docs/other/windows.md                      | 2 +-
 provisioning/JJG-Ansible-Windows/README.md | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 90eaa4e84..dbbcf0977 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,7 @@ Vagrant will automatically install [VirtualBox](https://www.virtualbox.org/wiki/
 
 Notes:
 
-  - **For faster provisioning** (Mac/Linux only): *[Install Ansible](http://docs.ansible.com/intro_installation.html) on your host machine, so Drupal VM can run the provisioning steps locally instead of inside the VM.*
+  - **For faster provisioning** (macOS/Linux only): *[Install Ansible](http://docs.ansible.com/intro_installation.html) on your host machine, so Drupal VM can run the provisioning steps locally instead of inside the VM.*
   - **NFS on Linux**: *If NFS is not already installed on your host, you will need to install it to use the default NFS synced folder configuration. See guides for [Debian/Ubuntu](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-ubuntu-14-04), [Arch](https://wiki.archlinux.org/index.php/NFS#Installation), and [RHEL/CentOS](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-centos-6).*
   - **Versions**: *Make sure you're running the latest releases of Vagrant, VirtualBox, and Ansible—as of February 2016, Drupal VM recommends: Vagrant 1.8.1, VirtualBox 5.0.20, and Ansible 2.1.0.*
 
diff --git a/docs/extras/mysql.md b/docs/extras/mysql.md
index 4a18ed96b..c461cf5f0 100644
--- a/docs/extras/mysql.md
+++ b/docs/extras/mysql.md
@@ -1,4 +1,4 @@
-By default, this VM is set up so you can manage MySQL databases on your own. The default root MySQL user credentials are `root` for username and password, but you can change the password via `config.yml` (changing the `mysql_root_password` variable). I use [Sequel Pro](http://www.sequelpro.com/) (Mac-only) to connect to and manage databases, and Drush to sync databases (sometimes I'll just do a dump and import, but Drush is usually quicker, and is easier to do over and over again when you need it).
+By default, this VM is set up so you can manage MySQL databases on your own. The default root MySQL user credentials are `root` for username and password, but you can change the password via `config.yml` (changing the `mysql_root_password` variable). I use [Sequel Pro](http://www.sequelpro.com/) (macOS-only) to connect to and manage databases, and Drush to sync databases (sometimes I'll just do a dump and import, but Drush is usually quicker, and is easier to do over and over again when you need it).
 
 ## Connect using Adminer
 
diff --git a/docs/other/windows.md b/docs/other/windows.md
index 25d1cb851..b3866d2ca 100644
--- a/docs/other/windows.md
+++ b/docs/other/windows.md
@@ -72,7 +72,7 @@ If you are running Windows 7 and `vagrant up` hangs, you may need to upgrade Pow
 
 ## Hosts file updates
 
-If you install either the `vagrant-hostsupdater` or `vagrant-hostmanager` plugin, you might get a permissions error when Vagrant tries changing the hosts file. On a Mac or Linux workstation, you're prompted for a sudo password so the change can be made, but on Windows, you have to do one of the following to make sure hostsupdater works correctly:
+If you install either the `vagrant-hostsupdater` or `vagrant-hostmanager` plugin, you might get a permissions error when Vagrant tries changing the hosts file. On a macOS or Linux workstation, you're prompted for a sudo password so the change can be made, but on Windows, you have to do one of the following to make sure hostsupdater works correctly:
 
   1. Run PowerShell or whatever CLI you use with Vagrant as an administrator. Right click on the application and select 'Run as administrator', then proceed with `vagrant` commands as normal.
   2. Change the permissions on the hosts file so your account has permission to edit the file (this has security implications, so it's best to use option 1 unless you know what you're doing). To do this, open `%SystemRoot%\system32\drivers\etc` in Windows Explorer, right-click the `hosts` file, and under Security, add your account and give yourself full access to the file.
diff --git a/provisioning/JJG-Ansible-Windows/README.md b/provisioning/JJG-Ansible-Windows/README.md
index e7548efaf..48097c6ec 100644
--- a/provisioning/JJG-Ansible-Windows/README.md
+++ b/provisioning/JJG-Ansible-Windows/README.md
@@ -23,7 +23,7 @@ if is_windows
     sh.args = "/vagrant/provisioning/playbook.yml"
   end
 else
-  # Provisioning configuration for Ansible (for Mac/Linux hosts).
+  # Provisioning configuration for Ansible (for macOS/Linux hosts).
   config.vm.provision "ansible" do |ansible|
     ansible.playbook = "provisioning/playbook.yml"
     ansible.sudo = true

From aeeb79aa5a92968e33344849fd52626d4c976bf1 Mon Sep 17 00:00:00 2001
From: Joe Stewart <joe.stewart@mediacurrent.com>
Date: Mon, 27 Jun 2016 10:46:28 -0500
Subject: [PATCH 0352/1273] Support including extra_parameters for nginx vhosts

---
 provisioning/templates/nginx-vhost.conf.j2 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/provisioning/templates/nginx-vhost.conf.j2 b/provisioning/templates/nginx-vhost.conf.j2
index 7f37bc349..44f84bd58 100644
--- a/provisioning/templates/nginx-vhost.conf.j2
+++ b/provisioning/templates/nginx-vhost.conf.j2
@@ -90,4 +90,8 @@ server {
         image/x-icon;
     gzip_buffers 16 8k;
     gzip_min_length 512;
+
+{% if item.extra_parameters is defined %}
+    {{ item.extra_parameters }}
+{% endif %}
 }

From 70af9066986dd37a9a928e05165fdb458515f1b9 Mon Sep 17 00:00:00 2001
From: Eric Steinborn <esteinborn@gmail.com>
Date: Tue, 28 Jun 2016 13:34:26 -0400
Subject: [PATCH 0353/1273] DOCS: Set vagrant_box to ubuntu1404 for PHP 5.6

fixes #765
---
 docs/other/php-56.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/other/php-56.md b/docs/other/php-56.md
index 4fecd645f..cd1ff558a 100644
--- a/docs/other/php-56.md
+++ b/docs/other/php-56.md
@@ -11,6 +11,7 @@ Ubuntu 16.04 Xenial defaults to PHP 7.0 in it's system packages. No older versio
 Ondřej Surý's PPA for PHP 7.0 is used to install PHP 7, but you can switch to using different 5.6 packages instead by making the following changes to `config.yml`:
 
 ```yaml
+vagrant_box: geerlingguy/ubuntu1404
 php_version: "5.6"
 php_packages:
   - php5

From 1a82cc306693a61d74be03bf3fe88fab000e0acf Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 29 Jun 2016 11:20:15 -0500
Subject: [PATCH 0354/1273] Issue #726, #720, #727: Fix permissions on the
 synced folder for composer project build.

---
 provisioning/tasks/build-composer-project.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/provisioning/tasks/build-composer-project.yml b/provisioning/tasks/build-composer-project.yml
index 9372c81f9..fedb49013 100644
--- a/provisioning/tasks/build-composer-project.yml
+++ b/provisioning/tasks/build-composer-project.yml
@@ -1,4 +1,14 @@
 ---
+- name: Ensure drupal_composer_install_dir directory has proper permissions.
+  file:
+    path: "{{ drupal_composer_install_dir }}"
+    state: directory
+    owner: "{{ drupalvm_user }}"
+    group: "{{ drupalvm_user }}"
+    mode: 0775
+  when: not drupal_site_exists
+  failed_when: false
+
 - name: Generate Drupal project with composer package.
   command: >
     {{ composer_path }} create-project

From fb40e2083cee353457e29ef9f43cbe63b30a6704 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 30 Jun 2016 09:02:04 -0500
Subject: [PATCH 0355/1273] Bump recommended dependency versions.

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

diff --git a/README.md b/README.md
index dbbcf0977..47575c5e0 100644
--- a/README.md
+++ b/README.md
@@ -73,7 +73,7 @@ Notes:
 
   - **For faster provisioning** (macOS/Linux only): *[Install Ansible](http://docs.ansible.com/intro_installation.html) on your host machine, so Drupal VM can run the provisioning steps locally instead of inside the VM.*
   - **NFS on Linux**: *If NFS is not already installed on your host, you will need to install it to use the default NFS synced folder configuration. See guides for [Debian/Ubuntu](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-ubuntu-14-04), [Arch](https://wiki.archlinux.org/index.php/NFS#Installation), and [RHEL/CentOS](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-centos-6).*
-  - **Versions**: *Make sure you're running the latest releases of Vagrant, VirtualBox, and Ansible—as of February 2016, Drupal VM recommends: Vagrant 1.8.1, VirtualBox 5.0.20, and Ansible 2.1.0.*
+  - **Versions**: *Make sure you're running the latest releases of Vagrant, VirtualBox, and Ansible—as of February 2016, Drupal VM recommends: Vagrant 1.8.4, VirtualBox 5.0.24, and Ansible 2.1.0.*
 
 ### 2 - Build the Virtual Machine
 

From e4ebaecbc705aa5eb5aa05f16a206509421d9401 Mon Sep 17 00:00:00 2001
From: jonathanjfshaw <jonathanjfshaw@gmail.com>
Date: Sun, 3 Jul 2016 21:47:33 +0100
Subject: [PATCH 0356/1273] Emphasised need to install Virtualbox

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

diff --git a/README.md b/README.md
index 47575c5e0..ef411ff8e 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,7 @@ But Drupal VM allows you to build your site exactly how you like, using whatever
 
 Download and install [Vagrant](https://www.vagrantup.com/downloads.html).
 
-Vagrant will automatically install [VirtualBox](https://www.virtualbox.org/wiki/Downloads) if no providers are available (Drupal VM also works with Parallels or VMware, if you have the [Vagrant VMware integration plugin](http://www.vagrantup.com/vmware)).
+Download and install [VirtualBox](https://www.virtualbox.org/wiki/Downloads). Vagrant will automatically do this if you have the paid-for [Vagrant VMware integration plugin](http://www.vagrantup.com/vmware), and no alternative provider like Parallels or VMware already installed.
 
 Notes:
 

From 2d835826de127e427b9a8287bdd2d84a65779761 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 3 Jul 2016 16:39:02 -0500
Subject: [PATCH 0357/1273] Switch from ssmtp to mhsendmail.

---
 default.config.yml            | 2 +-
 provisioning/requirements.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/default.config.yml b/default.config.yml
index 58c3eac14..53d267c3a 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -218,7 +218,7 @@ php_memory_limit: "192M"
 php_display_errors: "On"
 php_display_startup_errors: "On"
 php_realpath_cache_size: "1024K"
-php_sendmail_path: "/usr/sbin/ssmtp -t"
+php_sendmail_path: "/opt/mailhog/mhsendmail"
 php_opcache_enabled_in_ini: true
 php_opcache_memory_consumption: "192"
 php_opcache_max_accelerated_files: 4096
diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 88f7c2358..7602bea96 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -26,7 +26,7 @@
 - src: geerlingguy.java
   version: 1.4.0
 - src: geerlingguy.mailhog
-  version: 1.1.0
+  version: 2.0.0
 - src: geerlingguy.memcached
   version: 1.0.4
 - src: geerlingguy.mysql

From e283d263bc76c6bdf14a3310f03aaa02909fd605 Mon Sep 17 00:00:00 2001
From: jonathanjfshaw <jonathanjfshaw@gmail.com>
Date: Mon, 4 Jul 2016 16:27:26 +0100
Subject: [PATCH 0358/1273] 2nd attempt to clarify Vagrant/Virtualbox
 installation.

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

diff --git a/README.md b/README.md
index ef411ff8e..1ea1d5a82 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,7 @@ But Drupal VM allows you to build your site exactly how you like, using whatever
 
 Download and install [Vagrant](https://www.vagrantup.com/downloads.html).
 
-Download and install [VirtualBox](https://www.virtualbox.org/wiki/Downloads). Vagrant will automatically do this if you have the paid-for [Vagrant VMware integration plugin](http://www.vagrantup.com/vmware), and no alternative provider like Parallels or VMware already installed.
+Vagrant will automatically install [VirtualBox](https://www.virtualbox.org/wiki/Downloads) if no VM provider is installed. If you want to use an alternative provider like Parallels or VMware, you will need to install the [Vagrant VMware integration plugin](http://www.vagrantup.com/vmware).
 
 Notes:
 

From 19ff6be759a887a3311df9d66acc4016d8ec18c7 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 7 Jul 2016 22:51:24 -0500
Subject: [PATCH 0359/1273] Bump requirements for MySQL role so large table
 prefixes are configurable.

---
 provisioning/requirements.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 7602bea96..46b6d8136 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -30,7 +30,7 @@
 - src: geerlingguy.memcached
   version: 1.0.4
 - src: geerlingguy.mysql
-  version: 2.2.3
+  version: 2.3.0
 - src: geerlingguy.nginx
   version: 1.9.2
 - src: geerlingguy.nodejs

From 458b03ad5b7de990f42d4f8b2fbfafa7070877a4 Mon Sep 17 00:00:00 2001
From: Domenic Santangelo <domenics@gmail.com>
Date: Fri, 8 Jul 2016 15:24:37 -0700
Subject: [PATCH 0360/1273] Updates default.config.yml for php-fpm user

Updates default.config.yml to include a stub for defining the user that php-fpm runs as. See #781
---
 default.config.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/default.config.yml b/default.config.yml
index 53d267c3a..18dbfcd32 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -230,6 +230,10 @@ php_max_input_vars: "4000"
 php_enable_php_fpm: true
 php_fpm_listen: "127.0.0.1:9000"
 
+# If you want to run php-fpm as a user other than your OS's default user,
+# uncomment this line and specify. For example, to run as the "nginx" user:
+# php_fpm_pool_user: "nginx"
+
 composer_path: /usr/bin/composer
 composer_home_path: "/home/{{ drupalvm_user }}/.composer"
 composer_home_owner: "{{ drupalvm_user }}"

From 530e83845b73a5a42537772c651e7c0c310aa2b5 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 10 Jul 2016 23:39:46 -0500
Subject: [PATCH 0361/1273] Fixes #791: Update URLs to https (yay for Let's
 Encrypt).

---
 README.md                                | 2 +-
 composer.json                            | 2 +-
 docs/index.md                            | 2 +-
 provisioning/templates/dashboard.html.j2 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 47575c5e0..481b23403 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/geerlingguy/drupal-vm.svg?branch=master)](https://travis-ci.org/geerlingguy/drupal-vm) [![Documentation Status](https://readthedocs.org/projects/drupal-vm/badge/?version=latest)](http://docs.drupalvm.com) [![Packagist](https://img.shields.io/packagist/v/geerlingguy/drupal-vm.svg)](https://packagist.org/packages/geerlingguy/drupal-vm)
 
-[Drupal VM](http://www.drupalvm.com/) is A VM for local Drupal development, built with Vagrant + Ansible.
+[Drupal VM](https://www.drupalvm.com/) is A VM for local Drupal development, built with Vagrant + Ansible.
 
 This project aims to make spinning up a simple local Drupal test/development environment incredibly quick and easy, and to introduce new developers to the wonderful world of Drupal development on local virtual machines (instead of crufty old MAMP/WAMP-based development).
 
diff --git a/composer.json b/composer.json
index 8e4b76057..5a4cd713a 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
     "type": "project",
     "description": "A VM for local Drupal development, built with Vagrant + Ansible",
     "keywords": ["vagrant", "vm", "virtual machine", "drupal"],
-    "homepage": "http://www.drupalvm.com",
+    "homepage": "https://www.drupalvm.com",
     "license": "MIT",
     "authors": [
         {
diff --git a/docs/index.md b/docs/index.md
index 14c156114..a10ae6c37 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,6 +1,6 @@
 <p align="center"><img src="images/drupal-vm-logo.png" alt="Drupal VM Logo" /></p>
 
-[Drupal VM](http://www.drupalvm.com/) is A VM for local Drupal development, built with Vagrant + Ansible.
+[Drupal VM](https://www.drupalvm.com/) is A VM for local Drupal development, built with Vagrant + Ansible.
 
 Welcome to Drupal VM's documentation site! Please read through the [Quick Start Guide](https://github.com/geerlingguy/drupal-vm#quick-start-guide) to get started, and then browse the rest of this project's documentation in the sidebar.
 
diff --git a/provisioning/templates/dashboard.html.j2 b/provisioning/templates/dashboard.html.j2
index 99eaf6e17..bf102859a 100644
--- a/provisioning/templates/dashboard.html.j2
+++ b/provisioning/templates/dashboard.html.j2
@@ -292,7 +292,7 @@
           <section class="jumbotron">
             <div class="row">
               <div class="col-md-7 text-center">
-                <a href="http://www.drupalvm.com/"><img src="http://docs.drupalvm.com/en/latest/images/drupal-vm-logo.png" alt="Drupal VM" title="Welcome to Drupal VM"></a>
+                <a href="https://www.drupalvm.com/"><img src="http://docs.drupalvm.com/en/latest/images/drupal-vm-logo.png" alt="Drupal VM" title="Welcome to Drupal VM"></a>
                 <p><a href="https://github.com/geerlingguy/drupal-vm">Drupal VM</a> is a VM for local Drupal development, built with Vagrant + Ansible.</p>
                 <p><a class="btn btn-primary btn-lg" href="http://docs.drupalvm.com/en/latest/" role="button">Read the documentation</a></p>
               </div>

From 85f6021e206aa6e2b2dae61a7e23ede3ada9d993 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 10 Jul 2016 23:43:25 -0500
Subject: [PATCH 0362/1273] Fixes #782: VM favicon for Drupal VM dashboard.

---
 provisioning/templates/dashboard.html.j2 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/provisioning/templates/dashboard.html.j2 b/provisioning/templates/dashboard.html.j2
index bf102859a..cf4259255 100644
--- a/provisioning/templates/dashboard.html.j2
+++ b/provisioning/templates/dashboard.html.j2
@@ -2,6 +2,7 @@
   <head>
     <title>Drupal VM</title>
     <meta charset="utf-8">
+    <link rel="shortcut icon" href="//cdn.rawgit.com/geerlingguy/drupalvm.github.io/master/favicon.ico" type="image/vnd.microsoft.icon" />
     <style>
       .section-host {
         font-family: monospace;

From 37abc076142f7073481426af6639975630a1ca3c Mon Sep 17 00:00:00 2001
From: Christopher Torgalson <manager@bedlamhotel.com>
Date: Mon, 11 Jul 2016 15:46:48 +0200
Subject: [PATCH 0363/1273] Adds drupal_enabled_modules info to composer
 section

- Without either adding devel as a dependency to composer.json, or
  removeing devel from drupal_enabled_modules in config.yml, vagrant up
  hangs when enabling modules.
- gh-792
---
 docs/other/drupalvm-composer-dependency.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/other/drupalvm-composer-dependency.md b/docs/other/drupalvm-composer-dependency.md
index 5d143470e..02113678f 100644
--- a/docs/other/drupalvm-composer-dependency.md
+++ b/docs/other/drupalvm-composer-dependency.md
@@ -39,6 +39,10 @@ drupal_composer_install_dir: "/var/www/drupalvm"
 drupal_core_path: "{{ drupal_composer_install_dir }}/docroot"
 ```
 
+If you intened to use the devel module, it must be added as a requirement to your `composer.json` file. Alternatively, if you do not intend to use it remove it from `drupal_enabled_modules` in your `config.yml` file:
+
+`drupal_enabled_modules: []`
+
 If you're using `pre_provision_scripts` or `post_provision_scripts` you also need to adjust their paths to take into account the new directory structure. The examples used in `default.config.yml` assume the files are located in the Drupal VM directory. If you use relative paths you need to the ascend the directory tree as far as the project root, but using the `config_dir` variable you get the absolute path of where you `config.yml` is located.
 
 ```yaml

From 2b23c734a725b9f2e3c4239cbecfc379c83adaa4 Mon Sep 17 00:00:00 2001
From: Domenic Santangelo <domenics@gmail.com>
Date: Mon, 11 Jul 2016 10:18:31 -0700
Subject: [PATCH 0364/1273] Update default.config.yml

Add group.
---
 default.config.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/default.config.yml b/default.config.yml
index 18dbfcd32..3f25e9bb0 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -230,9 +230,10 @@ php_max_input_vars: "4000"
 php_enable_php_fpm: true
 php_fpm_listen: "127.0.0.1:9000"
 
-# If you want to run php-fpm as a user other than your OS's default user,
-# uncomment this line and specify. For example, to run as the "nginx" user:
+# If you want to run php-fpm as a user/group other than your OS's default user,
+# uncomment this line and specify. For example, to run as the "nginx" user & group:
 # php_fpm_pool_user: "nginx"
+# php_fpm_pool_group: "nginx"
 
 composer_path: /usr/bin/composer
 composer_home_path: "/home/{{ drupalvm_user }}/.composer"

From 8502972e9564ba856dc34257da8d906f99cda97f Mon Sep 17 00:00:00 2001
From: Domenic Santangelo <domenics@gmail.com>
Date: Mon, 11 Jul 2016 10:28:23 -0700
Subject: [PATCH 0365/1273] Bump requirements for php role.

Bump version for php role so that geerlingguy/ansible-role-php#128 gets in.
---
 provisioning/requirements.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 46b6d8136..17e8574b5 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -36,7 +36,7 @@
 - src: geerlingguy.nodejs
   version: 3.2.0
 - src: geerlingguy.php
-  version: 3.2.1
+  version: 3.2.2
 - src: geerlingguy.php-memcached
   version: 2.0.0
 - src: geerlingguy.php-mysql

From dfa8812341eac66c80cb883822b3a26010cdf662 Mon Sep 17 00:00:00 2001
From: Domenic Santangelo <domenics@gmail.com>
Date: Mon, 11 Jul 2016 10:54:11 -0700
Subject: [PATCH 0366/1273] Fixes #795, broken Your Site links on dashboard.

---
 provisioning/templates/dashboard.html.j2 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/provisioning/templates/dashboard.html.j2 b/provisioning/templates/dashboard.html.j2
index cf4259255..564996867 100644
--- a/provisioning/templates/dashboard.html.j2
+++ b/provisioning/templates/dashboard.html.j2
@@ -106,7 +106,9 @@
             {%- endfor -%}
           {%- elif drupalvm_webserver == 'nginx' -%}
             {%- for host in nginx_hosts -%}
-              {{ printSite(host.server_name, host.root) }}
+              {%- for hostname in host.server_name.split() -%}
+                {{ printSite(hostname, host.root) }}
+              {%- endfor -%}
             {%- endfor -%}
           {%- endif %}
           <tr><td colspan=3><small>*Note: If Ansible isn't installed installed on your host, Drush aliases are only created inside the VM.</small></td></tr>

From 90ff87304e7a214d4281d3061498a94cc304fd3e Mon Sep 17 00:00:00 2001
From: Domenic Santangelo <domenics@gmail.com>
Date: Mon, 11 Jul 2016 13:58:50 -0700
Subject: [PATCH 0367/1273] Restores default.config.yml.

---
 default.config.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/default.config.yml b/default.config.yml
index 3f25e9bb0..53d267c3a 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -230,11 +230,6 @@ php_max_input_vars: "4000"
 php_enable_php_fpm: true
 php_fpm_listen: "127.0.0.1:9000"
 
-# If you want to run php-fpm as a user/group other than your OS's default user,
-# uncomment this line and specify. For example, to run as the "nginx" user & group:
-# php_fpm_pool_user: "nginx"
-# php_fpm_pool_group: "nginx"
-
 composer_path: /usr/bin/composer
 composer_home_path: "/home/{{ drupalvm_user }}/.composer"
 composer_home_owner: "{{ drupalvm_user }}"

From 60cbf093b1f9cd12b92fa8e55baec3e0a185406f Mon Sep 17 00:00:00 2001
From: Domenic Santangelo <domenics@gmail.com>
Date: Mon, 11 Jul 2016 14:02:57 -0700
Subject: [PATCH 0368/1273] Update webservers.md

Updates docs to reflect php-fpm user/group variables.
---
 docs/other/webservers.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/other/webservers.md b/docs/other/webservers.md
index bd2b24245..b78744e28 100644
--- a/docs/other/webservers.md
+++ b/docs/other/webservers.md
@@ -14,4 +14,6 @@ See the examples included in the [`geerlingguy.apache` Ansible role's README](ht
 
 Because Nginx server directives behave a little differently than Apache's VirtualHosts, Drupal VM includes a custom Drupal-optimized Nginx server block configuration, and you can control all the servers ('virtual hosts') Nginx will run using the `nginx_hosts` configuration. A few simple examples are shown in `default.config.yml`, but you have some extra flexibility if you need it. See the `nginx-vhost.conf.j2` template for more information.
 
-Also, see the examples included in the [`geerlingguy.nginx` Ansible role's README](https://github.com/geerlingguy/ansible-role-nginx#readme) for more info, as well as many other variables you can override to configure Nginx exactly how you like it.
+Also, see the examples included in the [`geerlingguy.nginx` Ansible role's README](https://github.com/geerlingguy/ansible-role-nginx#readme) for more info, as well as many other variables you can override to configure Nginx exactly how you like it. 
+
+Note: if you're using php-fpm, you may want to reflect your use of nginx by setting `php_fpm_pool_user` and `php_fpm_pool_group` in your `config.yml`. 

From 18a801945a1af526685c380d5ff7139b9efe8599 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 11 Jul 2016 21:04:04 -0500
Subject: [PATCH 0369/1273] Update directions for Drupal 7 make file.

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 481b23403..4c810f07e 100644
--- a/README.md
+++ b/README.md
@@ -48,8 +48,8 @@ There are a couple places where you can customize the VM for your needs:
 If you want to switch from Drupal 8 (default) to Drupal 7 on the initial install, do the following:
 
   1. Switch to using a [Drush Make file](http://docs.drupalvm.com/en/latest/deployment/drush-make/).
-  1. Update the Drupal `version` and `core` inside the `drupal.make.yml` file.
-  2. Update `drupal_major_version` inside `config.yml`.
+  1. Update the Drupal `version` and `core` inside your `drupal.make.yml` file.
+  2. Set `drupal_major_version: 7` inside `config.yml`.
 
 ## Quick Start Guide
 

From 429e7c90eb871967fb2058de733e70b4cce87e7d Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 12 Jul 2016 09:13:08 -0500
Subject: [PATCH 0370/1273] Fixes #800: Add php5-apcu to default Acquia Cloud
 package list.

---
 examples/acquia/acquia.config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/examples/acquia/acquia.config.yml b/examples/acquia/acquia.config.yml
index d20c09df3..035924095 100644
--- a/examples/acquia/acquia.config.yml
+++ b/examples/acquia/acquia.config.yml
@@ -14,6 +14,7 @@ php_packages:
   - php5-fpm
   - php5-gd
   - php5-sqlite
+  - php5-apcu
   - php-pear
   - libpcre3-dev
 php_conf_paths:

From 3043a72bee337cd6bf207db11e18928c6807a1c9 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 13 Jul 2016 10:17:49 -0500
Subject: [PATCH 0371/1273] Issue #798: Update selenium role so it doesn't
 cause build failure.

---
 provisioning/requirements.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 17e8574b5..bc6902166 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -1,6 +1,6 @@
 ---
 - src: arknoll.selenium
-  version: 1.2.0
+  version: 1.3.0
 - src: franklinkim.newrelic
   version: 1.2.0
 - src: geerlingguy.adminer

From bcc91634f2cbe2bb09af874908351e2ef997423b Mon Sep 17 00:00:00 2001
From: Joe Stewart <joe.stewart@mediacurrent.com>
Date: Wed, 13 Jul 2016 14:30:19 -0500
Subject: [PATCH 0372/1273] Add elasticsearch to installed extras

---
 default.config.yml            | 2 ++
 provisioning/playbook.yml     | 3 ++-
 provisioning/requirements.yml | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/default.config.yml b/default.config.yml
index 53d267c3a..0dc4c70e5 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -174,6 +174,7 @@ installed_extras:
   - adminer
   # - blackfire
   - drupalconsole
+  # - elasticsearch
   - mailhog
   # - memcached
   # - newrelic
@@ -209,6 +210,7 @@ firewall_allowed_tcp_ports:
   - "8080"
   - "8443"
   - "8983"
+  - "9200"
 firewall_log_dropped_packets: false
 
 # PHP Configuration. Currently-supported versions: 5.6, 7.0.
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index df50ee94c..9f11e7d14 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -68,9 +68,10 @@
     - { role: geerlingguy.redis, when: '"redis" in installed_extras' }
     - { role: geerlingguy.php-redis, when: '"redis" in installed_extras' }
     - { role: geerlingguy.ruby, when: '"ruby" in installed_extras' }
-    - { role: geerlingguy.java, when: '"solr" in installed_extras or "selenium" in installed_extras' }
+    - { role: geerlingguy.java, when: '"solr" in installed_extras or "selenium" in installed_extras or "elasticsearch" in installed_extras'}
     - { role: arknoll.selenium, when: '"selenium" in installed_extras' }
     - { role: geerlingguy.solr, when: '"solr" in installed_extras' }
+    - { role: geerlingguy.elasticsearch, when: '"elasticsearch" in installed_extras' }
     - { role: geerlingguy.varnish, when: '"varnish" in installed_extras' }
 
     # Roles for security and stability on production.
diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index bc6902166..5fb548db8 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -19,6 +19,8 @@
   version: 1.0.7
 - src: geerlingguy.drush
   version: 1.1.2
+- src: geerlingguy.elasticsearch
+  version: 2.0.1
 - src: geerlingguy.firewall
   version: 1.0.9
 - src: geerlingguy.git

From 94a50800b82374f9a1ab44324647d6055a18b1f8 Mon Sep 17 00:00:00 2001
From: Joe Stewart <joe@joestewartjr.com>
Date: Fri, 15 Jul 2016 06:26:14 -0500
Subject: [PATCH 0373/1273] Add doc page and install version 2.1.0 of
 elasticsearch role.

---
 docs/extras/elasticsearch.md  | 24 ++++++++++++++++++++++++
 provisioning/requirements.yml |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 docs/extras/elasticsearch.md

diff --git a/docs/extras/elasticsearch.md b/docs/extras/elasticsearch.md
new file mode 100644
index 000000000..8a7d98cb5
--- /dev/null
+++ b/docs/extras/elasticsearch.md
@@ -0,0 +1,24 @@
+[Elasticsearch](https://www.elastic.co/products/elasticsearch) is a search engine based on Lucene. It provides a distributed, multitenant-capable full-text search engine with an HTTP web interface and schema-free JSON documents.
+
+ To enable Elasticsearch in Drupal VM just make sure `elasticsearch` is in the list of `installed_extras` in your `config.yml`, and when you build Drupal VM, the latest version of Elasticsearch will be installed.
+
+The URL to connect to the local elasticsearch server (assuming you're using the default `elasticsearch_http_port` of 9200) from Drupal is:
+
+    http://localhost:9200
+    
+To access Elasticsearch from the host computer requires changing the IP address to listen on a specific interface, or 0.0.0.0 to listen on all interfaces.
+
+    elasticsearch_network_host: 0.0.0.0
+
+The Elasticsearch server can then be accessed at the configured domain:
+
+    http://drupalvm.dev:9200
+
+## Elasticsearch configuration
+
+You can add configuration for Elasticsearch by setting the appropriate variables inside `config.yml` before you build Drupal VM.
+
+    elasticsearch_network_host: localhost
+    elasticsearch_http_port: 9200
+
+Consult the [geerlingguy.elasticsearch](https://github.com/geerlingguy/ansible-role-elasticsearch) role for additional variables available for configuration.
diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 5fb548db8..6c1172e86 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -20,7 +20,7 @@
 - src: geerlingguy.drush
   version: 1.1.2
 - src: geerlingguy.elasticsearch
-  version: 2.0.1
+  version: 2.1.0
 - src: geerlingguy.firewall
   version: 1.0.9
 - src: geerlingguy.git

From 69706ef39f27faa3e404272cc7077d270f172703 Mon Sep 17 00:00:00 2001
From: Joe Stewart <joe@joestewartjr.com>
Date: Fri, 15 Jul 2016 06:28:43 -0500
Subject: [PATCH 0374/1273] Add Elasticsearch as optionally installed in README

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

diff --git a/README.md b/README.md
index 4c810f07e..a11feb3cb 100644
--- a/README.md
+++ b/README.md
@@ -17,6 +17,7 @@ It will install the following on an Ubuntu 16.04 (by default) linux VM:
     - Drupal Console
     - Varnish 4.x (configurable)
     - Apache Solr 4.10.x (configurable)
+    - Elasticsearch
     - Node.js 0.12 (configurable)
     - Selenium, for testing your sites via Behat
     - Ruby

From 5041a9dc324aab6fcbe563bb5c7d8c9821f94ab6 Mon Sep 17 00:00:00 2001
From: Jason Tavares <jaytavares@gmail.com>
Date: Sat, 16 Jul 2016 02:14:20 -0400
Subject: [PATCH 0375/1273] Add ability to override drush make command line
 options.

---
 default.config.yml                    | 1 +
 provisioning/tasks/build-makefile.yml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/default.config.yml b/default.config.yml
index 0dc4c70e5..ea76fea84 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -39,6 +39,7 @@ drupalvm_webserver: apache
 # would like to configure 'vagrant_synced_folders' and 'apache_vhosts' manually.
 build_makefile: false
 drush_makefile_path: "{{ config_dir }}/drupal.make.yml"
+drush_make_options: "--no-gitinfofile"
 
 # Set 'build_makefile' to 'false' and this to 'true' if you are using a
 # composer based site deployment strategy.
diff --git a/provisioning/tasks/build-makefile.yml b/provisioning/tasks/build-makefile.yml
index 862cb5acc..2dc994c4a 100644
--- a/provisioning/tasks/build-makefile.yml
+++ b/provisioning/tasks/build-makefile.yml
@@ -16,7 +16,7 @@
 
 - name: Generate Drupal site with drush makefile.
   command: >
-    {{ drush_path }} make -y /tmp/drupal.make.yml --no-gitinfofile
+    {{ drush_path }} make -y /tmp/drupal.make.yml {{ drush_make_options }}
     chdir={{ drupal_core_path }}
   when: not drupal_site_exists
   become: no

From f4e75b25e4a48c4582c7e7b63b54dcdc683a8d4b Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 22 Jul 2016 22:18:38 -0500
Subject: [PATCH 0376/1273] Issue #814: Add config to help include roles in the
 directory.

---
 .gitignore               |  1 -
 provisioning/README.md   | 15 +++++++++++++++
 provisioning/ansible.cfg |  2 ++
 3 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 provisioning/README.md
 create mode 100644 provisioning/ansible.cfg

diff --git a/.gitignore b/.gitignore
index c0f8665af..b5483661c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,5 +12,4 @@ Vagrantfile.local
 examples/prod/inventory
 examples/prod/bootstrap/vars.yml
 scripts/
-roles/
 drupal/
diff --git a/provisioning/README.md b/provisioning/README.md
new file mode 100644
index 000000000..6f3eedb02
--- /dev/null
+++ b/provisioning/README.md
@@ -0,0 +1,15 @@
+# Drupal VM - Ansible Provisioning
+
+Drupal VM uses the Ansible provisioner to build all the software that runs and supplements Drupal sites.
+
+The Ansible configuration uses a variety of open source community-maintained Ansible Roles that are hosted on Ansible Galaxy, but Drupal VM includes the roles in the codebase for efficiency's sake.
+
+**You should NOT make any manual changes to the roles in the `roles` directory**, but rather, contribute to the upstream roles corresponding to the role's folder name (e.g. for issues with the `geerlingguy.apache` role, see the [`geerlingguy.apache`](https://galaxy.ansible.com/geerlingguy/apache/) role page on Ansible Galaxy, and the role's [issue tracker on GitHub](https://github.com/geerlingguy/ansible-role-apache/issues)).
+
+## Adding and Updating Galaxy roles
+
+From time to time, third party roles need to be added or updated to enable new Drupal VM functionality or fix bugs. To update a role (e.g. `geerlingguy.apache`), find the role's `version` setting inside `requirements.yml`, bump the version to the required or latest version of the role, then run the following command _in the same directory as this README file_:
+
+    $ ansible-galaxy install -r requirements.yml --force
+
+Then commit the updated `requirements.yml` file and the new and updated files within the `roles` directory in a new PR to the Drupal VM project.
diff --git a/provisioning/ansible.cfg b/provisioning/ansible.cfg
new file mode 100644
index 000000000..002a50dd5
--- /dev/null
+++ b/provisioning/ansible.cfg
@@ -0,0 +1,2 @@
+[defaults]
+roles_path = ./roles

From db7699c08b55d32d267ef8bf6dcc039123daf7b8 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 22 Jul 2016 22:19:02 -0500
Subject: [PATCH 0377/1273] Fixes #814: Include all required roles in Drupal
 VM's codebase.

---
 .../roles/arknoll.selenium/.gitignore         |  24 ++
 .../roles/arknoll.selenium/.travis.yml        |  35 +++
 .../roles/arknoll.selenium/LICENSE.txt        |  13 +
 provisioning/roles/arknoll.selenium/README.md |  61 +++++
 .../roles/arknoll.selenium/defaults/main.yml  |   5 +
 .../roles/arknoll.selenium/handlers/main.yml  |   4 +
 .../meta/.galaxy_install_info                 |   1 +
 .../roles/arknoll.selenium/meta/main.yml      |  21 ++
 .../roles/arknoll.selenium/tasks/main.yml     |  42 ++++
 .../templates/selenium-init-Debian.j2         |  60 +++++
 .../templates/selenium-init-RedHat.j2         |  81 +++++++
 .../roles/arknoll.selenium/tests/inventory    |   1 +
 .../roles/arknoll.selenium/tests/test.yml     |   6 +
 .../roles/arknoll.selenium/vars/main.yml      |   2 +
 .../roles/franklinkim.newrelic/.clog.toml     |   4 +
 .../roles/franklinkim.newrelic/.editorconfig  |  16 ++
 .../roles/franklinkim.newrelic/.gitignore     |   6 +
 .../roles/franklinkim.newrelic/.travis.yml    |  10 +
 .../roles/franklinkim.newrelic/CHANGELOG.md   |  20 ++
 .../roles/franklinkim.newrelic/LICENSE        |  22 ++
 .../roles/franklinkim.newrelic/README.md      | 127 ++++++++++
 .../roles/franklinkim.newrelic/Vagrantfile    |  23 ++
 .../franklinkim.newrelic/defaults/main.yml    |  22 ++
 .../franklinkim.newrelic/handlers/main.yml    |   7 +
 .../roles/franklinkim.newrelic/meta/main.yml  | 104 ++++++++
 .../franklinkim.newrelic/meta/readme.yml      |  14 ++
 .../franklinkim.newrelic/tasks/install.yml    |   7 +
 .../tasks/install_debian.yml                  |  23 ++
 .../tasks/install_redhat.yml                  |  13 +
 .../roles/franklinkim.newrelic/tasks/main.yml |  28 +++
 .../franklinkim.newrelic/tasks/service.yml    |   7 +
 .../templates/etc/newrelic/nrsysmond.cfg.j2   | 205 ++++++++++++++++
 .../roles/franklinkim.newrelic/tests/main.yml |  10 +
 .../roles/franklinkim.newrelic/tests/run.sh   |  17 ++
 .../roles/geerlingguy.adminer/.travis.yml     |  66 +++++
 .../roles/geerlingguy.adminer/README.md       |  47 ++++
 .../geerlingguy.adminer/defaults/main.yml     |   5 +
 .../meta/.galaxy_install_info                 |   1 +
 .../roles/geerlingguy.adminer/meta/main.yml   |  44 ++++
 .../roles/geerlingguy.adminer/tasks/main.yml  |  40 ++++
 .../templates/adminer.conf.j2                 |   9 +
 .../tests/Dockerfile.centos-6                 |  15 ++
 .../tests/Dockerfile.centos-7                 |  27 +++
 .../tests/Dockerfile.ubuntu-12.04             |  11 +
 .../tests/Dockerfile.ubuntu-14.04             |  11 +
 .../geerlingguy.adminer/tests/test-apache.yml |   8 +
 .../tests/test-standalone.yml                 |   8 +
 .../geerlingguy.apache-php-fpm/.travis.yml    |  53 +++++
 .../geerlingguy.apache-php-fpm/README.md      |  57 +++++
 .../meta/.galaxy_install_info                 |   1 +
 .../geerlingguy.apache-php-fpm/meta/main.yml  |  26 ++
 .../tasks/configure-Debian.yml                |  10 +
 .../tasks/configure-RedHat.yml                |   7 +
 .../geerlingguy.apache-php-fpm/tasks/main.yml |   7 +
 .../tests/Dockerfile.centos-7                 |  27 +++
 .../tests/Dockerfile.ubuntu-12.04             |  11 +
 .../tests/Dockerfile.ubuntu-14.04             |  11 +
 .../geerlingguy.apache-php-fpm/tests/test.yml |  27 +++
 .../roles/geerlingguy.apache/.travis.yml      |  54 +++++
 .../roles/geerlingguy.apache/README.md        | 124 ++++++++++
 .../geerlingguy.apache/defaults/main.yml      |  44 ++++
 .../geerlingguy.apache/handlers/main.yml      |   5 +
 .../meta/.galaxy_install_info                 |   1 +
 .../roles/geerlingguy.apache/meta/main.yml    |  31 +++
 .../tasks/configure-Debian.yml                |  54 +++++
 .../tasks/configure-RedHat.yml                |  24 ++
 .../tasks/configure-Solaris.yml               |  19 ++
 .../tasks/configure-Suse.yml                  |  24 ++
 .../roles/geerlingguy.apache/tasks/main.yml   |  58 +++++
 .../geerlingguy.apache/tasks/setup-Debian.yml |   7 +
 .../geerlingguy.apache/tasks/setup-RedHat.yml |   7 +
 .../tasks/setup-Solaris.yml                   |   6 +
 .../geerlingguy.apache/tasks/setup-Suse.yml   |   6 +
 .../templates/vhosts.conf.j2                  |  82 +++++++
 .../tests/Dockerfile.centos-6                 |  15 ++
 .../tests/Dockerfile.centos-7                 |  27 +++
 .../tests/Dockerfile.ubuntu-12.04             |  11 +
 .../tests/Dockerfile.ubuntu-14.04             |  11 +
 .../roles/geerlingguy.apache/tests/test.yml   |  13 +
 .../roles/geerlingguy.apache/vars/Debian.yml  |  14 ++
 .../roles/geerlingguy.apache/vars/RedHat.yml  |  20 ++
 .../roles/geerlingguy.apache/vars/Solaris.yml |  19 ++
 .../roles/geerlingguy.apache/vars/Suse.yml    |  18 ++
 .../geerlingguy.apache/vars/apache-22.yml     |  12 +
 .../geerlingguy.apache/vars/apache-24.yml     |   8 +
 .../roles/geerlingguy.blackfire/.travis.yml   |  55 +++++
 .../roles/geerlingguy.blackfire/README.md     |  41 ++++
 .../geerlingguy.blackfire/defaults/main.yml   |   6 +
 .../meta/.galaxy_install_info                 |   1 +
 .../roles/geerlingguy.blackfire/meta/main.yml |  28 +++
 .../geerlingguy.blackfire/tasks/main.yml      |  14 ++
 .../tasks/setup-Debian.yml                    |  17 ++
 .../tasks/setup-RedHat.yml                    |  18 ++
 .../tests/Dockerfile.centos-7                 |  27 +++
 .../tests/Dockerfile.ubuntu-12.04             |  11 +
 .../tests/Dockerfile.ubuntu-14.04             |  11 +
 .../geerlingguy.blackfire/tests/test.yml      |  10 +
 .../roles/geerlingguy.composer/.travis.yml    |  52 ++++
 .../roles/geerlingguy.composer/README.md      |  68 ++++++
 .../geerlingguy.composer/defaults/main.yml    |  20 ++
 .../meta/.galaxy_install_info                 |   1 +
 .../roles/geerlingguy.composer/meta/main.yml  |  43 ++++
 .../tasks/global-require.yml                  |  17 ++
 .../roles/geerlingguy.composer/tasks/main.yml |  53 +++++
 .../templates/auth.json.j2                    |   5 +
 .../templates/composer.sh.j2                  |   1 +
 .../tests/Dockerfile.centos-7                 |  27 +++
 .../tests/Dockerfile.ubuntu-14.04             |  14 ++
 .../geerlingguy.composer/tests/initctl_faker  |  23 ++
 .../geerlingguy.composer/tests/inventory      |   1 +
 .../tests/requirements.yml                    |   3 +
 .../roles/geerlingguy.composer/tests/test.yml |  21 ++
 .../roles/geerlingguy.daemonize/.travis.yml   |  57 +++++
 .../roles/geerlingguy.daemonize/README.md     |  43 ++++
 .../geerlingguy.daemonize/defaults/main.yml   |   5 +
 .../meta/.galaxy_install_info                 |   1 +
 .../roles/geerlingguy.daemonize/meta/main.yml |  28 +++
 .../geerlingguy.daemonize/tasks/main.yml      |  29 +++
 .../tests/Dockerfile.centos-6                 |  15 ++
 .../tests/Dockerfile.centos-7                 |  27 +++
 .../tests/Dockerfile.ubuntu-12.04             |  11 +
 .../tests/Dockerfile.ubuntu-14.04             |  11 +
 .../geerlingguy.daemonize/tests/test.yml      |  24 ++
 .../geerlingguy.drupal-console/.travis.yml    |  41 ++++
 .../geerlingguy.drupal-console/README.md      |  45 ++++
 .../defaults/main.yml                         |   4 +
 .../meta/.galaxy_install_info                 |   1 +
 .../geerlingguy.drupal-console/meta/main.yml  |  44 ++++
 .../geerlingguy.drupal-console/tasks/main.yml |  22 ++
 .../tests/inventory                           |   1 +
 .../tests/test-self-update.yml                |  15 ++
 .../geerlingguy.drupal-console/tests/test.yml |  14 ++
 .../roles/geerlingguy.drush/.travis.yml       |  42 ++++
 .../roles/geerlingguy.drush/README.md         |  56 +++++
 .../roles/geerlingguy.drush/defaults/main.yml |  10 +
 .../meta/.galaxy_install_info                 |   1 +
 .../roles/geerlingguy.drush/meta/main.yml     |  46 ++++
 .../roles/geerlingguy.drush/tasks/main.yml    |  37 +++
 .../roles/geerlingguy.drush/tests/inventory   |   1 +
 .../roles/geerlingguy.drush/tests/test.yml    |  10 +
 .../geerlingguy.elasticsearch/.travis.yml     |  58 +++++
 .../roles/geerlingguy.elasticsearch/README.md |  44 ++++
 .../defaults/main.yml                         |   5 +
 .../files/elasticsearch.repo                  |   6 +
 .../handlers/main.yml                         |   3 +
 .../meta/.galaxy_install_info                 |   1 +
 .../geerlingguy.elasticsearch/meta/main.yml   |  24 ++
 .../geerlingguy.elasticsearch/tasks/main.yml  |  18 ++
 .../tasks/setup-Debian.yml                    |  14 ++
 .../tasks/setup-RedHat.yml                    |  14 ++
 .../templates/elasticsearch.yml.j2            |  97 ++++++++
 .../tests/Dockerfile.centos-6                 |  15 ++
 .../tests/Dockerfile.centos-7                 |  27 +++
 .../tests/Dockerfile.ubuntu-12.04             |  11 +
 .../tests/Dockerfile.ubuntu-14.04             |  11 +
 .../geerlingguy.elasticsearch/tests/test.yml  |  11 +
 .../roles/geerlingguy.firewall/.travis.yml    |  60 +++++
 .../roles/geerlingguy.firewall/README.md      |  72 ++++++
 .../geerlingguy.firewall/defaults/main.yml    |  11 +
 .../geerlingguy.firewall/handlers/main.yml    |   3 +
 .../meta/.galaxy_install_info                 |   1 +
 .../roles/geerlingguy.firewall/meta/main.yml  |  22 ++
 .../roles/geerlingguy.firewall/tasks/main.yml |  21 ++
 .../templates/firewall.bash.j2                |  83 +++++++
 .../templates/firewall.j2                     |  49 ++++
 .../geerlingguy.firewall/tests/inventory      |   1 +
 .../roles/geerlingguy.firewall/tests/test.yml |   8 +
 provisioning/roles/geerlingguy.git/.gitignore |   1 +
 .../roles/geerlingguy.git/.travis.yml         |  84 +++++++
 provisioning/roles/geerlingguy.git/README.md  |  55 +++++
 .../roles/geerlingguy.git/defaults/main.yml   |  23 ++
 .../geerlingguy.git/meta/.galaxy_install_info |   1 +
 .../roles/geerlingguy.git/meta/main.yml       |  22 ++
 .../tasks/install-from-source.yml             |  62 +++++
 .../roles/geerlingguy.git/tasks/main.yml      |  23 ++
 .../geerlingguy.git/tests/Dockerfile.centos-6 |  15 ++
 .../geerlingguy.git/tests/Dockerfile.centos-7 |  27 +++
 .../tests/Dockerfile.ubuntu-12.04             |  11 +
 .../tests/Dockerfile.ubuntu-14.04             |  11 +
 .../geerlingguy.git/tests/test-package.yml    |  14 ++
 .../geerlingguy.git/tests/test-source.yml     |  15 ++
 .../roles/geerlingguy.git/vars/main.yml       |   2 +
 .../roles/geerlingguy.java/.travis.yml        |  57 +++++
 provisioning/roles/geerlingguy.java/README.md |  62 +++++
 .../roles/geerlingguy.java/defaults/main.yml  |   4 +
 .../meta/.galaxy_install_info                 |   1 +
 .../roles/geerlingguy.java/meta/main.yml      |  27 +++
 .../roles/geerlingguy.java/tasks/main.yml     |  23 ++
 .../geerlingguy.java/tasks/setup-Debian.yml   |   7 +
 .../geerlingguy.java/tasks/setup-FreeBSD.yml  |  10 +
 .../geerlingguy.java/tasks/setup-RedHat.yml   |   4 +
 .../tests/Dockerfile.centos-6                 |  15 ++
 .../tests/Dockerfile.centos-7                 |  27 +++
 .../tests/Dockerfile.ubuntu-12.04             |  11 +
 .../tests/Dockerfile.ubuntu-14.04             |  11 +
 .../roles/geerlingguy.java/tests/test.yml     |  10 +
 .../roles/geerlingguy.java/vars/Debian.yml    |   7 +
 .../roles/geerlingguy.java/vars/FreeBSD.yml   |   7 +
 .../roles/geerlingguy.java/vars/RedHat.yml    |   7 +
 .../geerlingguy.java/vars/Ubuntu-12.04.yml    |   7 +
 .../geerlingguy.java/vars/Ubuntu-14.04.yml    |   7 +
 .../geerlingguy.java/vars/Ubuntu-16.04.yml    |   7 +
 .../roles/geerlingguy.mailhog/.travis.yml     |  67 ++++++
 .../roles/geerlingguy.mailhog/README.md       |  55 +++++
 .../geerlingguy.mailhog/defaults/main.yml     |   7 +
 .../meta/.galaxy_install_info                 |   1 +
 .../roles/geerlingguy.mailhog/meta/main.yml   |  25 ++
 .../roles/geerlingguy.mailhog/tasks/main.yml  |  33 +++
 .../templates/mailhog.init.j2                 |  61 +++++
 .../tests/Dockerfile.centos-6                 |  15 ++
 .../tests/Dockerfile.centos-7                 |  27 +++
 .../tests/Dockerfile.ubuntu-12.04             |  11 +
 .../tests/Dockerfile.ubuntu-14.04             |  11 +
 .../roles/geerlingguy.mailhog/tests/message   |   5 +
 .../roles/geerlingguy.mailhog/tests/test.yml  |  27 +++
 .../roles/geerlingguy.memcached/.gitignore    |   1 +
 .../roles/geerlingguy.memcached/.travis.yml   |  34 +++
 .../roles/geerlingguy.memcached/README.md     |  53 +++++
 .../geerlingguy.memcached/defaults/main.yml   |   9 +
 .../geerlingguy.memcached/handlers/main.yml   |   3 +
 .../meta/.galaxy_install_info                 |   1 +
 .../roles/geerlingguy.memcached/meta/main.yml |  24 ++
 .../geerlingguy.memcached/tasks/main.yml      |  29 +++
 .../tasks/setup-Debian.yml                    |   6 +
 .../tasks/setup-RedHat.yml                    |   3 +
 .../templates/memcached-Debian.conf.j2        |  27 +++
 .../templates/memcached-RedHat.conf.j2        |  19 ++
 .../geerlingguy.memcached/tests/inventory     |   1 +
 .../geerlingguy.memcached/tests/test.yml      |   5 +
 .../geerlingguy.memcached/vars/Debian.yml     |   3 +
 .../geerlingguy.memcached/vars/RedHat.yml     |   3 +
 .../roles/geerlingguy.mysql/.travis.yml       |  78 ++++++
 .../roles/geerlingguy.mysql/README.md         | 144 +++++++++++
 .../roles/geerlingguy.mysql/defaults/main.yml | 101 ++++++++
 .../roles/geerlingguy.mysql/handlers/main.yml |   3 +
 .../meta/.galaxy_install_info                 |   1 +
 .../roles/geerlingguy.mysql/meta/main.yml     |  22 ++
 .../geerlingguy.mysql/tasks/configure.yml     |  69 ++++++
 .../geerlingguy.mysql/tasks/databases.yml     |   8 +
 .../roles/geerlingguy.mysql/tasks/main.yml    |  42 ++++
 .../geerlingguy.mysql/tasks/replication.yml   |  51 ++++
 .../tasks/secure-installation.yml             |  60 +++++
 .../geerlingguy.mysql/tasks/setup-Debian.yml  |  29 +++
 .../geerlingguy.mysql/tasks/setup-RedHat.yml  |   8 +
 .../roles/geerlingguy.mysql/tasks/users.yml   |  11 +
 .../geerlingguy.mysql/templates/my.cnf.j2     | 111 +++++++++
 .../templates/user-my.cnf.j2                  |   3 +
 .../tests/Dockerfile.centos-6                 |  15 ++
 .../tests/Dockerfile.centos-7                 |  27 +++
 .../tests/Dockerfile.ubuntu-12.04             |  14 ++
 .../tests/Dockerfile.ubuntu-14.04             |  14 ++
 .../geerlingguy.mysql/tests/centos-7-test.yml |  15 ++
 .../geerlingguy.mysql/tests/initctl_faker     |  23 ++
 .../roles/geerlingguy.mysql/tests/inventory   |   1 +
 .../roles/geerlingguy.mysql/tests/test.yml    |   4 +
 .../roles/geerlingguy.mysql/vars/Debian.yml   |  10 +
 .../roles/geerlingguy.mysql/vars/RedHat-6.yml |  10 +
 .../roles/geerlingguy.mysql/vars/RedHat-7.yml |  16 ++
 .../roles/geerlingguy.nginx/.travis.yml       |  39 +++
 .../roles/geerlingguy.nginx/README.md         | 122 ++++++++++
 .../roles/geerlingguy.nginx/defaults/main.yml |  68 ++++++
 .../roles/geerlingguy.nginx/handlers/main.yml |  10 +
 .../meta/.galaxy_install_info                 |   1 +
 .../roles/geerlingguy.nginx/meta/main.yml     |  30 +++
 .../roles/geerlingguy.nginx/tasks/main.yml    |  39 +++
 .../geerlingguy.nginx/tasks/setup-Debian.yml  |   9 +
 .../geerlingguy.nginx/tasks/setup-FreeBSD.yml |  13 +
 .../geerlingguy.nginx/tasks/setup-RedHat.yml  |  14 ++
 .../geerlingguy.nginx/tasks/setup-Ubuntu.yml  |  14 ++
 .../roles/geerlingguy.nginx/tasks/vhosts.yml  |  26 ++
 .../geerlingguy.nginx/templates/nginx.conf.j2 |  63 +++++
 .../geerlingguy.nginx/templates/nginx.repo.j2 |   5 +
 .../geerlingguy.nginx/templates/vhosts.j2     |  33 +++
 .../roles/geerlingguy.nginx/tests/inventory   |   1 +
 .../roles/geerlingguy.nginx/tests/test.yml    |   6 +
 .../roles/geerlingguy.nginx/vars/Debian.yml   |   9 +
 .../roles/geerlingguy.nginx/vars/FreeBSD.yml  |   9 +
 .../roles/geerlingguy.nginx/vars/RedHat.yml   |   9 +
 .../roles/geerlingguy.nodejs/.travis.yml      |  62 +++++
 .../roles/geerlingguy.nodejs/README.md        |  66 +++++
 .../geerlingguy.nodejs/defaults/main.yml      |  21 ++
 .../meta/.galaxy_install_info                 |   1 +
 .../roles/geerlingguy.nodejs/meta/main.yml    |  27 +++
 .../roles/geerlingguy.nodejs/tasks/main.yml   |  50 ++++
 .../geerlingguy.nodejs/tasks/setup-Debian.yml |  24 ++
 .../geerlingguy.nodejs/tasks/setup-RedHat.yml |  18 ++
 .../geerlingguy.nodejs/templates/npm.sh.j2    |   3 +
 .../tests/Dockerfile.centos-6                 |  15 ++
 .../tests/Dockerfile.centos-7                 |  27 +++
 .../tests/Dockerfile.ubuntu-12.04             |  11 +
 .../tests/Dockerfile.ubuntu-14.04             |  11 +
 .../roles/geerlingguy.nodejs/tests/test.yml   |  29 +++
 .../geerlingguy.php-memcached/.travis.yml     |  40 ++++
 .../roles/geerlingguy.php-memcached/README.md |  39 +++
 .../defaults/main.yml                         |   3 +
 .../meta/.galaxy_install_info                 |   1 +
 .../geerlingguy.php-memcached/meta/main.yml   |  24 ++
 .../geerlingguy.php-memcached/tasks/main.yml  |  28 +++
 .../geerlingguy.php-memcached/tests/inventory |   1 +
 .../tests/memcached-test.php                  |  35 +++
 .../geerlingguy.php-memcached/tests/test.yml  |  12 +
 .../geerlingguy.php-memcached/vars/Debian.yml |   2 +
 .../geerlingguy.php-memcached/vars/RedHat.yml |   2 +
 .../roles/geerlingguy.php-mysql/.travis.yml   |  56 +++++
 .../roles/geerlingguy.php-mysql/README.md     |  40 ++++
 .../geerlingguy.php-mysql/defaults/main.yml   |   3 +
 .../meta/.galaxy_install_info                 |   1 +
 .../roles/geerlingguy.php-mysql/meta/main.yml |  23 ++
 .../geerlingguy.php-mysql/tasks/main.yml      |  29 +++
 .../tests/Dockerfile.centos-6                 |  18 ++
 .../tests/Dockerfile.centos-7                 |  30 +++
 .../tests/Dockerfile.ubuntu-14.04             |  14 ++
 .../tests/centos7-vars.yml                    |  11 +
 .../geerlingguy.php-mysql/tests/initctl_faker |  23 ++
 .../geerlingguy.php-mysql/tests/inventory     |   1 +
 .../tests/requirements.yml                    |   5 +
 .../geerlingguy.php-mysql/tests/test.yml      |  23 ++
 .../geerlingguy.php-mysql/vars/Debian.yml     |   2 +
 .../geerlingguy.php-mysql/vars/RedHat.yml     |   2 +
 .../roles/geerlingguy.php-pecl/.travis.yml    |  43 ++++
 .../roles/geerlingguy.php-pecl/README.md      |  45 ++++
 .../geerlingguy.php-pecl/defaults/main.yml    |   4 +
 .../meta/.galaxy_install_info                 |   1 +
 .../roles/geerlingguy.php-pecl/meta/main.yml  |  44 ++++
 .../roles/geerlingguy.php-pecl/tasks/main.yml |   7 +
 .../geerlingguy.php-pecl/tests/inventory      |   1 +
 .../roles/geerlingguy.php-pecl/tests/test.yml |   6 +
 .../roles/geerlingguy.php-redis/.travis.yml   |  40 ++++
 .../roles/geerlingguy.php-redis/README.md     |  63 +++++
 .../geerlingguy.php-redis/defaults/main.yml   |  10 +
 .../geerlingguy.php-redis/files/redis.ini     |   1 +
 .../meta/.galaxy_install_info                 |   1 +
 .../roles/geerlingguy.php-redis/meta/main.yml |  24 ++
 .../tasks/install-from-source.yml             |  36 +++
 .../geerlingguy.php-redis/tasks/main.yml      |  36 +++
 .../geerlingguy.php-redis/tests/inventory     |   1 +
 .../tests/redis-test.php                      |  32 +++
 .../geerlingguy.php-redis/tests/test.yml      |  14 ++
 .../geerlingguy.php-redis/vars/Debian.yml     |   2 +
 .../geerlingguy.php-redis/vars/RedHat.yml     |   2 +
 .../roles/geerlingguy.php-xdebug/.gitignore   |   1 +
 .../roles/geerlingguy.php-xdebug/.travis.yml  |  62 +++++
 .../roles/geerlingguy.php-xdebug/README.md    |  77 ++++++
 .../geerlingguy.php-xdebug/defaults/main.yml  |  20 ++
 .../meta/.galaxy_install_info                 |   1 +
 .../geerlingguy.php-xdebug/meta/main.yml      |  44 ++++
 .../tasks/configure.yml                       |  12 +
 .../geerlingguy.php-xdebug/tasks/main.yml     |  56 +++++
 .../templates/xdebug.ini.j2                   |  17 ++
 .../tests/Dockerfile.centos-6                 |  19 ++
 .../tests/Dockerfile.centos-7                 |  29 +++
 .../tests/Dockerfile.ubuntu-12.04             |  11 +
 .../tests/Dockerfile.ubuntu-14.04             |  11 +
 .../geerlingguy.php-xdebug/tests/inventory    |   1 +
 .../tests/test-source.yml                     |  21 ++
 .../tests/xdebug-test.php                     |  21 ++
 .../geerlingguy.php-xdebug/vars/Debian.yml    |   3 +
 .../geerlingguy.php-xdebug/vars/RedHat.yml    |   3 +
 .../roles/geerlingguy.php-xhprof/.gitignore   |   1 +
 .../roles/geerlingguy.php-xhprof/.travis.yml  |  58 +++++
 .../roles/geerlingguy.php-xhprof/README.md    |  52 ++++
 .../geerlingguy.php-xhprof/defaults/main.yml  |  14 ++
 .../meta/.galaxy_install_info                 |   1 +
 .../geerlingguy.php-xhprof/meta/main.yml      |  44 ++++
 .../tasks/configure.yml                       |  18 ++
 .../geerlingguy.php-xhprof/tasks/main.yml     |  68 ++++++
 .../tasks/setup-Debian.yml                    |   8 +
 .../tasks/setup-RedHat.yml                    |   8 +
 .../templates/xhprof.ini.j2                   |   3 +
 .../tests/Dockerfile.centos-7                 |  30 +++
 .../tests/Dockerfile.ubuntu-12.04             |  13 +
 .../tests/Dockerfile.ubuntu-14.04             |  13 +
 .../geerlingguy.php-xhprof/tests/inventory    |   1 +
 .../tests/test-source.yml                     |  20 ++
 .../tests/xhprof-test.php                     |  51 ++++
 .../geerlingguy.php-xhprof/vars/Debian.yml    |   4 +
 .../geerlingguy.php-xhprof/vars/RedHat.yml    |   4 +
 .../roles/geerlingguy.php/.travis.yml         |  84 +++++++
 provisioning/roles/geerlingguy.php/README.md  | 204 ++++++++++++++++
 .../roles/geerlingguy.php/defaults/main.yml   | 116 +++++++++
 .../roles/geerlingguy.php/handlers/main.yml   |  13 +
 .../geerlingguy.php/meta/.galaxy_install_info |   1 +
 .../roles/geerlingguy.php/meta/main.yml       |  23 ++
 .../geerlingguy.php/tasks/configure-apcu.yml  |  37 +++
 .../geerlingguy.php/tasks/configure-fpm.yml   |  76 ++++++
 .../tasks/configure-opcache.yml               |  37 +++
 .../roles/geerlingguy.php/tasks/configure.yml |  20 ++
 .../tasks/install-from-source.yml             | 150 ++++++++++++
 .../roles/geerlingguy.php/tasks/main.yml      |  61 +++++
 .../geerlingguy.php/tasks/setup-Debian.yml    |  27 +++
 .../geerlingguy.php/tasks/setup-RedHat.yml    |   8 +
 .../geerlingguy.php/templates/apc.ini.j2      |   4 +
 .../geerlingguy.php/templates/fpm-init.j2     | 170 +++++++++++++
 .../geerlingguy.php/templates/opcache.ini.j2  |  14 ++
 .../geerlingguy.php/templates/php-fpm.conf.j2 |  12 +
 .../geerlingguy.php/templates/php.ini.j2      | 225 ++++++++++++++++++
 .../geerlingguy.php/templates/www.conf.j2     |  12 +
 .../geerlingguy.php/tests/Dockerfile.centos-7 |  27 +++
 .../tests/Dockerfile.ubuntu-12.04             |  11 +
 .../tests/Dockerfile.ubuntu-14.04             |  11 +
 .../roles/geerlingguy.php/tests/inventory     |   1 +
 .../geerlingguy.php/tests/requirements.yml    |   2 +
 .../geerlingguy.php/tests/test-package.yml    |  27 +++
 .../geerlingguy.php/tests/test-source.yml     |  18 ++
 .../tests/test-vars-ubuntu1204.yml            |  23 ++
 .../roles/geerlingguy.php/vars/Debian.yml     |  37 +++
 .../roles/geerlingguy.php/vars/RedHat.yml     |  33 +++
 .../roles/geerlingguy.pimpmylog/.travis.yml   |  41 ++++
 .../roles/geerlingguy.pimpmylog/README.md     |  49 ++++
 .../geerlingguy.pimpmylog/defaults/main.yml   |   5 +
 .../meta/.galaxy_install_info                 |   1 +
 .../roles/geerlingguy.pimpmylog/meta/main.yml |  23 ++
 .../geerlingguy.pimpmylog/tasks/main.yml      |  14 ++
 .../geerlingguy.pimpmylog/tests/inventory     |   1 +
 .../geerlingguy.pimpmylog/tests/test.yml      |  11 +
 .../roles/geerlingguy.postfix/.travis.yml     |  36 +++
 .../roles/geerlingguy.postfix/README.md       |  31 +++
 .../geerlingguy.postfix/defaults/main.yml     |   1 +
 .../meta/.galaxy_install_info                 |   1 +
 .../roles/geerlingguy.postfix/meta/main.yml   |  23 ++
 .../roles/geerlingguy.postfix/tasks/main.yml  |  11 +
 .../roles/geerlingguy.postfix/tests/inventory |   1 +
 .../roles/geerlingguy.postfix/tests/test.yml  |   5 +
 .../roles/geerlingguy.redis/.travis.yml       |  47 ++++
 .../roles/geerlingguy.redis/README.md         |  92 +++++++
 .../roles/geerlingguy.redis/defaults/main.yml |  30 +++
 .../roles/geerlingguy.redis/handlers/main.yml |   3 +
 .../meta/.galaxy_install_info                 |   1 +
 .../roles/geerlingguy.redis/meta/main.yml     |  24 ++
 .../roles/geerlingguy.redis/tasks/main.yml    |  21 ++
 .../geerlingguy.redis/tasks/setup-Debian.yml  |   3 +
 .../geerlingguy.redis/tasks/setup-RedHat.yml  |   3 +
 .../geerlingguy.redis/templates/redis.conf.j2 |  45 ++++
 .../roles/geerlingguy.redis/tests/inventory   |   1 +
 .../roles/geerlingguy.redis/tests/test.yml    |   6 +
 .../roles/geerlingguy.redis/vars/Debian.yml   |   3 +
 .../roles/geerlingguy.redis/vars/RedHat.yml   |   3 +
 .../roles/geerlingguy.repo-remi/.travis.yml   |  48 ++++
 .../roles/geerlingguy.repo-remi/README.md     |  39 +++
 .../geerlingguy.repo-remi/defaults/main.yml   |   3 +
 .../meta/.galaxy_install_info                 |   1 +
 .../roles/geerlingguy.repo-remi/meta/main.yml |  15 ++
 .../geerlingguy.repo-remi/tasks/main.yml      |  10 +
 .../tests/Dockerfile.centos-6                 |  19 ++
 .../tests/Dockerfile.centos-7                 |  29 +++
 .../tests/requirements.yml                    |   2 +
 .../geerlingguy.repo-remi/tests/test.yml      |   5 +
 .../roles/geerlingguy.ruby/.travis.yml        |  61 +++++
 provisioning/roles/geerlingguy.ruby/README.md |  59 +++++
 .../roles/geerlingguy.ruby/defaults/main.yml  |  16 ++
 .../meta/.galaxy_install_info                 |   1 +
 .../roles/geerlingguy.ruby/meta/main.yml      |  45 ++++
 .../tasks/install-from-source.yml             |  60 +++++
 .../roles/geerlingguy.ruby/tasks/main.yml     |  26 ++
 .../geerlingguy.ruby/tasks/setup-Debian.yml   |  14 ++
 .../geerlingguy.ruby/tasks/setup-RedHat.yml   |   6 +
 .../roles/geerlingguy.ruby/tests/inventory    |   1 +
 .../tests/test-install-from-source.yml        |  11 +
 .../tests/test-install-package.yml            |   5 +
 .../roles/geerlingguy.security/.travis.yml    |  57 +++++
 .../roles/geerlingguy.security/README.md      |  79 ++++++
 .../geerlingguy.security/defaults/main.yml    |  10 +
 .../geerlingguy.security/handlers/main.yml    |   3 +
 .../meta/.galaxy_install_info                 |   1 +
 .../roles/geerlingguy.security/meta/main.yml  |  22 ++
 .../tasks/autoupdate-Debian.yml               |  14 ++
 .../tasks/autoupdate-RedHat.yml               |  13 +
 .../tasks/fail2ban-Debian.yml                 |   3 +
 .../tasks/fail2ban-RedHat.yml                 |   3 +
 .../roles/geerlingguy.security/tasks/main.yml |  24 ++
 .../roles/geerlingguy.security/tasks/ssh.yml  |  35 +++
 .../templates/10periodic.j2                   |   4 +
 .../templates/50unattended-upgrades.j2        |   6 +
 .../tests/Dockerfile.centos-6                 |  15 ++
 .../tests/Dockerfile.centos-7                 |  27 +++
 .../tests/Dockerfile.ubuntu-12.04             |  11 +
 .../tests/Dockerfile.ubuntu-14.04             |  17 ++
 .../roles/geerlingguy.security/tests/test.yml |  19 ++
 .../geerlingguy.security/vars/Debian.yml      |   3 +
 .../geerlingguy.security/vars/RedHat.yml      |   3 +
 .../roles/geerlingguy.solr/.travis.yml        |  68 ++++++
 provisioning/roles/geerlingguy.solr/README.md |  86 +++++++
 .../roles/geerlingguy.solr/defaults/main.yml  |  26 ++
 .../roles/geerlingguy.solr/handlers/main.yml  |   6 +
 .../meta/.galaxy_install_info                 |   1 +
 .../roles/geerlingguy.solr/meta/main.yml      |  22 ++
 .../geerlingguy.solr/tasks/configure.yml      |  20 ++
 .../roles/geerlingguy.solr/tasks/cores.yml    |  26 ++
 .../geerlingguy.solr/tasks/install-pre5.yml   |  70 ++++++
 .../roles/geerlingguy.solr/tasks/install.yml  |  15 ++
 .../roles/geerlingguy.solr/tasks/main.yml     |  48 ++++
 .../roles/geerlingguy.solr/tasks/user.yml     |   9 +
 .../templates/solr-init-Debian-pre5.j2        |  94 ++++++++
 .../templates/solr-init-RedHat-pre5.j2        |  91 +++++++
 .../tests/Dockerfile.centos-7                 |  27 +++
 .../tests/Dockerfile.ubuntu-12.04             |  11 +
 .../tests/Dockerfile.ubuntu-14.04             |  11 +
 .../geerlingguy.solr/tests/requirements.yml   |   2 +
 .../geerlingguy.solr/tests/test-solr-3.yml    |  11 +
 .../geerlingguy.solr/tests/test-solr-4.yml    |  11 +
 .../geerlingguy.solr/tests/test-solr-5.yml    |  11 +
 .../geerlingguy.solr/tests/test-solr-6.yml    |  21 ++
 .../roles/geerlingguy.varnish/.gitignore      |   1 +
 .../roles/geerlingguy.varnish/.travis.yml     |  54 +++++
 .../roles/geerlingguy.varnish/README.md       |  77 ++++++
 .../geerlingguy.varnish/defaults/main.yml     |  12 +
 .../geerlingguy.varnish/handlers/main.yml     |   6 +
 .../meta/.galaxy_install_info                 |   1 +
 .../roles/geerlingguy.varnish/meta/main.yml   |  23 ++
 .../roles/geerlingguy.varnish/tasks/main.yml  |  72 ++++++
 .../tasks/setup-Debian.yml                    |  13 +
 .../tasks/setup-RedHat.yml                    |  21 ++
 .../templates/default.vcl.j2                  |  11 +
 .../geerlingguy.varnish/templates/secret.j2   |   1 +
 .../geerlingguy.varnish/templates/varnish.j2  | 110 +++++++++
 .../templates/varnish.params.j2               |  35 +++
 .../templates/varnish.service.j2              |  12 +
 .../tests/Dockerfile.centos-6                 |  15 ++
 .../tests/Dockerfile.centos-7                 |  27 +++
 .../tests/Dockerfile.ubuntu-12.04             |  11 +
 .../tests/Dockerfile.ubuntu-14.04             |  17 ++
 .../roles/geerlingguy.varnish/tests/test.yml  |  20 ++
 .../roles/geerlingguy.varnish/vars/Debian.yml |   3 +
 .../roles/geerlingguy.varnish/vars/RedHat.yml |   2 +
 524 files changed, 13018 insertions(+)
 create mode 100644 provisioning/roles/arknoll.selenium/.gitignore
 create mode 100644 provisioning/roles/arknoll.selenium/.travis.yml
 create mode 100644 provisioning/roles/arknoll.selenium/LICENSE.txt
 create mode 100644 provisioning/roles/arknoll.selenium/README.md
 create mode 100644 provisioning/roles/arknoll.selenium/defaults/main.yml
 create mode 100644 provisioning/roles/arknoll.selenium/handlers/main.yml
 create mode 100644 provisioning/roles/arknoll.selenium/meta/.galaxy_install_info
 create mode 100644 provisioning/roles/arknoll.selenium/meta/main.yml
 create mode 100644 provisioning/roles/arknoll.selenium/tasks/main.yml
 create mode 100644 provisioning/roles/arknoll.selenium/templates/selenium-init-Debian.j2
 create mode 100644 provisioning/roles/arknoll.selenium/templates/selenium-init-RedHat.j2
 create mode 100644 provisioning/roles/arknoll.selenium/tests/inventory
 create mode 100644 provisioning/roles/arknoll.selenium/tests/test.yml
 create mode 100644 provisioning/roles/arknoll.selenium/vars/main.yml
 create mode 100644 provisioning/roles/franklinkim.newrelic/.clog.toml
 create mode 100644 provisioning/roles/franklinkim.newrelic/.editorconfig
 create mode 100644 provisioning/roles/franklinkim.newrelic/.gitignore
 create mode 100644 provisioning/roles/franklinkim.newrelic/.travis.yml
 create mode 100644 provisioning/roles/franklinkim.newrelic/CHANGELOG.md
 create mode 100644 provisioning/roles/franklinkim.newrelic/LICENSE
 create mode 100644 provisioning/roles/franklinkim.newrelic/README.md
 create mode 100644 provisioning/roles/franklinkim.newrelic/Vagrantfile
 create mode 100644 provisioning/roles/franklinkim.newrelic/defaults/main.yml
 create mode 100644 provisioning/roles/franklinkim.newrelic/handlers/main.yml
 create mode 100644 provisioning/roles/franklinkim.newrelic/meta/main.yml
 create mode 100644 provisioning/roles/franklinkim.newrelic/meta/readme.yml
 create mode 100644 provisioning/roles/franklinkim.newrelic/tasks/install.yml
 create mode 100644 provisioning/roles/franklinkim.newrelic/tasks/install_debian.yml
 create mode 100644 provisioning/roles/franklinkim.newrelic/tasks/install_redhat.yml
 create mode 100644 provisioning/roles/franklinkim.newrelic/tasks/main.yml
 create mode 100644 provisioning/roles/franklinkim.newrelic/tasks/service.yml
 create mode 100644 provisioning/roles/franklinkim.newrelic/templates/etc/newrelic/nrsysmond.cfg.j2
 create mode 100644 provisioning/roles/franklinkim.newrelic/tests/main.yml
 create mode 100755 provisioning/roles/franklinkim.newrelic/tests/run.sh
 create mode 100644 provisioning/roles/geerlingguy.adminer/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.adminer/README.md
 create mode 100644 provisioning/roles/geerlingguy.adminer/defaults/main.yml
 create mode 100644 provisioning/roles/geerlingguy.adminer/meta/.galaxy_install_info
 create mode 100644 provisioning/roles/geerlingguy.adminer/meta/main.yml
 create mode 100644 provisioning/roles/geerlingguy.adminer/tasks/main.yml
 create mode 100644 provisioning/roles/geerlingguy.adminer/templates/adminer.conf.j2
 create mode 100644 provisioning/roles/geerlingguy.adminer/tests/Dockerfile.centos-6
 create mode 100644 provisioning/roles/geerlingguy.adminer/tests/Dockerfile.centos-7
 create mode 100644 provisioning/roles/geerlingguy.adminer/tests/Dockerfile.ubuntu-12.04
 create mode 100644 provisioning/roles/geerlingguy.adminer/tests/Dockerfile.ubuntu-14.04
 create mode 100644 provisioning/roles/geerlingguy.adminer/tests/test-apache.yml
 create mode 100644 provisioning/roles/geerlingguy.adminer/tests/test-standalone.yml
 create mode 100644 provisioning/roles/geerlingguy.apache-php-fpm/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.apache-php-fpm/README.md
 create mode 100644 provisioning/roles/geerlingguy.apache-php-fpm/meta/.galaxy_install_info
 create mode 100644 provisioning/roles/geerlingguy.apache-php-fpm/meta/main.yml
 create mode 100644 provisioning/roles/geerlingguy.apache-php-fpm/tasks/configure-Debian.yml
 create mode 100644 provisioning/roles/geerlingguy.apache-php-fpm/tasks/configure-RedHat.yml
 create mode 100644 provisioning/roles/geerlingguy.apache-php-fpm/tasks/main.yml
 create mode 100644 provisioning/roles/geerlingguy.apache-php-fpm/tests/Dockerfile.centos-7
 create mode 100644 provisioning/roles/geerlingguy.apache-php-fpm/tests/Dockerfile.ubuntu-12.04
 create mode 100644 provisioning/roles/geerlingguy.apache-php-fpm/tests/Dockerfile.ubuntu-14.04
 create mode 100644 provisioning/roles/geerlingguy.apache-php-fpm/tests/test.yml
 create mode 100644 provisioning/roles/geerlingguy.apache/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.apache/README.md
 create mode 100644 provisioning/roles/geerlingguy.apache/defaults/main.yml
 create mode 100644 provisioning/roles/geerlingguy.apache/handlers/main.yml
 create mode 100644 provisioning/roles/geerlingguy.apache/meta/.galaxy_install_info
 create mode 100644 provisioning/roles/geerlingguy.apache/meta/main.yml
 create mode 100644 provisioning/roles/geerlingguy.apache/tasks/configure-Debian.yml
 create mode 100644 provisioning/roles/geerlingguy.apache/tasks/configure-RedHat.yml
 create mode 100644 provisioning/roles/geerlingguy.apache/tasks/configure-Solaris.yml
 create mode 100644 provisioning/roles/geerlingguy.apache/tasks/configure-Suse.yml
 create mode 100644 provisioning/roles/geerlingguy.apache/tasks/main.yml
 create mode 100644 provisioning/roles/geerlingguy.apache/tasks/setup-Debian.yml
 create mode 100644 provisioning/roles/geerlingguy.apache/tasks/setup-RedHat.yml
 create mode 100644 provisioning/roles/geerlingguy.apache/tasks/setup-Solaris.yml
 create mode 100644 provisioning/roles/geerlingguy.apache/tasks/setup-Suse.yml
 create mode 100644 provisioning/roles/geerlingguy.apache/templates/vhosts.conf.j2
 create mode 100644 provisioning/roles/geerlingguy.apache/tests/Dockerfile.centos-6
 create mode 100644 provisioning/roles/geerlingguy.apache/tests/Dockerfile.centos-7
 create mode 100644 provisioning/roles/geerlingguy.apache/tests/Dockerfile.ubuntu-12.04
 create mode 100644 provisioning/roles/geerlingguy.apache/tests/Dockerfile.ubuntu-14.04
 create mode 100644 provisioning/roles/geerlingguy.apache/tests/test.yml
 create mode 100644 provisioning/roles/geerlingguy.apache/vars/Debian.yml
 create mode 100644 provisioning/roles/geerlingguy.apache/vars/RedHat.yml
 create mode 100644 provisioning/roles/geerlingguy.apache/vars/Solaris.yml
 create mode 100644 provisioning/roles/geerlingguy.apache/vars/Suse.yml
 create mode 100644 provisioning/roles/geerlingguy.apache/vars/apache-22.yml
 create mode 100644 provisioning/roles/geerlingguy.apache/vars/apache-24.yml
 create mode 100644 provisioning/roles/geerlingguy.blackfire/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.blackfire/README.md
 create mode 100644 provisioning/roles/geerlingguy.blackfire/defaults/main.yml
 create mode 100644 provisioning/roles/geerlingguy.blackfire/meta/.galaxy_install_info
 create mode 100644 provisioning/roles/geerlingguy.blackfire/meta/main.yml
 create mode 100644 provisioning/roles/geerlingguy.blackfire/tasks/main.yml
 create mode 100644 provisioning/roles/geerlingguy.blackfire/tasks/setup-Debian.yml
 create mode 100644 provisioning/roles/geerlingguy.blackfire/tasks/setup-RedHat.yml
 create mode 100644 provisioning/roles/geerlingguy.blackfire/tests/Dockerfile.centos-7
 create mode 100644 provisioning/roles/geerlingguy.blackfire/tests/Dockerfile.ubuntu-12.04
 create mode 100644 provisioning/roles/geerlingguy.blackfire/tests/Dockerfile.ubuntu-14.04
 create mode 100644 provisioning/roles/geerlingguy.blackfire/tests/test.yml
 create mode 100644 provisioning/roles/geerlingguy.composer/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.composer/README.md
 create mode 100644 provisioning/roles/geerlingguy.composer/defaults/main.yml
 create mode 100644 provisioning/roles/geerlingguy.composer/meta/.galaxy_install_info
 create mode 100644 provisioning/roles/geerlingguy.composer/meta/main.yml
 create mode 100644 provisioning/roles/geerlingguy.composer/tasks/global-require.yml
 create mode 100644 provisioning/roles/geerlingguy.composer/tasks/main.yml
 create mode 100644 provisioning/roles/geerlingguy.composer/templates/auth.json.j2
 create mode 100644 provisioning/roles/geerlingguy.composer/templates/composer.sh.j2
 create mode 100644 provisioning/roles/geerlingguy.composer/tests/Dockerfile.centos-7
 create mode 100644 provisioning/roles/geerlingguy.composer/tests/Dockerfile.ubuntu-14.04
 create mode 100644 provisioning/roles/geerlingguy.composer/tests/initctl_faker
 create mode 100644 provisioning/roles/geerlingguy.composer/tests/inventory
 create mode 100644 provisioning/roles/geerlingguy.composer/tests/requirements.yml
 create mode 100644 provisioning/roles/geerlingguy.composer/tests/test.yml
 create mode 100644 provisioning/roles/geerlingguy.daemonize/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.daemonize/README.md
 create mode 100644 provisioning/roles/geerlingguy.daemonize/defaults/main.yml
 create mode 100644 provisioning/roles/geerlingguy.daemonize/meta/.galaxy_install_info
 create mode 100644 provisioning/roles/geerlingguy.daemonize/meta/main.yml
 create mode 100644 provisioning/roles/geerlingguy.daemonize/tasks/main.yml
 create mode 100644 provisioning/roles/geerlingguy.daemonize/tests/Dockerfile.centos-6
 create mode 100644 provisioning/roles/geerlingguy.daemonize/tests/Dockerfile.centos-7
 create mode 100644 provisioning/roles/geerlingguy.daemonize/tests/Dockerfile.ubuntu-12.04
 create mode 100644 provisioning/roles/geerlingguy.daemonize/tests/Dockerfile.ubuntu-14.04
 create mode 100644 provisioning/roles/geerlingguy.daemonize/tests/test.yml
 create mode 100644 provisioning/roles/geerlingguy.drupal-console/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.drupal-console/README.md
 create mode 100644 provisioning/roles/geerlingguy.drupal-console/defaults/main.yml
 create mode 100644 provisioning/roles/geerlingguy.drupal-console/meta/.galaxy_install_info
 create mode 100644 provisioning/roles/geerlingguy.drupal-console/meta/main.yml
 create mode 100644 provisioning/roles/geerlingguy.drupal-console/tasks/main.yml
 create mode 100644 provisioning/roles/geerlingguy.drupal-console/tests/inventory
 create mode 100644 provisioning/roles/geerlingguy.drupal-console/tests/test-self-update.yml
 create mode 100644 provisioning/roles/geerlingguy.drupal-console/tests/test.yml
 create mode 100644 provisioning/roles/geerlingguy.drush/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.drush/README.md
 create mode 100644 provisioning/roles/geerlingguy.drush/defaults/main.yml
 create mode 100644 provisioning/roles/geerlingguy.drush/meta/.galaxy_install_info
 create mode 100644 provisioning/roles/geerlingguy.drush/meta/main.yml
 create mode 100644 provisioning/roles/geerlingguy.drush/tasks/main.yml
 create mode 100644 provisioning/roles/geerlingguy.drush/tests/inventory
 create mode 100644 provisioning/roles/geerlingguy.drush/tests/test.yml
 create mode 100644 provisioning/roles/geerlingguy.elasticsearch/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.elasticsearch/README.md
 create mode 100644 provisioning/roles/geerlingguy.elasticsearch/defaults/main.yml
 create mode 100644 provisioning/roles/geerlingguy.elasticsearch/files/elasticsearch.repo
 create mode 100644 provisioning/roles/geerlingguy.elasticsearch/handlers/main.yml
 create mode 100644 provisioning/roles/geerlingguy.elasticsearch/meta/.galaxy_install_info
 create mode 100644 provisioning/roles/geerlingguy.elasticsearch/meta/main.yml
 create mode 100644 provisioning/roles/geerlingguy.elasticsearch/tasks/main.yml
 create mode 100644 provisioning/roles/geerlingguy.elasticsearch/tasks/setup-Debian.yml
 create mode 100644 provisioning/roles/geerlingguy.elasticsearch/tasks/setup-RedHat.yml
 create mode 100644 provisioning/roles/geerlingguy.elasticsearch/templates/elasticsearch.yml.j2
 create mode 100644 provisioning/roles/geerlingguy.elasticsearch/tests/Dockerfile.centos-6
 create mode 100644 provisioning/roles/geerlingguy.elasticsearch/tests/Dockerfile.centos-7
 create mode 100644 provisioning/roles/geerlingguy.elasticsearch/tests/Dockerfile.ubuntu-12.04
 create mode 100644 provisioning/roles/geerlingguy.elasticsearch/tests/Dockerfile.ubuntu-14.04
 create mode 100644 provisioning/roles/geerlingguy.elasticsearch/tests/test.yml
 create mode 100644 provisioning/roles/geerlingguy.firewall/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.firewall/README.md
 create mode 100644 provisioning/roles/geerlingguy.firewall/defaults/main.yml
 create mode 100644 provisioning/roles/geerlingguy.firewall/handlers/main.yml
 create mode 100644 provisioning/roles/geerlingguy.firewall/meta/.galaxy_install_info
 create mode 100644 provisioning/roles/geerlingguy.firewall/meta/main.yml
 create mode 100644 provisioning/roles/geerlingguy.firewall/tasks/main.yml
 create mode 100755 provisioning/roles/geerlingguy.firewall/templates/firewall.bash.j2
 create mode 100644 provisioning/roles/geerlingguy.firewall/templates/firewall.j2
 create mode 100644 provisioning/roles/geerlingguy.firewall/tests/inventory
 create mode 100644 provisioning/roles/geerlingguy.firewall/tests/test.yml
 create mode 100644 provisioning/roles/geerlingguy.git/.gitignore
 create mode 100644 provisioning/roles/geerlingguy.git/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.git/README.md
 create mode 100644 provisioning/roles/geerlingguy.git/defaults/main.yml
 create mode 100644 provisioning/roles/geerlingguy.git/meta/.galaxy_install_info
 create mode 100644 provisioning/roles/geerlingguy.git/meta/main.yml
 create mode 100644 provisioning/roles/geerlingguy.git/tasks/install-from-source.yml
 create mode 100644 provisioning/roles/geerlingguy.git/tasks/main.yml
 create mode 100644 provisioning/roles/geerlingguy.git/tests/Dockerfile.centos-6
 create mode 100644 provisioning/roles/geerlingguy.git/tests/Dockerfile.centos-7
 create mode 100644 provisioning/roles/geerlingguy.git/tests/Dockerfile.ubuntu-12.04
 create mode 100644 provisioning/roles/geerlingguy.git/tests/Dockerfile.ubuntu-14.04
 create mode 100644 provisioning/roles/geerlingguy.git/tests/test-package.yml
 create mode 100644 provisioning/roles/geerlingguy.git/tests/test-source.yml
 create mode 100644 provisioning/roles/geerlingguy.git/vars/main.yml
 create mode 100644 provisioning/roles/geerlingguy.java/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.java/README.md
 create mode 100644 provisioning/roles/geerlingguy.java/defaults/main.yml
 create mode 100644 provisioning/roles/geerlingguy.java/meta/.galaxy_install_info
 create mode 100644 provisioning/roles/geerlingguy.java/meta/main.yml
 create mode 100644 provisioning/roles/geerlingguy.java/tasks/main.yml
 create mode 100644 provisioning/roles/geerlingguy.java/tasks/setup-Debian.yml
 create mode 100644 provisioning/roles/geerlingguy.java/tasks/setup-FreeBSD.yml
 create mode 100644 provisioning/roles/geerlingguy.java/tasks/setup-RedHat.yml
 create mode 100644 provisioning/roles/geerlingguy.java/tests/Dockerfile.centos-6
 create mode 100644 provisioning/roles/geerlingguy.java/tests/Dockerfile.centos-7
 create mode 100644 provisioning/roles/geerlingguy.java/tests/Dockerfile.ubuntu-12.04
 create mode 100644 provisioning/roles/geerlingguy.java/tests/Dockerfile.ubuntu-14.04
 create mode 100644 provisioning/roles/geerlingguy.java/tests/test.yml
 create mode 100644 provisioning/roles/geerlingguy.java/vars/Debian.yml
 create mode 100644 provisioning/roles/geerlingguy.java/vars/FreeBSD.yml
 create mode 100644 provisioning/roles/geerlingguy.java/vars/RedHat.yml
 create mode 100644 provisioning/roles/geerlingguy.java/vars/Ubuntu-12.04.yml
 create mode 100644 provisioning/roles/geerlingguy.java/vars/Ubuntu-14.04.yml
 create mode 100644 provisioning/roles/geerlingguy.java/vars/Ubuntu-16.04.yml
 create mode 100644 provisioning/roles/geerlingguy.mailhog/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.mailhog/README.md
 create mode 100644 provisioning/roles/geerlingguy.mailhog/defaults/main.yml
 create mode 100644 provisioning/roles/geerlingguy.mailhog/meta/.galaxy_install_info
 create mode 100644 provisioning/roles/geerlingguy.mailhog/meta/main.yml
 create mode 100644 provisioning/roles/geerlingguy.mailhog/tasks/main.yml
 create mode 100644 provisioning/roles/geerlingguy.mailhog/templates/mailhog.init.j2
 create mode 100644 provisioning/roles/geerlingguy.mailhog/tests/Dockerfile.centos-6
 create mode 100644 provisioning/roles/geerlingguy.mailhog/tests/Dockerfile.centos-7
 create mode 100644 provisioning/roles/geerlingguy.mailhog/tests/Dockerfile.ubuntu-12.04
 create mode 100644 provisioning/roles/geerlingguy.mailhog/tests/Dockerfile.ubuntu-14.04
 create mode 100644 provisioning/roles/geerlingguy.mailhog/tests/message
 create mode 100644 provisioning/roles/geerlingguy.mailhog/tests/test.yml
 create mode 100644 provisioning/roles/geerlingguy.memcached/.gitignore
 create mode 100644 provisioning/roles/geerlingguy.memcached/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.memcached/README.md
 create mode 100644 provisioning/roles/geerlingguy.memcached/defaults/main.yml
 create mode 100644 provisioning/roles/geerlingguy.memcached/handlers/main.yml
 create mode 100644 provisioning/roles/geerlingguy.memcached/meta/.galaxy_install_info
 create mode 100644 provisioning/roles/geerlingguy.memcached/meta/main.yml
 create mode 100644 provisioning/roles/geerlingguy.memcached/tasks/main.yml
 create mode 100644 provisioning/roles/geerlingguy.memcached/tasks/setup-Debian.yml
 create mode 100644 provisioning/roles/geerlingguy.memcached/tasks/setup-RedHat.yml
 create mode 100644 provisioning/roles/geerlingguy.memcached/templates/memcached-Debian.conf.j2
 create mode 100644 provisioning/roles/geerlingguy.memcached/templates/memcached-RedHat.conf.j2
 create mode 100644 provisioning/roles/geerlingguy.memcached/tests/inventory
 create mode 100644 provisioning/roles/geerlingguy.memcached/tests/test.yml
 create mode 100644 provisioning/roles/geerlingguy.memcached/vars/Debian.yml
 create mode 100644 provisioning/roles/geerlingguy.memcached/vars/RedHat.yml
 create mode 100644 provisioning/roles/geerlingguy.mysql/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.mysql/README.md
 create mode 100644 provisioning/roles/geerlingguy.mysql/defaults/main.yml
 create mode 100644 provisioning/roles/geerlingguy.mysql/handlers/main.yml
 create mode 100644 provisioning/roles/geerlingguy.mysql/meta/.galaxy_install_info
 create mode 100644 provisioning/roles/geerlingguy.mysql/meta/main.yml
 create mode 100644 provisioning/roles/geerlingguy.mysql/tasks/configure.yml
 create mode 100644 provisioning/roles/geerlingguy.mysql/tasks/databases.yml
 create mode 100644 provisioning/roles/geerlingguy.mysql/tasks/main.yml
 create mode 100644 provisioning/roles/geerlingguy.mysql/tasks/replication.yml
 create mode 100644 provisioning/roles/geerlingguy.mysql/tasks/secure-installation.yml
 create mode 100644 provisioning/roles/geerlingguy.mysql/tasks/setup-Debian.yml
 create mode 100644 provisioning/roles/geerlingguy.mysql/tasks/setup-RedHat.yml
 create mode 100644 provisioning/roles/geerlingguy.mysql/tasks/users.yml
 create mode 100644 provisioning/roles/geerlingguy.mysql/templates/my.cnf.j2
 create mode 100644 provisioning/roles/geerlingguy.mysql/templates/user-my.cnf.j2
 create mode 100644 provisioning/roles/geerlingguy.mysql/tests/Dockerfile.centos-6
 create mode 100644 provisioning/roles/geerlingguy.mysql/tests/Dockerfile.centos-7
 create mode 100644 provisioning/roles/geerlingguy.mysql/tests/Dockerfile.ubuntu-12.04
 create mode 100644 provisioning/roles/geerlingguy.mysql/tests/Dockerfile.ubuntu-14.04
 create mode 100644 provisioning/roles/geerlingguy.mysql/tests/centos-7-test.yml
 create mode 100644 provisioning/roles/geerlingguy.mysql/tests/initctl_faker
 create mode 100644 provisioning/roles/geerlingguy.mysql/tests/inventory
 create mode 100644 provisioning/roles/geerlingguy.mysql/tests/test.yml
 create mode 100644 provisioning/roles/geerlingguy.mysql/vars/Debian.yml
 create mode 100644 provisioning/roles/geerlingguy.mysql/vars/RedHat-6.yml
 create mode 100644 provisioning/roles/geerlingguy.mysql/vars/RedHat-7.yml
 create mode 100644 provisioning/roles/geerlingguy.nginx/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.nginx/README.md
 create mode 100644 provisioning/roles/geerlingguy.nginx/defaults/main.yml
 create mode 100644 provisioning/roles/geerlingguy.nginx/handlers/main.yml
 create mode 100644 provisioning/roles/geerlingguy.nginx/meta/.galaxy_install_info
 create mode 100644 provisioning/roles/geerlingguy.nginx/meta/main.yml
 create mode 100644 provisioning/roles/geerlingguy.nginx/tasks/main.yml
 create mode 100644 provisioning/roles/geerlingguy.nginx/tasks/setup-Debian.yml
 create mode 100644 provisioning/roles/geerlingguy.nginx/tasks/setup-FreeBSD.yml
 create mode 100644 provisioning/roles/geerlingguy.nginx/tasks/setup-RedHat.yml
 create mode 100644 provisioning/roles/geerlingguy.nginx/tasks/setup-Ubuntu.yml
 create mode 100644 provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml
 create mode 100644 provisioning/roles/geerlingguy.nginx/templates/nginx.conf.j2
 create mode 100644 provisioning/roles/geerlingguy.nginx/templates/nginx.repo.j2
 create mode 100644 provisioning/roles/geerlingguy.nginx/templates/vhosts.j2
 create mode 100644 provisioning/roles/geerlingguy.nginx/tests/inventory
 create mode 100644 provisioning/roles/geerlingguy.nginx/tests/test.yml
 create mode 100644 provisioning/roles/geerlingguy.nginx/vars/Debian.yml
 create mode 100644 provisioning/roles/geerlingguy.nginx/vars/FreeBSD.yml
 create mode 100644 provisioning/roles/geerlingguy.nginx/vars/RedHat.yml
 create mode 100644 provisioning/roles/geerlingguy.nodejs/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.nodejs/README.md
 create mode 100644 provisioning/roles/geerlingguy.nodejs/defaults/main.yml
 create mode 100644 provisioning/roles/geerlingguy.nodejs/meta/.galaxy_install_info
 create mode 100644 provisioning/roles/geerlingguy.nodejs/meta/main.yml
 create mode 100644 provisioning/roles/geerlingguy.nodejs/tasks/main.yml
 create mode 100644 provisioning/roles/geerlingguy.nodejs/tasks/setup-Debian.yml
 create mode 100644 provisioning/roles/geerlingguy.nodejs/tasks/setup-RedHat.yml
 create mode 100644 provisioning/roles/geerlingguy.nodejs/templates/npm.sh.j2
 create mode 100644 provisioning/roles/geerlingguy.nodejs/tests/Dockerfile.centos-6
 create mode 100644 provisioning/roles/geerlingguy.nodejs/tests/Dockerfile.centos-7
 create mode 100644 provisioning/roles/geerlingguy.nodejs/tests/Dockerfile.ubuntu-12.04
 create mode 100644 provisioning/roles/geerlingguy.nodejs/tests/Dockerfile.ubuntu-14.04
 create mode 100644 provisioning/roles/geerlingguy.nodejs/tests/test.yml
 create mode 100644 provisioning/roles/geerlingguy.php-memcached/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.php-memcached/README.md
 create mode 100644 provisioning/roles/geerlingguy.php-memcached/defaults/main.yml
 create mode 100644 provisioning/roles/geerlingguy.php-memcached/meta/.galaxy_install_info
 create mode 100644 provisioning/roles/geerlingguy.php-memcached/meta/main.yml
 create mode 100644 provisioning/roles/geerlingguy.php-memcached/tasks/main.yml
 create mode 100644 provisioning/roles/geerlingguy.php-memcached/tests/inventory
 create mode 100644 provisioning/roles/geerlingguy.php-memcached/tests/memcached-test.php
 create mode 100644 provisioning/roles/geerlingguy.php-memcached/tests/test.yml
 create mode 100644 provisioning/roles/geerlingguy.php-memcached/vars/Debian.yml
 create mode 100644 provisioning/roles/geerlingguy.php-memcached/vars/RedHat.yml
 create mode 100644 provisioning/roles/geerlingguy.php-mysql/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.php-mysql/README.md
 create mode 100644 provisioning/roles/geerlingguy.php-mysql/defaults/main.yml
 create mode 100644 provisioning/roles/geerlingguy.php-mysql/meta/.galaxy_install_info
 create mode 100644 provisioning/roles/geerlingguy.php-mysql/meta/main.yml
 create mode 100644 provisioning/roles/geerlingguy.php-mysql/tasks/main.yml
 create mode 100644 provisioning/roles/geerlingguy.php-mysql/tests/Dockerfile.centos-6
 create mode 100644 provisioning/roles/geerlingguy.php-mysql/tests/Dockerfile.centos-7
 create mode 100644 provisioning/roles/geerlingguy.php-mysql/tests/Dockerfile.ubuntu-14.04
 create mode 100644 provisioning/roles/geerlingguy.php-mysql/tests/centos7-vars.yml
 create mode 100644 provisioning/roles/geerlingguy.php-mysql/tests/initctl_faker
 create mode 100644 provisioning/roles/geerlingguy.php-mysql/tests/inventory
 create mode 100644 provisioning/roles/geerlingguy.php-mysql/tests/requirements.yml
 create mode 100644 provisioning/roles/geerlingguy.php-mysql/tests/test.yml
 create mode 100644 provisioning/roles/geerlingguy.php-mysql/vars/Debian.yml
 create mode 100644 provisioning/roles/geerlingguy.php-mysql/vars/RedHat.yml
 create mode 100644 provisioning/roles/geerlingguy.php-pecl/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.php-pecl/README.md
 create mode 100644 provisioning/roles/geerlingguy.php-pecl/defaults/main.yml
 create mode 100644 provisioning/roles/geerlingguy.php-pecl/meta/.galaxy_install_info
 create mode 100644 provisioning/roles/geerlingguy.php-pecl/meta/main.yml
 create mode 100644 provisioning/roles/geerlingguy.php-pecl/tasks/main.yml
 create mode 100644 provisioning/roles/geerlingguy.php-pecl/tests/inventory
 create mode 100644 provisioning/roles/geerlingguy.php-pecl/tests/test.yml
 create mode 100644 provisioning/roles/geerlingguy.php-redis/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.php-redis/README.md
 create mode 100644 provisioning/roles/geerlingguy.php-redis/defaults/main.yml
 create mode 100644 provisioning/roles/geerlingguy.php-redis/files/redis.ini
 create mode 100644 provisioning/roles/geerlingguy.php-redis/meta/.galaxy_install_info
 create mode 100644 provisioning/roles/geerlingguy.php-redis/meta/main.yml
 create mode 100644 provisioning/roles/geerlingguy.php-redis/tasks/install-from-source.yml
 create mode 100644 provisioning/roles/geerlingguy.php-redis/tasks/main.yml
 create mode 100644 provisioning/roles/geerlingguy.php-redis/tests/inventory
 create mode 100644 provisioning/roles/geerlingguy.php-redis/tests/redis-test.php
 create mode 100644 provisioning/roles/geerlingguy.php-redis/tests/test.yml
 create mode 100644 provisioning/roles/geerlingguy.php-redis/vars/Debian.yml
 create mode 100644 provisioning/roles/geerlingguy.php-redis/vars/RedHat.yml
 create mode 100644 provisioning/roles/geerlingguy.php-xdebug/.gitignore
 create mode 100644 provisioning/roles/geerlingguy.php-xdebug/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.php-xdebug/README.md
 create mode 100644 provisioning/roles/geerlingguy.php-xdebug/defaults/main.yml
 create mode 100644 provisioning/roles/geerlingguy.php-xdebug/meta/.galaxy_install_info
 create mode 100644 provisioning/roles/geerlingguy.php-xdebug/meta/main.yml
 create mode 100644 provisioning/roles/geerlingguy.php-xdebug/tasks/configure.yml
 create mode 100644 provisioning/roles/geerlingguy.php-xdebug/tasks/main.yml
 create mode 100644 provisioning/roles/geerlingguy.php-xdebug/templates/xdebug.ini.j2
 create mode 100644 provisioning/roles/geerlingguy.php-xdebug/tests/Dockerfile.centos-6
 create mode 100644 provisioning/roles/geerlingguy.php-xdebug/tests/Dockerfile.centos-7
 create mode 100644 provisioning/roles/geerlingguy.php-xdebug/tests/Dockerfile.ubuntu-12.04
 create mode 100644 provisioning/roles/geerlingguy.php-xdebug/tests/Dockerfile.ubuntu-14.04
 create mode 100644 provisioning/roles/geerlingguy.php-xdebug/tests/inventory
 create mode 100644 provisioning/roles/geerlingguy.php-xdebug/tests/test-source.yml
 create mode 100644 provisioning/roles/geerlingguy.php-xdebug/tests/xdebug-test.php
 create mode 100644 provisioning/roles/geerlingguy.php-xdebug/vars/Debian.yml
 create mode 100644 provisioning/roles/geerlingguy.php-xdebug/vars/RedHat.yml
 create mode 100644 provisioning/roles/geerlingguy.php-xhprof/.gitignore
 create mode 100644 provisioning/roles/geerlingguy.php-xhprof/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.php-xhprof/README.md
 create mode 100644 provisioning/roles/geerlingguy.php-xhprof/defaults/main.yml
 create mode 100644 provisioning/roles/geerlingguy.php-xhprof/meta/.galaxy_install_info
 create mode 100644 provisioning/roles/geerlingguy.php-xhprof/meta/main.yml
 create mode 100644 provisioning/roles/geerlingguy.php-xhprof/tasks/configure.yml
 create mode 100644 provisioning/roles/geerlingguy.php-xhprof/tasks/main.yml
 create mode 100644 provisioning/roles/geerlingguy.php-xhprof/tasks/setup-Debian.yml
 create mode 100644 provisioning/roles/geerlingguy.php-xhprof/tasks/setup-RedHat.yml
 create mode 100644 provisioning/roles/geerlingguy.php-xhprof/templates/xhprof.ini.j2
 create mode 100644 provisioning/roles/geerlingguy.php-xhprof/tests/Dockerfile.centos-7
 create mode 100644 provisioning/roles/geerlingguy.php-xhprof/tests/Dockerfile.ubuntu-12.04
 create mode 100644 provisioning/roles/geerlingguy.php-xhprof/tests/Dockerfile.ubuntu-14.04
 create mode 100644 provisioning/roles/geerlingguy.php-xhprof/tests/inventory
 create mode 100644 provisioning/roles/geerlingguy.php-xhprof/tests/test-source.yml
 create mode 100644 provisioning/roles/geerlingguy.php-xhprof/tests/xhprof-test.php
 create mode 100644 provisioning/roles/geerlingguy.php-xhprof/vars/Debian.yml
 create mode 100644 provisioning/roles/geerlingguy.php-xhprof/vars/RedHat.yml
 create mode 100644 provisioning/roles/geerlingguy.php/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.php/README.md
 create mode 100644 provisioning/roles/geerlingguy.php/defaults/main.yml
 create mode 100644 provisioning/roles/geerlingguy.php/handlers/main.yml
 create mode 100644 provisioning/roles/geerlingguy.php/meta/.galaxy_install_info
 create mode 100644 provisioning/roles/geerlingguy.php/meta/main.yml
 create mode 100644 provisioning/roles/geerlingguy.php/tasks/configure-apcu.yml
 create mode 100644 provisioning/roles/geerlingguy.php/tasks/configure-fpm.yml
 create mode 100644 provisioning/roles/geerlingguy.php/tasks/configure-opcache.yml
 create mode 100644 provisioning/roles/geerlingguy.php/tasks/configure.yml
 create mode 100644 provisioning/roles/geerlingguy.php/tasks/install-from-source.yml
 create mode 100644 provisioning/roles/geerlingguy.php/tasks/main.yml
 create mode 100644 provisioning/roles/geerlingguy.php/tasks/setup-Debian.yml
 create mode 100644 provisioning/roles/geerlingguy.php/tasks/setup-RedHat.yml
 create mode 100644 provisioning/roles/geerlingguy.php/templates/apc.ini.j2
 create mode 100644 provisioning/roles/geerlingguy.php/templates/fpm-init.j2
 create mode 100644 provisioning/roles/geerlingguy.php/templates/opcache.ini.j2
 create mode 100644 provisioning/roles/geerlingguy.php/templates/php-fpm.conf.j2
 create mode 100644 provisioning/roles/geerlingguy.php/templates/php.ini.j2
 create mode 100644 provisioning/roles/geerlingguy.php/templates/www.conf.j2
 create mode 100644 provisioning/roles/geerlingguy.php/tests/Dockerfile.centos-7
 create mode 100644 provisioning/roles/geerlingguy.php/tests/Dockerfile.ubuntu-12.04
 create mode 100644 provisioning/roles/geerlingguy.php/tests/Dockerfile.ubuntu-14.04
 create mode 100644 provisioning/roles/geerlingguy.php/tests/inventory
 create mode 100644 provisioning/roles/geerlingguy.php/tests/requirements.yml
 create mode 100644 provisioning/roles/geerlingguy.php/tests/test-package.yml
 create mode 100644 provisioning/roles/geerlingguy.php/tests/test-source.yml
 create mode 100644 provisioning/roles/geerlingguy.php/tests/test-vars-ubuntu1204.yml
 create mode 100644 provisioning/roles/geerlingguy.php/vars/Debian.yml
 create mode 100644 provisioning/roles/geerlingguy.php/vars/RedHat.yml
 create mode 100644 provisioning/roles/geerlingguy.pimpmylog/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.pimpmylog/README.md
 create mode 100644 provisioning/roles/geerlingguy.pimpmylog/defaults/main.yml
 create mode 100644 provisioning/roles/geerlingguy.pimpmylog/meta/.galaxy_install_info
 create mode 100644 provisioning/roles/geerlingguy.pimpmylog/meta/main.yml
 create mode 100644 provisioning/roles/geerlingguy.pimpmylog/tasks/main.yml
 create mode 100644 provisioning/roles/geerlingguy.pimpmylog/tests/inventory
 create mode 100644 provisioning/roles/geerlingguy.pimpmylog/tests/test.yml
 create mode 100644 provisioning/roles/geerlingguy.postfix/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.postfix/README.md
 create mode 100644 provisioning/roles/geerlingguy.postfix/defaults/main.yml
 create mode 100644 provisioning/roles/geerlingguy.postfix/meta/.galaxy_install_info
 create mode 100644 provisioning/roles/geerlingguy.postfix/meta/main.yml
 create mode 100644 provisioning/roles/geerlingguy.postfix/tasks/main.yml
 create mode 100644 provisioning/roles/geerlingguy.postfix/tests/inventory
 create mode 100644 provisioning/roles/geerlingguy.postfix/tests/test.yml
 create mode 100644 provisioning/roles/geerlingguy.redis/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.redis/README.md
 create mode 100644 provisioning/roles/geerlingguy.redis/defaults/main.yml
 create mode 100644 provisioning/roles/geerlingguy.redis/handlers/main.yml
 create mode 100644 provisioning/roles/geerlingguy.redis/meta/.galaxy_install_info
 create mode 100644 provisioning/roles/geerlingguy.redis/meta/main.yml
 create mode 100644 provisioning/roles/geerlingguy.redis/tasks/main.yml
 create mode 100644 provisioning/roles/geerlingguy.redis/tasks/setup-Debian.yml
 create mode 100644 provisioning/roles/geerlingguy.redis/tasks/setup-RedHat.yml
 create mode 100644 provisioning/roles/geerlingguy.redis/templates/redis.conf.j2
 create mode 100644 provisioning/roles/geerlingguy.redis/tests/inventory
 create mode 100644 provisioning/roles/geerlingguy.redis/tests/test.yml
 create mode 100644 provisioning/roles/geerlingguy.redis/vars/Debian.yml
 create mode 100644 provisioning/roles/geerlingguy.redis/vars/RedHat.yml
 create mode 100644 provisioning/roles/geerlingguy.repo-remi/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.repo-remi/README.md
 create mode 100644 provisioning/roles/geerlingguy.repo-remi/defaults/main.yml
 create mode 100644 provisioning/roles/geerlingguy.repo-remi/meta/.galaxy_install_info
 create mode 100644 provisioning/roles/geerlingguy.repo-remi/meta/main.yml
 create mode 100644 provisioning/roles/geerlingguy.repo-remi/tasks/main.yml
 create mode 100644 provisioning/roles/geerlingguy.repo-remi/tests/Dockerfile.centos-6
 create mode 100644 provisioning/roles/geerlingguy.repo-remi/tests/Dockerfile.centos-7
 create mode 100644 provisioning/roles/geerlingguy.repo-remi/tests/requirements.yml
 create mode 100644 provisioning/roles/geerlingguy.repo-remi/tests/test.yml
 create mode 100644 provisioning/roles/geerlingguy.ruby/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.ruby/README.md
 create mode 100644 provisioning/roles/geerlingguy.ruby/defaults/main.yml
 create mode 100644 provisioning/roles/geerlingguy.ruby/meta/.galaxy_install_info
 create mode 100644 provisioning/roles/geerlingguy.ruby/meta/main.yml
 create mode 100644 provisioning/roles/geerlingguy.ruby/tasks/install-from-source.yml
 create mode 100644 provisioning/roles/geerlingguy.ruby/tasks/main.yml
 create mode 100644 provisioning/roles/geerlingguy.ruby/tasks/setup-Debian.yml
 create mode 100644 provisioning/roles/geerlingguy.ruby/tasks/setup-RedHat.yml
 create mode 100644 provisioning/roles/geerlingguy.ruby/tests/inventory
 create mode 100644 provisioning/roles/geerlingguy.ruby/tests/test-install-from-source.yml
 create mode 100644 provisioning/roles/geerlingguy.ruby/tests/test-install-package.yml
 create mode 100644 provisioning/roles/geerlingguy.security/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.security/README.md
 create mode 100644 provisioning/roles/geerlingguy.security/defaults/main.yml
 create mode 100644 provisioning/roles/geerlingguy.security/handlers/main.yml
 create mode 100644 provisioning/roles/geerlingguy.security/meta/.galaxy_install_info
 create mode 100644 provisioning/roles/geerlingguy.security/meta/main.yml
 create mode 100644 provisioning/roles/geerlingguy.security/tasks/autoupdate-Debian.yml
 create mode 100644 provisioning/roles/geerlingguy.security/tasks/autoupdate-RedHat.yml
 create mode 100644 provisioning/roles/geerlingguy.security/tasks/fail2ban-Debian.yml
 create mode 100644 provisioning/roles/geerlingguy.security/tasks/fail2ban-RedHat.yml
 create mode 100644 provisioning/roles/geerlingguy.security/tasks/main.yml
 create mode 100644 provisioning/roles/geerlingguy.security/tasks/ssh.yml
 create mode 100644 provisioning/roles/geerlingguy.security/templates/10periodic.j2
 create mode 100644 provisioning/roles/geerlingguy.security/templates/50unattended-upgrades.j2
 create mode 100644 provisioning/roles/geerlingguy.security/tests/Dockerfile.centos-6
 create mode 100644 provisioning/roles/geerlingguy.security/tests/Dockerfile.centos-7
 create mode 100644 provisioning/roles/geerlingguy.security/tests/Dockerfile.ubuntu-12.04
 create mode 100644 provisioning/roles/geerlingguy.security/tests/Dockerfile.ubuntu-14.04
 create mode 100644 provisioning/roles/geerlingguy.security/tests/test.yml
 create mode 100644 provisioning/roles/geerlingguy.security/vars/Debian.yml
 create mode 100644 provisioning/roles/geerlingguy.security/vars/RedHat.yml
 create mode 100644 provisioning/roles/geerlingguy.solr/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.solr/README.md
 create mode 100644 provisioning/roles/geerlingguy.solr/defaults/main.yml
 create mode 100644 provisioning/roles/geerlingguy.solr/handlers/main.yml
 create mode 100644 provisioning/roles/geerlingguy.solr/meta/.galaxy_install_info
 create mode 100644 provisioning/roles/geerlingguy.solr/meta/main.yml
 create mode 100644 provisioning/roles/geerlingguy.solr/tasks/configure.yml
 create mode 100644 provisioning/roles/geerlingguy.solr/tasks/cores.yml
 create mode 100644 provisioning/roles/geerlingguy.solr/tasks/install-pre5.yml
 create mode 100644 provisioning/roles/geerlingguy.solr/tasks/install.yml
 create mode 100644 provisioning/roles/geerlingguy.solr/tasks/main.yml
 create mode 100644 provisioning/roles/geerlingguy.solr/tasks/user.yml
 create mode 100644 provisioning/roles/geerlingguy.solr/templates/solr-init-Debian-pre5.j2
 create mode 100644 provisioning/roles/geerlingguy.solr/templates/solr-init-RedHat-pre5.j2
 create mode 100644 provisioning/roles/geerlingguy.solr/tests/Dockerfile.centos-7
 create mode 100644 provisioning/roles/geerlingguy.solr/tests/Dockerfile.ubuntu-12.04
 create mode 100644 provisioning/roles/geerlingguy.solr/tests/Dockerfile.ubuntu-14.04
 create mode 100644 provisioning/roles/geerlingguy.solr/tests/requirements.yml
 create mode 100644 provisioning/roles/geerlingguy.solr/tests/test-solr-3.yml
 create mode 100644 provisioning/roles/geerlingguy.solr/tests/test-solr-4.yml
 create mode 100644 provisioning/roles/geerlingguy.solr/tests/test-solr-5.yml
 create mode 100644 provisioning/roles/geerlingguy.solr/tests/test-solr-6.yml
 create mode 100644 provisioning/roles/geerlingguy.varnish/.gitignore
 create mode 100644 provisioning/roles/geerlingguy.varnish/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.varnish/README.md
 create mode 100644 provisioning/roles/geerlingguy.varnish/defaults/main.yml
 create mode 100644 provisioning/roles/geerlingguy.varnish/handlers/main.yml
 create mode 100644 provisioning/roles/geerlingguy.varnish/meta/.galaxy_install_info
 create mode 100644 provisioning/roles/geerlingguy.varnish/meta/main.yml
 create mode 100644 provisioning/roles/geerlingguy.varnish/tasks/main.yml
 create mode 100644 provisioning/roles/geerlingguy.varnish/tasks/setup-Debian.yml
 create mode 100644 provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml
 create mode 100644 provisioning/roles/geerlingguy.varnish/templates/default.vcl.j2
 create mode 100644 provisioning/roles/geerlingguy.varnish/templates/secret.j2
 create mode 100644 provisioning/roles/geerlingguy.varnish/templates/varnish.j2
 create mode 100644 provisioning/roles/geerlingguy.varnish/templates/varnish.params.j2
 create mode 100644 provisioning/roles/geerlingguy.varnish/templates/varnish.service.j2
 create mode 100644 provisioning/roles/geerlingguy.varnish/tests/Dockerfile.centos-6
 create mode 100644 provisioning/roles/geerlingguy.varnish/tests/Dockerfile.centos-7
 create mode 100644 provisioning/roles/geerlingguy.varnish/tests/Dockerfile.ubuntu-12.04
 create mode 100644 provisioning/roles/geerlingguy.varnish/tests/Dockerfile.ubuntu-14.04
 create mode 100644 provisioning/roles/geerlingguy.varnish/tests/test.yml
 create mode 100644 provisioning/roles/geerlingguy.varnish/vars/Debian.yml
 create mode 100644 provisioning/roles/geerlingguy.varnish/vars/RedHat.yml

diff --git a/provisioning/roles/arknoll.selenium/.gitignore b/provisioning/roles/arknoll.selenium/.gitignore
new file mode 100644
index 000000000..7b8cfb120
--- /dev/null
+++ b/provisioning/roles/arknoll.selenium/.gitignore
@@ -0,0 +1,24 @@
+# OS generated files #
+######################
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+Icon?
+ehthumbs.db
+Thumbs.db
+
+# IDE files #
+#################
+/.settings
+/.buildpath
+/.project
+/nbproject
+*.komodoproject
+*.kpf
+/.idea
+
+# Other files #
+###############
+!empty
diff --git a/provisioning/roles/arknoll.selenium/.travis.yml b/provisioning/roles/arknoll.selenium/.travis.yml
new file mode 100644
index 000000000..490fc5265
--- /dev/null
+++ b/provisioning/roles/arknoll.selenium/.travis.yml
@@ -0,0 +1,35 @@
+---
+language: python
+python: "2.7"
+
+env:
+  - ANSIBLE_VERSION=1.6
+  - ANSIBLE_VERSION=1.7
+  - ANSIBLE_VERSION=1.8
+
+before_install:
+  - sudo apt-get update -qq
+
+install:
+  # Install Ansible.
+  - pip install ansible==$ANSIBLE_VERSION
+
+  # Add ansible.cfg to pick up roles path.
+  - "printf '[defaults]\\nroles_path = ../' > ansible.cfg"
+
+script:
+  # Check the role/playbook's syntax.
+  - "ansible-playbook -i tests/inventory tests/test.yml --syntax-check"
+
+  # Run the role/playbook with ansible-playbook.
+  - "ansible-playbook -i tests/inventory tests/test.yml --connection=local --sudo -vvvv"
+
+  # Run the role/playbook again, checking to make sure it's idempotent.
+  - >
+    ansible-playbook -i tests/inventory tests/test.yml --connection=local --sudo
+    | grep -q 'changed=0.*failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)
+
+notifications:
+  email: false
diff --git a/provisioning/roles/arknoll.selenium/LICENSE.txt b/provisioning/roles/arknoll.selenium/LICENSE.txt
new file mode 100644
index 000000000..978821a72
--- /dev/null
+++ b/provisioning/roles/arknoll.selenium/LICENSE.txt
@@ -0,0 +1,13 @@
+Copyright (c) Alex Knoll
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/provisioning/roles/arknoll.selenium/README.md b/provisioning/roles/arknoll.selenium/README.md
new file mode 100644
index 000000000..f2a027dfe
--- /dev/null
+++ b/provisioning/roles/arknoll.selenium/README.md
@@ -0,0 +1,61 @@
+## selenium [![Build Status](https://travis-ci.org/arknoll/ansible-role-selenium.svg?branch=master)](https://travis-ci.org/arknoll/ansible-role-selenium)
+
+Set up selenium and Firefox for running selenium tests.
+
+#### Requirements
+
+* `java`
+
+#### Variables
+
+* `selenium_install_dir`: [default: `/opt`] Install directory
+* `selenium_version`: [default: `2.44.0`] Install version
+
+## Dependencies
+
+None
+
+#### Example
+
+```yaml
+---
+- hosts: all
+  roles:
+  - selenium
+```
+
+#### Start/Stop/Restart Selenium
+
+```
+$ service selenium start
+$ service selenium stop
+$ service selenium restart
+```
+
+#### License and Author
+
+Author:: Alex Knoll (arknoll@gmail.com)
+
+Copyright:: 2015, Alex Knoll
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+#### Contributing
+
+We welcome contributed improvements and bug fixes via the usual workflow:
+
+1. Fork this repository
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create a new pull request
diff --git a/provisioning/roles/arknoll.selenium/defaults/main.yml b/provisioning/roles/arknoll.selenium/defaults/main.yml
new file mode 100644
index 000000000..bc0af10b4
--- /dev/null
+++ b/provisioning/roles/arknoll.selenium/defaults/main.yml
@@ -0,0 +1,5 @@
+---
+# defaults file for selenium
+selenium_install_dir: /opt
+selenium_version: 2.53.0
+selenium_install_firefox: yes
diff --git a/provisioning/roles/arknoll.selenium/handlers/main.yml b/provisioning/roles/arknoll.selenium/handlers/main.yml
new file mode 100644
index 000000000..acf78d5ae
--- /dev/null
+++ b/provisioning/roles/arknoll.selenium/handlers/main.yml
@@ -0,0 +1,4 @@
+---
+# handlers file for selenium
+- name: restart selenium
+  service: name=selenium state=restarted
diff --git a/provisioning/roles/arknoll.selenium/meta/.galaxy_install_info b/provisioning/roles/arknoll.selenium/meta/.galaxy_install_info
new file mode 100644
index 000000000..5d2ce608f
--- /dev/null
+++ b/provisioning/roles/arknoll.selenium/meta/.galaxy_install_info
@@ -0,0 +1 @@
+{install_date: 'Sat Jul 23 03:17:21 2016', version: 1.3.0}
diff --git a/provisioning/roles/arknoll.selenium/meta/main.yml b/provisioning/roles/arknoll.selenium/meta/main.yml
new file mode 100644
index 000000000..77b083784
--- /dev/null
+++ b/provisioning/roles/arknoll.selenium/meta/main.yml
@@ -0,0 +1,21 @@
+---
+# meta file for selenium
+galaxy_info:
+  author: Alex Knoll
+  description: Set up selenium and Firefox for running selenium tests.
+  license: Apache V2
+  min_ansible_version: 1.3
+  platforms:
+  - name: EL
+    versions:
+    - 6
+    - 7
+  - name: Ubuntu
+    versions:
+    - all
+  - name: Debian
+    versions:
+    - all
+  categories:
+  - web
+dependencies: []
diff --git a/provisioning/roles/arknoll.selenium/tasks/main.yml b/provisioning/roles/arknoll.selenium/tasks/main.yml
new file mode 100644
index 000000000..3c1ac5919
--- /dev/null
+++ b/provisioning/roles/arknoll.selenium/tasks/main.yml
@@ -0,0 +1,42 @@
+---
+# Tasks file for selenium
+- name: create directory
+  file: "path={{ selenium_install_dir }}/selenium state=directory recurse=yes"
+  tags: [configuration, selenium, selenium-create-directory]
+
+- name: download
+  get_url: "url=http://selenium-release.storage.googleapis.com/{{ selenium_version | regex_replace('\\.[0-9]+$', '') }}/selenium-server-standalone-{{ selenium_version }}.jar dest=/opt/selenium/selenium-server-standalone-{{ selenium_version }}.jar"
+  tags: [configuration, selenium, selenium-download]
+
+- name: Install xvfb
+  apt: name={{item}}
+  with_items:
+    - xvfb
+  when: ansible_os_family == 'Debian'
+
+- name: Install browser
+  apt: name={{item}}
+  with_items:
+    - firefox
+  when: ansible_os_family == 'Debian' and selenium_install_firefox
+
+- name: Install browser Xvfb
+  yum: name={{item}}
+  with_items:
+    - xorg-x11-server-Xvfb
+  when: ansible_os_family == 'RedHat'
+
+- name: Install browser
+  yum: name={{item}}
+  with_items:
+    - firefox
+  when: ansible_os_family == 'RedHat' and selenium_install_firefox
+
+
+- name: install
+  template: src=selenium-init-{{ ansible_os_family }}.j2 dest=/etc/init.d/selenium owner=root group=root mode=0755
+  tags: [configuration, selenium, selenium-install]
+
+- name: run
+  service: name=selenium state=started enabled=yes
+  tags: [configuration, selenium, selenium-run]
diff --git a/provisioning/roles/arknoll.selenium/templates/selenium-init-Debian.j2 b/provisioning/roles/arknoll.selenium/templates/selenium-init-Debian.j2
new file mode 100644
index 000000000..3a8ca8598
--- /dev/null
+++ b/provisioning/roles/arknoll.selenium/templates/selenium-init-Debian.j2
@@ -0,0 +1,60 @@
+#!/bin/bash
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+
+DISPLAY_ID=":1"
+RUN_AS=root
+
+JAVA_BIN=/usr/bin/java
+
+XVFB_BIN=/usr/bin/xvfb-run
+
+SELENIUM_DIR={{ selenium_install_dir }}/selenium
+SELENIUM_PID_FILE="$SELENIUM_DIR/selenium.pid"
+SELENIUM_JAR_FILE="$SELENIUM_DIR/selenium-server-standalone-{{ selenium_version }}.jar"
+SELENIUM_LOG_FILE="$SELENIUM_DIR/selenium.log"
+SELENIUM_DAEMON_OPTS=" -client -jar $SELENIUM_JAR_FILE -log $SELENIUM_LOG_FILE"
+
+export DISPLAY="$DISPLAY_ID"
+
+set -e
+
+. /lib/lsb/init-functions
+
+case "$1" in
+    start)
+        if status_of_proc -p $SELENIUM_PID_FILE "$SELENIUM_JAR_FILE" $SELENIUM_JAR_FILE > /dev/null; then
+            log_progress_msg "Service already running"
+        else
+            log_daemon_msg "Starting Selenium server"
+            log_progress_msg "selenium"
+            start-stop-daemon -c $RUN_AS --start --quiet --background --pidfile $SELENIUM_PID_FILE --make-pidfile --exec $XVFB_BIN $JAVA_BIN -- $SELENIUM_DAEMON_OPTS
+        fi
+        ;;
+
+    stop)
+        if status_of_proc -p $SELENIUM_PID_FILE "$SELENIUM_JAR_FILE" $SELENIUM_JAR_FILE > /dev/null; then
+            log_daemon_msg "Stopping Selenium server"
+            log_progress_msg "selenium"
+            start-stop-daemon --stop --pidfile $SELENIUM_PID_FILE
+        else
+            log_progress_msg "Service not running"
+        fi
+        ;;
+
+    restart|force-reload)
+        $0 stop
+        sleep 1
+        $0 start
+	;;
+
+	status)
+        status_of_proc -p $SELENIUM_PID_FILE "$SELENIUM_JAR_FILE" $SELENIUM_JAR_FILE && exit 0 || exit $?
+    ;;
+
+    *)
+      	N=/etc/init.d/selenium
+        echo "Usage: $N {start|stop|restart|force-reload|status}" >&2
+        exit 1
+        ;;
+esac
diff --git a/provisioning/roles/arknoll.selenium/templates/selenium-init-RedHat.j2 b/provisioning/roles/arknoll.selenium/templates/selenium-init-RedHat.j2
new file mode 100644
index 000000000..bce943de0
--- /dev/null
+++ b/provisioning/roles/arknoll.selenium/templates/selenium-init-RedHat.j2
@@ -0,0 +1,81 @@
+#!/bin/bash
+#
+# Selenium
+#
+# chkconfig: 345 90 25
+# description: Selenium service
+
+# Source function library.
+. /etc/init.d/functions
+
+java_bin=/usr/bin/java
+
+xvfb_bin=/usr/bin/xvfb-run
+
+selenium_dir={{ selenium_install_dir }}/selenium
+selenium_jar_file="$selenium_dir/selenium-server-standalone-{{ selenium_version }}.jar"
+user=root
+exec="$xvfb_bin $java_bin"
+args=" -client -jar $selenium_jar_file"
+lockfile="/var/lock/subsys/selenium"
+pidfile="$selenium_dir/selenium.pid"
+logfile="$selenium_dir/selenium.log"
+prog="selenium"
+display=":1"
+port="4444"
+
+RETVAL=0
+
+start() {
+  echo -n $"Starting $prog: "
+
+  touch $pidfile
+  chown $user $pidfile
+
+  touch $logfile
+  chown $user $logfile
+
+  /bin/su - $user -c "DISPLAY=\"$display\" $exec $args >> $logfile 2>&1 & echo \$! > $pidfile"
+
+  sleep 2
+
+  pgrep -fl $prog
+  RETVAL=$?
+  [ $RETVAL -eq 0 ] && echo_success || echo_failure
+
+  return $RETVAL
+}
+
+stop() {
+  echo -n $"Stopping $prog: "
+  killproc -p $pidfile $prog
+  RETVAL=$?
+  echo
+  [ $RETVAL -eq 0 ] && rm -f $lockfile $pidfile
+  return $RETVAL
+}
+
+restart() {
+  stop
+  sleep 2
+  start
+}
+
+case "$1" in
+  start)
+    start
+    ;;
+  stop)
+    stop
+    ;;
+  status)
+    status -p ${pidfile} ${prog}
+    RETVAL=$?
+    ;;
+  restart)
+    restart
+    ;;
+  *)
+    echo $"Usage: $0 {start|stop|restart}"
+    exit 1
+esac
diff --git a/provisioning/roles/arknoll.selenium/tests/inventory b/provisioning/roles/arknoll.selenium/tests/inventory
new file mode 100644
index 000000000..2fbb50c4a
--- /dev/null
+++ b/provisioning/roles/arknoll.selenium/tests/inventory
@@ -0,0 +1 @@
+localhost
diff --git a/provisioning/roles/arknoll.selenium/tests/test.yml b/provisioning/roles/arknoll.selenium/tests/test.yml
new file mode 100644
index 000000000..640e29ed6
--- /dev/null
+++ b/provisioning/roles/arknoll.selenium/tests/test.yml
@@ -0,0 +1,6 @@
+---
+# Test file for selenium
+- hosts: localhost
+  remote_user: root
+  roles:
+    - ansible-role-selenium
diff --git a/provisioning/roles/arknoll.selenium/vars/main.yml b/provisioning/roles/arknoll.selenium/vars/main.yml
new file mode 100644
index 000000000..9a60dec17
--- /dev/null
+++ b/provisioning/roles/arknoll.selenium/vars/main.yml
@@ -0,0 +1,2 @@
+---
+# vars file for selenium
diff --git a/provisioning/roles/franklinkim.newrelic/.clog.toml b/provisioning/roles/franklinkim.newrelic/.clog.toml
new file mode 100644
index 000000000..5e4317e78
--- /dev/null
+++ b/provisioning/roles/franklinkim.newrelic/.clog.toml
@@ -0,0 +1,4 @@
+[clog]
+changelog = "CHANGELOG.md"
+repository = "https://github.com/weareinteractive/ansible-newrelic"
+from-latest-tag = true
diff --git a/provisioning/roles/franklinkim.newrelic/.editorconfig b/provisioning/roles/franklinkim.newrelic/.editorconfig
new file mode 100644
index 000000000..e99064344
--- /dev/null
+++ b/provisioning/roles/franklinkim.newrelic/.editorconfig
@@ -0,0 +1,16 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+[*]
+# Change these settings to your own preference
+indent_size = 2
+indent_style = space
+
+# We recommend you to keep these unchanged
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
diff --git a/provisioning/roles/franklinkim.newrelic/.gitignore b/provisioning/roles/franklinkim.newrelic/.gitignore
new file mode 100644
index 000000000..91bcbe432
--- /dev/null
+++ b/provisioning/roles/franklinkim.newrelic/.gitignore
@@ -0,0 +1,6 @@
+.*
+*~
+!.git*
+!.clog.toml
+!.travis.yml
+!.editorconfig
diff --git a/provisioning/roles/franklinkim.newrelic/.travis.yml b/provisioning/roles/franklinkim.newrelic/.travis.yml
new file mode 100644
index 000000000..f2bd5cf73
--- /dev/null
+++ b/provisioning/roles/franklinkim.newrelic/.travis.yml
@@ -0,0 +1,10 @@
+---
+
+language: ruby
+sudo: required
+services:
+  - docker
+install:
+  - docker pull franklinkim/ansible:ubuntu-trusty
+script:
+  - docker run -v $(pwd):/opt/ansible franklinkim/ansible:ubuntu-trusty tests/run.sh
diff --git a/provisioning/roles/franklinkim.newrelic/CHANGELOG.md b/provisioning/roles/franklinkim.newrelic/CHANGELOG.md
new file mode 100644
index 000000000..2b6672b66
--- /dev/null
+++ b/provisioning/roles/franklinkim.newrelic/CHANGELOG.md
@@ -0,0 +1,20 @@
+<a name="1.2.0"></a>
+## 1.2.0 (2016-02-13)
+
+
+#### Breaking Changes
+
+*   add configurable `newrelic_group` and `newrelic_groups` ([b06cf9f4](https://github.com/weareinteractive/ansible-newrelic/commit/b06cf9f4bbaeb6edd3bae8b600d351a27dbd28d5), breaks [#](https://github.com/weareinteractive/ansible-newrelic/issues/))
+
+#### Bug Fixes
+
+*   make docker container monitoring work ([89986c76](https://github.com/weareinteractive/ansible-newrelic/commit/89986c7649e3bc3d9f08d1d2027596b9e089b6c5))
+
+#### Features
+
+*   add configurable `newrelic_group` and `newrelic_groups` ([b06cf9f4](https://github.com/weareinteractive/ansible-newrelic/commit/b06cf9f4bbaeb6edd3bae8b600d351a27dbd28d5), breaks [#](https://github.com/weareinteractive/ansible-newrelic/issues/))
+*   use ansible-role docgen for README generation ([23b5e65f](https://github.com/weareinteractive/ansible-newrelic/commit/23b5e65fb9fe82851ec450f99d80b7db42663e58))
+*   add CHANGELOG ([86830e8f](https://github.com/weareinteractive/ansible-newrelic/commit/86830e8f5d84195c2b3c11a8d3b1235a74cb136f))
+
+
+
diff --git a/provisioning/roles/franklinkim.newrelic/LICENSE b/provisioning/roles/franklinkim.newrelic/LICENSE
new file mode 100644
index 000000000..ebdf0f1dc
--- /dev/null
+++ b/provisioning/roles/franklinkim.newrelic/LICENSE
@@ -0,0 +1,22 @@
+Copyright (c) We Are Interactive
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
diff --git a/provisioning/roles/franklinkim.newrelic/README.md b/provisioning/roles/franklinkim.newrelic/README.md
new file mode 100644
index 000000000..9650109b1
--- /dev/null
+++ b/provisioning/roles/franklinkim.newrelic/README.md
@@ -0,0 +1,127 @@
+# Ansible franklinkim.newrelic role
+
+[![Build Status](https://img.shields.io/travis/weareinteractive/ansible-newrelic.svg)](https://travis-ci.org/weareinteractive/ansible-newrelic)
+[![Galaxy](http://img.shields.io/badge/galaxy-franklinkim.apt-blue.svg)](https://galaxy.ansible.com/list#/roles/3917)
+[![GitHub Tags](https://img.shields.io/github/tag/weareinteractive/ansible-newrelic.svg)](https://github.com/weareinteractive/ansible-newrelic)
+[![GitHub Stars](https://img.shields.io/github/stars/weareinteractive/ansible-newrelic.svg)](https://github.com/weareinteractive/ansible-newrelic)
+
+> `franklinkim.newrelic` is an [Ansible](http://www.ansible.com) role which:
+>
+> * installs newrelic
+> * configures newrelic
+> * configures service
+
+## Installation
+
+Using `ansible-galaxy`:
+
+```shell
+$ ansible-galaxy install franklinkim.newrelic
+```
+
+Using `requirements.yml`:
+
+```yaml
+- src: franklinkim.newrelic
+```
+
+Using `git`:
+
+```shell
+$ git clone https://github.com/weareinteractive/ansible-newrelic.git franklinkim.newrelic
+```
+
+## Dependencies
+
+* Ansible >= 1.9
+
+## Variables
+
+Here is a list of all the default variables for this role, which are also available in `defaults/main.yml`.
+
+```yaml
+---
+#
+# newrelic_license_key: yourkey
+
+# User name
+newrelic_user: newrelic
+# User group
+newrelic_group: newrelic
+# User groups to append to user
+newrelic_groups: []
+# Name of the file where the server monitor will store it's log messages.
+newrelic_logfile: /var/log/newrelic/nrsysmond.log
+# Level of detail you want in the log file
+newrelic_loglevel: info
+# Set to true to disable NFS client statistics gathering.
+newrelic_disable_nfs: yes
+# Set to true to disable Docker container statistics gathering.
+newrelic_disable_docker: yes
+# start on boot
+newrelic_service_enabled: yes
+# current state: started, stopped
+newrelic_service_state: started
+
+```
+
+## Handlers
+
+These are the handlers that are defined in `handlers/main.yml`.
+
+```yaml
+---
+
+- name: restart newrelic
+  service:
+    name: newrelic-sysmond
+    state: restarted
+  when: newrelic_service_state != 'stopped'
+
+```
+
+
+## Usage
+
+This is an example playbook:
+
+```yaml
+---
+
+- hosts: all
+  sudo: yes
+  roles:
+    - franklinkim.newrelic
+  vars:
+    newrelic_license_key: yes
+    newrelic_service_state: started
+    newrelic_license_key: ab2fa361cd4d0d373833cad619d7bcc424d27c16
+
+```
+
+## Testing
+
+```shell
+$ git clone https://github.com/weareinteractive/ansible-newrelic.git
+$ cd ansible-newrelic
+$ vagrant up
+```
+
+## Contributing
+In lieu of a formal styleguide, take care to maintain the existing coding style. Add unit tests and examples for any new or changed functionality.
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request
+
+*Note: To update the `README.md` file please install and run `ansible-role`:*
+
+```shell
+$ gem install ansible-role
+$ ansible-role docgen
+```
+
+## License
+Copyright (c) We Are Interactive under the MIT license.
diff --git a/provisioning/roles/franklinkim.newrelic/Vagrantfile b/provisioning/roles/franklinkim.newrelic/Vagrantfile
new file mode 100644
index 000000000..6898da7a4
--- /dev/null
+++ b/provisioning/roles/franklinkim.newrelic/Vagrantfile
@@ -0,0 +1,23 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.configure("2") do |config|
+  config.vbguest.no_remote = true
+  config.vbguest.auto_update = false
+
+  config.vm.define 'trusty' do |instance|
+    instance.vm.box = 'ubuntu/trusty64'
+  end
+
+  config.vm.define 'centos7' do |instance|
+    instance.vm.box = 'geerlingguy/centos7'
+  end
+
+  # View the documentation for the provider you're using for more
+  # information on available options.
+  config.vm.provision "ansible" do |ansible|
+    ansible.playbook = "tests/main.yml"
+    ansible.verbose = 'vv'
+    ansible.sudo = true
+  end
+end
diff --git a/provisioning/roles/franklinkim.newrelic/defaults/main.yml b/provisioning/roles/franklinkim.newrelic/defaults/main.yml
new file mode 100644
index 000000000..7195e1f1c
--- /dev/null
+++ b/provisioning/roles/franklinkim.newrelic/defaults/main.yml
@@ -0,0 +1,22 @@
+---
+#
+# newrelic_license_key: yourkey
+
+# User name
+newrelic_user: newrelic
+# User group
+newrelic_group: newrelic
+# User groups to append to user
+newrelic_groups: []
+# Name of the file where the server monitor will store it's log messages.
+newrelic_logfile: /var/log/newrelic/nrsysmond.log
+# Level of detail you want in the log file
+newrelic_loglevel: info
+# Set to true to disable NFS client statistics gathering.
+newrelic_disable_nfs: yes
+# Set to true to disable Docker container statistics gathering.
+newrelic_disable_docker: yes
+# start on boot
+newrelic_service_enabled: yes
+# current state: started, stopped
+newrelic_service_state: started
diff --git a/provisioning/roles/franklinkim.newrelic/handlers/main.yml b/provisioning/roles/franklinkim.newrelic/handlers/main.yml
new file mode 100644
index 000000000..2ea02f7e8
--- /dev/null
+++ b/provisioning/roles/franklinkim.newrelic/handlers/main.yml
@@ -0,0 +1,7 @@
+---
+
+- name: restart newrelic
+  service:
+    name: newrelic-sysmond
+    state: restarted
+  when: newrelic_service_state != 'stopped'
diff --git a/provisioning/roles/franklinkim.newrelic/meta/main.yml b/provisioning/roles/franklinkim.newrelic/meta/main.yml
new file mode 100644
index 000000000..a1cbde7de
--- /dev/null
+++ b/provisioning/roles/franklinkim.newrelic/meta/main.yml
@@ -0,0 +1,104 @@
+---
+galaxy_info:
+  author: franklin
+  company: We Are Interactive
+  description: Installs and configure newrelic
+  min_ansible_version: 1.9
+  license: MIT
+  #
+  # Below are all platforms currently available. Just uncomment
+  # the ones that apply to your role. If you don't see your
+  # platform on this list, let us know and we'll get it added!
+  #
+  platforms:
+    - name: EL
+      versions:
+  #      - all
+  #      - 5
+  #      - 6
+        - 7
+  #  - name: GenericUNIX
+  #    versions:
+  #      - all
+  #      - any
+  #  - name: Fedora
+  #    versions:
+  #      - all
+  #      - 16
+  #      - 17
+  #      - 18
+  #      - 19
+  #      - 20
+  #  - name: opensuse
+  #    versions:
+  #      - all
+  #      - 12.1
+  #      - 12.2
+  #      - 12.3
+  #      - 13.1
+  #      - 13.2
+  #  - name: GenericBSD
+  #    versions:
+  #      - all
+  #      - any
+  #  - name: FreeBSD
+  #    versions:
+  #      - all
+  #      - 8.0
+  #      - 8.1
+  #      - 8.2
+  #      - 8.3
+  #      - 8.4
+  #      - 9.0
+  #      - 9.1
+  #      - 9.1
+  #      - 9.2
+    - name: Ubuntu
+      versions:
+        - all
+  #      - lucid
+  #      - maverick
+  #      - natty
+  #      - oneiric
+  #      - precise
+  #      - quantal
+  #      - raring
+  #      - saucy
+  #      - trusty
+  #  - name: SLES
+  #    versions:
+  #      - all
+  #      - 10SP3
+  #      - 10SP4
+  #      - 11
+  #      - 11SP1
+  #      - 11SP2
+  #      - 11SP3
+  #  - name: GenericLinux
+  #    versions:
+  #      - all
+  #      - any
+    - name: Debian
+      versions:
+        - all
+  #      - etch
+  #      - lenny
+  #      - squeeze
+  #      - wheezy
+  #
+  # Below are all categories currently available. Just as with
+  # the platforms above, uncomment those that apply to your role.
+  #
+  # The number of tags imported by Galaxy is limited to 20,
+  # and tag values containing non-alphanumeric characters will be ignored.
+  # Tag values containing a : will be split into multiple tags.
+  # The tag cloud:ec2, for example, will become two tags: cloud and ec2.
+  #
+  galaxy_tags:
+    - monitoring
+    - newrelic
+dependencies: []
+  # List your role dependencies here, one per line. Only
+  # dependencies available via galaxy should be listed here.
+  # Be sure to remove the '[]' above if you add dependencies
+  # to this list.
diff --git a/provisioning/roles/franklinkim.newrelic/meta/readme.yml b/provisioning/roles/franklinkim.newrelic/meta/readme.yml
new file mode 100644
index 000000000..db694e9c7
--- /dev/null
+++ b/provisioning/roles/franklinkim.newrelic/meta/readme.yml
@@ -0,0 +1,14 @@
+---
+
+galaxy_name: franklinkim.newrelic
+github_user: weareinteractive
+github_name: ansible-newrelic
+badges: |
+  [![Build Status](https://img.shields.io/travis/weareinteractive/ansible-newrelic.svg)](https://travis-ci.org/weareinteractive/ansible-newrelic)
+  [![Galaxy](http://img.shields.io/badge/galaxy-franklinkim.apt-blue.svg)](https://galaxy.ansible.com/list#/roles/3917)
+  [![GitHub Tags](https://img.shields.io/github/tag/weareinteractive/ansible-newrelic.svg)](https://github.com/weareinteractive/ansible-newrelic)
+  [![GitHub Stars](https://img.shields.io/github/stars/weareinteractive/ansible-newrelic.svg)](https://github.com/weareinteractive/ansible-newrelic)
+description: |
+  > * installs newrelic
+  > * configures newrelic
+  > * configures service
diff --git a/provisioning/roles/franklinkim.newrelic/tasks/install.yml b/provisioning/roles/franklinkim.newrelic/tasks/install.yml
new file mode 100644
index 000000000..f56069d09
--- /dev/null
+++ b/provisioning/roles/franklinkim.newrelic/tasks/install.yml
@@ -0,0 +1,7 @@
+---
+
+- include: install_debian.yml
+  when: ansible_os_family == 'Debian'
+
+- include: install_redhat.yml
+  when: ansible_os_family == 'RedHat'
diff --git a/provisioning/roles/franklinkim.newrelic/tasks/install_debian.yml b/provisioning/roles/franklinkim.newrelic/tasks/install_debian.yml
new file mode 100644
index 000000000..6f0e16d58
--- /dev/null
+++ b/provisioning/roles/franklinkim.newrelic/tasks/install_debian.yml
@@ -0,0 +1,23 @@
+---
+
+- name: Installing dependencies
+  apt:
+    pkg: apt-transport-https
+    state: present
+
+- name: Adding APT key
+  apt_key:
+    id: 548C16BF
+    url: https://download.newrelic.com/548C16BF.gpg
+
+- name: Add APT repository
+  apt_repository:
+    repo: "deb http://apt.newrelic.com/debian/ newrelic non-free"
+    update_cache: yes
+
+- name: Installing packages
+  apt:
+    pkg: "{{ item }}"
+    state: present
+  with_items:
+    - newrelic-sysmond
diff --git a/provisioning/roles/franklinkim.newrelic/tasks/install_redhat.yml b/provisioning/roles/franklinkim.newrelic/tasks/install_redhat.yml
new file mode 100644
index 000000000..38516fb94
--- /dev/null
+++ b/provisioning/roles/franklinkim.newrelic/tasks/install_redhat.yml
@@ -0,0 +1,13 @@
+---
+
+- name: Installing dependencies
+  yum:
+    name: http://download.newrelic.com/pub/newrelic/el5/i386/newrelic-repo-5-3.noarch.rpm
+    state: present
+
+- name: Installing packages
+  yum:
+    name: "{{ item }}"
+    state: present
+  with_items:
+    - newrelic-sysmond
diff --git a/provisioning/roles/franklinkim.newrelic/tasks/main.yml b/provisioning/roles/franklinkim.newrelic/tasks/main.yml
new file mode 100644
index 000000000..514a108ba
--- /dev/null
+++ b/provisioning/roles/franklinkim.newrelic/tasks/main.yml
@@ -0,0 +1,28 @@
+---
+
+- name: Checking for key
+  fail:
+    msg: "newrelic_license_key has not been defined"
+  when: newrelic_license_key|default(False) == False
+
+- include: install.yml
+  tags:
+    - monitoring
+    - newrelic
+    - install
+    - newrelic-install
+
+- include: config.yml
+  tags:
+    - monitoring
+    - newrelic
+    - config
+    - newrelic-config
+
+- include: service.yml
+  tags:
+    - monitoring
+    - newrelic
+    - service
+    - newrelic-service
+
diff --git a/provisioning/roles/franklinkim.newrelic/tasks/service.yml b/provisioning/roles/franklinkim.newrelic/tasks/service.yml
new file mode 100644
index 000000000..c5314c313
--- /dev/null
+++ b/provisioning/roles/franklinkim.newrelic/tasks/service.yml
@@ -0,0 +1,7 @@
+---
+
+- name: Configuring service
+  service:
+    name: newrelic-sysmond
+    state: "{{ newrelic_service_state }}"
+    enabled: "{{ newrelic_service_enabled }}"
diff --git a/provisioning/roles/franklinkim.newrelic/templates/etc/newrelic/nrsysmond.cfg.j2 b/provisioning/roles/franklinkim.newrelic/templates/etc/newrelic/nrsysmond.cfg.j2
new file mode 100644
index 000000000..4185604f3
--- /dev/null
+++ b/provisioning/roles/franklinkim.newrelic/templates/etc/newrelic/nrsysmond.cfg.j2
@@ -0,0 +1,205 @@
+# {{ ansible_managed }}
+#
+# New Relic Server Monitor configuration file.
+#
+# Lines that begin with a # are comment lines and are ignored by the server
+# monitor. For those options that have command line equivalents, if the
+# option is specified on the command line it will over-ride any value set
+# in this file.
+#
+
+#
+# Option : license_key
+# Value  : 40-character hexadecimal string provided by New Relic. This is
+#          required in order for the server monitor to start.
+# Default: none
+#
+license_key={{ newrelic_license_key }}
+
+#
+# Option : loglevel
+# Value  : Level of detail you want in the log file (as defined by the logfile
+#          setting below. Valid values are (in increasing levels of verbosity):
+#          error        - show errors only
+#          warning      - show errors and warnings
+#          info         - show minimal additional information messages
+#          verbose      - show more detailed information messages
+#          debug        - show debug messages
+#          verbosedebug - show very detailed debug messages
+# Default: error
+# Note   : Can also be set with the -d command line option.
+#
+loglevel={{ newrelic_loglevel }}
+
+#
+# Option : logfile
+# Value  : Name of the file where the server monitor will store it's log
+#          messages. The amount of detail stored in this file is controlled
+#          by the loglevel option (above).
+# Default: none. However it is highly recommended you set a value for this.
+# Note   : Can also be set with the -l command line option.
+#
+logfile={{ newrelic_logfile }}
+
+#
+# Option : proxy
+# Value  : The name and optional login credentials of the proxy server to use
+#          for all communication with the New Relic collector. In its simplest
+#          form this setting is just a hostname[:port] setting. The default
+#          port if none is specified is 1080. If your proxy requires a user
+#          name, use the syntax user@host[:port]. If it also requires a
+#          password use the format user:password@host[:port]. For example:
+#            fred:secret@proxy.mydomain.com:8181
+# Default: none (use a direct connection)
+#
+#proxy=
+
+#
+# Setting: ssl
+# Type   : boolean
+# Purpose: If you prefer the daemon to use the secure HTTP (https) protocol
+#          when communicating with the New Relic collector servers, set this
+#          to true.
+# Default: true (as of version 1.4)
+#
+#ssl=true
+
+#
+# Setting: docker_connection
+# Type   : string
+# Purpose: Determine how to communicate with the Docker API on the local host.
+#          Valid values are:
+#
+#          uds:///path/to/socket
+#          unix:///path/to/socket
+#          /path/to/socket
+#            These three forms are all equivalent and are used to point to the
+#            UNIX-domain socket (UDS). The socket path must be absolute and the
+#            socket must be writeable.
+#
+#          tcp://localhost:port
+#          http://localhost:port
+#            Use an unencrypted connection to the local host on the specified
+#            port. If the :port portion is missing it defaults to 2376. The
+#            host name MUST be localhost or 127.0.0.1. No other host name is
+#            valid.
+#
+#          https://localhost:port
+#            Use an encrypted connection to the local host om the specified
+#            port. If the :port portion is missing it defaults to 2376. The
+#            host name MUST be localhost or 127.0.0.1. No other host name is
+#            valid. In order to use TLS authentication you may need to set
+#            the various key and certificate options below.
+#
+#          If no value is set, attempt to use the default (/var/run/docker.sock)
+#          if it exists and is writable. If that fails, attempt to use the value
+#          of the environment variable DOCKER_HOST.
+#
+#          You may need to add the user that you run LSM as to the docker
+#          group. Please consult the Docker web site for details and security
+#          implications.
+# Default: empty
+#docker_connection=
+
+#
+# Setting: docker_cert_path
+# Type   : string
+# Purpose: Set the default location to look for the certificate, key and CA
+#          certificate for using TLS. If no value is set and the directory
+#          $HOME/.docker exists, that is used as the default value. LSM will
+#          look in this directory for the cert.pem, key.pem and cacert.pem
+#          files, and use them if present. If set, the environment variable
+#          $DOCKER_CERT_PATH will be used as the default value if no value
+#          is explicitly set here.
+# Default: empty
+#docker_cert_path=
+
+#
+# Setting: docker_cert
+#          docker_key
+#          docker_cacert
+# Type   : string
+# Purpose: Set the name of the certificate, key and CA certificate files to
+#          use for TLS. If these are not absolute paths they are searched for
+#          in the directory determined by docker_cert_path above.
+# Default: empty
+#docker_cert=
+#docker_key=
+#docker_cacert=
+
+#
+# Setting: ssl_ca_bundle
+# Type   : string
+# Purpose: Sets the location of a file containing CA certificates in PEM
+#          format. When set, the certificates in this file will be used
+#          to authenticate the New Relic collector servers. If ssl_ca_path
+#          is also set (see below), the certificates in this file will be
+#          searched first, followed by the certificates contained in the
+#          ssl_ca_path directory. This setting has no effect when ssl
+#          is set to false.
+# Default: none
+# Note   : Can also be set with the -b command line option.
+#
+#ssl_ca_bundle=
+
+#
+# Setting: ssl_ca_path
+# Type   : string
+# Purpose: Sets the location of a directory containing trusted CA certificates
+#          in PEM format. When set, the certificates in this directory will be
+#          used to authenticate the New Relic collector servers. If
+#          ssl_ca_bundle is also set (see above), it will be searched first
+#          followed by the certificates contained in ssl_ca_path. This
+#          setting has no effect when ssl is set to false.
+# Default: none
+# Note   : Can also be set with the -S command line option.
+#
+#ssl_ca_path=
+
+#
+# Option : pidfile
+# Value  : Name of a file where the server monitoring daemon will store it's
+#          process ID (PID). This is used by the startup and shutdown script
+#          to determine if the monitor is already running, and to start it up
+#          or shut it down.
+# Default: /tmp/nrsysmond.pid
+# Note   : Can also be set with the -p command line option.
+#
+#pidfile=/var/run/newrelic/nrsysmond.pid
+
+# Option : collector_host
+# Value  : The name of the New Relic collector to connect to. This should only
+#          ever be changed on advise from a New Relic support staff member.
+#          The format is host[:port]. Using a port number of 0 means the default
+#          port, which is 80 (if not using the ssl option - see below) or 443
+#          if SSL is enabled. If the port is omitted the default value is used.
+# Default: collector.newrelic.com
+#
+#collector_host=collector.newrelic.com
+
+#
+# Option : labels
+# Value  : A series of label_type/label_value pairings
+#          Each item in the pair is separated by a colon
+#          Each pair is separated by a semicolon
+#          e.g.
+#            labels = Environment:Production;DataCenter:EastUS;
+# Default: none
+#
+#labels=label_type:label_value
+
+#
+# Option : disable_nfs
+# Type   : boolean
+# Value  : Set to true to disable NFS client statistics gathering.
+# Default: false
+#
+disable_nfs={{ newrelic_disable_nfs | to_nice_json }}
+
+#
+# Option : disable_docker
+# Type   : boolean
+# Value  : Set to true to disable Docker container statistics gathering.
+# Default: false
+#
+disable_docker={{ newrelic_disable_docker | to_nice_json }}
diff --git a/provisioning/roles/franklinkim.newrelic/tests/main.yml b/provisioning/roles/franklinkim.newrelic/tests/main.yml
new file mode 100644
index 000000000..0b30d6d30
--- /dev/null
+++ b/provisioning/roles/franklinkim.newrelic/tests/main.yml
@@ -0,0 +1,10 @@
+---
+
+- hosts: all
+  sudo: yes
+  roles:
+    - franklinkim.newrelic
+  vars:
+    newrelic_license_key: yes
+    newrelic_service_state: started
+    newrelic_license_key: ab2fa361cd4d0d373833cad619d7bcc424d27c16
diff --git a/provisioning/roles/franklinkim.newrelic/tests/run.sh b/provisioning/roles/franklinkim.newrelic/tests/run.sh
new file mode 100755
index 000000000..72e2f4dc5
--- /dev/null
+++ b/provisioning/roles/franklinkim.newrelic/tests/run.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# define variables
+ROLE_NAME=franklinkim.newrelic
+
+# install dependencies
+# echo '* installing dependencies'
+# ansible-galaxy install franklinkim.openssl
+
+# create role symlink
+echo '* creating symlink'
+ln -s $(pwd) /usr/share/ansible/roles/$ROLE_NAME
+
+# run tests
+echo 'running playbook'
+ansible-playbook --syntax-check -i 'localhost,' -c local $(pwd)/tests/main.yml
+ansible-playbook -vvvv -i 'localhost,' -c local $(pwd)/tests/main.yml
diff --git a/provisioning/roles/geerlingguy.adminer/.travis.yml b/provisioning/roles/geerlingguy.adminer/.travis.yml
new file mode 100644
index 000000000..45c461ac7
--- /dev/null
+++ b/provisioning/roles/geerlingguy.adminer/.travis.yml
@@ -0,0 +1,66 @@
+---
+sudo: required
+
+env:
+  - distribution: centos
+    version: 6
+    init: /sbin/init
+    run_opts: ""
+    test_file: test-apache.yml
+  - distribution: centos
+    version: 7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    test_file: test-apache.yml
+  - distribution: ubuntu
+    version: 14.04
+    init: /sbin/init
+    run_opts: ""
+    test_file: test-apache.yml
+  - distribution: ubuntu
+    version: 12.04
+    init: /sbin/init
+    run_opts: ""
+    test_file: test-apache.yml
+  - distribution: ubuntu
+    version: 14.04
+    init: /sbin/init
+    run_opts: ""
+    test_file: test-standalone.yml
+
+services:
+  - docker
+
+before_install:
+  # - sudo apt-get update
+  # Pull container
+  - 'sudo docker pull ${distribution}:${version}'
+  # Customize container
+  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+
+script:
+  - container_id=$(mktemp)
+  # Run container in detached state
+  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+
+  # Install required Galaxy roles.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-galaxy install geerlingguy.apache'
+
+  # Ansible syntax check.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${test_file} --syntax-check'
+
+  # Test role.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${test_file}'
+
+  # Test role idempotence.
+  - >
+    sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/${test_file}
+    | grep -q 'changed=0.*failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)
+
+  # Clean up
+  - 'sudo docker stop "$(cat ${container_id})"'
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.adminer/README.md b/provisioning/roles/geerlingguy.adminer/README.md
new file mode 100644
index 000000000..4693bd86a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.adminer/README.md
@@ -0,0 +1,47 @@
+# Ansible Role: Adminer
+
+[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-adminer.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-adminer)
+
+An Ansible Role that installs [Adminer](http://www.adminer.org/) on almost any computer.
+
+## Requirements
+
+You need to have PHP and MySQL for Adminer to do anything useful. If you have Apache installed, Adminer will add in configuration to make Adminer accessible on any virtualhost at `/adminer`; set `adminer_add_apache_config` to `false` to disable this behavior.
+
+## Role Variables
+
+Available variables are listed below, along with default values (see `defaults/main.yml`):
+
+    adminer_install_dir: /opt/adminer
+
+The directory in which Adminer will be downloaded/installed.
+
+    adminer_install_filename: adminer.php
+
+The filename for the downloaded Adminer application. If you're managing virtualhosts or server directives manually, it might be simpler to set the document root to your configured `adminer_install_dir`, and the filename to `index.php`, so you don't have to enter `/adminer.php` in the URL to access Adminer.
+
+    adminer_symlink_dirs: []
+
+Directories inside which you would like `adminer.php` symlinked. Can be useful if you just want to toss the script into a docroot and access it at `sitename/adminer.php`.
+
+    adminer_add_apache_config: false
+
+Set this to `true` to tell Adminer to add a config file to Apache so you can access it at `hostname/adminer` on any configured virtualhost, using an Apache `Alias` directive. The role will also restart Apache so this configuration takes effect immediately.
+
+## Dependencies
+
+None. If `adminer_add_apache_config` is set to `true`, it will use some variables and handlers defined by the `geerlingguy.apache` role, so there's a soft dependency on that role.
+
+## Example Playbook
+
+    - hosts: servers
+      roles:
+        - { role: geerlingguy.adminer }
+
+## License
+
+MIT / BSD
+
+## Author Information
+
+This role was created in 2015 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/). It is originally a fork of [Oefenweb/ansible-adminer](https://github.com/Oefenweb/ansible-adminer).
diff --git a/provisioning/roles/geerlingguy.adminer/defaults/main.yml b/provisioning/roles/geerlingguy.adminer/defaults/main.yml
new file mode 100644
index 000000000..2a0f61580
--- /dev/null
+++ b/provisioning/roles/geerlingguy.adminer/defaults/main.yml
@@ -0,0 +1,5 @@
+---
+adminer_install_dir: /opt/adminer
+adminer_install_filename: adminer.php
+adminer_symlink_dirs: []
+adminer_add_apache_config: false
diff --git a/provisioning/roles/geerlingguy.adminer/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.adminer/meta/.galaxy_install_info
new file mode 100644
index 000000000..4a97db086
--- /dev/null
+++ b/provisioning/roles/geerlingguy.adminer/meta/.galaxy_install_info
@@ -0,0 +1 @@
+{install_date: 'Sat Jul 23 03:17:26 2016', version: 1.1.0}
diff --git a/provisioning/roles/geerlingguy.adminer/meta/main.yml b/provisioning/roles/geerlingguy.adminer/meta/main.yml
new file mode 100644
index 000000000..36278933b
--- /dev/null
+++ b/provisioning/roles/geerlingguy.adminer/meta/main.yml
@@ -0,0 +1,44 @@
+---
+dependencies: []
+
+galaxy_info:
+  author: geerlingguy
+  description: Installs Adminer for Database management.
+  company: "Midwestern Mac, LLC"
+  license: "license (BSD, MIT)"
+  min_ansible_version: 1.9
+  platforms:
+    - name: EL
+      versions:
+      - all
+    - name: GenericUNIX
+      versions:
+      - all
+    - name: Fedora
+      versions:
+      - all
+    - name: opensuse
+      versions:
+      - all
+    - name: GenericBSD
+      versions:
+      - all
+    - name: FreeBSD
+      versions:
+      - all
+    - name: Ubuntu
+      versions:
+      - all
+    - name: SLES
+      versions:
+      - all
+    - name: GenericLinux
+      versions:
+      - all
+    - name: Debian
+      versions:
+      - all
+  galaxy_tags:
+    - system
+    - database
+    - development
diff --git a/provisioning/roles/geerlingguy.adminer/tasks/main.yml b/provisioning/roles/geerlingguy.adminer/tasks/main.yml
new file mode 100644
index 000000000..377725513
--- /dev/null
+++ b/provisioning/roles/geerlingguy.adminer/tasks/main.yml
@@ -0,0 +1,40 @@
+---
+# Install Adminer.
+- name: Ensure Adminer directory exists.
+  file:
+    path: "{{ adminer_install_dir }}"
+    state: directory
+    recurse: yes
+
+- name: Download Adminer to configured directory.
+  get_url:
+    url: http://www.adminer.org/latest.php
+    dest: "{{ adminer_install_dir }}/{{ adminer_install_filename }}"
+    mode: 0644
+
+- name: Symlink Adminer into configured directories.
+  file:
+    src: "{{ adminer_install_dir }}/adminer.php"
+    dest: "{{ item }}/adminer.php"
+    state: link
+  with_items: "{{ adminer_symlink_dirs }}"
+
+# Add Apache configuration (if configured).
+- name: Set the proper Apache configuration directory (Debian).
+  set_fact:
+    apache_extra_conf_dir: "{{ 'conf-enabled' if apache_vhosts_version == '2.4' else 'conf.d' }}"
+  when: adminer_add_apache_config and ansible_os_family == 'Debian'
+
+- name: Add Apache configuration file for Adminer (Debian).
+  template:
+    src: adminer.conf.j2
+    dest: "{{ apache_conf_path }}/{{ apache_extra_conf_dir }}/adminer.conf"
+  when: adminer_add_apache_config and ansible_os_family == 'Debian'
+  notify: restart apache
+
+- name: Add Apache configuration file for Adminer (RedHat).
+  template:
+    src: adminer.conf.j2
+    dest: "{{ apache_conf_path }}/adminer.conf"
+  when: adminer_add_apache_config and ansible_os_family == 'RedHat'
+  notify: restart apache
diff --git a/provisioning/roles/geerlingguy.adminer/templates/adminer.conf.j2 b/provisioning/roles/geerlingguy.adminer/templates/adminer.conf.j2
new file mode 100644
index 000000000..93f23f2e7
--- /dev/null
+++ b/provisioning/roles/geerlingguy.adminer/templates/adminer.conf.j2
@@ -0,0 +1,9 @@
+Alias /adminer "{{ adminer_install_dir }}/adminer.php"
+<Directory "{{ adminer_install_dir }}">
+{% if apache_vhosts_version == "2.2" %}
+    Order allow,deny
+    Allow from all
+{% else %}
+    Require all granted
+{% endif %}
+</Directory>
diff --git a/provisioning/roles/geerlingguy.adminer/tests/Dockerfile.centos-6 b/provisioning/roles/geerlingguy.adminer/tests/Dockerfile.centos-6
new file mode 100644
index 000000000..4a4e7b8d6
--- /dev/null
+++ b/provisioning/roles/geerlingguy.adminer/tests/Dockerfile.centos-6
@@ -0,0 +1,15 @@
+FROM centos:6
+
+# Install Ansible
+RUN yum -y update; yum clean all;
+RUN yum -y install epel-release
+RUN yum -y install git ansible sudo
+RUN yum clean all
+
+# Disable requiretty
+RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
+
+# Install Ansible inventory file
+RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
+
+CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.adminer/tests/Dockerfile.centos-7 b/provisioning/roles/geerlingguy.adminer/tests/Dockerfile.centos-7
new file mode 100644
index 000000000..8aa065497
--- /dev/null
+++ b/provisioning/roles/geerlingguy.adminer/tests/Dockerfile.centos-7
@@ -0,0 +1,27 @@
+FROM centos:7
+
+# Install systemd -- See https://hub.docker.com/_/centos/
+RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
+RUN yum -y update; yum clean all; \
+(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
+rm -f /lib/systemd/system/multi-user.target.wants/*; \
+rm -f /etc/systemd/system/*.wants/*; \
+rm -f /lib/systemd/system/local-fs.target.wants/*; \
+rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
+rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
+rm -f /lib/systemd/system/basic.target.wants/*; \
+rm -f /lib/systemd/system/anaconda.target.wants/*;
+
+# Install Ansible
+RUN yum -y install epel-release
+RUN yum -y install git ansible sudo
+RUN yum clean all
+
+# Disable requiretty
+RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
+
+# Install Ansible inventory file
+RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
+
+VOLUME ["/sys/fs/cgroup"]
+CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.adminer/tests/Dockerfile.ubuntu-12.04 b/provisioning/roles/geerlingguy.adminer/tests/Dockerfile.ubuntu-12.04
new file mode 100644
index 000000000..d0c130cdf
--- /dev/null
+++ b/provisioning/roles/geerlingguy.adminer/tests/Dockerfile.ubuntu-12.04
@@ -0,0 +1,11 @@
+FROM ubuntu:12.04
+RUN apt-get update
+
+# Install Ansible
+RUN apt-get install -y software-properties-common python-software-properties git
+RUN apt-add-repository -y ppa:ansible/ansible
+RUN apt-get update
+RUN apt-get install -y ansible
+
+# Install Ansible inventory file
+RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.adminer/tests/Dockerfile.ubuntu-14.04 b/provisioning/roles/geerlingguy.adminer/tests/Dockerfile.ubuntu-14.04
new file mode 100644
index 000000000..ca332871f
--- /dev/null
+++ b/provisioning/roles/geerlingguy.adminer/tests/Dockerfile.ubuntu-14.04
@@ -0,0 +1,11 @@
+FROM ubuntu:14.04
+RUN apt-get update
+
+# Install Ansible
+RUN apt-get install -y software-properties-common git
+RUN apt-add-repository -y ppa:ansible/ansible
+RUN apt-get update
+RUN apt-get install -y ansible
+
+# Install Ansible inventory file
+RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.adminer/tests/test-apache.yml b/provisioning/roles/geerlingguy.adminer/tests/test-apache.yml
new file mode 100644
index 000000000..b45153296
--- /dev/null
+++ b/provisioning/roles/geerlingguy.adminer/tests/test-apache.yml
@@ -0,0 +1,8 @@
+- hosts: all
+
+  vars:
+    adminer_add_apache_config: true
+
+  roles:
+    - geerlingguy.apache
+    - role_under_test
diff --git a/provisioning/roles/geerlingguy.adminer/tests/test-standalone.yml b/provisioning/roles/geerlingguy.adminer/tests/test-standalone.yml
new file mode 100644
index 000000000..5a696a9a6
--- /dev/null
+++ b/provisioning/roles/geerlingguy.adminer/tests/test-standalone.yml
@@ -0,0 +1,8 @@
+- hosts: all
+
+  vars:
+    adminer_install_dir: /opt/adminer
+    adminer_add_apache_config: false
+
+  roles:
+    - role_under_test
diff --git a/provisioning/roles/geerlingguy.apache-php-fpm/.travis.yml b/provisioning/roles/geerlingguy.apache-php-fpm/.travis.yml
new file mode 100644
index 000000000..a74f40609
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache-php-fpm/.travis.yml
@@ -0,0 +1,53 @@
+---
+sudo: required
+
+env:
+  - distribution: centos
+    version: 7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distribution: ubuntu
+    version: 14.04
+    init: /sbin/init
+    run_opts: ""
+  - distribution: ubuntu
+    version: 12.04
+    init: /sbin/init
+    run_opts: ""
+
+services:
+  - docker
+
+before_install:
+  # Pull container
+  - 'sudo docker pull ${distribution}:${version}'
+  # Customize container
+  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+
+script:
+  - container_id=$(mktemp)
+  # Run container in detached state.
+  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+
+  # Install required Galaxy roles.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-galaxy install geerlingguy.repo-remi geerlingguy.apache geerlingguy.php'
+
+  # Ansible syntax check.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+
+  # Test role.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+
+  # Test role idempotence.
+  - >
+    sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml
+    | grep -q 'changed=0.*failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)
+
+  # Clean up
+  - 'sudo docker stop "$(cat ${container_id})"'
+
+notifications:
+   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.apache-php-fpm/README.md b/provisioning/roles/geerlingguy.apache-php-fpm/README.md
new file mode 100644
index 000000000..5591e6a41
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache-php-fpm/README.md
@@ -0,0 +1,57 @@
+# Ansible Role: Apache PHP-FPM
+
+[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-apache-php-fpm.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-apache-php-fpm)
+
+An Ansible Role that configures Apache for PHP-FPM usage on RHEL/CentOS and Debian/Ubuntu.
+
+## Requirements
+
+This role is dependent upon `geerlingguy.apache`, and also requires you have PHP running with PHP-FPM somewhere on the server or elsewhere (I usually configure PHP with the `geerlingguy.php` role).
+
+Additionally, this role will only work correctly if you have Apache 2.4.9+ installed; on older versions of Debian/Ubuntu Linux (e.g. 12.04), you can add `ppa:ondrej/apache2` prior to Apache installation to install Apache 2.4, for example:
+
+    - name: Add repository for Apache 2.4 on Ubuntu 12.04.
+      apt_repository: repo='ppa:ondrej/apache2'
+      when: ansible_distribution_version == "12.04"
+
+When configuring your Apache virtual hosts, you can add the following line to any vhost definition to enable passthrough to PHP-FPM:
+
+    # If using a TCP port:
+    ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000/var/www/example"
+    
+    # If using a Unix socket:
+    ProxyPassMatch ^/(.*\.php(/.*)?)$ "unix:/var/run/php5-fpm.sock|fcgi://localhost/var/www/example"
+
+For a full usage example with the `geerlingguy.apache` role, see the Example Playbook later in this README.
+
+## Role Variables
+
+None.
+
+## Dependencies
+
+None.
+
+## Example Playbook
+
+    - hosts: webservers
+    
+      vars:
+        apache_vhosts:
+          - servername: "www.example.com"
+            documentroot: "/var/www/example"
+            extra_parameters: |
+                  ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000/var/www/example"
+    
+      roles:
+        - { role: geerlingguy.apache }
+        - { role: geerlingguy.php }
+        - { role: geerlingguy.apache-fastcgi-php }
+
+## License
+
+MIT / BSD
+
+## Author Information
+
+This role was created in 2016 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.apache-php-fpm/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.apache-php-fpm/meta/.galaxy_install_info
new file mode 100644
index 000000000..5882bc048
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache-php-fpm/meta/.galaxy_install_info
@@ -0,0 +1 @@
+{install_date: 'Fri Jul 15 19:48:33 2016', version: 1.0.2}
diff --git a/provisioning/roles/geerlingguy.apache-php-fpm/meta/main.yml b/provisioning/roles/geerlingguy.apache-php-fpm/meta/main.yml
new file mode 100644
index 000000000..153a07bf0
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache-php-fpm/meta/main.yml
@@ -0,0 +1,26 @@
+---
+dependencies:
+  - geerlingguy.apache
+
+galaxy_info:
+  author: geerlingguy
+  description: Apache 2.4+ PHP-FPM support for Linux.
+  company: "Midwestern Mac, LLC"
+  license: "license (BSD, MIT)"
+  min_ansible_version: 1.4
+  platforms:
+  - name: EL
+    versions:
+    - 6
+    - 7
+  - name: Debian
+    versions:
+    - wheezy
+    - jessie
+  - name: Ubuntu
+    versions:
+    - precise
+    - trusty
+    - xenial
+  galaxy_tags:
+    - web
diff --git a/provisioning/roles/geerlingguy.apache-php-fpm/tasks/configure-Debian.yml b/provisioning/roles/geerlingguy.apache-php-fpm/tasks/configure-Debian.yml
new file mode 100644
index 000000000..f4eb185df
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache-php-fpm/tasks/configure-Debian.yml
@@ -0,0 +1,10 @@
+---
+- name: Enable mod_proxy_fcgi.
+  file:
+    src: "{{ apache_server_root }}/mods-available/{{ item }}"
+    dest: "{{ apache_server_root }}/mods-enabled/{{ item }}"
+    state: link
+  with_items:
+    - proxy.load
+    - proxy_fcgi.load
+  notify: restart apache
diff --git a/provisioning/roles/geerlingguy.apache-php-fpm/tasks/configure-RedHat.yml b/provisioning/roles/geerlingguy.apache-php-fpm/tasks/configure-RedHat.yml
new file mode 100644
index 000000000..b42a7be4c
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache-php-fpm/tasks/configure-RedHat.yml
@@ -0,0 +1,7 @@
+---
+# RHEL/CentOS 7 automatically installs and enables mod_proxy_fcgi by default.
+
+# RHEL/CentOS 6 installs Apache 2.2... and is much harder to get configured with
+# FastCGI, but here are two guides:
+#   - Apache 2.2 + mod_fastcgi: http://stackoverflow.com/a/21409702/100134
+#   - Apache 2.4 + mod_proxy_fcgi: http://unix.stackexchange.com/a/138903/16194
diff --git a/provisioning/roles/geerlingguy.apache-php-fpm/tasks/main.yml b/provisioning/roles/geerlingguy.apache-php-fpm/tasks/main.yml
new file mode 100644
index 000000000..545b65d0c
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache-php-fpm/tasks/main.yml
@@ -0,0 +1,7 @@
+---
+# Configuration tasks.
+- include: configure-Debian.yml
+  when: ansible_os_family == 'Debian'
+
+- include: configure-RedHat.yml
+  when: ansible_os_family == 'RedHat'
diff --git a/provisioning/roles/geerlingguy.apache-php-fpm/tests/Dockerfile.centos-7 b/provisioning/roles/geerlingguy.apache-php-fpm/tests/Dockerfile.centos-7
new file mode 100644
index 000000000..8aa065497
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache-php-fpm/tests/Dockerfile.centos-7
@@ -0,0 +1,27 @@
+FROM centos:7
+
+# Install systemd -- See https://hub.docker.com/_/centos/
+RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
+RUN yum -y update; yum clean all; \
+(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
+rm -f /lib/systemd/system/multi-user.target.wants/*; \
+rm -f /etc/systemd/system/*.wants/*; \
+rm -f /lib/systemd/system/local-fs.target.wants/*; \
+rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
+rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
+rm -f /lib/systemd/system/basic.target.wants/*; \
+rm -f /lib/systemd/system/anaconda.target.wants/*;
+
+# Install Ansible
+RUN yum -y install epel-release
+RUN yum -y install git ansible sudo
+RUN yum clean all
+
+# Disable requiretty
+RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
+
+# Install Ansible inventory file
+RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
+
+VOLUME ["/sys/fs/cgroup"]
+CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.apache-php-fpm/tests/Dockerfile.ubuntu-12.04 b/provisioning/roles/geerlingguy.apache-php-fpm/tests/Dockerfile.ubuntu-12.04
new file mode 100644
index 000000000..d0c130cdf
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache-php-fpm/tests/Dockerfile.ubuntu-12.04
@@ -0,0 +1,11 @@
+FROM ubuntu:12.04
+RUN apt-get update
+
+# Install Ansible
+RUN apt-get install -y software-properties-common python-software-properties git
+RUN apt-add-repository -y ppa:ansible/ansible
+RUN apt-get update
+RUN apt-get install -y ansible
+
+# Install Ansible inventory file
+RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.apache-php-fpm/tests/Dockerfile.ubuntu-14.04 b/provisioning/roles/geerlingguy.apache-php-fpm/tests/Dockerfile.ubuntu-14.04
new file mode 100644
index 000000000..ca332871f
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache-php-fpm/tests/Dockerfile.ubuntu-14.04
@@ -0,0 +1,11 @@
+FROM ubuntu:14.04
+RUN apt-get update
+
+# Install Ansible
+RUN apt-get install -y software-properties-common git
+RUN apt-add-repository -y ppa:ansible/ansible
+RUN apt-get update
+RUN apt-get install -y ansible
+
+# Install Ansible inventory file
+RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.apache-php-fpm/tests/test.yml b/provisioning/roles/geerlingguy.apache-php-fpm/tests/test.yml
new file mode 100644
index 000000000..88f3d7caf
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache-php-fpm/tests/test.yml
@@ -0,0 +1,27 @@
+---
+- hosts: all
+
+  vars:
+    php_enablerepo: "remi,remi-php56"
+    apache_listen_port_ssl: 443
+    apache_create_vhosts: true
+    apache_vhosts_filename: "vhosts.conf"
+    apache_vhosts:
+      - servername: "example.com"
+        documentroot: "/var/www/vhosts/example_com"
+
+  pre_tasks:
+    - name: Add repository for PHP 5.5 + Apache 2.4 on Ubuntu 12.04.
+      apt_repository: repo='ppa:ondrej/php5'
+      when: ansible_distribution_version == "12.04"
+
+    - name: Update apt cache on Ubuntu 12.04.
+      apt: update_cache=yes
+      when: ansible_distribution_version == "12.04"
+
+  roles:
+    - role: geerlingguy.repo-remi
+      when: ansible_os_family == 'RedHat'
+    - role: geerlingguy.apache
+    - role: geerlingguy.php
+    - role: role_under_test
diff --git a/provisioning/roles/geerlingguy.apache/.travis.yml b/provisioning/roles/geerlingguy.apache/.travis.yml
new file mode 100644
index 000000000..163e4c3b4
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache/.travis.yml
@@ -0,0 +1,54 @@
+---
+sudo: required
+
+env:
+  - distribution: centos
+    version: 6
+    init: /sbin/init
+    run_opts: ""
+  - distribution: centos
+    version: 7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distribution: ubuntu
+    version: 14.04
+    init: /sbin/init
+    run_opts: ""
+  - distribution: ubuntu
+    version: 12.04
+    init: /sbin/init
+    run_opts: ""
+
+services:
+  - docker
+
+before_install:
+  # - sudo apt-get update
+  # Pull container
+  - 'sudo docker pull ${distribution}:${version}'
+  # Customize container
+  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+
+script:
+  - container_id=$(mktemp)
+    # Run container in detached state
+  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+
+  # Ansible syntax check.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+
+  # Test role.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+
+  # Test role idempotence.
+  - >
+    sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml
+    | grep -q 'changed=0.*failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)
+
+  # Clean up
+  - 'sudo docker stop "$(cat ${container_id})"'
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.apache/README.md b/provisioning/roles/geerlingguy.apache/README.md
new file mode 100644
index 000000000..100614d0d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache/README.md
@@ -0,0 +1,124 @@
+# Ansible Role: Apache 2.x
+
+[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-apache.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-apache)
+
+An Ansible Role that installs Apache 2.x on RHEL/CentOS, Debian/Ubuntu, SLES and Solaris.
+
+## Requirements
+
+If you are using SSL/TLS, you will need to provide your own certificate and key files. You can generate a self-signed certificate with a command like `openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout example.key -out example.crt`.
+
+If you are using Apache with PHP, I recommend using the `geerlingguy.php` role to install PHP, and you can either use mod_php (by adding the proper package, e.g. `libapache2-mod-php5` for Ubuntu, to `php_packages`), or by also using `geerlingguy.apache-php-fpm` to connect Apache to PHP via FPM. See that role's README for more info.
+
+## Role Variables
+
+Available variables are listed below, along with default values (see `defaults/main.yml`):
+
+    apache_enablerepo: ""
+
+The repository to use when installing Apache (only used on RHEL/CentOS systems). If you'd like later versions of Apache than are available in the OS's core repositories, use a repository like EPEL (which can be installed with the `geerlingguy.repo-epel` role).
+
+    apache_listen_ip: "*"
+    apache_listen_port: 80
+    apache_listen_port_ssl: 443
+
+The IP address and ports on which apache should be listening. Useful if you have another service (like a reverse proxy) listening on port 80 or 443 and need to change the defaults.
+
+    apache_create_vhosts: true
+    apache_vhosts_filename: "vhosts.conf"
+
+If set to true, a vhosts file, managed by this role's variables (see below), will be created and placed in the Apache configuration folder. If set to false, you can place your own vhosts file into Apache's configuration folder and skip the convenient (but more basic) one added by this role.
+
+    apache_remove_default_vhost: false
+
+On Debian/Ubuntu, a default virtualhost is included in Apache's configuration. Set this to `true` to remove that default virtualhost configuration file.
+
+    apache_global_vhost_settings: |
+      DirectoryIndex index.php index.html
+      # Add other global settings on subsequent lines.
+
+You can add or override global Apache configuration settings in the role-provided vhosts file (assuming `apache_create_vhosts` is true) using this variable. By default it only sets the DirectoryIndex configuration.
+
+    apache_vhosts:
+      # Additional optional properties: 'serveradmin, serveralias, extra_parameters'.
+      - servername: "local.dev"
+        documentroot: "/var/www/html"
+
+Add a set of properties per virtualhost, including `servername` (required), `documentroot` (required), `serveradmin` (optional), `serveralias` (optional) and `extra_parameters` (optional: you can add whatever additional configuration lines you'd like in here).
+
+Here's an example using `extra_parameters` to add a RewriteRule to redirect all requests to the `www.` site:
+
+      - servername: "www.local.dev"
+        serveralias: "local.dev"
+        documentroot: "/var/www/html"
+        extra_parameters: |
+          RewriteCond %{HTTP_HOST} !^www\. [NC]
+          RewriteRule ^(.*)$ http://www.%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
+
+The `|` denotes a multiline scalar block in YAML, so newlines are preserved in the resulting configuration file output.
+
+    apache_vhosts_ssl: []
+
+No SSL vhosts are configured by default, but you can add them using the same pattern as `apache_vhosts`, with a few additional directives, like the following example:
+
+    apache_vhosts_ssl:
+      - {
+        servername: "local.dev",
+        documentroot: "/var/www/html",
+        certificate_file: "/home/vagrant/example.crt",
+        certificate_key_file: "/home/vagrant/example.key",
+        certificate_chain_file: "/path/to/certificate_chain.crt"
+      }
+
+Other SSL directives can be managed with other SSL-related role variables.
+
+    apache_ssl_protocol: "All -SSLv2 -SSLv3"
+    apache_ssl_cipher_suite: "AES256+EECDH:AES256+EDH"
+
+The SSL protocols and cipher suites that are used/allowed when clients make secure connections to your server. These are secure/sane defaults, but for maximum security, performand, and/or compatibility, you may need to adjust these settings.
+
+    apache_mods_enabled:
+      - rewrite.load
+      - ssl.load
+    apache_mods_disabled: []
+
+(Debian/Ubuntu ONLY) Which Apache mods to enable or disable (these will be symlinked into the appropriate location). See the `mods-available` directory inside the apache configuration directory (`/etc/apache2/mods-available` by default) for all the available mods.
+
+    apache_packages:
+      - [platform-specific]
+
+The list of packages to be installed. This defaults to a set of platform-specific packages for RedHat or Debian-based systems (see `vars/RedHat.yml` and `vars/Debian.yml` for the default values).
+
+    apache_state: started
+
+Set initial Apache daemon state to be enforced when this role is run. This should generally remain `started`, but you can set it to `stopped` if you need to fix the Apache config during a playbook run or otherwise would not like Apache started at the time this role is run.
+
+    apache_ignore_missing_ssl_certificate: true
+
+If you would like to only create SSL vhosts when the vhost certificate is present (e.g. when using Let’s Encrypt), set `apache_ignore_missing_ssl_certificate` to `false`. When doing this, you might need to run your playbook more than once so all the vhosts are configured (if another part of the playbook generates the SSL certificates).
+
+## Dependencies
+
+None.
+
+## Example Playbook
+
+    - hosts: webservers
+      vars_files:
+        - vars/main.yml
+      roles:
+        - { role: geerlingguy.apache }
+
+*Inside `vars/main.yml`*:
+
+    apache_listen_port: 8080
+    apache_vhosts:
+      - {servername: "example.com", documentroot: "/var/www/vhosts/example_com"}
+
+## License
+
+MIT / BSD
+
+## Author Information
+
+This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.apache/defaults/main.yml b/provisioning/roles/geerlingguy.apache/defaults/main.yml
new file mode 100644
index 000000000..4acdfce37
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache/defaults/main.yml
@@ -0,0 +1,44 @@
+---
+apache_enablerepo: ""
+
+apache_listen_ip: "*"
+apache_listen_port: 80
+apache_listen_port_ssl: 443
+
+apache_create_vhosts: true
+apache_vhosts_filename: "vhosts.conf"
+
+# On Debian/Ubuntu, a default virtualhost is included in Apache's configuration.
+# Set this to `true` to remove that default.
+apache_remove_default_vhost: false
+
+apache_global_vhost_settings: |
+  DirectoryIndex index.php index.html
+
+apache_vhosts:
+  # Additional properties: 'serveradmin, serveralias, extra_parameters'.
+  - servername: "local.dev"
+    documentroot: "/var/www/html"
+
+apache_vhosts_ssl: []
+  # Additional properties: 'serveradmin, extra_parameters'.
+  # - servername: "local.dev",
+  #   documentroot: "/var/www/html",
+  #   certificate_file: "/path/to/certificate.crt",
+  #   certificate_key_file: "/path/to/certificate.key",
+  #   # Optional.
+  #   certificate_chain_file: "/path/to/certificate_chain.crt"
+
+apache_ignore_missing_ssl_certificate: true
+
+apache_ssl_protocol: "All -SSLv2 -SSLv3"
+apache_ssl_cipher_suite: "AES256+EECDH:AES256+EDH"
+
+# Only used on Debian/Ubuntu.
+apache_mods_enabled:
+  - rewrite.load
+  - ssl.load
+apache_mods_disabled: []
+
+# Set initial apache state. Recommended values: `started` or `stopped`
+apache_state: started
diff --git a/provisioning/roles/geerlingguy.apache/handlers/main.yml b/provisioning/roles/geerlingguy.apache/handlers/main.yml
new file mode 100644
index 000000000..25d14ec17
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache/handlers/main.yml
@@ -0,0 +1,5 @@
+---
+- name: restart apache
+  service:
+    name: "{{ apache_service }}"
+    state: restarted
diff --git a/provisioning/roles/geerlingguy.apache/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.apache/meta/.galaxy_install_info
new file mode 100644
index 000000000..be7d7d1ac
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache/meta/.galaxy_install_info
@@ -0,0 +1 @@
+{install_date: 'Fri Jul 15 19:48:30 2016', version: 1.7.2}
diff --git a/provisioning/roles/geerlingguy.apache/meta/main.yml b/provisioning/roles/geerlingguy.apache/meta/main.yml
new file mode 100644
index 000000000..12200db07
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache/meta/main.yml
@@ -0,0 +1,31 @@
+---
+dependencies: []
+
+galaxy_info:
+  author: geerlingguy
+  description: Apache 2.x for RedHat/CentOS/Debian/Ubuntu/Solaris/Suse.
+  company: "Midwestern Mac, LLC"
+  license: "license (BSD, MIT)"
+  min_ansible_version: 1.9
+  platforms:
+    - name: EL
+      versions:
+      - all
+    - name: Debian
+      versions:
+      - all
+    - name: Ubuntu
+      versions:
+      - precise
+      - raring
+      - saucy
+      - trusty
+      - xenial
+    - name: Suse
+      versions:
+      - all
+    - name: Solaris
+      versions:
+      - 11.3
+  galaxy_tags:
+    - web
diff --git a/provisioning/roles/geerlingguy.apache/tasks/configure-Debian.yml b/provisioning/roles/geerlingguy.apache/tasks/configure-Debian.yml
new file mode 100644
index 000000000..94b9b2380
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache/tasks/configure-Debian.yml
@@ -0,0 +1,54 @@
+---
+- name: Configure Apache.
+  lineinfile:
+    dest: "{{ apache_server_root }}/ports.conf"
+    regexp: "{{ item.regexp }}"
+    line: "{{ item.line }}"
+    state: present
+  with_items: "{{ apache_ports_configuration_items }}"
+  notify: restart apache
+
+- name: Enable Apache mods.
+  file:
+    src: "{{ apache_server_root }}/mods-available/{{ item }}"
+    dest: "{{ apache_server_root }}/mods-enabled/{{ item }}"
+    state: link
+  with_items: "{{ apache_mods_enabled }}"
+  notify: restart apache
+
+- name: Disable Apache mods.
+  file:
+    path: "{{ apache_server_root }}/mods-enabled/{{ item }}"
+    state: absent
+  with_items: "{{ apache_mods_disabled }}"
+  notify: restart apache
+
+- name: Check whether certificates defined in vhosts exist.
+  stat: "path={{ item.certificate_file }}"
+  register: apache_ssl_certificates
+  with_items: "{{ apache_vhosts_ssl }}"
+
+- name: Add apache vhosts configuration.
+  template:
+    src: "vhosts.conf.j2"
+    dest: "{{ apache_conf_path }}/sites-available/{{ apache_vhosts_filename }}"
+    owner: root
+    group: root
+    mode: 0644
+  notify: restart apache
+  when: apache_create_vhosts
+
+- name: Add vhost symlink in sites-enabled.
+  file:
+    src: "{{ apache_conf_path }}/sites-available/{{ apache_vhosts_filename }}"
+    dest: "{{ apache_conf_path }}/sites-enabled/{{ apache_vhosts_filename }}"
+    state: link
+  notify: restart apache
+  when: apache_create_vhosts
+
+- name: Remove default vhost in sites-enabled.
+  file:
+    path: "{{ apache_conf_path }}/sites-enabled/{{ apache_default_vhost_filename }}"
+    state: absent
+  notify: restart apache
+  when: apache_remove_default_vhost
diff --git a/provisioning/roles/geerlingguy.apache/tasks/configure-RedHat.yml b/provisioning/roles/geerlingguy.apache/tasks/configure-RedHat.yml
new file mode 100644
index 000000000..0c3a01f5a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache/tasks/configure-RedHat.yml
@@ -0,0 +1,24 @@
+---
+- name: Configure Apache.
+  lineinfile:
+    dest: "{{ apache_server_root }}/conf/{{ apache_daemon }}.conf"
+    regexp: "{{ item.regexp }}"
+    line: "{{ item.line }}"
+    state: present
+  with_items: "{{ apache_ports_configuration_items }}"
+  notify: restart apache
+
+- name: Check whether certificates defined in vhosts exist.
+  stat: path={{ item.certificate_file }}
+  register: apache_ssl_certificates
+  with_items: "{{ apache_vhosts_ssl }}"
+
+- name: Add apache vhosts configuration.
+  template:
+    src: "vhosts.conf.j2"
+    dest: "{{ apache_conf_path }}/{{ apache_vhosts_filename }}"
+    owner: root
+    group: root
+    mode: 0644
+  notify: restart apache
+  when: apache_create_vhosts
diff --git a/provisioning/roles/geerlingguy.apache/tasks/configure-Solaris.yml b/provisioning/roles/geerlingguy.apache/tasks/configure-Solaris.yml
new file mode 100644
index 000000000..a95654bed
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache/tasks/configure-Solaris.yml
@@ -0,0 +1,19 @@
+---
+- name: Configure Apache.
+  lineinfile:
+    dest: "{{ apache_server_root }}/{{ apache_daemon }}.conf"
+    regexp: "{{ item.regexp }}"
+    line: "{{ item.line }}"
+    state: present
+  with_items: "{{ apache_ports_configuration_items }}"
+  notify: restart apache
+
+- name: Add apache vhosts configuration.
+  template:
+    src: "vhosts.conf.j2"
+    dest: "{{ apache_conf_path }}/{{ apache_vhosts_filename }}"
+    owner: root
+    group: root
+    mode: 0644
+  notify: restart apache
+  when: apache_create_vhosts
diff --git a/provisioning/roles/geerlingguy.apache/tasks/configure-Suse.yml b/provisioning/roles/geerlingguy.apache/tasks/configure-Suse.yml
new file mode 100644
index 000000000..16d89f81c
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache/tasks/configure-Suse.yml
@@ -0,0 +1,24 @@
+---
+- name: Configure Apache.
+  lineinfile:
+    dest: "{{ apache_server_root }}/listen.conf"
+    regexp: "{{ item.regexp }}"
+    line: "{{ item.line }}"
+    state: present
+  with_items: "{{ apache_ports_configuration_items }}"
+  notify: restart apache
+
+- name: Check whether certificates defined in vhosts exist.
+  stat: path={{ item.certificate_file }}
+  register: apache_ssl_certificates
+  with_items: "{{ apache_vhosts_ssl }}"
+
+- name: Add apache vhosts configuration.
+  template:
+    src: "vhosts.conf.j2"
+    dest: "{{ apache_conf_path }}/{{ apache_vhosts_filename }}"
+    owner: root
+    group: root
+    mode: 0644
+  notify: restart apache
+  when: apache_create_vhosts
diff --git a/provisioning/roles/geerlingguy.apache/tasks/main.yml b/provisioning/roles/geerlingguy.apache/tasks/main.yml
new file mode 100644
index 000000000..0715fc2bc
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache/tasks/main.yml
@@ -0,0 +1,58 @@
+---
+# Include variables and define needed variables.
+- name: Include OS-specific variables.
+  include_vars: "{{ ansible_os_family }}.yml"
+
+- name: Define apache_packages.
+  set_fact:
+    apache_packages: "{{ __apache_packages | list }}"
+  when: apache_packages is not defined
+
+# Setup/install tasks.
+- include: setup-RedHat.yml
+  when: ansible_os_family == 'RedHat'
+
+- include: setup-Suse.yml
+  when: ansible_os_family == 'Suse'
+
+- include: setup-Debian.yml
+  when: ansible_os_family == 'Debian'
+
+- include: setup-Solaris.yml
+  when: ansible_os_family == 'Solaris'
+
+# Figure out what version of Apache is installed.
+- name: Get installed version of Apache.
+  shell: "{{ apache_daemon_path }}{{ apache_daemon }} -v"
+  changed_when: false
+  always_run: yes
+  register: _apache_version
+
+- name: Create apache_version variable.
+  set_fact:
+    apache_version: "{{ _apache_version.stdout.split()[2].split('/')[1] }}"
+
+- include_vars: apache-22.yml
+  when: "apache_version.split('.')[1] == '2'"
+
+- include_vars: apache-24.yml
+  when: "apache_version.split('.')[1] == '4'"
+
+# Configure Apache.
+- include: configure-RedHat.yml
+  when: ansible_os_family == 'RedHat'
+
+- include: configure-Suse.yml
+  when: ansible_os_family == 'Suse'
+
+- include: configure-Debian.yml
+  when: ansible_os_family == 'Debian'
+
+- include: configure-Solaris.yml
+  when: ansible_os_family == 'Solaris'
+
+- name: Ensure Apache has selected state and enabled on boot.
+  service:
+    name: "{{ apache_service }}"
+    state: "{{ apache_state }}"
+    enabled: yes
diff --git a/provisioning/roles/geerlingguy.apache/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.apache/tasks/setup-Debian.yml
new file mode 100644
index 000000000..8d72deb1b
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache/tasks/setup-Debian.yml
@@ -0,0 +1,7 @@
+---
+- name: Update apt cache.
+  apt: update_cache=yes cache_valid_time=86400
+
+- name: Ensure Apache is installed on Debian.
+  apt: "name={{ item }} state=installed"
+  with_items: "{{ apache_packages }}"
diff --git a/provisioning/roles/geerlingguy.apache/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.apache/tasks/setup-RedHat.yml
new file mode 100644
index 000000000..f4a838f20
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache/tasks/setup-RedHat.yml
@@ -0,0 +1,7 @@
+---
+- name: Ensure Apache is installed on RHEL.
+  yum:
+    name: "{{ item }}"
+    state: installed
+    enablerepo: "{{ apache_enablerepo }}"
+  with_items: "{{ apache_packages }}"
diff --git a/provisioning/roles/geerlingguy.apache/tasks/setup-Solaris.yml b/provisioning/roles/geerlingguy.apache/tasks/setup-Solaris.yml
new file mode 100644
index 000000000..989e32e86
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache/tasks/setup-Solaris.yml
@@ -0,0 +1,6 @@
+---
+- name: Ensure Apache is installed on Solaris.
+  pkg5:
+    name: "{{ item }}"
+    state: installed
+  with_items: "{{ apache_packages }}"
diff --git a/provisioning/roles/geerlingguy.apache/tasks/setup-Suse.yml b/provisioning/roles/geerlingguy.apache/tasks/setup-Suse.yml
new file mode 100644
index 000000000..80c65cafa
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache/tasks/setup-Suse.yml
@@ -0,0 +1,6 @@
+---
+- name: Ensure Apache is installed on Suse.
+  zypper:
+    name: "{{ item }}"
+    state: installed
+  with_items: "{{ apache_packages }}"
diff --git a/provisioning/roles/geerlingguy.apache/templates/vhosts.conf.j2 b/provisioning/roles/geerlingguy.apache/templates/vhosts.conf.j2
new file mode 100644
index 000000000..766554fb3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache/templates/vhosts.conf.j2
@@ -0,0 +1,82 @@
+{{ apache_global_vhost_settings }}
+
+{# Set up VirtualHosts #}
+{% for vhost in apache_vhosts %}
+<VirtualHost {{ apache_listen_ip }}:{{ apache_listen_port }}>
+  ServerName {{ vhost.servername }}
+{% if vhost.serveralias is defined %}
+  ServerAlias {{ vhost.serveralias }}
+{% endif %}
+{% if vhost.documentroot is defined %}
+  DocumentRoot {{ vhost.documentroot }}
+{% endif %}
+
+{% if vhost.serveradmin is defined %}
+  ServerAdmin {{ vhost.serveradmin }}
+{% endif %}
+{% if vhost.documentroot is defined %}
+  <Directory "{{ vhost.documentroot }}">
+    AllowOverride All
+    Options -Indexes +FollowSymLinks
+{% if apache_vhosts_version == "2.2" %}
+    Order allow,deny
+    Allow from all
+{% else %}
+    Require all granted
+{% endif %}
+  </Directory>
+{% endif %}
+{% if vhost.extra_parameters is defined %}
+  {{ vhost.extra_parameters }}
+{% endif %}
+</VirtualHost>
+
+{% endfor %}
+
+{# Set up SSL VirtualHosts #}
+{% for vhost in apache_vhosts_ssl %}
+{% if apache_ignore_missing_ssl_certificate or apache_ssl_certificates.results[loop.index0].stat.exists %}
+<VirtualHost {{ apache_listen_ip }}:{{ apache_listen_port_ssl }}>
+  ServerName {{ vhost.servername }}
+{% if vhost.serveralias is defined %}
+  ServerAlias {{ vhost.serveralias }}
+{% endif %}
+{% if vhost.documentroot is defined %}
+  DocumentRoot {{ vhost.documentroot }}
+{% endif %}
+
+  SSLEngine on
+  SSLCipherSuite {{ apache_ssl_cipher_suite }}
+  SSLProtocol {{ apache_ssl_protocol }}
+  SSLHonorCipherOrder On
+{% if apache_vhosts_version == "2.4" %}
+  SSLCompression off
+{% endif %}
+  SSLCertificateFile {{ vhost.certificate_file }}
+  SSLCertificateKeyFile {{ vhost.certificate_key_file }}
+{% if vhost.certificate_chain_file is defined %}
+  SSLCertificateChainFile {{ vhost.certificate_chain_file }}
+{% endif %}
+
+{% if vhost.serveradmin is defined %}
+  ServerAdmin {{ vhost.serveradmin }}
+{% endif %}
+{% if vhost.documentroot is defined %}
+  <Directory "{{ vhost.documentroot }}">
+    AllowOverride All
+    Options -Indexes +FollowSymLinks
+{% if apache_vhosts_version == "2.2" %}
+    Order allow,deny
+    Allow from all
+{% else %}
+    Require all granted
+{% endif %}
+  </Directory>
+{% endif %}
+{% if vhost.extra_parameters is defined %}
+  {{ vhost.extra_parameters }}
+{% endif %}
+</VirtualHost>
+
+{% endif %}
+{% endfor %}
diff --git a/provisioning/roles/geerlingguy.apache/tests/Dockerfile.centos-6 b/provisioning/roles/geerlingguy.apache/tests/Dockerfile.centos-6
new file mode 100644
index 000000000..4a4e7b8d6
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache/tests/Dockerfile.centos-6
@@ -0,0 +1,15 @@
+FROM centos:6
+
+# Install Ansible
+RUN yum -y update; yum clean all;
+RUN yum -y install epel-release
+RUN yum -y install git ansible sudo
+RUN yum clean all
+
+# Disable requiretty
+RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
+
+# Install Ansible inventory file
+RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
+
+CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.apache/tests/Dockerfile.centos-7 b/provisioning/roles/geerlingguy.apache/tests/Dockerfile.centos-7
new file mode 100644
index 000000000..8aa065497
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache/tests/Dockerfile.centos-7
@@ -0,0 +1,27 @@
+FROM centos:7
+
+# Install systemd -- See https://hub.docker.com/_/centos/
+RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
+RUN yum -y update; yum clean all; \
+(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
+rm -f /lib/systemd/system/multi-user.target.wants/*; \
+rm -f /etc/systemd/system/*.wants/*; \
+rm -f /lib/systemd/system/local-fs.target.wants/*; \
+rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
+rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
+rm -f /lib/systemd/system/basic.target.wants/*; \
+rm -f /lib/systemd/system/anaconda.target.wants/*;
+
+# Install Ansible
+RUN yum -y install epel-release
+RUN yum -y install git ansible sudo
+RUN yum clean all
+
+# Disable requiretty
+RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
+
+# Install Ansible inventory file
+RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
+
+VOLUME ["/sys/fs/cgroup"]
+CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.apache/tests/Dockerfile.ubuntu-12.04 b/provisioning/roles/geerlingguy.apache/tests/Dockerfile.ubuntu-12.04
new file mode 100644
index 000000000..d0c130cdf
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache/tests/Dockerfile.ubuntu-12.04
@@ -0,0 +1,11 @@
+FROM ubuntu:12.04
+RUN apt-get update
+
+# Install Ansible
+RUN apt-get install -y software-properties-common python-software-properties git
+RUN apt-add-repository -y ppa:ansible/ansible
+RUN apt-get update
+RUN apt-get install -y ansible
+
+# Install Ansible inventory file
+RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.apache/tests/Dockerfile.ubuntu-14.04 b/provisioning/roles/geerlingguy.apache/tests/Dockerfile.ubuntu-14.04
new file mode 100644
index 000000000..ca332871f
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache/tests/Dockerfile.ubuntu-14.04
@@ -0,0 +1,11 @@
+FROM ubuntu:14.04
+RUN apt-get update
+
+# Install Ansible
+RUN apt-get install -y software-properties-common git
+RUN apt-add-repository -y ppa:ansible/ansible
+RUN apt-get update
+RUN apt-get install -y ansible
+
+# Install Ansible inventory file
+RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.apache/tests/test.yml b/provisioning/roles/geerlingguy.apache/tests/test.yml
new file mode 100644
index 000000000..f5c5ca6cb
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache/tests/test.yml
@@ -0,0 +1,13 @@
+---
+- hosts: all
+
+  vars:
+    apache_listen_port_ssl: 443
+    apache_create_vhosts: true
+    apache_vhosts_filename: "vhosts.conf"
+    apache_vhosts:
+      - servername: "example.com"
+        documentroot: "/var/www/vhosts/example_com"
+
+  roles:
+    - role_under_test
diff --git a/provisioning/roles/geerlingguy.apache/vars/Debian.yml b/provisioning/roles/geerlingguy.apache/vars/Debian.yml
new file mode 100644
index 000000000..7ff09c5f8
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache/vars/Debian.yml
@@ -0,0 +1,14 @@
+---
+apache_service: apache2
+apache_daemon: apache2
+apache_daemon_path: /usr/sbin/
+apache_server_root: /etc/apache2
+apache_conf_path: /etc/apache2
+
+__apache_packages:
+  - apache2
+  - apache2-utils
+
+apache_ports_configuration_items:
+  - regexp: "^Listen "
+    line: "Listen {{ apache_listen_port }}"
diff --git a/provisioning/roles/geerlingguy.apache/vars/RedHat.yml b/provisioning/roles/geerlingguy.apache/vars/RedHat.yml
new file mode 100644
index 000000000..d79fa5ac5
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache/vars/RedHat.yml
@@ -0,0 +1,20 @@
+---
+apache_service: httpd
+apache_daemon: httpd
+apache_daemon_path: /usr/sbin/
+apache_server_root: /etc/httpd
+apache_conf_path: /etc/httpd/conf.d
+
+apache_vhosts_version: "2.2"
+
+__apache_packages:
+  - httpd
+  - httpd-devel
+  - mod_ssl
+  - openssh
+
+apache_ports_configuration_items:
+  - regexp: "^Listen "
+    line: "Listen {{ apache_listen_port }}"
+  - regexp: "^#?NameVirtualHost "
+    line: "NameVirtualHost {{ apache_listen_ip }}:{{ apache_listen_port }}"
diff --git a/provisioning/roles/geerlingguy.apache/vars/Solaris.yml b/provisioning/roles/geerlingguy.apache/vars/Solaris.yml
new file mode 100644
index 000000000..576291e8d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache/vars/Solaris.yml
@@ -0,0 +1,19 @@
+---
+apache_service: apache24
+apache_daemon: httpd
+apache_daemon_path: /usr/apache2/2.4/bin/
+apache_server_root: /etc/apache2/2.4/
+apache_conf_path: /etc/apache2/2.4/conf.d
+
+apache_vhosts_version: "2.2"
+
+__apache_packages:
+  - web/server/apache-24
+  - web/server/apache-24/module/apache-ssl
+  - web/server/apache-24/module/apache-security
+
+apache_ports_configuration_items:
+  - regexp: "^Listen "
+    line: "Listen {{ apache_listen_port }}"
+  - regexp: "^#?NameVirtualHost "
+    line: "NameVirtualHost {{ apache_listen_ip }}:{{ apache_listen_port }}"
diff --git a/provisioning/roles/geerlingguy.apache/vars/Suse.yml b/provisioning/roles/geerlingguy.apache/vars/Suse.yml
new file mode 100644
index 000000000..27703f336
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache/vars/Suse.yml
@@ -0,0 +1,18 @@
+---
+apache_service: apache2
+apache_daemon: httpd2
+apache_daemon_path: /usr/sbin/
+apache_server_root: /etc/apache2
+apache_conf_path: /etc/apache2/conf.d
+
+apache_vhosts_version: "2.2"
+
+__apache_packages:
+  - apache2
+  - openssh
+
+apache_ports_configuration_items:
+  - regexp: "^Listen "
+    line: "Listen {{ apache_listen_port }}"
+  - regexp: "^#?NameVirtualHost "
+    line: "NameVirtualHost {{ apache_listen_ip }}:{{ apache_listen_port }}"
diff --git a/provisioning/roles/geerlingguy.apache/vars/apache-22.yml b/provisioning/roles/geerlingguy.apache/vars/apache-22.yml
new file mode 100644
index 000000000..c932f93f5
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache/vars/apache-22.yml
@@ -0,0 +1,12 @@
+---
+apache_vhosts_version: "2.2"
+apache_default_vhost_filename: 000-default
+apache_ports_configuration_items:
+  - {
+    regexp: "^Listen ",
+    line: "Listen {{ apache_listen_port }}"
+  }
+  - {
+    regexp: "^#?NameVirtualHost ",
+    line: "NameVirtualHost {{ apache_listen_ip }}:{{ apache_listen_port }}"
+  }
diff --git a/provisioning/roles/geerlingguy.apache/vars/apache-24.yml b/provisioning/roles/geerlingguy.apache/vars/apache-24.yml
new file mode 100644
index 000000000..449a444e8
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache/vars/apache-24.yml
@@ -0,0 +1,8 @@
+---
+apache_vhosts_version: "2.4"
+apache_default_vhost_filename: 000-default.conf
+apache_ports_configuration_items:
+  - {
+    regexp: "^Listen ",
+    line: "Listen {{ apache_listen_port }}"
+  }
diff --git a/provisioning/roles/geerlingguy.blackfire/.travis.yml b/provisioning/roles/geerlingguy.blackfire/.travis.yml
new file mode 100644
index 000000000..8f7ae13c7
--- /dev/null
+++ b/provisioning/roles/geerlingguy.blackfire/.travis.yml
@@ -0,0 +1,55 @@
+---
+sudo: required
+
+env:
+  - distribution: centos
+    version: 7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distribution: ubuntu
+    version: 14.04
+    init: /sbin/init
+    run_opts: ""
+  - distribution: ubuntu
+    version: 12.04
+    init: /sbin/init
+    run_opts: ""
+
+services:
+  - docker
+
+before_install:
+  # Pull container
+  - 'sudo docker pull ${distribution}:${version}'
+  # Customize container
+  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+
+script:
+  - container_id=$(mktemp)
+  # Run container in detached state
+  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+
+  # Install dependencies.
+  - 'sudo docker exec "$(cat ${container_id})" ansible-galaxy install geerlingguy.php'
+
+  # Ansible syntax check.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+
+  # Test role.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+
+  # Test role idempotence.
+  - >
+    sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml
+    | grep -q 'changed=0.*failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)
+
+  # Ensure Blackfire is installed.
+  #- 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm TODO'
+
+  # Clean up
+  - 'sudo docker stop "$(cat ${container_id})"'
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.blackfire/README.md b/provisioning/roles/geerlingguy.blackfire/README.md
new file mode 100644
index 000000000..b42dd7ba5
--- /dev/null
+++ b/provisioning/roles/geerlingguy.blackfire/README.md
@@ -0,0 +1,41 @@
+# Ansible Role: Blackfire
+
+[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-blackfire.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-blackfire)
+
+Installs [Blackfire](https://blackfire.io/) on RHEL/CentOS or Debian/Ubuntu.
+
+## Requirements
+
+After installation, you need to complete Blackfire setup manually before profiling:
+
+  1. Register the Blackfire agent: `sudo blackfire-agent -register`
+  2. Configure Blackfire: `blackfire config`
+
+## Role Variables
+
+Available variables are listed below, along with default values (see `defaults/main.yml`):
+
+    blackfire_packages:
+      - blackfire-agent
+      - blackfire-php
+
+The Blackfire packages this role will install on the server. Note that `blackfire-php` may not work well with XHProf and/or XDebug.
+
+## Dependencies
+
+Requires the `geerlingguy.php` role.
+
+## Example Playbook
+
+    - hosts: webserver
+      roles:
+        - geerlingguy.php
+        - geerlingguy.blackfire
+
+## License
+
+MIT / BSD
+
+## Author Information
+
+This role was created in 2016 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.blackfire/defaults/main.yml b/provisioning/roles/geerlingguy.blackfire/defaults/main.yml
new file mode 100644
index 000000000..68e1bff63
--- /dev/null
+++ b/provisioning/roles/geerlingguy.blackfire/defaults/main.yml
@@ -0,0 +1,6 @@
+---
+blackfire_gpg_key_url: https://packagecloud.io/gpg.key
+
+blackfire_packages:
+  - blackfire-agent
+  - blackfire-php
diff --git a/provisioning/roles/geerlingguy.blackfire/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.blackfire/meta/.galaxy_install_info
new file mode 100644
index 000000000..3dcb0aeb3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.blackfire/meta/.galaxy_install_info
@@ -0,0 +1 @@
+{install_date: 'Fri Jul 15 19:48:37 2016', version: 1.0.0}
diff --git a/provisioning/roles/geerlingguy.blackfire/meta/main.yml b/provisioning/roles/geerlingguy.blackfire/meta/main.yml
new file mode 100644
index 000000000..9d50ce884
--- /dev/null
+++ b/provisioning/roles/geerlingguy.blackfire/meta/main.yml
@@ -0,0 +1,28 @@
+---
+dependencies:
+  - geerlingguy.php
+
+galaxy_info:
+  author: geerlingguy
+  description: Blackfire installation for Linux
+  company: "Midwestern Mac, LLC"
+  license: "license (BSD, MIT)"
+  min_ansible_version: 2.0
+  platforms:
+    - name: EL
+      versions:
+      - 6
+      - 7
+    - name: Debian
+      versions:
+      - all
+    - name: Ubuntu
+      versions:
+      - precise
+      - raring
+      - saucy
+      - trusty
+      - xenial
+  galaxy_tags:
+    - development
+    - web
diff --git a/provisioning/roles/geerlingguy.blackfire/tasks/main.yml b/provisioning/roles/geerlingguy.blackfire/tasks/main.yml
new file mode 100644
index 000000000..2dc893ece
--- /dev/null
+++ b/provisioning/roles/geerlingguy.blackfire/tasks/main.yml
@@ -0,0 +1,14 @@
+---
+- include: setup-RedHat.yml
+  when: ansible_os_family == 'RedHat'
+
+- include: setup-Debian.yml
+  when: ansible_os_family == 'Debian'
+
+- name: Ensure Blackfire packages are installed.
+  package:
+    name: "{{ blackfire_packages }}"
+    state: present
+  notify:
+    - restart webserver
+    - restart php-fpm
diff --git a/provisioning/roles/geerlingguy.blackfire/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.blackfire/tasks/setup-Debian.yml
new file mode 100644
index 000000000..e3bd66149
--- /dev/null
+++ b/provisioning/roles/geerlingguy.blackfire/tasks/setup-Debian.yml
@@ -0,0 +1,17 @@
+---
+- name: Add packagecloud apt key.
+  apt_key:
+    url: "{{ blackfire_gpg_key_url }}"
+    state: present
+
+- name: Add packagecloud repository.
+  apt_repository:
+    repo: "{{ item }}"
+    state: present
+  register: packagecloud_repos
+  with_items:
+    - "deb http://packages.blackfire.io/debian any main"
+
+- name: Update apt caches after repo is added.
+  apt: update_cache=yes
+  when: packagecloud_repos.changed
diff --git a/provisioning/roles/geerlingguy.blackfire/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.blackfire/tasks/setup-RedHat.yml
new file mode 100644
index 000000000..9d5b515f6
--- /dev/null
+++ b/provisioning/roles/geerlingguy.blackfire/tasks/setup-RedHat.yml
@@ -0,0 +1,18 @@
+---
+- name: Add packagecloud GPG key.
+  rpm_key:
+    key: "{{ blackfire_gpg_key_url }}"
+    state: present
+
+- name: Add Blackfire repository.
+  get_url:
+    url: http://packages.blackfire.io/fedora/blackfire.repo
+    dest: /etc/yum.repos.d/blackfire.repo
+    mode: 0644
+
+- name: Disable gpg_repocheck for non-bleeding-edge CentOS.
+  lineinfile: >
+    dest=/etc/yum.repos.d/blackfire.repo
+    regexp="^repo_gpgcheck="
+    line="repo_gpgcheck=0"
+    state=present
diff --git a/provisioning/roles/geerlingguy.blackfire/tests/Dockerfile.centos-7 b/provisioning/roles/geerlingguy.blackfire/tests/Dockerfile.centos-7
new file mode 100644
index 000000000..8aa065497
--- /dev/null
+++ b/provisioning/roles/geerlingguy.blackfire/tests/Dockerfile.centos-7
@@ -0,0 +1,27 @@
+FROM centos:7
+
+# Install systemd -- See https://hub.docker.com/_/centos/
+RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
+RUN yum -y update; yum clean all; \
+(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
+rm -f /lib/systemd/system/multi-user.target.wants/*; \
+rm -f /etc/systemd/system/*.wants/*; \
+rm -f /lib/systemd/system/local-fs.target.wants/*; \
+rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
+rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
+rm -f /lib/systemd/system/basic.target.wants/*; \
+rm -f /lib/systemd/system/anaconda.target.wants/*;
+
+# Install Ansible
+RUN yum -y install epel-release
+RUN yum -y install git ansible sudo
+RUN yum clean all
+
+# Disable requiretty
+RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
+
+# Install Ansible inventory file
+RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
+
+VOLUME ["/sys/fs/cgroup"]
+CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.blackfire/tests/Dockerfile.ubuntu-12.04 b/provisioning/roles/geerlingguy.blackfire/tests/Dockerfile.ubuntu-12.04
new file mode 100644
index 000000000..d0c130cdf
--- /dev/null
+++ b/provisioning/roles/geerlingguy.blackfire/tests/Dockerfile.ubuntu-12.04
@@ -0,0 +1,11 @@
+FROM ubuntu:12.04
+RUN apt-get update
+
+# Install Ansible
+RUN apt-get install -y software-properties-common python-software-properties git
+RUN apt-add-repository -y ppa:ansible/ansible
+RUN apt-get update
+RUN apt-get install -y ansible
+
+# Install Ansible inventory file
+RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.blackfire/tests/Dockerfile.ubuntu-14.04 b/provisioning/roles/geerlingguy.blackfire/tests/Dockerfile.ubuntu-14.04
new file mode 100644
index 000000000..ca332871f
--- /dev/null
+++ b/provisioning/roles/geerlingguy.blackfire/tests/Dockerfile.ubuntu-14.04
@@ -0,0 +1,11 @@
+FROM ubuntu:14.04
+RUN apt-get update
+
+# Install Ansible
+RUN apt-get install -y software-properties-common git
+RUN apt-add-repository -y ppa:ansible/ansible
+RUN apt-get update
+RUN apt-get install -y ansible
+
+# Install Ansible inventory file
+RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.blackfire/tests/test.yml b/provisioning/roles/geerlingguy.blackfire/tests/test.yml
new file mode 100644
index 000000000..8e5a02d46
--- /dev/null
+++ b/provisioning/roles/geerlingguy.blackfire/tests/test.yml
@@ -0,0 +1,10 @@
+---
+- hosts: all
+
+  vars:
+    php_enable_webserver: false
+    php_enable_php_fpm: true
+
+  roles:
+    - geerlingguy.php
+    - role_under_test
diff --git a/provisioning/roles/geerlingguy.composer/.travis.yml b/provisioning/roles/geerlingguy.composer/.travis.yml
new file mode 100644
index 000000000..319088cb4
--- /dev/null
+++ b/provisioning/roles/geerlingguy.composer/.travis.yml
@@ -0,0 +1,52 @@
+---
+sudo: required
+
+env:
+  - distribution: centos
+    version: 7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distribution: ubuntu
+    version: 14.04
+    init: /sbin/init
+    run_opts: ""
+
+services:
+  - docker
+
+before_install:
+  # - sudo apt-get update
+  # Pull container
+  - 'sudo docker pull ${distribution}:${version}'
+  # Customize container
+  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+
+script:
+  - container_id=$(mktemp)
+  # Run container in detached state
+  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+
+  # Install dependencies.
+  - 'sudo docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
+
+  # Ansible syntax check.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+
+  # Test role.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+
+  # Test role idempotence.
+  - >
+    sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml
+    | grep -q 'changed=0.*failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)
+
+  # Ensure Composer is installed and working.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm composer'
+
+  # Clean up
+  - 'sudo docker stop "$(cat ${container_id})"'
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.composer/README.md b/provisioning/roles/geerlingguy.composer/README.md
new file mode 100644
index 000000000..11def0422
--- /dev/null
+++ b/provisioning/roles/geerlingguy.composer/README.md
@@ -0,0 +1,68 @@
+# Ansible Role: Composer
+
+[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-composer.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-composer)
+
+Installs Composer, the PHP Dependency Manager, on any Linux or UNIX system.
+
+## Requirements
+
+  - `php` (version 5.4+) should be installed and working (you can use the `geerlingguy.php` role to install).
+  - `git` should be installed and working (you can use the `geerlingguy.git` role to install).
+
+## Role Variables
+
+Available variables are listed below, along with default values (see `defaults/main.yml`):
+
+    composer_path: /usr/local/bin/composer
+
+The path where composer will be installed and available to your system. Should be in your user's `$PATH` so you can run commands simply with `composer` instead of the full path.
+
+    composer_keep_updated: false
+
+Set this to `true` to update Composer to the latest release every time the playbook is run.
+
+    composer_home_path: '~/.composer'
+    composer_home_owner: root
+    composer_home_group: root
+
+The `COMPOSER_HOME` path and directory ownership; this is the directory where global packages will be installed.
+
+    composer_version: ''
+
+You can install a specific release of Composer, e.g. `composer_version: '1.0.0-alpha11'`. If left empty the latest development version will be installed. Note that `composer_keep_updated` will override this variable, as it will always install the latest development version.
+
+    composer_global_packages: {}
+
+A list of packages to install globally (using `composer global require`). If you want to install any packages globally, add a list item with a dictionary with the `name` of the package and a `release`, e.g. `- { name: phpunit/phpunit, release: "4.7.*" }`. The 'release' is optional, and defaults to `@stable`.
+
+    composer_add_to_path: true
+
+If `true`, and if there are any configured `composer_global_packages`, the `vendor/bin` directory inside `composer_home_path` will be added to the system's default `$PATH` (for all users).
+
+    composer_github_oauth_token: ''
+
+GitHub OAuth token, used to avoid GitHub API rate limiting errors when building and rebuilding applications using Composer. Follow GitHub's directions to [Create a personal access token](https://help.github.com/articles/creating-an-access-token-for-command-line-use/) if you run into these rate limit errors.
+
+    php_executable: php
+
+The executable name or full path to the PHP executable. This is defaulted to `php` if you don't override the variable.
+
+## Dependencies
+
+None (but make sure you've installed PHP; the `geerlingguy.php` role is recommended).
+
+## Example Playbook
+
+    - hosts: servers
+      roles:
+        - geerlingguy.composer
+
+After the playbook runs, `composer` will be placed in `/usr/local/bin/composer` (this location is configurable), and will be accessible via normal system accounts.
+
+## License
+
+MIT / BSD
+
+## Author Information
+
+This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.composer/defaults/main.yml b/provisioning/roles/geerlingguy.composer/defaults/main.yml
new file mode 100644
index 000000000..a6313ea6b
--- /dev/null
+++ b/provisioning/roles/geerlingguy.composer/defaults/main.yml
@@ -0,0 +1,20 @@
+---
+composer_path: /usr/local/bin/composer
+composer_keep_updated: false
+composer_version: ''
+
+# The directory where global packages will be installed.
+composer_home_path: '~/.composer'
+composer_home_owner: root
+composer_home_group: root
+
+# A list of packages to install globally. See commented examples below for
+# usage; the 'release' is optional, and defaults to '@stable'.
+composer_global_packages: []
+  # - { name: phpunit/phpunit, release: "4.7.x" }
+  # - { name: phpunit/phpunit, release: "@stable" }
+
+composer_add_to_path: true
+
+# GitHub OAuth token (used to help overcome API rate limits).
+composer_github_oauth_token: ''
diff --git a/provisioning/roles/geerlingguy.composer/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.composer/meta/.galaxy_install_info
new file mode 100644
index 000000000..0e05813ff
--- /dev/null
+++ b/provisioning/roles/geerlingguy.composer/meta/.galaxy_install_info
@@ -0,0 +1 @@
+{install_date: 'Fri Jul 15 19:48:40 2016', version: 1.4.1}
diff --git a/provisioning/roles/geerlingguy.composer/meta/main.yml b/provisioning/roles/geerlingguy.composer/meta/main.yml
new file mode 100644
index 000000000..c4b0b3130
--- /dev/null
+++ b/provisioning/roles/geerlingguy.composer/meta/main.yml
@@ -0,0 +1,43 @@
+---
+dependencies: []
+
+galaxy_info:
+  author: geerlingguy
+  description: Composer PHP Dependency Manager
+  company: "Midwestern Mac, LLC"
+  license: "license (BSD, MIT)"
+  min_ansible_version: 1.9
+  platforms:
+    - name: EL
+      versions:
+      - all
+    - name: GenericUNIX
+      versions:
+      - all
+    - name: Fedora
+      versions:
+      - all
+    - name: opensuse
+      versions:
+      - all
+    - name: GenericBSD
+      versions:
+      - all
+    - name: FreeBSD
+      versions:
+      - all
+    - name: Ubuntu
+      versions:
+      - all
+    - name: SLES
+      versions:
+      - all
+    - name: GenericLinux
+      versions:
+      - all
+    - name: Debian
+      versions:
+      - all
+  galaxy_tags:
+    - packaging
+    - web
diff --git a/provisioning/roles/geerlingguy.composer/tasks/global-require.yml b/provisioning/roles/geerlingguy.composer/tasks/global-require.yml
new file mode 100644
index 000000000..6f20b4c93
--- /dev/null
+++ b/provisioning/roles/geerlingguy.composer/tasks/global-require.yml
@@ -0,0 +1,17 @@
+---
+- name: Install configured globally-required packages.
+  become: yes
+  become_user: "{{ composer_home_owner }}"
+  shell: >
+    COMPOSER_HOME={{ composer_home_path }}
+    {{ composer_path }} global require {{ item.name }}:{{ item.release | default('@stable') }} --no-progress
+    creates={{ composer_home_path }}/vendor/{{ item.name }}
+  register: composer_global_require_result
+  with_items: "{{ composer_global_packages }}"
+
+- name: Add composer_home_path bin directory to global $PATH.
+  template:
+    src: composer.sh.j2
+    dest: /etc/profile.d/composer.sh
+    mode: 0644
+  when: composer_add_to_path
diff --git a/provisioning/roles/geerlingguy.composer/tasks/main.yml b/provisioning/roles/geerlingguy.composer/tasks/main.yml
new file mode 100644
index 000000000..6a65e991f
--- /dev/null
+++ b/provisioning/roles/geerlingguy.composer/tasks/main.yml
@@ -0,0 +1,53 @@
+---
+- name: Set php_executable variable to a default if not defined.
+  set_fact:
+    php_executable: php
+  when: php_executable is not defined
+
+- name: Check if Composer is installed.
+  stat: "path={{ composer_path }}"
+  register: composer_bin
+
+- name: Download Composer installer.
+  get_url:
+    url: https://getcomposer.org/installer
+    dest: /tmp/composer-installer.php
+    mode: 0755
+  when: not composer_bin.stat.exists
+
+- name: Run Composer installer.
+  command: >
+    {{ php_executable }} composer-installer.php {% if composer_version != '' %} --version={{ composer_version }}{% endif %}
+    chdir=/tmp
+  when: not composer_bin.stat.exists
+
+- name: Move Composer into globally-accessible location.
+  shell: >
+    mv /tmp/composer.phar {{ composer_path }}
+    creates={{ composer_path }}
+  when: not composer_bin.stat.exists
+
+- name: Update Composer to latest version (if configured).
+  shell: >
+    {{ php_executable }} {{ composer_path }} self-update
+  register: composer_update
+  changed_when: "'Updating to version' in composer_update.stdout"
+  when: composer_keep_updated
+
+- name: Ensure composer directory exists.
+  file:
+    path: "{{ composer_home_path }}"
+    owner: "{{ composer_home_owner }}"
+    group: "{{ composer_home_group }}"
+    state: directory
+
+- name: Add GitHub OAuth token for Composer (if configured).
+  template:
+    src: "auth.json.j2"
+    dest: "{{ composer_home_path }}/auth.json"
+    owner: "{{ composer_home_owner }}"
+    group: "{{ composer_home_group }}"
+  when: composer_github_oauth_token != ''
+
+- include: global-require.yml
+  when: composer_global_packages|length > 0
diff --git a/provisioning/roles/geerlingguy.composer/templates/auth.json.j2 b/provisioning/roles/geerlingguy.composer/templates/auth.json.j2
new file mode 100644
index 000000000..a41c2142d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.composer/templates/auth.json.j2
@@ -0,0 +1,5 @@
+{
+    "github-oauth": {
+        "github.com": "{{ composer_github_oauth_token }}"
+    }
+}
diff --git a/provisioning/roles/geerlingguy.composer/templates/composer.sh.j2 b/provisioning/roles/geerlingguy.composer/templates/composer.sh.j2
new file mode 100644
index 000000000..3e6cd7a36
--- /dev/null
+++ b/provisioning/roles/geerlingguy.composer/templates/composer.sh.j2
@@ -0,0 +1 @@
+export PATH=$PATH:{{ composer_home_path }}/vendor/bin
diff --git a/provisioning/roles/geerlingguy.composer/tests/Dockerfile.centos-7 b/provisioning/roles/geerlingguy.composer/tests/Dockerfile.centos-7
new file mode 100644
index 000000000..8aa065497
--- /dev/null
+++ b/provisioning/roles/geerlingguy.composer/tests/Dockerfile.centos-7
@@ -0,0 +1,27 @@
+FROM centos:7
+
+# Install systemd -- See https://hub.docker.com/_/centos/
+RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
+RUN yum -y update; yum clean all; \
+(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
+rm -f /lib/systemd/system/multi-user.target.wants/*; \
+rm -f /etc/systemd/system/*.wants/*; \
+rm -f /lib/systemd/system/local-fs.target.wants/*; \
+rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
+rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
+rm -f /lib/systemd/system/basic.target.wants/*; \
+rm -f /lib/systemd/system/anaconda.target.wants/*;
+
+# Install Ansible
+RUN yum -y install epel-release
+RUN yum -y install git ansible sudo
+RUN yum clean all
+
+# Disable requiretty
+RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
+
+# Install Ansible inventory file
+RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
+
+VOLUME ["/sys/fs/cgroup"]
+CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.composer/tests/Dockerfile.ubuntu-14.04 b/provisioning/roles/geerlingguy.composer/tests/Dockerfile.ubuntu-14.04
new file mode 100644
index 000000000..f81cabec6
--- /dev/null
+++ b/provisioning/roles/geerlingguy.composer/tests/Dockerfile.ubuntu-14.04
@@ -0,0 +1,14 @@
+FROM ubuntu:14.04
+RUN apt-get update
+
+# Install Ansible
+RUN apt-get install -y software-properties-common git
+RUN apt-add-repository -y ppa:ansible/ansible
+RUN apt-get update
+RUN apt-get install -y ansible
+
+COPY initctl_faker .
+RUN chmod +x initctl_faker && rm -fr /sbin/initctl && ln -s /initctl_faker /sbin/initctl
+
+# Install Ansible inventory file
+RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.composer/tests/initctl_faker b/provisioning/roles/geerlingguy.composer/tests/initctl_faker
new file mode 100644
index 000000000..a2267f30d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.composer/tests/initctl_faker
@@ -0,0 +1,23 @@
+#!/bin/sh
+ALIAS_CMD="$(echo ""$0"" | sed -e 's?/sbin/??')"
+
+case "$ALIAS_CMD" in
+    start|stop|restart|reload|status)
+        exec service $1 $ALIAS_CMD
+        ;;
+esac
+
+case "$1" in
+    list )
+        exec service --status-all
+        ;;
+    reload-configuration )
+        exec service $2 restart
+        ;;
+    start|stop|restart|reload|status)
+        exec service $2 $1
+        ;;
+    \?)
+        exit 0
+        ;;
+esac
diff --git a/provisioning/roles/geerlingguy.composer/tests/inventory b/provisioning/roles/geerlingguy.composer/tests/inventory
new file mode 100644
index 000000000..2fbb50c4a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.composer/tests/inventory
@@ -0,0 +1 @@
+localhost
diff --git a/provisioning/roles/geerlingguy.composer/tests/requirements.yml b/provisioning/roles/geerlingguy.composer/tests/requirements.yml
new file mode 100644
index 000000000..80e765f13
--- /dev/null
+++ b/provisioning/roles/geerlingguy.composer/tests/requirements.yml
@@ -0,0 +1,3 @@
+---
+- src: geerlingguy.repo-remi
+- src: geerlingguy.php
diff --git a/provisioning/roles/geerlingguy.composer/tests/test.yml b/provisioning/roles/geerlingguy.composer/tests/test.yml
new file mode 100644
index 000000000..c76d2a4b3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.composer/tests/test.yml
@@ -0,0 +1,21 @@
+---
+- hosts: localhost
+  remote_user: root
+
+  vars:
+    php_enablerepo: "remi,remi-php70"
+    php_enable_webserver: false
+
+    # Test a global requirement.
+    composer_global_packages:
+      - { name: phpunit/phpunit, release: "@stable" }
+
+  pre_tasks:
+    - name: Add repository for PHP 7.0.
+      apt_repository: repo='ppa:ondrej/php'
+      when: ansible_os_family == 'Debian'
+
+  roles:
+    - { role: geerlingguy.repo-remi, when: ansible_os_family == 'RedHat' }
+    - geerlingguy.php
+    - role_under_test
diff --git a/provisioning/roles/geerlingguy.daemonize/.travis.yml b/provisioning/roles/geerlingguy.daemonize/.travis.yml
new file mode 100644
index 000000000..fee7c8ba1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.daemonize/.travis.yml
@@ -0,0 +1,57 @@
+---
+sudo: required
+
+env:
+  - distribution: centos
+    version: 6
+    init: /sbin/init
+    run_opts: ""
+  - distribution: centos
+    version: 7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distribution: ubuntu
+    version: 14.04
+    init: /sbin/init
+    run_opts: ""
+  - distribution: ubuntu
+    version: 12.04
+    init: /sbin/init
+    run_opts: ""
+
+services:
+  - docker
+
+before_install:
+  # - sudo apt-get update
+  # Pull container
+  - 'sudo docker pull ${distribution}:${version}'
+  # Customize container
+  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+
+script:
+  - container_id=$(mktemp)
+  # Run container in detached state
+  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+
+  # Ansible syntax check.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+
+  # Test role.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+
+  # Ensure daemonize is available.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm which daemonize'
+
+  # Test role idempotence.
+  - >
+    sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml
+    | grep -q 'changed=0.*failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)
+
+  # Clean up
+  - 'sudo docker stop "$(cat ${container_id})"'
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.daemonize/README.md b/provisioning/roles/geerlingguy.daemonize/README.md
new file mode 100644
index 000000000..5beefbffd
--- /dev/null
+++ b/provisioning/roles/geerlingguy.daemonize/README.md
@@ -0,0 +1,43 @@
+# Ansible Role: Daemonize
+
+[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-daemonize.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-daemonize)
+
+Installs [Daemonize](http://software.clapper.org/daemonize/), a tool for running commands as a Unix daemon.
+
+## Requirements
+
+Make sure you have `gcc` or other build tools installed (e.g. `yum install make automake gcc gcc-c++ kernel-devel` on RedHat, or `apt-get install build-essential` on Debian) prior to running this role, as it builds Daemonize from source.
+
+## Role Variables
+
+Available variables are listed below, along with default values (see `defaults/main.yml`):
+
+    workspace: /root
+
+The location where code will be downloaded and compiled.
+
+    daemonize_version: 1.7.5
+
+The daemonize release version to install.
+
+    daemonize_install_path: "/usr"
+
+The path where the compiled daemonize binary will be installed.
+
+## Dependencies
+
+None.
+
+## Example Playbook
+
+    - hosts: servers
+      roles:
+        - { role: geerlingguy.daemonize }
+
+## License
+
+MIT / BSD
+
+## Author Information
+
+This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.daemonize/defaults/main.yml b/provisioning/roles/geerlingguy.daemonize/defaults/main.yml
new file mode 100644
index 000000000..29b95d5a3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.daemonize/defaults/main.yml
@@ -0,0 +1,5 @@
+---
+workspace: /root
+
+daemonize_version: 1.7.7
+daemonize_install_path: "/usr"
diff --git a/provisioning/roles/geerlingguy.daemonize/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.daemonize/meta/.galaxy_install_info
new file mode 100644
index 000000000..6e1de8afa
--- /dev/null
+++ b/provisioning/roles/geerlingguy.daemonize/meta/.galaxy_install_info
@@ -0,0 +1 @@
+{install_date: 'Fri Jul 15 19:48:43 2016', version: 1.1.0}
diff --git a/provisioning/roles/geerlingguy.daemonize/meta/main.yml b/provisioning/roles/geerlingguy.daemonize/meta/main.yml
new file mode 100644
index 000000000..09258d152
--- /dev/null
+++ b/provisioning/roles/geerlingguy.daemonize/meta/main.yml
@@ -0,0 +1,28 @@
+---
+dependencies: []
+
+galaxy_info:
+  author: geerlingguy
+  description: "Daemonize for Unix-like operating systems"
+  company: "Midwestern Mac, LLC"
+  license: "license (BSD, MIT)"
+  min_ansible_version: 1.6
+  platforms:
+  - name: EL
+    versions:
+    - all
+  - name: Ubuntu
+    versions:
+    - all
+  - name: Debian
+    versions:
+    - all
+  - name: GenericUNIX
+    versions:
+    - all
+    - any
+  galaxy_tags:
+    - development
+    - web
+    - system
+    - mail
diff --git a/provisioning/roles/geerlingguy.daemonize/tasks/main.yml b/provisioning/roles/geerlingguy.daemonize/tasks/main.yml
new file mode 100644
index 000000000..38334682a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.daemonize/tasks/main.yml
@@ -0,0 +1,29 @@
+---
+- name: Download daemonize archive.
+  get_url:
+    url: "https://github.com/bmc/daemonize/archive/release-{{ daemonize_version }}.tar.gz"
+    dest: "{{ workspace }}/daemonize-{{ daemonize_version }}.tar.gz"
+
+- name: Expand daemonize archive.
+  unarchive:
+    src: "{{ workspace }}/daemonize-{{ daemonize_version }}.tar.gz"
+    dest: "{{ workspace }}"
+    creates: "{{ workspace }}/daemonize-release-{{ daemonize_version }}/INSTALL"
+    copy: no
+
+- name: Check if daemonize is installed.
+  command: which daemonize
+  changed_when: false
+  failed_when: false
+  register: daemonize_installed
+
+- name: Build daemonize.
+  command: >
+    {{ item }}
+    chdir={{ workspace }}/daemonize-release-{{ daemonize_version }}
+  when: daemonize_installed | failed
+  with_items:
+    - "./configure --prefix={{ daemonize_install_path }}"
+    - make
+    - make install
+  become: yes
diff --git a/provisioning/roles/geerlingguy.daemonize/tests/Dockerfile.centos-6 b/provisioning/roles/geerlingguy.daemonize/tests/Dockerfile.centos-6
new file mode 100644
index 000000000..4a4e7b8d6
--- /dev/null
+++ b/provisioning/roles/geerlingguy.daemonize/tests/Dockerfile.centos-6
@@ -0,0 +1,15 @@
+FROM centos:6
+
+# Install Ansible
+RUN yum -y update; yum clean all;
+RUN yum -y install epel-release
+RUN yum -y install git ansible sudo
+RUN yum clean all
+
+# Disable requiretty
+RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
+
+# Install Ansible inventory file
+RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
+
+CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.daemonize/tests/Dockerfile.centos-7 b/provisioning/roles/geerlingguy.daemonize/tests/Dockerfile.centos-7
new file mode 100644
index 000000000..8aa065497
--- /dev/null
+++ b/provisioning/roles/geerlingguy.daemonize/tests/Dockerfile.centos-7
@@ -0,0 +1,27 @@
+FROM centos:7
+
+# Install systemd -- See https://hub.docker.com/_/centos/
+RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
+RUN yum -y update; yum clean all; \
+(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
+rm -f /lib/systemd/system/multi-user.target.wants/*; \
+rm -f /etc/systemd/system/*.wants/*; \
+rm -f /lib/systemd/system/local-fs.target.wants/*; \
+rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
+rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
+rm -f /lib/systemd/system/basic.target.wants/*; \
+rm -f /lib/systemd/system/anaconda.target.wants/*;
+
+# Install Ansible
+RUN yum -y install epel-release
+RUN yum -y install git ansible sudo
+RUN yum clean all
+
+# Disable requiretty
+RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
+
+# Install Ansible inventory file
+RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
+
+VOLUME ["/sys/fs/cgroup"]
+CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.daemonize/tests/Dockerfile.ubuntu-12.04 b/provisioning/roles/geerlingguy.daemonize/tests/Dockerfile.ubuntu-12.04
new file mode 100644
index 000000000..d0c130cdf
--- /dev/null
+++ b/provisioning/roles/geerlingguy.daemonize/tests/Dockerfile.ubuntu-12.04
@@ -0,0 +1,11 @@
+FROM ubuntu:12.04
+RUN apt-get update
+
+# Install Ansible
+RUN apt-get install -y software-properties-common python-software-properties git
+RUN apt-add-repository -y ppa:ansible/ansible
+RUN apt-get update
+RUN apt-get install -y ansible
+
+# Install Ansible inventory file
+RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.daemonize/tests/Dockerfile.ubuntu-14.04 b/provisioning/roles/geerlingguy.daemonize/tests/Dockerfile.ubuntu-14.04
new file mode 100644
index 000000000..ca332871f
--- /dev/null
+++ b/provisioning/roles/geerlingguy.daemonize/tests/Dockerfile.ubuntu-14.04
@@ -0,0 +1,11 @@
+FROM ubuntu:14.04
+RUN apt-get update
+
+# Install Ansible
+RUN apt-get install -y software-properties-common git
+RUN apt-add-repository -y ppa:ansible/ansible
+RUN apt-get update
+RUN apt-get install -y ansible
+
+# Install Ansible inventory file
+RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.daemonize/tests/test.yml b/provisioning/roles/geerlingguy.daemonize/tests/test.yml
new file mode 100644
index 000000000..4b03ee45e
--- /dev/null
+++ b/provisioning/roles/geerlingguy.daemonize/tests/test.yml
@@ -0,0 +1,24 @@
+- hosts: all
+
+  pre_tasks:
+    - name: Ensure build dependencies are installed (RedHat).
+      yum: 'name="{{ item }}" state=present'
+      with_items:
+        - "@Development tools"
+        - tar
+        - unzip
+        - sudo
+        - which
+      when: ansible_os_family == 'RedHat'
+
+    - name: Ensure build dependencies are installed (Debian).
+      apt: 'name="{{ item }}" state=installed'
+      with_items:
+        - build-essential
+        - unzip
+        - tar
+        - sudo
+      when: ansible_os_family == 'Debian'
+
+  roles:
+    - role_under_test
diff --git a/provisioning/roles/geerlingguy.drupal-console/.travis.yml b/provisioning/roles/geerlingguy.drupal-console/.travis.yml
new file mode 100644
index 000000000..816fbddfa
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal-console/.travis.yml
@@ -0,0 +1,41 @@
+---
+sudo: required
+language: python
+python: "2.7"
+
+env:
+  - SITE=test.yml
+  - SITE=test-self-update.yml
+
+before_install:
+  - sudo apt-get update -qq
+
+install:
+  # Install Ansible.
+  - pip install ansible
+
+  # Add ansible.cfg to pick up roles path.
+  - "{ echo '[defaults]'; echo 'roles_path = ../'; } >> ansible.cfg"
+
+  # Install required dependencies.
+  - ansible-galaxy install geerlingguy.php
+
+script:
+  # Check the role/playbook's syntax.
+  - "ansible-playbook -i tests/inventory tests/$SITE --syntax-check"
+
+  # Run the role/playbook with ansible-playbook.
+  - "ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo"
+
+  # Run the role/playbook again, checking to make sure it's idempotent.
+  - >
+    ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo
+    | grep -q 'changed=0.*failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)
+
+  # Check if Drupal Console is installed and working.
+  - drupal
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.drupal-console/README.md b/provisioning/roles/geerlingguy.drupal-console/README.md
new file mode 100644
index 000000000..83aa15b1d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal-console/README.md
@@ -0,0 +1,45 @@
+# Ansible Role: Drupal Console
+
+[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-drupal-console.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-drupal-console)
+
+Installs [Drupal Console](http://drupalconsole.com/) on any Linux or UNIX system.
+
+## Requirements
+
+`php` (version 5.4+) should be installed and working.
+
+## Role Variables
+
+Available variables are listed below, along with default values (see `defaults/main.yml`):
+
+    drupal_console_path: /usr/local/bin/drupal
+
+The path where Drupal Console will be installed and available to your system. Should be in your user's `$PATH` so you can use Drupal Console by entering `drupal` instead of the full path.
+
+    drupal_console_keep_updated: false
+
+By default, this role not update Drupal Console when it is run again. If you'd like always update Drupal Console to the latest version when this role is run, switch this variable to `true`.
+
+    drupal_console_config: ~/.console
+
+The path to the Drupal Console configuration file.
+
+## Dependencies
+
+  - geerlingguy.php (Installs PHP).
+
+## Example Playbook
+
+    - hosts: servers
+      roles:
+        - { role: geerlingguy.drupal-console }
+
+After the playbook runs, `drupal` will be placed in `/usr/local/bin/drupal` (this location is configurable), and will be accessible via normal system accounts.
+
+## License
+
+MIT / BSD
+
+## Author Information
+
+This role was created in 2015 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.drupal-console/defaults/main.yml b/provisioning/roles/geerlingguy.drupal-console/defaults/main.yml
new file mode 100644
index 000000000..5885c7a4e
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal-console/defaults/main.yml
@@ -0,0 +1,4 @@
+---
+drupal_console_path: /usr/local/bin/drupal
+drupal_console_keep_updated: false
+drupal_console_config: ~/.console
diff --git a/provisioning/roles/geerlingguy.drupal-console/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.drupal-console/meta/.galaxy_install_info
new file mode 100644
index 000000000..57fafd60d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal-console/meta/.galaxy_install_info
@@ -0,0 +1 @@
+{install_date: 'Fri Jul 15 19:48:47 2016', version: 1.0.7}
diff --git a/provisioning/roles/geerlingguy.drupal-console/meta/main.yml b/provisioning/roles/geerlingguy.drupal-console/meta/main.yml
new file mode 100644
index 000000000..b08456f77
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal-console/meta/main.yml
@@ -0,0 +1,44 @@
+---
+dependencies:
+  - geerlingguy.php
+
+galaxy_info:
+  author: geerlingguy
+  description: Drupal Console
+  company: "Midwestern Mac, LLC"
+  license: "license (BSD, MIT)"
+  min_ansible_version: 1.4
+  platforms:
+  - name: EL
+    versions:
+    - all
+  - name: GenericUNIX
+    versions:
+    - all
+  - name: Fedora
+    versions:
+    - all
+  - name: opensuse
+    versions:
+    - all
+  - name: GenericBSD
+    versions:
+    - all
+  - name: FreeBSD
+    versions:
+    - all
+  - name: Ubuntu
+    versions:
+    - all
+  - name: SLES
+    versions:
+    - all
+  - name: GenericLinux
+    versions:
+    - all
+  - name: Debian
+    versions:
+    - all
+  galaxy_tags:
+    - packaging
+    - web
diff --git a/provisioning/roles/geerlingguy.drupal-console/tasks/main.yml b/provisioning/roles/geerlingguy.drupal-console/tasks/main.yml
new file mode 100644
index 000000000..5be21946f
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal-console/tasks/main.yml
@@ -0,0 +1,22 @@
+---
+- name: Install Drupal Console.
+  get_url:
+    url: https://drupalconsole.com/installer
+    dest: "{{ drupal_console_path }}"
+
+- name: Ensure Drupal Console is executable.
+  file:
+    path: "{{ drupal_console_path }}"
+    mode: 0755
+
+- name: Run Drupal Console init.
+  shell: >
+    php {{ drupal_console_path }} init
+    creates={{ drupal_console_config }}
+
+- name: Update Drupal Console to latest version (if configured).
+  shell: >
+    php {{ drupal_console_path }} self-update
+  register: drupal_console_update
+  changed_when: "'console has been updated' in drupal_console_update.stdout"
+  when: drupal_console_keep_updated
diff --git a/provisioning/roles/geerlingguy.drupal-console/tests/inventory b/provisioning/roles/geerlingguy.drupal-console/tests/inventory
new file mode 100644
index 000000000..2fbb50c4a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal-console/tests/inventory
@@ -0,0 +1 @@
+localhost
diff --git a/provisioning/roles/geerlingguy.drupal-console/tests/test-self-update.yml b/provisioning/roles/geerlingguy.drupal-console/tests/test-self-update.yml
new file mode 100644
index 000000000..cb5934cc4
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal-console/tests/test-self-update.yml
@@ -0,0 +1,15 @@
+---
+- hosts: localhost
+  remote_user: root
+
+  vars:
+    php_enable_webserver: false
+    drupal_console_keep_updated: true
+
+  pre_tasks:
+    - name: Add ondrej repository for PHP 5.6.
+      apt_repository: repo='ppa:ondrej/php5-5.6'
+
+  roles:
+    - geerlingguy.php
+    - ansible-role-drupal-console
diff --git a/provisioning/roles/geerlingguy.drupal-console/tests/test.yml b/provisioning/roles/geerlingguy.drupal-console/tests/test.yml
new file mode 100644
index 000000000..cf4c49ce2
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal-console/tests/test.yml
@@ -0,0 +1,14 @@
+---
+- hosts: localhost
+  remote_user: root
+
+  vars:
+    php_enable_webserver: false
+
+  pre_tasks:
+    - name: Add ondrej repository for PHP 5.6.
+      apt_repository: repo='ppa:ondrej/php5-5.6'
+
+  roles:
+    - geerlingguy.php
+    - ansible-role-drupal-console
diff --git a/provisioning/roles/geerlingguy.drush/.travis.yml b/provisioning/roles/geerlingguy.drush/.travis.yml
new file mode 100644
index 000000000..7125a00a3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drush/.travis.yml
@@ -0,0 +1,42 @@
+---
+language: python
+python: "2.7"
+
+env:
+  - SITE=test.yml
+
+before_install:
+  - sudo add-apt-repository ppa:ondrej/php5 -y
+  - sudo apt-get update -q
+  - sudo apt-get update -qq
+  - sudo apt-get install curl
+
+install:
+  # Install Ansible.
+  - pip install ansible
+
+  # Add ansible.cfg to pick up roles path.
+  - "{ echo '[defaults]'; echo 'roles_path = ../'; } >> ansible.cfg"
+
+  # Install required dependencies.
+  - ansible-galaxy install geerlingguy.php geerlingguy.composer geerlingguy.git
+
+script:
+  # Check the role/playbook's syntax.
+  - "ansible-playbook -i tests/inventory tests/$SITE --syntax-check"
+
+  # Run the role/playbook with ansible-playbook.
+  - "ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo"
+
+  # Run the role/playbook again, checking to make sure it's idempotent.
+  - >
+    ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo
+    | grep -q 'changed=0.*failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)
+
+  # Check if drush is installed and working.
+  - drush --version
+
+notifications:
+   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.drush/README.md b/provisioning/roles/geerlingguy.drush/README.md
new file mode 100644
index 000000000..6e8dc8883
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drush/README.md
@@ -0,0 +1,56 @@
+# Ansible Role: Drush
+
+[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-drush.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-drush)
+
+Installs Drush, a command line shell and scripting interface for Drupal, on any Linux or UNIX system.
+
+## Requirements
+
+None.
+
+## Role Variables
+
+Available variables are listed below, along with default values (see `defaults/main.yml`):
+
+    drush_install_path: /usr/local/share/drush
+
+The location of the entire drush installation (includes all the supporting files, as well as the `drush` executable file.
+
+    drush_path: /usr/local/bin/drush
+
+The path where drush will be installed and available to your system. Should be in your user's `$PATH` so you can run commands simply with `drush` instead of the full path.
+
+    drush_version: "master"
+
+The version of Drush to install (examples: `"master"` for the bleeding edge, `"7.x"`, `"6.x"`, `"6.2.0"`). This should be a string as it refers to a git branch, tag, or commit hash.
+
+    drush_keep_updated: no
+    drush_force_update: no
+
+Whether to keep Drush up-to-date with the latest revision of the branch specified by `drush_version`, and whether to force the update (e.g. overwrite local modifications to the drush repository).
+
+    drush_composer_cli_options: "--prefer-source --no-interaction"
+
+These options are the safest for avoiding GitHub API rate limits when installing Drush, and can be very helpful when working on dependencies/installation, but builds can be sped up substantially by changing the first option to --prefer-dist.
+
+## Dependencies
+
+  - geerlingguy.git (Installs Git).
+  - geerlingguy.php (Installs PHP).
+  - geerlingguy.composer (Installs Composer).
+
+## Example Playbook
+
+    - hosts: servers
+      roles:
+        - { role: geerlingguy.drush }
+
+After the playbook runs, the `drush` command will be accessible from normal system accounts.
+
+## License
+
+MIT / BSD
+
+## Author Information
+
+This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.drush/defaults/main.yml b/provisioning/roles/geerlingguy.drush/defaults/main.yml
new file mode 100644
index 000000000..eff2827a0
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drush/defaults/main.yml
@@ -0,0 +1,10 @@
+---
+drush_install_path: /usr/local/share/drush
+drush_path: /usr/local/bin/drush
+drush_version: "master"
+drush_keep_updated: no
+drush_force_update: no
+
+# These options are the safest for avoiding GitHub API rate limits, but builds
+# can be sped up substantially by changing to --prefer-dist.
+drush_composer_cli_options: "--prefer-source --no-interaction"
diff --git a/provisioning/roles/geerlingguy.drush/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.drush/meta/.galaxy_install_info
new file mode 100644
index 000000000..f0864c071
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drush/meta/.galaxy_install_info
@@ -0,0 +1 @@
+{install_date: 'Fri Jul 15 19:48:50 2016', version: 1.1.2}
diff --git a/provisioning/roles/geerlingguy.drush/meta/main.yml b/provisioning/roles/geerlingguy.drush/meta/main.yml
new file mode 100644
index 000000000..46be0d34d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drush/meta/main.yml
@@ -0,0 +1,46 @@
+---
+dependencies:
+  - geerlingguy.git
+  - geerlingguy.php
+  - geerlingguy.composer
+
+galaxy_info:
+  author: geerlingguy
+  description: Drush - command line shell for Drupal
+  company: "Midwestern Mac, LLC"
+  license: "license (BSD, MIT)"
+  min_ansible_version: 1.4
+  platforms:
+  - name: EL
+    versions:
+    - all
+  - name: GenericUNIX
+    versions:
+    - all
+  - name: Fedora
+    versions:
+    - all
+  - name: opensuse
+    versions:
+    - all
+  - name: GenericBSD
+    versions:
+    - all
+  - name: FreeBSD
+    versions:
+    - all
+  - name: Ubuntu
+    versions:
+    - all
+  - name: SLES
+    versions:
+    - all
+  - name: GenericLinux
+    versions:
+    - all
+  - name: Debian
+    versions:
+    - all
+  categories:
+    - development
+    - web
diff --git a/provisioning/roles/geerlingguy.drush/tasks/main.yml b/provisioning/roles/geerlingguy.drush/tasks/main.yml
new file mode 100644
index 000000000..5b907aa64
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drush/tasks/main.yml
@@ -0,0 +1,37 @@
+---
+- name: Clone Drush from GitHub.
+  git:
+    repo: https://github.com/drush-ops/drush.git
+    dest: "{{ drush_install_path }}"
+    version: "{{ drush_version }}"
+    update: "{{ drush_keep_updated }}"
+    force: "{{ drush_force_update }}"
+  register: drush_clone
+
+- name: Check for composer.json
+  stat: path={{ drush_install_path }}/composer.json
+  register: drush_composer
+
+# See: https://github.com/geerlingguy/ansible-role-drush/issues/6
+- name: Ensure Drush can be installed on Debian Wheezy.
+  shell: >
+    {{ composer_path }} update {{ drush_composer_cli_options }}
+    chdir={{ drush_install_path }}
+  when: drush_clone.changed and ansible_distribution == "Debian" and ansible_distribution_release == "wheezy" and drush_composer.stat.exists
+
+- name: Install Drush dependencies with Composer.
+  shell: >
+    {{ composer_path }} install {{ drush_composer_cli_options }}
+    chdir={{ drush_install_path }}
+  when: drush_clone.changed and drush_composer.stat.exists
+
+- name: Create drush symlink.
+  file:
+    src: "{{ drush_install_path }}/drush"
+    dest: "{{ drush_path }}"
+    state: link
+
+- name: Run drush to finish setting it up.
+  command: "{{ drush_path }}"
+  register: drush_result
+  changed_when: "'Execute a drush command' not in drush_result.stdout"
diff --git a/provisioning/roles/geerlingguy.drush/tests/inventory b/provisioning/roles/geerlingguy.drush/tests/inventory
new file mode 100644
index 000000000..2fbb50c4a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drush/tests/inventory
@@ -0,0 +1 @@
+localhost
diff --git a/provisioning/roles/geerlingguy.drush/tests/test.yml b/provisioning/roles/geerlingguy.drush/tests/test.yml
new file mode 100644
index 000000000..df2c5033f
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drush/tests/test.yml
@@ -0,0 +1,10 @@
+---
+- hosts: localhost
+  remote_user: root
+  vars:
+    php_opcache_enable: "0"
+  roles:
+    - geerlingguy.php
+    - geerlingguy.composer
+    - geerlingguy.git
+    - ansible-role-drush
diff --git a/provisioning/roles/geerlingguy.elasticsearch/.travis.yml b/provisioning/roles/geerlingguy.elasticsearch/.travis.yml
new file mode 100644
index 000000000..dcd413c48
--- /dev/null
+++ b/provisioning/roles/geerlingguy.elasticsearch/.travis.yml
@@ -0,0 +1,58 @@
+---
+sudo: required
+
+env:
+  - distribution: centos
+    version: 6
+    init: /sbin/init
+    run_opts: ""
+  - distribution: centos
+    version: 7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distribution: ubuntu
+    version: 14.04
+    init: /sbin/init
+    run_opts: ""
+  - distribution: ubuntu
+    version: 12.04
+    init: /sbin/init
+    run_opts: ""
+
+services:
+  - docker
+
+before_install:
+  # Pull container
+  - 'sudo docker pull ${distribution}:${version}'
+  # Customize container
+  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+
+script:
+  - container_id=$(mktemp)
+  # Run container in detached state
+  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+
+  # Install required Galaxy roles.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-galaxy install geerlingguy.java'
+
+  # Ansible syntax check.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+
+  # Test role.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+
+  # TODO: Test if elasticsearch is working.
+
+  # Test role idempotence.
+  - >
+    sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml
+    | grep -q 'changed=0.*failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)
+
+  # Clean up
+  - 'sudo docker stop "$(cat ${container_id})"'
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.elasticsearch/README.md b/provisioning/roles/geerlingguy.elasticsearch/README.md
new file mode 100644
index 000000000..31c741162
--- /dev/null
+++ b/provisioning/roles/geerlingguy.elasticsearch/README.md
@@ -0,0 +1,44 @@
+# Ansible Role: Elasticsearch
+
+[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-elasticsearch.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-elasticsearch)
+
+An Ansible Role that installs Elasticsearch on RedHat/CentOS or Debian/Ubuntu.
+
+## Requirements
+
+None.
+
+## Role Variables
+Available variables are listed below, along with default values (see `defaults/main.yml`):
+
+    elasticsearch_network_host: localhost
+
+Network host to listen for incoming connections on. By default we only listen on the localhost interface. Change this to the IP address to listen on a specific interface, or `0.0.0.0` to listen on all interfaces.
+
+    elasticsearch_http_port: 9200
+
+The port to listen for HTTP connections on.
+
+    elasticsearch_script_inline: true
+    elasticsearch_script_indexed: true
+
+Whether to allow inline scripting against ElasticSearch. You should read the following link as there are possible security implications for enabling these options: [Enable Dynamic Scripting](https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-scripting.html#enable-dynamic-scripting). Available options include: `true`, `false`, and `sandbox`.
+
+## Dependencies
+
+  - geerlingguy.java
+
+## Example Playbook
+
+    - hosts: search
+      roles:
+        - geerlingguy.java
+        - geerlingguy.elasticsearch
+
+## License
+
+MIT / BSD
+
+## Author Information
+
+This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.elasticsearch/defaults/main.yml b/provisioning/roles/geerlingguy.elasticsearch/defaults/main.yml
new file mode 100644
index 000000000..758877f5e
--- /dev/null
+++ b/provisioning/roles/geerlingguy.elasticsearch/defaults/main.yml
@@ -0,0 +1,5 @@
+---
+elasticsearch_network_host: localhost
+elasticsearch_http_port: 9200
+elasticsearch_script_inline: true
+elasticsearch_script_indexed: true
diff --git a/provisioning/roles/geerlingguy.elasticsearch/files/elasticsearch.repo b/provisioning/roles/geerlingguy.elasticsearch/files/elasticsearch.repo
new file mode 100644
index 000000000..e9d28a615
--- /dev/null
+++ b/provisioning/roles/geerlingguy.elasticsearch/files/elasticsearch.repo
@@ -0,0 +1,6 @@
+[elasticsearch-2.x]
+name=Elasticsearch repository for 2.x packages
+baseurl=http://packages.elastic.co/elasticsearch/2.x/centos
+gpgcheck=1
+gpgkey=http://packages.elastic.co/GPG-KEY-elasticsearch
+enabled=1
diff --git a/provisioning/roles/geerlingguy.elasticsearch/handlers/main.yml b/provisioning/roles/geerlingguy.elasticsearch/handlers/main.yml
new file mode 100644
index 000000000..a4c1162a1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.elasticsearch/handlers/main.yml
@@ -0,0 +1,3 @@
+---
+- name: restart elasticsearch
+  service: name=elasticsearch state=restarted
diff --git a/provisioning/roles/geerlingguy.elasticsearch/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.elasticsearch/meta/.galaxy_install_info
new file mode 100644
index 000000000..2c762e161
--- /dev/null
+++ b/provisioning/roles/geerlingguy.elasticsearch/meta/.galaxy_install_info
@@ -0,0 +1 @@
+{install_date: 'Fri Jul 15 19:48:53 2016', version: 2.1.0}
diff --git a/provisioning/roles/geerlingguy.elasticsearch/meta/main.yml b/provisioning/roles/geerlingguy.elasticsearch/meta/main.yml
new file mode 100644
index 000000000..8285a4b94
--- /dev/null
+++ b/provisioning/roles/geerlingguy.elasticsearch/meta/main.yml
@@ -0,0 +1,24 @@
+---
+dependencies:
+  - { role: geerlingguy.java }
+
+galaxy_info:
+  author: geerlingguy
+  description: Elasticsearch for Linux.
+  company: "Midwestern Mac, LLC"
+  license: "license (BSD, MIT)"
+  min_ansible_version: 1.8
+  platforms:
+  - name: EL
+    versions:
+    - all
+  - name: Debian
+    versions:
+    - all
+  - name: Ubuntu
+    versions:
+    - all
+  galaxy_tags:
+    - web
+    - system
+    - monitoring
diff --git a/provisioning/roles/geerlingguy.elasticsearch/tasks/main.yml b/provisioning/roles/geerlingguy.elasticsearch/tasks/main.yml
new file mode 100644
index 000000000..a4ce2d04a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.elasticsearch/tasks/main.yml
@@ -0,0 +1,18 @@
+---
+- include: setup-RedHat.yml
+  when: ansible_os_family == 'RedHat'
+
+- include: setup-Debian.yml
+  when: ansible_os_family == 'Debian'
+
+- name: Configure Elasticsearch.
+  template:
+    src: elasticsearch.yml.j2
+    dest: /etc/elasticsearch/elasticsearch.yml
+    owner: root
+    group: elasticsearch
+    mode: 0750
+  notify: restart elasticsearch
+
+- name: Start Elasticsearch.
+  service: name=elasticsearch state=started enabled=yes
diff --git a/provisioning/roles/geerlingguy.elasticsearch/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.elasticsearch/tasks/setup-Debian.yml
new file mode 100644
index 000000000..bafa0d5a1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.elasticsearch/tasks/setup-Debian.yml
@@ -0,0 +1,14 @@
+---
+- name: Add Elasticsearch apt key.
+  apt_key:
+    url: https://packages.elastic.co/GPG-KEY-elasticsearch
+    state: present
+
+- name: Add Elasticsearch repository.
+  apt_repository:
+    repo: 'deb http://packages.elastic.co/elasticsearch/2.x/debian stable main'
+    state: present
+    update_cache: yes
+
+- name: Install Elasticsearch.
+  apt: pkg=elasticsearch state=present
diff --git a/provisioning/roles/geerlingguy.elasticsearch/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.elasticsearch/tasks/setup-RedHat.yml
new file mode 100644
index 000000000..543cce2f0
--- /dev/null
+++ b/provisioning/roles/geerlingguy.elasticsearch/tasks/setup-RedHat.yml
@@ -0,0 +1,14 @@
+---
+- name: Add Elasticsearch GPG key.
+  rpm_key:
+    key: https://packages.elastic.co/GPG-KEY-elasticsearch
+    state: present
+
+- name: Add Elasticsearch repository.
+  copy:
+    src: elasticsearch.repo
+    dest: /etc/yum.repos.d/elasticsearch.repo
+    mode: 0644
+
+- name: Install Elasticsearch.
+  yum: pkg=elasticsearch state=installed
diff --git a/provisioning/roles/geerlingguy.elasticsearch/templates/elasticsearch.yml.j2 b/provisioning/roles/geerlingguy.elasticsearch/templates/elasticsearch.yml.j2
new file mode 100644
index 000000000..58182a1f9
--- /dev/null
+++ b/provisioning/roles/geerlingguy.elasticsearch/templates/elasticsearch.yml.j2
@@ -0,0 +1,97 @@
+# {{ ansible_managed }}
+# ======================== Elasticsearch Configuration =========================
+#
+# NOTE: Elasticsearch comes with reasonable defaults for most settings.
+#       Before you set out to tweak and tune the configuration, make sure you
+#       understand what are you trying to accomplish and the consequences.
+#
+# The primary way of configuring a node is via this file. This template lists
+# the most important settings you may want to configure for a production cluster.
+#
+# Please see the documentation for further information on configuration options:
+# <http://www.elastic.co/guide/en/elasticsearch/reference/current/setup-configuration.html>
+#
+# ---------------------------------- Cluster -----------------------------------
+#
+# Use a descriptive name for your cluster:
+#
+# cluster.name: my-application
+#
+# ------------------------------------ Node ------------------------------------
+#
+# Use a descriptive name for the node:
+#
+# node.name: node-1
+#
+# Add custom attributes to the node:
+#
+# node.rack: r1
+#
+# ----------------------------------- Paths ------------------------------------
+#
+# Path to directory where to store the data (separate multiple locations by comma):
+#
+# path.data: /path/to/data
+#
+# Path to log files:
+#
+# path.logs: /path/to/logs
+#
+# ----------------------------------- Memory -----------------------------------
+#
+# Lock the memory on startup:
+#
+# bootstrap.mlockall: true
+#
+# Make sure that the `ES_HEAP_SIZE` environment variable is set to about half the memory
+# available on the system and that the owner of the process is allowed to use this limit.
+#
+# Elasticsearch performs poorly when the system is swapping the memory.
+#
+# ---------------------------------- Network -----------------------------------
+#
+# Set the bind address to a specific IP (IPv4 or IPv6):
+#
+network.host: {{ elasticsearch_network_host }}
+#
+# Set a custom port for HTTP:
+#
+http.port: {{ elasticsearch_http_port }}
+#
+# For more information, see the documentation at:
+# <http://www.elastic.co/guide/en/elasticsearch/reference/current/modules-network.html>
+#
+# --------------------------------- Discovery ----------------------------------
+#
+# Pass an initial list of hosts to perform discovery when new node is started:
+# The default list of hosts is ["127.0.0.1", "[::1]"]
+#
+# discovery.zen.ping.unicast.hosts: ["host1", "host2"]
+#
+# Prevent the "split brain" by configuring the majority of nodes (total number of nodes / 2 + 1):
+#
+# discovery.zen.minimum_master_nodes: 3
+#
+# For more information, see the documentation at:
+# <http://www.elastic.co/guide/en/elasticsearch/reference/current/modules-discovery.html>
+#
+# ---------------------------------- Gateway -----------------------------------
+#
+# Block initial recovery after a full cluster restart until N nodes are started:
+#
+# gateway.recover_after_nodes: 3
+#
+# For more information, see the documentation at:
+# <http://www.elastic.co/guide/en/elasticsearch/reference/current/modules-gateway.html>
+#
+# ---------------------------------- Various -----------------------------------
+#
+# Disable starting multiple nodes on a single system:
+#
+# node.max_local_storage_nodes: 1
+#
+# Require explicit names when deleting indices:
+#
+# action.destructive_requires_name: true
+script.inline: {{ elasticsearch_script_inline }}
+script.indexed: {{ elasticsearch_script_indexed }}
diff --git a/provisioning/roles/geerlingguy.elasticsearch/tests/Dockerfile.centos-6 b/provisioning/roles/geerlingguy.elasticsearch/tests/Dockerfile.centos-6
new file mode 100644
index 000000000..4a4e7b8d6
--- /dev/null
+++ b/provisioning/roles/geerlingguy.elasticsearch/tests/Dockerfile.centos-6
@@ -0,0 +1,15 @@
+FROM centos:6
+
+# Install Ansible
+RUN yum -y update; yum clean all;
+RUN yum -y install epel-release
+RUN yum -y install git ansible sudo
+RUN yum clean all
+
+# Disable requiretty
+RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
+
+# Install Ansible inventory file
+RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
+
+CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.elasticsearch/tests/Dockerfile.centos-7 b/provisioning/roles/geerlingguy.elasticsearch/tests/Dockerfile.centos-7
new file mode 100644
index 000000000..8aa065497
--- /dev/null
+++ b/provisioning/roles/geerlingguy.elasticsearch/tests/Dockerfile.centos-7
@@ -0,0 +1,27 @@
+FROM centos:7
+
+# Install systemd -- See https://hub.docker.com/_/centos/
+RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
+RUN yum -y update; yum clean all; \
+(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
+rm -f /lib/systemd/system/multi-user.target.wants/*; \
+rm -f /etc/systemd/system/*.wants/*; \
+rm -f /lib/systemd/system/local-fs.target.wants/*; \
+rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
+rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
+rm -f /lib/systemd/system/basic.target.wants/*; \
+rm -f /lib/systemd/system/anaconda.target.wants/*;
+
+# Install Ansible
+RUN yum -y install epel-release
+RUN yum -y install git ansible sudo
+RUN yum clean all
+
+# Disable requiretty
+RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
+
+# Install Ansible inventory file
+RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
+
+VOLUME ["/sys/fs/cgroup"]
+CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.elasticsearch/tests/Dockerfile.ubuntu-12.04 b/provisioning/roles/geerlingguy.elasticsearch/tests/Dockerfile.ubuntu-12.04
new file mode 100644
index 000000000..d0c130cdf
--- /dev/null
+++ b/provisioning/roles/geerlingguy.elasticsearch/tests/Dockerfile.ubuntu-12.04
@@ -0,0 +1,11 @@
+FROM ubuntu:12.04
+RUN apt-get update
+
+# Install Ansible
+RUN apt-get install -y software-properties-common python-software-properties git
+RUN apt-add-repository -y ppa:ansible/ansible
+RUN apt-get update
+RUN apt-get install -y ansible
+
+# Install Ansible inventory file
+RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.elasticsearch/tests/Dockerfile.ubuntu-14.04 b/provisioning/roles/geerlingguy.elasticsearch/tests/Dockerfile.ubuntu-14.04
new file mode 100644
index 000000000..ca332871f
--- /dev/null
+++ b/provisioning/roles/geerlingguy.elasticsearch/tests/Dockerfile.ubuntu-14.04
@@ -0,0 +1,11 @@
+FROM ubuntu:14.04
+RUN apt-get update
+
+# Install Ansible
+RUN apt-get install -y software-properties-common git
+RUN apt-add-repository -y ppa:ansible/ansible
+RUN apt-get update
+RUN apt-get install -y ansible
+
+# Install Ansible inventory file
+RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.elasticsearch/tests/test.yml b/provisioning/roles/geerlingguy.elasticsearch/tests/test.yml
new file mode 100644
index 000000000..a289f8d1d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.elasticsearch/tests/test.yml
@@ -0,0 +1,11 @@
+---
+- hosts: all
+
+  pre_tasks:
+    - name: Ensure build dependencies are installed (RedHat).
+      yum: name=which state=present
+      when: ansible_os_family == 'RedHat'
+
+  roles:
+    - geerlingguy.java
+    - role_under_test
diff --git a/provisioning/roles/geerlingguy.firewall/.travis.yml b/provisioning/roles/geerlingguy.firewall/.travis.yml
new file mode 100644
index 000000000..a26b16a82
--- /dev/null
+++ b/provisioning/roles/geerlingguy.firewall/.travis.yml
@@ -0,0 +1,60 @@
+---
+language: python
+python: "2.7"
+
+env:
+  - SITE=test.yml
+
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -y curl
+
+install:
+  # Install Ansible.
+  - pip install ansible
+
+  # Add ansible.cfg to pick up roles path.
+  - "{ echo '[defaults]'; echo 'roles_path = ../'; } >> ansible.cfg"
+
+script:
+  # Check the role/playbook's syntax.
+  - "ansible-playbook -i tests/inventory tests/$SITE --syntax-check"
+
+  # Run the role/playbook with ansible-playbook.
+  - "ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo"
+
+  # Run the role/playbook again, checking to make sure it's idempotent.
+  - >
+    ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo
+    | grep -q 'changed=0.*failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)
+
+  # Check if TCP port 9123 is open.
+  - >
+    sudo iptables -L -n
+    | grep -q "ACCEPT.*dpt:9123"
+    && (echo 'Port 9123 is open - pass' && exit 0)
+    || (echo 'Port 9123 is not open - fail' && exit 1)
+
+  # Check running firewall has exit code 0
+  - >
+    sudo service firewall status
+    && (echo 'Status of running firewall is 0 - pass' && exit 0)
+    || (echo 'Status of running firewall is not 0 - fail' && exit 1)
+
+  # Stop firewall
+  - >
+    sudo service firewall stop
+    && (echo 'Stopping firewall - pass' && exit 0)
+    || (echo 'Stopping firewall - fail' && exit 1)
+
+  # Check stopped firewall has exit code 3
+  - >
+    sudo service firewall status;
+    EXIT=$?;
+    if [ 3 -eq $EXIT ]; then
+      echo 'Status of stopped firewall is 3 - pass' && exit 0;
+    else
+      echo 'Status of stopped firewall is not 3 - fail' && exit 1;
+    fi 
diff --git a/provisioning/roles/geerlingguy.firewall/README.md b/provisioning/roles/geerlingguy.firewall/README.md
new file mode 100644
index 000000000..415dec0cd
--- /dev/null
+++ b/provisioning/roles/geerlingguy.firewall/README.md
@@ -0,0 +1,72 @@
+# Ansible Role: Firewall (iptables)
+
+[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-firewall.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-firewall)
+
+Installs a simple iptables-based firewall for RHEL/CentOS or Debian/Ubunty systems.
+
+This firewall aims for simplicity over complexity, and only opens a few specific ports for incoming traffic (configurable through Ansible variables). If you have a rudimentary knowledge of `iptables` and/or firewalls in general, this role should be a good starting point for a secure system firewall.
+
+After the role is run, a `firewall` init service will be available on the server. You can use `service firewall [start|stop|restart|status]` to control the firewall.
+
+## Requirements
+
+None.
+
+## Role Variables
+
+Available variables are listed below, along with default values (see `vars/main.yml`):
+
+    firewall_allowed_tcp_ports:
+      - "22"
+      - "80"
+      ...
+    firewall_allowed_udp_ports: []
+
+A list of TCP or UDP ports (respectively) to open to incoming traffic.
+
+    firewall_forwarded_tcp_ports:
+      - { src: "22", dest: "2222" }
+      - { src: "80", dest: "8080" }
+    firewall_forwarded_udp_ports: []
+
+Forward `src` port to `dest` port, either TCP or UDP (respectively).
+
+    firewall_additional_rules: []
+
+Any additional (custom) rules to be added to the firewall (in the same format you would add them via command line, e.g. `iptables [rule]`).
+
+    firewall_log_dropped_packets: true
+
+Whether to log dropped packets to syslog (messages will be prefixed with "Dropped by firewall: ").
+
+## Dependencies
+
+None.
+
+## Example Playbook
+
+    - hosts: server
+      vars_files:
+        - vars/main.yml
+      roles:
+        - { role: geerlingguy.firewall }
+
+*Inside `vars/main.yml`*:
+
+    firewall_allowed_tcp_ports:
+      - "22"
+      - "25"
+      - "80"
+
+## TODO
+
+  - Make outgoing ports more configurable.
+  - Make other firewall features (like logging) configurable.
+
+## License
+
+MIT / BSD
+
+## Author Information
+
+This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.firewall/defaults/main.yml b/provisioning/roles/geerlingguy.firewall/defaults/main.yml
new file mode 100644
index 000000000..e20845849
--- /dev/null
+++ b/provisioning/roles/geerlingguy.firewall/defaults/main.yml
@@ -0,0 +1,11 @@
+---
+firewall_allowed_tcp_ports:
+  - "22"
+  - "25"
+  - "80"
+  - "443"
+firewall_allowed_udp_ports: []
+firewall_forwarded_tcp_ports: []
+firewall_forwarded_udp_ports: []
+firewall_additional_rules: []
+firewall_log_dropped_packets: true
diff --git a/provisioning/roles/geerlingguy.firewall/handlers/main.yml b/provisioning/roles/geerlingguy.firewall/handlers/main.yml
new file mode 100644
index 000000000..378095524
--- /dev/null
+++ b/provisioning/roles/geerlingguy.firewall/handlers/main.yml
@@ -0,0 +1,3 @@
+---
+- name: restart firewall
+  service: name=firewall state=restarted
diff --git a/provisioning/roles/geerlingguy.firewall/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.firewall/meta/.galaxy_install_info
new file mode 100644
index 000000000..419b46e75
--- /dev/null
+++ b/provisioning/roles/geerlingguy.firewall/meta/.galaxy_install_info
@@ -0,0 +1 @@
+{install_date: 'Fri Jul 15 19:48:57 2016', version: 1.0.9}
diff --git a/provisioning/roles/geerlingguy.firewall/meta/main.yml b/provisioning/roles/geerlingguy.firewall/meta/main.yml
new file mode 100644
index 000000000..fb1434993
--- /dev/null
+++ b/provisioning/roles/geerlingguy.firewall/meta/main.yml
@@ -0,0 +1,22 @@
+---
+dependencies: []
+
+galaxy_info:
+  author: geerlingguy
+  description: Simple iptables firewall for most Unix-like systems.
+  company: "Midwestern Mac, LLC"
+  license: "license (BSD, MIT)"
+  min_ansible_version: 1.4
+  platforms:
+  - name: EL
+    versions:
+    - all
+  - name: Debian
+    versions:
+    - all
+  - name: Ubuntu
+    versions:
+    - all
+  categories:
+    - networking
+    - system
diff --git a/provisioning/roles/geerlingguy.firewall/tasks/main.yml b/provisioning/roles/geerlingguy.firewall/tasks/main.yml
new file mode 100644
index 000000000..b8bd8357e
--- /dev/null
+++ b/provisioning/roles/geerlingguy.firewall/tasks/main.yml
@@ -0,0 +1,21 @@
+---
+- name: Ensure iptables is installed (RedHat).
+  yum: pkg=iptables state=installed
+  when: ansible_os_family == 'RedHat'
+
+- name: Ensure iptables is installed (Debian).
+  apt: pkg=iptables state=installed
+  when: ansible_os_family == 'Debian'
+
+- name: Flush iptables the first time playbook runs.
+  command: iptables -F creates=/etc/init.d/firewall
+
+- name: Copy firewall script into place.
+  template: src=firewall.bash.j2 dest=/etc/firewall.bash owner=root group=root mode=0744
+  notify: restart firewall
+
+- name: Copy firewall init script into place.
+  template: src=firewall.j2 dest=/etc/init.d/firewall owner=root group=root mode=0755
+
+- name: Ensure the firewall is enabled and will start on boot.
+  service: name=firewall state=started enabled=yes
diff --git a/provisioning/roles/geerlingguy.firewall/templates/firewall.bash.j2 b/provisioning/roles/geerlingguy.firewall/templates/firewall.bash.j2
new file mode 100755
index 000000000..bbe6436e9
--- /dev/null
+++ b/provisioning/roles/geerlingguy.firewall/templates/firewall.bash.j2
@@ -0,0 +1,83 @@
+#!/bin/bash
+# iptables firewall for common LAMP servers.
+#
+# This file should be located at /etc/firewall.bash, and is meant to work with
+# Jeff Geerling's firewall init script.
+#
+# Common port reference:
+#   22: SSH
+#   25: SMTP
+#   80: HTTP
+#   123: DNS
+#   443: HTTPS
+#   2222: SSH alternate
+#   4949: Munin
+#   6082: Varnish admin
+#   8080: HTTP alternate (often used with Tomcat)
+#   8983: Tomcat HTTP
+#   8443: Tomcat HTTPS
+#   9000: SonarQube
+#
+# @author Jeff Geerling
+
+# No spoofing.
+if [ -e /proc/sys/net/ipv4/conf/all/rp_filter ]
+then
+for filter in /proc/sys/net/ipv4/conf/*/rp_filter
+do
+echo 1 > $filter
+done
+fi
+
+# Remove all rules and chains.
+iptables -F
+iptables -X
+
+# Accept traffic from loopback interface (localhost).
+iptables -A INPUT -i lo -j ACCEPT
+
+# Forwarded ports.
+{# Add a rule for each forwarded port #}
+{% for forwarded_port in firewall_forwarded_tcp_ports %}
+iptables -t nat -I PREROUTING -p tcp --dport {{ forwarded_port.src }} -j REDIRECT --to-port {{ forwarded_port.dest }}
+iptables -t nat -I OUTPUT -p tcp -o lo --dport {{ forwarded_port.src }} -j REDIRECT --to-port {{ forwarded_port.dest }}
+{% endfor %}
+{% for forwarded_port in firewall_forwarded_udp_ports %}
+iptables -t nat -I PREROUTING -p udp --dport {{ forwarded_port.src }} -j REDIRECT --to-port {{ forwarded_port.dest }}
+iptables -t nat -I OUTPUT -p udp -o lo --dport {{ forwarded_port.src }} -j REDIRECT --to-port {{ forwarded_port.dest }}
+{% endfor %}
+
+# Open ports.
+{# Add a rule for each open port #}
+{% for port in firewall_allowed_tcp_ports %}
+iptables -A INPUT -p tcp -m tcp --dport {{ port }} -j ACCEPT
+{% endfor %}
+{% for port in firewall_allowed_udp_ports %}
+iptables -A INPUT -p udp -m udp --dport {{ port }} -j ACCEPT
+{% endfor %}
+
+# Accept icmp ping requests.
+iptables -A INPUT -p icmp -j ACCEPT
+
+# Allow NTP traffic for time synchronization.
+iptables -A OUTPUT -p udp --dport 123 -j ACCEPT
+iptables -A INPUT -p udp --sport 123 -j ACCEPT
+
+# Additional custom rules.
+{% for rule in firewall_additional_rules %}
+{{ rule }}
+{% endfor %}
+
+# Allow established connections:
+iptables -A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT
+
+# Log EVERYTHING (ONLY for Debug).
+# iptables -A INPUT -j LOG
+
+{% if firewall_log_dropped_packets %}
+# Log other incoming requests (all of which are dropped) at 15/minute max.
+iptables -A INPUT -m limit --limit 15/minute -j LOG --log-level 7 --log-prefix "Dropped by firewall: "
+{% endif %}
+
+# Drop all other traffic.
+iptables -A INPUT -j DROP
diff --git a/provisioning/roles/geerlingguy.firewall/templates/firewall.j2 b/provisioning/roles/geerlingguy.firewall/templates/firewall.j2
new file mode 100644
index 000000000..e2705f609
--- /dev/null
+++ b/provisioning/roles/geerlingguy.firewall/templates/firewall.j2
@@ -0,0 +1,49 @@
+#! /bin/sh
+# /etc/init.d/firewall
+#
+# Firewall init script, to be used with /etc/firewall.bash by Jeff Geerling.
+#
+# @author Jeff Geerling
+
+### BEGIN INIT INFO
+# Provides:          firewall
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start firewall at boot time.
+# Description:       Enable the firewall.
+### END INIT INFO
+
+# Carry out specific functions when asked to by the system
+case "$1" in
+  start)
+    echo "Starting firewall."
+    /etc/firewall.bash
+    ;;
+  stop)
+    echo "Stopping firewall."
+    iptables -F
+    ;;
+  restart)
+    echo "Restarting firewall."
+    /etc/firewall.bash
+    ;;
+  status)
+    echo -e "`iptables -L -n`"
+    EXIT=4 # program or service status is unknown
+    NUMBER_OF_RULES=$(iptables-save | grep '^\-' | wc -l)
+    if [ 0 -eq $NUMBER_OF_RULES ]; then
+        EXIT=3 # program is not running
+    else
+        EXIT=0 # program is running or service is OK
+    fi
+    exit $EXIT
+    ;;
+  *)
+    echo "Usage: /etc/init.d/firewall {start|stop|status|restart}"
+    exit 1
+    ;;
+esac
+
+exit 0
diff --git a/provisioning/roles/geerlingguy.firewall/tests/inventory b/provisioning/roles/geerlingguy.firewall/tests/inventory
new file mode 100644
index 000000000..2fbb50c4a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.firewall/tests/inventory
@@ -0,0 +1 @@
+localhost
diff --git a/provisioning/roles/geerlingguy.firewall/tests/test.yml b/provisioning/roles/geerlingguy.firewall/tests/test.yml
new file mode 100644
index 000000000..20809d1f8
--- /dev/null
+++ b/provisioning/roles/geerlingguy.firewall/tests/test.yml
@@ -0,0 +1,8 @@
+---
+- hosts: localhost
+  remote_user: root
+  vars:
+    - firewall_allowed_tcp_ports:
+      - "9123"
+  roles:
+    - ansible-role-firewall
diff --git a/provisioning/roles/geerlingguy.git/.gitignore b/provisioning/roles/geerlingguy.git/.gitignore
new file mode 100644
index 000000000..b066709e0
--- /dev/null
+++ b/provisioning/roles/geerlingguy.git/.gitignore
@@ -0,0 +1 @@
+.LSOverride
diff --git a/provisioning/roles/geerlingguy.git/.travis.yml b/provisioning/roles/geerlingguy.git/.travis.yml
new file mode 100644
index 000000000..a221fcc27
--- /dev/null
+++ b/provisioning/roles/geerlingguy.git/.travis.yml
@@ -0,0 +1,84 @@
+---
+sudo: required
+
+env:
+  # Only test source install on latest supported OSes.
+  # - distribution: centos
+  #   version: 7
+  #   init: /usr/lib/systemd/systemd
+  #   run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  #   SITE: source
+  #   GIT_VERSION: 2.7.1
+  - distribution: ubuntu
+    version: 14.04
+    init: /sbin/init
+    run_opts: ""
+    SITE: source
+    GIT_VERSION: 2.7.1
+
+  # Test package install on all supported OSes.
+  - distribution: centos
+    version: 6
+    init: /sbin/init
+    run_opts: ""
+    SITE: package
+    GIT_VERSION: 1.7.1
+  - distribution: centos
+    version: 7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    SITE: package
+    GIT_VERSION: 1.8.3.1
+  - distribution: ubuntu
+    version: 14.04
+    init: /sbin/init
+    run_opts: ""
+    SITE: package
+    GIT_VERSION: 1.9.1
+  - distribution: ubuntu
+    version: 12.04
+    init: /sbin/init
+    run_opts: ""
+    SITE: package
+    GIT_VERSION: 1.7.9.5
+
+services:
+  - docker
+
+before_install:
+  # - sudo apt-get update
+  # Pull container
+  - 'sudo docker pull ${distribution}:${version}'
+  # Customize container
+  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+
+script:
+  - container_id=$(mktemp)
+  # Run container in detached state
+  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+
+  # Ansible syntax check.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test-${SITE}.yml --syntax-check'
+
+  # Test role.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test-${SITE}.yml'
+
+  # Test role idempotence.
+  - >
+    sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test-${SITE}.yml
+    | grep -q 'changed=0.*failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)
+
+  # Ensure Git is installed and at the right version.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm which git'
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm test -x /usr/bin/git'
+
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm git --version'
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm /usr/bin/git --version | grep -qF "$GIT_VERSION"'
+
+  # Clean up
+  - 'sudo docker stop "$(cat ${container_id})"'
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.git/README.md b/provisioning/roles/geerlingguy.git/README.md
new file mode 100644
index 000000000..e7b66763a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.git/README.md
@@ -0,0 +1,55 @@
+# Ansible Role: Git
+
+[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-git.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-git)
+
+Installs Git, a distributed version control system, on any RHEL/CentOS or Debian/Ubuntu Linux system.
+
+## Requirements
+
+None.
+
+## Role Variables
+
+Available variables are listed below, along with default values (see `defaults/main.yml`):
+
+    workspace: /root
+
+Where certain files will be downloaded and adjusted prior to git installation, if needed.
+
+    git_enablerepo: ""
+
+This variable, a well as `git_packages`, will be used to install git via a particular `yum` repo if `git_install_from_source` is false (CentOS only). Any additional repositories you have installed that you would like to use for a newer/different Git version.
+
+    git_packages:
+      - git
+      - git-svn
+
+The specific Git packages that will be installed. By default, `git-svn` is included, but you can easily add this variable to your playbook's variables and remove `git-svn` if desired.
+
+    git_install_from_source: false
+    git_install_path: "/usr"
+    git_version: "2.1.0"
+
+Whether to install Git from source; if set to `true`, `git_version` is required and will be used to install a particular version of git (see all available versions here: https://www.kernel.org/pub/software/scm/git/), and `git_install_path` defines where git should be installed.
+
+    git_install_from_source_force_update: false
+
+If git is already installed at and older version, force a new source build. Only applies if `git_install_from_source` is `true`.
+
+## Dependencies
+
+None.
+
+## Example Playbook
+
+    - hosts: servers
+      roles:
+        - { role: geerlingguy.git }
+
+## License
+
+MIT / BSD
+
+## Author Information
+
+This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.git/defaults/main.yml b/provisioning/roles/geerlingguy.git/defaults/main.yml
new file mode 100644
index 000000000..7c64bc22d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.git/defaults/main.yml
@@ -0,0 +1,23 @@
+---
+workspace: /root
+
+# If git_install_from_source is set to false, these two variables define whether
+# to use an additional repo for the package installation, and which git packages
+# will be installed.
+git_enablerepo: ""
+git_packages:
+  - git
+  - git-svn
+
+# If set to TRUE, git will be installed from source, using the version set with
+# the 'git_version' variable instead of using a package.
+git_install_from_source: false
+git_install_path: "/usr"
+git_version: "2.7.1"
+
+# If git is already installed at and older version, force a new source build.
+# Only applies if git_install_from_source is `true`.
+git_install_from_source_force_update: false
+
+# Leave this at it's default.
+git_reinstall_from_source: false
diff --git a/provisioning/roles/geerlingguy.git/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.git/meta/.galaxy_install_info
new file mode 100644
index 000000000..683f63a38
--- /dev/null
+++ b/provisioning/roles/geerlingguy.git/meta/.galaxy_install_info
@@ -0,0 +1 @@
+{install_date: 'Fri Jul 15 19:49:01 2016', version: 1.1.1}
diff --git a/provisioning/roles/geerlingguy.git/meta/main.yml b/provisioning/roles/geerlingguy.git/meta/main.yml
new file mode 100644
index 000000000..d119d20d0
--- /dev/null
+++ b/provisioning/roles/geerlingguy.git/meta/main.yml
@@ -0,0 +1,22 @@
+---
+dependencies: []
+
+galaxy_info:
+  author: geerlingguy
+  description: Git version control software
+  company: "Midwestern Mac, LLC"
+  license: "license (BSD, MIT)"
+  min_ansible_version: 1.9
+  platforms:
+  - name: EL
+    versions:
+    - all
+  - name: Debian
+    versions:
+    - all
+  - name: Ubuntu
+    versions:
+    - all
+  galaxy_tags:
+    - development
+    - system
diff --git a/provisioning/roles/geerlingguy.git/tasks/install-from-source.yml b/provisioning/roles/geerlingguy.git/tasks/install-from-source.yml
new file mode 100644
index 000000000..3dc0458e9
--- /dev/null
+++ b/provisioning/roles/geerlingguy.git/tasks/install-from-source.yml
@@ -0,0 +1,62 @@
+---
+- name: Ensure git's dependencies are installed (RedHat).
+  yum: "pkg={{ item }} state=installed"
+  with_items:
+    - gettext-devel
+    - expat-devel
+    - curl-devel
+    - zlib-devel
+    - perl-devel
+    - openssl-devel
+    - subversion-perl
+    - make
+    - gcc
+  when: ansible_os_family == 'RedHat'
+
+- name: Ensure git's dependencies are installed (Debian).
+  apt: "pkg={{ item }} state=installed"
+  with_items:
+    - libcurl4-gnutls-dev
+    - libexpat1-dev
+    - gettext
+    - libssl-dev
+    - build-essential
+    - gcc
+  when: ansible_os_family == 'Debian'
+
+- name: Get installed version
+  command: git --version
+  changed_when: false
+  failed_when: false
+  # Ansible 1.8 feature.
+  # warn: no
+  register: git_installed_version
+
+- name: Force git install if the version numbers do not match
+  set_fact:
+    git_reinstall_from_source: true
+  when: 'git_install_from_source_force_update and (git_installed_version|success and (git_installed_version.stdout | regex_replace("^.*?([0-9\.]+)$", "\\1") | version_compare(git_version, operator="!=")))'
+
+- name: Download git.
+  get_url:
+    url: "https://www.kernel.org/pub/software/scm/git/git-{{ git_version }}.tar.gz"
+    dest: "{{ workspace }}/git-{{ git_version }}.tar.gz"
+  when:  git_installed_version|failed or git_reinstall_from_source
+
+- name: Expand git archive.
+  unarchive:
+    src: "{{ workspace }}/git-{{ git_version }}.tar.gz"
+    dest: "{{ workspace }}"
+    creates: "{{ workspace }}/git-{{ git_version }}/README"
+    copy: no
+  when:  git_installed_version|failed or git_reinstall_from_source
+
+- name: Build git.
+  command: >
+    make prefix={{ git_install_path }} {{ item }}
+    chdir={{ workspace }}/git-{{ git_version }}
+  with_items:
+    - all
+    - install
+  when:  git_installed_version|failed or git_reinstall_from_source
+  become: yes
diff --git a/provisioning/roles/geerlingguy.git/tasks/main.yml b/provisioning/roles/geerlingguy.git/tasks/main.yml
new file mode 100644
index 000000000..22f2b81f6
--- /dev/null
+++ b/provisioning/roles/geerlingguy.git/tasks/main.yml
@@ -0,0 +1,23 @@
+---
+- name: Ensure git is installed (RedHat).
+  yum:
+    name: "{{ item }}"
+    state: installed
+    enablerepo: "{{ git_enablerepo }}"
+  with_items: "{{ git_packages }}"
+  when: (git_install_from_source == false) and (ansible_os_family == 'RedHat')
+
+- name: Update apt cache (Debian).
+  apt: update_cache=yes cache_valid_time=86400
+  when: ansible_os_family == 'Debian'
+
+- name: Ensure git is installed (Debian).
+  apt:
+    name: "{{ item }}"
+    state: installed
+  with_items: "{{ git_packages }}"
+  when: (git_install_from_source == false) and (ansible_os_family == 'Debian')
+
+# Install git from source when git_install_from_source is true.
+- include: install-from-source.yml
+  when: git_install_from_source == true
diff --git a/provisioning/roles/geerlingguy.git/tests/Dockerfile.centos-6 b/provisioning/roles/geerlingguy.git/tests/Dockerfile.centos-6
new file mode 100644
index 000000000..4a4e7b8d6
--- /dev/null
+++ b/provisioning/roles/geerlingguy.git/tests/Dockerfile.centos-6
@@ -0,0 +1,15 @@
+FROM centos:6
+
+# Install Ansible
+RUN yum -y update; yum clean all;
+RUN yum -y install epel-release
+RUN yum -y install git ansible sudo
+RUN yum clean all
+
+# Disable requiretty
+RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
+
+# Install Ansible inventory file
+RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
+
+CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.git/tests/Dockerfile.centos-7 b/provisioning/roles/geerlingguy.git/tests/Dockerfile.centos-7
new file mode 100644
index 000000000..8aa065497
--- /dev/null
+++ b/provisioning/roles/geerlingguy.git/tests/Dockerfile.centos-7
@@ -0,0 +1,27 @@
+FROM centos:7
+
+# Install systemd -- See https://hub.docker.com/_/centos/
+RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
+RUN yum -y update; yum clean all; \
+(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
+rm -f /lib/systemd/system/multi-user.target.wants/*; \
+rm -f /etc/systemd/system/*.wants/*; \
+rm -f /lib/systemd/system/local-fs.target.wants/*; \
+rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
+rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
+rm -f /lib/systemd/system/basic.target.wants/*; \
+rm -f /lib/systemd/system/anaconda.target.wants/*;
+
+# Install Ansible
+RUN yum -y install epel-release
+RUN yum -y install git ansible sudo
+RUN yum clean all
+
+# Disable requiretty
+RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
+
+# Install Ansible inventory file
+RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
+
+VOLUME ["/sys/fs/cgroup"]
+CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.git/tests/Dockerfile.ubuntu-12.04 b/provisioning/roles/geerlingguy.git/tests/Dockerfile.ubuntu-12.04
new file mode 100644
index 000000000..d0c130cdf
--- /dev/null
+++ b/provisioning/roles/geerlingguy.git/tests/Dockerfile.ubuntu-12.04
@@ -0,0 +1,11 @@
+FROM ubuntu:12.04
+RUN apt-get update
+
+# Install Ansible
+RUN apt-get install -y software-properties-common python-software-properties git
+RUN apt-add-repository -y ppa:ansible/ansible
+RUN apt-get update
+RUN apt-get install -y ansible
+
+# Install Ansible inventory file
+RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.git/tests/Dockerfile.ubuntu-14.04 b/provisioning/roles/geerlingguy.git/tests/Dockerfile.ubuntu-14.04
new file mode 100644
index 000000000..ca332871f
--- /dev/null
+++ b/provisioning/roles/geerlingguy.git/tests/Dockerfile.ubuntu-14.04
@@ -0,0 +1,11 @@
+FROM ubuntu:14.04
+RUN apt-get update
+
+# Install Ansible
+RUN apt-get install -y software-properties-common git
+RUN apt-add-repository -y ppa:ansible/ansible
+RUN apt-get update
+RUN apt-get install -y ansible
+
+# Install Ansible inventory file
+RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.git/tests/test-package.yml b/provisioning/roles/geerlingguy.git/tests/test-package.yml
new file mode 100644
index 000000000..e76a3e01c
--- /dev/null
+++ b/provisioning/roles/geerlingguy.git/tests/test-package.yml
@@ -0,0 +1,14 @@
+---
+- hosts: all
+
+  vars:
+    git_install_from_source: false
+    git_install_path: /usr/local
+
+  pre_tasks:
+    - name: Ensure build dependencies are installed (RedHat).
+      yum: name=which state=present
+      when: ansible_os_family == 'RedHat'
+
+  roles:
+    - role_under_test
diff --git a/provisioning/roles/geerlingguy.git/tests/test-source.yml b/provisioning/roles/geerlingguy.git/tests/test-source.yml
new file mode 100644
index 000000000..a31cc4e7d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.git/tests/test-source.yml
@@ -0,0 +1,15 @@
+---
+- hosts: all
+
+  vars:
+    git_install_from_source: true
+    git_install_from_source_force_update: true
+    git_version: 2.7.1
+
+  pre_tasks:
+    - name: Ensure build dependencies are installed (RedHat).
+      yum: name=which state=present
+      when: ansible_os_family == 'RedHat'
+
+  roles:
+    - role_under_test
diff --git a/provisioning/roles/geerlingguy.git/vars/main.yml b/provisioning/roles/geerlingguy.git/vars/main.yml
new file mode 100644
index 000000000..10e268ab3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.git/vars/main.yml
@@ -0,0 +1,2 @@
+---
+# This space intentionally left blank.
diff --git a/provisioning/roles/geerlingguy.java/.travis.yml b/provisioning/roles/geerlingguy.java/.travis.yml
new file mode 100644
index 000000000..e14ea79f1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.java/.travis.yml
@@ -0,0 +1,57 @@
+---
+sudo: required
+
+env:
+  - distribution: centos
+    version: 6
+    init: /sbin/init
+    run_opts: ""
+  - distribution: centos
+    version: 7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distribution: ubuntu
+    version: 14.04
+    init: /sbin/init
+    run_opts: ""
+  - distribution: ubuntu
+    version: 12.04
+    init: /sbin/init
+    run_opts: ""
+
+services:
+  - docker
+
+before_install:
+  # Pull container
+  - 'sudo docker pull ${distribution}:${version}'
+  # Customize container
+  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+
+script:
+  - container_id=$(mktemp)
+  # Run container in detached state
+  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+
+  # Ansible syntax check.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+
+  # Test role.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+
+  # Test role idempotence.
+  - >
+    sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml
+    | grep -q 'changed=0.*failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)
+
+  # Ensure daemonize is available.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm which java'
+
+  # Clean up
+  - 'sudo docker stop "$(cat ${container_id})"'
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
+
diff --git a/provisioning/roles/geerlingguy.java/README.md b/provisioning/roles/geerlingguy.java/README.md
new file mode 100644
index 000000000..483ad3f52
--- /dev/null
+++ b/provisioning/roles/geerlingguy.java/README.md
@@ -0,0 +1,62 @@
+# Ansible Role: Java
+
+[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-java.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-java)
+
+Installs Java for RedHat/CentOS and Debian/Ubuntu linux servers.
+
+## Requirements
+
+None.
+
+## Role Variables
+
+Available variables are listed below, along with default values:
+
+    # The defaults provided by this role are specific to each distribution.
+    java_packages:
+      - java-1.7.0-openjdk
+
+Set the version/development kit of Java to install, along with any other necessary Java packages. Some other options include are included in the distribution-specific files in this role's 'defaults' folder.
+
+## Dependencies
+
+None.
+
+## Example Playbook (using default package, usually OpenJDK 7)
+
+    - hosts: servers
+      roles:
+        - geerlingguy.java
+
+## Example Playbook (install OpenJDK 8)
+
+For RHEL / CentOS:
+
+    - hosts: server
+      roles:
+        - role: geerlingguy.java
+          when: "ansible_os_family == 'RedHat'"
+          java_packages:
+            - java-1.8.0-openjdk
+
+For Ubuntu < 16.04:
+
+    - hosts: server
+      tasks:
+        - name: installing repo for Java 8 in Ubuntu
+  	      apt_repository: repo='ppa:openjdk-r/ppa'
+    
+    - hosts: server
+      roles:
+        - role: geerlingguy.java
+          when: "ansible_os_family == 'Debian'"
+          java_packages:
+            - openjdk-8-jdk
+
+## License
+
+MIT / BSD
+
+## Author Information
+
+This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.java/defaults/main.yml b/provisioning/roles/geerlingguy.java/defaults/main.yml
new file mode 100644
index 000000000..43a7a0226
--- /dev/null
+++ b/provisioning/roles/geerlingguy.java/defaults/main.yml
@@ -0,0 +1,4 @@
+---
+# Set java_packages if you would like to use a different version than the
+# default (OpenJDK 1.7).
+# java_packages: []
diff --git a/provisioning/roles/geerlingguy.java/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.java/meta/.galaxy_install_info
new file mode 100644
index 000000000..79c2cbc1a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.java/meta/.galaxy_install_info
@@ -0,0 +1 @@
+{install_date: 'Fri Jul 15 19:49:05 2016', version: 1.4.0}
diff --git a/provisioning/roles/geerlingguy.java/meta/main.yml b/provisioning/roles/geerlingguy.java/meta/main.yml
new file mode 100644
index 000000000..526ffadc2
--- /dev/null
+++ b/provisioning/roles/geerlingguy.java/meta/main.yml
@@ -0,0 +1,27 @@
+---
+dependencies: []
+
+galaxy_info:
+  author: geerlingguy
+  description: Java for Linux
+  company: "Midwestern Mac, LLC"
+  license: "license (BSD, MIT)"
+  min_ansible_version: 1.9
+  platforms:
+    - name: EL
+      versions:
+      - 6
+      - 7
+    - name: Debian
+      versions:
+      - all
+    - name: Ubuntu
+      versions:
+      - all
+    - name: FreeBSD
+      versions:
+      - 10.2
+  galaxy_tags:
+    - development
+    - system
+    - web
diff --git a/provisioning/roles/geerlingguy.java/tasks/main.yml b/provisioning/roles/geerlingguy.java/tasks/main.yml
new file mode 100644
index 000000000..95f5b56ba
--- /dev/null
+++ b/provisioning/roles/geerlingguy.java/tasks/main.yml
@@ -0,0 +1,23 @@
+---
+- name: Include OS-specific variables.
+  include_vars: "{{ ansible_os_family }}.yml"
+  when: ansible_distribution != 'Ubuntu'
+
+- name: Include version-specific variables for Ubuntu.
+  include_vars: "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yml"
+  when: ansible_distribution == 'Ubuntu'
+
+- name: Define java_packages.
+  set_fact:
+    java_packages: "{{ __java_packages | list }}"
+  when: java_packages is not defined
+
+# Setup/install tasks.
+- include: setup-RedHat.yml
+  when: ansible_os_family == 'RedHat'
+
+- include: setup-Debian.yml
+  when: ansible_os_family == 'Debian'
+
+- include: setup-FreeBSD.yml
+  when: ansible_os_family == 'FreeBSD'
diff --git a/provisioning/roles/geerlingguy.java/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.java/tasks/setup-Debian.yml
new file mode 100644
index 000000000..f1adc7574
--- /dev/null
+++ b/provisioning/roles/geerlingguy.java/tasks/setup-Debian.yml
@@ -0,0 +1,7 @@
+---
+- name: Update apt cache.
+  apt: update_cache=yes cache_valid_time=86400
+
+- name: Ensure Java is installed.
+  apt: "name={{ item }} state=installed"
+  with_items: "{{ java_packages }}"
diff --git a/provisioning/roles/geerlingguy.java/tasks/setup-FreeBSD.yml b/provisioning/roles/geerlingguy.java/tasks/setup-FreeBSD.yml
new file mode 100644
index 000000000..f3d1fa310
--- /dev/null
+++ b/provisioning/roles/geerlingguy.java/tasks/setup-FreeBSD.yml
@@ -0,0 +1,10 @@
+---
+- name: Ensure Java is installed.
+  pkgng: "name={{ item }} state=present"
+  with_items: "{{ java_packages }}"
+
+- name: ensure proc is mounted
+  mount: name=/proc fstype=procfs src=proc opts=rw state=mounted
+
+- name: ensure fdesc is mounted
+  mount: name=/dev/fd fstype=fdescfs src=fdesc opts=rw state=mounted
diff --git a/provisioning/roles/geerlingguy.java/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.java/tasks/setup-RedHat.yml
new file mode 100644
index 000000000..4a616adce
--- /dev/null
+++ b/provisioning/roles/geerlingguy.java/tasks/setup-RedHat.yml
@@ -0,0 +1,4 @@
+---
+- name: Ensure Java is installed.
+  yum: "name={{ item }} state=installed"
+  with_items: "{{ java_packages }}"
diff --git a/provisioning/roles/geerlingguy.java/tests/Dockerfile.centos-6 b/provisioning/roles/geerlingguy.java/tests/Dockerfile.centos-6
new file mode 100644
index 000000000..4a4e7b8d6
--- /dev/null
+++ b/provisioning/roles/geerlingguy.java/tests/Dockerfile.centos-6
@@ -0,0 +1,15 @@
+FROM centos:6
+
+# Install Ansible
+RUN yum -y update; yum clean all;
+RUN yum -y install epel-release
+RUN yum -y install git ansible sudo
+RUN yum clean all
+
+# Disable requiretty
+RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
+
+# Install Ansible inventory file
+RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
+
+CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.java/tests/Dockerfile.centos-7 b/provisioning/roles/geerlingguy.java/tests/Dockerfile.centos-7
new file mode 100644
index 000000000..8aa065497
--- /dev/null
+++ b/provisioning/roles/geerlingguy.java/tests/Dockerfile.centos-7
@@ -0,0 +1,27 @@
+FROM centos:7
+
+# Install systemd -- See https://hub.docker.com/_/centos/
+RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
+RUN yum -y update; yum clean all; \
+(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
+rm -f /lib/systemd/system/multi-user.target.wants/*; \
+rm -f /etc/systemd/system/*.wants/*; \
+rm -f /lib/systemd/system/local-fs.target.wants/*; \
+rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
+rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
+rm -f /lib/systemd/system/basic.target.wants/*; \
+rm -f /lib/systemd/system/anaconda.target.wants/*;
+
+# Install Ansible
+RUN yum -y install epel-release
+RUN yum -y install git ansible sudo
+RUN yum clean all
+
+# Disable requiretty
+RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
+
+# Install Ansible inventory file
+RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
+
+VOLUME ["/sys/fs/cgroup"]
+CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.java/tests/Dockerfile.ubuntu-12.04 b/provisioning/roles/geerlingguy.java/tests/Dockerfile.ubuntu-12.04
new file mode 100644
index 000000000..d0c130cdf
--- /dev/null
+++ b/provisioning/roles/geerlingguy.java/tests/Dockerfile.ubuntu-12.04
@@ -0,0 +1,11 @@
+FROM ubuntu:12.04
+RUN apt-get update
+
+# Install Ansible
+RUN apt-get install -y software-properties-common python-software-properties git
+RUN apt-add-repository -y ppa:ansible/ansible
+RUN apt-get update
+RUN apt-get install -y ansible
+
+# Install Ansible inventory file
+RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.java/tests/Dockerfile.ubuntu-14.04 b/provisioning/roles/geerlingguy.java/tests/Dockerfile.ubuntu-14.04
new file mode 100644
index 000000000..ca332871f
--- /dev/null
+++ b/provisioning/roles/geerlingguy.java/tests/Dockerfile.ubuntu-14.04
@@ -0,0 +1,11 @@
+FROM ubuntu:14.04
+RUN apt-get update
+
+# Install Ansible
+RUN apt-get install -y software-properties-common git
+RUN apt-add-repository -y ppa:ansible/ansible
+RUN apt-get update
+RUN apt-get install -y ansible
+
+# Install Ansible inventory file
+RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.java/tests/test.yml b/provisioning/roles/geerlingguy.java/tests/test.yml
new file mode 100644
index 000000000..b29465406
--- /dev/null
+++ b/provisioning/roles/geerlingguy.java/tests/test.yml
@@ -0,0 +1,10 @@
+---
+- hosts: all
+
+  pre_tasks:
+    - name: Ensure build dependencies are installed (RedHat).
+      yum: name=which state=present
+      when: ansible_os_family == 'RedHat'
+
+  roles:
+    - role_under_test
diff --git a/provisioning/roles/geerlingguy.java/vars/Debian.yml b/provisioning/roles/geerlingguy.java/vars/Debian.yml
new file mode 100644
index 000000000..8d620e47a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.java/vars/Debian.yml
@@ -0,0 +1,7 @@
+---
+# JDK version options include:
+#   - java
+#   - openjdk-6-jdk
+#   - openjdk-7-jdk
+__java_packages:
+  - openjdk-7-jdk
diff --git a/provisioning/roles/geerlingguy.java/vars/FreeBSD.yml b/provisioning/roles/geerlingguy.java/vars/FreeBSD.yml
new file mode 100644
index 000000000..0d712eb4d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.java/vars/FreeBSD.yml
@@ -0,0 +1,7 @@
+---
+# JDK version options for FreeBSD include:
+#   - openjdk
+#   - openjdk6
+#   - openjdk8
+__java_packages:
+  - openjdk
diff --git a/provisioning/roles/geerlingguy.java/vars/RedHat.yml b/provisioning/roles/geerlingguy.java/vars/RedHat.yml
new file mode 100644
index 000000000..70694b7af
--- /dev/null
+++ b/provisioning/roles/geerlingguy.java/vars/RedHat.yml
@@ -0,0 +1,7 @@
+---
+# JDK version options include:
+#   - java
+#   - java-1.6.0-openjdk
+#   - java-1.7.0-openjdk
+__java_packages:
+  - java-1.7.0-openjdk
diff --git a/provisioning/roles/geerlingguy.java/vars/Ubuntu-12.04.yml b/provisioning/roles/geerlingguy.java/vars/Ubuntu-12.04.yml
new file mode 100644
index 000000000..8d620e47a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.java/vars/Ubuntu-12.04.yml
@@ -0,0 +1,7 @@
+---
+# JDK version options include:
+#   - java
+#   - openjdk-6-jdk
+#   - openjdk-7-jdk
+__java_packages:
+  - openjdk-7-jdk
diff --git a/provisioning/roles/geerlingguy.java/vars/Ubuntu-14.04.yml b/provisioning/roles/geerlingguy.java/vars/Ubuntu-14.04.yml
new file mode 100644
index 000000000..8d620e47a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.java/vars/Ubuntu-14.04.yml
@@ -0,0 +1,7 @@
+---
+# JDK version options include:
+#   - java
+#   - openjdk-6-jdk
+#   - openjdk-7-jdk
+__java_packages:
+  - openjdk-7-jdk
diff --git a/provisioning/roles/geerlingguy.java/vars/Ubuntu-16.04.yml b/provisioning/roles/geerlingguy.java/vars/Ubuntu-16.04.yml
new file mode 100644
index 000000000..0a0bd8209
--- /dev/null
+++ b/provisioning/roles/geerlingguy.java/vars/Ubuntu-16.04.yml
@@ -0,0 +1,7 @@
+---
+# JDK version options include:
+#   - java
+#   - openjdk-8-jdk
+#   - openjdk-9-jdk
+__java_packages:
+  - openjdk-8-jdk
diff --git a/provisioning/roles/geerlingguy.mailhog/.travis.yml b/provisioning/roles/geerlingguy.mailhog/.travis.yml
new file mode 100644
index 000000000..135e0d568
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mailhog/.travis.yml
@@ -0,0 +1,67 @@
+---
+sudo: required
+
+env:
+  - distribution: centos
+    version: 6
+    init: /sbin/init
+    run_opts: ""
+  - distribution: centos
+    version: 7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distribution: ubuntu
+    version: 14.04
+    init: /sbin/init
+    run_opts: ""
+  - distribution: ubuntu
+    version: 12.04
+    init: /sbin/init
+    run_opts: ""
+
+services:
+  - docker
+
+before_install:
+  # Pull container
+  - 'sudo docker pull ${distribution}:${version}'
+  # Customize container
+  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+
+script:
+  - container_id=$(mktemp)
+  # Run container in detached state
+  - 'sudo docker run --detach -p 8025:8025 --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+
+  # Install required Galaxy roles.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-galaxy install geerlingguy.daemonize'
+
+  # Ansible syntax check.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+
+  # Test role.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+
+  # Test role idempotence.
+  - idempotence=$(mktemp)
+  - sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
+  - >
+    tail ${idempotence}
+    | grep -q 'changed=0.*failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)
+
+  # Make sure mailhog is listening on ports 1025 and 8025.
+  # TODO.
+
+  # Send an email via mhsendmail.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm sh -c "cat /etc/ansible/roles/role_under_test/tests/message | /opt/mailhog/mhsendmail johndoe@example.com"'
+
+  # Test retrieving messages via MailHog API.
+  - 'curl http://localhost:8025/api/v2/messages | grep id'
+
+  # Clean up
+  - 'sudo docker stop "$(cat ${container_id})"'
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.mailhog/README.md b/provisioning/roles/geerlingguy.mailhog/README.md
new file mode 100644
index 000000000..9fac45635
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mailhog/README.md
@@ -0,0 +1,55 @@
+# Ansible Role: MailHog
+
+[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-mailhog.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-mailhog)
+
+Installs [MailHog](https://github.com/mailhog/MailHog), a Go-based SMTP server and web UI/API for displaying captured emails, on RedHat or Debian-based linux systems.
+
+Also installs [mhsendmail](https://github.com/mailhog/mhsendmail) so you can redirect system mail to MailHog's built-in SMTP server.
+
+If you're using PHP and would like to route all PHP email into MailHog, you will need to update the `sendmail_path` configuration option in php.ini, like so:
+
+    sendmail_path = "{{ mailhog_install_dir }}/mhsendmail"
+
+(Replace `{{ mailhog_install_dir }}` with the actual MailHog installation directory, which is `/opt/mailhog` by default—e.g. `/opt/mailhog/mhsendmail`).
+
+## Requirements
+
+None.
+
+## Role Variables
+
+Available variables are listed below, along with default values (see `defaults/main.yml`):
+
+    mailhog_install_dir: /opt/mailhog
+
+The directory into which the MailHog binary will be installed.
+
+    mailhog_binary_url: https://github.com/mailhog/MailHog/releases/download/v0.2.0/MailHog_linux_amd64
+
+The MailHog binary that will be installed. You can find the latest version or a 32-bit version by visiting the [MailHog project releases page](https://github.com/mailhog/MailHog/releases).
+
+    mailhog_daemonize_bin_path: /usr/sbin/daemonize
+
+The path to `daemonize`, which is used to launch MailHog via init script.
+
+    mhsendmail_binary_url: https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64
+
+The mhsendmail binary that will be installed. You can find the latest version or a 32-bit version by visiting the [mhsendmail project releases page](https://github.com/mailhog/mhsendmail/releases).
+
+## Dependencies
+
+  - geerlingguy.daemonize
+
+## Example Playbook
+
+    - hosts: servers
+      roles:
+        - { role: geerlingguy.mailhog }
+
+## License
+
+MIT / BSD
+
+## Author Information
+
+This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.mailhog/defaults/main.yml b/provisioning/roles/geerlingguy.mailhog/defaults/main.yml
new file mode 100644
index 000000000..73d66df85
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mailhog/defaults/main.yml
@@ -0,0 +1,7 @@
+---
+mailhog_install_dir: /opt/mailhog
+mailhog_binary_url: https://github.com/mailhog/MailHog/releases/download/v0.2.0/MailHog_linux_amd64
+mhsendmail_binary_url: https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64
+
+# Path to daemonize, which is used to launch MailHog via init script.
+mailhog_daemonize_bin_path: /usr/sbin/daemonize
diff --git a/provisioning/roles/geerlingguy.mailhog/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.mailhog/meta/.galaxy_install_info
new file mode 100644
index 000000000..d49e3f771
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mailhog/meta/.galaxy_install_info
@@ -0,0 +1 @@
+{install_date: 'Fri Jul 15 19:49:08 2016', version: 2.0.0}
diff --git a/provisioning/roles/geerlingguy.mailhog/meta/main.yml b/provisioning/roles/geerlingguy.mailhog/meta/main.yml
new file mode 100644
index 000000000..16a2c2b78
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mailhog/meta/main.yml
@@ -0,0 +1,25 @@
+---
+dependencies:
+  - geerlingguy.daemonize
+
+galaxy_info:
+  author: geerlingguy
+  description: "MailHog for Linux"
+  company: "Midwestern Mac, LLC"
+  license: "license (BSD, MIT)"
+  min_ansible_version: 1.8
+  platforms:
+    - name: EL
+      versions:
+      - all
+    - name: Ubuntu
+      versions:
+      - all
+    - name: Debian
+      versions:
+      - all
+  galaxy_tags:
+    - development
+    - web
+    - system
+    - mail
diff --git a/provisioning/roles/geerlingguy.mailhog/tasks/main.yml b/provisioning/roles/geerlingguy.mailhog/tasks/main.yml
new file mode 100644
index 000000000..3ee62d118
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mailhog/tasks/main.yml
@@ -0,0 +1,33 @@
+---
+# Install and configure MailHog.
+- name: Ensure mailhog install directory exists.
+  file:
+    path: "{{ mailhog_install_dir }}"
+    owner: root
+    group: root
+    state: directory
+    mode: 0755
+
+- name: Download MailHog and mhsendmail binaries.
+  get_url:
+    url: "{{ item.url }}"
+    dest: "{{ item.dest }}"
+    owner: root
+    group: root
+    mode: 0755
+  with_items:
+    - url: "{{ mailhog_binary_url }}"
+      dest: "{{ mailhog_install_dir }}/mailhog"
+    - url: "{{ mhsendmail_binary_url }}"
+      dest: "{{ mailhog_install_dir }}/mhsendmail"
+
+- name: Copy mailhog init script into place.
+  template:
+    src: mailhog.init.j2
+    dest: /etc/init.d/mailhog
+    owner: root
+    group: root
+    mode: 0755
+
+- name: Ensure mailhog is enabled and will start on boot.
+  service: name=mailhog state=started enabled=yes
diff --git a/provisioning/roles/geerlingguy.mailhog/templates/mailhog.init.j2 b/provisioning/roles/geerlingguy.mailhog/templates/mailhog.init.j2
new file mode 100644
index 000000000..c20904c79
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mailhog/templates/mailhog.init.j2
@@ -0,0 +1,61 @@
+#! /bin/sh
+# /etc/init.d/mailhog
+#
+# MailHog init script.
+#
+# @author Jeff Geerling
+
+### BEGIN INIT INFO
+# Provides:          mailhog
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start MailHog at boot time.
+# Description:       Enable MailHog.
+### END INIT INFO
+
+PID=/var/run/mailhog.pid
+LOCK=/var/lock/mailhog.lock
+USER=nobody
+BIN={{ mailhog_install_dir }}/mailhog
+DAEMONIZE_BIN={{ mailhog_daemonize_bin_path }}
+
+# Carry out specific functions when asked to by the system
+case "$1" in
+  start)
+    echo "Starting mailhog."
+    $DAEMONIZE_BIN -p $PID -l $LOCK -u $USER $BIN
+    ;;
+  stop)
+    if [ -f $PID ]; then
+      echo "Stopping mailhog.";
+      kill -TERM $(cat $PID);
+      rm -f $PID;
+    else
+      echo "MailHog is not running.";
+    fi
+    ;;
+  restart)
+    echo "Restarting mailhog."
+    if [ -f $PID ]; then
+      kill -TERM $(cat $PID);
+      rm -f $PID;
+    fi
+    $DAEMONIZE_BIN -p $PID -l $LOCK -u $USER $BIN
+    ;;
+  status)
+    if [ -f $PID ]; then
+      echo "MailHog is running.";
+    else
+      echo "MailHog is not running.";
+      exit 3
+    fi
+    ;;
+  *)
+    echo "Usage: /etc/init.d/mailhog {start|stop|status|restart}"
+    exit 1
+    ;;
+esac
+
+exit 0
\ No newline at end of file
diff --git a/provisioning/roles/geerlingguy.mailhog/tests/Dockerfile.centos-6 b/provisioning/roles/geerlingguy.mailhog/tests/Dockerfile.centos-6
new file mode 100644
index 000000000..4a4e7b8d6
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mailhog/tests/Dockerfile.centos-6
@@ -0,0 +1,15 @@
+FROM centos:6
+
+# Install Ansible
+RUN yum -y update; yum clean all;
+RUN yum -y install epel-release
+RUN yum -y install git ansible sudo
+RUN yum clean all
+
+# Disable requiretty
+RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
+
+# Install Ansible inventory file
+RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
+
+CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.mailhog/tests/Dockerfile.centos-7 b/provisioning/roles/geerlingguy.mailhog/tests/Dockerfile.centos-7
new file mode 100644
index 000000000..8aa065497
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mailhog/tests/Dockerfile.centos-7
@@ -0,0 +1,27 @@
+FROM centos:7
+
+# Install systemd -- See https://hub.docker.com/_/centos/
+RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
+RUN yum -y update; yum clean all; \
+(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
+rm -f /lib/systemd/system/multi-user.target.wants/*; \
+rm -f /etc/systemd/system/*.wants/*; \
+rm -f /lib/systemd/system/local-fs.target.wants/*; \
+rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
+rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
+rm -f /lib/systemd/system/basic.target.wants/*; \
+rm -f /lib/systemd/system/anaconda.target.wants/*;
+
+# Install Ansible
+RUN yum -y install epel-release
+RUN yum -y install git ansible sudo
+RUN yum clean all
+
+# Disable requiretty
+RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
+
+# Install Ansible inventory file
+RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
+
+VOLUME ["/sys/fs/cgroup"]
+CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.mailhog/tests/Dockerfile.ubuntu-12.04 b/provisioning/roles/geerlingguy.mailhog/tests/Dockerfile.ubuntu-12.04
new file mode 100644
index 000000000..d0c130cdf
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mailhog/tests/Dockerfile.ubuntu-12.04
@@ -0,0 +1,11 @@
+FROM ubuntu:12.04
+RUN apt-get update
+
+# Install Ansible
+RUN apt-get install -y software-properties-common python-software-properties git
+RUN apt-add-repository -y ppa:ansible/ansible
+RUN apt-get update
+RUN apt-get install -y ansible
+
+# Install Ansible inventory file
+RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.mailhog/tests/Dockerfile.ubuntu-14.04 b/provisioning/roles/geerlingguy.mailhog/tests/Dockerfile.ubuntu-14.04
new file mode 100644
index 000000000..ca332871f
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mailhog/tests/Dockerfile.ubuntu-14.04
@@ -0,0 +1,11 @@
+FROM ubuntu:14.04
+RUN apt-get update
+
+# Install Ansible
+RUN apt-get install -y software-properties-common git
+RUN apt-add-repository -y ppa:ansible/ansible
+RUN apt-get update
+RUN apt-get install -y ansible
+
+# Install Ansible inventory file
+RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.mailhog/tests/message b/provisioning/roles/geerlingguy.mailhog/tests/message
new file mode 100644
index 000000000..582ec1e91
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mailhog/tests/message
@@ -0,0 +1,5 @@
+From: johndoe@example.com
+To: janedoe@example.com
+Subject: Test email
+
+Hello world!
\ No newline at end of file
diff --git a/provisioning/roles/geerlingguy.mailhog/tests/test.yml b/provisioning/roles/geerlingguy.mailhog/tests/test.yml
new file mode 100644
index 000000000..3fd4e5d05
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mailhog/tests/test.yml
@@ -0,0 +1,27 @@
+- hosts: all
+
+  pre_tasks:
+    - name: Ensure build dependencies are installed (RedHat).
+      yum: 'name="{{ item }}" state=present'
+      with_items:
+        - "@Development tools"
+        - tar
+        - unzip
+        - sudo
+        - which
+        - net-tools
+      when: ansible_os_family == 'RedHat'
+
+    - name: Ensure build dependencies are installed (Debian).
+      apt: 'name="{{ item }}" state=installed'
+      with_items:
+        - build-essential
+        - unzip
+        - tar
+        - sudo
+        - net-tools
+      when: ansible_os_family == 'Debian'
+
+  roles:
+    - geerlingguy.daemonize
+    - role_under_test
diff --git a/provisioning/roles/geerlingguy.memcached/.gitignore b/provisioning/roles/geerlingguy.memcached/.gitignore
new file mode 100644
index 000000000..e43b0f988
--- /dev/null
+++ b/provisioning/roles/geerlingguy.memcached/.gitignore
@@ -0,0 +1 @@
+.DS_Store
diff --git a/provisioning/roles/geerlingguy.memcached/.travis.yml b/provisioning/roles/geerlingguy.memcached/.travis.yml
new file mode 100644
index 000000000..3f9719b3b
--- /dev/null
+++ b/provisioning/roles/geerlingguy.memcached/.travis.yml
@@ -0,0 +1,34 @@
+---
+language: python
+python: "2.7"
+
+env:
+  - SITE=test.yml
+
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -y curl
+
+install:
+  # Install Ansible.
+  - pip install ansible
+
+  # Add ansible.cfg to pick up roles path.
+  - "{ echo '[defaults]'; echo 'roles_path = ../'; } >> ansible.cfg"
+
+script:
+  # Check the role/playbook's syntax.
+  - "ansible-playbook -i tests/inventory tests/$SITE --syntax-check"
+
+  # Run the role/playbook with ansible-playbook.
+  - "ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo"
+
+  # Run the role/playbook again, checking to make sure it's idempotent.
+  - >
+    ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo
+    | grep -q 'changed=0.*failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)
+
+  # Check the version of Memcached (if this output fails, it's not running).
+  - memcached -h | head -1
diff --git a/provisioning/roles/geerlingguy.memcached/README.md b/provisioning/roles/geerlingguy.memcached/README.md
new file mode 100644
index 000000000..79af09a0c
--- /dev/null
+++ b/provisioning/roles/geerlingguy.memcached/README.md
@@ -0,0 +1,53 @@
+# Ansible Role: Memcached
+
+[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-memcached.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-memcached)
+
+An Ansible Role that installs Memcached on RedHat/CentOS or Debian/Ubuntu Linux.
+
+## Requirements
+
+None.
+
+## Role Variables
+
+Available variables are listed below, along with default values (see `defaults/main.yml`):
+
+    memcached_user: memcache
+
+The user under which the Memcached daemon will run.
+
+    memcached_port: 11211
+    memcached_listen_ip: 127.0.0.1
+
+The port and IP address (127.0.0.1 for localhost) on which Memcached will listen for requests.
+
+    memcached_memory_limit: 64
+    memcached_connections: 1024
+
+Memcached limits. The maximum amount of RAM `memcached` will consume (64MB is the default), and the maximum number of simultaneous connections memcached will handle.
+
+    memcached_log_file: /var/log/memcached.log
+
+The location of the memcached log file.
+
+    memcached_log_verbosity: ""
+
+Normally memcached does not log anything. Change to "-v" to enable logging or to "-vv" for debug logging.
+
+## Dependencies
+
+None.
+
+## Example Playbook
+
+    - hosts: cache
+      roles:
+        - { role: geerlingguy.memcached }
+
+## License
+
+MIT / BSD
+
+## Author Information
+
+This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.memcached/defaults/main.yml b/provisioning/roles/geerlingguy.memcached/defaults/main.yml
new file mode 100644
index 000000000..9f4768446
--- /dev/null
+++ b/provisioning/roles/geerlingguy.memcached/defaults/main.yml
@@ -0,0 +1,9 @@
+---
+memcached_port: 11211
+memcached_listen_ip: 127.0.0.1
+
+memcached_memory_limit: 64
+memcached_connections: 1024
+
+memcached_log_file: /var/log/memcached.log
+memcached_log_verbosity: ""
diff --git a/provisioning/roles/geerlingguy.memcached/handlers/main.yml b/provisioning/roles/geerlingguy.memcached/handlers/main.yml
new file mode 100644
index 000000000..9aaea02cb
--- /dev/null
+++ b/provisioning/roles/geerlingguy.memcached/handlers/main.yml
@@ -0,0 +1,3 @@
+---
+- name: restart memcached
+  service: name=memcached state=restarted
diff --git a/provisioning/roles/geerlingguy.memcached/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.memcached/meta/.galaxy_install_info
new file mode 100644
index 000000000..19a1059f6
--- /dev/null
+++ b/provisioning/roles/geerlingguy.memcached/meta/.galaxy_install_info
@@ -0,0 +1 @@
+{install_date: 'Fri Jul 15 19:49:12 2016', version: 1.0.4}
diff --git a/provisioning/roles/geerlingguy.memcached/meta/main.yml b/provisioning/roles/geerlingguy.memcached/meta/main.yml
new file mode 100644
index 000000000..876bbbc8f
--- /dev/null
+++ b/provisioning/roles/geerlingguy.memcached/meta/main.yml
@@ -0,0 +1,24 @@
+---
+dependencies: []
+
+galaxy_info:
+  author: geerlingguy
+  description: Memcached for Linux
+  company: "Midwestern Mac, LLC"
+  license: "license (BSD, MIT)"
+  min_ansible_version: 1.4
+  platforms:
+  - name: EL
+    versions:
+    - 6
+    - 7
+  - name: Ubuntu
+    versions:
+    - precise
+    - trusty
+  - name: Debian
+    versions:
+    - all
+  categories:
+    - web
+    - database
diff --git a/provisioning/roles/geerlingguy.memcached/tasks/main.yml b/provisioning/roles/geerlingguy.memcached/tasks/main.yml
new file mode 100644
index 000000000..2aa71cf0a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.memcached/tasks/main.yml
@@ -0,0 +1,29 @@
+---
+# Include variables and define needed variables.
+- name: Include OS-specific variables.
+  include_vars: "{{ ansible_os_family }}.yml"
+
+- name: Define memcached_user.
+  set_fact:
+    memcached_user: "{{ __memcached_user }}"
+  when: memcached_user is not defined
+
+# Setup/install tasks.
+- include: setup-RedHat.yml
+  when: ansible_os_family == 'RedHat'
+
+- include: setup-Debian.yml
+  when: ansible_os_family == 'Debian'
+
+# Configure Memcached.
+- name: Copy Memcached configuration.
+  template:
+    src: memcached-{{ ansible_os_family }}.conf.j2
+    dest: "{{ memcached_config_file }}"
+    owner: root
+    group: root
+    mode: 0644
+  notify: restart memcached
+
+- name: Ensure Memcached is started and set to run on startup.
+  service: name=memcached state=started enabled=yes
diff --git a/provisioning/roles/geerlingguy.memcached/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.memcached/tasks/setup-Debian.yml
new file mode 100644
index 000000000..2a5b4145b
--- /dev/null
+++ b/provisioning/roles/geerlingguy.memcached/tasks/setup-Debian.yml
@@ -0,0 +1,6 @@
+---
+- name: Update apt cache.
+  apt: update_cache=yes cache_valid_time=86400
+
+- name: Install Memcached.
+  apt: name=memcached state=installed
diff --git a/provisioning/roles/geerlingguy.memcached/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.memcached/tasks/setup-RedHat.yml
new file mode 100644
index 000000000..461cc3538
--- /dev/null
+++ b/provisioning/roles/geerlingguy.memcached/tasks/setup-RedHat.yml
@@ -0,0 +1,3 @@
+---
+- name: Install Memcached.
+  yum: name=memcached state=installed
diff --git a/provisioning/roles/geerlingguy.memcached/templates/memcached-Debian.conf.j2 b/provisioning/roles/geerlingguy.memcached/templates/memcached-Debian.conf.j2
new file mode 100644
index 000000000..25f0aacdf
--- /dev/null
+++ b/provisioning/roles/geerlingguy.memcached/templates/memcached-Debian.conf.j2
@@ -0,0 +1,27 @@
+# Run memcached as a daemon. This command is implied, and is not needed for the
+# daemon to run.
+-d
+
+# Log memcached's output to /var/log/memcached
+logfile {{ memcached_log_file }}
+{{ memcached_log_verbosity }}
+
+# Start with a cap of 64 megs of memory. It's reasonable, and the daemon default
+# Note that the daemon will grow to this size, but does not start out holding this much
+# memory
+-m {{ memcached_memory_limit }}
+
+# Default connection port is 11211
+-p {{ memcached_port }}
+
+# Run the daemon as root. The start-memcached will default to running as root if no
+# -u command is present in this config file
+-u {{ memcached_user }}
+
+# Specify which IP address to listen on. The default is to listen on all IP addresses
+# This parameter is one of the only security measures that memcached has, so make sure
+# it's listening on a firewalled interface.
+-l {{ memcached_listen_ip }}
+
+# Limit the number of simultaneous incoming connections. The daemon default is 1024
+-c {{ memcached_connections }}
diff --git a/provisioning/roles/geerlingguy.memcached/templates/memcached-RedHat.conf.j2 b/provisioning/roles/geerlingguy.memcached/templates/memcached-RedHat.conf.j2
new file mode 100644
index 000000000..e57d425a4
--- /dev/null
+++ b/provisioning/roles/geerlingguy.memcached/templates/memcached-RedHat.conf.j2
@@ -0,0 +1,19 @@
+# Default connection port is 11211
+PORT="{{ memcached_port }}"
+
+# The user to run memcached as.
+USER="{{ memcached_user }}"
+
+# Limit the number of simultaneous incoming connections. The daemon default is 1024.
+MAXCONN="{{ memcached_connections }}"
+
+# Start with a cap of 64 megs of memory. It's reasonable, and the daemon default
+# Note that the daemon will grow to this size, but does not start out holding this much
+# memory
+CACHESIZE="{{ memcached_memory_limit }}"
+
+# Extra options:
+# -l Specify which IP address to listen on. The default is to listen on all IP addresses
+#    This parameter is one of the only security measures that memcached has, so make sure
+#    it's listening on a firewalled interface.
+OPTIONS="-l {{ memcached_listen_ip }} {{ memcached_log_verbosity }} >> {{ memcached_log_file }} 2>&1"
diff --git a/provisioning/roles/geerlingguy.memcached/tests/inventory b/provisioning/roles/geerlingguy.memcached/tests/inventory
new file mode 100644
index 000000000..2fbb50c4a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.memcached/tests/inventory
@@ -0,0 +1 @@
+localhost
diff --git a/provisioning/roles/geerlingguy.memcached/tests/test.yml b/provisioning/roles/geerlingguy.memcached/tests/test.yml
new file mode 100644
index 000000000..cc7aee226
--- /dev/null
+++ b/provisioning/roles/geerlingguy.memcached/tests/test.yml
@@ -0,0 +1,5 @@
+---
+- hosts: localhost
+  remote_user: root
+  roles:
+    - ansible-role-memcached
diff --git a/provisioning/roles/geerlingguy.memcached/vars/Debian.yml b/provisioning/roles/geerlingguy.memcached/vars/Debian.yml
new file mode 100644
index 000000000..6167345d3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.memcached/vars/Debian.yml
@@ -0,0 +1,3 @@
+---
+__memcached_user: memcache
+memcached_config_file: /etc/memcached.conf
diff --git a/provisioning/roles/geerlingguy.memcached/vars/RedHat.yml b/provisioning/roles/geerlingguy.memcached/vars/RedHat.yml
new file mode 100644
index 000000000..520ab013e
--- /dev/null
+++ b/provisioning/roles/geerlingguy.memcached/vars/RedHat.yml
@@ -0,0 +1,3 @@
+---
+__memcached_user: memcached
+memcached_config_file: /etc/sysconfig/memcached
diff --git a/provisioning/roles/geerlingguy.mysql/.travis.yml b/provisioning/roles/geerlingguy.mysql/.travis.yml
new file mode 100644
index 000000000..24c1c0910
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/.travis.yml
@@ -0,0 +1,78 @@
+---
+sudo: required
+
+env:
+  - distribution: centos
+    version: 6
+    init: /sbin/init
+    run_opts: ""
+    playbook: test.yml
+  - distribution: centos
+    version: 7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    playbook: centos-7-test.yml
+  - distribution: ubuntu
+    version: 14.04
+    init: /sbin/init
+    run_opts: ""
+    playbook: test.yml
+  # - distribution: ubuntu
+  #   version: 12.04
+  #   init: /sbin/init
+  #   run_opts: ""
+  #   playbook: test.yml
+
+services:
+  - docker
+
+before_install:
+  # Pull container
+  - 'sudo docker pull ${distribution}:${version}'
+  # Customize container
+  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+
+script:
+  - container_id=$(mktemp)
+    # Run container in detached state
+  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+
+  # Ansible syntax check.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} --syntax-check'
+
+  # Test role.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook}'
+
+  # Test role idempotence.
+  - idempotence=$(mktemp)
+  - sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} | tee -a ${idempotence}
+  - >
+    tail ${idempotence}
+    | grep -q 'changed=0.*failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)
+
+  # Some MySQL debugging (show all the logs).
+  - sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ls -lah /var/log
+  - sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm cat /var/log/mysql/error.log || true
+  - sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm cat /var/log/mysql.err || true
+
+  # Check to make sure we can connect to MySQL via Unix socket.
+  - >
+    sudo docker exec "$(cat ${container_id})" mysql -u root -proot -e 'show databases;'
+    | grep -q 'information_schema'
+    && (echo 'MySQL running normally' && exit 0)
+    || (echo 'MySQL not running' && exit 1)
+
+  # Check to make sure we can connect to MySQL via TCP.
+  - >
+    sudo docker exec "$(cat ${container_id})" mysql -u root -proot -h 127.0.0.1 -e 'show databases;'
+    | grep -q 'information_schema'
+    && (echo 'MySQL running normally' && exit 0)
+    || (echo 'MySQL not running' && exit 1)
+
+  # Clean up
+  - sudo docker stop "$(cat ${container_id})"
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.mysql/README.md b/provisioning/roles/geerlingguy.mysql/README.md
new file mode 100644
index 000000000..3218d1888
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/README.md
@@ -0,0 +1,144 @@
+# Ansible Role: MySQL
+
+[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-mysql.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-mysql)
+
+Installs and configures MySQL or MariaDB server on RHEL/CentOS or Debian/Ubuntu servers.
+
+## Requirements
+
+No special requirements; note that this role requires root access, so either run it in a playbook with a global `become: yes`, or invoke the role in your playbook like:
+
+    - hosts: database
+      roles:
+        - role: geerlingguy.mysql
+          become: yes
+
+## Role Variables
+
+Available variables are listed below, along with default values (see `defaults/main.yml`):
+
+    mysql_user_home: /root
+
+The home directory inside which Python MySQL settings will be stored, which Ansible will use when connecting to MySQL. This should be the home directory of the user which runs this Ansible role.
+
+    mysql_root_password: root
+
+The MySQL root user account password.
+
+    mysql_root_password_update: no
+
+Whether to force update the MySQL root user's password. By default, this role will only change the root user's password when MySQL is first configured. You can force an update by setting this to `yes`.
+
+> Note: If you get an error like `ERROR 1045 (28000): Access denied for user 'root'@'localhost' (using password: YES)` after a failed or interrupted playbook run, this usually means the root password wasn't originally updated to begin with. Try either removing  the `.my.cnf` file inside the configured `mysql_user_home` or updating it and setting `password=''` (the insecure default password). Run the playbook again, with `mysql_root_password_update` set to `yes`, and the setup should complete.
+
+    mysql_enabled_on_startup: yes
+
+Whether MySQL should be enabled on startup.
+
+    overwrite_global_mycnf: yes
+
+Whether the global my.cnf should be overwritten each time this role is run. Setting this to `no` tells Ansible to only create the `my.cnf` file if it doesn't exist. This should be left at its default value (`yes`) if you'd like to use this role's variables to configure MySQL.
+
+    mysql_config_include_files: []
+
+A list of files that should override the default global my.cnf. Each item in the array requires a "src" parameter which is a path to a file. An optional "force" parameter can force the file to be updated each time ansible runs.
+
+    mysql_databases: []
+
+The MySQL databases to create. A database has the values `name`, `encoding` (defaults to `utf8`), `collation` (defaults to `utf8_general_ci`) and `replicate` (defaults to `1`, only used if replication is configured). The formats of these are the same as in the `mysql_db` module.
+
+    mysql_users: []
+
+The MySQL users and their privileges. A user has the values `name`, `host` (defaults to `localhost`), `password`, `priv` (defaults to `*.*:USAGE`), `append_privs` (defaults to `no`),  `state`  (defaults to `present`). The formats of these are the same as in the `mysql_user` module.
+
+    mysql_packages:
+      - mysql
+      - mysql-server
+
+(OS-specific, RedHat/CentOS defaults listed here) Packages to be installed. In some situations, you may need to add additional packages, like `mysql-devel`.
+
+    mysql_enablerepo: ""
+
+(RedHat/CentOS only) If you have enabled any additional repositories (might I suggest geerlingguy.repo-epel or geerlingguy.repo-remi), those repositories can be listed under this variable (e.g. `remi,epel`). This can be handy, as an example, if you want to install later versions of MySQL.
+
+    mysql_port: "3306"
+    mysql_bind_address: '0.0.0.0'
+    mysql_datadir: /var/lib/mysql
+
+Default MySQL connection configuration.
+
+    mysql_log: ""
+    mysql_log_error: /var/log/mysqld.log
+    mysql_syslog_tag: mysqld
+
+MySQL logging configuration. Setting `mysql_log` (the general query log) or `mysql_log_error` to `syslog` will make MySQL log to syslog using the `mysql_syslog_tag`.
+
+    mysql_slow_query_log_enabled: no
+    mysql_slow_query_log_file: /var/log/mysql-slow.log
+    mysql_slow_query_time: 2
+
+Slow query log settings. Note that the log file will be created by this role, but if you're running on a server with SELinux or AppArmor, you may need to add this path to the allowed paths for MySQL, or disable the mysql profile. For example, on Debian/Ubuntu, you can run `sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/usr.sbin.mysqld && sudo service apparmor restart`.
+
+    mysql_key_buffer_size: "256M"
+    mysql_max_allowed_packet: "64M"
+    mysql_table_open_cache: "256"
+    [...]
+
+The rest of the settings in `defaults/main.yml` control MySQL's memory usage and some other common settings. The default values are tuned for a server where MySQL can consume ~512 MB RAM, so you should consider adjusting them to suit your particular server better.
+
+    mysql_server_id: "1"
+    mysql_max_binlog_size: "100M"
+    mysql_binlog_format: "ROW"
+    mysql_expire_logs_days: "10"
+    mysql_replication_role: ''
+    mysql_replication_master: ''
+    mysql_replication_user: []
+
+Replication settings. Set `mysql_server_id` and `mysql_replication_role` by server (e.g. the master would be ID `1`, with the `mysql_replication_role` of `master`, and the slave would be ID `2`, with the `mysql_replication_role` of `slave`). The `mysql_replication_user` uses the same keys as `mysql_users`, and is created on master servers, and used to replicate on all the slaves.
+
+### MariaDB usage
+
+This role works with either MySQL or a compatible version of MariaDB. On RHEL/CentOS 7+, the mariadb database engine was substituted as the default MySQL replacement package. No modifications are necessary though all of the variables still reference 'mysql' instead of mariadb.
+
+#### Ubuntu 14.04 and 16.04 MariaDB configuration
+
+On Ubuntu, the package names are named differently, so the `mysql_package` variable needs to be altered. Set the following variables (at a minimum):
+
+    mysql_packages:
+      - mariadb-client
+      - mariadb-server
+      - python-mysqldb
+
+## Dependencies
+
+None.
+
+## Example Playbook
+
+    - hosts: db-servers
+      become: yes
+      vars_files:
+        - vars/main.yml
+      roles:
+        - { role: geerlingguy.mysql }
+
+*Inside `vars/main.yml`*:
+
+    mysql_root_password: super-secure-password
+    mysql_databases:
+      - name: example_db
+        encoding: latin1
+        collation: latin1_general_ci
+    mysql_users:
+      - name: example_user
+        host: "%"
+        password: similarly-secure-password
+        priv: "example_db.*:ALL"
+
+## License
+
+MIT / BSD
+
+## Author Information
+
+This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.mysql/defaults/main.yml b/provisioning/roles/geerlingguy.mysql/defaults/main.yml
new file mode 100644
index 000000000..7f25f14f3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/defaults/main.yml
@@ -0,0 +1,101 @@
+---
+mysql_user_home: /root
+mysql_root_username: root
+mysql_root_password: root
+
+# Set this to `yes` to forcibly update the root password.
+mysql_root_password_update: no
+
+mysql_enabled_on_startup: yes
+
+# update my.cnf. each time role is run? yes | no
+overwrite_global_mycnf: yes
+
+# Pass in a comma-separated list of repos to use (e.g. "remi,epel"). Used only
+# for RedHat systems (and derivatives).
+mysql_enablerepo: ""
+
+# Define a custom list of packages to install; if none provided, the default
+# package list from vars/[OS-family].yml will be used.
+# mysql_packages:
+#   - mysql
+#   - mysql-server
+#   - MySQL-python
+
+# MySQL connection settings.
+mysql_port: "3306"
+mysql_bind_address: '0.0.0.0'
+mysql_datadir: /var/lib/mysql
+mysql_pid_file: /var/run/mysqld/mysqld.pid
+mysql_skip_name_resolve: no
+
+# Slow query log settings.
+mysql_slow_query_log_enabled: no
+mysql_slow_query_log_file: /var/log/mysql-slow.log
+mysql_slow_query_time: "2"
+
+# Memory settings (default values optimized ~512MB RAM).
+mysql_key_buffer_size: "256M"
+mysql_max_allowed_packet: "64M"
+mysql_table_open_cache: "256"
+mysql_sort_buffer_size: "1M"
+mysql_read_buffer_size: "1M"
+mysql_read_rnd_buffer_size: "4M"
+mysql_myisam_sort_buffer_size: "64M"
+mysql_thread_cache_size: "8"
+mysql_query_cache_size: "16M"
+mysql_max_connections: "151"
+
+# Other settings.
+mysql_lower_case_table_names: "0"
+mysql_wait_timeout: "28800"
+
+# InnoDB settings.
+mysql_innodb_file_per_table: "1"
+# Set .._buffer_pool_size up to 80% of RAM but beware of setting too high.
+mysql_innodb_buffer_pool_size: "256M"
+# Set .._log_file_size to 25% of buffer pool size.
+mysql_innodb_log_file_size: "64M"
+mysql_innodb_log_buffer_size: "8M"
+mysql_innodb_flush_log_at_trx_commit: "1"
+mysql_innodb_lock_wait_timeout: "50"
+
+# These settings require MySQL > 5.5.
+mysql_innodb_large_prefix: "1"
+mysql_innodb_file_format: "barracuda"
+
+# mysqldump settings.
+mysql_mysqldump_max_allowed_packet: "64M"
+
+# Logging settings.
+mysql_log: ""
+mysql_log_error: /var/log/mysql.err
+mysql_syslog_tag: mysql
+
+mysql_config_include_files: []
+#  - src: path/relative/to/playbook/file.cnf
+#  - { src: path/relative/to/playbook/anotherfile.cnf, force: yes }
+
+# Databases.
+mysql_databases: []
+#   - name: example
+#     collation: utf8_general_ci
+#     encoding: utf8
+#     replicate: 1
+
+# Users.
+mysql_users: []
+#   - name: example
+#     host: 127.0.0.1
+#     password: secret
+#     priv: *.*:USAGE
+
+# Replication settings (replication is only enabled if master/user have values).
+mysql_server_id: "1"
+mysql_max_binlog_size: "100M"
+mysql_binlog_format: "ROW"
+mysql_expire_logs_days: "10"
+mysql_replication_role: ''
+mysql_replication_master: ''
+# Same keys as `mysql_users` above.
+mysql_replication_user: []
diff --git a/provisioning/roles/geerlingguy.mysql/handlers/main.yml b/provisioning/roles/geerlingguy.mysql/handlers/main.yml
new file mode 100644
index 000000000..429abe31b
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/handlers/main.yml
@@ -0,0 +1,3 @@
+---
+- name: restart mysql
+  service: "name={{ mysql_daemon }} state=restarted sleep=5"
diff --git a/provisioning/roles/geerlingguy.mysql/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.mysql/meta/.galaxy_install_info
new file mode 100644
index 000000000..272443920
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/meta/.galaxy_install_info
@@ -0,0 +1 @@
+{install_date: 'Fri Jul 15 19:49:15 2016', version: 2.3.0}
diff --git a/provisioning/roles/geerlingguy.mysql/meta/main.yml b/provisioning/roles/geerlingguy.mysql/meta/main.yml
new file mode 100644
index 000000000..0432274a6
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/meta/main.yml
@@ -0,0 +1,22 @@
+---
+dependencies: []
+
+galaxy_info:
+  author: geerlingguy
+  description: MySQL server for RHEL/CentOS and Debian/Ubuntu.
+  company: "Midwestern Mac, LLC"
+  license: "license (BSD, MIT)"
+  min_ansible_version: 1.9
+  platforms:
+    - name: EL
+      versions:
+      - 6
+      - 7
+    - name: Ubuntu
+      versions:
+      - all
+    - name: Debian
+      versions:
+      - all
+  galaxy_tags:
+    - database
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/configure.yml b/provisioning/roles/geerlingguy.mysql/tasks/configure.yml
new file mode 100644
index 000000000..d8a458574
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/tasks/configure.yml
@@ -0,0 +1,69 @@
+---
+- name: Copy my.cnf global MySQL configuration.
+  template:
+    src: my.cnf.j2
+    dest: "{{ mysql_config_file }}"
+    owner: root
+    group: root
+    mode: 0644
+    force: "{{ overwrite_global_mycnf }}"
+  notify: restart mysql
+
+- name: Verify mysql include directory exists.
+  file:
+    path: "{{ mysql_config_include_dir }}"
+    state: directory
+    owner: root
+    group: root
+    mode: 0755
+  when: mysql_config_include_files | length
+
+- name: Copy my.cnf override files into include directory.
+  template:
+    src: "{{ item.src }}"
+    dest: "{{ mysql_config_include_dir }}/{{ item.src | basename }}"
+    owner: root
+    group: root
+    mode: 0644
+    force: "{{ item.force | default(False) }}"
+  with_items: "{{ mysql_config_include_files }}"
+  notify: restart mysql
+
+- name: Create slow query log file (if configured).
+  shell: "touch {{ mysql_slow_query_log_file }} creates={{ mysql_slow_query_log_file }}"
+  when: mysql_slow_query_log_enabled
+
+- name: Create datadir if it does not exist
+  file:
+    path: "{{ mysql_datadir }}"
+    state: directory
+    owner: mysql
+    group: mysql
+    mode:  0755
+    setype: mysqld_db_t
+
+- name: Set ownership on slow query log file (if configured).
+  file:
+    path: "{{ mysql_slow_query_log_file }}"
+    state: file
+    owner: mysql
+    group: mysql
+    mode: 0640
+  when: mysql_slow_query_log_enabled
+
+- name: Create error log file (if configured).
+  shell: "touch {{ mysql_log_error }} creates={{ mysql_log_error }}"
+  when: mysql_log == "" and mysql_log_error != ""
+
+- name: Set ownership on error log file (if configured).
+  file:
+    path: "{{ mysql_log_error }}"
+    state: file
+    owner: mysql
+    group: mysql
+    mode: 0640
+  when: mysql_log == "" and mysql_log_error != ""
+
+- name: Ensure MySQL is started and enabled on boot.
+  service: "name={{ mysql_daemon }} state=started enabled={{ mysql_enabled_on_startup }}"
+  register: mysql_service_configuration
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/databases.yml b/provisioning/roles/geerlingguy.mysql/tasks/databases.yml
new file mode 100644
index 000000000..681e51501
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/tasks/databases.yml
@@ -0,0 +1,8 @@
+---
+- name: Ensure MySQL databases are present.
+  mysql_db:
+    name: "{{ item.name }}"
+    collation: "{{ item.collation | default('utf8_general_ci') }}"
+    encoding: "{{ item.encoding | default('utf8') }}"
+    state: present
+  with_items: "{{ mysql_databases }}"
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/main.yml b/provisioning/roles/geerlingguy.mysql/tasks/main.yml
new file mode 100644
index 000000000..627d917ee
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/tasks/main.yml
@@ -0,0 +1,42 @@
+---
+# Variable configuration.
+- name: Include OS-specific variables.
+  include_vars: "{{ ansible_os_family }}.yml"
+  when: ansible_os_family != "RedHat"
+
+- name: Include OS-specific variables (RedHat).
+  include_vars: "{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml"
+  when: ansible_os_family == "RedHat"
+
+- name: Define mysql_packages.
+  set_fact:
+    mysql_packages: "{{ __mysql_packages | list }}"
+  when: mysql_packages is not defined
+
+- name: Define mysql_daemon.
+  set_fact:
+    mysql_daemon: "{{ __mysql_daemon }}"
+  when: mysql_daemon is not defined
+
+- name: Define mysql_slow_query_log_file.
+  set_fact:
+    mysql_slow_query_log_file: "{{ __mysql_slow_query_log_file }}"
+  when: mysql_slow_query_log_file is not defined
+
+# Setup/install tasks.
+- include: setup-RedHat.yml
+  when: ansible_os_family == 'RedHat'
+
+- include: setup-Debian.yml
+  when: ansible_os_family == 'Debian'
+
+- name: Check if MySQL packages were installed.
+  set_fact:
+    mysql_install_packages: "{{ (rh_mysql_install_packages is defined and rh_mysql_install_packages.changed) or (deb_mysql_install_packages is defined and deb_mysql_install_packages.changed) }}"
+
+# Configure MySQL.
+- include: configure.yml
+- include: secure-installation.yml
+- include: databases.yml
+- include: users.yml
+- include: replication.yml
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/replication.yml b/provisioning/roles/geerlingguy.mysql/tasks/replication.yml
new file mode 100644
index 000000000..ec56dfc29
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/tasks/replication.yml
@@ -0,0 +1,51 @@
+---
+- name: Ensure replication user exists on master.
+  mysql_user:
+    name: "{{ mysql_replication_user.name }}"
+    host: "{{ mysql_replication_user.host | default('%') }}"
+    password: "{{ mysql_replication_user.password }}"
+    priv: "{{ mysql_replication_user.priv | default('*.*:REPLICATION SLAVE') }}"
+    state: present
+  when: >
+    (mysql_replication_role == 'master')
+    and mysql_replication_user
+    and (mysql_replication_master != '')
+
+- name: Check slave replication status.
+  mysql_replication: mode=getslave
+  ignore_errors: true
+  register: slave
+  when: >
+    mysql_replication_role == 'slave'
+    and (mysql_replication_master != '')
+
+- name: Check master replication status.
+  mysql_replication: mode=getmaster
+  delegate_to: "{{ mysql_replication_master }}"
+  register: master
+  when: >
+    slave|failed
+    and (mysql_replication_role == 'slave')
+    and (mysql_replication_master != '')
+
+- name: Configure replication on the slave.
+  mysql_replication:
+    mode: changemaster
+    master_host: "{{ mysql_replication_master }}"
+    master_user: "{{ mysql_replication_user.name }}"
+    master_password: "{{ mysql_replication_user.password }}"
+    master_log_file: "{{ master.File }}"
+    master_log_pos: "{{ master.Position }}"
+  ignore_errors: True
+  when: >
+    slave|failed
+    and (mysql_replication_role == 'slave')
+    and (mysql_replication_master != '')
+    and mysql_replication_user
+
+- name: Start replication.
+  mysql_replication: mode=startslave
+  when: >
+    slave|failed
+    and (mysql_replication_role == 'slave')
+    and (mysql_replication_master != '')
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/secure-installation.yml b/provisioning/roles/geerlingguy.mysql/tasks/secure-installation.yml
new file mode 100644
index 000000000..db4a8edeb
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/tasks/secure-installation.yml
@@ -0,0 +1,60 @@
+---
+- name: Get MySQL version.
+  command: 'mysql --version'
+  register: mysql_cli_version
+  changed_when: false
+
+- name: Disallow root login remotely
+  command: 'mysql -NBe "{{ item }}"'
+  with_items:
+    - DELETE FROM mysql.user WHERE User='root' AND Host NOT IN ('localhost', '127.0.0.1', '::1')
+  changed_when: false
+
+- name: Get list of hosts for the root user.
+  command: mysql -NBe 'SELECT Host FROM mysql.user WHERE User = "root" ORDER BY (Host="localhost") ASC'
+  register: mysql_root_hosts
+  changed_when: false
+  always_run: true
+
+# Note: We do not use mysql_user for this operation, as it doesn't always update
+# the root password correctly. See: https://goo.gl/MSOejW
+# Set root password for MySQL >= 5.7.x.
+- name: Update MySQL root password for localhost root account (5.7.x).
+  shell: >
+    mysql -u root -NBe
+    'ALTER USER "{{ mysql_root_username }}"@"{{ item }}" IDENTIFIED WITH mysql_native_password BY "{{ mysql_root_password }}";'
+  with_items: "{{ mysql_root_hosts.stdout_lines }}"
+  when: ((mysql_install_packages | bool) or mysql_root_password_update) and ('5.7.' in mysql_cli_version.stdout)
+
+# Set root password for MySQL < 5.7.x.
+- name: Update MySQL root password for localhost root account (< 5.7.x).
+  shell: >
+    mysql -u root -NBe
+    'SET PASSWORD FOR "{{ mysql_root_username }}"@"{{ item }}" = PASSWORD("{{ mysql_root_password }}");'
+  with_items: "{{ mysql_root_hosts.stdout_lines }}"
+  when: ((mysql_install_packages | bool) or mysql_root_password_update) and ('5.7.' not in mysql_cli_version.stdout)
+
+# Has to be after the root password assignment, for idempotency.
+- name: Copy .my.cnf file with root password credentials.
+  template:
+    src: "user-my.cnf.j2"
+    dest: "{{ mysql_user_home }}/.my.cnf"
+    owner: root
+    group: root
+    mode: 0600
+
+- name: Get list of hosts for the anonymous user.
+  command: mysql -NBe 'SELECT Host FROM mysql.user WHERE User = ""'
+  register: mysql_anonymous_hosts
+  changed_when: false
+  always_run: true
+
+- name: Remove anonymous MySQL users.
+  mysql_user:
+     name: ""
+     host: "{{ item }}"
+     state: absent
+  with_items: "{{ mysql_anonymous_hosts.stdout_lines }}"
+
+- name: Remove MySQL test database.
+  mysql_db: "name='test' state=absent"
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.mysql/tasks/setup-Debian.yml
new file mode 100644
index 000000000..85770f2a8
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/tasks/setup-Debian.yml
@@ -0,0 +1,29 @@
+---
+- name: Check if MySQL is already installed.
+  stat: path=/etc/init.d/mysql
+  register: mysql_installed
+
+- name: Update apt cache if MySQL is not yet installed.
+  apt: update_cache=yes
+  when: mysql_installed.stat.exists == false
+
+- name: Ensure MySQL Python libraries are installed.
+  apt: "name=python-mysqldb state=installed"
+
+- name: Ensure MySQL packages are installed.
+  apt: "name={{ item }} state=installed"
+  with_items: "{{ mysql_packages }}"
+  register: deb_mysql_install_packages
+
+# Because Ubuntu starts MySQL as part of the install process, we need to stop
+# mysql and remove the logfiles in case the user set a custom log file size.
+- name: Ensure MySQL is stopped after initial install.
+  service: "name={{ mysql_daemon }} state=stopped"
+  when: mysql_installed.stat.exists == false
+
+- name: Delete innodb log files created by apt package after initial install.
+  file: path={{ mysql_datadir }}/{{item}} state=absent
+  with_items:
+          - "ib_logfile0"
+          - "ib_logfile1"
+  when: mysql_installed.stat.exists == false
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.mysql/tasks/setup-RedHat.yml
new file mode 100644
index 000000000..fc05bee62
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/tasks/setup-RedHat.yml
@@ -0,0 +1,8 @@
+---
+- name: Ensure MySQL packages are installed.
+  yum: "name={{ item }} state=installed enablerepo={{ mysql_enablerepo }}"
+  with_items: "{{ mysql_packages }}"
+  register: rh_mysql_install_packages
+
+- name: Ensure MySQL Python libraries are installed.
+  yum: "name=MySQL-python state=installed enablerepo={{ mysql_enablerepo }}"
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/users.yml b/provisioning/roles/geerlingguy.mysql/tasks/users.yml
new file mode 100644
index 000000000..6c41ce770
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/tasks/users.yml
@@ -0,0 +1,11 @@
+---
+- name: Ensure MySQL users are present.
+  mysql_user:
+    name: "{{ item.name }}"
+    host: "{{ item.host | default('localhost') }}"
+    password: "{{ item.password }}"
+    priv: "{{ item.priv | default('*.*:USAGE') }}"
+    state: "{{ item.state | default('present') }}"
+    append_privs: "{{ item.append_privs | default('no') }}"
+  with_items: "{{ mysql_users }}"
+  no_log: true
diff --git a/provisioning/roles/geerlingguy.mysql/templates/my.cnf.j2 b/provisioning/roles/geerlingguy.mysql/templates/my.cnf.j2
new file mode 100644
index 000000000..c16a91d3a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/templates/my.cnf.j2
@@ -0,0 +1,111 @@
+[client]
+#password = your_password
+port = {{ mysql_port }}
+socket = {{ mysql_socket }}
+
+[mysqld]
+port = {{ mysql_port }}
+bind-address = {{ mysql_bind_address }}
+datadir = {{ mysql_datadir }}
+socket = {{ mysql_socket }}
+pid-file = {{ mysql_pid_file }}
+{% if mysql_skip_name_resolve %}
+skip-name-resolve
+{% endif %}
+
+# Logging configuration.
+{% if mysql_log_error == 'syslog' or mysql_log == 'syslog' %}
+syslog
+syslog-tag = {{ mysql_syslog_tag }}
+{% else %}
+{% if mysql_log %}
+log = {{ mysql_log }}
+{% endif %}
+log-error = {{ mysql_log_error }}
+{% endif %}
+
+{% if mysql_slow_query_log_enabled %}
+# Slow query log configuration.
+slow_query_log = 1
+slow_query_log_file = {{ mysql_slow_query_log_file }}
+long_query_time = {{ mysql_slow_query_time }}
+{% endif %}
+
+{% if mysql_replication_master %}
+# Replication
+server-id = {{ mysql_server_id }}
+
+{% if mysql_replication_role == 'master' %}
+log_bin = mysql-bin
+log-bin-index = mysql-bin.index
+expire_logs_days = {{ mysql_expire_logs_days }}
+max_binlog_size = {{ mysql_max_binlog_size }}
+binlog_format = {{mysql_binlog_format}}
+
+{% for db in mysql_databases %}
+{% if db.replicate|default(1) %}
+binlog_do_db = {{ db.name }}
+{% else %}
+binlog_ignore_db = {{ db.name }}
+{% endif %}
+{% endfor %}
+{% endif %}
+
+{% if mysql_replication_role == 'slave' %}
+read_only
+relay-log = relay-bin
+relay-log-index = relay-bin.index
+{% endif %}
+{% endif %}
+
+# Disabling symbolic-links is recommended to prevent assorted security risks
+symbolic-links = 0
+
+# User is ignored when systemd is used (fedora >= 15).
+user = mysql
+
+# http://dev.mysql.com/doc/refman/5.5/en/performance-schema.html
+;performance_schema
+
+# Memory settings.
+key_buffer_size = {{ mysql_key_buffer_size }}
+max_allowed_packet = {{ mysql_max_allowed_packet }}
+table_open_cache = {{ mysql_table_open_cache }}
+sort_buffer_size = {{ mysql_sort_buffer_size }}
+read_buffer_size = {{ mysql_read_buffer_size }}
+read_rnd_buffer_size = {{ mysql_read_rnd_buffer_size }}
+myisam_sort_buffer_size = {{ mysql_myisam_sort_buffer_size }}
+thread_cache_size = {{ mysql_thread_cache_size }}
+query_cache_size = {{ mysql_query_cache_size }}
+max_connections = {{ mysql_max_connections }}
+
+# Other settings.
+wait_timeout = {{ mysql_wait_timeout }}
+lower_case_table_names = {{ mysql_lower_case_table_names }}
+
+# InnoDB settings.
+{% if mysql_supports_innodb_large_prefix %}
+innodb_large_prefix = {{ mysql_innodb_large_prefix }}
+innodb_file_format = {{ mysql_innodb_file_format }}
+{% endif %}
+innodb_file_per_table = {{ mysql_innodb_file_per_table }}
+innodb_buffer_pool_size = {{ mysql_innodb_buffer_pool_size }}
+innodb_log_file_size = {{ mysql_innodb_log_file_size }}
+innodb_log_buffer_size = {{ mysql_innodb_log_buffer_size }}
+innodb_flush_log_at_trx_commit = {{ mysql_innodb_flush_log_at_trx_commit }}
+innodb_lock_wait_timeout = {{ mysql_innodb_lock_wait_timeout }}
+
+[mysqldump]
+quick
+max_allowed_packet = {{ mysql_mysqldump_max_allowed_packet }}
+
+[mysqld_safe]
+pid-file = {{ mysql_pid_file }}
+
+{% if mysql_config_include_files | length %}
+# * IMPORTANT: Additional settings that can override those from this file!
+#   The files must end with '.cnf', otherwise they'll be ignored.
+#
+!includedir {{ mysql_config_include_dir }}
+{% endif %}
+
diff --git a/provisioning/roles/geerlingguy.mysql/templates/user-my.cnf.j2 b/provisioning/roles/geerlingguy.mysql/templates/user-my.cnf.j2
new file mode 100644
index 000000000..95cae6622
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/templates/user-my.cnf.j2
@@ -0,0 +1,3 @@
+[client]
+user={{ mysql_root_username }}
+password="{{ mysql_root_password }}"
diff --git a/provisioning/roles/geerlingguy.mysql/tests/Dockerfile.centos-6 b/provisioning/roles/geerlingguy.mysql/tests/Dockerfile.centos-6
new file mode 100644
index 000000000..4a4e7b8d6
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/tests/Dockerfile.centos-6
@@ -0,0 +1,15 @@
+FROM centos:6
+
+# Install Ansible
+RUN yum -y update; yum clean all;
+RUN yum -y install epel-release
+RUN yum -y install git ansible sudo
+RUN yum clean all
+
+# Disable requiretty
+RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
+
+# Install Ansible inventory file
+RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
+
+CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.mysql/tests/Dockerfile.centos-7 b/provisioning/roles/geerlingguy.mysql/tests/Dockerfile.centos-7
new file mode 100644
index 000000000..8aa065497
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/tests/Dockerfile.centos-7
@@ -0,0 +1,27 @@
+FROM centos:7
+
+# Install systemd -- See https://hub.docker.com/_/centos/
+RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
+RUN yum -y update; yum clean all; \
+(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
+rm -f /lib/systemd/system/multi-user.target.wants/*; \
+rm -f /etc/systemd/system/*.wants/*; \
+rm -f /lib/systemd/system/local-fs.target.wants/*; \
+rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
+rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
+rm -f /lib/systemd/system/basic.target.wants/*; \
+rm -f /lib/systemd/system/anaconda.target.wants/*;
+
+# Install Ansible
+RUN yum -y install epel-release
+RUN yum -y install git ansible sudo
+RUN yum clean all
+
+# Disable requiretty
+RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
+
+# Install Ansible inventory file
+RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
+
+VOLUME ["/sys/fs/cgroup"]
+CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.mysql/tests/Dockerfile.ubuntu-12.04 b/provisioning/roles/geerlingguy.mysql/tests/Dockerfile.ubuntu-12.04
new file mode 100644
index 000000000..8aebd6558
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/tests/Dockerfile.ubuntu-12.04
@@ -0,0 +1,14 @@
+FROM ubuntu:12.04
+RUN apt-get update
+
+# Install Ansible
+RUN apt-get install -y software-properties-common python-software-properties git
+RUN apt-add-repository -y ppa:ansible/ansible
+RUN apt-get update
+RUN apt-get install -y ansible
+
+COPY initctl_faker .
+RUN chmod +x initctl_faker && rm -fr /sbin/initctl && ln -s /initctl_faker /sbin/initctl
+
+# Install Ansible inventory file
+RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.mysql/tests/Dockerfile.ubuntu-14.04 b/provisioning/roles/geerlingguy.mysql/tests/Dockerfile.ubuntu-14.04
new file mode 100644
index 000000000..f81cabec6
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/tests/Dockerfile.ubuntu-14.04
@@ -0,0 +1,14 @@
+FROM ubuntu:14.04
+RUN apt-get update
+
+# Install Ansible
+RUN apt-get install -y software-properties-common git
+RUN apt-add-repository -y ppa:ansible/ansible
+RUN apt-get update
+RUN apt-get install -y ansible
+
+COPY initctl_faker .
+RUN chmod +x initctl_faker && rm -fr /sbin/initctl && ln -s /initctl_faker /sbin/initctl
+
+# Install Ansible inventory file
+RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.mysql/tests/centos-7-test.yml b/provisioning/roles/geerlingguy.mysql/tests/centos-7-test.yml
new file mode 100644
index 000000000..57a617147
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/tests/centos-7-test.yml
@@ -0,0 +1,15 @@
+---
+- hosts: all
+  vars:
+    mysql_packages:
+      - mariadb
+      - mariadb-server
+      - mariadb-libs
+      - MySQL-python
+      - perl-DBD-MySQL
+    mysql_daemon: mariadb
+    mysql_log_error: /var/log/mariadb/mariadb.log
+    mysql_syslog_tag: mariadb
+    mysql_pid_file: /var/run/mariadb/mariadb.pid
+  roles:
+    - role_under_test
diff --git a/provisioning/roles/geerlingguy.mysql/tests/initctl_faker b/provisioning/roles/geerlingguy.mysql/tests/initctl_faker
new file mode 100644
index 000000000..a2267f30d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/tests/initctl_faker
@@ -0,0 +1,23 @@
+#!/bin/sh
+ALIAS_CMD="$(echo ""$0"" | sed -e 's?/sbin/??')"
+
+case "$ALIAS_CMD" in
+    start|stop|restart|reload|status)
+        exec service $1 $ALIAS_CMD
+        ;;
+esac
+
+case "$1" in
+    list )
+        exec service --status-all
+        ;;
+    reload-configuration )
+        exec service $2 restart
+        ;;
+    start|stop|restart|reload|status)
+        exec service $2 $1
+        ;;
+    \?)
+        exit 0
+        ;;
+esac
diff --git a/provisioning/roles/geerlingguy.mysql/tests/inventory b/provisioning/roles/geerlingguy.mysql/tests/inventory
new file mode 100644
index 000000000..2fbb50c4a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/tests/inventory
@@ -0,0 +1 @@
+localhost
diff --git a/provisioning/roles/geerlingguy.mysql/tests/test.yml b/provisioning/roles/geerlingguy.mysql/tests/test.yml
new file mode 100644
index 000000000..0ed0b4324
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/tests/test.yml
@@ -0,0 +1,4 @@
+---
+- hosts: all
+  roles:
+    - role_under_test
diff --git a/provisioning/roles/geerlingguy.mysql/vars/Debian.yml b/provisioning/roles/geerlingguy.mysql/vars/Debian.yml
new file mode 100644
index 000000000..e191526e0
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/vars/Debian.yml
@@ -0,0 +1,10 @@
+---
+__mysql_daemon: mysql
+__mysql_packages:
+  - mysql-common
+  - mysql-server
+__mysql_slow_query_log_file: /var/log/mysql/mysql-slow.log
+mysql_config_file: /etc/mysql/my.cnf
+mysql_config_include_dir: /etc/mysql/conf.d
+mysql_socket: /var/run/mysqld/mysqld.sock
+mysql_supports_innodb_large_prefix: false
diff --git a/provisioning/roles/geerlingguy.mysql/vars/RedHat-6.yml b/provisioning/roles/geerlingguy.mysql/vars/RedHat-6.yml
new file mode 100644
index 000000000..2cb7e3827
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/vars/RedHat-6.yml
@@ -0,0 +1,10 @@
+---
+__mysql_daemon: mysqld
+__mysql_packages:
+  - mysql
+  - mysql-server
+__mysql_slow_query_log_file: /var/log/mysql-slow.log
+mysql_config_file: /etc/my.cnf
+mysql_config_include_dir: /etc/my.cnf.d
+mysql_socket: /var/lib/mysql/mysql.sock
+mysql_supports_innodb_large_prefix: false
diff --git a/provisioning/roles/geerlingguy.mysql/vars/RedHat-7.yml b/provisioning/roles/geerlingguy.mysql/vars/RedHat-7.yml
new file mode 100644
index 000000000..60cefcd91
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/vars/RedHat-7.yml
@@ -0,0 +1,16 @@
+---
+__mysql_daemon: mariadb
+__mysql_packages:
+  - mariadb
+  - mariadb-server
+  - mariadb-libs
+  - MySQL-python
+  - perl-DBD-MySQL
+__mysql_slow_query_log_file: /var/log/mysql-slow.log
+mysql_log_error: /var/log/mariadb/mariadb.log
+mysql_syslog_tag: mariadb
+mysql_pid_file: /var/run/mariadb/mariadb.pid
+mysql_config_file: /etc/my.cnf
+mysql_config_include_dir: /etc/my.cnf.d
+mysql_socket: /var/lib/mysql/mysql.sock
+mysql_supports_innodb_large_prefix: false
diff --git a/provisioning/roles/geerlingguy.nginx/.travis.yml b/provisioning/roles/geerlingguy.nginx/.travis.yml
new file mode 100644
index 000000000..13d7de0a9
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nginx/.travis.yml
@@ -0,0 +1,39 @@
+---
+sudo: required
+language: python
+python: "2.7"
+
+env:
+  - SITE=test.yml
+
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -y curl
+
+install:
+  # Install Ansible.
+  - pip install ansible
+
+  # Add ansible.cfg to pick up roles path.
+  - "{ echo '[defaults]'; echo 'roles_path = ../'; } >> ansible.cfg"
+
+script:
+  # Check the role/playbook's syntax.
+  - "ansible-playbook -i tests/inventory tests/$SITE --syntax-check"
+
+  # Run the role/playbook with ansible-playbook.
+  - "ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo"
+
+  # Run the role/playbook again, checking to make sure it's idempotent.
+  - >
+    ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo
+    | grep -q 'changed=0.*failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)
+
+  # TODO - get the test working. Probably need to add a virtual host.
+  # Request a page via Nginx, to make sure Nginx is running and responds.
+  # - "curl http://localhost/"
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.nginx/README.md b/provisioning/roles/geerlingguy.nginx/README.md
new file mode 100644
index 000000000..854fa3294
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nginx/README.md
@@ -0,0 +1,122 @@
+# Ansible Role: Nginx
+
+[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-nginx.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-nginx)
+
+Installs Nginx on RedHat/CentOS or Debian/Ubuntu Linux, or FreeBSD servers.
+
+This role installs and configures the latest version of Nginx from the Nginx yum repository (on RedHat-based systems) or via apt (on Debian-based systems) or pkgng (on FreeBSD systems). You will likely need to do extra setup work after this role has installed Nginx, like adding your own [virtualhost].conf file inside `/etc/nginx/conf.d/`, describing the location and options to use for your particular website.
+
+## Requirements
+
+None.
+
+## Role Variables
+
+Available variables are listed below, along with default values (see `defaults/main.yml`):
+
+    nginx_vhosts: []
+
+A list of vhost definitions (server blocks) for Nginx virtual hosts. If left empty, you will need to supply your own virtual host configuration. See the commented example in `defaults/main.yml` for available server options. If you have a large number of customizations required for your server definition(s), you're likely better off managing the vhost configuration file yourself, leaving this variable set to `[]`.
+
+    nginx_vhosts:
+      - listen: "80 default_server"
+        server_name: "example.com"
+        root: "/var/www/example.com"
+        index: "index.php index.html index.htm"
+        error_page: ""
+        access_log: ""
+        error_log: ""
+        extra_parameters: |
+          location ~ \.php$ {
+            fastcgi_split_path_info ^(.+\.php)(/.+)$;
+            fastcgi_pass unix:/var/run/php5-fpm.sock;
+            fastcgi_index index.php;
+            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+            include fastcgi_params;
+          }
+
+An example of a fully-populated nginx_vhosts entry, using a `|` to declare a block of syntax for the `extra_parameters`.
+
+    nginx_remove_default_vhost: false
+
+Whether to remove the 'default' virtualhost configuration supplied by Nginx. Useful if you want the base `/` URL to be directed at one of your own virtual hosts configured in a separate .conf file.
+
+    nginx_upstreams: []
+
+If you are configuring Nginx as a load balancer, you can define one or more upstream sets using this variable. In addition to defining at least one upstream, you would need to configure one of your server blocks to proxy requests through the defined upstream (e.g. `proxy_pass http://myapp1;`). See the commented example in `defaults/main.yml` for more information.
+
+    nginx_user: "nginx"
+
+The user under which Nginx will run. Defaults to `nginx` for RedHat, and `www-data` for Debian.
+
+    nginx_worker_processes: "1"
+    nginx_worker_connections: "1024"
+    nginx_multi_accept: "off"
+
+`nginx_worker_processes` should be set to the number of cores present on your machine. Connections (find this number with `grep processor /proc/cpuinfo | wc -l`). `nginx_worker_connections` is the number of connections per process. Set this higher to handle more simultaneous connections (and remember that a connection will be used for as long as the keepalive timeout duration for every client!). You can set `nginx_multi_accept` to `on` if you want Nginx to accept all connections immediately.
+
+    nginx_error_log: "/var/log/nginx/error.log warn"
+    nginx_access_log: "/var/log/nginx/access.log main buffer=16k"
+
+Configuration of the default error and access logs. Set to `off` to disable a log entirely.
+
+    nginx_sendfile: "on"
+    nginx_tcp_nopush: "on"
+    nginx_tcp_nodelay: "on"
+
+TCP connection options. See [this blog post](https://t37.net/nginx-optimization-understanding-sendfile-tcp_nodelay-and-tcp_nopush.html) for more information on these directives.
+
+    nginx_keepalive_timeout: "65"
+    nginx_keepalive_requests: "100"
+
+Nginx keepalive settings. Timeout should be set higher (10s+) if you have more polling-style traffic (AJAX-powered sites especially), or lower (<10s) if you have a site where most users visit a few pages and don't send any further requests.
+
+    nginx_client_max_body_size: "64m"
+
+This value determines the largest file upload possible, as uploads are passed through Nginx before hitting a backend like `php-fpm`. If you get an error like `client intended to send too large body`, it means this value is set too low.
+
+    nginx_server_names_hash_bucket_size: "64"
+
+If you have many server names, or have very long server names, you might get an Nginx error on startup requiring this value to be increased.
+
+    nginx_proxy_cache_path: ""
+
+Set as the `proxy_cache_path` directive in the `nginx.conf` file. By default, this will not be configured (if left as an empty string), but if you wish to use Nginx as a reverse proxy, you can set this to a valid value (e.g. `"/var/cache/nginx keys_zone=cache:32m"`) to use Nginx's cache (further proxy configuration can be done in individual server configurations).
+
+    nginx_extra_http_options: ""
+
+Extra lines to be inserted in the top-level `http` block in `nginx.conf`. The value should be defined literally (as you would insert it directly in the `nginx.conf`, adhering to the Nginx configuration syntax - such as `;` for line termination, etc.), for example:
+
+    nginx_extra_http_options: |
+      proxy_buffering    off;
+      proxy_set_header   X-Real-IP $remote_addr;
+      proxy_set_header   X-Scheme $scheme;
+      proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_set_header   Host $http_host;
+
+    nginx_default_release: ""
+
+(For Debian/Ubuntu only) Allows you to set a different repository for the installation of Nginx. As an example, if you are running Debian's wheezy release, and want to get a newer version of Nginx, you can install the `wheezy-backports` repository and set that value here, and Ansible will use that as the `-t` option while installing Nginx.
+
+    nginx_ppa_use: false
+    nginx_ppa_version: stable
+
+(For Ubuntu only) Allows you to use the official Nginx PPA instead of the system's package. You can set the version to `stable` or `development`.
+
+## Dependencies
+
+None.
+
+## Example Playbook
+
+    - hosts: server
+      roles:
+        - { role: geerlingguy.nginx }
+
+## License
+
+MIT / BSD
+
+## Author Information
+
+This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.nginx/defaults/main.yml b/provisioning/roles/geerlingguy.nginx/defaults/main.yml
new file mode 100644
index 000000000..620dc098e
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nginx/defaults/main.yml
@@ -0,0 +1,68 @@
+---
+# Used only for Debian/Ubuntu installation, as the -t option for apt.
+nginx_default_release: ""
+
+# Use the official Nginx PPA for Ubuntu, and the version to use if so.
+nginx_ppa_use: false
+nginx_ppa_version: stable
+
+# The name of the nginx apt/yum package to install.
+nginx_package_name: "nginx"
+
+nginx_worker_processes: "1"
+nginx_worker_connections: "1024"
+nginx_multi_accept: "off"
+
+nginx_error_log: "/var/log/nginx/error.log warn"
+nginx_access_log: "/var/log/nginx/access.log main buffer=16k"
+
+nginx_sendfile: "on"
+nginx_tcp_nopush: "on"
+nginx_tcp_nodelay: "on"
+
+nginx_keepalive_timeout: "65"
+nginx_keepalive_requests: "100"
+
+nginx_client_max_body_size: "64m"
+
+nginx_server_names_hash_bucket_size: "64"
+
+nginx_proxy_cache_path: ""
+
+nginx_extra_conf_options: ""
+# Example extra main options, used within the main nginx's context:
+#   nginx_extra_conf_options: |
+#     env VARIABLE;
+#     include /etc/nginx/main.d/*.conf;
+
+nginx_extra_http_options: ""
+# Example extra http options, printed inside the main server http config:
+#    nginx_extra_http_options: |
+#      proxy_buffering    off;
+#      proxy_set_header   X-Real-IP $remote_addr;
+#      proxy_set_header   X-Scheme $scheme;
+#      proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+#      proxy_set_header   Host $http_host;
+
+nginx_remove_default_vhost: false
+nginx_vhosts: []
+# Example vhost below, showing all available options:
+# - listen: "80 default_server" # default: "80 default_server"
+#   server_name: "example.com" # default: N/A
+#   root: "/var/www/example.com" # default: N/A
+#   index: "index.html index.htm" # default: "index.html index.htm"
+#
+#   # Properties that are only added if defined:
+#   error_page: ""
+#   access_log: ""
+#   error_log: ""
+#   extra_parameters: "" # Can be used to add extra config blocks (multiline).
+
+nginx_upstreams: []
+# - name: myapp1
+#   strategy: "ip_hash" # "least_conn", etc.
+#   servers: {
+#     "srv1.example.com",
+#     "srv2.example.com weight=3",
+#     "srv3.example.com"
+#   }
diff --git a/provisioning/roles/geerlingguy.nginx/handlers/main.yml b/provisioning/roles/geerlingguy.nginx/handlers/main.yml
new file mode 100644
index 000000000..3f6d02478
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nginx/handlers/main.yml
@@ -0,0 +1,10 @@
+---
+- name: restart nginx
+  service: name=nginx state=restarted
+
+- name: validate nginx configuration
+  command: nginx -t -c /etc/nginx/nginx.conf
+  changed_when: False
+
+- name: reload nginx
+  service: name=nginx state=reloaded
diff --git a/provisioning/roles/geerlingguy.nginx/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.nginx/meta/.galaxy_install_info
new file mode 100644
index 000000000..dbf11e272
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nginx/meta/.galaxy_install_info
@@ -0,0 +1 @@
+{install_date: 'Fri Jul 15 19:49:19 2016', version: 1.9.2}
diff --git a/provisioning/roles/geerlingguy.nginx/meta/main.yml b/provisioning/roles/geerlingguy.nginx/meta/main.yml
new file mode 100644
index 000000000..fab65e4ea
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nginx/meta/main.yml
@@ -0,0 +1,30 @@
+---
+dependencies: []
+
+galaxy_info:
+  author: geerlingguy
+  description: Nginx installation for Linux and FreeBSD.
+  company: "Midwestern Mac, LLC"
+  license: "license (BSD, MIT)"
+  min_ansible_version: 1.8
+  platforms:
+    - name: EL
+      versions:
+      - 6
+      - 7
+    - name: Debian
+      versions:
+      - all
+    - name: Ubuntu
+      versions:
+      - all
+    - name: FreeBSD
+      versions:
+      - 10.3
+      - 10.2
+      - 10.1
+      - 10.0
+      - 9.3
+  galaxy_tags:
+    - development
+    - web
diff --git a/provisioning/roles/geerlingguy.nginx/tasks/main.yml b/provisioning/roles/geerlingguy.nginx/tasks/main.yml
new file mode 100644
index 000000000..23638387f
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nginx/tasks/main.yml
@@ -0,0 +1,39 @@
+---
+# Variable setup.
+- name: Include OS-specific variables.
+  include_vars: "{{ ansible_os_family }}.yml"
+
+- name: Define nginx_user.
+  set_fact:
+    nginx_user: "{{ __nginx_user }}"
+  when: nginx_user is not defined
+
+# Setup/install tasks.
+- include: setup-RedHat.yml
+  when: ansible_os_family == 'RedHat'
+
+- include: setup-Ubuntu.yml
+  when: ansible_distribution == 'Ubuntu'
+
+- include: setup-Debian.yml
+  when: ansible_os_family == 'Debian'
+
+- include: setup-FreeBSD.yml
+  when: ansible_os_family == 'FreeBSD'
+
+# Vhost configuration.
+- include: vhosts.yml
+
+# Nginx setup.
+- name: Copy nginx configuration in place.
+  template:
+    src: nginx.conf.j2
+    dest: "{{ nginx_conf_file_path }}"
+    owner: root
+    group: "{{ root_group }}"
+    mode: 0644
+  notify:
+    - reload nginx
+
+- name: Ensure nginx is started and enabled to start at boot.
+  service: name=nginx state=started enabled=yes
diff --git a/provisioning/roles/geerlingguy.nginx/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.nginx/tasks/setup-Debian.yml
new file mode 100644
index 000000000..43f9ab84d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nginx/tasks/setup-Debian.yml
@@ -0,0 +1,9 @@
+---
+- name: Update apt cache.
+  apt: update_cache=yes cache_valid_time=86400
+
+- name: Ensure nginx is installed.
+  apt:
+    name: "{{ nginx_package_name }}"
+    state: installed
+    default_release: "{{ nginx_default_release }}"
diff --git a/provisioning/roles/geerlingguy.nginx/tasks/setup-FreeBSD.yml b/provisioning/roles/geerlingguy.nginx/tasks/setup-FreeBSD.yml
new file mode 100644
index 000000000..7aa883769
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nginx/tasks/setup-FreeBSD.yml
@@ -0,0 +1,13 @@
+---
+- name: Update pkg cache.
+  shell: pkg update -f
+
+- name: Ensure nginx is installed.
+  pkgng:
+    name: "{{ nginx_package_name }}"
+    state: present
+
+- name: Create logs directory.
+  file:
+    path: /var/log/nginx
+    state: directory
diff --git a/provisioning/roles/geerlingguy.nginx/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.nginx/tasks/setup-RedHat.yml
new file mode 100644
index 000000000..a1563b79c
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nginx/tasks/setup-RedHat.yml
@@ -0,0 +1,14 @@
+---
+- name: Enable nginx repo.
+  template:
+    src: nginx.repo.j2
+    dest: /etc/yum.repos.d/nginx.repo
+    owner: root
+    group: root
+    mode: 0644
+
+- name: Ensure nginx is installed.
+  yum:
+    name: "{{ nginx_package_name }}"
+    state: installed
+    enablerepo: nginx
diff --git a/provisioning/roles/geerlingguy.nginx/tasks/setup-Ubuntu.yml b/provisioning/roles/geerlingguy.nginx/tasks/setup-Ubuntu.yml
new file mode 100644
index 000000000..920dc0b2b
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nginx/tasks/setup-Ubuntu.yml
@@ -0,0 +1,14 @@
+---
+- name: Add PPA for Nginx.
+  apt_repository:
+    repo: 'ppa:nginx/{{ nginx_ppa_version }}'
+    state: present
+    update_cache: yes
+  register: nginx_ppa_added
+  when: nginx_ppa_use
+
+- name: Ensure nginx will reinstall if the PPA was just added.
+  apt:
+    name: nginx
+    state: absent
+  when: nginx_ppa_added.changed
diff --git a/provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml b/provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml
new file mode 100644
index 000000000..583ff7773
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml
@@ -0,0 +1,26 @@
+---
+- name: Remove default nginx vhost config file (if configured).
+  file:
+    path: "{{ nginx_default_vhost_path }}"
+    state: absent
+  when: nginx_remove_default_vhost
+  notify:
+    - reload nginx
+
+- name: Add managed vhost config file (if any vhosts are configured).
+  template:
+    src: vhosts.j2
+    dest: "{{ nginx_vhost_path }}/vhosts.conf"
+    mode: 0644
+  when: nginx_vhosts|length > 0
+  notify:
+    - reload nginx
+
+- name: Remove managed vhost config file (if no vhosts are configured).
+  file:
+    path: "{{ nginx_vhost_path }}/vhosts.conf"
+    state: absent
+  when: nginx_vhosts|length == 0
+  notify:
+    - reload nginx
+
diff --git a/provisioning/roles/geerlingguy.nginx/templates/nginx.conf.j2 b/provisioning/roles/geerlingguy.nginx/templates/nginx.conf.j2
new file mode 100644
index 000000000..e9499e706
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nginx/templates/nginx.conf.j2
@@ -0,0 +1,63 @@
+user  {{ nginx_user }};
+
+error_log  {{ nginx_error_log }};
+pid        {{ nginx_pidfile }};
+
+worker_processes  {{ nginx_worker_processes }};
+
+events {
+    worker_connections  {{ nginx_worker_connections }};
+    multi_accept {{ nginx_multi_accept }};
+}
+
+{% if nginx_extra_conf_options %}
+{{ nginx_extra_conf_options }}
+{% endif %}
+
+http {
+    include       {{ nginx_mime_file_path }};
+    default_type  application/octet-stream;
+
+    server_names_hash_bucket_size {{ nginx_server_names_hash_bucket_size }};
+
+    client_max_body_size {{ nginx_client_max_body_size }};
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  {{ nginx_access_log }};
+
+    sendfile        {{ nginx_sendfile }};
+    tcp_nopush      {{ nginx_tcp_nopush }};
+    tcp_nodelay     {{ nginx_tcp_nodelay }};
+
+    keepalive_timeout  {{ nginx_keepalive_timeout }};
+    keepalive_requests {{ nginx_keepalive_requests }};
+
+    #gzip  on;
+
+{% if nginx_proxy_cache_path %}
+    proxy_cache_path {{ nginx_proxy_cache_path }};
+{% endif %}
+
+{% if nginx_extra_http_options %}
+    {{ nginx_extra_http_options }}
+{% endif %}
+
+{% for upstream in nginx_upstreams %}
+    upstream {{ upstream.name }} {
+{% if upstream.strategy is defined %}
+        {{ upstream.strategy }};
+{% endif %}
+{% for server in upstream.servers %}
+        server {{ server }};
+{% endfor %}
+    }
+{% endfor %}
+
+    include {{ nginx_conf_path }}/*.conf;
+{% if nginx_conf_path != nginx_vhost_path %}
+    include {{ nginx_vhost_path }}/*;
+{% endif %}
+}
diff --git a/provisioning/roles/geerlingguy.nginx/templates/nginx.repo.j2 b/provisioning/roles/geerlingguy.nginx/templates/nginx.repo.j2
new file mode 100644
index 000000000..9a853b70b
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nginx/templates/nginx.repo.j2
@@ -0,0 +1,5 @@
+[nginx]
+name=nginx repo
+baseurl=http://nginx.org/packages/centos/{{ ansible_distribution_major_version }}/$basearch/
+gpgcheck=0
+enabled=1
diff --git a/provisioning/roles/geerlingguy.nginx/templates/vhosts.j2 b/provisioning/roles/geerlingguy.nginx/templates/vhosts.j2
new file mode 100644
index 000000000..04dbf9ea3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nginx/templates/vhosts.j2
@@ -0,0 +1,33 @@
+{% for vhost in nginx_vhosts %}
+server {
+    listen {{ vhost.listen | default('80 default_server') }};
+
+    {% if vhost.server_name is defined %}
+    server_name {{ vhost.server_name }};
+    {% endif %}
+
+    {% if vhost.root is defined %}
+    root {{ vhost.root }};
+    {% endif %}
+
+    index {{ vhost.index | default('index.html index.htm') }};
+
+    {% if vhost.error_page is defined %}
+    error_page {{ vhost.error_page }};
+    {% endif %}
+    {% if vhost.access_log is defined %}
+    access_log {{ vhost.access_log }};
+    {% endif %}
+    {% if vhost.error_log is defined %}
+    error_log {{ vhost.error_log }} error;
+    {% endif %}
+
+    {% if vhost.return is defined %}
+    return {{ vhost.return }};
+    {% endif %}
+
+    {% if vhost.extra_parameters is defined %}
+    {{ vhost.extra_parameters }}
+    {% endif %}
+}
+{% endfor %}
diff --git a/provisioning/roles/geerlingguy.nginx/tests/inventory b/provisioning/roles/geerlingguy.nginx/tests/inventory
new file mode 100644
index 000000000..2fbb50c4a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nginx/tests/inventory
@@ -0,0 +1 @@
+localhost
diff --git a/provisioning/roles/geerlingguy.nginx/tests/test.yml b/provisioning/roles/geerlingguy.nginx/tests/test.yml
new file mode 100644
index 000000000..5b55b97fb
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nginx/tests/test.yml
@@ -0,0 +1,6 @@
+---
+- hosts: localhost
+  remote_user: root
+  roles:
+    - role: ansible-role-nginx
+      nginx_use_ppa: true
diff --git a/provisioning/roles/geerlingguy.nginx/vars/Debian.yml b/provisioning/roles/geerlingguy.nginx/vars/Debian.yml
new file mode 100644
index 000000000..cb127706c
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nginx/vars/Debian.yml
@@ -0,0 +1,9 @@
+---
+root_group: root
+nginx_conf_path: /etc/nginx/conf.d
+nginx_conf_file_path: /etc/nginx/nginx.conf
+nginx_mime_file_path: /etc/nginx/mime.types
+nginx_pidfile: /run/nginx.pid
+nginx_vhost_path: /etc/nginx/sites-enabled
+nginx_default_vhost_path: /etc/nginx/sites-enabled/default
+__nginx_user: "www-data"
diff --git a/provisioning/roles/geerlingguy.nginx/vars/FreeBSD.yml b/provisioning/roles/geerlingguy.nginx/vars/FreeBSD.yml
new file mode 100644
index 000000000..b032f98bc
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nginx/vars/FreeBSD.yml
@@ -0,0 +1,9 @@
+---
+root_group: wheel
+nginx_conf_path: /usr/local/etc/nginx/conf.d
+nginx_conf_file_path: /usr/local/etc/nginx/nginx.conf
+nginx_mime_file_path: /usr/local/etc/nginx/mime.types
+nginx_pidfile: /var/run/nginx.pid
+nginx_vhost_path: /usr/local/etc/nginx/sites-enabled
+nginx_default_vhost_path: /usr/local/etc/nginx/sites-enabled/default
+__nginx_user: "www"
diff --git a/provisioning/roles/geerlingguy.nginx/vars/RedHat.yml b/provisioning/roles/geerlingguy.nginx/vars/RedHat.yml
new file mode 100644
index 000000000..0138f8daa
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nginx/vars/RedHat.yml
@@ -0,0 +1,9 @@
+---
+root_group: root
+nginx_conf_path: /etc/nginx/conf.d
+nginx_conf_file_path: /etc/nginx/nginx.conf
+nginx_mime_file_path: /etc/nginx/mime.types
+nginx_pidfile: /var/run/nginx.pid
+nginx_vhost_path: /etc/nginx/conf.d
+nginx_default_vhost_path: /etc/nginx/conf.d/default.conf
+__nginx_user: "nginx"
diff --git a/provisioning/roles/geerlingguy.nodejs/.travis.yml b/provisioning/roles/geerlingguy.nodejs/.travis.yml
new file mode 100644
index 000000000..6512b6b9e
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nodejs/.travis.yml
@@ -0,0 +1,62 @@
+---
+sudo: required
+
+env:
+  - distribution: centos
+    version: 6
+    init: /sbin/init
+    run_opts: ""
+  - distribution: centos
+    version: 7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distribution: ubuntu
+    version: 14.04
+    init: /sbin/init
+    run_opts: ""
+  - distribution: ubuntu
+    version: 12.04
+    init: /sbin/init
+    run_opts: ""
+
+services:
+  - docker
+
+before_install:
+  # Pull container
+  - 'sudo docker pull ${distribution}:${version}'
+  # Customize container
+  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+
+script:
+  - container_id=$(mktemp)
+  # Run container in detached state
+  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+
+  # Ansible syntax check.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+
+  # Test role.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+
+  # Test role idempotence.
+  - >
+    sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml
+    | grep -q 'changed=0.*failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)
+
+  # Ensure Node.js is installed.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm which node'
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm node -v'
+
+  # Ensure npm packages are installed globally.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm bash --login -c "npm list -g --depth=0 jslint"'
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm bash --login -c "npm list -g --depth=0 node-sass"'
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm bash --login -c "npm list -g --depth=0 yo"'
+
+  # Clean up
+  - 'sudo docker stop "$(cat ${container_id})"'
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.nodejs/README.md b/provisioning/roles/geerlingguy.nodejs/README.md
new file mode 100644
index 000000000..0fce6fcb4
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nodejs/README.md
@@ -0,0 +1,66 @@
+# Ansible Role: Node.js
+
+[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-nodejs.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-nodejs)
+
+Installs Node.js on RHEL/CentOS or Debian/Ubuntu.
+
+## Requirements
+
+Requires the EPEL repository on RedHat/CentOS (you can install it by simply adding the `geerlingguy.repo-epel` role to your playbook).
+
+## Role Variables
+
+Available variables are listed below, along with default values (see `defaults/main.yml`):
+
+    nodejs_version: "0.12"
+
+The Node.js version to install. "0.12" is the default and works on all supported OSes. Other versions such as "0.10", "4.x", "5.x", and "6.x" should work on the latest versions of Debian/Ubuntu and RHEL/CentOS.
+
+    nodejs_install_npm_user: "{{ ansible_ssh_user }}"
+
+The user for whom the npm packages will be installed can be set here, this defaults to ansible_user
+
+    npm_config_prefix: "~/.npm-global"
+
+The global installation directory. This should be writeable by the nodejs_install_npm_user.
+
+    npm_config_unsafe_perm: "false"
+
+Set to true to suppress the UID/GID switching when running package scripts. If set explicitly to false, then installing as a non-root user will fail.
+
+    nodejs_npm_global_packages: []
+
+Add a list of npm packages with a `name` and (optional) `version` to be installed globally. For example:
+
+    nodejs_npm_global_packages:
+      # Install a specific version of a package.
+      - name: jslint
+        version: 0.9.3
+      # Install the latest stable release of a package.
+      - name: node-sass
+
+## Dependencies
+
+None.
+
+## Example Playbook
+
+    - hosts: utility
+      vars_files:
+        - vars/main.yml
+      roles:
+        - geerlingguy.nodejs
+
+*Inside `vars/main.yml`*:
+
+    nodejs_npm_global_packages:
+      - name: jslint
+      - name: node-sass
+
+## License
+
+MIT / BSD
+
+## Author Information
+
+This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.nodejs/defaults/main.yml b/provisioning/roles/geerlingguy.nodejs/defaults/main.yml
new file mode 100644
index 000000000..9a2b39227
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nodejs/defaults/main.yml
@@ -0,0 +1,21 @@
+---
+# Set the version of Node.js to install ("0.10", "0.12", "4.x", "5.x", "6.x").
+# Version numbers from Nodesource: https://github.com/nodesource/distributions
+nodejs_version: "0.12"
+
+# The user for whom the npm packages will be installed.
+# nodejs_install_npm_user: username
+
+# The directory for global installations.
+npm_config_prefix: "/usr/local/lib/npm"
+
+# Set to true to suppress the UID/GID switching when running package scripts. If set explicitly to false, then installing as a non-root user will fail.
+npm_config_unsafe_perm: "false"
+
+# Define a list of global packages to be installed with NPM.
+nodejs_npm_global_packages: []
+#  # Install a specific version of a package.
+#  - name: jslint
+#    version: 0.9.3
+#  # Install the latest stable release of a package.
+#  - name: node-sass
diff --git a/provisioning/roles/geerlingguy.nodejs/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.nodejs/meta/.galaxy_install_info
new file mode 100644
index 000000000..1f626c47a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nodejs/meta/.galaxy_install_info
@@ -0,0 +1 @@
+{install_date: 'Fri Jul 15 19:49:23 2016', version: 3.2.0}
diff --git a/provisioning/roles/geerlingguy.nodejs/meta/main.yml b/provisioning/roles/geerlingguy.nodejs/meta/main.yml
new file mode 100644
index 000000000..8925daaf8
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nodejs/meta/main.yml
@@ -0,0 +1,27 @@
+---
+dependencies: []
+
+galaxy_info:
+  author: geerlingguy
+  description: Node.js installation for Linux
+  company: "Midwestern Mac, LLC"
+  license: "license (BSD, MIT)"
+  min_ansible_version: 1.9
+  platforms:
+    - name: EL
+      versions:
+      - 6
+      - 7
+    - name: Debian
+      versions:
+      - all
+    - name: Ubuntu
+      versions:
+      - precise
+      - raring
+      - saucy
+      - trusty
+      - xenial
+  galaxy_tags:
+    - development
+    - web
diff --git a/provisioning/roles/geerlingguy.nodejs/tasks/main.yml b/provisioning/roles/geerlingguy.nodejs/tasks/main.yml
new file mode 100644
index 000000000..70b650367
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nodejs/tasks/main.yml
@@ -0,0 +1,50 @@
+---
+- include: setup-RedHat.yml
+  when: ansible_os_family == 'RedHat'
+
+- include: setup-Debian.yml
+  when: ansible_os_family == 'Debian'
+
+- name: Define nodejs_install_npm_user
+  set_fact:
+    nodejs_install_npm_user: "{{ ansible_user }}"
+  when: nodejs_install_npm_user is not defined
+
+- name: Create npm global directory
+  file:
+    path: "{{ npm_config_prefix }}"
+    owner: "{{ nodejs_install_npm_user }}"
+    group: "{{ nodejs_install_npm_user }}"
+    state: directory
+
+- name: Add npm_config_prefix bin directory to global $PATH.
+  template:
+    src: npm.sh.j2
+    dest: /etc/profile.d/npm.sh
+    mode: 0644
+
+# TODO: Remove this task after Ansible 2.x npm module bug is fixed. See:
+# https://github.com/ansible/ansible-modules-extras/issues/1375
+- name: Ensure npm global packages are installed.
+  npm:
+    name: "{{ item.name }}"
+    version: "{{ item.version | default('latest') }}"
+    global: yes
+    state: present
+  environment:
+    NPM_CONFIG_PREFIX: "{{ npm_config_prefix }}"
+    NODE_PATH: "{{ npm_config_prefix }}/lib/node_modules"
+    NPM_CONFIG_UNSAFE_PERM: "{{ npm_config_unsafe_perm }}"
+  with_items: "{{ nodejs_npm_global_packages }}"
+
+- name: Ensure npm global packages are at the latest release.
+  npm:
+    name: "{{ item.name }}"
+    version: "{{ item.version | default('latest') }}"
+    global: yes
+    state: latest
+  environment:
+    NPM_CONFIG_PREFIX: "{{ npm_config_prefix }}"
+    NODE_PATH: "{{ npm_config_prefix }}/lib/node_modules"
+    NPM_CONFIG_UNSAFE_PERM: "{{ npm_config_unsafe_perm }}"
+  with_items: "{{ nodejs_npm_global_packages }}"
diff --git a/provisioning/roles/geerlingguy.nodejs/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.nodejs/tasks/setup-Debian.yml
new file mode 100644
index 000000000..f88c4eef0
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nodejs/tasks/setup-Debian.yml
@@ -0,0 +1,24 @@
+---
+- name: Ensure apt-transport-https is installed.
+  apt: name=apt-transport-https state=present
+
+- name: Add Nodesource apt key.
+  apt_key:
+    url: https://deb.nodesource.com/gpgkey/nodesource.gpg.key
+    state: present
+
+- name: Add NodeSource repositories for Node.js.
+  apt_repository:
+    repo: "{{ item }}"
+    state: present
+  with_items:
+    - "deb https://deb.nodesource.com/node_{{ nodejs_version }} {{ ansible_distribution_release }} main"
+    - "deb-src https://deb.nodesource.com/node_{{ nodejs_version }} {{ ansible_distribution_release }} main"
+  register: node_repo
+
+- name: Update apt cache if repo was added.
+  apt: update_cache=yes
+  when: node_repo.changed
+
+- name: Ensure Node.js and npm are installed.
+  apt: "name=nodejs={{ nodejs_version|regex_replace('x', '') }}* state=present"
diff --git a/provisioning/roles/geerlingguy.nodejs/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.nodejs/tasks/setup-RedHat.yml
new file mode 100644
index 000000000..984b1814d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nodejs/tasks/setup-RedHat.yml
@@ -0,0 +1,18 @@
+---
+- name: Set up the Nodesource RPM directory for Node.js > 0.10.
+  set_fact:
+    nodejs_rhel_rpm_dir: "pub_{{ nodejs_version }}"
+  when: nodejs_version != '0.10'
+
+- name: Set up the Nodesource RPM variable for Node.js == 0.10.
+  set_fact:
+    nodejs_rhel_rpm_dir: "pub"
+  when: nodejs_version == '0.10'
+
+- name: Add Nodesource repositories for Node.js.
+  yum:
+    name: "https://rpm.nodesource.com/{{ nodejs_rhel_rpm_dir }}/el/{{ ansible_distribution_major_version }}/{{ ansible_architecture }}/nodesource-release-el{{ ansible_distribution_major_version }}-1.noarch.rpm"
+    state: present
+
+- name: Ensure Node.js and npm are installed.
+  yum: "name=nodejs state=present enablerepo='epel,nodesource'"
diff --git a/provisioning/roles/geerlingguy.nodejs/templates/npm.sh.j2 b/provisioning/roles/geerlingguy.nodejs/templates/npm.sh.j2
new file mode 100644
index 000000000..67caa7897
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nodejs/templates/npm.sh.j2
@@ -0,0 +1,3 @@
+export PATH={{ npm_config_prefix }}/bin:$PATH
+export NPM_CONFIG_PREFIX={{ npm_config_prefix }}
+export NODE_PATH=$NODE_PATH:{{ npm_config_prefix }}/lib/node_modules
diff --git a/provisioning/roles/geerlingguy.nodejs/tests/Dockerfile.centos-6 b/provisioning/roles/geerlingguy.nodejs/tests/Dockerfile.centos-6
new file mode 100644
index 000000000..4a4e7b8d6
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nodejs/tests/Dockerfile.centos-6
@@ -0,0 +1,15 @@
+FROM centos:6
+
+# Install Ansible
+RUN yum -y update; yum clean all;
+RUN yum -y install epel-release
+RUN yum -y install git ansible sudo
+RUN yum clean all
+
+# Disable requiretty
+RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
+
+# Install Ansible inventory file
+RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
+
+CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.nodejs/tests/Dockerfile.centos-7 b/provisioning/roles/geerlingguy.nodejs/tests/Dockerfile.centos-7
new file mode 100644
index 000000000..8aa065497
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nodejs/tests/Dockerfile.centos-7
@@ -0,0 +1,27 @@
+FROM centos:7
+
+# Install systemd -- See https://hub.docker.com/_/centos/
+RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
+RUN yum -y update; yum clean all; \
+(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
+rm -f /lib/systemd/system/multi-user.target.wants/*; \
+rm -f /etc/systemd/system/*.wants/*; \
+rm -f /lib/systemd/system/local-fs.target.wants/*; \
+rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
+rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
+rm -f /lib/systemd/system/basic.target.wants/*; \
+rm -f /lib/systemd/system/anaconda.target.wants/*;
+
+# Install Ansible
+RUN yum -y install epel-release
+RUN yum -y install git ansible sudo
+RUN yum clean all
+
+# Disable requiretty
+RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
+
+# Install Ansible inventory file
+RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
+
+VOLUME ["/sys/fs/cgroup"]
+CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.nodejs/tests/Dockerfile.ubuntu-12.04 b/provisioning/roles/geerlingguy.nodejs/tests/Dockerfile.ubuntu-12.04
new file mode 100644
index 000000000..d0c130cdf
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nodejs/tests/Dockerfile.ubuntu-12.04
@@ -0,0 +1,11 @@
+FROM ubuntu:12.04
+RUN apt-get update
+
+# Install Ansible
+RUN apt-get install -y software-properties-common python-software-properties git
+RUN apt-add-repository -y ppa:ansible/ansible
+RUN apt-get update
+RUN apt-get install -y ansible
+
+# Install Ansible inventory file
+RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.nodejs/tests/Dockerfile.ubuntu-14.04 b/provisioning/roles/geerlingguy.nodejs/tests/Dockerfile.ubuntu-14.04
new file mode 100644
index 000000000..ca332871f
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nodejs/tests/Dockerfile.ubuntu-14.04
@@ -0,0 +1,11 @@
+FROM ubuntu:14.04
+RUN apt-get update
+
+# Install Ansible
+RUN apt-get install -y software-properties-common git
+RUN apt-add-repository -y ppa:ansible/ansible
+RUN apt-get update
+RUN apt-get install -y ansible
+
+# Install Ansible inventory file
+RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.nodejs/tests/test.yml b/provisioning/roles/geerlingguy.nodejs/tests/test.yml
new file mode 100644
index 000000000..9dfa879bf
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nodejs/tests/test.yml
@@ -0,0 +1,29 @@
+---
+- hosts: all
+
+  vars:
+    nodejs_version: "5.x"
+    nodejs_install_npm_user: root
+    npm_config_prefix: /root/.npm-global
+    npm_config_unsafe_perm: "true"
+    nodejs_npm_global_packages:
+      - name: node-sass
+      - name: jslint
+        version: 0.9.6
+      - name: yo
+
+  pre_tasks:
+    - name: Ensure build dependencies are installed (RedHat).
+      yum: 'name="{{ item }}" state=present'
+      with_items:
+        - which
+      when: ansible_os_family == 'RedHat'
+
+    - name: Ensure build dependencies are installed (Debian).
+      apt: 'name="{{ item }}" state=installed'
+      with_items:
+        - sudo
+      when: ansible_os_family == 'Debian'
+
+  roles:
+    - role_under_test
diff --git a/provisioning/roles/geerlingguy.php-memcached/.travis.yml b/provisioning/roles/geerlingguy.php-memcached/.travis.yml
new file mode 100644
index 000000000..8115dc351
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-memcached/.travis.yml
@@ -0,0 +1,40 @@
+---
+sudo: required
+language: python
+python: "2.7"
+
+env:
+  - SITE=test.yml
+
+before_install:
+  - sudo apt-get update -qq
+
+install:
+  # Install Ansible.
+  - pip install ansible
+
+  # Add ansible.cfg to pick up roles path.
+  - "{ echo '[defaults]'; echo 'roles_path = ../'; } >> ansible.cfg"
+
+  # Install dependencies.
+  - ansible-galaxy install geerlingguy.memcached geerlingguy.php
+
+script:
+  # Check the role/playbook's syntax.
+  - "ansible-playbook -i tests/inventory tests/$SITE --syntax-check"
+
+  # Run the role/playbook with ansible-playbook.
+  - "ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo"
+
+  # Run the role/playbook again, checking to make sure it's idempotent.
+  - >
+    ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo
+    | grep -q 'changed=0.*failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)
+
+  # Run script to test if Memcached is available and working.
+  - php tests/memcached-test.php
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.php-memcached/README.md b/provisioning/roles/geerlingguy.php-memcached/README.md
new file mode 100644
index 000000000..b565c6781
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-memcached/README.md
@@ -0,0 +1,39 @@
+# Ansible Role: PHP-Memcached
+
+[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-php-memcached.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-php-memcached)
+
+Installs PHP Memcached support on RedHat/CentOS/Debian/Ubuntu.
+
+## Requirements
+
+This role doesn't *explicitly* require Memcached to be installed, but if you don't have the daemon running somewhere (either on the same server, or somewhere else), this role won't be all that helpful. Check out `geerlingguy.memcached` for a simple role to install and configure Memcached (either on the same server, or separate servers).
+
+## Role Variables
+
+Available variables are listed below, along with default values (see `defaults/main.yml`):
+
+    php_enablerepo: ""
+
+(RedHat/CentOS only) If you have enabled any additional repositories (might I suggest geerlingguy.repo-epel or geerlingguy.repo-remi), those repositories can be listed under this variable (e.g. `remi,epel`). This can be handy, as an example, if you want to install the latest version of PHP from Remi's repository.
+
+    php_memcached_package: php-memcached
+
+The package to install for PHP Memcached support. For Debian/Ubuntu and PHP 5.x, use `php5-memcached`.
+
+## Dependencies
+
+  - geerlingguy.php
+
+## Example Playbook
+
+    - hosts: webservers
+      roles:
+        - { role: geerlingguy.php-memcached }
+
+## License
+
+MIT / BSD
+
+## Author Information
+
+This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.php-memcached/defaults/main.yml b/provisioning/roles/geerlingguy.php-memcached/defaults/main.yml
new file mode 100644
index 000000000..f6a43ca96
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-memcached/defaults/main.yml
@@ -0,0 +1,3 @@
+---
+# Pass in a comma-separated list of repos to use (e.g. "remi,epel").
+php_enablerepo: ""
diff --git a/provisioning/roles/geerlingguy.php-memcached/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.php-memcached/meta/.galaxy_install_info
new file mode 100644
index 000000000..d2366c484
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-memcached/meta/.galaxy_install_info
@@ -0,0 +1 @@
+{install_date: 'Fri Jul 15 19:49:30 2016', version: 2.0.0}
diff --git a/provisioning/roles/geerlingguy.php-memcached/meta/main.yml b/provisioning/roles/geerlingguy.php-memcached/meta/main.yml
new file mode 100644
index 000000000..02d5e2087
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-memcached/meta/main.yml
@@ -0,0 +1,24 @@
+---
+dependencies:
+  - geerlingguy.php
+
+galaxy_info:
+  author: geerlingguy
+  description: PHP Memcached support for Linux
+  company: "Midwestern Mac, LLC"
+  license: "license (BSD, MIT)"
+  min_ansible_version: 1.8
+  platforms:
+    - name: EL
+      versions:
+      - 6
+      - 7
+    - name: Debian
+      versions:
+      - all
+    - name: Ubuntu
+      versions:
+      - all
+  galaxy_tags:
+    - database
+    - web
diff --git a/provisioning/roles/geerlingguy.php-memcached/tasks/main.yml b/provisioning/roles/geerlingguy.php-memcached/tasks/main.yml
new file mode 100644
index 000000000..f11ffab53
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-memcached/tasks/main.yml
@@ -0,0 +1,28 @@
+---
+# Include variables and define needed variables.
+- name: Include OS-specific variables.
+  include_vars: "{{ ansible_os_family }}.yml"
+
+- name: Define php_memcached_package.
+  set_fact:
+    php_memcached_package: "{{ __php_memcached_package }}"
+  when: php_memcached_package is not defined
+
+- name: Install PHP Memcached extension (RedHat).
+  yum:
+    name: "{{ php_memcached_package }}"
+    state: installed
+    enablerepo: "{{ php_enablerepo }}"
+  notify:
+    - restart webserver
+    - restart php-fpm
+  when: ansible_os_family == 'RedHat'
+
+- name: Install PHP Memcached extension (Debian).
+  apt:
+    name: "{{ php_memcached_package }}"
+    state: installed
+  notify:
+    - restart webserver
+    - restart php-fpm
+  when: ansible_os_family == 'Debian'
diff --git a/provisioning/roles/geerlingguy.php-memcached/tests/inventory b/provisioning/roles/geerlingguy.php-memcached/tests/inventory
new file mode 100644
index 000000000..2fbb50c4a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-memcached/tests/inventory
@@ -0,0 +1 @@
+localhost
diff --git a/provisioning/roles/geerlingguy.php-memcached/tests/memcached-test.php b/provisioning/roles/geerlingguy.php-memcached/tests/memcached-test.php
new file mode 100644
index 000000000..4d16d96ca
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-memcached/tests/memcached-test.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * @file
+ * Test if Memcached is available and working.
+ *
+ * Note that if you run this script more than once per second, the add() call
+ * will fail. Why would you run this more than once per second?!
+ */
+
+$success = FALSE;
+$key = 'test';
+$value = 'Success';
+
+if (class_exists('Memcached')) {
+  $memcached = new Memcached;
+  $memcached->addServer('127.0.0.1', 11211);
+
+  // Test adding a value to memcached.
+  if ($memcached->add($key, $value, 1)) {
+    $result = $memcached->get($key);
+
+    // If we get the expected result, it was a success.
+    if ($result == $value) {
+      $success = TRUE;
+      print "Memcached connection successful.\r\n";
+      exit(0);
+    }
+  }
+}
+
+if (!$success) {
+  print "Memcached not working properly.\r\n";
+  exit(1);
+}
diff --git a/provisioning/roles/geerlingguy.php-memcached/tests/test.yml b/provisioning/roles/geerlingguy.php-memcached/tests/test.yml
new file mode 100644
index 000000000..8ff255785
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-memcached/tests/test.yml
@@ -0,0 +1,12 @@
+---
+- hosts: localhost
+  remote_user: root
+
+  vars:
+    php_enable_webserver: false
+    php_memcached_package: php5-memcached
+
+  roles:
+    - geerlingguy.memcached
+    - geerlingguy.php
+    - ansible-role-php-memcached
diff --git a/provisioning/roles/geerlingguy.php-memcached/vars/Debian.yml b/provisioning/roles/geerlingguy.php-memcached/vars/Debian.yml
new file mode 100644
index 000000000..456072e2f
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-memcached/vars/Debian.yml
@@ -0,0 +1,2 @@
+---
+__php_memcached_package: php-memcached
diff --git a/provisioning/roles/geerlingguy.php-memcached/vars/RedHat.yml b/provisioning/roles/geerlingguy.php-memcached/vars/RedHat.yml
new file mode 100644
index 000000000..73c7bf134
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-memcached/vars/RedHat.yml
@@ -0,0 +1,2 @@
+---
+__php_memcached_package: php-pecl-memcached
diff --git a/provisioning/roles/geerlingguy.php-mysql/.travis.yml b/provisioning/roles/geerlingguy.php-mysql/.travis.yml
new file mode 100644
index 000000000..293ca81d0
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-mysql/.travis.yml
@@ -0,0 +1,56 @@
+---
+sudo: required
+
+env:
+  - distribution: centos
+    version: 6
+    init: /sbin/init
+    run_opts: ""
+  - distribution: centos
+    version: 7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distribution: ubuntu
+    version: 14.04
+    init: /sbin/init
+    run_opts: ""
+
+services:
+  - docker
+
+before_install:
+  # - sudo apt-get update
+  # Pull container
+  - 'sudo docker pull ${distribution}:${version}'
+  # Customize container
+  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+
+script:
+  - container_id=$(mktemp)
+  # Run container in detached state
+  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+
+  # Install dependencies.
+  - 'sudo docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
+
+  # Ansible syntax check.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+
+  # Test role.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+
+  # Test role idempotence.
+  - >
+    sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml
+    | grep -q 'changed=0.*failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)
+
+  # Ensure PHP mysql support is enabled.
+  - sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm php -i | grep 'MySQL Support => enabled'
+
+  # Clean up
+  - 'sudo docker stop "$(cat ${container_id})"'
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.php-mysql/README.md b/provisioning/roles/geerlingguy.php-mysql/README.md
new file mode 100644
index 000000000..dcc731417
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-mysql/README.md
@@ -0,0 +1,40 @@
+# Ansible Role: PHP-MySQL
+
+[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-php-mysql.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-php-mysql)
+
+Installs PHP MySQL support on RedHat/CentOS/Debian/Ubuntu.
+
+## Requirements
+
+None.
+
+## Role Variables
+
+Available variables are listed below, along with default values (see `defaults/main.yml`):
+
+    php_enablerepo: ""
+
+(RedHat/CentOS only) If you have enabled any additional repositories (might I suggest geerlingguy.repo-epel or geerlingguy.repo-remi), those repositories can be listed under this variable (e.g. `remi,epel`). This can be handy, as an example, if you want to install the latest version of PHP 5.4, which is in the Remi repository.
+
+    php_mysql_package: php-mysql # RedHat
+    php_mysql_package: php5-mysql # Debian
+
+The PHP MySQL package to install via apt/yum. This should only be overridden if you need to install a unique/special package for MySQL support, as in the case of using software collections on Enterprise Linux.
+
+## Dependencies
+
+  - geerlingguy.php
+
+## Example Playbook
+
+    - hosts: webservers
+      roles:
+        - { role: geerlingguy.php-mysql }
+
+## License
+
+MIT / BSD
+
+## Author Information
+
+This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.php-mysql/defaults/main.yml b/provisioning/roles/geerlingguy.php-mysql/defaults/main.yml
new file mode 100644
index 000000000..f6a43ca96
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-mysql/defaults/main.yml
@@ -0,0 +1,3 @@
+---
+# Pass in a comma-separated list of repos to use (e.g. "remi,epel").
+php_enablerepo: ""
diff --git a/provisioning/roles/geerlingguy.php-mysql/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.php-mysql/meta/.galaxy_install_info
new file mode 100644
index 000000000..5c2d3df86
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-mysql/meta/.galaxy_install_info
@@ -0,0 +1 @@
+{install_date: 'Fri Jul 15 19:49:34 2016', version: 2.0.0}
diff --git a/provisioning/roles/geerlingguy.php-mysql/meta/main.yml b/provisioning/roles/geerlingguy.php-mysql/meta/main.yml
new file mode 100644
index 000000000..b46eaeffa
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-mysql/meta/main.yml
@@ -0,0 +1,23 @@
+---
+dependencies:
+  - geerlingguy.php
+
+galaxy_info:
+  author: geerlingguy
+  description: PHP MySQL support for RedHat/CentOS and Debian/Ubuntu.
+  company: "Midwestern Mac, LLC"
+  license: "license (BSD, MIT)"
+  min_ansible_version: 1.8
+  platforms:
+    - name: EL
+      versions:
+      - all
+    - name: Debian
+      versions:
+      - all
+    - name: Ubuntu
+      versions:
+      - all
+  galaxy_tags:
+    - database
+    - web
diff --git a/provisioning/roles/geerlingguy.php-mysql/tasks/main.yml b/provisioning/roles/geerlingguy.php-mysql/tasks/main.yml
new file mode 100644
index 000000000..bf5c8a07c
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-mysql/tasks/main.yml
@@ -0,0 +1,29 @@
+---
+# Variable setup.
+- name: Include OS-specific variables.
+  include_vars: "{{ ansible_os_family }}.yml"
+
+- name: Define php_mysql_package.
+  set_fact:
+    php_mysql_package: "{{ __php_mysql_package }}"
+  when: php_mysql_package is not defined
+
+# Installation.
+- name: Install PHP MySQL dependencies (RedHat).
+  yum:
+    name: "{{ php_mysql_package }}"
+    state: present
+    enablerepo: "{{ php_enablerepo }}"
+  notify:
+    - restart webserver
+    - restart php-fpm
+  when: ansible_os_family == 'RedHat'
+
+- name: Install PHP MySQL dependencies (Debian).
+  apt:
+    name: "{{ php_mysql_package }}"
+    state: present
+  notify:
+    - restart webserver
+    - restart php-fpm
+  when: ansible_os_family == 'Debian'
diff --git a/provisioning/roles/geerlingguy.php-mysql/tests/Dockerfile.centos-6 b/provisioning/roles/geerlingguy.php-mysql/tests/Dockerfile.centos-6
new file mode 100644
index 000000000..db3f5b684
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-mysql/tests/Dockerfile.centos-6
@@ -0,0 +1,18 @@
+FROM centos:6
+
+# Install Ansible
+RUN yum -y update; yum clean all;
+RUN yum -y install epel-release
+RUN yum -y install git python-setuptools gcc sudo libffi-devel python-devel openssl-devel
+RUN yum clean all
+RUN easy_install pip
+RUN pip install ansible
+
+# Disable requiretty
+RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
+
+# Install Ansible inventory file
+RUN mkdir - p /etc/ansible
+RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
+
+CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.php-mysql/tests/Dockerfile.centos-7 b/provisioning/roles/geerlingguy.php-mysql/tests/Dockerfile.centos-7
new file mode 100644
index 000000000..55bc14de6
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-mysql/tests/Dockerfile.centos-7
@@ -0,0 +1,30 @@
+FROM centos:7
+
+# Install systemd -- See https://hub.docker.com/_/centos/
+RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
+RUN yum -y update; yum clean all; \
+(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
+rm -f /lib/systemd/system/multi-user.target.wants/*; \
+rm -f /etc/systemd/system/*.wants/*; \
+rm -f /lib/systemd/system/local-fs.target.wants/*; \
+rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
+rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
+rm -f /lib/systemd/system/basic.target.wants/*; \
+rm -f /lib/systemd/system/anaconda.target.wants/*;
+
+# Install Ansible
+RUN yum -y install epel-release
+RUN yum -y install git python-setuptools gcc sudo libffi-devel python-devel openssl-devel
+RUN yum clean all
+RUN easy_install pip
+RUN pip install ansible
+
+# Disable requiretty
+RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
+
+# Install Ansible inventory file
+RUN mkdir - p /etc/ansible
+RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
+
+VOLUME ["/sys/fs/cgroup"]
+CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.php-mysql/tests/Dockerfile.ubuntu-14.04 b/provisioning/roles/geerlingguy.php-mysql/tests/Dockerfile.ubuntu-14.04
new file mode 100644
index 000000000..f81cabec6
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-mysql/tests/Dockerfile.ubuntu-14.04
@@ -0,0 +1,14 @@
+FROM ubuntu:14.04
+RUN apt-get update
+
+# Install Ansible
+RUN apt-get install -y software-properties-common git
+RUN apt-add-repository -y ppa:ansible/ansible
+RUN apt-get update
+RUN apt-get install -y ansible
+
+COPY initctl_faker .
+RUN chmod +x initctl_faker && rm -fr /sbin/initctl && ln -s /initctl_faker /sbin/initctl
+
+# Install Ansible inventory file
+RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.php-mysql/tests/centos7-vars.yml b/provisioning/roles/geerlingguy.php-mysql/tests/centos7-vars.yml
new file mode 100644
index 000000000..1b0b69304
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-mysql/tests/centos7-vars.yml
@@ -0,0 +1,11 @@
+---
+mysql_packages:
+  - mariadb
+  - mariadb-server
+  - mariadb-libs
+  - MySQL-python
+  - perl-DBD-MySQL
+mysql_daemon: mariadb
+mysql_log_error: /var/log/mariadb/mariadb.log
+mysql_syslog_tag: mariadb
+mysql_pid_file: /var/run/mariadb/mariadb.pid
diff --git a/provisioning/roles/geerlingguy.php-mysql/tests/initctl_faker b/provisioning/roles/geerlingguy.php-mysql/tests/initctl_faker
new file mode 100644
index 000000000..a2267f30d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-mysql/tests/initctl_faker
@@ -0,0 +1,23 @@
+#!/bin/sh
+ALIAS_CMD="$(echo ""$0"" | sed -e 's?/sbin/??')"
+
+case "$ALIAS_CMD" in
+    start|stop|restart|reload|status)
+        exec service $1 $ALIAS_CMD
+        ;;
+esac
+
+case "$1" in
+    list )
+        exec service --status-all
+        ;;
+    reload-configuration )
+        exec service $2 restart
+        ;;
+    start|stop|restart|reload|status)
+        exec service $2 $1
+        ;;
+    \?)
+        exit 0
+        ;;
+esac
diff --git a/provisioning/roles/geerlingguy.php-mysql/tests/inventory b/provisioning/roles/geerlingguy.php-mysql/tests/inventory
new file mode 100644
index 000000000..2fbb50c4a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-mysql/tests/inventory
@@ -0,0 +1 @@
+localhost
diff --git a/provisioning/roles/geerlingguy.php-mysql/tests/requirements.yml b/provisioning/roles/geerlingguy.php-mysql/tests/requirements.yml
new file mode 100644
index 000000000..d11269582
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-mysql/tests/requirements.yml
@@ -0,0 +1,5 @@
+---
+- src: geerlingguy.repo-remi
+- src: geerlingguy.apache
+- src: geerlingguy.mysql
+- src: geerlingguy.php
diff --git a/provisioning/roles/geerlingguy.php-mysql/tests/test.yml b/provisioning/roles/geerlingguy.php-mysql/tests/test.yml
new file mode 100644
index 000000000..2ac82459b
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-mysql/tests/test.yml
@@ -0,0 +1,23 @@
+---
+- hosts: localhost
+  remote_user: root
+
+  vars:
+    php_version: 5.6
+    php_enablerepo: "remi,remi-php56"
+
+  pre_tasks:
+    - name: Include CentOS 7-specific vars.
+      include_vars: centos7-vars.yml
+      when: ansible_os_family == 'RedHat' and ansible_distribution_major_version == "7"
+
+    - name: Add repository for PHP 5.6.
+      apt_repository: repo='ppa:ondrej/php5-5.6'
+      when: ansible_os_family == 'Debian'
+
+  roles:
+    - { role: geerlingguy.repo-remi, when: ansible_os_family == 'RedHat' }
+    - geerlingguy.apache
+    - geerlingguy.mysql
+    - geerlingguy.php
+    - role_under_test
diff --git a/provisioning/roles/geerlingguy.php-mysql/vars/Debian.yml b/provisioning/roles/geerlingguy.php-mysql/vars/Debian.yml
new file mode 100644
index 000000000..7ba3ec0e5
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-mysql/vars/Debian.yml
@@ -0,0 +1,2 @@
+---
+__php_mysql_package: php7.0-mysql
diff --git a/provisioning/roles/geerlingguy.php-mysql/vars/RedHat.yml b/provisioning/roles/geerlingguy.php-mysql/vars/RedHat.yml
new file mode 100644
index 000000000..d10126b4c
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-mysql/vars/RedHat.yml
@@ -0,0 +1,2 @@
+---
+__php_mysql_package: php-mysql
diff --git a/provisioning/roles/geerlingguy.php-pecl/.travis.yml b/provisioning/roles/geerlingguy.php-pecl/.travis.yml
new file mode 100644
index 000000000..e0a3f7cc7
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-pecl/.travis.yml
@@ -0,0 +1,43 @@
+---
+sudo: required
+language: python
+python: "2.7"
+
+env:
+  - SITE=test.yml
+
+before_install:
+  - sudo apt-get update -qq
+
+install:
+  # Install Ansible.
+  - pip install ansible
+
+  # Add ansible.cfg to pick up roles path.
+  - "{ echo '[defaults]'; echo 'roles_path = ../'; } >> ansible.cfg"
+
+  # Install required dependencies.
+  - ansible-galaxy install geerlingguy.php
+
+script:
+  # Check the role/playbook's syntax.
+  - "ansible-playbook -i tests/inventory tests/$SITE --syntax-check"
+
+  # Run the role/playbook with ansible-playbook.
+  - "ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo"
+
+  # Run the role/playbook again, checking to make sure it's idempotent.
+  - >
+    ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo
+    | grep -q 'changed=0.*failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)
+
+  # Make sure Pecl is installed.
+  - >
+    which pecl
+    && (echo 'Pecl is installed' && exit 0)
+    || (echo 'Pecl is not installed' && exit 1)
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.php-pecl/README.md b/provisioning/roles/geerlingguy.php-pecl/README.md
new file mode 100644
index 000000000..cf642b1ca
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-pecl/README.md
@@ -0,0 +1,45 @@
+# Ansible Role: PHP PECL extensions
+
+[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-php-pecl.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-php-pecl)
+
+Installs PHP PECL extensions on servers with PHP already installed.
+
+## Requirements
+
+PHP must already be installed on the server (along with the package `php-pear`), so the `pecl` command can be run.
+
+## Role Variables
+
+Available variables are listed below, along with default values (see `defaults/main.yml`):
+
+    php_pecl_extensions: []
+
+A list of extensions that should be installed via `pecl install`. If you'd like to have this role install extensions like XDebug, just add it in the list, like so:
+
+    php_pecl_extensions:
+      - xdebug
+
+## Dependencies
+
+  - geerlingguy.php
+
+## Example Playbook
+
+    - hosts: webservers
+      vars_files:
+        - vars/main.yml
+      roles:
+        - { role: geerlingguy.php-pecl }
+
+*Inside `vars/main.yml`*:
+
+    php_pecl_extensions:
+      - xdebug
+
+## License
+
+MIT / BSD
+
+## Author Information
+
+This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.php-pecl/defaults/main.yml b/provisioning/roles/geerlingguy.php-pecl/defaults/main.yml
new file mode 100644
index 000000000..397c65753
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-pecl/defaults/main.yml
@@ -0,0 +1,4 @@
+---
+# Add extensions to this list to have them installed with this role.
+php_pecl_extensions: []
+  # - xdebug
diff --git a/provisioning/roles/geerlingguy.php-pecl/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.php-pecl/meta/.galaxy_install_info
new file mode 100644
index 000000000..65a0492ff
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-pecl/meta/.galaxy_install_info
@@ -0,0 +1 @@
+{install_date: 'Fri Jul 15 19:49:37 2016', version: 1.2.1}
diff --git a/provisioning/roles/geerlingguy.php-pecl/meta/main.yml b/provisioning/roles/geerlingguy.php-pecl/meta/main.yml
new file mode 100644
index 000000000..06c138d81
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-pecl/meta/main.yml
@@ -0,0 +1,44 @@
+---
+dependencies:
+  - geerlingguy.php
+
+galaxy_info:
+  author: geerlingguy
+  description: PHP PECL extension installation.
+  company: "Midwestern Mac, LLC"
+  license: "license (BSD, MIT)"
+  min_ansible_version: 1.9
+  platforms:
+    - name: EL
+      versions:
+      - all
+    - name: GenericUNIX
+      versions:
+      - all
+    - name: Fedora
+      versions:
+      - all
+    - name: opensuse
+      versions:
+      - all
+    - name: GenericBSD
+      versions:
+      - all
+    - name: FreeBSD
+      versions:
+      - all
+    - name: Ubuntu
+      versions:
+      - all
+    - name: SLES
+      versions:
+      - all
+    - name: GenericLinux
+      versions:
+      - all
+    - name: Debian
+      versions:
+      - all
+  galaxy_tags:
+    - development
+    - web
diff --git a/provisioning/roles/geerlingguy.php-pecl/tasks/main.yml b/provisioning/roles/geerlingguy.php-pecl/tasks/main.yml
new file mode 100644
index 000000000..840b61e70
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-pecl/tasks/main.yml
@@ -0,0 +1,7 @@
+---
+- name: Install PECL libaries.
+  shell: "yes \"\" | pecl install {{ item }}"
+  register: pecl_result
+  changed_when: "pecl_result.rc == 0"
+  failed_when: "not (('already installed' in pecl_result.stdout) or ('install ok:' in pecl_result.stdout))"
+  with_items: "{{ php_pecl_extensions }}"
diff --git a/provisioning/roles/geerlingguy.php-pecl/tests/inventory b/provisioning/roles/geerlingguy.php-pecl/tests/inventory
new file mode 100644
index 000000000..2fbb50c4a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-pecl/tests/inventory
@@ -0,0 +1 @@
+localhost
diff --git a/provisioning/roles/geerlingguy.php-pecl/tests/test.yml b/provisioning/roles/geerlingguy.php-pecl/tests/test.yml
new file mode 100644
index 000000000..a1369f2e5
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-pecl/tests/test.yml
@@ -0,0 +1,6 @@
+---
+- hosts: localhost
+  remote_user: root
+  roles:
+    - geerlingguy.php
+    - ansible-role-php-pecl
diff --git a/provisioning/roles/geerlingguy.php-redis/.travis.yml b/provisioning/roles/geerlingguy.php-redis/.travis.yml
new file mode 100644
index 000000000..f4fe38645
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-redis/.travis.yml
@@ -0,0 +1,40 @@
+---
+sudo: required
+language: python
+python: "2.7"
+
+env:
+  - SITE=test.yml
+
+before_install:
+  - sudo apt-get update -qq
+
+install:
+  # Install Ansible.
+  - pip install ansible
+
+  # Add ansible.cfg to pick up roles path.
+  - "{ echo '[defaults]'; echo 'roles_path = ../'; } >> ansible.cfg"
+
+  # Install dependencies.
+  - ansible-galaxy install geerlingguy.redis geerlingguy.php
+
+script:
+  # Check the role/playbook's syntax.
+  - "ansible-playbook -i tests/inventory tests/$SITE --syntax-check"
+
+  # Run the role/playbook with ansible-playbook.
+  - "ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo"
+
+  # Run the role/playbook again, checking to make sure it's idempotent.
+  - >
+    ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo
+    | grep -q 'changed=0.*failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)
+
+  # Run script to test if Redis is available and working.
+  - php tests/redis-test.php
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.php-redis/README.md b/provisioning/roles/geerlingguy.php-redis/README.md
new file mode 100644
index 000000000..74f5dfe8d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-redis/README.md
@@ -0,0 +1,63 @@
+# Ansible Role: PhpRedis
+
+[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-php-redis.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-php-redis)
+
+Installs PhpRedis support on Linux.
+
+## Requirements
+
+This role doesn't *explicitly* require Redis to be installed, but if you don't have the daemon running somewhere (either on the same server, or somewhere else), this role won't be all that helpful. Check out `geerlingguy.redis` for a simple role to install and configure Redis (either on the same server, or separate servers).
+
+## Role Variables
+
+Available variables are listed below, along with default values (see `defaults/main.yml`):
+
+    php_enablerepo: ""
+
+(RedHat/CentOS only) If you have enabled any additional repositories (might I suggest geerlingguy.repo-epel or geerlingguy.repo-remi), those repositories can be listed under this variable (e.g. `remi,epel`). This can be handy, as an example, if you want to install the latest version of PHP from Remi's repository.
+
+    php_redis_package: php-redis
+
+(Default for Debian/Ubuntu shown). If installing from apt or yum, which package to install which provides the PhpRedis extension. (For PHP 5.x on Debian, this should be `php5-redis`).
+
+### Install from source
+
+If you want to install PhpRedis directly from source (if you're on an OS that doesn't have it available as a package, or if you want a newer version than is available through your package manager), you can use the variables below to configure the source installation:
+
+    php_redis_install_from_source: false
+
+Whether to install PhpRedis from source. If you'd like to install a specific version of PhpRedis not available via the system package manager, you can compile the extension from source. Note that source installation is forced on Ubuntu 12.04.
+
+    php_redis_source_repo: https://github.com/phpredis/phpredis.git
+
+The git repository for the PhpRedis extension.
+
+    php_redis_source_version: develop
+
+The branch, tag, or commit hash to use when cloning the source repository. Can be a branch (e.g. `develop` or `php7`), a tag (e.g. `2.2.7`), or a commit hash (e.g. `5241a5c`).
+
+    php_redis_source_clone_dir: ~/phpredis
+
+The location where the PhpRedis source code will be cloned locally.
+
+    php_redis_source_configure_command: "./configure"
+
+The command to configure a PhpRedis source install. You can modify this command if you want to do something like add `--enable-redis-igbinary`.
+
+## Dependencies
+
+  - geerlingguy.php
+
+## Example Playbook
+
+    - hosts: webservers
+      roles:
+        - { role: geerlingguy.php-redis }
+
+## License
+
+MIT / BSD
+
+## Author Information
+
+This role was created in 2015 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.php-redis/defaults/main.yml b/provisioning/roles/geerlingguy.php-redis/defaults/main.yml
new file mode 100644
index 000000000..a561b7971
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-redis/defaults/main.yml
@@ -0,0 +1,10 @@
+---
+# Pass in a comma-separated list of repos to use (e.g. "remi,epel").
+php_enablerepo: ""
+
+# Whether to install the extension from source or from an apt or yum repo.
+php_redis_install_from_source: false
+php_redis_source_repo: https://github.com/phpredis/phpredis.git
+php_redis_source_version: develop
+php_redis_source_clone_dir: ~/phpredis
+php_redis_source_configure_command: "./configure"
diff --git a/provisioning/roles/geerlingguy.php-redis/files/redis.ini b/provisioning/roles/geerlingguy.php-redis/files/redis.ini
new file mode 100644
index 000000000..6aecae489
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-redis/files/redis.ini
@@ -0,0 +1 @@
+extension=redis.so
diff --git a/provisioning/roles/geerlingguy.php-redis/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.php-redis/meta/.galaxy_install_info
new file mode 100644
index 000000000..0d0322513
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-redis/meta/.galaxy_install_info
@@ -0,0 +1 @@
+{install_date: 'Fri Jul 15 19:49:41 2016', version: 3.0.0}
diff --git a/provisioning/roles/geerlingguy.php-redis/meta/main.yml b/provisioning/roles/geerlingguy.php-redis/meta/main.yml
new file mode 100644
index 000000000..810ac2ce1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-redis/meta/main.yml
@@ -0,0 +1,24 @@
+---
+dependencies:
+  - geerlingguy.php
+
+galaxy_info:
+  author: geerlingguy
+  description: PhpRedis support for Linux
+  company: "Midwestern Mac, LLC"
+  license: "license (BSD, MIT)"
+  min_ansible_version: 1.8
+  platforms:
+    - name: EL
+      versions:
+      - 6
+      - 7
+    - name: Debian
+      versions:
+      - all
+    - name: Ubuntu
+      versions:
+      - all
+  galaxy_tags:
+    - database
+    - web
diff --git a/provisioning/roles/geerlingguy.php-redis/tasks/install-from-source.yml b/provisioning/roles/geerlingguy.php-redis/tasks/install-from-source.yml
new file mode 100644
index 000000000..73c40fc7e
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-redis/tasks/install-from-source.yml
@@ -0,0 +1,36 @@
+---
+- name: Clone the PhpRedis repo.
+  git:
+    repo: "{{ php_redis_source_repo }}"
+    dest: "{{ php_redis_source_clone_dir }}"
+    version: "{{ php_redis_source_version }}"
+    accept_hostkey: yes
+    depth: 1
+
+- name: Run phpize.
+  shell: >
+    phpize
+    chdir={{ php_redis_source_clone_dir }}
+    creates={{ php_extension_conf_paths[0] }}/redis.ini
+
+- name: Run configure script.
+  shell: >
+    {{ php_redis_source_configure_command }}
+    chdir={{ php_redis_source_clone_dir }}
+    creates={{ php_extension_conf_paths[0] }}/redis.ini
+
+- name: Make and install PHP.
+  shell: >
+    {{ item }}
+    chdir={{ php_redis_source_clone_dir }}
+    creates={{ php_extension_conf_paths[0] }}/redis.ini
+  with_items:
+    - make
+    - make install
+
+- name: Ensure the Redis extension is present in PHP's configuration.
+  copy:
+    src: redis.ini
+    dest: "{{ php_extension_conf_paths[0] }}/redis.ini"
+    mode: 0644
+  notify: restart webserver
diff --git a/provisioning/roles/geerlingguy.php-redis/tasks/main.yml b/provisioning/roles/geerlingguy.php-redis/tasks/main.yml
new file mode 100644
index 000000000..bca9bef4e
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-redis/tasks/main.yml
@@ -0,0 +1,36 @@
+---
+# Include variables and define needed variables.
+- name: Include OS-specific variables.
+  include_vars: "{{ ansible_os_family }}.yml"
+
+- name: Define php_redis_package.
+  set_fact:
+    php_redis_package: "{{ __php_redis_package }}"
+  when: php_redis_package is not defined
+
+- name: Force install from source on Ubuntu 12.04.
+  set_fact:
+    php_redis_install_from_source: true
+  when: ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'precise'
+
+# Install PhpRedis from the system package manager.
+- name: Install PhpRedis extension (RedHat).
+  yum:
+    name: "{{ php_redis_package }}"
+    state: installed
+    enablerepo: "{{ php_enablerepo }}"
+  notify:
+    - restart webserver
+    - restart php-fpm
+  when: (php_redis_install_from_source == false) and (ansible_os_family == 'RedHat')
+
+- name: Install PhpRedis extension (Debian).
+  apt: "name={{ php_redis_package }} state=installed"
+  notify:
+    - restart webserver
+    - restart php-fpm
+  when: (php_redis_install_from_source == false) and (ansible_os_family == 'Debian')
+
+# Install PhpRedis from source.
+- include: install-from-source.yml
+  when: php_redis_install_from_source == true
diff --git a/provisioning/roles/geerlingguy.php-redis/tests/inventory b/provisioning/roles/geerlingguy.php-redis/tests/inventory
new file mode 100644
index 000000000..2fbb50c4a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-redis/tests/inventory
@@ -0,0 +1 @@
+localhost
diff --git a/provisioning/roles/geerlingguy.php-redis/tests/redis-test.php b/provisioning/roles/geerlingguy.php-redis/tests/redis-test.php
new file mode 100644
index 000000000..b86c65aa9
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-redis/tests/redis-test.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * @file
+ * Test if Redis is available and working.
+ */
+
+$success = FALSE;
+$key = 'test';
+$value = 'Success';
+
+if (class_exists('Redis')) {
+  $redis = new Redis;
+  $redis->connect('127.0.0.1', 6379);
+
+  // Test adding a value to redis.
+  if ($redis->set($key, $value)) {
+    $result = $redis->get($key);
+
+    // If we get the expected result, it was a success.
+    if ($result == $value) {
+      $success = TRUE;
+      print "Redis connection successful.\r\n";
+      exit(0);
+    }
+  }
+}
+
+if (!$success) {
+  print "Redis not working properly.\r\n";
+  exit(1);
+}
diff --git a/provisioning/roles/geerlingguy.php-redis/tests/test.yml b/provisioning/roles/geerlingguy.php-redis/tests/test.yml
new file mode 100644
index 000000000..f101e0872
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-redis/tests/test.yml
@@ -0,0 +1,14 @@
+---
+- hosts: localhost
+  remote_user: root
+
+  vars:
+    # Because Travis runs on Ubuntu 12.04, PhpRedis is not available via package
+    # so we have to install from source.
+    php_redis_install_from_source: true
+    php_enable_webserver: false
+
+  roles:
+    - geerlingguy.redis
+    - geerlingguy.php
+    - ansible-role-php-redis
diff --git a/provisioning/roles/geerlingguy.php-redis/vars/Debian.yml b/provisioning/roles/geerlingguy.php-redis/vars/Debian.yml
new file mode 100644
index 000000000..db5f96108
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-redis/vars/Debian.yml
@@ -0,0 +1,2 @@
+---
+__php_redis_package: php-redis
diff --git a/provisioning/roles/geerlingguy.php-redis/vars/RedHat.yml b/provisioning/roles/geerlingguy.php-redis/vars/RedHat.yml
new file mode 100644
index 000000000..11c6873d7
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-redis/vars/RedHat.yml
@@ -0,0 +1,2 @@
+---
+__php_redis_package: php-pecl-redis
diff --git a/provisioning/roles/geerlingguy.php-xdebug/.gitignore b/provisioning/roles/geerlingguy.php-xdebug/.gitignore
new file mode 100644
index 000000000..e43b0f988
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xdebug/.gitignore
@@ -0,0 +1 @@
+.DS_Store
diff --git a/provisioning/roles/geerlingguy.php-xdebug/.travis.yml b/provisioning/roles/geerlingguy.php-xdebug/.travis.yml
new file mode 100644
index 000000000..f67ce39ed
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xdebug/.travis.yml
@@ -0,0 +1,62 @@
+---
+sudo: required
+
+env:
+  - distribution: centos
+    version: 6
+    init: /sbin/init
+    run_opts: ""
+    SITE: source
+  - distribution: centos
+    version: 7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    SITE: source
+  - distribution: ubuntu
+    version: 14.04
+    init: /sbin/init
+    run_opts: ""
+    SITE: source
+  - distribution: ubuntu
+    version: 12.04
+    init: /sbin/init
+    run_opts: ""
+    SITE: source
+
+services:
+  - docker
+
+before_install:
+  # Pull container
+  - 'sudo docker pull ${distribution}:${version}'
+  # Customize container
+  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+
+script:
+  - container_id=$(mktemp)
+  # Run container in detached state
+  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+
+  # Install dependencies.
+  - 'sudo docker exec "$(cat ${container_id})" ansible-galaxy install geerlingguy.php geerlingguy.repo-remi'
+
+  # Ansible syntax check.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test-${SITE}.yml --syntax-check'
+
+  # Test role.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test-${SITE}.yml'
+
+  # Test role idempotence.
+  - >
+    sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test-${SITE}.yml
+    | grep -q 'changed=0.*failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)
+  # Run script to test if Xdebug is available and working.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm php /etc/ansible/roles/role_under_test/tests/xdebug-test.php'
+
+  # Clean up
+  - 'sudo docker stop "$(cat ${container_id})"'
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.php-xdebug/README.md b/provisioning/roles/geerlingguy.php-xdebug/README.md
new file mode 100644
index 000000000..6fe84800d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xdebug/README.md
@@ -0,0 +1,77 @@
+# Ansible Role: PHP-XDebug
+
+[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-php-xdebug.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-php-xdebug)
+
+Installs PHP [XDebug](http://xdebug.org/) on Linux servers.
+
+## Requirements
+
+Prior to running this role, make sure the `php-devel` and `@Development Tools` (for RHEL/CentOS) or `php5-dev` + `build-essential` packages (for Debian/Ubuntu) are present on the system, as they are required for the build of Xdebug.
+
+## Role Variables
+
+Available variables are listed below, along with default values (see `defaults/main.yml`):
+
+    workspace: /root
+
+Where Xdebug setup files will be downloaded and built.
+
+    php_xdebug_version: 2.4.0
+
+The version of Xdebug to be installed (see [Updates](https://xdebug.org/updates.php) for a current listing).
+
+    php_xdebug_default_enable: 1
+    php_xdebug_coverage_enable: 1
+
+Whether to enable XDebug coverage and default exception handling or not. Disable these for slightly improved PHP performance, enable these to use XDebug to the fullest extent.
+
+    php_xdebug_cli_enable: 1
+
+Whether xdebug is enabled for the CLI.
+
+    php_xdebug_module_path: /usr/lib64/php/modules
+
+The path where `xdebug.so` will be installed.
+
+    php_xdebug_remote_enable: "false"
+
+Whether remote debugging is enabled.
+
+    php_xdebug_remote_connect_back: "false"
+
+If this is set to true, Xdebug will respond to any request from any IP address; use only for local development on non-public installations!
+
+    php_xdebug_remote_host: localhost
+    php_xdebug_remote_port: "9000"
+
+The host and port on which Xdebug will listen.
+
+    php_xdebug_remote_log: /tmp/xdebug.log
+
+The location of the xdebug log (useful if you're having trouble connecting).
+
+    php_xdebug_idekey: sublime.xdebug
+
+The IDE key to use in the URL when making Xdebug requests (e.g. `http://example.local/?XDEBUG_SESSION_START=sublime.xdebug`).
+
+    php_xdebug_max_nesting_level: 100
+
+The maximimum function nesting level before Xdebug bails and throws a fatal exception.
+
+## Dependencies
+
+  - geerlingguy.php
+
+## Example Playbook
+
+    - hosts: webservers
+      roles:
+        - { role: geerlingguy.php-xdebug }
+
+## License
+
+MIT / BSD
+
+## Author Information
+
+This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.php-xdebug/defaults/main.yml b/provisioning/roles/geerlingguy.php-xdebug/defaults/main.yml
new file mode 100644
index 000000000..ecccbf1ec
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xdebug/defaults/main.yml
@@ -0,0 +1,20 @@
+---
+workspace: /root
+
+php_xdebug_version: 2.4.0
+
+php_xdebug_coverage_enable: 1
+php_xdebug_default_enable: 1
+php_xdebug_cli_enable: 1
+
+php_xdebug_remote_enable: "false"
+php_xdebug_remote_connect_back: "false"
+php_xdebug_remote_host: localhost
+php_xdebug_remote_port: "9000"
+php_xdebug_remote_log: /tmp/xdebug.log
+php_xdebug_remote_autostart: "false"
+
+php_xdebug_idekey: sublime.xdebug
+
+php_xdebug_max_nesting_level: 256
+
diff --git a/provisioning/roles/geerlingguy.php-xdebug/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.php-xdebug/meta/.galaxy_install_info
new file mode 100644
index 000000000..ce1859dd6
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xdebug/meta/.galaxy_install_info
@@ -0,0 +1 @@
+{install_date: 'Fri Jul 15 19:49:44 2016', version: 2.1.0}
diff --git a/provisioning/roles/geerlingguy.php-xdebug/meta/main.yml b/provisioning/roles/geerlingguy.php-xdebug/meta/main.yml
new file mode 100644
index 000000000..8724d2929
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xdebug/meta/main.yml
@@ -0,0 +1,44 @@
+---
+dependencies:
+  - geerlingguy.php
+
+galaxy_info:
+  author: geerlingguy
+  description: PHP XDebug for Linux
+  company: "Midwestern Mac, LLC"
+  license: "license (BSD, MIT)"
+  min_ansible_version: 1.8
+  platforms:
+    - name: EL
+      versions:
+      - all
+    - name: GenericUNIX
+      versions:
+      - all
+    - name: Fedora
+      versions:
+      - all
+    - name: opensuse
+      versions:
+      - all
+    - name: GenericBSD
+      versions:
+      - all
+    - name: FreeBSD
+      versions:
+      - all
+    - name: Ubuntu
+      versions:
+      - all
+    - name: SLES
+      versions:
+      - all
+    - name: GenericLinux
+      versions:
+      - all
+    - name: Debian
+      versions:
+      - all
+  galaxy_tags:
+    - development
+    - web
diff --git a/provisioning/roles/geerlingguy.php-xdebug/tasks/configure.yml b/provisioning/roles/geerlingguy.php-xdebug/tasks/configure.yml
new file mode 100644
index 000000000..944e35b5f
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xdebug/tasks/configure.yml
@@ -0,0 +1,12 @@
+---
+- name: Copy xdebug ini into main extension config folder.
+  template:
+    src: xdebug.ini.j2
+    dest: "{{ item }}/{{ php_xdebug_config_filename }}"
+    owner: root
+    group: root
+    mode: 0644
+  with_items: "{{ php_extension_conf_paths }}"
+  notify:
+    - restart webserver
+    - restart php-fpm
diff --git a/provisioning/roles/geerlingguy.php-xdebug/tasks/main.yml b/provisioning/roles/geerlingguy.php-xdebug/tasks/main.yml
new file mode 100644
index 000000000..2a0302e2e
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xdebug/tasks/main.yml
@@ -0,0 +1,56 @@
+---
+- name: Include OS-specific variables.
+  include_vars: "{{ ansible_os_family }}.yml"
+
+- name: Ensure dependencies for building from source are installed (RedHat).
+  yum: "pkg={{ item }} state=installed"
+  with_items:
+    - make
+  when: ansible_os_family == 'RedHat'
+
+- name: Ensure dependencies for building from source are installed (Debian).
+  apt: "pkg={{ item }} state=installed"
+  with_items:
+    - make
+  when: ansible_os_family == 'Debian'
+
+- name: Download Xdebug.
+  get_url:
+    url: "https://xdebug.org/files/xdebug-{{ php_xdebug_version }}.tgz"
+    dest: "{{ workspace }}/xdebug-{{ php_xdebug_version }}.tgz"
+
+# TODO: In 2.0, we can set the 'src' to the URL from the get_url task above and
+# cut out one extra task :)
+- name: Untar Xdebug.
+  unarchive:
+    src: "{{ workspace }}/xdebug-{{ php_xdebug_version }}.tgz"
+    dest: "{{ workspace }}"
+    copy: no
+
+
+- name: Build Xdebug.
+  shell: >
+    {{ item }}
+    chdir={{ workspace }}/xdebug-{{ php_xdebug_version }}
+    creates={{ workspace }}/xdebug-{{ php_xdebug_version }}/modules/xdebug.so
+  with_items:
+    - phpize
+    - ./configure
+    - make
+  notify: restart webserver
+
+- name: Ensure Xdebug module path exists.
+  file:
+    path: "{{ php_xdebug_module_path }}"
+    state: directory
+    owner: root
+    group: root
+    mode: 0755
+
+- name: Move Xdebug module into place.
+  shell: >
+    cp {{ workspace }}/xdebug-{{ php_xdebug_version }}/modules/xdebug.so {{ php_xdebug_module_path }}/xdebug.so
+    creates={{ php_xdebug_module_path }}/xdebug.so
+  notify: restart webserver
+
+- include: configure.yml
diff --git a/provisioning/roles/geerlingguy.php-xdebug/templates/xdebug.ini.j2 b/provisioning/roles/geerlingguy.php-xdebug/templates/xdebug.ini.j2
new file mode 100644
index 000000000..e787262f2
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xdebug/templates/xdebug.ini.j2
@@ -0,0 +1,17 @@
+[XDebug]
+zend_extension="{{ php_xdebug_module_path }}/xdebug.so"
+
+xdebug.coverage_enable={{ php_xdebug_coverage_enable }}
+xdebug.default_enable={{ php_xdebug_default_enable }}
+
+xdebug.remote_enable={{ php_xdebug_remote_enable }}
+xdebug.remote_connect_back={{ php_xdebug_remote_connect_back }}
+xdebug.remote_host={{ php_xdebug_remote_host }}
+xdebug.remote_port={{ php_xdebug_remote_port }}
+xdebug.remote_handler=dbgp
+xdebug.remote_log={{ php_xdebug_remote_log }}
+xdebug.remote_autostart={{ php_xdebug_remote_autostart }}
+
+xdebug.idekey="{{ php_xdebug_idekey }}"
+
+xdebug.max_nesting_level={{ php_xdebug_max_nesting_level }}
diff --git a/provisioning/roles/geerlingguy.php-xdebug/tests/Dockerfile.centos-6 b/provisioning/roles/geerlingguy.php-xdebug/tests/Dockerfile.centos-6
new file mode 100644
index 000000000..7adc80e49
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xdebug/tests/Dockerfile.centos-6
@@ -0,0 +1,19 @@
+FROM centos:6
+
+# Install Ansible
+RUN yum -y update; yum clean all;
+RUN yum -y install epel-release
+RUN yum update openssl
+RUN yum -y install git python-setuptools gcc sudo libffi-devel python-devel openssl-devel
+RUN yum clean all
+RUN easy_install pip
+RUN pip install ansible
+
+# Disable requiretty
+RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
+
+# Install Ansible inventory file
+RUN mkdir -p /etc/ansible
+RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
+
+CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.php-xdebug/tests/Dockerfile.centos-7 b/provisioning/roles/geerlingguy.php-xdebug/tests/Dockerfile.centos-7
new file mode 100644
index 000000000..7df59cdbb
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xdebug/tests/Dockerfile.centos-7
@@ -0,0 +1,29 @@
+FROM centos:7
+
+# Install systemd -- See https://hub.docker.com/_/centos/
+RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
+RUN yum -y update; yum clean all; \
+(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
+rm -f /lib/systemd/system/multi-user.target.wants/*; \
+rm -f /etc/systemd/system/*.wants/*; \
+rm -f /lib/systemd/system/local-fs.target.wants/*; \
+rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
+rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
+rm -f /lib/systemd/system/basic.target.wants/*; \
+rm -f /lib/systemd/system/anaconda.target.wants/*;
+
+# Install Ansible
+RUN yum -y install git python-setuptools gcc sudo libffi-devel python-devel openssl-devel
+RUN yum clean all
+RUN easy_install pip
+RUN pip install ansible
+
+# Disable requiretty
+RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
+
+# Install Ansible inventory file
+RUN mkdir -p /etc/ansible
+RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
+
+VOLUME ["/sys/fs/cgroup"]
+CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.php-xdebug/tests/Dockerfile.ubuntu-12.04 b/provisioning/roles/geerlingguy.php-xdebug/tests/Dockerfile.ubuntu-12.04
new file mode 100644
index 000000000..d0c130cdf
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xdebug/tests/Dockerfile.ubuntu-12.04
@@ -0,0 +1,11 @@
+FROM ubuntu:12.04
+RUN apt-get update
+
+# Install Ansible
+RUN apt-get install -y software-properties-common python-software-properties git
+RUN apt-add-repository -y ppa:ansible/ansible
+RUN apt-get update
+RUN apt-get install -y ansible
+
+# Install Ansible inventory file
+RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.php-xdebug/tests/Dockerfile.ubuntu-14.04 b/provisioning/roles/geerlingguy.php-xdebug/tests/Dockerfile.ubuntu-14.04
new file mode 100644
index 000000000..ca332871f
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xdebug/tests/Dockerfile.ubuntu-14.04
@@ -0,0 +1,11 @@
+FROM ubuntu:14.04
+RUN apt-get update
+
+# Install Ansible
+RUN apt-get install -y software-properties-common git
+RUN apt-add-repository -y ppa:ansible/ansible
+RUN apt-get update
+RUN apt-get install -y ansible
+
+# Install Ansible inventory file
+RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.php-xdebug/tests/inventory b/provisioning/roles/geerlingguy.php-xdebug/tests/inventory
new file mode 100644
index 000000000..2fbb50c4a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xdebug/tests/inventory
@@ -0,0 +1 @@
+localhost
diff --git a/provisioning/roles/geerlingguy.php-xdebug/tests/test-source.yml b/provisioning/roles/geerlingguy.php-xdebug/tests/test-source.yml
new file mode 100644
index 000000000..9f1e024b9
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xdebug/tests/test-source.yml
@@ -0,0 +1,21 @@
+---
+- hosts: all
+
+  vars:
+    php_enable_webserver: false
+    php_version: 5.6
+    php_enablerepo: "remi,remi-php56"
+
+  pre_tasks:
+    - name: Ensure build dependencies are installed (RedHat).
+      yum: name=which state=present
+      when: ansible_os_family == 'RedHat'
+
+    - name: Add repository for PHP 5.6.
+      apt_repository: repo='ppa:ondrej/php5-5.6'
+      when: ansible_os_family == 'Debian'
+
+  roles:
+    - { role: geerlingguy.repo-remi, when: ansible_os_family == 'RedHat' }
+    - geerlingguy.php
+    - role_under_test
diff --git a/provisioning/roles/geerlingguy.php-xdebug/tests/xdebug-test.php b/provisioning/roles/geerlingguy.php-xdebug/tests/xdebug-test.php
new file mode 100644
index 000000000..d5ff4f47a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xdebug/tests/xdebug-test.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * @file
+ * Test if Xdebug is available and working.
+ */
+
+$success = FALSE;
+
+// Simple check; this function should return an empty array.
+$test = xdebug_get_code_coverage();
+if ($test === array()) {
+  $success = TRUE;
+  print "Xdebug working properly.\r\n";
+  exit(0);
+}
+
+if (!$success) {
+  print "Xdebug not working properly.\r\n";
+  exit(1);
+}
diff --git a/provisioning/roles/geerlingguy.php-xdebug/vars/Debian.yml b/provisioning/roles/geerlingguy.php-xdebug/vars/Debian.yml
new file mode 100644
index 000000000..cff33a28f
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xdebug/vars/Debian.yml
@@ -0,0 +1,3 @@
+---
+php_xdebug_module_path: /usr/lib/php5/modules
+php_xdebug_config_filename: 20-xdebug.ini
diff --git a/provisioning/roles/geerlingguy.php-xdebug/vars/RedHat.yml b/provisioning/roles/geerlingguy.php-xdebug/vars/RedHat.yml
new file mode 100644
index 000000000..b66a725a8
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xdebug/vars/RedHat.yml
@@ -0,0 +1,3 @@
+---
+php_xdebug_module_path: /usr/lib64/php/modules
+php_xdebug_config_filename: xdebug.ini
diff --git a/provisioning/roles/geerlingguy.php-xhprof/.gitignore b/provisioning/roles/geerlingguy.php-xhprof/.gitignore
new file mode 100644
index 000000000..e43b0f988
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xhprof/.gitignore
@@ -0,0 +1 @@
+.DS_Store
diff --git a/provisioning/roles/geerlingguy.php-xhprof/.travis.yml b/provisioning/roles/geerlingguy.php-xhprof/.travis.yml
new file mode 100644
index 000000000..00c73d710
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xhprof/.travis.yml
@@ -0,0 +1,58 @@
+---
+sudo: required
+
+env:
+  - distribution: centos
+    version: 7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    SITE: source
+  - distribution: ubuntu
+    version: 14.04
+    init: /sbin/init
+    run_opts: ""
+    SITE: source
+  - distribution: ubuntu
+    version: 12.04
+    init: /sbin/init
+    run_opts: ""
+    SITE: source
+
+services:
+  - docker
+
+before_install:
+  # Pull container
+  - 'sudo docker pull ${distribution}:${version}'
+  # Customize container
+  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+
+script:
+  - container_id=$(mktemp)
+  # Run container in detached state
+  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+
+  # Install dependencies.
+  - 'sudo docker exec "$(cat ${container_id})" ansible-galaxy install geerlingguy.php geerlingguy.repo-remi'
+
+  # Ansible syntax check.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test-${SITE}.yml --syntax-check'
+
+  # Test role.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test-${SITE}.yml'
+
+  # Test role idempotence.
+  - >
+    sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test-${SITE}.yml
+    | grep -q 'changed=0.*failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)
+
+  # Run script to test if XHProf is available and working.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm php /etc/ansible/roles/role_under_test/tests/xhprof-test.php'
+
+  # Clean up
+  - 'sudo docker stop "$(cat ${container_id})"'
+
+notifications:
+   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.php-xhprof/README.md b/provisioning/roles/geerlingguy.php-xhprof/README.md
new file mode 100644
index 000000000..fb2171cce
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xhprof/README.md
@@ -0,0 +1,52 @@
+# Ansible Role: PHP-XHProf
+
+[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-php-xhprof.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-php-xhprof)
+
+Installs PHP [XHProf](http://php.net/manual/en/book.xhprof.php) on Linux servers.
+
+## Requirements
+
+None.
+
+## Role Variables
+
+Available variables are listed below, along with default values (see `defaults/main.yml`):
+
+    workspace: /root
+
+Where XHProf setup files will be downloaded and built.
+
+    xhprof_download_url: https://github.com/RustJason/xhprof/archive/php7.zip
+    xhprof_download_folder_name: xhprof-php7
+
+The URL from which XHProf will be downloaded. Note that this default is for the PHP 7-compatible version of XHProf. If you're using PHP 5.x, you should probably switch to the 'official' upstream source: `https://github.com/phacility/xhprof/archive/master.tar.gz`.
+
+    xhprof_output_dir: /tmp
+
+Directory where XHProf runs are stored.
+
+    php_xhprof_lib_dir: /usr/share/php/xhprof_lib
+
+Directory where the XHProf PHP library is stored.
+
+    php_xhprof_html_dir: /usr/share/php/xhprof_html
+
+Directory where the XHProf UI is stored.
+
+## Dependencies
+
+  - geerlingguy.php
+
+## Example Playbook
+
+    - hosts: webservers
+      roles:
+        - { role: geerlingguy.php-xhprof }
+
+## License
+
+MIT / BSD
+
+## Author Information
+
+This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.php-xhprof/defaults/main.yml b/provisioning/roles/geerlingguy.php-xhprof/defaults/main.yml
new file mode 100644
index 000000000..5466cdcfe
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xhprof/defaults/main.yml
@@ -0,0 +1,14 @@
+---
+workspace: /root
+
+# Use the commented URL and folder below if you want to use the 'official'
+# XHProf project.
+xhprof_download_url: https://github.com/RustJason/xhprof/archive/php7.zip
+#xhprof_download_url: https://github.com/phacility/xhprof/archive/master.tar.gz
+xhprof_download_folder_name: xhprof-php7
+# xhprof_download_folder_name: xhprof-master
+
+xhprof_output_dir: /tmp
+
+php_xhprof_lib_dir: /usr/share/php/xhprof_lib
+php_xhprof_html_dir: /usr/share/php/xhprof_html
diff --git a/provisioning/roles/geerlingguy.php-xhprof/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.php-xhprof/meta/.galaxy_install_info
new file mode 100644
index 000000000..87ecc7639
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xhprof/meta/.galaxy_install_info
@@ -0,0 +1 @@
+{install_date: 'Fri Jul 15 19:49:48 2016', version: 2.1.2}
diff --git a/provisioning/roles/geerlingguy.php-xhprof/meta/main.yml b/provisioning/roles/geerlingguy.php-xhprof/meta/main.yml
new file mode 100644
index 000000000..f4fd533b2
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xhprof/meta/main.yml
@@ -0,0 +1,44 @@
+---
+dependencies:
+  - geerlingguy.php
+
+galaxy_info:
+  author: geerlingguy
+  description: PHP XHProf for Linux
+  company: "Midwestern Mac, LLC"
+  license: "license (BSD, MIT)"
+  min_ansible_version: 1.8
+  platforms:
+    - name: EL
+      versions:
+      - all
+    - name: GenericUNIX
+      versions:
+      - all
+    - name: Fedora
+      versions:
+      - all
+    - name: opensuse
+      versions:
+      - all
+    - name: GenericBSD
+      versions:
+      - all
+    - name: FreeBSD
+      versions:
+      - all
+    - name: Ubuntu
+      versions:
+      - all
+    - name: SLES
+      versions:
+      - all
+    - name: GenericLinux
+      versions:
+      - all
+    - name: Debian
+      versions:
+      - all
+  galaxy_tags:
+    - development
+    - web
diff --git a/provisioning/roles/geerlingguy.php-xhprof/tasks/configure.yml b/provisioning/roles/geerlingguy.php-xhprof/tasks/configure.yml
new file mode 100644
index 000000000..67fcbfc2b
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xhprof/tasks/configure.yml
@@ -0,0 +1,18 @@
+---
+- name: Ensure PHP configuration directories exist.
+  file:
+    path: "{{ item }}"
+    state: directory
+    mode: 0755
+    follow: true
+  with_items: "{{ php_extension_conf_paths }}"
+
+- name: Copy XHProf INI into various other conf folders.
+  template:
+    src: xhprof.ini.j2
+    dest: "{{ item }}/{{ php_xhprof_config_filename }}"
+    owner: root
+    group: root
+    mode: 0644
+  with_items: "{{ php_extension_conf_paths }}"
+  notify: restart webserver
diff --git a/provisioning/roles/geerlingguy.php-xhprof/tasks/main.yml b/provisioning/roles/geerlingguy.php-xhprof/tasks/main.yml
new file mode 100644
index 000000000..8189bacfb
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xhprof/tasks/main.yml
@@ -0,0 +1,68 @@
+---
+- name: Include OS-specific variables.
+  include_vars: "{{ ansible_os_family }}.yml"
+
+# Setup/install tasks.
+- include: setup-RedHat.yml
+  when: ansible_os_family == 'RedHat'
+
+- include: setup-Debian.yml
+  when: ansible_os_family == 'Debian'
+
+- name: Download XHProf source.
+  get_url:
+    url: "{{ xhprof_download_url }}"
+    dest: "{{ workspace }}/xhprof.tar.gz"
+  register: xhprof_download_get_url
+
+# TODO: In 2.0, we can set the 'src' to the URL from the get_url task above and
+# cut out one extra task :)
+- name: Untar XHProf.
+  unarchive:
+    src: "{{ workspace }}/xhprof.tar.gz"
+    dest: "{{ workspace }}"
+    copy: no
+  when: xhprof_download_get_url.changed
+
+- name: Build XHProf.
+  shell: >
+    {{ item }}
+    chdir={{ workspace }}/{{ xhprof_download_folder_name }}/extension
+    creates={{ workspace }}/{{ xhprof_download_folder_name }}/extension/modules/xhprof.so
+  with_items:
+    - phpize
+    - ./configure
+    - make
+  notify: restart webserver
+
+- name: Ensure XHProf module path exists.
+  file:
+    path: "{{ php_xhprof_module_path }}"
+    state: directory
+    owner: root
+    group: root
+    mode: 0755
+
+- name: Move XHProf module into place.
+  shell: >
+    cp {{ workspace }}/{{ xhprof_download_folder_name }}/extension/modules/xhprof.so {{ php_xhprof_module_path }}/xhprof.so
+    creates={{ php_xhprof_module_path }}/xhprof.so
+  notify: restart webserver
+
+- name: Move XHProf PHP library into place.
+  shell: >
+    cp -r {{ workspace }}/{{ xhprof_download_folder_name }}/xhprof_lib {{ php_xhprof_lib_dir }}
+    creates={{ php_xhprof_lib_dir }}/utils/xhprof_lib.php
+
+- name: Move XHProf UI into place.
+  shell: >
+    cp -r {{ workspace }}/{{ xhprof_download_folder_name }}/xhprof_html {{ php_xhprof_html_dir }}
+    creates={{ php_xhprof_html_dir }}/index.php
+
+- include: configure.yml
+
+- name: Ensure XHProf output directory exists.
+  file:
+    path: "{{ xhprof_output_dir }}"
+    state: directory
+    mode: 0777
diff --git a/provisioning/roles/geerlingguy.php-xhprof/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.php-xhprof/tasks/setup-Debian.yml
new file mode 100644
index 000000000..085cd098c
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xhprof/tasks/setup-Debian.yml
@@ -0,0 +1,8 @@
+---
+- name: Ensure dependencies for installing from source are installed.
+  apt: "pkg={{ item }} state=installed"
+  with_items:
+    - make
+
+- name: Ensure GraphViz is installed.
+  apt: pkg=graphviz state=installed
diff --git a/provisioning/roles/geerlingguy.php-xhprof/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.php-xhprof/tasks/setup-RedHat.yml
new file mode 100644
index 000000000..334d8f5c6
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xhprof/tasks/setup-RedHat.yml
@@ -0,0 +1,8 @@
+---
+- name: Ensure dependencies for installing from source are installed.
+  yum: "pkg={{ item }} state=installed"
+  with_items:
+    - make
+
+- name: Ensure GraphViz is installed.
+  yum: pkg=graphviz state=installed
diff --git a/provisioning/roles/geerlingguy.php-xhprof/templates/xhprof.ini.j2 b/provisioning/roles/geerlingguy.php-xhprof/templates/xhprof.ini.j2
new file mode 100644
index 000000000..8caedae53
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xhprof/templates/xhprof.ini.j2
@@ -0,0 +1,3 @@
+[xhprof]
+extension="{{ php_xhprof_module_path }}/xhprof.so"
+xhprof.output_dir="{{ xhprof_output_dir }}"
diff --git a/provisioning/roles/geerlingguy.php-xhprof/tests/Dockerfile.centos-7 b/provisioning/roles/geerlingguy.php-xhprof/tests/Dockerfile.centos-7
new file mode 100644
index 000000000..10c2684ce
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xhprof/tests/Dockerfile.centos-7
@@ -0,0 +1,30 @@
+FROM centos:7
+
+# Install systemd -- See https://hub.docker.com/_/centos/
+RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
+RUN yum -y update; yum clean all; \
+(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
+rm -f /lib/systemd/system/multi-user.target.wants/*; \
+rm -f /etc/systemd/system/*.wants/*; \
+rm -f /lib/systemd/system/local-fs.target.wants/*; \
+rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
+rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
+rm -f /lib/systemd/system/basic.target.wants/*; \
+rm -f /lib/systemd/system/anaconda.target.wants/*;
+
+# Install Ansible
+RUN yum -y install epel-release
+RUN yum -y install git ansible sudo
+RUN yum clean all
+
+RUN yum install -y unzip
+RUN yum groupinstall -y "Development Tools"
+
+# Disable requiretty
+RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
+
+# Install Ansible inventory file
+RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
+
+VOLUME ["/sys/fs/cgroup"]
+CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.php-xhprof/tests/Dockerfile.ubuntu-12.04 b/provisioning/roles/geerlingguy.php-xhprof/tests/Dockerfile.ubuntu-12.04
new file mode 100644
index 000000000..576e3bce8
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xhprof/tests/Dockerfile.ubuntu-12.04
@@ -0,0 +1,13 @@
+FROM ubuntu:12.04
+RUN apt-get update
+
+# Install Ansible
+RUN apt-get install -y software-properties-common python-software-properties git
+RUN apt-add-repository -y ppa:ansible/ansible
+RUN apt-get update
+RUN apt-get install -y ansible
+
+RUN apt-get install -y unzip
+
+# Install Ansible inventory file
+RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.php-xhprof/tests/Dockerfile.ubuntu-14.04 b/provisioning/roles/geerlingguy.php-xhprof/tests/Dockerfile.ubuntu-14.04
new file mode 100644
index 000000000..cb7a7bda4
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xhprof/tests/Dockerfile.ubuntu-14.04
@@ -0,0 +1,13 @@
+FROM ubuntu:14.04
+RUN apt-get update
+
+# Install Ansible
+RUN apt-get install -y software-properties-common git
+RUN apt-add-repository -y ppa:ansible/ansible
+RUN apt-get update
+RUN apt-get install -y ansible
+
+RUN apt-get install -y unzip
+
+# Install Ansible inventory file
+RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.php-xhprof/tests/inventory b/provisioning/roles/geerlingguy.php-xhprof/tests/inventory
new file mode 100644
index 000000000..2fbb50c4a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xhprof/tests/inventory
@@ -0,0 +1 @@
+localhost
diff --git a/provisioning/roles/geerlingguy.php-xhprof/tests/test-source.yml b/provisioning/roles/geerlingguy.php-xhprof/tests/test-source.yml
new file mode 100644
index 000000000..dee464c36
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xhprof/tests/test-source.yml
@@ -0,0 +1,20 @@
+---
+- hosts: all
+
+  vars:
+    php_enable_webserver: false
+    php_enablerepo: "remi,remi-php70"
+
+  pre_tasks:
+    - name: Ensure build dependencies are installed (RedHat).
+      yum: name=which state=present
+      when: ansible_os_family == 'RedHat'
+
+    - name: Add repository for PHP 7.0.
+      apt_repository: repo='ppa:ondrej/php'
+      when: ansible_os_family == 'Debian'
+
+  roles:
+    - { role: geerlingguy.repo-remi, when: ansible_os_family == 'RedHat' }
+    - geerlingguy.php
+    - role_under_test
diff --git a/provisioning/roles/geerlingguy.php-xhprof/tests/xhprof-test.php b/provisioning/roles/geerlingguy.php-xhprof/tests/xhprof-test.php
new file mode 100644
index 000000000..1dd28b956
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xhprof/tests/xhprof-test.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * @file
+ * Test if XHProf is available and working.
+ */
+
+$xhprof_root_dir = '/usr/share/php';
+$success = TRUE;
+
+xhprof_enable();
+$data = xhprof_disable();
+
+if (isset($data['main()==>xhprof_disable'])) {
+  print "XHProf profiling working.\r\n";
+}
+else {
+  print "XHProf profiling not working.\r\n";
+  $success = FALSE;
+}
+
+include $xhprof_root_dir . '/xhprof_lib/utils/xhprof_lib.php';
+include $xhprof_root_dir . '/xhprof_lib/utils/xhprof_runs.php';
+
+$xhprof_runs = new XHProfRuns_Default();
+$run_id = $xhprof_runs->save_run($data, "xhprof_testing");
+$output_dir = ini_get("xhprof.output_dir");
+$filename = "$output_dir/$run_id.xhprof_testing.xhprof";
+
+if (file_exists($filename)) {
+  print "XHProf PHP library writing to output directory.\r\n";
+}
+else {
+  print "XHProf PHP library not working.\r\n";
+  $success = FALSE;
+}
+
+ob_start();
+include $xhprof_root_dir . '/xhprof_html/index.php';
+$html = ob_get_clean();
+if (strpos($html, "?run=$run_id") !== FALSE) {
+  print "XHProf UI working.\r\n";
+}
+else {
+  print "XHProf UI not working.\r\n";
+  $success = FALSE;
+}
+
+if (!$success) {
+  exit(1);
+}
diff --git a/provisioning/roles/geerlingguy.php-xhprof/vars/Debian.yml b/provisioning/roles/geerlingguy.php-xhprof/vars/Debian.yml
new file mode 100644
index 000000000..37fae2e1d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xhprof/vars/Debian.yml
@@ -0,0 +1,4 @@
+---
+php_xhprof_module_path: /usr/lib/php5/modules
+
+php_xhprof_config_filename: 20-xhprof.ini
diff --git a/provisioning/roles/geerlingguy.php-xhprof/vars/RedHat.yml b/provisioning/roles/geerlingguy.php-xhprof/vars/RedHat.yml
new file mode 100644
index 000000000..e487f1b91
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xhprof/vars/RedHat.yml
@@ -0,0 +1,4 @@
+---
+php_xhprof_module_path: /usr/lib64/php/modules
+
+php_xhprof_config_filename: xhprof.ini
diff --git a/provisioning/roles/geerlingguy.php/.travis.yml b/provisioning/roles/geerlingguy.php/.travis.yml
new file mode 100644
index 000000000..0fe9aaedf
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/.travis.yml
@@ -0,0 +1,84 @@
+---
+sudo: required
+
+env:
+  # Only test source install on latest supported OSes.
+  - distribution: centos
+    version: 7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    SITE: source
+    PHP_VERSION: 7.0.5
+  - distribution: ubuntu
+    version: 14.04
+    init: /sbin/init
+    run_opts: ""
+    SITE: source
+    PHP_VERSION: 7.0.5
+
+  # Test package install on all supported OSes.
+  - distribution: centos
+    version: 7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    SITE: package
+    PHP_VERSION: 7.0
+  - distribution: ubuntu
+    version: 14.04
+    init: /sbin/init
+    run_opts: ""
+    SITE: package
+    PHP_VERSION: 7.0
+  - distribution: ubuntu
+    version: 12.04
+    init: /sbin/init
+    run_opts: ""
+    SITE: package
+    PHP_VERSION: 5.6
+
+services:
+  - docker
+
+before_install:
+  # - sudo apt-get update
+  # Pull container
+  - 'sudo docker pull ${distribution}:${version}'
+  # Customize container
+  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+
+script:
+  - container_id=$(mktemp)
+  # Run container in detached state
+  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+
+  # Install dependencies.
+  - 'sudo docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
+
+  # Ansible syntax check.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test-${SITE}.yml --syntax-check'
+
+  # Test role.
+  - 'travis_wait 30 sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test-${SITE}.yml'
+
+  # Test role idempotence.
+  - >
+    sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test-${SITE}.yml
+    | grep -q 'changed=0.*failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)
+
+  # Ensure PHP is installed and at the right version.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm which php'
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm test -x /usr/bin/php'
+
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm php --version'
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm /usr/bin/php --version | grep -qF "PHP $PHP_VERSION"'
+
+  # Ensure PHP configurations have taken effect.
+  - sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm php -i | grep 'memory_limit.*192'
+
+  # Clean up
+  - 'sudo docker stop "$(cat ${container_id})"'
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.php/README.md b/provisioning/roles/geerlingguy.php/README.md
new file mode 100644
index 000000000..9bdd4e36b
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/README.md
@@ -0,0 +1,204 @@
+# Ansible Role: PHP
+
+[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-php.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-php)
+
+Installs PHP on RedHat/CentOS and Debian/Ubuntu servers.
+
+## Requirements
+
+If you're using an older LTS release of Ubuntu or RHEL, with an old/outdated version of PHP, you need to use a repo or PPA with a maintained PHP version, as this role only works with [PHP versions that are currently supported](http://php.net/supported-versions.php) by the PHP community.
+
+## Role Variables
+
+Available variables are listed below, along with default values (see `defaults/main.yml`):
+
+    php_packages: []
+
+A list of the PHP packages to install (OS-specific by default). You'll likely want to install common packages like `php`, `php-cli`, `php-devel` and `php-pdo`, and you can add in whatever other packages you'd like (for example, `php-gd` for image manipulation, or `php-ldap` if you need to connect to an LDAP server for authentication).
+
+_Note: If you're using Debian/Ubuntu, you also need to install `libapache2-mod-fastcgi` (for cgi/PHP-FPM) or `libapache2-mod-php7.0` (or a similar package depending on PHP version) if you want to use `mod_php` with Apache._
+
+    php_enable_webserver: true
+
+If your usage of PHP is tied to a web server (e.g. Apache or Nginx), leave this default value. If you are using PHP server-side or to run some small application, set this value to `false` so this role doesn't attempt to interact with a web server.
+
+    php_webserver_daemon: "httpd"
+
+The default values for the HTTP server deamon are `httpd` (used by Apache) for RedHat/CentOS, or `apache2` (also used by Apache) for Debian/Ubuntu. If you are running another webserver (for example, `nginx`), change this value to the name of the daemon under which the webserver runs.
+
+    php_enablerepo: ""
+
+(RedHat/CentOS only) If you have enabled any additional repositories (might I suggest [geerlingguy.repo-epel](https://github.com/geerlingguy/ansible-role-repo-epel) or [geerlingguy.repo-remi](https://github.com/geerlingguy/ansible-role-repo-remi)), those repositories can be listed under this variable (e.g. `remi-php70,epel`). This can be handy, as an example, if you want to install the latest version of PHP 7.0, which is in the Remi repository.
+
+    php_packages_state: "installed"
+
+If you have enabled any additional repositories such as [geerlingguy.repo-epel](https://github.com/geerlingguy/ansible-role-repo-epel) or [geerlingguy.repo-remi](https://github.com/geerlingguy/ansible-role-repo-remi), you may want an easy way to swap PHP versions on the fly. By default, this is set to 'installed'. You can now override this variable to 'latest'. Combined with php_enablerepo, a user now doesn't need to manually uninstall the existing PHP packages before installing them from a different repository.
+
+    php_executable: "php"
+
+The executable to run when calling PHP from the command line. You should only change this if running `php` on your server doesn't target the correct executable, or if you're using software collections on RHEL/CentOS and need to target a different version of PHP.
+
+### PHP-FPM
+
+PHP-FPM is a simple and robust FastCGI Process Manager for PHP. It can dramatically ease scaling of PHP apps and is the normal way of running PHP-based sites and apps when using a webserver like Nginx (though it can be used with other webservers just as easily).
+
+When using this role with PHP running as `php-fpm` instead of as a process inside a webserver (e.g. Apache's `mod_php`), you need to set the following variable to `true`:
+
+    php_enable_php_fpm: false
+
+If you're using Apache, you can easily get it configured to work with PHP-FPM using the [geerlingguy.apache-php-fpm](https://github.com/geerlingguy/ansible-role-apache-php-fpm) role.
+
+    php_fpm_listen: "127.0.0.1:9000"
+    php_fpm_listen_allowed_clients: "127.0.0.1"
+    php_fpm_pm_max_children: 50
+    php_fpm_pm_start_servers: 5
+    php_fpm_pm_min_spare_servers: 5
+    php_fpm_pm_max_spare_servers: 5
+
+Specific settings inside the default `www.conf` PHP-FPM pool. If you'd like to manage additional settings, you can do so either by replacing the file with your own template or using `lineinfile` like this role does inside `tasks/configure.yml`.
+
+### php.ini settings
+
+    php_use_managed_ini: true
+
+By default, all the extra defaults below are applied through the php.ini included with this role. You can self-manage your php.ini file (if you need more flexility in its configuration) by setting this to `false` (in which case all the below variables will be ignored).
+
+    php_memory_limit: "256M"
+    php_max_execution_time: "60"
+    php_max_input_time: "60"
+    php_max_input_vars: "1000"
+    php_realpath_cache_size: "32K"
+    php_upload_max_filesize: "64M"
+    php_post_max_size: "32M"
+    php_date_timezone: "America/Chicago"
+    php_allow_url_fopen: "On"
+    php_sendmail_path: "/usr/sbin/sendmail -t -i"
+    php_output_buffering: "4096"
+    php_short_open_tag: false
+    php_error_reporting: "E_ALL & ~E_DEPRECATED & ~E_STRICT"
+    php_display_errors: "Off"
+    php_display_startup_errors: "On"
+    php_expose_php: "On"
+    php_session_cookie_lifetime: 0
+    php_session_gc_probability: 1
+    php_session_gc_divisor: 1000
+    php_session_gc_maxlifetime: 1440
+    php_session_save_handler: files
+    php_session_save_path: ''
+
+Various defaults for PHP. Only used if `php_use_managed_ini` is set to `true`.
+
+### OpCache-related Variables
+
+The OpCache is included in PHP starting in version 5.5, and the following variables will only take effect if the version of PHP you have installed is 5.5 or greater.
+
+    php_opcache_enable: "1"
+    php_opcache_enable_cli: "0"
+    php_opcache_memory_consumption: "96"
+    php_opcache_interned_strings_buffer: "16"
+    php_opcache_max_accelerated_files: "4096"
+    php_opcache_max_wasted_percentage: "5"
+    php_opcache_validate_timestamps: "1"
+    php_opcache_revalidate_path: "0"
+    php_opcache_revalidate_freq: "2"
+    php_opcache_max_file_size: "0"
+
+OpCache ini directives that are often customized on a system. Make sure you have enough memory and file slots allocated in the OpCache (`php_opcache_memory_consumption`, in MB, and `php_opcache_max_accelerated_files`) to contain all the PHP code you are running. If not, you may get less-than-optimal performance!
+
+    php_opcache_conf_filename: [platform-specific]
+
+The platform-specific opcache configuration filename. Generally the default should work, but in some cases, you may need to override the filename.
+
+### APCu-related Variables
+
+    php_enable_apc: true
+
+Whether to enable APCu. Other APCu variables will be ineffective if this is set to false.
+
+    php_apc_shm_size: "96M"
+    php_apc_enable_cli: "0"
+
+APCu ini directives that are often customized on a system. Set the `php_apc_shm_size` so it will hold all cache entries in memory with a little overhead (fragmentation or APC running out of memory will slow down PHP *dramatically*).
+
+    php_apc_conf_filename: [platform-specific]
+
+The platform-specific APC configuration filename. Generally the default should work, but in some cases, you may need to override the filename.
+
+#### Ensuring APC is installed
+
+If you use APC, you will need to make sure APC is installed (it is installed by default, but if you customize the `php_packages` list, you need to include APC in the list):
+
+  - *On RHEL/CentOS systems*: Make sure `php-pecl-apcu` is in the list of `php_packages`.
+  - *On Debian/Ubuntu systems*: Make sure `php-apcu` is in the list of `php_packages`.
+
+### Installing from Source
+
+If you need a specific version of PHP, or would like to test the latest (e.g. master) version of PHP, there's a good chance there's no suitable package already available in your platform's package manager. In these cases, you may choose to install PHP from source by compiling it directly.
+
+Note that source compilation takes *much* longer than installing from packages (PHP HEAD takes 5+ minutes to compile on a modern quad-core computer, just as a point of reference).
+
+    php_install_from_source: false
+
+Set this to `true` to install PHP from source instead of installing from packages.
+
+    php_source_version: "master"
+
+The version of PHP to install from source (a git branch, tag, or commit hash).
+
+    php_source_clone_dir: "~/php-src"
+    php_source_install_path: "/opt/php"
+    php_source_install_gmp_path: "/usr/include/x86_64-linux-gnu/gmp.h"
+
+Location where source will be cloned and installed, and the location of the GMP header file (which can be platform/distribution specific).
+
+    php_source_make_command: "make"
+
+Set the `make` command to `make --jobs=X` where `X` is the number of cores present on the server where PHP is being compiled. Will speed up compilation times dramatically if you have multiple cores.
+
+    php_source_configure_command: >
+      [...]
+
+The `./configure` command that will build the Makefile to be used for PHP compilation. Add in all the options you need for your particular environment. Using a folded scalar (`>`) allows you to define the variable over multiple lines, which is extremely helpful for legibility and source control!
+
+A few other notes/caveats for specific configurations:
+
+  - **Apache with `mpm_prefork`**: If you're using Apache with prefork as a webserver for PHP, you will need to make sure `apxs2` is available on your system (e.g. by installing `apache2-prefork-dev` in Ubuntu), and you will need to make sure the option `--with-apxs2` is defined in `php_source_configure_command`. Finally, you will need to make sure the `mpm_prefork` module is loaded instead of `mpm_worker` or `mpm_event`, and likely add a `phpX.conf` (where `X` is the major version of PHP) configuration file to the Apache module config folder with contents like [`php7.conf`](https://gist.github.com/geerlingguy/5ae5445f28e71264e8c1).
+  - **Apache with `mpm_event` or `mpm_worker`**: If you're using Apache with event or worker as a webserver for PHP, you will need to compile PHP with FPM. Make sure the option `--enable-fpm` is defined in `php_source_configure_command`. You'll also need to make sure Apache's support for CGI and event is installed (e.g. by installing `apache2-mpm-event` and `libapache2-mod-fastcgi`) and the `mpm_event` module is loaded.
+  - **Nginx**: If you're using Nginx as a webserver for PHP, you will need to compile PHP with FPM. Make sure the option `--enable-fpm` is defined in `php_source_configure_command`.
+
+## Dependencies
+
+None.
+
+## Example Playbook
+
+    - hosts: webservers
+      vars_files:
+        - vars/main.yml
+      roles:
+        - { role: geerlingguy.php }
+
+*Inside `vars/main.yml`*:
+
+    php_memory_limit: "128M"
+    php_max_execution_time: "90"
+    php_upload_max_filesize: "256M"
+    php_packages:
+      - php
+      - php-cli
+      - php-common
+      - php-devel
+      - php-gd
+      - php-mbstring
+      - php-pdo
+      - php-pecl-apcu
+      - php-xml
+      ...
+
+## License
+
+MIT / BSD
+
+## Author Information
+
+This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.php/defaults/main.yml b/provisioning/roles/geerlingguy.php/defaults/main.yml
new file mode 100644
index 000000000..f0941f4e9
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/defaults/main.yml
@@ -0,0 +1,116 @@
+---
+# Pass in a comma-separated list of repos to use (e.g. "remi,epel").
+php_enablerepo: ""
+
+# PHP package state; use 'installed' to make sure it's installed, or 'latest' if
+# you want to upgrade or switch versions using a new repo.
+php_packages_state: installed
+
+# Set this to false if you're not using PHP with Apache/Nginx/etc.
+php_enable_webserver: true
+
+# PHP-FPM configuration.
+php_enable_php_fpm: false
+php_fpm_listen: "127.0.0.1:9000"
+php_fpm_listen_allowed_clients: "127.0.0.1"
+php_fpm_pm_max_children: 50
+php_fpm_pm_start_servers: 5
+php_fpm_pm_min_spare_servers: 5
+php_fpm_pm_max_spare_servers: 5
+
+# The executable to run when calling PHP from the command line.
+php_executable: "php"
+
+# OpCache settings (useful for PHP >=5.5).
+php_opcache_enable: "1"
+php_opcache_enable_cli: "0"
+php_opcache_memory_consumption: "96"
+php_opcache_interned_strings_buffer: "16"
+php_opcache_max_accelerated_files: "4096"
+php_opcache_max_wasted_percentage: "5"
+php_opcache_validate_timestamps: "1"
+php_opcache_revalidate_path: "0"
+php_opcache_revalidate_freq: "2"
+php_opcache_max_file_size: "0"
+php_opcache_blacklist_filename: ""
+
+# APCu settings.
+php_enable_apc: true
+php_apc_shm_size: "96M"
+php_apc_enable_cli: "0"
+
+# If this is set to false, none of the following options will have any effect.
+# Any and all changes to /etc/php.ini will be your responsibility.
+php_use_managed_ini: true
+
+php_expose_php: "On"
+php_memory_limit: "256M"
+php_max_execution_time: "60"
+php_max_input_time: "60"
+php_max_input_vars: "1000"
+php_realpath_cache_size: "32K"
+php_upload_max_filesize: "64M"
+php_post_max_size: "32M"
+php_date_timezone: "America/Chicago"
+php_allow_url_fopen: "On"
+
+php_sendmail_path: "/usr/sbin/sendmail -t -i"
+php_output_buffering: "4096"
+php_short_open_tag: false
+
+php_session_cookie_lifetime: 0
+php_session_gc_probability: 1
+php_session_gc_divisor: 1000
+php_session_gc_maxlifetime: 1440
+php_session_save_handler: files
+php_session_save_path: ''
+
+php_error_reporting: "E_ALL & ~E_DEPRECATED & ~E_STRICT"
+php_display_errors: "Off"
+php_display_startup_errors: "Off"
+
+# Install PHP from source (instead of using a package manager) with these vars.
+php_install_from_source: false
+php_source_version: "master"
+php_source_clone_dir: "~/php-src"
+php_source_install_path: "/opt/php"
+php_source_install_gmp_path: "/usr/include/x86_64-linux-gnu/gmp.h"
+# For faster compile time: "make --jobs=X" where X is # of cores present.
+php_source_make_command: "make"
+php_source_configure_command: >
+  ./configure
+  --prefix={{ php_source_install_path }}
+  --with-config-file-path={{ php_conf_paths | first }}
+  --enable-mbstring
+  --enable-zip
+  --enable-bcmath
+  --enable-pcntl
+  --enable-ftp
+  --enable-exif
+  --enable-calendar
+  --enable-opcache
+  --enable-pdo
+  --enable-sysvmsg
+  --enable-sysvsem
+  --enable-sysvshm
+  --enable-wddx
+  --with-curl
+  --with-mcrypt
+  --with-iconv
+  --with-gmp
+  --with-pspell
+  --with-gd
+  --with-jpeg-dir=/usr
+  --with-png-dir=/usr
+  --with-zlib-dir=/usr
+  --with-xpm-dir=/usr
+  --with-freetype-dir=/usr
+  --enable-gd-native-ttf
+  --enable-gd-jis-conv
+  --with-openssl
+  --with-pdo-mysql=/usr
+  --with-gettext=/usr
+  --with-zlib=/usr
+  --with-bz2=/usr
+  --with-recode=/usr
+  --with-mysqli=/usr/bin/mysql_config
diff --git a/provisioning/roles/geerlingguy.php/handlers/main.yml b/provisioning/roles/geerlingguy.php/handlers/main.yml
new file mode 100644
index 000000000..454476dbc
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/handlers/main.yml
@@ -0,0 +1,13 @@
+---
+- name: restart webserver
+  service:
+    name: "{{ php_webserver_daemon }}"
+    state: restarted
+  notify: restart php-fpm
+  when: php_enable_webserver
+
+- name: restart php-fpm
+  service:
+    name: "{{ php_fpm_daemon }}"
+    state: restarted
+  when: php_enable_php_fpm
diff --git a/provisioning/roles/geerlingguy.php/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.php/meta/.galaxy_install_info
new file mode 100644
index 000000000..d879b8800
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/meta/.galaxy_install_info
@@ -0,0 +1 @@
+{install_date: 'Fri Jul 15 19:49:27 2016', version: 3.2.2}
diff --git a/provisioning/roles/geerlingguy.php/meta/main.yml b/provisioning/roles/geerlingguy.php/meta/main.yml
new file mode 100644
index 000000000..fb04c15fd
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/meta/main.yml
@@ -0,0 +1,23 @@
+---
+dependencies: []
+
+galaxy_info:
+  author: geerlingguy
+  description: PHP for RedHat/CentOS/Debian/Ubuntu.
+  company: "Midwestern Mac, LLC"
+  license: "license (BSD, MIT)"
+  min_ansible_version: 2.0
+  platforms:
+  - name: EL
+    versions:
+    - 6
+    - 7
+  - name: Debian
+    versions:
+    - all
+  - name: Ubuntu
+    versions:
+    - all
+  galaxy_tags:
+    - development
+    - web
diff --git a/provisioning/roles/geerlingguy.php/tasks/configure-apcu.yml b/provisioning/roles/geerlingguy.php/tasks/configure-apcu.yml
new file mode 100644
index 000000000..5a3badba2
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/tasks/configure-apcu.yml
@@ -0,0 +1,37 @@
+---
+- name: Check for existing APCu config files.
+  find:
+    paths: "{{ item }}"
+    contains: 'extension(\s+)?=(\s+)?apc[u]?\.so'
+  register: php_installed_apc_confs
+  with_items: "{{ php_extension_conf_paths }}"
+
+- name: Remove any non-role-supplied APCu config files.
+  file:
+    path: "{{ item.1.path }}"
+    state: absent
+  when: php_apc_conf_filename != (item.1.path.split('/') | last)
+  with_subelements:
+    - "{{ php_installed_apc_confs.results }}"
+    - files
+  notify: restart webserver
+
+- name: Ensure APCu config file is present.
+  template:
+    src: apc.ini.j2
+    dest: "{{ item }}/{{ php_apc_conf_filename }}"
+    owner: root
+    group: root
+    force: yes
+    mode: 0644
+  with_items: "{{ php_extension_conf_paths }}"
+  when: php_enable_apc
+  notify: restart webserver
+
+- name: Remove APCu config file if APC is disabled.
+  file:
+    path: "{{ item }}/{{ php_apc_conf_filename }}"
+    state: absent
+  with_items: "{{ php_extension_conf_paths }}"
+  when: not php_enable_apc
+  notify: restart webserver
diff --git a/provisioning/roles/geerlingguy.php/tasks/configure-fpm.yml b/provisioning/roles/geerlingguy.php/tasks/configure-fpm.yml
new file mode 100644
index 000000000..00f7427b6
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/tasks/configure-fpm.yml
@@ -0,0 +1,76 @@
+---
+- name: Define php_fpm_daemon.
+  set_fact:
+    php_fpm_daemon: "{{ __php_fpm_daemon }}"
+  when: php_fpm_daemon is not defined
+
+- name: Define php_fpm_pool_conf_path.
+  set_fact:
+    php_fpm_pool_conf_path: "{{ __php_fpm_pool_conf_path }}"
+  when: php_fpm_pool_conf_path is not defined
+
+- name: Define php_fpm_pool_user.
+  set_fact:
+    php_fpm_pool_user: "{{ __php_fpm_pool_user }}"
+  when: php_fpm_pool_user is not defined
+
+- name: Define php_fpm_pool_group.
+  set_fact:
+    php_fpm_pool_group: "{{ __php_fpm_pool_group }}"
+  when: php_fpm_pool_group is not defined
+
+- name: Stat php_fpm_pool_conf_path
+  stat:
+    path: "{{ php_fpm_pool_conf_path | dirname }}"
+  register: php_fpm_pool_conf_path_dir_stat
+
+- name: Ensure the default pool directory exists.
+  file:
+    path: "{{ php_fpm_pool_conf_path | dirname }}"
+    state: directory
+    owner: root
+    group: root
+    mode: 0755
+  when: php_fpm_pool_conf_path_dir_stat.stat.islnk is not defined
+
+- name: Ensure the default pool exists.
+  template:
+    src: www.conf.j2
+    dest: "{{ php_fpm_pool_conf_path }}"
+    owner: root
+    group: root
+    mode: 0644
+    force: no
+
+- name: Configure php-fpm pool (if enabled).
+  lineinfile:
+    dest: "{{ php_fpm_pool_conf_path }}"
+    regexp: "{{ item.regexp }}"
+    line: "{{ item.line }}"
+    state: present
+  with_items:
+    - regexp: "^user.?=.+$"
+      line: "user = {{ php_fpm_pool_user }}"
+    - regexp: "^group.?=.+$"
+      line: "group = {{ php_fpm_pool_group }}"
+    - regexp: "^listen.?=.+$"
+      line: "listen = {{ php_fpm_listen }}"
+    - regexp: '^listen\.allowed_clients.?=.+$'
+      line: "listen.allowed_clients = {{ php_fpm_listen_allowed_clients }}"
+    - regexp: '^pm\.max_children.?=.+$'
+      line: "pm.max_children = {{ php_fpm_pm_max_children }}"
+    - regexp: '^pm\.start_servers.?=.+$'
+      line: "pm.start_servers = {{ php_fpm_pm_start_servers }}"
+    - regexp: '^pm\.min_spare_servers.?=.+$'
+      line: "pm.min_spare_servers = {{ php_fpm_pm_min_spare_servers }}"
+    - regexp: '^pm\.max_spare_servers.?=.+$'
+      line: "pm.max_spare_servers = {{ php_fpm_pm_max_spare_servers }}"
+  when: php_enable_php_fpm
+  notify: restart php-fpm
+
+- name: Ensure php-fpm is started and enabled at boot (if configured).
+  service:
+    name: "{{ php_fpm_daemon }}"
+    state: started
+    enabled: yes
+  when: php_enable_php_fpm
diff --git a/provisioning/roles/geerlingguy.php/tasks/configure-opcache.yml b/provisioning/roles/geerlingguy.php/tasks/configure-opcache.yml
new file mode 100644
index 000000000..cd02e3f18
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/tasks/configure-opcache.yml
@@ -0,0 +1,37 @@
+---
+- name: Check for existing OpCache config files.
+  find:
+    paths: "{{ item }}"
+    contains: 'zend_extension(\s+)?=(\s+)?opcache\.so'
+  register: php_installed_opcache_confs
+  with_items: "{{ php_extension_conf_paths }}"
+
+- name: Remove any non-role-supplied OpCache config files.
+  file:
+    path: "{{ item.1.path }}"
+    state: absent
+  when: php_opcache_conf_filename != (item.1.path.split('/') | last)
+  with_subelements:
+    - "{{ php_installed_opcache_confs.results }}"
+    - files
+  notify: restart webserver
+
+- name: Ensure OpCache config file is present.
+  template:
+    src: opcache.ini.j2
+    dest: "{{ item }}/{{ php_opcache_conf_filename }}"
+    owner: root
+    group: root
+    force: yes
+    mode: 0644
+  with_items: "{{ php_extension_conf_paths }}"
+  when: php_opcache_enable
+  notify: restart webserver
+
+- name: Remove OpCache config file if OpCache is disabled.
+  file:
+    path: "{{ item }}/{{ php_opcache_conf_filename }}"
+    state: absent
+  with_items: "{{ php_extension_conf_paths }}"
+  when: not php_opcache_enable
+  notify: restart webserver
diff --git a/provisioning/roles/geerlingguy.php/tasks/configure.yml b/provisioning/roles/geerlingguy.php/tasks/configure.yml
new file mode 100644
index 000000000..f4fa94c4d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/tasks/configure.yml
@@ -0,0 +1,20 @@
+---
+- name: Ensure configuration directories exist.
+  file:
+    path: "{{ item }}"
+    state: directory
+    follow: true
+  with_flattened:
+    - "{{ php_conf_paths }}"
+    - "{{ php_extension_conf_paths }}"
+
+- name: Place PHP configuration file in place.
+  template:
+    src: php.ini.j2
+    dest: "{{ item }}/php.ini"
+    owner: root
+    group: root
+    mode: 0644
+  with_items: "{{ php_conf_paths }}"
+  notify: restart webserver
+  when: php_use_managed_ini
diff --git a/provisioning/roles/geerlingguy.php/tasks/install-from-source.yml b/provisioning/roles/geerlingguy.php/tasks/install-from-source.yml
new file mode 100644
index 000000000..83a52a383
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/tasks/install-from-source.yml
@@ -0,0 +1,150 @@
+---
+- name: Ensure dependencies for building from source are installed (RedHat).
+  yum: "pkg={{ item }} state=installed"
+  with_items:
+    - autoconf
+    - automake
+    - libtool
+    - bison
+    - make
+    - curl-devel
+    - recode-devel
+    - aspell-devel
+    - libxml2-devel
+    - pkgconfig
+    - libmcrypt-devel
+    - t1lib-devel
+    - libXpm-devel
+    - libpng-devel
+    - libjpeg-turbo-devel
+    - bzip2-devel
+    - openssl-devel
+    - freetype-devel
+    - libicu-devel
+    - mariadb-devel
+    - gmp-devel
+  when: ansible_os_family == 'RedHat'
+
+- name: Update apt cache (Debian).
+  apt: update_cache=yes cache_valid_time=86400
+  when: ansible_os_family == 'Debian'
+
+- name: Ensure dependencies for building from source are installed (Debian).
+  apt: "pkg={{ item }} state=installed"
+  with_items:
+    - build-essential
+    - autoconf
+    - automake
+    - libtool
+    - bison
+    - pkg-config
+    - re2c
+    - libxml2-dev
+    - libcurl4-openssl-dev
+    - libbz2-dev
+    - libjpeg-dev
+    - libpng12-dev
+    - libxpm-dev
+    - libfreetype6-dev
+    - libgmp3-dev
+    - libmcrypt-dev
+    - libmysqlclient-dev
+    - libpspell-dev
+    - librecode-dev
+    - libssl-dev
+  when: ansible_os_family == 'Debian'
+
+- name: Define php_fpm_daemon (if not defined already).
+  set_fact:
+    php_fpm_daemon: "php-fpm"
+  when: php_fpm_daemon is not defined
+
+- name: Check if gmp.h is already in a location accessible to gcc.
+  stat: path=/usr/include/gmp.h
+  register: gmp_file
+
+- name: Ensure gmp.h is symlinked into a location accessible to gcc.
+  file:
+    src: "{{ php_source_install_gmp_path }}"
+    dest: /usr/include/gmp.h
+    state: link
+  when: gmp_file.stat.exists == false
+
+- name: Check if PHP is installed.
+  command: which php
+  changed_when: false
+  failed_when: false
+  register: php_installed
+
+- name: Clone the PHP repository.
+  git:
+    repo: https://git.php.net/repository/php-src.git
+    dest: "{{ php_source_clone_dir }}"
+    version: "{{ php_source_version }}"
+    accept_hostkey: yes
+    depth: 1
+  when: php_installed|failed
+
+- name: Ensure PHP installation path exists.
+  file:
+    path: "{{ php_source_install_path }}"
+    state: directory
+    mode: 0755
+  when: php_installed|failed
+
+- name: Build configure script.
+  shell: >
+    ./buildconf --force
+    chdir={{ php_source_clone_dir }}
+  when: php_installed|failed
+
+- name: Run configure script.
+  shell: >
+    {{ php_source_configure_command }}
+    chdir={{ php_source_clone_dir }}
+  when: php_installed|failed
+
+- name: Make and install PHP.
+  shell: >
+    {{ item }}
+    chdir={{ php_source_clone_dir }}
+  with_items:
+    - "{{ php_source_make_command }}"
+    - make install
+  when: php_installed|failed
+
+- name: Ensure php executable is symlinked into a standard path.
+  file:
+    src: "{{ php_source_install_path }}/bin/php"
+    dest: /usr/bin/php
+    state: link
+
+# PHP FPM configuration.
+- name: Ensure php-fpm executable is symlinked into a standard path.
+  file:
+    src: "{{ php_source_install_path }}/sbin/php-fpm"
+    dest: "/usr/sbin/{{ php_fpm_daemon }}"
+    state: link
+  when: "'--enable-fpm' in php_source_configure_command"
+
+- name: Ensure php-fpm init script is installed.
+  template:
+    src: fpm-init.j2
+    dest: "/etc/init.d/{{ php_fpm_daemon }}"
+    mode: 0755
+  when: "'--enable-fpm' in php_source_configure_command"
+  notify: restart php-fpm
+
+- name: Ensure php-fpm config directory exists.
+  file:
+    path: "{{ php_fpm_conf_path }}"
+    state: directory
+  when: "'--enable-fpm' in php_source_configure_command"
+
+- name: Ensure php-fpm config file is installed.
+  template:
+    src: php-fpm.conf.j2
+    dest: "{{ php_fpm_conf_path }}/php-fpm.conf"
+    mode: 0644
+  when: "'--enable-fpm' in php_source_configure_command"
+  notify: restart php-fpm
diff --git a/provisioning/roles/geerlingguy.php/tasks/main.yml b/provisioning/roles/geerlingguy.php/tasks/main.yml
new file mode 100644
index 000000000..1e82ceedd
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/tasks/main.yml
@@ -0,0 +1,61 @@
+---
+# Variable setup.
+- name: Include OS-specific variables.
+  include_vars: "{{ ansible_os_family }}.yml"
+
+- name: Define php_packages.
+  set_fact:
+    php_packages: "{{ __php_packages | list }}"
+  when: php_packages is not defined
+
+- name: Define php_webserver_daemon.
+  set_fact:
+    php_webserver_daemon: "{{ __php_webserver_daemon }}"
+  when: php_webserver_daemon is not defined
+
+- name: Define php_conf_paths.
+  set_fact:
+    php_conf_paths: "{{ __php_conf_paths }}"
+  when: php_conf_paths is not defined
+
+- name: Define php_extension_conf_paths.
+  set_fact:
+    php_extension_conf_paths: "{{ __php_extension_conf_paths }}"
+  when: php_extension_conf_paths is not defined
+
+- name: Define php_apc_conf_filename.
+  set_fact:
+    php_apc_conf_filename: "{{ __php_apc_conf_filename }}"
+  when: php_apc_conf_filename is not defined
+
+- name: Define php_opcache_conf_filename (Ubuntu 16.04).
+  set_fact:
+    php_opcache_conf_filename: "10-opcache.ini"
+  when: php_opcache_conf_filename is not defined and ansible_distribution_version == "16.04"
+
+- name: Define php_opcache_conf_filename.
+  set_fact:
+    php_opcache_conf_filename: "{{ __php_opcache_conf_filename }}"
+  when: php_opcache_conf_filename is not defined
+
+- name: Define php_fpm_conf_path.
+  set_fact:
+    php_fpm_conf_path: "{{ __php_fpm_conf_path }}"
+  when: php_fpm_conf_path is not defined
+
+# Setup/install tasks.
+- include: setup-RedHat.yml
+  when: (php_install_from_source == false) and (ansible_os_family == 'RedHat')
+
+- include: setup-Debian.yml
+  when: (php_install_from_source == false) and (ansible_os_family == 'Debian')
+
+# Install PHP from source when php_install_from_source is true.
+- include: install-from-source.yml
+  when: php_install_from_source == true
+
+# Configure PHP.
+- include: configure.yml
+- include: configure-apcu.yml
+- include: configure-opcache.yml
+- include: configure-fpm.yml
diff --git a/provisioning/roles/geerlingguy.php/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.php/tasks/setup-Debian.yml
new file mode 100644
index 000000000..f77278a35
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/tasks/setup-Debian.yml
@@ -0,0 +1,27 @@
+---
+- name: Update apt cache.
+  apt: update_cache=yes cache_valid_time=86400
+
+- name: Ensure PHP packages are installed.
+  apt:
+    name: "{{ item }}"
+    state: "{{ php_packages_state }}"
+  with_items: "{{ php_packages }}"
+  register: php_package_install
+  notify: restart webserver
+
+- name: Delete APCu configuration file if this role will provide one.
+  file:
+    path: "{{ item }}/{{ php_apc_conf_filename }}"
+    state: absent
+  with_items: "{{ php_extension_conf_paths }}"
+  when: php_enable_apc and php_package_install.changed
+  notify: restart webserver
+
+- name: Delete OpCache configuration file if this role will provide one.
+  file:
+    path: "{{ item }}/{{ php_opcache_conf_filename }}"
+    state: absent
+  with_items: "{{ php_extension_conf_paths }}"
+  when: php_opcache_enable and php_package_install.changed
+  notify: restart webserver
diff --git a/provisioning/roles/geerlingguy.php/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.php/tasks/setup-RedHat.yml
new file mode 100644
index 000000000..6cfde8cb0
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/tasks/setup-RedHat.yml
@@ -0,0 +1,8 @@
+---
+- name: Ensure PHP packages are installed.
+  yum:
+    name: "{{ item }}"
+    state: "{{ php_packages_state }}"
+    enablerepo: "{{ php_enablerepo }}"
+  with_items: "{{ php_packages }}"
+  notify: restart webserver
diff --git a/provisioning/roles/geerlingguy.php/templates/apc.ini.j2 b/provisioning/roles/geerlingguy.php/templates/apc.ini.j2
new file mode 100644
index 000000000..bfd570646
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/templates/apc.ini.j2
@@ -0,0 +1,4 @@
+extension=apcu.so
+apc.shm_size={{ php_apc_shm_size }}
+apc.enable_cli={{ php_apc_enable_cli }}
+apc.rfc1867=1
diff --git a/provisioning/roles/geerlingguy.php/templates/fpm-init.j2 b/provisioning/roles/geerlingguy.php/templates/fpm-init.j2
new file mode 100644
index 000000000..4d6a6d5dc
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/templates/fpm-init.j2
@@ -0,0 +1,170 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          php-fpm {{ php_fpm_daemon }}
+# Required-Start:    $remote_fs $network
+# Required-Stop:     $remote_fs $network
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6  
+# Short-Description: starts {{ php_fpm_daemon }}
+# Description:       Starts The PHP FastCGI Process Manager Daemon
+### END INIT INFO
+
+# Author: Ondrej Sury <ondrej@debian.org>
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="PHP FastCGI Process Manager"
+NAME={{ php_fpm_daemon }}
+DAEMON=/usr/sbin/$NAME
+DAEMON_ARGS="--daemonize --fpm-config {{ php_fpm_conf_path }}/php-fpm.conf"
+PIDFILE=/var/run/{{ php_fpm_daemon }}.pid
+TIMEOUT=2
+SCRIPTNAME=/etc/init.d/$NAME
+
+# Exit if the package is not installed
+[ -x "$DAEMON" ] || exit 0
+
+# Read configuration variable file if it is present
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
+. /lib/lsb/init-functions
+
+# Don't run if we are running upstart
+if init_is_upstart; then
+    exit 1
+fi
+
+#
+# Function to check the correctness of the config file
+#
+do_check()
+{
+    /usr/lib/php5/php5-fpm-checkconf || return 1
+    return 0
+}
+
+#
+# Function that starts the daemon/service
+#
+do_start()
+{
+  # Return
+  #   0 if daemon has been started
+  #   1 if daemon was already running
+  #   2 if daemon could not be started
+  start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
+    || return 1
+  start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
+    $DAEMON_ARGS 2>/dev/null \
+    || return 2
+  # Add code here, if necessary, that waits for the process to be ready
+  # to handle requests from services started subsequently which depend
+  # on this one.  As a last resort, sleep for some time.
+}
+
+#
+# Function that stops the daemon/service
+#
+do_stop()
+{
+  # Return
+  #   0 if daemon has been stopped
+  #   1 if daemon was already stopped
+  #   2 if daemon could not be stopped
+  #   other if a failure occurred
+  start-stop-daemon --stop --quiet --retry=QUIT/$TIMEOUT/TERM/5/KILL/5 --pidfile $PIDFILE --name $NAME
+  RETVAL="$?"
+  [ "$RETVAL" = 2 ] && return 2
+  # Wait for children to finish too if this is a daemon that forks
+  # and if the daemon is only ever run from this initscript.
+  # If the above conditions are not satisfied then add some other code
+  # that waits for the process to drop all resources that could be
+  # needed by services started subsequently.  A last resort is to
+  # sleep for some time.
+  start-stop-daemon --stop --quiet --oknodo --retry=0/$TIMEOUT/TERM/5/KILL/5 --exec $DAEMON
+  [ "$?" = 2 ] && return 2
+  # Many daemons don't delete their pidfiles when they exit.
+  rm -f $PIDFILE
+  return "$RETVAL"
+}
+
+#
+# Function that sends a SIGHUP to the daemon/service
+#
+do_reload() {
+  #
+  # If the daemon can reload its configuration without
+  # restarting (for example, when it is sent a SIGHUP),
+  # then implement that here.
+  #
+  start-stop-daemon --stop --signal USR2 --quiet --pidfile $PIDFILE --name $NAME
+  return 0
+}
+
+case "$1" in
+    start)
+  [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+  do_start
+  case "$?" in
+      0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+      2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+  esac
+  ;;
+    stop)
+  [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+  do_stop
+  case "$?" in
+    0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+    2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+  esac
+  ;;
+    status)
+        status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
+        ;;
+    check)
+        do_check yes
+  ;;
+    reload|force-reload)
+  log_daemon_msg "Reloading $DESC" "$NAME"
+  do_reload
+  log_end_msg $?
+  ;;
+    reopen-logs)
+  log_daemon_msg "Reopening $DESC logs" $NAME
+  if start-stop-daemon --stop --signal USR1 --oknodo --quiet \
+      --pidfile $PIDFILE --exec $DAEMON
+  then
+      log_end_msg 0
+  else
+      log_end_msg 1
+  fi
+  ;;
+    restart)
+  log_daemon_msg "Restarting $DESC" "$NAME"
+  do_stop
+  case "$?" in
+    0|1)
+    do_start
+    case "$?" in
+      0) log_end_msg 0 ;;
+      1) log_end_msg 1 ;; # Old process is still running
+      *) log_end_msg 1 ;; # Failed to start
+    esac
+    ;;
+    *)
+      # Failed to stop
+    log_end_msg 1
+    ;;
+  esac
+  ;;
+    *)
+  echo "Usage: $SCRIPTNAME {start|stop|status|restart|reload|force-reload}" >&2
+  exit 1
+    ;;
+esac
+
+:
diff --git a/provisioning/roles/geerlingguy.php/templates/opcache.ini.j2 b/provisioning/roles/geerlingguy.php/templates/opcache.ini.j2
new file mode 100644
index 000000000..f60fb8927
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/templates/opcache.ini.j2
@@ -0,0 +1,14 @@
+zend_extension=opcache.so
+opcache.enable={{ php_opcache_enable }}
+opcache.enable_cli={{ php_opcache_enable_cli }}
+opcache.memory_consumption={{ php_opcache_memory_consumption }}
+opcache.interned_strings_buffer={{ php_opcache_interned_strings_buffer }}
+opcache.max_accelerated_files={{ php_opcache_max_accelerated_files }}
+opcache.max_wasted_percentage={{ php_opcache_max_wasted_percentage }}
+opcache.validate_timestamps={{ php_opcache_validate_timestamps }}
+opcache.revalidate_path={{ php_opcache_revalidate_path }}
+opcache.revalidate_freq={{ php_opcache_revalidate_freq }}
+opcache.max_file_size={{ php_opcache_max_file_size }}
+{% if php_opcache_blacklist_filename != '' %}
+opcache.blacklist_filename={{ php_opcache_blacklist_filename }}
+{% endif %}
diff --git a/provisioning/roles/geerlingguy.php/templates/php-fpm.conf.j2 b/provisioning/roles/geerlingguy.php/templates/php-fpm.conf.j2
new file mode 100644
index 000000000..12b277fbe
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/templates/php-fpm.conf.j2
@@ -0,0 +1,12 @@
+;;;;;;;;;;;;;;;;;;;;;
+; FPM Configuration ;
+;;;;;;;;;;;;;;;;;;;;;
+
+include={{ php_fpm_conf_path }}/pool.d/*.conf
+
+;;;;;;;;;;;;;;;;;;
+; Global Options ;
+;;;;;;;;;;;;;;;;;;
+
+[global]
+error_log = /var/log/php-fpm.log
diff --git a/provisioning/roles/geerlingguy.php/templates/php.ini.j2 b/provisioning/roles/geerlingguy.php/templates/php.ini.j2
new file mode 100644
index 000000000..d6ad9df97
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/templates/php.ini.j2
@@ -0,0 +1,225 @@
+[PHP]
+
+;;;;;;;;;;;;;;;;;;;;
+; Language Options ;
+;;;;;;;;;;;;;;;;;;;;
+
+engine = On
+short_open_tag = {{ php_short_open_tag }}
+asp_tags = Off
+precision = 14
+output_buffering = {{ php_output_buffering }}
+
+zlib.output_compression = Off
+
+implicit_flush = Off
+unserialize_callback_func =
+serialize_precision = 17
+disable_functions =
+disable_classes =
+
+zend.enable_gc = On
+
+;;;;;;;;;;;;;;;;;
+; Miscellaneous ;
+;;;;;;;;;;;;;;;;;
+
+expose_php = {{ php_expose_php }}
+
+;;;;;;;;;;;;;;;;;;;
+; Resource Limits ;
+;;;;;;;;;;;;;;;;;;;
+
+max_execution_time = {{ php_max_execution_time }}
+max_input_time = {{ php_max_input_time }}
+max_input_vars = {{ php_max_input_vars }}
+memory_limit = {{ php_memory_limit }}
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Error handling and logging ;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+error_reporting = {{ php_error_reporting }}
+display_errors = {{ php_display_errors }}
+display_startup_errors = {{ php_display_startup_errors }}
+log_errors = On
+log_errors_max_len = 1024
+ignore_repeated_errors = Off
+ignore_repeated_source = Off
+report_memleaks = On
+track_errors = Off
+html_errors = On
+
+;;;;;;;;;;;;;;;;;
+; Data Handling ;
+;;;;;;;;;;;;;;;;;
+
+variables_order = "GPCS"
+request_order = "GP"
+register_argc_argv = Off
+auto_globals_jit = On
+
+post_max_size = {{ php_post_max_size }}
+auto_prepend_file =
+auto_append_file =
+
+default_mimetype = "text/html"
+always_populate_raw_post_data = -1
+
+;;;;;;;;;;;;;;;;;;;;;;;;;
+; Paths and Directories ;
+;;;;;;;;;;;;;;;;;;;;;;;;;
+
+doc_root =
+user_dir =
+
+enable_dl = Off
+
+realpath_cache_size = {{ php_realpath_cache_size }}
+
+;;;;;;;;;;;;;;;;
+; File Uploads ;
+;;;;;;;;;;;;;;;;
+
+file_uploads = On
+upload_max_filesize = {{ php_upload_max_filesize }}
+max_file_uploads = 20
+
+;;;;;;;;;;;;;;;;;;
+; Fopen wrappers ;
+;;;;;;;;;;;;;;;;;;
+
+allow_url_fopen = {{ php_allow_url_fopen }}
+allow_url_include = Off
+
+default_socket_timeout = 60
+
+;;;;;;;;;;;;;;;;;;;
+; Module Settings ;
+;;;;;;;;;;;;;;;;;;;
+
+[CLI Server]
+cli_server.color = On
+
+[Date]
+date.timezone = {{ php_date_timezone }}
+
+[Pdo_mysql]
+pdo_mysql.cache_size = 2000
+pdo_mysql.default_socket=
+
+[mail function]
+; For Win32 only.
+SMTP = localhost
+smtp_port = 25
+
+; For Unix only.  You may supply arguments as well (default: "sendmail -t -i").
+sendmail_path = {{ php_sendmail_path }}
+
+mail.add_x_header = On
+
+[SQL]
+sql.safe_mode = Off
+
+[ODBC]
+odbc.allow_persistent = On
+odbc.check_persistent = On
+odbc.max_persistent = -1
+odbc.max_links = -1
+odbc.defaultlrl = 4096
+odbc.defaultbinmode = 1
+
+[MySQL]
+mysql.allow_local_infile = On
+mysql.allow_persistent = On
+mysql.cache_size = 2000
+mysql.max_persistent = -1
+mysql.max_links = -1
+mysql.default_port =
+mysql.default_socket =
+mysql.default_host =
+mysql.default_user =
+mysql.default_password =
+mysql.connect_timeout = 60
+mysql.trace_mode = Off
+
+[MySQLi]
+mysqli.max_persistent = -1
+mysqli.allow_persistent = On
+mysqli.max_links = -1
+mysqli.cache_size = 2000
+mysqli.default_port = 3306
+mysqli.default_socket =
+mysqli.default_host =
+mysqli.default_user =
+mysqli.default_pw =
+mysqli.reconnect = Off
+
+[mysqlnd]
+mysqlnd.collect_statistics = On
+mysqlnd.collect_memory_statistics = Off
+
+[PostgreSQL]
+pgsql.allow_persistent = On
+pgsql.auto_reset_persistent = Off
+pgsql.max_persistent = -1
+pgsql.max_links = -1
+pgsql.ignore_notice = 0
+pgsql.log_notice = 0
+
+[bcmath]
+bcmath.scale = 0
+
+[Session]
+session.save_handler = {{ php_session_save_handler }}
+session.save_path = {{ php_session_save_path }}
+session.use_cookies = 1
+session.use_only_cookies = 1
+session.name = PHPSESSID
+session.auto_start = 0
+
+session.cookie_lifetime = {{ php_session_cookie_lifetime }}
+session.cookie_path = /
+session.cookie_domain =
+session.cookie_httponly =
+
+session.serialize_handler = php
+
+session.gc_probability = {{ php_session_gc_probability }}
+session.gc_divisor = {{ php_session_gc_divisor }}
+session.gc_maxlifetime = {{ php_session_gc_maxlifetime }}
+
+session.bug_compat_42 = Off
+session.bug_compat_warn = Off
+session.referer_check =
+
+session.cache_limiter = nocache
+session.cache_expire = 180
+
+session.use_trans_sid = 0
+
+session.hash_function = 0
+session.hash_bits_per_character = 5
+
+url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=fakeentry"
+
+[MSSQL]
+mssql.allow_persistent = On
+mssql.max_persistent = -1
+mssql.max_links = -1
+mssql.min_error_severity = 10
+mssql.min_message_severity = 10
+mssql.compatability_mode = Off
+mssql.secure_connection = Off
+
+[Tidy]
+tidy.clean_output = Off
+
+[soap]
+soap.wsdl_cache_enabled=1
+soap.wsdl_cache_dir="/tmp"
+soap.wsdl_cache_ttl=86400
+soap.wsdl_cache_limit = 5
+
+[ldap]
+ldap.max_links = -1
diff --git a/provisioning/roles/geerlingguy.php/templates/www.conf.j2 b/provisioning/roles/geerlingguy.php/templates/www.conf.j2
new file mode 100644
index 000000000..aaab17aa4
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/templates/www.conf.j2
@@ -0,0 +1,12 @@
+[www]
+listen = 127.0.0.1:9000
+listen.allowed_clients = 127.0.0.1
+user = {{ php_fpm_pool_user }}
+group = {{ php_fpm_pool_group }}
+
+pm = dynamic
+pm.max_children = 50
+pm.start_servers = 5
+pm.min_spare_servers = 5
+pm.max_spare_servers = 5
+pm.max_requests = 500
diff --git a/provisioning/roles/geerlingguy.php/tests/Dockerfile.centos-7 b/provisioning/roles/geerlingguy.php/tests/Dockerfile.centos-7
new file mode 100644
index 000000000..8aa065497
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/tests/Dockerfile.centos-7
@@ -0,0 +1,27 @@
+FROM centos:7
+
+# Install systemd -- See https://hub.docker.com/_/centos/
+RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
+RUN yum -y update; yum clean all; \
+(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
+rm -f /lib/systemd/system/multi-user.target.wants/*; \
+rm -f /etc/systemd/system/*.wants/*; \
+rm -f /lib/systemd/system/local-fs.target.wants/*; \
+rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
+rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
+rm -f /lib/systemd/system/basic.target.wants/*; \
+rm -f /lib/systemd/system/anaconda.target.wants/*;
+
+# Install Ansible
+RUN yum -y install epel-release
+RUN yum -y install git ansible sudo
+RUN yum clean all
+
+# Disable requiretty
+RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
+
+# Install Ansible inventory file
+RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
+
+VOLUME ["/sys/fs/cgroup"]
+CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.php/tests/Dockerfile.ubuntu-12.04 b/provisioning/roles/geerlingguy.php/tests/Dockerfile.ubuntu-12.04
new file mode 100644
index 000000000..d0c130cdf
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/tests/Dockerfile.ubuntu-12.04
@@ -0,0 +1,11 @@
+FROM ubuntu:12.04
+RUN apt-get update
+
+# Install Ansible
+RUN apt-get install -y software-properties-common python-software-properties git
+RUN apt-add-repository -y ppa:ansible/ansible
+RUN apt-get update
+RUN apt-get install -y ansible
+
+# Install Ansible inventory file
+RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.php/tests/Dockerfile.ubuntu-14.04 b/provisioning/roles/geerlingguy.php/tests/Dockerfile.ubuntu-14.04
new file mode 100644
index 000000000..ca332871f
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/tests/Dockerfile.ubuntu-14.04
@@ -0,0 +1,11 @@
+FROM ubuntu:14.04
+RUN apt-get update
+
+# Install Ansible
+RUN apt-get install -y software-properties-common git
+RUN apt-add-repository -y ppa:ansible/ansible
+RUN apt-get update
+RUN apt-get install -y ansible
+
+# Install Ansible inventory file
+RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.php/tests/inventory b/provisioning/roles/geerlingguy.php/tests/inventory
new file mode 100644
index 000000000..2fbb50c4a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/tests/inventory
@@ -0,0 +1 @@
+localhost
diff --git a/provisioning/roles/geerlingguy.php/tests/requirements.yml b/provisioning/roles/geerlingguy.php/tests/requirements.yml
new file mode 100644
index 000000000..711227acc
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/tests/requirements.yml
@@ -0,0 +1,2 @@
+---
+- src: geerlingguy.repo-remi
diff --git a/provisioning/roles/geerlingguy.php/tests/test-package.yml b/provisioning/roles/geerlingguy.php/tests/test-package.yml
new file mode 100644
index 000000000..8e749e8d8
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/tests/test-package.yml
@@ -0,0 +1,27 @@
+---
+- hosts: all
+
+  vars:
+    php_enable_webserver: false
+    php_memory_limit: "192M"
+    php_enablerepo: "remi,remi-php70"
+
+  pre_tasks:
+    - include_vars: test-vars-ubuntu1204.yml
+      when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '12.04'
+
+    - name: Ensure build dependencies are installed (RedHat).
+      yum: name=which state=present
+      when: ansible_os_family == 'RedHat'
+
+    - name: Add repository for PHP 7.
+      apt_repository: repo='ppa:ondrej/php'
+      when: ansible_distribution == 'Ubuntu' and ansible_distribution_version != '12.04'
+
+    - name: Add repository for PHP 5.6.
+      apt_repository: repo='ppa:ondrej/php5-5.6'
+      when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '12.04'
+
+  roles:
+    - { role: geerlingguy.repo-remi, when: ansible_os_family == 'RedHat' }
+    - role_under_test
diff --git a/provisioning/roles/geerlingguy.php/tests/test-source.yml b/provisioning/roles/geerlingguy.php/tests/test-source.yml
new file mode 100644
index 000000000..cac53496a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/tests/test-source.yml
@@ -0,0 +1,18 @@
+---
+- hosts: all
+
+  vars:
+    php_enable_webserver: false
+    php_install_from_source: true
+    php_source_clone_dir: /root/php-src
+    php_source_make_command: "make --jobs=2"
+    php_source_version: "php-7.0.5"
+    php_memory_limit: "192M"
+
+  pre_tasks:
+    - name: Ensure build dependencies are installed (RedHat).
+      yum: name=which state=present
+      when: ansible_os_family == 'RedHat'
+
+  roles:
+    - role_under_test
diff --git a/provisioning/roles/geerlingguy.php/tests/test-vars-ubuntu1204.yml b/provisioning/roles/geerlingguy.php/tests/test-vars-ubuntu1204.yml
new file mode 100644
index 000000000..9fabcac42
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/tests/test-vars-ubuntu1204.yml
@@ -0,0 +1,23 @@
+---
+php_version: "5.6"
+php_packages:
+  - php5
+  - php5-mcrypt
+  - php5-cli
+  - php5-common
+  - php5-curl
+  - php5-dev
+  - php5-fpm
+  - php5-gd
+  - php-pear
+  - libpcre3-dev
+php_conf_paths:
+  - /etc/php5/fpm
+  - /etc/php5/apache2
+  - /etc/php5/cli
+php_extension_conf_paths:
+  - /etc/php5/fpm/conf.d
+  - /etc/php5/apache2/conf.d
+  - /etc/php5/cli/conf.d
+php_fpm_daemon: php5-fpm
+php_fpm_conf_path: "/etc/php5/fpm"
diff --git a/provisioning/roles/geerlingguy.php/vars/Debian.yml b/provisioning/roles/geerlingguy.php/vars/Debian.yml
new file mode 100644
index 000000000..ae927c200
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/vars/Debian.yml
@@ -0,0 +1,37 @@
+---
+__php_packages:
+  - php7.0-common
+  - php7.0-cli
+  - php7.0-dev
+  - php7.0-fpm
+  - libpcre3-dev
+  - php7.0-gd
+  - php7.0-curl
+  - php7.0-imap
+  - php7.0-json
+  - php7.0-opcache
+  - php7.0-xml
+  - php7.0-mbstring
+  - php-sqlite3
+  - php-apcu
+__php_webserver_daemon: "apache2"
+
+# Vendor-specific configuration paths on Debian/Ubuntu make my brain asplode.
+__php_conf_paths:
+  - /etc/php/7.0/fpm
+  - /etc/php/7.0/apache2
+  - /etc/php/7.0/cli
+
+__php_extension_conf_paths:
+  - /etc/php/7.0/fpm/conf.d
+  - /etc/php/7.0/apache2/conf.d
+  - /etc/php/7.0/cli/conf.d
+
+__php_apc_conf_filename: 20-apcu.ini
+__php_opcache_conf_filename: 05-opcache.ini
+__php_fpm_daemon: php7.0-fpm
+__php_fpm_conf_path: "/etc/php/7.0/fpm"
+__php_fpm_pool_conf_path: "{{ __php_fpm_conf_path }}/pool.d/www.conf"
+
+__php_fpm_pool_user: www-data
+__php_fpm_pool_group: www-data
diff --git a/provisioning/roles/geerlingguy.php/vars/RedHat.yml b/provisioning/roles/geerlingguy.php/vars/RedHat.yml
new file mode 100644
index 000000000..f17b982ee
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/vars/RedHat.yml
@@ -0,0 +1,33 @@
+---
+__php_packages:
+  - php
+  - php-cli
+  - php-common
+  - php-devel
+  - php-fpm
+  - php-gd
+  - php-imap
+  - php-ldap
+  - php-mbstring
+  - php-opcache
+  - php-pdo
+  - php-pear
+  - php-pecl-apcu
+  - php-xml
+  - php-xmlrpc
+__php_webserver_daemon: "httpd"
+
+__php_conf_paths:
+  - /etc
+
+__php_extension_conf_paths:
+  - /etc/php.d
+
+__php_apc_conf_filename: 50-apc.ini
+__php_opcache_conf_filename: 10-opcache.ini
+__php_fpm_daemon: php-fpm
+__php_fpm_conf_path: "/etc/fpm"
+__php_fpm_pool_conf_path: "/etc/php-fpm.d/www.conf"
+
+__php_fpm_pool_user: apache
+__php_fpm_pool_group: apache
diff --git a/provisioning/roles/geerlingguy.pimpmylog/.travis.yml b/provisioning/roles/geerlingguy.pimpmylog/.travis.yml
new file mode 100644
index 000000000..ba14ee002
--- /dev/null
+++ b/provisioning/roles/geerlingguy.pimpmylog/.travis.yml
@@ -0,0 +1,41 @@
+---
+sudo: required
+language: python
+python: "2.7"
+
+env:
+  - SITE=test.yml
+
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install curl
+
+install:
+  # Install Ansible.
+  - pip install ansible
+
+  # Add ansible.cfg to pick up roles path.
+  - "{ echo '[defaults]'; echo 'roles_path = ../'; } >> ansible.cfg"
+
+  # Install dependencies.
+  - ansible-galaxy install geerlingguy.apache geerlingguy.php
+
+script:
+  # Check the role/playbook's syntax.
+  - "ansible-playbook -i tests/inventory tests/$SITE --syntax-check"
+
+  # Run the role/playbook with ansible-playbook.
+  - "ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo"
+
+  # Run the role/playbook again, checking to make sure it's idempotent.
+  - >
+    ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo
+    | grep -q 'changed=0.*failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)
+
+  # Check if Pimp my Log is reachable.
+  - curl http://127.0.0.1/pimpmylog/
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.pimpmylog/README.md b/provisioning/roles/geerlingguy.pimpmylog/README.md
new file mode 100644
index 000000000..b46539e87
--- /dev/null
+++ b/provisioning/roles/geerlingguy.pimpmylog/README.md
@@ -0,0 +1,49 @@
+# Ansible Role: Pimp My Log
+
+[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-pimpmylog.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-pimpmylog)
+
+Installs [Pimp my Log](http://pimpmylog.com/).
+
+## Requirements
+
+Requires PHP to be installed on the server, and a web server like Apache, Nginx, IIS. You can get Pimp my Log set up pretty quickly with this role in tandem with `geerlingguy.apache` and `geerlingguy.php` available on Ansible Galaxy.
+
+## Role Variables
+
+Available variables are listed below, along with default values (see `defaults/main.yml`):
+
+    pimpmylog_install_dir: /var/www/pimpmylog
+
+The location where Pimp my Log will be installed. You should configure a virtual host or server entry pointing to this directory so you can access the interface. Otherwise, you could choose a location that's within an existing docroot, e.g. the default docroot `/var/www/html/pimpmylog`, and access Pimp my Log at `http://localhost/pimpmylog/`.
+
+    pimpmylog_repo: https://github.com/potsky/PimpMyLog.git
+
+The git repository URL from which Pimp my Log will be cloned.
+
+    pimpmylog_version: master
+
+The version of Pimp my Log to install. Can be any valid tag, branch, or `HEAD`.
+
+    pimpmylog_grant_all_privs: no
+
+The setup of Pimp my Log allows for auto-configuration if the installation directory has `777` privileges, but this is an insecure way to install Pimp my Log. If you're installing on a local development environment, this is relatively harmless to set to `yes` to ease in installation... but if you're running this on a production or publicly-available server, don't even _think_ about changing this value!
+
+## Dependencies
+
+None.
+
+## Example Playbook
+
+    - hosts: webservers
+      roles:
+        - { role: geerlingguy.apache }
+        - { role: geerlingguy.php }
+        - { role: geerlingguy.pimpmylog }
+
+## License
+
+MIT / BSD
+
+## Author Information
+
+This role was created in 2015 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.pimpmylog/defaults/main.yml b/provisioning/roles/geerlingguy.pimpmylog/defaults/main.yml
new file mode 100644
index 000000000..723fbefe4
--- /dev/null
+++ b/provisioning/roles/geerlingguy.pimpmylog/defaults/main.yml
@@ -0,0 +1,5 @@
+---
+pimpmylog_install_dir: /var/www/pimpmylog
+pimpmylog_repo: https://github.com/potsky/PimpMyLog.git
+pimpmylog_version: master
+pimpmylog_grant_all_privs: no
diff --git a/provisioning/roles/geerlingguy.pimpmylog/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.pimpmylog/meta/.galaxy_install_info
new file mode 100644
index 000000000..58bb564f4
--- /dev/null
+++ b/provisioning/roles/geerlingguy.pimpmylog/meta/.galaxy_install_info
@@ -0,0 +1 @@
+{install_date: 'Fri Jul 15 19:49:51 2016', version: 1.0.2}
diff --git a/provisioning/roles/geerlingguy.pimpmylog/meta/main.yml b/provisioning/roles/geerlingguy.pimpmylog/meta/main.yml
new file mode 100644
index 000000000..1c8775be3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.pimpmylog/meta/main.yml
@@ -0,0 +1,23 @@
+---
+dependencies: []
+
+galaxy_info:
+  author: geerlingguy
+  description: Pimp my Log installation for Linux
+  company: "Midwestern Mac, LLC"
+  license: "license (BSD, MIT)"
+  min_ansible_version: 1.8
+  platforms:
+    - name: EL
+      versions:
+      - all
+    - name: Debian
+      versions:
+      - all
+    - name: Ubuntu
+      versions:
+      - all
+  galaxy_tags:
+    - development
+    - web
+    - server
diff --git a/provisioning/roles/geerlingguy.pimpmylog/tasks/main.yml b/provisioning/roles/geerlingguy.pimpmylog/tasks/main.yml
new file mode 100644
index 000000000..ccf0fca44
--- /dev/null
+++ b/provisioning/roles/geerlingguy.pimpmylog/tasks/main.yml
@@ -0,0 +1,14 @@
+---
+- name: Clone Pimp my Log.
+  git:
+    dest: "{{ pimpmylog_install_dir }}"
+    repo: "{{ pimpmylog_repo }}"
+    version: "{{ pimpmylog_version }}"
+    accept_hostkey: yes
+
+- name: Grant all privileges on the Pimp my Log directory.
+  file:
+    path: "{{ pimpmylog_install_dir }}"
+    state: directory
+    mode: 0777
+  when: pimpmylog_grant_all_privs
diff --git a/provisioning/roles/geerlingguy.pimpmylog/tests/inventory b/provisioning/roles/geerlingguy.pimpmylog/tests/inventory
new file mode 100644
index 000000000..2fbb50c4a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.pimpmylog/tests/inventory
@@ -0,0 +1 @@
+localhost
diff --git a/provisioning/roles/geerlingguy.pimpmylog/tests/test.yml b/provisioning/roles/geerlingguy.pimpmylog/tests/test.yml
new file mode 100644
index 000000000..0b6322eff
--- /dev/null
+++ b/provisioning/roles/geerlingguy.pimpmylog/tests/test.yml
@@ -0,0 +1,11 @@
+---
+- hosts: localhost
+  remote_user: root
+
+  vars:
+    pimpmylog_grant_all_privs: yes
+
+  roles:
+    - geerlingguy.apache
+    - geerlingguy.php
+    - ansible-role-pimpmylog
diff --git a/provisioning/roles/geerlingguy.postfix/.travis.yml b/provisioning/roles/geerlingguy.postfix/.travis.yml
new file mode 100644
index 000000000..df7b65408
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postfix/.travis.yml
@@ -0,0 +1,36 @@
+---
+sudo: required
+language: python
+python: "2.7"
+
+env:
+  - SITE=test.yml
+
+before_install:
+  - sudo apt-get update -qq
+
+install:
+  # Install Ansible.
+  - pip install ansible
+
+  # Add ansible.cfg to pick up roles path.
+  - "{ echo '[defaults]'; echo 'roles_path = ../'; } >> ansible.cfg"
+
+script:
+  # Check the role/playbook's syntax.
+  - "ansible-playbook -i tests/inventory tests/$SITE --syntax-check"
+
+  # Run the role/playbook with ansible-playbook.
+  - "ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo"
+
+  # Run the role/playbook again, checking to make sure it's idempotent.
+  - >
+    ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo
+    | grep -q 'changed=0.*failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)
+
+  # TODO - Add test to check if postfix is working correctly.
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.postfix/README.md b/provisioning/roles/geerlingguy.postfix/README.md
new file mode 100644
index 000000000..6bb46a155
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postfix/README.md
@@ -0,0 +1,31 @@
+# Ansible Role: Postfix
+
+[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-postfix.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-postfix)
+
+Installs postfix on RedHat/CentOS or Debian/Ubuntu.
+
+## Requirements
+
+If you're using this as an SMTP relay server, you will need to do that on your own, and open TCP port 25 in your server firewall.
+
+## Role Variables
+
+None.
+
+## Dependencies
+
+None.
+
+## Example Playbook
+
+    - hosts: all
+      roles:
+        - { role: geerlingguy.postfix }
+
+## License
+
+MIT / BSD
+
+## Author Information
+
+This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.postfix/defaults/main.yml b/provisioning/roles/geerlingguy.postfix/defaults/main.yml
new file mode 100644
index 000000000..ed97d539c
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postfix/defaults/main.yml
@@ -0,0 +1 @@
+---
diff --git a/provisioning/roles/geerlingguy.postfix/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.postfix/meta/.galaxy_install_info
new file mode 100644
index 000000000..6d641a107
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postfix/meta/.galaxy_install_info
@@ -0,0 +1 @@
+{install_date: 'Fri Jul 15 19:49:54 2016', version: 1.1.0}
diff --git a/provisioning/roles/geerlingguy.postfix/meta/main.yml b/provisioning/roles/geerlingguy.postfix/meta/main.yml
new file mode 100644
index 000000000..1f034f178
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postfix/meta/main.yml
@@ -0,0 +1,23 @@
+---
+dependencies: []
+
+galaxy_info:
+  author: geerlingguy
+  description: Postfix for RedHat/CentOS or Debian/Ubuntu.
+  company: "Midwestern Mac, LLC"
+  license: "license (BSD, MIT)"
+  min_ansible_version: 1.8
+  platforms:
+    - name: EL
+      versions:
+      - all
+    - name: Debian
+      versions:
+      - all
+    - name: Ubuntu
+      versions:
+      - all
+  galaxy_tags:
+    - networking
+    - system
+    - mail
diff --git a/provisioning/roles/geerlingguy.postfix/tasks/main.yml b/provisioning/roles/geerlingguy.postfix/tasks/main.yml
new file mode 100644
index 000000000..6d0ca1a7c
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postfix/tasks/main.yml
@@ -0,0 +1,11 @@
+---
+- name: Ensure postfix is installed (RedHat).
+  yum: name=postfix state=installed
+  when: ansible_os_family == 'RedHat'
+
+- name: Ensure postfix is installed (Debian).
+  apt: name=postfix state=installed
+  when: ansible_os_family == 'Debian'
+
+- name: Ensure postfix is started and enabled at boot.
+  service: name=postfix state=started enabled=yes
diff --git a/provisioning/roles/geerlingguy.postfix/tests/inventory b/provisioning/roles/geerlingguy.postfix/tests/inventory
new file mode 100644
index 000000000..2fbb50c4a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postfix/tests/inventory
@@ -0,0 +1 @@
+localhost
diff --git a/provisioning/roles/geerlingguy.postfix/tests/test.yml b/provisioning/roles/geerlingguy.postfix/tests/test.yml
new file mode 100644
index 000000000..f404e408f
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postfix/tests/test.yml
@@ -0,0 +1,5 @@
+---
+- hosts: localhost
+  remote_user: root
+  roles:
+    - ansible-role-postfix
diff --git a/provisioning/roles/geerlingguy.redis/.travis.yml b/provisioning/roles/geerlingguy.redis/.travis.yml
new file mode 100644
index 000000000..70111384e
--- /dev/null
+++ b/provisioning/roles/geerlingguy.redis/.travis.yml
@@ -0,0 +1,47 @@
+---
+sudo: required
+language: python
+python: "2.7"
+
+env:
+  - SITE=test.yml
+
+before_install:
+  - sudo apt-get update -qq
+
+  # Remove pre-existing Redis installation.
+  - sudo apt-get remove -y --purge redis-server
+  - sudo rm -rf /etc/redis
+
+install:
+  # Install Ansible.
+  - pip install ansible
+
+  # Add ansible.cfg to pick up roles path.
+  - "{ echo '[defaults]'; echo 'roles_path = ../'; } >> ansible.cfg"
+
+script:
+  # Check the role/playbook's syntax.
+  - "ansible-playbook -i tests/inventory tests/$SITE --syntax-check"
+
+  # Run the role/playbook with ansible-playbook.
+  - "ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo"
+
+  # Run the role/playbook again, checking to make sure it's idempotent.
+  - >
+    ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo
+    | grep -q 'changed=0.*failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)
+
+  # Make sure Redis is running, and can be stopped and started cleanly.
+  - sudo service redis-server status
+  - sudo service redis-server stop
+  - sudo service redis-server start
+
+after_failure:
+  - sudo cat /var/log/redis/redis-server.log
+  - sudo cat /etc/redis/redis.conf
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.redis/README.md b/provisioning/roles/geerlingguy.redis/README.md
new file mode 100644
index 000000000..4f746790a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.redis/README.md
@@ -0,0 +1,92 @@
+# Ansible Role: Redis
+
+[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-redis.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-redis)
+
+Installs [Redis](http://redis.io/) on RHEL/CentOS or Debian/Ubuntu.
+
+## Requirements
+
+On RedHat-based distributions, requires the EPEL repository (you can simply add the role `geerlingguy.repo-epel` to install ensure EPEL is available).
+
+## Role Variables
+
+Available variables are listed below, along with default values (see `defaults/main.yml`):
+
+    redis_port: 6379
+    redis_bind_interface: 127.0.0.1
+
+Port and interface on which Redis will listen. Set the interface to `0.0.0.0` to listen on all interfaces.
+
+    redis_unixsocket: ''
+
+If set, Redis will also listen on a local Unix socket.
+
+    redis_timeout: 300
+
+Close a connection after a client is idle `N` seconds. Set to `0` to disable timeout.
+
+    redis_loglevel: "notice"
+    redis_logfile: /var/log/redis/redis-server.log
+
+Log level and log location (valid levels are `debug`, `verbose`, `notice`, and `warning`).
+
+    redis_databases: 16
+
+The number of Redis databases.
+
+    # Set to an empty set to disable persistence (saving the DB to disk).
+    redis_save:
+      - 900 1
+      - 300 10
+      - 60 10000
+
+Snapshotting configuration; setting values in this list will save the database to disk if the given number of seconds (e.g. `900`) and the given number of write operations (e.g. `1`) have occurred.
+
+    redis_rdbcompression: "yes"
+    redis_dbfilename: dump.rdb
+    redis_dbdir: /var/lib/redis
+
+Database compression and location configuration.
+
+    redis_maxmemory: 0
+    
+Limit memory usage to the specified amount of bytes. Leave at 0 for unlimited.
+
+    redis_maxmemory_policy: "noeviction"
+    
+The method to use to keep memory usage below the limit, if specified. See [Using Redis as an LRU cache](http://redis.io/topics/lru-cache).
+
+    redis_maxmemory_samples: 5
+
+Number of samples to use to approximate LRU. See [Using Redis as an LRU cache](http://redis.io/topics/lru-cache).
+
+    redis_appendonly: "no"
+
+The appendonly option, if enabled, affords better data durability guarantees, at the cost of slightly slower performance.
+
+    redis_appendfsync: "everysec"
+
+Valid values are `always` (slower, safest), `everysec` (happy medium), or `no` (let the filesystem flush data when it wants, most risky).
+
+    # Add extra include files for local configuration/overrides.
+    redis_includes: []
+
+Add extra include file paths to this list to include more/localized Redis configuration.
+
+## Dependencies
+
+None.
+
+## Example Playbook
+
+    - hosts: all
+      roles:
+        - { role: geerlingguy.redis }
+
+## License
+
+MIT / BSD
+
+## Author Information
+
+This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.redis/defaults/main.yml b/provisioning/roles/geerlingguy.redis/defaults/main.yml
new file mode 100644
index 000000000..15e94a2f4
--- /dev/null
+++ b/provisioning/roles/geerlingguy.redis/defaults/main.yml
@@ -0,0 +1,30 @@
+---
+redis_port: 6379
+redis_bind_interface: 127.0.0.1
+redis_unixsocket: ''
+redis_timeout: 300
+
+redis_loglevel: "notice"
+redis_logfile: /var/log/redis/redis-server.log
+
+redis_databases: 16
+
+# Set to an empty set to disable persistence (saving the DB to disk).
+redis_save:
+  - 900 1
+  - 300 10
+  - 60 10000
+
+redis_rdbcompression: "yes"
+redis_dbfilename: dump.rdb
+redis_dbdir: /var/lib/redis
+
+redis_maxmemory: 0
+redis_maxmemory_policy: "noeviction"
+redis_maxmemory_samples: 5
+
+redis_appendonly: "no"
+redis_appendfsync: "everysec"
+
+# Add extra include files for local configuration/overrides.
+redis_includes: []
diff --git a/provisioning/roles/geerlingguy.redis/handlers/main.yml b/provisioning/roles/geerlingguy.redis/handlers/main.yml
new file mode 100644
index 000000000..9a212039f
--- /dev/null
+++ b/provisioning/roles/geerlingguy.redis/handlers/main.yml
@@ -0,0 +1,3 @@
+---
+- name: restart redis
+  service: "name={{ redis_daemon }} state=restarted"
diff --git a/provisioning/roles/geerlingguy.redis/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.redis/meta/.galaxy_install_info
new file mode 100644
index 000000000..69c9c0a74
--- /dev/null
+++ b/provisioning/roles/geerlingguy.redis/meta/.galaxy_install_info
@@ -0,0 +1 @@
+{install_date: 'Fri Jul 15 19:49:59 2016', version: 1.2.0}
diff --git a/provisioning/roles/geerlingguy.redis/meta/main.yml b/provisioning/roles/geerlingguy.redis/meta/main.yml
new file mode 100644
index 000000000..109a5d752
--- /dev/null
+++ b/provisioning/roles/geerlingguy.redis/meta/main.yml
@@ -0,0 +1,24 @@
+---
+dependencies: []
+
+galaxy_info:
+  author: geerlingguy
+  description: Redis for Linux
+  company: "Midwestern Mac, LLC"
+  license: "license (BSD, MIT)"
+  min_ansible_version: 1.8
+  platforms:
+    - name: EL
+      versions:
+      - 6
+      - 7
+    - name: Debian
+      versions:
+      - all
+    - name: Ubuntu
+      versions:
+      - all
+  galaxy_tags:
+    - database
+    - development
+    - web
diff --git a/provisioning/roles/geerlingguy.redis/tasks/main.yml b/provisioning/roles/geerlingguy.redis/tasks/main.yml
new file mode 100644
index 000000000..ec8de5132
--- /dev/null
+++ b/provisioning/roles/geerlingguy.redis/tasks/main.yml
@@ -0,0 +1,21 @@
+---
+# Variable setup.
+- name: Include OS-specific variables.
+  include_vars: "{{ ansible_os_family }}.yml"
+
+# Setup/install tasks.
+- include: setup-RedHat.yml
+  when: ansible_os_family == 'RedHat'
+
+- include: setup-Debian.yml
+  when: ansible_os_family == 'Debian'
+
+- name: Ensure Redis is configured.
+  template:
+    src: redis.conf.j2
+    dest: "{{ redis_conf_path }}"
+    mode: 0644
+  notify: restart redis
+
+- name: Ensure redis is running and enabled on boot.
+  service: "name={{ redis_daemon }} state=started enabled=yes"
diff --git a/provisioning/roles/geerlingguy.redis/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.redis/tasks/setup-Debian.yml
new file mode 100644
index 000000000..c105caf18
--- /dev/null
+++ b/provisioning/roles/geerlingguy.redis/tasks/setup-Debian.yml
@@ -0,0 +1,3 @@
+---
+- name: Ensure redis is installed.
+  apt: name=redis-server state=installed
diff --git a/provisioning/roles/geerlingguy.redis/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.redis/tasks/setup-RedHat.yml
new file mode 100644
index 000000000..85ed9091d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.redis/tasks/setup-RedHat.yml
@@ -0,0 +1,3 @@
+---
+- name: Ensure redis is installed.
+  yum: name=redis state=installed enablerepo=epel
diff --git a/provisioning/roles/geerlingguy.redis/templates/redis.conf.j2 b/provisioning/roles/geerlingguy.redis/templates/redis.conf.j2
new file mode 100644
index 000000000..f7a7c5f04
--- /dev/null
+++ b/provisioning/roles/geerlingguy.redis/templates/redis.conf.j2
@@ -0,0 +1,45 @@
+daemonize yes
+pidfile /var/run/redis/{{ redis_daemon }}.pid
+port {{ redis_port }}
+bind {{ redis_bind_interface }}
+
+{% if redis_unixsocket %}
+unixsocket {{ redis_unixsocket }}
+{% endif %}
+
+timeout {{ redis_timeout }}
+
+loglevel {{ redis_loglevel }}
+logfile {{ redis_logfile }}
+
+# To enable logging to the system logger, just set 'syslog-enabled' to yes,
+# and optionally update the other syslog parameters to suit your needs.
+# syslog-enabled no
+# syslog-ident redis
+# syslog-facility local0
+
+databases {{ redis_databases }}
+
+{% for save in redis_save %}
+save {{ save }}
+{% endfor %}
+
+rdbcompression {{ redis_rdbcompression }}
+dbfilename {{ redis_dbfilename }}
+dir {{ redis_dbdir }}
+
+# maxclients 128
+
+{% if redis_maxmemory %}
+maxmemory {{ redis_maxmemory }}
+maxmemory-policy {{ redis_maxmemory_policy }}
+maxmemory-samples {{ redis_maxmemory_samples }}
+{% endif %}
+
+appendonly {{ redis_appendonly }}
+appendfsync {{ redis_appendfsync }}
+no-appendfsync-on-rewrite no
+
+{% for include in redis_includes %}
+include {{ include }}
+{% endfor %}
diff --git a/provisioning/roles/geerlingguy.redis/tests/inventory b/provisioning/roles/geerlingguy.redis/tests/inventory
new file mode 100644
index 000000000..2fbb50c4a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.redis/tests/inventory
@@ -0,0 +1 @@
+localhost
diff --git a/provisioning/roles/geerlingguy.redis/tests/test.yml b/provisioning/roles/geerlingguy.redis/tests/test.yml
new file mode 100644
index 000000000..d24c0a9cc
--- /dev/null
+++ b/provisioning/roles/geerlingguy.redis/tests/test.yml
@@ -0,0 +1,6 @@
+---
+- hosts: localhost
+  remote_user: root
+
+  roles:
+    - ansible-role-redis
diff --git a/provisioning/roles/geerlingguy.redis/vars/Debian.yml b/provisioning/roles/geerlingguy.redis/vars/Debian.yml
new file mode 100644
index 000000000..517d91a1f
--- /dev/null
+++ b/provisioning/roles/geerlingguy.redis/vars/Debian.yml
@@ -0,0 +1,3 @@
+---
+redis_daemon: redis-server
+redis_conf_path: /etc/redis/redis.conf
diff --git a/provisioning/roles/geerlingguy.redis/vars/RedHat.yml b/provisioning/roles/geerlingguy.redis/vars/RedHat.yml
new file mode 100644
index 000000000..d4f603ce3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.redis/vars/RedHat.yml
@@ -0,0 +1,3 @@
+---
+redis_daemon: redis
+redis_conf_path: /etc/redis.conf
diff --git a/provisioning/roles/geerlingguy.repo-remi/.travis.yml b/provisioning/roles/geerlingguy.repo-remi/.travis.yml
new file mode 100644
index 000000000..c96ecd0f9
--- /dev/null
+++ b/provisioning/roles/geerlingguy.repo-remi/.travis.yml
@@ -0,0 +1,48 @@
+---
+sudo: required
+
+env:
+  - distribution: centos
+    version: 6
+    init: /sbin/init
+    run_opts: ""
+  - distribution: centos
+    version: 7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+
+services:
+  - docker
+
+before_install:
+  # Pull container
+  - 'sudo docker pull ${distribution}:${version}'
+  # Customize container
+  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+
+script:
+  - container_id=$(mktemp)
+  # Run container in detached state
+  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+
+  # Install dependencies.
+  - 'sudo docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
+
+  # Ansible syntax check.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+
+  # Test role.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+
+  # Test role idempotence.
+  - >
+    sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml
+    | grep -q 'changed=0.*failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)
+
+  # Clean up
+  - 'sudo docker stop "$(cat ${container_id})"'
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.repo-remi/README.md b/provisioning/roles/geerlingguy.repo-remi/README.md
new file mode 100644
index 000000000..c93ee157a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.repo-remi/README.md
@@ -0,0 +1,39 @@
+# Ansible Role: Remi Repository
+
+[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-repo-remi.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-repo-remi)
+
+Installs [Remi's RPM repository](http://rpms.famillecollet.com/) for RHEL/CentOS.
+
+## Requirements
+
+None.
+
+## Role Variables
+
+Available variables are listed below, along with default values (see `defaults/main.yml`):
+
+    remi_repo_url: "http://rpms.famillecollet.com/enterprise/remi-release-{{ ansible_distribution_major_version }}.rpm"
+
+The URL from which the Remi repo `.rpm` will be downloaded and installed.
+
+    remi_repo_gpg_key_url: "http://rpms.remirepo.net/RPM-GPG-KEY-remi"
+
+Remi repo GPG key location. Can be set to a local file or to the URL from Remi's website.
+
+## Dependencies
+
+None.
+
+## Example Playbook
+
+    - hosts: servers
+      roles:
+        - geerlingguy.repo-remi
+
+## License
+
+MIT / BSD
+
+## Author Information
+
+This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.repo-remi/defaults/main.yml b/provisioning/roles/geerlingguy.repo-remi/defaults/main.yml
new file mode 100644
index 000000000..c4827c60c
--- /dev/null
+++ b/provisioning/roles/geerlingguy.repo-remi/defaults/main.yml
@@ -0,0 +1,3 @@
+---
+remi_repo_url: "http://rpms.remirepo.net/enterprise/remi-release-{{ ansible_distribution_major_version }}.rpm"
+remi_repo_gpg_key_url: "http://rpms.remirepo.net/RPM-GPG-KEY-remi"
diff --git a/provisioning/roles/geerlingguy.repo-remi/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.repo-remi/meta/.galaxy_install_info
new file mode 100644
index 000000000..e363416af
--- /dev/null
+++ b/provisioning/roles/geerlingguy.repo-remi/meta/.galaxy_install_info
@@ -0,0 +1 @@
+{install_date: 'Fri Jul 15 19:50:02 2016', version: 1.2.0}
diff --git a/provisioning/roles/geerlingguy.repo-remi/meta/main.yml b/provisioning/roles/geerlingguy.repo-remi/meta/main.yml
new file mode 100644
index 000000000..1f4e932f9
--- /dev/null
+++ b/provisioning/roles/geerlingguy.repo-remi/meta/main.yml
@@ -0,0 +1,15 @@
+---
+dependencies: []
+
+galaxy_info:
+  author: geerlingguy
+  description: Remi's RPM repository for RHEL/CentOS.
+  company: "Midwestern Mac, LLC"
+  license: "license (BSD, MIT)"
+  min_ansible_version: 1.8
+  platforms:
+    - name: EL
+      versions:
+      - all
+  galaxy_tags:
+    - packaging
diff --git a/provisioning/roles/geerlingguy.repo-remi/tasks/main.yml b/provisioning/roles/geerlingguy.repo-remi/tasks/main.yml
new file mode 100644
index 000000000..b9c50b955
--- /dev/null
+++ b/provisioning/roles/geerlingguy.repo-remi/tasks/main.yml
@@ -0,0 +1,10 @@
+---
+- name: Install remi repo.
+  yum:
+    name: "{{ remi_repo_url }}"
+    state: present
+
+- name: Import remi GPG key.
+  rpm_key:
+    key: "{{ remi_repo_gpg_key_url }}"
+    state: present
diff --git a/provisioning/roles/geerlingguy.repo-remi/tests/Dockerfile.centos-6 b/provisioning/roles/geerlingguy.repo-remi/tests/Dockerfile.centos-6
new file mode 100644
index 000000000..7df05ff57
--- /dev/null
+++ b/provisioning/roles/geerlingguy.repo-remi/tests/Dockerfile.centos-6
@@ -0,0 +1,19 @@
+FROM centos:6
+
+# Install Ansible
+RUN yum -y update; yum clean all;
+RUN yum -y install epel-release
+RUN yum -y install git python-setuptools gcc sudo libffi-devel python-devel openssl-devel
+RUN yum clean all
+RUN easy_install pip
+RUN pip install ansible
+
+
+# Disable requiretty
+RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
+
+# Install Ansible inventory file
+RUN mkdir - p /etc/ansible
+RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
+
+CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.repo-remi/tests/Dockerfile.centos-7 b/provisioning/roles/geerlingguy.repo-remi/tests/Dockerfile.centos-7
new file mode 100644
index 000000000..ded17f155
--- /dev/null
+++ b/provisioning/roles/geerlingguy.repo-remi/tests/Dockerfile.centos-7
@@ -0,0 +1,29 @@
+FROM centos:7
+
+# Install systemd -- See https://hub.docker.com/_/centos/
+RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
+RUN yum -y update; yum clean all; \
+(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
+rm -f /lib/systemd/system/multi-user.target.wants/*; \
+rm -f /etc/systemd/system/*.wants/*; \
+rm -f /lib/systemd/system/local-fs.target.wants/*; \
+rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
+rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
+rm -f /lib/systemd/system/basic.target.wants/*; \
+rm -f /lib/systemd/system/anaconda.target.wants/*;
+
+# Install Ansible
+RUN yum -y install git python-setuptools gcc sudo libffi-devel python-devel openssl-devel
+RUN yum clean all
+RUN easy_install pip
+RUN pip install ansible
+
+# Disable requiretty
+RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
+
+# Install Ansible inventory file
+RUN mkdir - p /etc/ansible
+RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
+
+VOLUME ["/sys/fs/cgroup"]
+CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.repo-remi/tests/requirements.yml b/provisioning/roles/geerlingguy.repo-remi/tests/requirements.yml
new file mode 100644
index 000000000..711227acc
--- /dev/null
+++ b/provisioning/roles/geerlingguy.repo-remi/tests/requirements.yml
@@ -0,0 +1,2 @@
+---
+- src: geerlingguy.repo-remi
diff --git a/provisioning/roles/geerlingguy.repo-remi/tests/test.yml b/provisioning/roles/geerlingguy.repo-remi/tests/test.yml
new file mode 100644
index 000000000..3646ff420
--- /dev/null
+++ b/provisioning/roles/geerlingguy.repo-remi/tests/test.yml
@@ -0,0 +1,5 @@
+---
+- hosts: all
+
+  roles:
+    - role_under_test
diff --git a/provisioning/roles/geerlingguy.ruby/.travis.yml b/provisioning/roles/geerlingguy.ruby/.travis.yml
new file mode 100644
index 000000000..d09b9b48e
--- /dev/null
+++ b/provisioning/roles/geerlingguy.ruby/.travis.yml
@@ -0,0 +1,61 @@
+---
+sudo: required
+language: python
+python: "2.7"
+
+env:
+  - SITE=test-install-from-source.yml
+    RUBY_VERSION=2.3.0
+    RUBY_PATH_PREFIX=/usr/local
+  - SITE=test-install-package.yml
+    RUBY_VERSION=1.8.7
+    RUBY_PATH_PREFIX=/usr
+
+before_install:
+  - sudo apt-get update -qq
+
+install:
+  # Install Ansible.
+  - pip install ansible
+
+  # Ensure ruby is not installed.
+  - yes | gem uninstall --all
+  - yes "yes" | rvm implode --force
+  - sudo apt-get purge -y ruby
+  - sudo rm -rf ~/.rvm
+
+  # Add ansible.cfg to pick up roles path.
+  - "{ echo '[defaults]'; echo 'roles_path = ../'; } >> ansible.cfg"
+
+script:
+  # Check the role/playbook's syntax.
+  - "ansible-playbook -i tests/inventory tests/$SITE --syntax-check"
+
+  # Run the role/playbook with ansible-playbook.
+  - "ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo"
+
+  # Run the role/playbook again, checking to make sure it's idempotent.
+  - >
+    ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo
+    | grep -q 'changed=0.*failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)
+
+  # Make sure ruby is installed and at the correct version.
+  - which ruby
+  - test -x $RUBY_PATH_PREFIX/bin/ruby
+
+  - ruby --version
+  - $RUBY_PATH_PREFIX/bin/ruby --version | grep -qF "$RUBY_VERSION"
+
+  # Make sure bundler is installed.
+  - ls -lah /usr/local/bin
+  - which bundle
+
+after_failure:
+  # If we failed, it's likely due to Travis environment changes.
+  - which ruby
+  - ruby --version
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.ruby/README.md b/provisioning/roles/geerlingguy.ruby/README.md
new file mode 100644
index 000000000..2c0061724
--- /dev/null
+++ b/provisioning/roles/geerlingguy.ruby/README.md
@@ -0,0 +1,59 @@
+# Ansible Role: Ruby
+
+[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-ruby.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-ruby)
+
+Installs Ruby and bundler gem on Linux.
+
+## Requirements
+
+None.
+
+## Role Variables
+
+Available variables are listed below, along with default values (see `defaults/main.yml`):
+
+    workspace: /root
+
+The location where temporary files will be downloaded in preparation for Ruby installation.
+
+    ruby_rubygems_package_name: rubygems
+
+The name of the `rubygems` package. Generally, the default should work; but it will be set to `rubygems-integration` automatically on Ubuntu Trusty (14.04).
+
+    ruby_install_gems: []
+
+A list of Ruby gems to install (just the name of the gem to be installed). This is meant as a simple convenience, and will only install the latest version of the gem. If you need to install gems with more options or specificity, you can do so elsewhere in your playbook.
+
+    ruby_install_gems_user: username
+
+The user account under which Ruby gems will be installed. Defaults to the `ansible_ssh_user` if not set.
+
+    ruby_install_from_source: false
+
+By default, this role will install whatever version of ruby is available through your system's package manager (`apt` or `yum`). You can install whatever version you like (including the latest release) by setting this to `true` and/or updating the `ruby_download_url` and `ruby_version`.
+
+    ruby_download_url: http://cache.ruby-lang.org/pub/ruby/2.2/ruby-2.2.1.tar.gz
+
+The URL from which Ruby will be downloaded (only used if `ruby_install_from_source` is `true`).
+
+    ruby_version: 2.2.1
+
+The version of ruby that will be installed (only used if `ruby_install_from_source` is `true`).
+
+## Dependencies
+
+None.
+
+## Example Playbook
+
+    - hosts: server
+      roles:
+        - { role: geerlingguy.ruby }
+
+## License
+
+MIT / BSD
+
+## Author Information
+
+This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.ruby/defaults/main.yml b/provisioning/roles/geerlingguy.ruby/defaults/main.yml
new file mode 100644
index 000000000..bd0698362
--- /dev/null
+++ b/provisioning/roles/geerlingguy.ruby/defaults/main.yml
@@ -0,0 +1,16 @@
+---
+workspace: /root
+
+# A list of Ruby gems to install.
+ruby_install_gems: []
+
+# The user account under which Ruby gems will be installed.
+# ruby_install_gems_user: username
+
+# If set to TRUE, ruby will be installed from source, using the version set with
+# the 'ruby_version' variable instead of using a package.
+ruby_install_from_source: false
+ruby_download_url: http://cache.ruby-lang.org/pub/ruby/2.3/ruby-2.3.0.tar.gz
+ruby_version: 2.3.0
+
+ruby_rubygems_package_name: rubygems
diff --git a/provisioning/roles/geerlingguy.ruby/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.ruby/meta/.galaxy_install_info
new file mode 100644
index 000000000..9f943894f
--- /dev/null
+++ b/provisioning/roles/geerlingguy.ruby/meta/.galaxy_install_info
@@ -0,0 +1 @@
+{install_date: 'Fri Jul 15 19:50:06 2016', version: 2.3.1}
diff --git a/provisioning/roles/geerlingguy.ruby/meta/main.yml b/provisioning/roles/geerlingguy.ruby/meta/main.yml
new file mode 100644
index 000000000..6c5c21ba1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.ruby/meta/main.yml
@@ -0,0 +1,45 @@
+---
+dependencies: []
+
+galaxy_info:
+  author: geerlingguy
+  description: Ruby installation for Linux.
+  company: "Midwestern Mac, LLC"
+  license: "license (BSD, MIT)"
+  min_ansible_version: 1.9
+  platforms:
+    - name: EL
+      versions:
+      - all
+    - name: GenericUNIX
+      versions:
+      - all
+    - name: Fedora
+      versions:
+      - all
+    - name: opensuse
+      versions:
+      - all
+    - name: GenericBSD
+      versions:
+      - all
+    - name: FreeBSD
+      versions:
+      - all
+    - name: Ubuntu
+      versions:
+      - lucid
+      - trusty
+      - precise
+    - name: SLES
+      versions:
+      - all
+    - name: GenericLinux
+      versions:
+      - all
+    - name: Debian
+      versions:
+      - all
+  galaxy_tags:
+    - development
+    - web
diff --git a/provisioning/roles/geerlingguy.ruby/tasks/install-from-source.yml b/provisioning/roles/geerlingguy.ruby/tasks/install-from-source.yml
new file mode 100644
index 000000000..2ae8ac796
--- /dev/null
+++ b/provisioning/roles/geerlingguy.ruby/tasks/install-from-source.yml
@@ -0,0 +1,60 @@
+---
+- name: Install packages required to build ruby (RedHat).
+  yum: "name={{ item }} state=present"
+  with_items:
+    - zlib-devel
+    - openssl-static
+  when: ansible_os_family == 'RedHat'
+
+- name: Update apt cache (Debian).
+  apt: update_cache=yes cache_valid_time=86400
+  when: ansible_os_family == 'Debian'
+
+- name: Install packages required to build ruby (Debian).
+  apt: "name={{ item }} state=present"
+  with_items:
+    - zlib1g-dev
+    - libssl-dev
+    - libyaml-dev
+    - libreadline6-dev
+    - zlib1g-dev
+    - libncurses5-dev
+    - libffi-dev
+    - libgdbm3
+    - libgdbm-dev
+  when: ansible_os_family == 'Debian'
+
+- name: Download ruby.
+  get_url:
+    url: "{{ ruby_download_url }}"
+    dest: "{{ workspace }}/ruby-{{ ruby_version }}.tar.gz"
+
+- name: Extract ruby.
+  unarchive:
+    src: "{{ workspace }}/ruby-{{ ruby_version }}.tar.gz"
+    dest: "{{ workspace }}/"
+    copy: no
+
+- name: Build ruby.
+  command: >
+    {{ item }}
+    chdir={{ workspace }}/ruby-{{ ruby_version }}
+    creates=/usr/local/bin/ruby
+  with_items:
+    - ./configure --enable-shared
+    - make
+    - sudo make install
+
+- name: Add ruby symlinks.
+  file:
+    src: "/usr/local/bin/{{ item }}"
+    dest: "/usr/bin/{{ item }}"
+    state: link
+    force: yes
+  with_items:
+    - erb
+    - gem
+    - irb
+    - rake
+    - rdoc
+    - ruby
diff --git a/provisioning/roles/geerlingguy.ruby/tasks/main.yml b/provisioning/roles/geerlingguy.ruby/tasks/main.yml
new file mode 100644
index 000000000..b79d38b4e
--- /dev/null
+++ b/provisioning/roles/geerlingguy.ruby/tasks/main.yml
@@ -0,0 +1,26 @@
+---
+# Include OS-specific installation tasks.
+- include: setup-RedHat.yml
+  when: (ruby_install_from_source == false) and (ansible_os_family == 'RedHat')
+
+- include: setup-Debian.yml
+  when: (ruby_install_from_source == false) and (ansible_os_family == 'Debian')
+
+# Install ruby from source when ruby_install_from_source is true.
+- include: install-from-source.yml
+  when: ruby_install_from_source == true
+
+# Install Bundler and configured gems.
+- name: Install Bundler.
+  gem: name=bundler state=present user_install=no
+
+- name: Define ruby_install_gems_user.
+  set_fact:
+    ruby_install_gems_user: "{{ ansible_ssh_user }}"
+  when: ruby_install_gems_user is not defined
+
+- name: Install configured gems.
+  gem: "name={{ item }} state=present"
+  become: yes
+  become_user: "{{ ruby_install_gems_user }}"
+  with_items: "{{ ruby_install_gems }}"
diff --git a/provisioning/roles/geerlingguy.ruby/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.ruby/tasks/setup-Debian.yml
new file mode 100644
index 000000000..fdcce9b89
--- /dev/null
+++ b/provisioning/roles/geerlingguy.ruby/tasks/setup-Debian.yml
@@ -0,0 +1,14 @@
+---
+- name: Update apt cache.
+  apt: update_cache=yes cache_valid_time=86400
+
+- name: Set rubygems package name for Ubuntu 14.04.
+  set_fact:
+    ruby_rubygems_package_name: rubygems-integration
+  when: ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'trusty'
+
+- name: Install ruby and rubygems.
+  apt: "name={{ item }} state=present"
+  with_items:
+    - ruby-full
+    - "{{ ruby_rubygems_package_name }}"
diff --git a/provisioning/roles/geerlingguy.ruby/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.ruby/tasks/setup-RedHat.yml
new file mode 100644
index 000000000..6df6be14f
--- /dev/null
+++ b/provisioning/roles/geerlingguy.ruby/tasks/setup-RedHat.yml
@@ -0,0 +1,6 @@
+---
+- name: Install ruby and rubygems.
+  yum: "name={{ item }} state=present"
+  with_items:
+    - ruby
+    - "{{ ruby_rubygems_package_name }}"
diff --git a/provisioning/roles/geerlingguy.ruby/tests/inventory b/provisioning/roles/geerlingguy.ruby/tests/inventory
new file mode 100644
index 000000000..2fbb50c4a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.ruby/tests/inventory
@@ -0,0 +1 @@
+localhost
diff --git a/provisioning/roles/geerlingguy.ruby/tests/test-install-from-source.yml b/provisioning/roles/geerlingguy.ruby/tests/test-install-from-source.yml
new file mode 100644
index 000000000..8c0fe37f0
--- /dev/null
+++ b/provisioning/roles/geerlingguy.ruby/tests/test-install-from-source.yml
@@ -0,0 +1,11 @@
+---
+- hosts: localhost
+  remote_user: root
+
+  vars:
+    ruby_install_from_source: true
+    ruby_download_url: http://cache.ruby-lang.org/pub/ruby/2.3/ruby-2.3.0.tar.gz
+    ruby_version: 2.3.0
+
+  roles:
+    - ansible-role-ruby
diff --git a/provisioning/roles/geerlingguy.ruby/tests/test-install-package.yml b/provisioning/roles/geerlingguy.ruby/tests/test-install-package.yml
new file mode 100644
index 000000000..125a9cd68
--- /dev/null
+++ b/provisioning/roles/geerlingguy.ruby/tests/test-install-package.yml
@@ -0,0 +1,5 @@
+---
+- hosts: localhost
+  remote_user: root
+  roles:
+    - ansible-role-ruby
diff --git a/provisioning/roles/geerlingguy.security/.travis.yml b/provisioning/roles/geerlingguy.security/.travis.yml
new file mode 100644
index 000000000..8928886b2
--- /dev/null
+++ b/provisioning/roles/geerlingguy.security/.travis.yml
@@ -0,0 +1,57 @@
+---
+sudo: required
+
+env:
+  - distribution: centos
+    version: 6
+    init: /sbin/init
+    run_opts: ""
+  - distribution: centos
+    version: 7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distribution: ubuntu # phusion/baseimage
+    version: 14.04
+    init: /sbin/my_init
+    run_opts: ""
+  - distribution: ubuntu
+    version: 12.04
+    init: /sbin/init
+    run_opts: ""
+
+services:
+  - docker
+
+before_install:
+  # Customize container
+  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+
+script:
+  - container_id=$(mktemp)
+  # Run container in detached state
+  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+
+  # Ansible syntax check.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+
+  # Test role.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+
+  # Test role idempotence.
+  - >
+    sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml
+    | grep -q 'changed=0.*failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)
+
+  # Make sure fail2ban process is running.
+  - >
+    sudo docker exec "$(cat ${container_id})" ps -ax | grep -q 'fail2ban'
+    && (echo 'fail2ban is on: pass' && exit 0)
+    || (echo 'fail2ban is on: fail' && exit 1)
+
+  # Clean up
+  - 'sudo docker stop "$(cat ${container_id})"'
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.security/README.md b/provisioning/roles/geerlingguy.security/README.md
new file mode 100644
index 000000000..15afb12f1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.security/README.md
@@ -0,0 +1,79 @@
+# Ansible Role: Security (Basics)
+
+[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-security.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-security)
+
+**First, a major, MAJOR caveat**: the security of your servers is YOUR responsibility. If you think simply including this role and adding a firewall makes a server secure, then you're mistaken. Read up on Linux, network, and application security, and know that no matter how much you know, you can always make every part of your stack more secure.
+
+That being said, this role performs some basic security configuration on RedHat and Debian-based linux systems. It attempts to:
+
+  - Install software to monitor bad SSH access (fail2ban)
+  - Configure SSH to be more secure (disabling root login, requiring key-based authentication, and allowing a custom SSH port to be set)
+  - Set up automatic updates (if configured to do so)
+
+There are a few other things you may or may not want to do (which are not included in this role) to make sure your servers are more secure, like:
+
+  - Use logwatch or a centralized logging server to analyze and monitor log files
+  - Securely configure user accounts and SSH keys (this role assumes you're not using password authentication or logging in as root)
+  - Have a well-configured firewall (check out the `geerlingguy.firewall` role on Ansible Galaxy for a flexible example)
+
+Again: Your servers' security is *your* responsibility.
+
+## Requirements
+
+For obvious reasons, `sudo` must be installed if you want to manage the sudoers file with this role.
+
+On RedHat/CentOS systems, make sure you have the EPEL repository installed (you can include the `geerlingguy.repo-epel` role to get it installed).
+
+No special requirements for Debian/Ubuntu systems.
+
+## Role Variables
+
+Available variables are listed below, along with default values (see `defaults/main.yml`):
+
+    security_ssh_port: 22
+
+The port through which you'd like SSH to be accessible. The default is port 22, but if you're operating a server on the open internet, and have no firewall blocking access to port 22, you'll quickly find that thousands of login attempts per day are not uncommon. You can change the port to a nonstandard port (e.g. 2849) if you want to avoid these thousands of automated penetration attempts.
+
+    security_ssh_password_authentication: 'no'
+    security_ssh_permit_root_login: 'no'
+
+Security settings for SSH authentication. It's best to leave these both set to `'no'`, but there are times (especially during initial server configuration or when you don't have key-based authentication in place) when one or both may be safely set to `'yes'`.
+
+    security_sudoers_passwordless: []
+    security_sudoers_passworded: []
+
+A list of users who should be added to the sudoers file so they can run any command as root (via `sudo`) either without a password or requiring a password for each command, respectively.
+
+    security_autoupdate_enabled: true
+
+Whether to install/enable `yum-cron` (RedHat-based systems) or `unattended-upgrades` (Debian-based systems). System restarts will not happen automatically in any case, and automatic upgrades are no excuse for sloppy patch and package management, but automatic updates can be helpful as yet another security measure.
+
+    security_fail2ban_enabled: true
+
+Wether to install/enable `fail2ban`. You might not want to use fail2ban if you're already using some other service for login and intrusion detection (e.g. [ConfigServer](http://configserver.com/cp/csf.html)).
+
+## Dependencies
+
+None.
+
+## Example Playbook
+
+    - hosts: servers
+      vars_files:
+        - vars/main.yml
+      roles:
+        - geerlingguy.security
+
+*Inside `vars/main.yml`*:
+
+    security_sudoers_passworded:
+      - johndoe
+      - deployacct
+
+## License
+
+MIT (Expat) / BSD
+
+## Author Information
+
+This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.security/defaults/main.yml b/provisioning/roles/geerlingguy.security/defaults/main.yml
new file mode 100644
index 000000000..9954803c9
--- /dev/null
+++ b/provisioning/roles/geerlingguy.security/defaults/main.yml
@@ -0,0 +1,10 @@
+---
+security_ssh_port: 22
+security_ssh_password_authentication: "no"
+security_ssh_permit_root_login: "no"
+
+security_sudoers_passwordless: []
+security_sudoers_passworded: []
+
+security_autoupdate_enabled: true
+security_fail2ban_enabled: true
diff --git a/provisioning/roles/geerlingguy.security/handlers/main.yml b/provisioning/roles/geerlingguy.security/handlers/main.yml
new file mode 100644
index 000000000..f91988e3d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.security/handlers/main.yml
@@ -0,0 +1,3 @@
+---
+- name: restart ssh
+  service: "name={{ security_sshd_name }} state=restarted"
diff --git a/provisioning/roles/geerlingguy.security/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.security/meta/.galaxy_install_info
new file mode 100644
index 000000000..aa3c5db8e
--- /dev/null
+++ b/provisioning/roles/geerlingguy.security/meta/.galaxy_install_info
@@ -0,0 +1 @@
+{install_date: 'Fri Jul 15 19:50:09 2016', version: 1.2.0}
diff --git a/provisioning/roles/geerlingguy.security/meta/main.yml b/provisioning/roles/geerlingguy.security/meta/main.yml
new file mode 100644
index 000000000..1d1ffaf16
--- /dev/null
+++ b/provisioning/roles/geerlingguy.security/meta/main.yml
@@ -0,0 +1,22 @@
+---
+dependencies: []
+
+galaxy_info:
+  author: geerlingguy
+  description: Security software installation and configuration.
+  company: "Midwestern Mac, LLC"
+  license: "license (BSD, MIT)"
+  min_ansible_version: 1.9
+  platforms:
+    - name: EL
+      versions:
+      - all
+    - name: Debian
+      versions:
+      - all
+    - name: Ubuntu
+      versions:
+      - all
+  galaxy_tags:
+    - system
+    - security
diff --git a/provisioning/roles/geerlingguy.security/tasks/autoupdate-Debian.yml b/provisioning/roles/geerlingguy.security/tasks/autoupdate-Debian.yml
new file mode 100644
index 000000000..784e2c682
--- /dev/null
+++ b/provisioning/roles/geerlingguy.security/tasks/autoupdate-Debian.yml
@@ -0,0 +1,14 @@
+---
+- name: Install unattended upgrades package.
+  apt: name=unattended-upgrades state=present
+
+- name: Copy unattended-upgrades configuration files in place.
+  template:
+    src: "../templates/{{ item }}.j2"
+    dest: "/etc/apt/apt.conf.d/{{ item }}"
+    owner: root
+    group: root
+    mode: 0644
+  with_items:
+    - 10periodic
+    - 50unattended-upgrades
diff --git a/provisioning/roles/geerlingguy.security/tasks/autoupdate-RedHat.yml b/provisioning/roles/geerlingguy.security/tasks/autoupdate-RedHat.yml
new file mode 100644
index 000000000..3e7a0a2de
--- /dev/null
+++ b/provisioning/roles/geerlingguy.security/tasks/autoupdate-RedHat.yml
@@ -0,0 +1,13 @@
+---
+- name: Install yum-cron.
+  yum: name=yum-cron state=present
+
+- name: Ensure yum-cron is running and enabled on boot.
+  service: name=yum-cron state=started enabled=yes
+
+- name: Configure autoupdates (RHEL 7).
+  lineinfile:
+    dest: "/etc/yum/yum-cron.conf"
+    regexp: '^apply_updates = .+'
+    line: 'apply_updates = yes'
+  when: security_autoupdate_enabled and ansible_distribution_major_version | int == 7
diff --git a/provisioning/roles/geerlingguy.security/tasks/fail2ban-Debian.yml b/provisioning/roles/geerlingguy.security/tasks/fail2ban-Debian.yml
new file mode 100644
index 000000000..238c1a286
--- /dev/null
+++ b/provisioning/roles/geerlingguy.security/tasks/fail2ban-Debian.yml
@@ -0,0 +1,3 @@
+---
+- name: Install fail2ban.
+  apt: name=fail2ban state=present
diff --git a/provisioning/roles/geerlingguy.security/tasks/fail2ban-RedHat.yml b/provisioning/roles/geerlingguy.security/tasks/fail2ban-RedHat.yml
new file mode 100644
index 000000000..4f49ddea4
--- /dev/null
+++ b/provisioning/roles/geerlingguy.security/tasks/fail2ban-RedHat.yml
@@ -0,0 +1,3 @@
+---
+- name: Install fail2ban.
+  yum: name=fail2ban state=present enablerepo=epel
diff --git a/provisioning/roles/geerlingguy.security/tasks/main.yml b/provisioning/roles/geerlingguy.security/tasks/main.yml
new file mode 100644
index 000000000..31200f84c
--- /dev/null
+++ b/provisioning/roles/geerlingguy.security/tasks/main.yml
@@ -0,0 +1,24 @@
+---
+- name: Include OS-specific variables.
+  include_vars: "{{ ansible_os_family }}.yml"
+
+# Fail2Ban
+- include: fail2ban-RedHat.yml
+  when: ansible_os_family == 'RedHat' and security_fail2ban_enabled
+
+- include: fail2ban-Debian.yml
+  when: ansible_os_family == 'Debian' and security_fail2ban_enabled
+
+- name: Ensure fail2ban is running and enabled on boot.
+  service: name=fail2ban state=started enabled=yes
+  when: security_fail2ban_enabled
+
+# SSH
+- include: ssh.yml
+
+# Autoupdate
+- include: autoupdate-RedHat.yml
+  when: ansible_os_family == 'RedHat' and security_autoupdate_enabled
+
+- include: autoupdate-Debian.yml
+  when: ansible_os_family == 'Debian' and security_autoupdate_enabled
diff --git a/provisioning/roles/geerlingguy.security/tasks/ssh.yml b/provisioning/roles/geerlingguy.security/tasks/ssh.yml
new file mode 100644
index 000000000..57f53f4a2
--- /dev/null
+++ b/provisioning/roles/geerlingguy.security/tasks/ssh.yml
@@ -0,0 +1,35 @@
+---
+- name: Update SSH configuration to be more secure.
+  lineinfile:
+    dest: "{{ security_ssh_config_path }}"
+    regexp: "{{ item.regexp }}"
+    line: "{{ item.line }}"
+    state: present
+  with_items:
+    - regexp: "^PasswordAuthentication"
+      line: "PasswordAuthentication {{ security_ssh_password_authentication }}"
+    - regexp: "^PermitRootLogin"
+      line: "PermitRootLogin {{ security_ssh_permit_root_login }}"
+    - regexp: "^Port"
+      line: "Port {{ security_ssh_port }}"
+  notify: restart ssh
+
+- name: Add configured user accounts to passwordless sudoers.
+  lineinfile:
+    dest: /etc/sudoers
+    regexp: '^{{ item }}'
+    line: '{{ item }} ALL=(ALL) NOPASSWD: ALL'
+    state: present
+    validate: 'visudo -cf %s'
+  with_items: "{{ security_sudoers_passwordless }}"
+  when: security_sudoers_passwordless | length > 0
+
+- name: Add configured user accounts to passworded sudoers.
+  lineinfile:
+    dest: /etc/sudoers
+    regexp: '^{{ item }}'
+    line: '{{ item }} ALL=(ALL) ALL'
+    state: present
+    validate: 'visudo -cf %s'
+  with_items: "{{ security_sudoers_passworded }}"
+  when: security_sudoers_passworded | length > 0
diff --git a/provisioning/roles/geerlingguy.security/templates/10periodic.j2 b/provisioning/roles/geerlingguy.security/templates/10periodic.j2
new file mode 100644
index 000000000..5d37e9fc0
--- /dev/null
+++ b/provisioning/roles/geerlingguy.security/templates/10periodic.j2
@@ -0,0 +1,4 @@
+APT::Periodic::Update-Package-Lists "1";
+APT::Periodic::Download-Upgradeable-Packages "1";
+APT::Periodic::AutocleanInterval "7";
+APT::Periodic::Unattended-Upgrade "1";
diff --git a/provisioning/roles/geerlingguy.security/templates/50unattended-upgrades.j2 b/provisioning/roles/geerlingguy.security/templates/50unattended-upgrades.j2
new file mode 100644
index 000000000..c1b7d48df
--- /dev/null
+++ b/provisioning/roles/geerlingguy.security/templates/50unattended-upgrades.j2
@@ -0,0 +1,6 @@
+Unattended-Upgrade::Automatic-Reboot "false";
+
+Unattended-Upgrade::Allowed-Origins {
+        "${distro_id} ${distro_codename}-security";
+//      "${distro_id} ${distro_codename}-updates";
+};
diff --git a/provisioning/roles/geerlingguy.security/tests/Dockerfile.centos-6 b/provisioning/roles/geerlingguy.security/tests/Dockerfile.centos-6
new file mode 100644
index 000000000..4a4e7b8d6
--- /dev/null
+++ b/provisioning/roles/geerlingguy.security/tests/Dockerfile.centos-6
@@ -0,0 +1,15 @@
+FROM centos:6
+
+# Install Ansible
+RUN yum -y update; yum clean all;
+RUN yum -y install epel-release
+RUN yum -y install git ansible sudo
+RUN yum clean all
+
+# Disable requiretty
+RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
+
+# Install Ansible inventory file
+RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
+
+CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.security/tests/Dockerfile.centos-7 b/provisioning/roles/geerlingguy.security/tests/Dockerfile.centos-7
new file mode 100644
index 000000000..8aa065497
--- /dev/null
+++ b/provisioning/roles/geerlingguy.security/tests/Dockerfile.centos-7
@@ -0,0 +1,27 @@
+FROM centos:7
+
+# Install systemd -- See https://hub.docker.com/_/centos/
+RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
+RUN yum -y update; yum clean all; \
+(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
+rm -f /lib/systemd/system/multi-user.target.wants/*; \
+rm -f /etc/systemd/system/*.wants/*; \
+rm -f /lib/systemd/system/local-fs.target.wants/*; \
+rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
+rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
+rm -f /lib/systemd/system/basic.target.wants/*; \
+rm -f /lib/systemd/system/anaconda.target.wants/*;
+
+# Install Ansible
+RUN yum -y install epel-release
+RUN yum -y install git ansible sudo
+RUN yum clean all
+
+# Disable requiretty
+RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
+
+# Install Ansible inventory file
+RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
+
+VOLUME ["/sys/fs/cgroup"]
+CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.security/tests/Dockerfile.ubuntu-12.04 b/provisioning/roles/geerlingguy.security/tests/Dockerfile.ubuntu-12.04
new file mode 100644
index 000000000..d0c130cdf
--- /dev/null
+++ b/provisioning/roles/geerlingguy.security/tests/Dockerfile.ubuntu-12.04
@@ -0,0 +1,11 @@
+FROM ubuntu:12.04
+RUN apt-get update
+
+# Install Ansible
+RUN apt-get install -y software-properties-common python-software-properties git
+RUN apt-add-repository -y ppa:ansible/ansible
+RUN apt-get update
+RUN apt-get install -y ansible
+
+# Install Ansible inventory file
+RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.security/tests/Dockerfile.ubuntu-14.04 b/provisioning/roles/geerlingguy.security/tests/Dockerfile.ubuntu-14.04
new file mode 100644
index 000000000..949fd976a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.security/tests/Dockerfile.ubuntu-14.04
@@ -0,0 +1,17 @@
+FROM phusion/baseimage:0.9.18
+RUN apt-get update
+
+# Enable SSH
+RUN rm -f /etc/service/sshd/down
+
+# Create auth.log required by fail2ban.
+RUN touch /var/log/auth.log
+
+# Install Ansible
+RUN apt-get install -y software-properties-common git
+RUN apt-add-repository -y ppa:ansible/ansible
+RUN apt-get update
+RUN apt-get install -y ansible
+
+# Install Ansible inventory file
+RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.security/tests/test.yml b/provisioning/roles/geerlingguy.security/tests/test.yml
new file mode 100644
index 000000000..f7ab17e98
--- /dev/null
+++ b/provisioning/roles/geerlingguy.security/tests/test.yml
@@ -0,0 +1,19 @@
+- hosts: all
+
+  pre_tasks:
+    - name: Ensure build dependencies are installed (RedHat).
+      yum: 'name="{{ item }}" state=present'
+      with_items:
+        - openssh-server
+        - openssh-clients
+      when: ansible_os_family == 'RedHat'
+
+    - name: Ensure build dependencies are installed (Debian).
+      apt: 'name="{{ item }}" state=installed'
+      with_items:
+        - openssh-server
+        - openssh-client
+      when: ansible_os_family == 'Debian'
+
+  roles:
+    - role_under_test
diff --git a/provisioning/roles/geerlingguy.security/vars/Debian.yml b/provisioning/roles/geerlingguy.security/vars/Debian.yml
new file mode 100644
index 000000000..40512bdaf
--- /dev/null
+++ b/provisioning/roles/geerlingguy.security/vars/Debian.yml
@@ -0,0 +1,3 @@
+---
+security_ssh_config_path: /etc/ssh/sshd_config
+security_sshd_name: ssh
\ No newline at end of file
diff --git a/provisioning/roles/geerlingguy.security/vars/RedHat.yml b/provisioning/roles/geerlingguy.security/vars/RedHat.yml
new file mode 100644
index 000000000..d7b192126
--- /dev/null
+++ b/provisioning/roles/geerlingguy.security/vars/RedHat.yml
@@ -0,0 +1,3 @@
+---
+security_ssh_config_path: /etc/ssh/sshd_config
+security_sshd_name: sshd
diff --git a/provisioning/roles/geerlingguy.solr/.travis.yml b/provisioning/roles/geerlingguy.solr/.travis.yml
new file mode 100644
index 000000000..dcf9cf90a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.solr/.travis.yml
@@ -0,0 +1,68 @@
+---
+sudo: required
+
+env:
+  - distribution: centos
+    version: 7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    solr_major_version: 6
+  - distribution: ubuntu
+    version: 14.04
+    init: /sbin/init
+    run_opts: ""
+    solr_major_version: 6
+  - distribution: ubuntu
+    version: 14.04
+    init: /sbin/init
+    run_opts: ""
+    solr_major_version: 5
+  - distribution: ubuntu
+    version: 12.04
+    init: /sbin/init
+    run_opts: ""
+    solr_major_version: 4
+  - distribution: ubuntu
+    version: 12.04
+    init: /sbin/init
+    run_opts: ""
+    solr_major_version: 3
+
+services:
+  - docker
+
+before_install:
+  # - sudo apt-get update
+  # Pull container
+  - 'sudo docker pull ${distribution}:${version}'
+  # Customize container
+  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+
+script:
+  - container_id=$(mktemp)
+  # Run container in detached state
+  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+
+  # Install dependencies.
+  - 'sudo docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
+
+  # Ansible syntax check.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test-solr-${solr_major_version}.yml --syntax-check'
+
+  # Test role.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test-solr-${solr_major_version}.yml'
+
+  # Test role idempotence.
+  - >
+    sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test-solr-${solr_major_version}.yml
+    | grep -q 'changed=0.*failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)
+
+  # TODO: Test Solr actually running/working.
+
+  # Clean up
+  - 'sudo docker stop "$(cat ${container_id})"'
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.solr/README.md b/provisioning/roles/geerlingguy.solr/README.md
new file mode 100644
index 000000000..5b9770df9
--- /dev/null
+++ b/provisioning/roles/geerlingguy.solr/README.md
@@ -0,0 +1,86 @@
+# Ansible Role: Apache Solr
+
+[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-solr.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-solr)
+
+An Ansible Role that installs Apache Solr on Linux servers.
+
+## Requirements
+
+Java must be available on the server. You can easily install Java using the `geerlingguy.java` role. Make sure the Java version installed meets the minimum requirements of Solr (e.g. Java 8 for Solr 6+).
+
+This role is currently tested and working with Solr 3.x, 4.x, 5.x and 6.x.
+
+## Role Variables
+
+Available variables are listed below, along with default values (see `defaults/main.yml`):
+
+    solr_workspace: /root
+
+Files will be downloaded to this path on the remote server before being moved into place.
+
+    solr_create_user: true
+    solr_user: solr
+
+Solr will be run under the `solr_user`. Set `solr_create_user` to `false` if `solr_user` is created before this role runs, or if you're using Solr 5+ and want Solr's own installation script to set up the user.
+
+    solr_version: "5.5.1"
+
+The Apache Solr version to install.
+
+    solr_mirror: "https://archive.apache.org/dist"
+
+The Apache Project mirror from which the Solr tarball will be downloaded. In case of slow download speed or timeouts it is useful to set the mirror to the one suggested by Apache's [mirror download site](https://www.apache.org/dyn/closer.cgi/lucene/solr/).
+
+    solr_install_dir: /opt
+    solr_install_path: /opt/solr
+
+The path where Apache Solr will be installed. For Solr 5+, the `solr_install_dir` will be used by Solr's installation script. For Solr < 5, the Solr installation files will be copied in place in the `solr_install_path`.
+
+    solr_home: /var/solr
+
+The path where local Solr data (search collections and configuration) will be stored. Should typically be outside of the `solr_path`, to make Solr upgrades easier.
+
+    solr_port: "8983"
+
+The port on which Solr will run.
+
+    solr_xms: "256M"
+    solr_xmx: "512M"
+
+Memory settings for the JVM. These should be set as high as you can allow for best performance and to reduce the chance of Solr restarting itself due to OOM situations.
+
+    solr_cores:
+      - collection1
+
+A list of cores / collections which should exist on the server. Each one will be created (if it doesn't exist already) using the default example configuration that ships with Solr. Note that this variable only applies when using Solr 5+.
+
+### Variables used only for Solr < 5.
+
+The following variables are currently only applied to installations of Solr 4 and below:
+
+    solr_log_file_path: /var/log/solr.log
+
+Path where Solr log file will be created.
+
+    solr_host: "0.0.0.0"
+
+The hostname or IP address to which Solr will bind. Defaults to `0.0.0.0` which allows Solr to listen on all interfaces.
+
+## Dependencies
+
+None.
+
+## Example Playbook
+
+    - hosts: solr-servers
+      roles:
+        - { role: geerlingguy.java }
+        - { role: geerlingguy.solr }
+
+## License
+
+MIT / BSD
+
+## Author Information
+
+This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.solr/defaults/main.yml b/provisioning/roles/geerlingguy.solr/defaults/main.yml
new file mode 100644
index 000000000..484e58637
--- /dev/null
+++ b/provisioning/roles/geerlingguy.solr/defaults/main.yml
@@ -0,0 +1,26 @@
+---
+solr_workspace: /root
+
+solr_create_user: true
+solr_user: solr
+
+solr_version: "6.0.1"
+solr_mirror: "https://archive.apache.org/dist"
+
+solr_service_name: solr
+solr_install_dir: /opt
+solr_install_path: /opt/solr
+solr_home: /var/solr
+solr_port: "8983"
+
+solr_xms: "256M"
+solr_xmx: "512M"
+
+solr_cores:
+  - collection1
+
+solr_config_file: /etc/default/solr.in.sh
+
+# Used only for Solr < 5.
+solr_log_file_path: /var/log/solr.log
+solr_host: "0.0.0.0"
diff --git a/provisioning/roles/geerlingguy.solr/handlers/main.yml b/provisioning/roles/geerlingguy.solr/handlers/main.yml
new file mode 100644
index 000000000..44404e0b3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.solr/handlers/main.yml
@@ -0,0 +1,6 @@
+---
+- name: restart solr
+  service:
+    name: "{{ solr_service_name }}"
+    state: restarted
+    sleep: 5
diff --git a/provisioning/roles/geerlingguy.solr/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.solr/meta/.galaxy_install_info
new file mode 100644
index 000000000..4efeddcd1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.solr/meta/.galaxy_install_info
@@ -0,0 +1 @@
+{install_date: 'Fri Jul 15 19:50:12 2016', version: 3.1.0}
diff --git a/provisioning/roles/geerlingguy.solr/meta/main.yml b/provisioning/roles/geerlingguy.solr/meta/main.yml
new file mode 100644
index 000000000..90d9f7692
--- /dev/null
+++ b/provisioning/roles/geerlingguy.solr/meta/main.yml
@@ -0,0 +1,22 @@
+---
+dependencies: []
+
+galaxy_info:
+  author: geerlingguy
+  description: Apache Solr for Linux.
+  company: "Midwestern Mac, LLC"
+  license: "license (BSD, MIT)"
+  min_ansible_version: 1.8
+  platforms:
+    - name: EL
+      versions:
+      - 6
+      - 7
+    - name: Debian
+      versions:
+      - all
+    - name: Ubuntu
+      versions:
+      - all
+  galaxy_tags:
+    - development
diff --git a/provisioning/roles/geerlingguy.solr/tasks/configure.yml b/provisioning/roles/geerlingguy.solr/tasks/configure.yml
new file mode 100644
index 000000000..9dc575c6b
--- /dev/null
+++ b/provisioning/roles/geerlingguy.solr/tasks/configure.yml
@@ -0,0 +1,20 @@
+---
+- name: Remove existing SOLR_HEAP configuration.
+  lineinfile:
+    dest: "{{ solr_config_file }}"
+    regexp: "^SOLR_HEAP"
+    state: absent
+  notify: restart solr
+
+- name: Apply Solr memory configuration changes.
+  lineinfile:
+    dest: "{{ solr_config_file }}"
+    regexp: "{{ item.regexp }}"
+    line: "{{ item.line }}"
+    state: present
+  with_items:
+    - regexp: "^.?SOLR_JAVA_MEM="
+      line: 'SOLR_JAVA_MEM="-Xms{{ solr_xms }} -Xmx{{ solr_xmx }}"'
+    - regexp: "^SOLR_PORT="
+      line: 'SOLR_PORT="{{ solr_port }}"'
+  notify: restart solr
\ No newline at end of file
diff --git a/provisioning/roles/geerlingguy.solr/tasks/cores.yml b/provisioning/roles/geerlingguy.solr/tasks/cores.yml
new file mode 100644
index 000000000..cf4e134bf
--- /dev/null
+++ b/provisioning/roles/geerlingguy.solr/tasks/cores.yml
@@ -0,0 +1,26 @@
+---
+- name: Check current list of Solr cores.
+  uri:
+    url: http://localhost:{{ solr_port }}/solr/admin/cores
+    return_content: yes
+  register: solr_cores_current
+
+- name: Ensure Solr conf directories exist.
+  file:
+    path: "/var/solr/data/{{ item }}/conf"
+    state: directory
+    owner: "{{ solr_user }}"
+    group: "{{ solr_user }}"
+    recurse: yes
+  when: "'{{ item }}' not in '{{ solr_cores_current.content }}'"
+  with_items: "{{ solr_cores }}"
+
+- name: Ensure core configuration directories exist.
+  shell: "cp -r {{ solr_install_path }}/example/files/conf/ /var/solr/data/{{ item }}/"
+  when: "'{{ item }}' not in '{{ solr_cores_current.content }}'"
+  with_items: "{{ solr_cores }}"
+
+- name: Create configured cores.
+  shell: "{{ solr_install_path }}/bin/solr create -c {{ item }}"
+  when: "'{{ item }}' not in '{{ solr_cores_current.content }}'"
+  with_items: "{{ solr_cores }}"
diff --git a/provisioning/roles/geerlingguy.solr/tasks/install-pre5.yml b/provisioning/roles/geerlingguy.solr/tasks/install-pre5.yml
new file mode 100644
index 000000000..623133b50
--- /dev/null
+++ b/provisioning/roles/geerlingguy.solr/tasks/install-pre5.yml
@@ -0,0 +1,70 @@
+---
+# Install Solr.
+- name: Check if Solr is already installed.
+  stat: "path={{ solr_install_path }}/dist/{{ solr_filename }}.war"
+  register: solr_war_file
+
+- name: Copy Solr into place.
+  command: "cp -r {{ solr_workspace }}/{{ solr_filename }} {{ solr_install_path }}"
+  when: not solr_war_file.stat.exists
+
+- name: Ensure Solr install files are owned by the solr_user.
+  file:
+    path: "{{ solr_install_path }}"
+    owner: "{{ solr_user }}"
+    group: "{{ solr_user }}"
+    recurse: yes
+  when: not solr_war_file.stat.exists
+
+# Set up solr_home.
+- name: Check if solr_home is already set up.
+  stat: "path={{ solr_home }}/solr.xml"
+  register: solr_example
+
+- name: Ensure solr_home directory exists.
+  file:
+    path: "{{ solr_home }}"
+    state: directory
+    owner: "{{ solr_user }}"
+    group: "{{ solr_user }}"
+    mode: 0755
+  when: not solr_example.stat.exists
+
+- name: Copy Solr example into solr_home.
+  shell: "cp -r {{ solr_install_path }}/example/solr/* {{ solr_home }}"
+  when: not solr_example.stat.exists
+
+- name: Fix the example solrconfig.xml file.
+  replace:
+    dest: "{{ solr_home }}/collection1/conf/solrconfig.xml"
+    regexp: ^.+solr\.install\.dir.+$
+    replace: ""
+  when: "not solr_example.stat.exists and solr_version.split('.')[0] == '4'"
+
+- name: Ensure Solr home files are owned by the solr_user.
+  file:
+    path: "{{ solr_home }}"
+    owner: "{{ solr_user }}"
+    group: "{{ solr_user }}"
+    recurse: yes
+  when: not solr_example.stat.exists
+
+# Set up Solr init script.
+- name: Ensure log file is created and has proper permissions.
+  file:
+    path: "/var/log/solr.log"
+    state: touch
+    owner: "{{ solr_user }}"
+    group: root
+    mode: 0664
+  changed_when: false
+
+- name: Copy solr init script into place.
+  template:
+    src: "solr-init-{{ ansible_os_family }}-pre5.j2"
+    dest: "/etc/init.d/{{ solr_service_name }}"
+    mode: 0755
+
+- name: Ensure daemon is installed (Debian).
+  apt: name=daemon state=installed
+  when: ansible_os_family == "Debian"
diff --git a/provisioning/roles/geerlingguy.solr/tasks/install.yml b/provisioning/roles/geerlingguy.solr/tasks/install.yml
new file mode 100644
index 000000000..a04201729
--- /dev/null
+++ b/provisioning/roles/geerlingguy.solr/tasks/install.yml
@@ -0,0 +1,15 @@
+---
+- name: Ensure lsof is present (RedHat).
+  yum: name=lsof state=present
+  when: ansible_os_family == "RedHat"
+
+- name: Run Solr installation script.
+  shell: >
+    {{ solr_workspace }}/{{ solr_filename }}/bin/install_solr_service.sh
+    {{ solr_workspace }}/{{ solr_filename }}.tgz
+    -i {{ solr_install_dir }}
+    -d {{ solr_home }}
+    -u {{ solr_user }}
+    -s {{ solr_service_name }}
+    -p {{ solr_port }}
+    creates={{ solr_install_dir }}/solr/bin/solr
diff --git a/provisioning/roles/geerlingguy.solr/tasks/main.yml b/provisioning/roles/geerlingguy.solr/tasks/main.yml
new file mode 100644
index 000000000..b9085fa38
--- /dev/null
+++ b/provisioning/roles/geerlingguy.solr/tasks/main.yml
@@ -0,0 +1,48 @@
+---
+- include: user.yml
+  when: solr_create_user
+
+- name: Set solr_filename for Solr 4+.
+  set_fact:
+    solr_filename: "solr-{{ solr_version }}"
+  when: "solr_version.split('.')[0] >= '4'"
+
+- name: Set solr_filename for Solr 3.x.
+  set_fact:
+    solr_filename: "apache-solr-{{ solr_version }}"
+  when: "solr_version.split('.')[0] == '3'"
+
+- name: Download Solr.
+  get_url:
+    url: "{{ solr_mirror }}/lucene/solr/{{ solr_version }}/{{ solr_filename }}.tgz"
+    dest: "{{ solr_workspace }}/{{ solr_filename }}.tgz"
+    force: no
+
+- name: Expand Solr.
+  unarchive:
+    src: "{{ solr_workspace }}/{{ solr_filename }}.tgz"
+    dest: "{{ solr_workspace }}"
+    creates: "{{ solr_workspace }}/{{ solr_filename }}/CHANGES.txt"
+    copy: no
+
+# Install Solr < 5.
+- include: install-pre5.yml
+  when: "solr_version.split('.')[0] < '5'"
+
+# Install Solr 5+.
+- include: install.yml
+  when: "solr_version.split('.')[0] >= '5'"
+
+- name: Ensure solr is started and enabled on boot.
+  service:
+    name: "{{ solr_service_name }}"
+    state: started
+    enabled: yes
+
+# Create cores, if any are configured.
+- include: cores.yml
+  when: "solr_cores and solr_version.split('.')[0] >= '5'"
+
+# Configure solr.
+- include: configure.yml
+  when: "solr_version.split('.')[0] >= '5'"
diff --git a/provisioning/roles/geerlingguy.solr/tasks/user.yml b/provisioning/roles/geerlingguy.solr/tasks/user.yml
new file mode 100644
index 000000000..8c899a30c
--- /dev/null
+++ b/provisioning/roles/geerlingguy.solr/tasks/user.yml
@@ -0,0 +1,9 @@
+---
+- name: Ensure solr_user group exists.
+  group: "name={{ solr_user }} state=present"
+
+- name: Ensure solr_user exists.
+  user:
+    name: "{{ solr_user }}"
+    state: present
+    group: "{{ solr_user }}"
diff --git a/provisioning/roles/geerlingguy.solr/templates/solr-init-Debian-pre5.j2 b/provisioning/roles/geerlingguy.solr/templates/solr-init-Debian-pre5.j2
new file mode 100644
index 000000000..b4a4a8d4f
--- /dev/null
+++ b/provisioning/roles/geerlingguy.solr/templates/solr-init-Debian-pre5.j2
@@ -0,0 +1,94 @@
+#!/bin/sh
+# chkconfig: 2345 95 05
+# description: Controls an Apache Solr process.
+#
+# This script will launch Solr in a mode that will automatically respawn if it
+# crashes. Output will be sent to $LOG_FILE. A PID file will be created in the
+# standard location.
+#
+# Adapted by Jeff Geerling from http://stackoverflow.com/a/8014720/100134
+
+### BEGIN INIT INFO
+# Provides:             solr
+# Required-Start:       $remote_fs $syslog
+# Required-Stop:        $remote_fs $syslog
+# Default-Start:        2 3 4 5
+# Default-Stop:         0 1 6
+# Short-Description:    Apache Solr search server
+### END INIT INFO
+
+SOLR_DIR="{{ solr_install_path }}/example"
+JAVA_OPTIONS="-Dsolr.solr.home={{ solr_home }} -Djetty.host={{ solr_host }} -Djetty.port={{ solr_port }} -Xms{{ solr_xms }} -Xmx{{ solr_xmx }}"
+START_COMMAND="java -jar $JAVA_OPTIONS start.jar"
+LOG_FILE="{{ solr_log_file_path }}"
+
+start () {
+    echo -n "Starting {{ solr_service_name }}... "
+
+    daemon --chdir="$SOLR_DIR" --command "$START_COMMAND" --respawn --output=$LOG_FILE --name={{ solr_service_name }}
+
+    RETVAL=$?
+    if [ $RETVAL = 0 ]
+    then
+        echo "done."
+    else
+        echo "failed. See error code for more information."
+    fi
+    return $RETVAL
+}
+
+stop () {
+    echo -n "Stopping {{ solr_service_name }}... "
+
+    daemon --stop --name={{ solr_service_name }}
+
+    RETVAL=$?
+    if [ $RETVAL = 0 ]
+    then
+        echo "done."
+    else
+        echo "failed. See error code for more information."
+    fi
+    return $RETVAL
+}
+
+restart () {
+    echo -n "Restarting solr... "
+    daemon --restart --name={{ solr_service_name }}
+
+    RETVAL=$?
+    if [ $RETVAL = 0 ]
+    then
+        echo "done."
+    else
+        echo "failed. See error code for more information."
+    fi
+    return $RETVAL
+}
+
+check_status () {
+    # Report on the status of the daemon
+    daemon --running --name={{ solr_service_name }} --verbose
+    return $?
+}
+
+case "$1" in
+    start)
+        start
+    ;;
+    status)
+        check_status
+    ;;
+    stop)
+        stop
+    ;;
+    restart)
+        restart
+    ;;
+    *)
+        echo $"Usage: solr {start|status|stop|restart}"
+        exit 3
+    ;;
+esac
+
+exit $RETVAL
diff --git a/provisioning/roles/geerlingguy.solr/templates/solr-init-RedHat-pre5.j2 b/provisioning/roles/geerlingguy.solr/templates/solr-init-RedHat-pre5.j2
new file mode 100644
index 000000000..979a2176c
--- /dev/null
+++ b/provisioning/roles/geerlingguy.solr/templates/solr-init-RedHat-pre5.j2
@@ -0,0 +1,91 @@
+#!/bin/sh
+# chkconfig: 2345 95 05
+# description: Controls an Apache Solr process.
+#
+# TODO: Describe this file.
+#
+# @author Jeff Geerling, 2015
+
+. /etc/rc.d/init.d/functions
+
+SOLR_DIR="{{ solr_install_path }}/example"
+JAVA_OPTIONS="-Dsolr.solr.home={{ solr_home }} -Djetty.host={{ solr_host }} -Djetty.port={{ solr_port }} -Xms{{ solr_xms }} -Xmx{{ solr_xmx }} -DSTOP.PORT=8079 -DSTOP.KEY=secret"
+START_COMMAND="java -jar $JAVA_OPTIONS start.jar"
+STOP_COMMAND="java -jar $JAVA_OPTIONS $SOLR_DIR/start.jar --stop"
+LOG_FILE="{{ solr_log_file_path }}"
+
+start () {
+    echo -n "Starting solr... "
+
+    if ps aux | grep "[s]olr.solr.home" > /dev/null
+    then
+        echo -n "already started... "
+    else
+        cd "$SOLR_DIR" && daemon --user="{{ solr_user }}" $START_COMMAND > $LOG_FILE &
+    fi
+
+    RETVAL=$?
+    if [ $RETVAL = 0 ]
+    then
+        echo "done."
+    else
+        echo "failed. See error code for more information."
+    fi
+    return $RETVAL
+}
+
+stop () {
+    echo -n "Stopping solr... "
+
+    if ps aux | grep "[s]olr.solr.home" > /dev/null
+    then
+        $STOP_COMMAND
+    else
+        echo -n "already stopped... "
+    fi
+
+    RETVAL=$?
+    if [ $RETVAL = 0 ]
+    then
+        echo "done."
+    else
+        echo "failed. See error code for more information."
+    fi
+    return $RETVAL
+}
+
+restart () {
+    $0 stop
+    sleep 3
+    $0 start
+}
+
+check_status () {
+    if ps aux | grep "[s]olr.solr.home" > /dev/null
+    then
+        printf "Solr is running.\n"
+    else
+        printf "Solr is stopped.\n"
+    fi
+}
+
+case "$1" in
+    start)
+        start
+    ;;
+    status)
+        check_status
+    ;;
+    stop)
+        stop
+    ;;
+    restart)
+        restart
+    ;;
+    *)
+        echo $"Usage: solr {start|status|stop|restart}"
+        exit 3
+    ;;
+esac
+
+exit $RETVAL
diff --git a/provisioning/roles/geerlingguy.solr/tests/Dockerfile.centos-7 b/provisioning/roles/geerlingguy.solr/tests/Dockerfile.centos-7
new file mode 100644
index 000000000..8aa065497
--- /dev/null
+++ b/provisioning/roles/geerlingguy.solr/tests/Dockerfile.centos-7
@@ -0,0 +1,27 @@
+FROM centos:7
+
+# Install systemd -- See https://hub.docker.com/_/centos/
+RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
+RUN yum -y update; yum clean all; \
+(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
+rm -f /lib/systemd/system/multi-user.target.wants/*; \
+rm -f /etc/systemd/system/*.wants/*; \
+rm -f /lib/systemd/system/local-fs.target.wants/*; \
+rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
+rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
+rm -f /lib/systemd/system/basic.target.wants/*; \
+rm -f /lib/systemd/system/anaconda.target.wants/*;
+
+# Install Ansible
+RUN yum -y install epel-release
+RUN yum -y install git ansible sudo
+RUN yum clean all
+
+# Disable requiretty
+RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
+
+# Install Ansible inventory file
+RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
+
+VOLUME ["/sys/fs/cgroup"]
+CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.solr/tests/Dockerfile.ubuntu-12.04 b/provisioning/roles/geerlingguy.solr/tests/Dockerfile.ubuntu-12.04
new file mode 100644
index 000000000..d0c130cdf
--- /dev/null
+++ b/provisioning/roles/geerlingguy.solr/tests/Dockerfile.ubuntu-12.04
@@ -0,0 +1,11 @@
+FROM ubuntu:12.04
+RUN apt-get update
+
+# Install Ansible
+RUN apt-get install -y software-properties-common python-software-properties git
+RUN apt-add-repository -y ppa:ansible/ansible
+RUN apt-get update
+RUN apt-get install -y ansible
+
+# Install Ansible inventory file
+RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.solr/tests/Dockerfile.ubuntu-14.04 b/provisioning/roles/geerlingguy.solr/tests/Dockerfile.ubuntu-14.04
new file mode 100644
index 000000000..ca332871f
--- /dev/null
+++ b/provisioning/roles/geerlingguy.solr/tests/Dockerfile.ubuntu-14.04
@@ -0,0 +1,11 @@
+FROM ubuntu:14.04
+RUN apt-get update
+
+# Install Ansible
+RUN apt-get install -y software-properties-common git
+RUN apt-add-repository -y ppa:ansible/ansible
+RUN apt-get update
+RUN apt-get install -y ansible
+
+# Install Ansible inventory file
+RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.solr/tests/requirements.yml b/provisioning/roles/geerlingguy.solr/tests/requirements.yml
new file mode 100644
index 000000000..8fbe7cb66
--- /dev/null
+++ b/provisioning/roles/geerlingguy.solr/tests/requirements.yml
@@ -0,0 +1,2 @@
+---
+- src: geerlingguy.java
diff --git a/provisioning/roles/geerlingguy.solr/tests/test-solr-3.yml b/provisioning/roles/geerlingguy.solr/tests/test-solr-3.yml
new file mode 100644
index 000000000..adf1ca6bd
--- /dev/null
+++ b/provisioning/roles/geerlingguy.solr/tests/test-solr-3.yml
@@ -0,0 +1,11 @@
+---
+- hosts: all
+
+  vars:
+    solr_version: "3.6.2"
+    java_packages:
+      - openjdk-7-jdk
+
+  roles:
+    - geerlingguy.java
+    - role_under_test
diff --git a/provisioning/roles/geerlingguy.solr/tests/test-solr-4.yml b/provisioning/roles/geerlingguy.solr/tests/test-solr-4.yml
new file mode 100644
index 000000000..f9c31ba9e
--- /dev/null
+++ b/provisioning/roles/geerlingguy.solr/tests/test-solr-4.yml
@@ -0,0 +1,11 @@
+---
+- hosts: all
+
+  vars:
+    solr_version: "4.10.4"
+    java_packages:
+      - openjdk-7-jdk
+
+  roles:
+    - geerlingguy.java
+    - role_under_test
diff --git a/provisioning/roles/geerlingguy.solr/tests/test-solr-5.yml b/provisioning/roles/geerlingguy.solr/tests/test-solr-5.yml
new file mode 100644
index 000000000..19ec04197
--- /dev/null
+++ b/provisioning/roles/geerlingguy.solr/tests/test-solr-5.yml
@@ -0,0 +1,11 @@
+---
+- hosts: all
+
+  vars:
+    solr_version: "5.5.1"
+    java_packages:
+      - openjdk-7-jdk
+
+  roles:
+    - geerlingguy.java
+    - role_under_test
diff --git a/provisioning/roles/geerlingguy.solr/tests/test-solr-6.yml b/provisioning/roles/geerlingguy.solr/tests/test-solr-6.yml
new file mode 100644
index 000000000..cf24a1f20
--- /dev/null
+++ b/provisioning/roles/geerlingguy.solr/tests/test-solr-6.yml
@@ -0,0 +1,21 @@
+---
+- hosts: all
+
+  pre_tasks:
+    - set_fact:
+        java_packages:
+          - java-1.8.0-openjdk
+      when: ansible_os_family == "RedHat"
+
+    - set_fact:
+        java_packages:
+          - openjdk-8-jdk
+      when: ansible_os_family == "Debian" and ansible_distribution_version == "14.04"
+
+    - name: Add repository for OpenJDK 8.
+      apt_repository: repo='ppa:openjdk-r/ppa'
+      when: ansible_os_family == "Debian" and ansible_distribution_version == "14.04"
+
+  roles:
+    - geerlingguy.java
+    - role_under_test
diff --git a/provisioning/roles/geerlingguy.varnish/.gitignore b/provisioning/roles/geerlingguy.varnish/.gitignore
new file mode 100644
index 000000000..496ee2ca6
--- /dev/null
+++ b/provisioning/roles/geerlingguy.varnish/.gitignore
@@ -0,0 +1 @@
+.DS_Store
\ No newline at end of file
diff --git a/provisioning/roles/geerlingguy.varnish/.travis.yml b/provisioning/roles/geerlingguy.varnish/.travis.yml
new file mode 100644
index 000000000..c7c83c6ad
--- /dev/null
+++ b/provisioning/roles/geerlingguy.varnish/.travis.yml
@@ -0,0 +1,54 @@
+---
+sudo: required
+
+env:
+  - distribution: centos
+    version: 6
+    init: /sbin/init
+    run_opts: ""
+  - distribution: centos
+    version: 7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distribution: ubuntu
+    version: 14.04
+    init: /sbin/my_init
+    run_opts: ""
+  - distribution: ubuntu
+    version: 12.04
+    init: /sbin/init
+    run_opts: ""
+
+services:
+  - docker
+
+before_install:
+  # Customize container
+  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+
+script:
+  - container_id=$(mktemp)
+  # Run container in detached state
+  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+
+  # Ansible syntax check.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+
+  # Test role.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+
+  # Test role idempotence.
+  - >
+    sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml
+    | grep -q 'changed=0.*failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)
+
+  # Make sure Varnish is running.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm varnishd -V'
+
+  # Clean up
+  - 'sudo docker stop "$(cat ${container_id})"'
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.varnish/README.md b/provisioning/roles/geerlingguy.varnish/README.md
new file mode 100644
index 000000000..c15d005fe
--- /dev/null
+++ b/provisioning/roles/geerlingguy.varnish/README.md
@@ -0,0 +1,77 @@
+# Ansible Role: Varnish
+
+[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-varnish.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-varnish)
+
+An Ansible Role that installs Varnish on RedHat/CentOS or Debian/Ubuntu Linux.
+
+## Requirements
+
+Requires the EPEL repository on RedHat/CentOS (you can install it using the `geerlingguy.repo-epel` role).
+
+## Role Variables
+
+Available variables are listed below, along with default values (see `defaults/main.yml`):
+
+    varnish_version: "4.0"
+
+Varnish version that should be installed. See `https://repo.varnish-cache.org/redhat/` for a listing of available versions (e.g. `3.0`, `4.0`, `4.1`). _Note: Ubuntu 16.04 "Xenial"
+
+    varnish_config_path: /etc/varnish
+
+The path in which Varnish configuration files will be stored.
+
+    varnish_use_default_vcl: true
+
+Whether to use the included (simplistic) default Varnish VCL, using the backend host/port defined with the next two variables. Set this to `false` and copy your own `default.vcl` file into the `varnish_config_path` if you'd like to use a more complicated setup. If this variable is set to `true`, all other configuration will be taken from Varnish's own [default VCL](https://www.varnish-cache.org/trac/browser/bin/varnishd/default.vcl?rev=3.0).
+
+    varnish_default_vcl_template_path: default.vcl.j2
+
+The default VCL file to be copied (if `varnish_use_default_vcl` is `true`). Defaults the the simple template inside `templates/default.vcl.j2`. This path should be relative to the directory from which you run your playbook.
+
+    varnish_default_backend_host: "127.0.0.1"
+    varnish_default_backend_port: "8080"
+
+Some settings for the default "default.vcl" template that will be copied to the `varnish_config_path` folder. The default backend host/port could be Apache or Nginx (or some other HTTP server) running on the same host or some other host (in which case, you might use port 80 instead).
+
+    varnish_listen_port: "80"
+
+The port on which Varnish will listen (typically port 80).
+
+    varnish_secret: "14bac2e6-1e34-4770-8078-974373b76c90"
+
+The secret/key to be used for connecting to Varnish's admin backend (for purge requests, etc.).
+
+    varnish_admin_listen_host: "127.0.0.1"
+    varnish_admin_listen_port: "6082"
+
+The host and port through which Varnish will accept admin requests (like purge and status requests).
+
+    varnish_storage: "file,/var/lib/varnish/varnish_storage.bin,256M"
+
+How Varnish stores cache entries (this is passed in as the argument for `-s`). If you want to use in-memory storage, change to something like `malloc,256M`. Please read Varnish's [Getting Started guide](https://www.varnish-software.com/static/book/Getting_started.html) for more information.
+
+## Dependencies
+
+None.
+
+## Example Playbook
+
+    - hosts: webservers
+      vars_files:
+        - vars/main.yml
+      roles:
+        - geerlingguy.varnish
+
+*Inside `vars/main.yml`*:
+
+    varnish_secret: "[secret generated by uuidgen]"
+    varnish_default_backend_host: 81
+    ... etc ...
+
+## License
+
+MIT / BSD
+
+## Author Information
+
+This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.varnish/defaults/main.yml b/provisioning/roles/geerlingguy.varnish/defaults/main.yml
new file mode 100644
index 000000000..bf5aac412
--- /dev/null
+++ b/provisioning/roles/geerlingguy.varnish/defaults/main.yml
@@ -0,0 +1,12 @@
+---
+varnish_version: "4.0"
+varnish_use_default_vcl: true
+varnish_default_vcl_template_path: default.vcl.j2
+varnish_default_backend_host: "127.0.0.1"
+varnish_default_backend_port: "8080"
+varnish_listen_port: "80"
+varnish_secret: "14bac2e6-1e34-4770-8078-974373b76c90"
+varnish_config_path: /etc/varnish
+varnish_admin_listen_host: "127.0.0.1"
+varnish_admin_listen_port: "6082"
+varnish_storage: "file,/var/lib/varnish/varnish_storage.bin,256M"
diff --git a/provisioning/roles/geerlingguy.varnish/handlers/main.yml b/provisioning/roles/geerlingguy.varnish/handlers/main.yml
new file mode 100644
index 000000000..409075088
--- /dev/null
+++ b/provisioning/roles/geerlingguy.varnish/handlers/main.yml
@@ -0,0 +1,6 @@
+---
+- name: reload systemd
+  command: systemctl daemon-reload
+
+- name: restart varnish
+  service: name=varnish state=restarted
diff --git a/provisioning/roles/geerlingguy.varnish/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.varnish/meta/.galaxy_install_info
new file mode 100644
index 000000000..517aabb19
--- /dev/null
+++ b/provisioning/roles/geerlingguy.varnish/meta/.galaxy_install_info
@@ -0,0 +1 @@
+{install_date: 'Fri Jul 15 19:50:16 2016', version: 1.6.1}
diff --git a/provisioning/roles/geerlingguy.varnish/meta/main.yml b/provisioning/roles/geerlingguy.varnish/meta/main.yml
new file mode 100644
index 000000000..f6096249f
--- /dev/null
+++ b/provisioning/roles/geerlingguy.varnish/meta/main.yml
@@ -0,0 +1,23 @@
+---
+dependencies: []
+
+galaxy_info:
+  author: geerlingguy
+  description: Varnish for Linux.
+  company: "Midwestern Mac, LLC"
+  license: "license (BSD, MIT)"
+  min_ansible_version: 1.8
+  platforms:
+    - name: EL
+      versions:
+      - 6
+      - 7
+    - name: Ubuntu
+      versions:
+      - precise
+      - trusty
+    - name: Debian
+      versions:
+      - all
+  galaxy_tags:
+    - web
diff --git a/provisioning/roles/geerlingguy.varnish/tasks/main.yml b/provisioning/roles/geerlingguy.varnish/tasks/main.yml
new file mode 100644
index 000000000..ffdaae452
--- /dev/null
+++ b/provisioning/roles/geerlingguy.varnish/tasks/main.yml
@@ -0,0 +1,72 @@
+---
+- name: Include OS-specific variables.
+  include_vars: "{{ ansible_os_family }}.yml"
+
+- include: setup-RedHat.yml
+  when: ansible_os_family == 'RedHat'
+
+- include: setup-Debian.yml
+  when: ansible_os_family == 'Debian'
+
+- name: Copy Varnish configuration (sysvinit).
+  template:
+    src: varnish.j2
+    dest: "{{ varnish_sysvinit_config_path }}/varnish"
+    owner: root
+    group: root
+    mode: 0644
+  when: >
+    (ansible_os_family == 'RedHat' and ansible_distribution_major_version|int < 7) or
+    (ansible_os_family == 'Debian' and ansible_distribution_release != "xenial")
+
+- name: Copy Debian Jessie/Xenial specific Varnish configs (systemd).
+  template:
+    src: varnish.service.j2
+    dest: "{{ varnish_systemd_config_path }}/varnish.service"
+    owner: root
+    group: root
+    mode: 0655
+  when: >
+    (ansible_os_family == 'Debian') and
+    (ansible_distribution_release == "jessie" or ansible_distribution_release == "xenial")
+  notify:
+    - reload systemd
+    - restart varnish
+
+- name: Copy Varnish configuration (systemd).
+  template:
+    src: varnish.params.j2
+    dest: /etc/varnish/varnish.params
+    owner: root
+    group: root
+    mode: 0644
+  when: >
+    (ansible_os_family == 'RedHat' and ansible_distribution_major_version|int >= 7) or
+    (ansible_os_family == 'Debian' and ansible_distribution_release == "xenial")
+
+- name: Ensure Varnish config path exists.
+  file:
+    path: "{{ varnish_config_path }}"
+    state: directory
+
+- name: Copy Varnish default VCL.
+  template:
+    src: "{{ varnish_default_vcl_template_path }}"
+    dest: "{{ varnish_config_path }}/default.vcl"
+    owner: root
+    group: root
+    mode: 0644
+  when: varnish_use_default_vcl
+  notify: restart varnish
+
+- name: Copy varnish secret.
+  template:
+    src: secret.j2
+    dest: "{{ varnish_config_path }}/secret"
+    owner: root
+    group: root
+    mode: 0644
+  notify: restart varnish
+
+- name: Ensure Varnish is started and set to run on startup.
+  service: name=varnish state=started enabled=yes
diff --git a/provisioning/roles/geerlingguy.varnish/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.varnish/tasks/setup-Debian.yml
new file mode 100644
index 000000000..b7cbba314
--- /dev/null
+++ b/provisioning/roles/geerlingguy.varnish/tasks/setup-Debian.yml
@@ -0,0 +1,13 @@
+---
+- name: Add Varnish apt key.
+  apt_key: url=http://repo.varnish-cache.org/debian/GPG-key.txt state=present
+  when: ansible_distribution_release != "xenial"
+
+- name: Add Varnish apt repository.
+  apt_repository:
+    repo: "deb http://repo.varnish-cache.org/ubuntu {{ ansible_distribution_release }} varnish-{{ varnish_version }}"
+    state: present
+  when: ansible_distribution_release != "xenial"
+
+- name: Install Varnish.
+  apt: name=varnish state=installed
diff --git a/provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml
new file mode 100644
index 000000000..b19e53985
--- /dev/null
+++ b/provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml
@@ -0,0 +1,21 @@
+---
+- name: Ensure gcc is installed (Varnish dependency).
+  yum: name=gcc state=present
+
+- name: Add Varnish repository.
+  command: >
+    rpm --nosignature -i https://repo.varnish-cache.org/redhat/varnish-{{ varnish_version }}.el6.rpm
+    creates=/var/lib/yum/repos/x86_64/6/varnish-{{ varnish_version }}
+  ignore_errors: true
+  when: ansible_distribution_major_version|int < 7
+
+- name: Set repo fact appropriately.
+  set_fact:
+    varnish_yum_enablerepo: "{{ 'varnish-{{ varnish_version }},epel' if (ansible_distribution_major_version|int < 7) else 'epel' }}"
+
+- name: Install Varnish.
+  yum:
+    name: varnish
+    state: installed
+    enablerepo: "{{ varnish_yum_enablerepo }}"
+    disablerepo: "*"
diff --git a/provisioning/roles/geerlingguy.varnish/templates/default.vcl.j2 b/provisioning/roles/geerlingguy.varnish/templates/default.vcl.j2
new file mode 100644
index 000000000..36a337620
--- /dev/null
+++ b/provisioning/roles/geerlingguy.varnish/templates/default.vcl.j2
@@ -0,0 +1,11 @@
+vcl 4.0;
+
+# This is a basic VCL configuration file for varnish.  See the vcl(7)
+# man page for details on VCL syntax and semantics.
+#
+# Default backend definition.  Set this to point to your content
+# server.
+backend default {
+  .host = "{{ varnish_default_backend_host }}";
+  .port = "{{ varnish_default_backend_port }}";
+}
diff --git a/provisioning/roles/geerlingguy.varnish/templates/secret.j2 b/provisioning/roles/geerlingguy.varnish/templates/secret.j2
new file mode 100644
index 000000000..8d7047d7c
--- /dev/null
+++ b/provisioning/roles/geerlingguy.varnish/templates/secret.j2
@@ -0,0 +1 @@
+{{ varnish_secret }}
diff --git a/provisioning/roles/geerlingguy.varnish/templates/varnish.j2 b/provisioning/roles/geerlingguy.varnish/templates/varnish.j2
new file mode 100644
index 000000000..6c3db0d5e
--- /dev/null
+++ b/provisioning/roles/geerlingguy.varnish/templates/varnish.j2
@@ -0,0 +1,110 @@
+# Configuration file for varnish
+#
+# /etc/init.d/varnish expects the variable $DAEMON_OPTS to be set from this
+# shell script fragment.
+#
+
+# Start varnish (only applies to Debian-based hosts)
+START=yes
+
+# Maximum number of open files (for ulimit -n)
+NFILES=131072
+
+# Locked shared memory (for ulimit -l)
+# Default log size is 82MB + header
+MEMLOCK=82000
+
+# Maximum number of threads (for ulimit -u)
+NPROCS="unlimited"
+
+# Maximum size of corefile (for ulimit -c). Default in Fedora is 0
+# DAEMON_COREFILE_LIMIT="unlimited"
+
+# Set this to 1 to make init script reload try to switch vcl without restart.
+# To make this work, you need to set the following variables
+# explicit: VARNISH_VCL_CONF, VARNISH_ADMIN_LISTEN_ADDRESS,
+# VARNISH_ADMIN_LISTEN_PORT, VARNISH_SECRET_FILE, or in short,
+# use Alternative 3, Advanced configuration, below
+RELOAD_VCL=1
+
+# This file contains 4 alternatives, please use only one.
+
+## Alternative 1, Minimal configuration, no VCL
+#
+# Listen on port 6081, administration on localhost:6082, and forward to
+# content server on localhost:8080.  Use a fixed-size cache file.
+#
+#DAEMON_OPTS="-a :6081 \
+#             -T localhost:6082 \
+#             -b localhost:8080 \
+#             -u varnish -g varnish \
+#             -s file,/var/lib/varnish/varnish_storage.bin,1G"
+
+
+## Alternative 2, Configuration with VCL
+#
+# Listen on port 6081, administration on localhost:6082, and forward to
+# one content server selected by the vcl file, based on the request.  Use a
+# fixed-size cache file.
+#
+#DAEMON_OPTS="-a :6081 \
+#             -T localhost:6082 \
+#             -f /etc/varnish/default.vcl \
+#             -u varnish -g varnish \
+#             -S /etc/varnish/secret \
+#             -s file,/var/lib/varnish/varnish_storage.bin,1G"
+
+
+## Alternative 3, Advanced configuration
+#
+# See varnishd(1) for more information.
+#
+# # Main configuration file. You probably want to change it :)
+VARNISH_VCL_CONF={{ varnish_config_path }}/default.vcl
+#
+# # Default address and port to bind to
+# # Blank address means all IPv4 and IPv6 interfaces, otherwise specify
+# # a host name, an IPv4 dotted quad, or an IPv6 address in brackets.
+# VARNISH_LISTEN_ADDRESS=
+VARNISH_LISTEN_PORT={{ varnish_listen_port }}
+#
+# # Telnet admin interface listen address and port
+VARNISH_ADMIN_LISTEN_ADDRESS={{ varnish_admin_listen_host }}
+VARNISH_ADMIN_LISTEN_PORT={{ varnish_admin_listen_port }}
+#
+# # Shared secret file for admin interface
+VARNISH_SECRET_FILE={{ varnish_config_path }}/secret
+#
+# # The minimum number of worker threads to start
+VARNISH_MIN_THREADS=50
+#
+# # The Maximum number of worker threads to start
+VARNISH_MAX_THREADS=1000
+#
+# # Idle timeout for worker threads
+VARNISH_THREAD_TIMEOUT=120
+#
+# # Backend storage specification
+VARNISH_STORAGE="{{ varnish_storage }}"
+#
+# # Default TTL used when the backend does not specify one
+VARNISH_TTL=120
+#
+# # DAEMON_OPTS is used by the init script.  If you add or remove options, make
+# # sure you update this section, too.
+DAEMON_OPTS="-a ${VARNISH_LISTEN_ADDRESS}:${VARNISH_LISTEN_PORT} \
+             -f ${VARNISH_VCL_CONF} \
+             -T ${VARNISH_ADMIN_LISTEN_ADDRESS}:${VARNISH_ADMIN_LISTEN_PORT} \
+             -t ${VARNISH_TTL} \
+             -p thread_pool_min=${VARNISH_MIN_THREADS} \
+             -p thread_pool_max=${VARNISH_MAX_THREADS} \
+             -p thread_pool_timeout=${VARNISH_THREAD_TIMEOUT} \
+             -u varnish -g varnish \
+             -S ${VARNISH_SECRET_FILE} \
+             -s ${VARNISH_STORAGE}"
+#
+
+
+## Alternative 4, Do It Yourself. See varnishd(1) for more information.
+#
+# DAEMON_OPTS=""
diff --git a/provisioning/roles/geerlingguy.varnish/templates/varnish.params.j2 b/provisioning/roles/geerlingguy.varnish/templates/varnish.params.j2
new file mode 100644
index 000000000..bd5637e9c
--- /dev/null
+++ b/provisioning/roles/geerlingguy.varnish/templates/varnish.params.j2
@@ -0,0 +1,35 @@
+# Varnish environment configuration description. This was derived from
+# the old style sysconfig/defaults settings
+
+# Set this to 1 to make systemd reload try to switch vcl without restart.
+RELOAD_VCL=1
+
+# Main configuration file. You probably want to change it.
+VARNISH_VCL_CONF={{ varnish_config_path }}/default.vcl
+
+# Default address and port to bind to. Blank address means all IPv4
+# and IPv6 interfaces, otherwise specify a host name, an IPv4 dotted
+# quad, or an IPv6 address in brackets.
+# VARNISH_LISTEN_ADDRESS=192.168.1.5
+VARNISH_LISTEN_PORT={{ varnish_listen_port }}
+
+# Admin interface listen address and port
+VARNISH_ADMIN_LISTEN_ADDRESS={{ varnish_admin_listen_host }}
+VARNISH_ADMIN_LISTEN_PORT={{ varnish_admin_listen_port }}
+
+# Shared secret file for admin interface
+VARNISH_SECRET_FILE={{ varnish_config_path }}/secret
+
+# Backend storage specification, see Storage Types in the varnishd(5)
+# man page for details.
+VARNISH_STORAGE="{{ varnish_storage }}"
+
+# Default TTL used when the backend does not specify one
+VARNISH_TTL=120
+
+# User and group for the varnishd worker processes
+VARNISH_USER=varnish
+VARNISH_GROUP=varnish
+
+# Other options, see the man page varnishd(1)
+#DAEMON_OPTS="-p thread_pool_min=5 -p thread_pool_max=500 -p thread_pool_timeout=300"
diff --git a/provisioning/roles/geerlingguy.varnish/templates/varnish.service.j2 b/provisioning/roles/geerlingguy.varnish/templates/varnish.service.j2
new file mode 100644
index 000000000..737a52f0f
--- /dev/null
+++ b/provisioning/roles/geerlingguy.varnish/templates/varnish.service.j2
@@ -0,0 +1,12 @@
+[Unit]
+Description=Varnish Cache, a high-performance HTTP accelerator
+
+[Service]
+Type=forking
+LimitNOFILE=131072
+LimitMEMLOCK=82000
+ExecStart=/usr/sbin/varnishd -a :{{ varnish_listen_port }} -T {{ varnish_admin_listen_host }}:{{ varnish_admin_listen_port }} -f /etc/varnish/default.vcl -S /etc/varnish/secret -s malloc,256m
+ExecReload=/usr/share/varnish/reload-vcl
+
+[Install]
+WantedBy=multi-user.target
diff --git a/provisioning/roles/geerlingguy.varnish/tests/Dockerfile.centos-6 b/provisioning/roles/geerlingguy.varnish/tests/Dockerfile.centos-6
new file mode 100644
index 000000000..4a4e7b8d6
--- /dev/null
+++ b/provisioning/roles/geerlingguy.varnish/tests/Dockerfile.centos-6
@@ -0,0 +1,15 @@
+FROM centos:6
+
+# Install Ansible
+RUN yum -y update; yum clean all;
+RUN yum -y install epel-release
+RUN yum -y install git ansible sudo
+RUN yum clean all
+
+# Disable requiretty
+RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
+
+# Install Ansible inventory file
+RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
+
+CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.varnish/tests/Dockerfile.centos-7 b/provisioning/roles/geerlingguy.varnish/tests/Dockerfile.centos-7
new file mode 100644
index 000000000..8aa065497
--- /dev/null
+++ b/provisioning/roles/geerlingguy.varnish/tests/Dockerfile.centos-7
@@ -0,0 +1,27 @@
+FROM centos:7
+
+# Install systemd -- See https://hub.docker.com/_/centos/
+RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
+RUN yum -y update; yum clean all; \
+(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
+rm -f /lib/systemd/system/multi-user.target.wants/*; \
+rm -f /etc/systemd/system/*.wants/*; \
+rm -f /lib/systemd/system/local-fs.target.wants/*; \
+rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
+rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
+rm -f /lib/systemd/system/basic.target.wants/*; \
+rm -f /lib/systemd/system/anaconda.target.wants/*;
+
+# Install Ansible
+RUN yum -y install epel-release
+RUN yum -y install git ansible sudo
+RUN yum clean all
+
+# Disable requiretty
+RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
+
+# Install Ansible inventory file
+RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
+
+VOLUME ["/sys/fs/cgroup"]
+CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.varnish/tests/Dockerfile.ubuntu-12.04 b/provisioning/roles/geerlingguy.varnish/tests/Dockerfile.ubuntu-12.04
new file mode 100644
index 000000000..d0c130cdf
--- /dev/null
+++ b/provisioning/roles/geerlingguy.varnish/tests/Dockerfile.ubuntu-12.04
@@ -0,0 +1,11 @@
+FROM ubuntu:12.04
+RUN apt-get update
+
+# Install Ansible
+RUN apt-get install -y software-properties-common python-software-properties git
+RUN apt-add-repository -y ppa:ansible/ansible
+RUN apt-get update
+RUN apt-get install -y ansible
+
+# Install Ansible inventory file
+RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.varnish/tests/Dockerfile.ubuntu-14.04 b/provisioning/roles/geerlingguy.varnish/tests/Dockerfile.ubuntu-14.04
new file mode 100644
index 000000000..949fd976a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.varnish/tests/Dockerfile.ubuntu-14.04
@@ -0,0 +1,17 @@
+FROM phusion/baseimage:0.9.18
+RUN apt-get update
+
+# Enable SSH
+RUN rm -f /etc/service/sshd/down
+
+# Create auth.log required by fail2ban.
+RUN touch /var/log/auth.log
+
+# Install Ansible
+RUN apt-get install -y software-properties-common git
+RUN apt-add-repository -y ppa:ansible/ansible
+RUN apt-get update
+RUN apt-get install -y ansible
+
+# Install Ansible inventory file
+RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.varnish/tests/test.yml b/provisioning/roles/geerlingguy.varnish/tests/test.yml
new file mode 100644
index 000000000..69e2a6818
--- /dev/null
+++ b/provisioning/roles/geerlingguy.varnish/tests/test.yml
@@ -0,0 +1,20 @@
+- hosts: all
+
+  pre_tasks:
+    - name: Ensure build dependencies are installed (RedHat 7+).
+      yum: 'name="{{ item }}" state=present'
+      with_items:
+        - logrotate
+        - redhat-rpm-config
+        - systemd-sysv
+        - initscripts
+      when: ansible_os_family == 'RedHat' and ansible_distribution_major_version >= '7'
+
+    - name: Ensure build dependencies are installed (RedHat < 7).
+      yum: 'name="{{ item }}" state=present'
+      with_items:
+        - logrotate
+      when: ansible_os_family == 'RedHat' and ansible_distribution_major_version < '7'
+
+  roles:
+    - role_under_test
diff --git a/provisioning/roles/geerlingguy.varnish/vars/Debian.yml b/provisioning/roles/geerlingguy.varnish/vars/Debian.yml
new file mode 100644
index 000000000..98ec82dcd
--- /dev/null
+++ b/provisioning/roles/geerlingguy.varnish/vars/Debian.yml
@@ -0,0 +1,3 @@
+---
+varnish_sysvinit_config_path: /etc/default
+varnish_systemd_config_path: /etc/systemd/system
diff --git a/provisioning/roles/geerlingguy.varnish/vars/RedHat.yml b/provisioning/roles/geerlingguy.varnish/vars/RedHat.yml
new file mode 100644
index 000000000..83b76ddde
--- /dev/null
+++ b/provisioning/roles/geerlingguy.varnish/vars/RedHat.yml
@@ -0,0 +1,2 @@
+---
+varnish_sysvinit_config_path: /etc/sysconfig

From 443999d797f442bd18d51cd35d83bcc2e1cf3fa8 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 22 Jul 2016 22:22:53 -0500
Subject: [PATCH 0378/1273] Issue #814: Update Vagrantfile and docs for
 roles-in-VM.

---
 Vagrantfile                             | 2 --
 docs/other/overriding-configurations.md | 3 ---
 docs/other/php-56.md                    | 2 --
 3 files changed, 7 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index dc2971781..7cc087dfe 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -122,7 +122,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   if which('ansible-playbook')
     config.vm.provision 'ansible' do |ansible|
       ansible.playbook = "#{host_drupalvm_dir}/provisioning/playbook.yml"
-      ansible.galaxy_role_file = "#{host_drupalvm_dir}/provisioning/requirements.yml"
       ansible.extra_vars = {
         config_dir: host_config_dir
       }
@@ -137,7 +136,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # else
   #   config.vm.provision "ansible_local" do |ansible|
   #     ansible.playbook = "#{guest_drupalvm_dir}/provisioning/playbook.yml"
-  #     ansible.galaxy_role_file = "#{guest_drupalvm_dir}/provisioning/requirements.yml"
   #     ansible.extra_vars = {
   #       config_dir: guest_config_dir
   #     }
diff --git a/docs/other/overriding-configurations.md b/docs/other/overriding-configurations.md
index 43f698720..36e1ccdaa 100644
--- a/docs/other/overriding-configurations.md
+++ b/docs/other/overriding-configurations.md
@@ -45,9 +45,6 @@ config.vm.provider :virtualbox do |v|
   # Cap the host CPU execution at 50% usage.
   v.customize ["modifyvm", :id, "--cpuexecutioncap", "50"]
 end
-
-# Disable the galaxy role re-installation during provisions.
-config.vm.provisioners[0].config.galaxy_role_file = nil
 ```
 
 ### Example: Using the `vagrant-aws` provider
diff --git a/docs/other/php-56.md b/docs/other/php-56.md
index cd1ff558a..14a6f8b8f 100644
--- a/docs/other/php-56.md
+++ b/docs/other/php-56.md
@@ -1,7 +1,5 @@
 Drupal VM defaults to PHP 7, but you can install and use 5.6 if you need to maximize compatibility with older Drupal 6 and 7 sites.
 
-_Note: If you have Ansible installed on your host machine, make sure you're running the latest version of all Ansible role dependencies by running `ansible-galaxy install -r provisioning/requirements.yml --force` inside the root Drupal VM project folder._
-
 ## Ubuntu 16.04
 
 Ubuntu 16.04 Xenial defaults to PHP 7.0 in it's system packages. No older versions of PHP will be supported if using this base box.

From 8919e9336097df382800f5cac88c3a99bf04471c Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 22 Jul 2016 22:24:15 -0500
Subject: [PATCH 0379/1273] Issue #814: Ignore galaxy install info dotfiles.

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index b5483661c..3f516b04a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 .vagrant/
 .bundle/
 *.retry
+.galaxy_install_info
 vagrant_ansible_inventory_default
 local.config.yml
 config.yml

From f912ca16bcc8e00389dba2a19130ada2ec32b8cb Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 22 Jul 2016 22:32:48 -0500
Subject: [PATCH 0380/1273] Issue #814: Remove galaxy install step from Travis
 config.

---
 .travis.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3a8ab7b07..104cb28f4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,9 +49,6 @@ script:
   # Setup directories.
   - 'sudo docker exec "$(cat ${container_id})" mkdir -p ${DRUPALVM_DIR}/drupal'
 
-  # Install dependencies.
-  - 'sudo docker exec "$(cat ${container_id})" ansible-galaxy install -r ${DRUPALVM_DIR}/provisioning/requirements.yml'
-
   # Setup config directory.
   - '[[ ! -z "${config_dir}" ]] && sudo docker exec "$(cat ${container_id})" mkdir -p ${config_dir} || true'
 

From 2bc448bcdc0dc79d2a9a0081a23b76b463c737c5 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 22 Jul 2016 22:34:31 -0500
Subject: [PATCH 0381/1273] Issue #814: Don't install dependencies on Windows
 or non-Ansible-powered hosts.

---
 provisioning/JJG-Ansible-Windows/windows.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/provisioning/JJG-Ansible-Windows/windows.sh b/provisioning/JJG-Ansible-Windows/windows.sh
index a96d5169e..4eb6e62e1 100644
--- a/provisioning/JJG-Ansible-Windows/windows.sh
+++ b/provisioning/JJG-Ansible-Windows/windows.sh
@@ -71,8 +71,8 @@ if ! command -v ansible >/dev/null; then
 fi
 
 # Install requirements.
-echo "Installing Ansible roles from requirements file, if available."
-find "$PLAYBOOK_DIR" \( -name "requirements.yml" -o -name "requirements.txt" \) -exec sudo ansible-galaxy install --force --ignore-errors -r {} \;
+#echo "Installing Ansible roles from requirements file, if available."
+#find "$PLAYBOOK_DIR" \( -name "requirements.yml" -o -name "requirements.txt" \) -exec sudo ansible-galaxy install --force --ignore-errors -r {} \;
 
 # Run the playbook.
 echo "Running Ansible provisioner defined in Vagrantfile."

From ead6ebcd571f1219265457d804a10f06e39bd547 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 22 Jul 2016 23:10:55 -0500
Subject: [PATCH 0382/1273] Issue #814: See what files rubocop is inspecting.

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 104cb28f4..d82226a74 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,6 +61,7 @@ script:
   - '[[ ! -z "${local_config}" ]] && sudo docker exec "$(cat ${container_id})" bash -c "cp ${DRUPALVM_DIR}/${local_config} ${config_dir:-$DRUPALVM_DIR}/local.config.yml" || true'
 
   # Vagrantfile syntax check
+  - 'rubocop --list-target-files'
   - 'rubocop --except LineLength,Eval,MutableConstant'
 
   # Ansible syntax check.

From 6e9102572044948f7461b718badc5f6eec0cce07 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 22 Jul 2016 23:15:12 -0500
Subject: [PATCH 0383/1273] Issue #814: See if we can make rubocop inspect only
 our own Vagrantfile.

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d82226a74..c7793e79a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,8 +61,7 @@ script:
   - '[[ ! -z "${local_config}" ]] && sudo docker exec "$(cat ${container_id})" bash -c "cp ${DRUPALVM_DIR}/${local_config} ${config_dir:-$DRUPALVM_DIR}/local.config.yml" || true'
 
   # Vagrantfile syntax check
-  - 'rubocop --list-target-files'
-  - 'rubocop --except LineLength,Eval,MutableConstant'
+  - 'rubocop ./Vagrantfile --except LineLength,Eval,MutableConstant'
 
   # Ansible syntax check.
   - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook ${DRUPALVM_DIR}/provisioning/playbook.yml --syntax-check'

From 5f10deccc87d8e2c5b02fc5d915a783b6263038f Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 23 Jul 2016 09:29:25 -0500
Subject: [PATCH 0384/1273] Fixes #450: Switch to Vagrant's ansible_local
 provisioner.

---
 README.md   |  2 +-
 Vagrantfile | 19 ++++++-------------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index a11feb3cb..962d8da45 100644
--- a/README.md
+++ b/README.md
@@ -74,7 +74,7 @@ Notes:
 
   - **For faster provisioning** (macOS/Linux only): *[Install Ansible](http://docs.ansible.com/intro_installation.html) on your host machine, so Drupal VM can run the provisioning steps locally instead of inside the VM.*
   - **NFS on Linux**: *If NFS is not already installed on your host, you will need to install it to use the default NFS synced folder configuration. See guides for [Debian/Ubuntu](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-ubuntu-14-04), [Arch](https://wiki.archlinux.org/index.php/NFS#Installation), and [RHEL/CentOS](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-centos-6).*
-  - **Versions**: *Make sure you're running the latest releases of Vagrant, VirtualBox, and Ansible—as of February 2016, Drupal VM recommends: Vagrant 1.8.4, VirtualBox 5.0.24, and Ansible 2.1.0.*
+  - **Versions**: *Make sure you're running the latest releases of Vagrant, VirtualBox, and Ansible—as of February 2016, Drupal VM recommends: Vagrant 1.8.5, VirtualBox 5.0.24, and Ansible 2.1.0.*
 
 ### 2 - Build the Virtual Machine
 
diff --git a/Vagrantfile b/Vagrantfile
index 7cc087dfe..5166466fa 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -118,7 +118,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # Allow override of the default synced folder type.
   config.vm.synced_folder host_project_dir, '/vagrant', type: vconfig.include?('vagrant_synced_folder_default_type') ? vconfig['vagrant_synced_folder_default_type'] : 'nfs'
 
-  # Provisioning. Use ansible if it's installed, JJG-Ansible-Windows if not.
+  # Provisioning. Use ansible if it's installed, ansible_local if not.
   if which('ansible-playbook')
     config.vm.provision 'ansible' do |ansible|
       ansible.playbook = "#{host_drupalvm_dir}/provisioning/playbook.yml"
@@ -127,20 +127,13 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       }
     end
   else
-    config.vm.provision 'shell' do |sh|
-      sh.path = "#{host_drupalvm_dir}/provisioning/JJG-Ansible-Windows/windows.sh"
-      sh.args = "-e 'config_dir=\"#{guest_config_dir}\"' #{guest_drupalvm_dir}/provisioning/playbook.yml"
+    config.vm.provision 'ansible_local' do |ansible|
+      ansible.playbook = "#{guest_drupalvm_dir}/provisioning/playbook.yml"
+      ansible.extra_vars = {
+        config_dir: guest_config_dir
+      }
     end
   end
-  # ansible_local provisioner is broken in Vagrant < 1.8.2.
-  # else
-  #   config.vm.provision "ansible_local" do |ansible|
-  #     ansible.playbook = "#{guest_drupalvm_dir}/provisioning/playbook.yml"
-  #     ansible.extra_vars = {
-  #       config_dir: guest_config_dir
-  #     }
-  #   end
-  # end
 
   # VMware Fusion.
   config.vm.provider :vmware_fusion do |v, override|

From 1546930584391b86410a404fa524803a3ae36255 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 23 Jul 2016 10:48:05 -0500
Subject: [PATCH 0385/1273] Issue #450: Remove JJG-Ansible-Windows dependency -
 no longer required.

---
 provisioning/JJG-Ansible-Windows/LICENSE    | 20 ------
 provisioning/JJG-Ansible-Windows/README.md  | 42 -----------
 provisioning/JJG-Ansible-Windows/windows.sh | 79 ---------------------
 3 files changed, 141 deletions(-)
 delete mode 100644 provisioning/JJG-Ansible-Windows/LICENSE
 delete mode 100644 provisioning/JJG-Ansible-Windows/README.md
 delete mode 100644 provisioning/JJG-Ansible-Windows/windows.sh

diff --git a/provisioning/JJG-Ansible-Windows/LICENSE b/provisioning/JJG-Ansible-Windows/LICENSE
deleted file mode 100644
index 378188abb..000000000
--- a/provisioning/JJG-Ansible-Windows/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2014 Jeff Geerling
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/provisioning/JJG-Ansible-Windows/README.md b/provisioning/JJG-Ansible-Windows/README.md
deleted file mode 100644
index 48097c6ec..000000000
--- a/provisioning/JJG-Ansible-Windows/README.md
+++ /dev/null
@@ -1,42 +0,0 @@
-# JJG-Ansible-Windows
-
-> **Important Note**: Vagrant now includes an [`ansible_local` provisioner](https://docs.vagrantup.com/v2/provisioning/ansible_local.html), which provides a much more reliable Ansible provisioning experience within a Vagrant VM. This project will likely no longer be updated for use beyond Vagrant 1.7.x.
-
-Windows shell provisioning script to bootstrap Ansible from within a Vagrant VM running on Windows.
-
-This script is configured to use configure any Linux-based VM (Debian, Ubuntu, Fedora, RedHat, CentOS, etc.) so it can run Ansible playbooks from within the VM through Vagrant.
-
-Read more about this script, and other techniques for using Ansible within a Windows environment, on Server Check.in: [Running Ansible within Windows](https://servercheck.in/blog/running-ansible-within-windows).
-
-## Usage
-
-In your Vagrantfile, use a conditional provisioning statement if you want to use this script (which runs Ansible from within the VM instead of on your host—this example assumes your playbook is inside within a 'provisioning' folder, and this script is within provisioning/JJG-Ansible-Windows):
-
-```ruby
-# Use rbconfig to determine if we're on a windows host or not.
-require 'rbconfig'
-is_windows = (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
-if is_windows
-  # Provisioning configuration for shell script.
-  config.vm.provision "shell" do |sh|
-    sh.path = "provisioning/JJG-Ansible-Windows/windows.sh"
-    sh.args = "/vagrant/provisioning/playbook.yml"
-  end
-else
-  # Provisioning configuration for Ansible (for macOS/Linux hosts).
-  config.vm.provision "ansible" do |ansible|
-    ansible.playbook = "provisioning/playbook.yml"
-    ansible.sudo = true
-  end
-end
-```
-
-Note that the `windows.sh` script will run within the VM and will run the given playbook against localhost with `--connection=local` inside the VM. You shouldn't/can't pass a custom inventory file to the script, as you can using Vagrant's Ansible provisioner.
-
-### Role Requirements File
-
-If your playbook requires roles to be installed which are not present in a `roles` directory within the playbook's directory, then you should add the roles to a [role requirements](http://docs.ansible.com/galaxy.html#advanced-control-over-role-requirements-files) file. Place the resulting `requirements.txt` or `requirements.yml` file in the same directory as your playbook, and the roles will be installed automatically.
-
-## Licensing and More Info
-
-Created by [Jeff Geerling](http://jeffgeerling.com/) in 2014. Licensed under the MIT license; see the LICENSE file for more info.
diff --git a/provisioning/JJG-Ansible-Windows/windows.sh b/provisioning/JJG-Ansible-Windows/windows.sh
deleted file mode 100644
index 4eb6e62e1..000000000
--- a/provisioning/JJG-Ansible-Windows/windows.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/bash
-#
-# Windows shell provisioner for Ansible playbooks, based on KSid's
-# windows-vagrant-ansible: https://github.com/KSid/windows-vagrant-ansible
-#
-# @see README.md
-# @author Jeff Geerling, 2014
-
-# Uncomment if behind a proxy server.
-# export {http,https,ftp}_proxy='http://username:password@proxy-host:80'
-
-args=()
-extra_vars=("is_windows=true")
-
-# Process and remove all flags.
-while (($#)); do
-  case $1 in
-    --extra-vars=*) extra_vars+=("${1#*=}") ;;
-    --extra-vars|-e) shift; extra_vars+=("$1") ;;
-    -*) echo "invalid option: $1" >&2; exit 1 ;;
-    *) args+=("$1") ;;
-  esac
-  shift
-done
-
-# Restore the arguments without flags.
-set -- "${args[@]}"
-
-ANSIBLE_PLAYBOOK=$1
-PLAYBOOK_DIR=${ANSIBLE_PLAYBOOK%/*}
-
-# Detect package management system.
-YUM=$(which yum 2>/dev/null)
-APT_GET=$(which apt-get 2>/dev/null)
-
-# Make sure Ansible playbook exists.
-if [ ! -f "$ANSIBLE_PLAYBOOK" ]; then
-  echo "Cannot find Ansible playbook."
-  exit 1
-fi
-
-# Install Ansible and its dependencies if it's not installed already.
-if ! command -v ansible >/dev/null; then
-  echo "Installing Ansible dependencies and Git."
-  if [[ ! -z ${YUM} ]]; then
-    yum install -y git python python-devel
-  elif [[ ! -z ${APT_GET} ]]; then
-    apt-get update
-    apt-get install -y git python python-dev
-  else
-    echo "Neither yum nor apt-get are available."
-    exit 1;
-  fi
-
-  echo "Installing pip."
-  wget https://bootstrap.pypa.io/get-pip.py
-  python get-pip.py && rm -f get-pip.py
-
-  echo "Installing required build tools."
-  if [[ ! -z $YUM ]]; then
-    yum install -y gcc libffi-devel openssl-devel
-  elif [[ ! -z $APT_GET ]]; then
-    apt-get install -y build-essential libssl-dev libffi-dev
-  fi
-
-  echo "Installing required python modules."
-  pip install paramiko pyyaml jinja2 markupsafe
-
-  echo "Installing Ansible."
-  pip install ansible
-fi
-
-# Install requirements.
-#echo "Installing Ansible roles from requirements file, if available."
-#find "$PLAYBOOK_DIR" \( -name "requirements.yml" -o -name "requirements.txt" \) -exec sudo ansible-galaxy install --force --ignore-errors -r {} \;
-
-# Run the playbook.
-echo "Running Ansible provisioner defined in Vagrantfile."
-ansible-playbook -i 'localhost,' "${ANSIBLE_PLAYBOOK}" --extra-vars "${extra_vars[*]}" --connection=local

From 3f7435b54158bf0b273a418e4138198e364666c6 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 23 Jul 2016 14:46:22 -0500
Subject: [PATCH 0386/1273] PR #775 follow-up: Recommend installing VirtualBox
 manually.

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 355b1949a..10256a1c9 100644
--- a/README.md
+++ b/README.md
@@ -58,17 +58,17 @@ This Quick Start Guide will help you quickly build a Drupal 8 site on the Drupal
 
 If you want to install a Drupal 8 site locally with minimal fuss, just:
 
-  1. Install Vagrant.
+  1. Install [Vagrant](https://www.vagrantup.com/downloads.html) and [VirtualBox](https://www.virtualbox.org/wiki/Downloads).
   2. Download or clone this project to your workstation.
   3. `cd` into this project directory and run `vagrant up`.
 
 But Drupal VM allows you to build your site exactly how you like, using whatever tools you need, with almost infinite flexibility and customization!
 
-### 1 - Install Vagrant
+### 1 - Install Vagrant and VirtualBox
 
-Download and install [Vagrant](https://www.vagrantup.com/downloads.html).
+Download and install [Vagrant](https://www.vagrantup.com/downloads.html) and [VirtualBox](https://www.virtualbox.org/wiki/Downloads).
 
-Vagrant will automatically install [VirtualBox](https://www.virtualbox.org/wiki/Downloads) if no VM provider is installed. If you want to use an alternative provider like Parallels or VMware, you will need to install the [Vagrant VMware integration plugin](http://www.vagrantup.com/vmware).
+You can also use an alternative provider like Parallels or VMware, (the latter also requires the paid [Vagrant VMware integration plugin](http://www.vagrantup.com/vmware)).
 
 Notes:
 

From f9a04ee302553958dba83adb38d45445ce5eb341 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 23 Jul 2016 14:53:17 -0500
Subject: [PATCH 0387/1273] Bump VirtualBox recommended version.

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

diff --git a/README.md b/README.md
index 10256a1c9..c3fc429b2 100644
--- a/README.md
+++ b/README.md
@@ -74,7 +74,7 @@ Notes:
 
   - **For faster provisioning** (macOS/Linux only): *[Install Ansible](http://docs.ansible.com/intro_installation.html) on your host machine, so Drupal VM can run the provisioning steps locally instead of inside the VM.*
   - **NFS on Linux**: *If NFS is not already installed on your host, you will need to install it to use the default NFS synced folder configuration. See guides for [Debian/Ubuntu](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-ubuntu-14-04), [Arch](https://wiki.archlinux.org/index.php/NFS#Installation), and [RHEL/CentOS](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-centos-6).*
-  - **Versions**: *Make sure you're running the latest releases of Vagrant, VirtualBox, and Ansible—as of February 2016, Drupal VM recommends: Vagrant 1.8.5, VirtualBox 5.0.24, and Ansible 2.1.0.*
+  - **Versions**: *Make sure you're running the latest releases of Vagrant, VirtualBox, and Ansible—as of February 2016, Drupal VM recommends: Vagrant 1.8.5, VirtualBox 5.1.2, and Ansible 2.1.0.*
 
 ### 2 - Build the Virtual Machine
 

From 60a291f4a84685091f6c402de889dcdfade7b9ab Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 23 Jul 2016 22:58:28 -0500
Subject: [PATCH 0388/1273] Fixes #777: Document switching Java versions for
 different Solr versions.

---
 default.config.yml  | 2 +-
 docs/extras/solr.md | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/default.config.yml b/default.config.yml
index ea76fea84..230ddcdef 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -285,7 +285,7 @@ php_xdebug_idekey: PHPSTORM
 php_xdebug_max_nesting_level: 256
 
 # Solr Configuration (if enabled above).
-solr_version: "5.5.1"
+solr_version: "5.5.2"
 solr_xms: "64M"
 solr_xmx: "128M"
 
diff --git a/docs/extras/solr.md b/docs/extras/solr.md
index 0fd47a8ea..75dbce641 100644
--- a/docs/extras/solr.md
+++ b/docs/extras/solr.md
@@ -8,6 +8,12 @@ The URL to connect to the local solr server (assuming you're using the default `
 
 This will connect to the default search core (`collection1`) set up by Solr. If you are using a multisite installation and want to have a search core per Drupal site, you can add more cores through Apache Solr's admin interface (visit `http://drupalvm.dev:8983/solr/`), then connect to each core by adding the core name to the end of the above URL (e.g. `core2` would be `http://localhost:8983/solr/core2`).
 
+## Using Different Solr versions
+
+Drupal VM installs Apache Solr 5.x by default, but you can use 6.x, 4.x, or other versions instead. To do this, [see the version-specific test examples](https://github.com/geerlingguy/ansible-role-solr/tree/master/tests) in the `geerlingguy.solr` role.
+
+One important note: If you use Solr 5.x or 6.x (or later), you need to make sure your VM has Java 8+. By default, many of the supported OSes only install Java 7. To install Java 8, see the `geerlingguy.java` role examples for [installing Java 8 on RHEL/CentOS or Ubuntu < 16.04](https://github.com/geerlingguy/ansible-role-java#example-playbook-install-openjdk-8).
+
 ## Configuring the Solr search core for Drupal
 
 Before Drupal content can be indexed correctly into Apache Solr, you will need to copy the Drupal Apache Solr Search or Search API Apache Solr configuration into place, and restart Apache Solr. Drupal VM comes with an example post provision script for automating this. Simply add it to `post_provision_scripts`:

From 09624961168b5658a46527de875ac77405bce131 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 24 Jul 2016 09:26:50 -0500
Subject: [PATCH 0389/1273] Issue #789: Remove .galaxy_install_info files and
 update Solr role to 3.1.2.

---
 provisioning/requirements.yml                               | 2 +-
 .../roles/arknoll.selenium/meta/.galaxy_install_info        | 1 -
 .../roles/geerlingguy.adminer/meta/.galaxy_install_info     | 1 -
 .../geerlingguy.apache-php-fpm/meta/.galaxy_install_info    | 1 -
 .../roles/geerlingguy.apache/meta/.galaxy_install_info      | 1 -
 .../roles/geerlingguy.blackfire/meta/.galaxy_install_info   | 1 -
 .../roles/geerlingguy.composer/meta/.galaxy_install_info    | 1 -
 .../roles/geerlingguy.daemonize/meta/.galaxy_install_info   | 1 -
 .../geerlingguy.drupal-console/meta/.galaxy_install_info    | 1 -
 .../roles/geerlingguy.drush/meta/.galaxy_install_info       | 1 -
 .../geerlingguy.elasticsearch/meta/.galaxy_install_info     | 1 -
 .../roles/geerlingguy.firewall/meta/.galaxy_install_info    | 1 -
 .../roles/geerlingguy.git/meta/.galaxy_install_info         | 1 -
 .../roles/geerlingguy.java/meta/.galaxy_install_info        | 1 -
 .../roles/geerlingguy.mailhog/meta/.galaxy_install_info     | 1 -
 .../roles/geerlingguy.memcached/meta/.galaxy_install_info   | 1 -
 .../roles/geerlingguy.mysql/meta/.galaxy_install_info       | 1 -
 .../roles/geerlingguy.nginx/meta/.galaxy_install_info       | 1 -
 .../roles/geerlingguy.nodejs/meta/.galaxy_install_info      | 1 -
 .../geerlingguy.php-memcached/meta/.galaxy_install_info     | 1 -
 .../roles/geerlingguy.php-mysql/meta/.galaxy_install_info   | 1 -
 .../roles/geerlingguy.php-pecl/meta/.galaxy_install_info    | 1 -
 .../roles/geerlingguy.php-redis/meta/.galaxy_install_info   | 1 -
 .../roles/geerlingguy.php-xdebug/meta/.galaxy_install_info  | 1 -
 .../roles/geerlingguy.php-xhprof/meta/.galaxy_install_info  | 1 -
 .../roles/geerlingguy.php/meta/.galaxy_install_info         | 1 -
 .../roles/geerlingguy.pimpmylog/meta/.galaxy_install_info   | 1 -
 .../roles/geerlingguy.postfix/meta/.galaxy_install_info     | 1 -
 .../roles/geerlingguy.redis/meta/.galaxy_install_info       | 1 -
 .../roles/geerlingguy.repo-remi/meta/.galaxy_install_info   | 1 -
 .../roles/geerlingguy.ruby/meta/.galaxy_install_info        | 1 -
 .../roles/geerlingguy.security/meta/.galaxy_install_info    | 1 -
 provisioning/roles/geerlingguy.solr/.travis.yml             | 4 +++-
 provisioning/roles/geerlingguy.solr/defaults/main.yml       | 2 +-
 .../roles/geerlingguy.solr/meta/.galaxy_install_info        | 1 -
 provisioning/roles/geerlingguy.solr/tasks/install.yml       | 6 ++++++
 .../roles/geerlingguy.solr/tests/Dockerfile.centos-7        | 3 +++
 provisioning/roles/geerlingguy.solr/tests/test-solr-5.yml   | 2 +-
 .../roles/geerlingguy.varnish/meta/.galaxy_install_info     | 1 -
 39 files changed, 15 insertions(+), 37 deletions(-)
 delete mode 100644 provisioning/roles/arknoll.selenium/meta/.galaxy_install_info
 delete mode 100644 provisioning/roles/geerlingguy.adminer/meta/.galaxy_install_info
 delete mode 100644 provisioning/roles/geerlingguy.apache-php-fpm/meta/.galaxy_install_info
 delete mode 100644 provisioning/roles/geerlingguy.apache/meta/.galaxy_install_info
 delete mode 100644 provisioning/roles/geerlingguy.blackfire/meta/.galaxy_install_info
 delete mode 100644 provisioning/roles/geerlingguy.composer/meta/.galaxy_install_info
 delete mode 100644 provisioning/roles/geerlingguy.daemonize/meta/.galaxy_install_info
 delete mode 100644 provisioning/roles/geerlingguy.drupal-console/meta/.galaxy_install_info
 delete mode 100644 provisioning/roles/geerlingguy.drush/meta/.galaxy_install_info
 delete mode 100644 provisioning/roles/geerlingguy.elasticsearch/meta/.galaxy_install_info
 delete mode 100644 provisioning/roles/geerlingguy.firewall/meta/.galaxy_install_info
 delete mode 100644 provisioning/roles/geerlingguy.git/meta/.galaxy_install_info
 delete mode 100644 provisioning/roles/geerlingguy.java/meta/.galaxy_install_info
 delete mode 100644 provisioning/roles/geerlingguy.mailhog/meta/.galaxy_install_info
 delete mode 100644 provisioning/roles/geerlingguy.memcached/meta/.galaxy_install_info
 delete mode 100644 provisioning/roles/geerlingguy.mysql/meta/.galaxy_install_info
 delete mode 100644 provisioning/roles/geerlingguy.nginx/meta/.galaxy_install_info
 delete mode 100644 provisioning/roles/geerlingguy.nodejs/meta/.galaxy_install_info
 delete mode 100644 provisioning/roles/geerlingguy.php-memcached/meta/.galaxy_install_info
 delete mode 100644 provisioning/roles/geerlingguy.php-mysql/meta/.galaxy_install_info
 delete mode 100644 provisioning/roles/geerlingguy.php-pecl/meta/.galaxy_install_info
 delete mode 100644 provisioning/roles/geerlingguy.php-redis/meta/.galaxy_install_info
 delete mode 100644 provisioning/roles/geerlingguy.php-xdebug/meta/.galaxy_install_info
 delete mode 100644 provisioning/roles/geerlingguy.php-xhprof/meta/.galaxy_install_info
 delete mode 100644 provisioning/roles/geerlingguy.php/meta/.galaxy_install_info
 delete mode 100644 provisioning/roles/geerlingguy.pimpmylog/meta/.galaxy_install_info
 delete mode 100644 provisioning/roles/geerlingguy.postfix/meta/.galaxy_install_info
 delete mode 100644 provisioning/roles/geerlingguy.redis/meta/.galaxy_install_info
 delete mode 100644 provisioning/roles/geerlingguy.repo-remi/meta/.galaxy_install_info
 delete mode 100644 provisioning/roles/geerlingguy.ruby/meta/.galaxy_install_info
 delete mode 100644 provisioning/roles/geerlingguy.security/meta/.galaxy_install_info
 delete mode 100644 provisioning/roles/geerlingguy.solr/meta/.galaxy_install_info
 delete mode 100644 provisioning/roles/geerlingguy.varnish/meta/.galaxy_install_info

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 6c1172e86..c04a13494 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -64,6 +64,6 @@
 - src: geerlingguy.security
   version: 1.2.0
 - src: geerlingguy.solr
-  version: 3.1.0
+  version: 3.1.2
 - src: geerlingguy.varnish
   version: 1.6.1
diff --git a/provisioning/roles/arknoll.selenium/meta/.galaxy_install_info b/provisioning/roles/arknoll.selenium/meta/.galaxy_install_info
deleted file mode 100644
index 5d2ce608f..000000000
--- a/provisioning/roles/arknoll.selenium/meta/.galaxy_install_info
+++ /dev/null
@@ -1 +0,0 @@
-{install_date: 'Sat Jul 23 03:17:21 2016', version: 1.3.0}
diff --git a/provisioning/roles/geerlingguy.adminer/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.adminer/meta/.galaxy_install_info
deleted file mode 100644
index 4a97db086..000000000
--- a/provisioning/roles/geerlingguy.adminer/meta/.galaxy_install_info
+++ /dev/null
@@ -1 +0,0 @@
-{install_date: 'Sat Jul 23 03:17:26 2016', version: 1.1.0}
diff --git a/provisioning/roles/geerlingguy.apache-php-fpm/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.apache-php-fpm/meta/.galaxy_install_info
deleted file mode 100644
index 5882bc048..000000000
--- a/provisioning/roles/geerlingguy.apache-php-fpm/meta/.galaxy_install_info
+++ /dev/null
@@ -1 +0,0 @@
-{install_date: 'Fri Jul 15 19:48:33 2016', version: 1.0.2}
diff --git a/provisioning/roles/geerlingguy.apache/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.apache/meta/.galaxy_install_info
deleted file mode 100644
index be7d7d1ac..000000000
--- a/provisioning/roles/geerlingguy.apache/meta/.galaxy_install_info
+++ /dev/null
@@ -1 +0,0 @@
-{install_date: 'Fri Jul 15 19:48:30 2016', version: 1.7.2}
diff --git a/provisioning/roles/geerlingguy.blackfire/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.blackfire/meta/.galaxy_install_info
deleted file mode 100644
index 3dcb0aeb3..000000000
--- a/provisioning/roles/geerlingguy.blackfire/meta/.galaxy_install_info
+++ /dev/null
@@ -1 +0,0 @@
-{install_date: 'Fri Jul 15 19:48:37 2016', version: 1.0.0}
diff --git a/provisioning/roles/geerlingguy.composer/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.composer/meta/.galaxy_install_info
deleted file mode 100644
index 0e05813ff..000000000
--- a/provisioning/roles/geerlingguy.composer/meta/.galaxy_install_info
+++ /dev/null
@@ -1 +0,0 @@
-{install_date: 'Fri Jul 15 19:48:40 2016', version: 1.4.1}
diff --git a/provisioning/roles/geerlingguy.daemonize/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.daemonize/meta/.galaxy_install_info
deleted file mode 100644
index 6e1de8afa..000000000
--- a/provisioning/roles/geerlingguy.daemonize/meta/.galaxy_install_info
+++ /dev/null
@@ -1 +0,0 @@
-{install_date: 'Fri Jul 15 19:48:43 2016', version: 1.1.0}
diff --git a/provisioning/roles/geerlingguy.drupal-console/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.drupal-console/meta/.galaxy_install_info
deleted file mode 100644
index 57fafd60d..000000000
--- a/provisioning/roles/geerlingguy.drupal-console/meta/.galaxy_install_info
+++ /dev/null
@@ -1 +0,0 @@
-{install_date: 'Fri Jul 15 19:48:47 2016', version: 1.0.7}
diff --git a/provisioning/roles/geerlingguy.drush/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.drush/meta/.galaxy_install_info
deleted file mode 100644
index f0864c071..000000000
--- a/provisioning/roles/geerlingguy.drush/meta/.galaxy_install_info
+++ /dev/null
@@ -1 +0,0 @@
-{install_date: 'Fri Jul 15 19:48:50 2016', version: 1.1.2}
diff --git a/provisioning/roles/geerlingguy.elasticsearch/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.elasticsearch/meta/.galaxy_install_info
deleted file mode 100644
index 2c762e161..000000000
--- a/provisioning/roles/geerlingguy.elasticsearch/meta/.galaxy_install_info
+++ /dev/null
@@ -1 +0,0 @@
-{install_date: 'Fri Jul 15 19:48:53 2016', version: 2.1.0}
diff --git a/provisioning/roles/geerlingguy.firewall/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.firewall/meta/.galaxy_install_info
deleted file mode 100644
index 419b46e75..000000000
--- a/provisioning/roles/geerlingguy.firewall/meta/.galaxy_install_info
+++ /dev/null
@@ -1 +0,0 @@
-{install_date: 'Fri Jul 15 19:48:57 2016', version: 1.0.9}
diff --git a/provisioning/roles/geerlingguy.git/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.git/meta/.galaxy_install_info
deleted file mode 100644
index 683f63a38..000000000
--- a/provisioning/roles/geerlingguy.git/meta/.galaxy_install_info
+++ /dev/null
@@ -1 +0,0 @@
-{install_date: 'Fri Jul 15 19:49:01 2016', version: 1.1.1}
diff --git a/provisioning/roles/geerlingguy.java/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.java/meta/.galaxy_install_info
deleted file mode 100644
index 79c2cbc1a..000000000
--- a/provisioning/roles/geerlingguy.java/meta/.galaxy_install_info
+++ /dev/null
@@ -1 +0,0 @@
-{install_date: 'Fri Jul 15 19:49:05 2016', version: 1.4.0}
diff --git a/provisioning/roles/geerlingguy.mailhog/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.mailhog/meta/.galaxy_install_info
deleted file mode 100644
index d49e3f771..000000000
--- a/provisioning/roles/geerlingguy.mailhog/meta/.galaxy_install_info
+++ /dev/null
@@ -1 +0,0 @@
-{install_date: 'Fri Jul 15 19:49:08 2016', version: 2.0.0}
diff --git a/provisioning/roles/geerlingguy.memcached/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.memcached/meta/.galaxy_install_info
deleted file mode 100644
index 19a1059f6..000000000
--- a/provisioning/roles/geerlingguy.memcached/meta/.galaxy_install_info
+++ /dev/null
@@ -1 +0,0 @@
-{install_date: 'Fri Jul 15 19:49:12 2016', version: 1.0.4}
diff --git a/provisioning/roles/geerlingguy.mysql/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.mysql/meta/.galaxy_install_info
deleted file mode 100644
index 272443920..000000000
--- a/provisioning/roles/geerlingguy.mysql/meta/.galaxy_install_info
+++ /dev/null
@@ -1 +0,0 @@
-{install_date: 'Fri Jul 15 19:49:15 2016', version: 2.3.0}
diff --git a/provisioning/roles/geerlingguy.nginx/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.nginx/meta/.galaxy_install_info
deleted file mode 100644
index dbf11e272..000000000
--- a/provisioning/roles/geerlingguy.nginx/meta/.galaxy_install_info
+++ /dev/null
@@ -1 +0,0 @@
-{install_date: 'Fri Jul 15 19:49:19 2016', version: 1.9.2}
diff --git a/provisioning/roles/geerlingguy.nodejs/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.nodejs/meta/.galaxy_install_info
deleted file mode 100644
index 1f626c47a..000000000
--- a/provisioning/roles/geerlingguy.nodejs/meta/.galaxy_install_info
+++ /dev/null
@@ -1 +0,0 @@
-{install_date: 'Fri Jul 15 19:49:23 2016', version: 3.2.0}
diff --git a/provisioning/roles/geerlingguy.php-memcached/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.php-memcached/meta/.galaxy_install_info
deleted file mode 100644
index d2366c484..000000000
--- a/provisioning/roles/geerlingguy.php-memcached/meta/.galaxy_install_info
+++ /dev/null
@@ -1 +0,0 @@
-{install_date: 'Fri Jul 15 19:49:30 2016', version: 2.0.0}
diff --git a/provisioning/roles/geerlingguy.php-mysql/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.php-mysql/meta/.galaxy_install_info
deleted file mode 100644
index 5c2d3df86..000000000
--- a/provisioning/roles/geerlingguy.php-mysql/meta/.galaxy_install_info
+++ /dev/null
@@ -1 +0,0 @@
-{install_date: 'Fri Jul 15 19:49:34 2016', version: 2.0.0}
diff --git a/provisioning/roles/geerlingguy.php-pecl/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.php-pecl/meta/.galaxy_install_info
deleted file mode 100644
index 65a0492ff..000000000
--- a/provisioning/roles/geerlingguy.php-pecl/meta/.galaxy_install_info
+++ /dev/null
@@ -1 +0,0 @@
-{install_date: 'Fri Jul 15 19:49:37 2016', version: 1.2.1}
diff --git a/provisioning/roles/geerlingguy.php-redis/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.php-redis/meta/.galaxy_install_info
deleted file mode 100644
index 0d0322513..000000000
--- a/provisioning/roles/geerlingguy.php-redis/meta/.galaxy_install_info
+++ /dev/null
@@ -1 +0,0 @@
-{install_date: 'Fri Jul 15 19:49:41 2016', version: 3.0.0}
diff --git a/provisioning/roles/geerlingguy.php-xdebug/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.php-xdebug/meta/.galaxy_install_info
deleted file mode 100644
index ce1859dd6..000000000
--- a/provisioning/roles/geerlingguy.php-xdebug/meta/.galaxy_install_info
+++ /dev/null
@@ -1 +0,0 @@
-{install_date: 'Fri Jul 15 19:49:44 2016', version: 2.1.0}
diff --git a/provisioning/roles/geerlingguy.php-xhprof/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.php-xhprof/meta/.galaxy_install_info
deleted file mode 100644
index 87ecc7639..000000000
--- a/provisioning/roles/geerlingguy.php-xhprof/meta/.galaxy_install_info
+++ /dev/null
@@ -1 +0,0 @@
-{install_date: 'Fri Jul 15 19:49:48 2016', version: 2.1.2}
diff --git a/provisioning/roles/geerlingguy.php/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.php/meta/.galaxy_install_info
deleted file mode 100644
index d879b8800..000000000
--- a/provisioning/roles/geerlingguy.php/meta/.galaxy_install_info
+++ /dev/null
@@ -1 +0,0 @@
-{install_date: 'Fri Jul 15 19:49:27 2016', version: 3.2.2}
diff --git a/provisioning/roles/geerlingguy.pimpmylog/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.pimpmylog/meta/.galaxy_install_info
deleted file mode 100644
index 58bb564f4..000000000
--- a/provisioning/roles/geerlingguy.pimpmylog/meta/.galaxy_install_info
+++ /dev/null
@@ -1 +0,0 @@
-{install_date: 'Fri Jul 15 19:49:51 2016', version: 1.0.2}
diff --git a/provisioning/roles/geerlingguy.postfix/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.postfix/meta/.galaxy_install_info
deleted file mode 100644
index 6d641a107..000000000
--- a/provisioning/roles/geerlingguy.postfix/meta/.galaxy_install_info
+++ /dev/null
@@ -1 +0,0 @@
-{install_date: 'Fri Jul 15 19:49:54 2016', version: 1.1.0}
diff --git a/provisioning/roles/geerlingguy.redis/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.redis/meta/.galaxy_install_info
deleted file mode 100644
index 69c9c0a74..000000000
--- a/provisioning/roles/geerlingguy.redis/meta/.galaxy_install_info
+++ /dev/null
@@ -1 +0,0 @@
-{install_date: 'Fri Jul 15 19:49:59 2016', version: 1.2.0}
diff --git a/provisioning/roles/geerlingguy.repo-remi/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.repo-remi/meta/.galaxy_install_info
deleted file mode 100644
index e363416af..000000000
--- a/provisioning/roles/geerlingguy.repo-remi/meta/.galaxy_install_info
+++ /dev/null
@@ -1 +0,0 @@
-{install_date: 'Fri Jul 15 19:50:02 2016', version: 1.2.0}
diff --git a/provisioning/roles/geerlingguy.ruby/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.ruby/meta/.galaxy_install_info
deleted file mode 100644
index 9f943894f..000000000
--- a/provisioning/roles/geerlingguy.ruby/meta/.galaxy_install_info
+++ /dev/null
@@ -1 +0,0 @@
-{install_date: 'Fri Jul 15 19:50:06 2016', version: 2.3.1}
diff --git a/provisioning/roles/geerlingguy.security/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.security/meta/.galaxy_install_info
deleted file mode 100644
index aa3c5db8e..000000000
--- a/provisioning/roles/geerlingguy.security/meta/.galaxy_install_info
+++ /dev/null
@@ -1 +0,0 @@
-{install_date: 'Fri Jul 15 19:50:09 2016', version: 1.2.0}
diff --git a/provisioning/roles/geerlingguy.solr/.travis.yml b/provisioning/roles/geerlingguy.solr/.travis.yml
index dcf9cf90a..f9c87c8f4 100644
--- a/provisioning/roles/geerlingguy.solr/.travis.yml
+++ b/provisioning/roles/geerlingguy.solr/.travis.yml
@@ -53,8 +53,10 @@ script:
   - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test-solr-${solr_major_version}.yml'
 
   # Test role idempotence.
+  - idempotence=$(mktemp)
+  - sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test-solr-${solr_major_version}.yml | tee -a ${idempotence}
   - >
-    sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test-solr-${solr_major_version}.yml
+    tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
     && (echo 'Idempotence test: pass' && exit 0)
     || (echo 'Idempotence test: fail' && exit 1)
diff --git a/provisioning/roles/geerlingguy.solr/defaults/main.yml b/provisioning/roles/geerlingguy.solr/defaults/main.yml
index 484e58637..f18b751ac 100644
--- a/provisioning/roles/geerlingguy.solr/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.solr/defaults/main.yml
@@ -4,7 +4,7 @@ solr_workspace: /root
 solr_create_user: true
 solr_user: solr
 
-solr_version: "6.0.1"
+solr_version: "6.1.0"
 solr_mirror: "https://archive.apache.org/dist"
 
 solr_service_name: solr
diff --git a/provisioning/roles/geerlingguy.solr/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.solr/meta/.galaxy_install_info
deleted file mode 100644
index 4efeddcd1..000000000
--- a/provisioning/roles/geerlingguy.solr/meta/.galaxy_install_info
+++ /dev/null
@@ -1 +0,0 @@
-{install_date: 'Fri Jul 15 19:50:12 2016', version: 3.1.0}
diff --git a/provisioning/roles/geerlingguy.solr/tasks/install.yml b/provisioning/roles/geerlingguy.solr/tasks/install.yml
index a04201729..c75f0e59c 100644
--- a/provisioning/roles/geerlingguy.solr/tasks/install.yml
+++ b/provisioning/roles/geerlingguy.solr/tasks/install.yml
@@ -13,3 +13,9 @@
     -s {{ solr_service_name }}
     -p {{ solr_port }}
     creates={{ solr_install_dir }}/solr/bin/solr
+  register: solr_install_script_result
+
+# Workaround for bug https://github.com/ansible/ansible-modules-core/issues/915.
+- name: Ensure solr is stopped (RHEL 7 workaround).
+  command: service {{ solr_service_name }} stop
+  when: (ansible_os_family == 'RedHat') and (ansible_distribution_version.split(".")[0] == '7') and (solr_install_script_result.changed)
diff --git a/provisioning/roles/geerlingguy.solr/tests/Dockerfile.centos-7 b/provisioning/roles/geerlingguy.solr/tests/Dockerfile.centos-7
index 8aa065497..75ef801a6 100644
--- a/provisioning/roles/geerlingguy.solr/tests/Dockerfile.centos-7
+++ b/provisioning/roles/geerlingguy.solr/tests/Dockerfile.centos-7
@@ -12,6 +12,9 @@ rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
 rm -f /lib/systemd/system/basic.target.wants/*; \
 rm -f /lib/systemd/system/anaconda.target.wants/*;
 
+# Install initscripts
+RUN yum -y install initscripts
+
 # Install Ansible
 RUN yum -y install epel-release
 RUN yum -y install git ansible sudo
diff --git a/provisioning/roles/geerlingguy.solr/tests/test-solr-5.yml b/provisioning/roles/geerlingguy.solr/tests/test-solr-5.yml
index 19ec04197..9dcb9ee72 100644
--- a/provisioning/roles/geerlingguy.solr/tests/test-solr-5.yml
+++ b/provisioning/roles/geerlingguy.solr/tests/test-solr-5.yml
@@ -2,7 +2,7 @@
 - hosts: all
 
   vars:
-    solr_version: "5.5.1"
+    solr_version: "5.5.2"
     java_packages:
       - openjdk-7-jdk
 
diff --git a/provisioning/roles/geerlingguy.varnish/meta/.galaxy_install_info b/provisioning/roles/geerlingguy.varnish/meta/.galaxy_install_info
deleted file mode 100644
index 517aabb19..000000000
--- a/provisioning/roles/geerlingguy.varnish/meta/.galaxy_install_info
+++ /dev/null
@@ -1 +0,0 @@
-{install_date: 'Fri Jul 15 19:50:16 2016', version: 1.6.1}

From 76b32c5155dba53290fd2660d167d80d78864a83 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 24 Jul 2016 19:38:32 -0500
Subject: [PATCH 0390/1273] Bump Solr role to 3.1.3.

---
 provisioning/requirements.yml                         | 2 +-
 provisioning/roles/geerlingguy.solr/tasks/install.yml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index c04a13494..94289ff21 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -64,6 +64,6 @@
 - src: geerlingguy.security
   version: 1.2.0
 - src: geerlingguy.solr
-  version: 3.1.2
+  version: 3.1.3
 - src: geerlingguy.varnish
   version: 1.6.1
diff --git a/provisioning/roles/geerlingguy.solr/tasks/install.yml b/provisioning/roles/geerlingguy.solr/tasks/install.yml
index c75f0e59c..72910cbd6 100644
--- a/provisioning/roles/geerlingguy.solr/tasks/install.yml
+++ b/provisioning/roles/geerlingguy.solr/tasks/install.yml
@@ -19,3 +19,4 @@
 - name: Ensure solr is stopped (RHEL 7 workaround).
   command: service {{ solr_service_name }} stop
   when: (ansible_os_family == 'RedHat') and (ansible_distribution_version.split(".")[0] == '7') and (solr_install_script_result.changed)
+  failed_when: false

From 0eed23b3c9f135dbd1e05b4622cae3f764522dbc Mon Sep 17 00:00:00 2001
From: Yaroslav <rayz93@rambler.ru>
Date: Tue, 26 Jul 2016 10:04:30 +0300
Subject: [PATCH 0391/1273] Update dashboard.html.j2

---
 provisioning/templates/dashboard.html.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/templates/dashboard.html.j2 b/provisioning/templates/dashboard.html.j2
index 564996867..8e097ee87 100644
--- a/provisioning/templates/dashboard.html.j2
+++ b/provisioning/templates/dashboard.html.j2
@@ -111,7 +111,7 @@
               {%- endfor -%}
             {%- endfor -%}
           {%- endif %}
-          <tr><td colspan=3><small>*Note: If Ansible isn't installed installed on your host, Drush aliases are only created inside the VM.</small></td></tr>
+          <tr><td colspan=3><small>*Note: If Ansible isn't installed on your host, Drush aliases are only created inside the VM.</small></td></tr>
         </tbody>
       </table>
     {%- endmacro -%}

From 956b427a4323e59ec5e6c9620247bdbca85c2652 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 26 Jul 2016 21:30:26 -0500
Subject: [PATCH 0392/1273] Issue #799: Quote the Drupal core version to
 prevent duck typing problems.

---
 example.drupal.make.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/example.drupal.make.yml b/example.drupal.make.yml
index 942c48f2d..b385e4b0a 100644
--- a/example.drupal.make.yml
+++ b/example.drupal.make.yml
@@ -11,7 +11,7 @@ projects:
 
   # Core.
   drupal:
-    version: 8.1
+    version: "8.1"
     # Use this if you need a working git repository of Drupal core instead of
     # the latest stable.
     # type: "core"

From dcf071a06c630d7bd46f3cfa4be5ba21a4c5dfcc Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 26 Jul 2016 21:33:14 -0500
Subject: [PATCH 0393/1273] Fix failing tests - set 'latest' version for Drupal
 core release.

---
 example.drupal.make.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/example.drupal.make.yml b/example.drupal.make.yml
index b385e4b0a..e4953a625 100644
--- a/example.drupal.make.yml
+++ b/example.drupal.make.yml
@@ -11,7 +11,7 @@ projects:
 
   # Core.
   drupal:
-    version: "8.1"
+    version: "~"
     # Use this if you need a working git repository of Drupal core instead of
     # the latest stable.
     # type: "core"

From bfb50bb1d8ed196ecd396655daf113ad87141402 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 26 Jul 2016 21:47:47 -0500
Subject: [PATCH 0394/1273] Set an explicit version - "8.1" isn't working, nor
 is "~".

---
 example.drupal.make.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/example.drupal.make.yml b/example.drupal.make.yml
index e4953a625..a6bd3566c 100644
--- a/example.drupal.make.yml
+++ b/example.drupal.make.yml
@@ -11,7 +11,7 @@ projects:
 
   # Core.
   drupal:
-    version: "~"
+    version: "8.1.7"
     # Use this if you need a working git repository of Drupal core instead of
     # the latest stable.
     # type: "core"

From 743dc57bfb949db39262ad814cc3601c9bb7d323 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 27 Jul 2016 20:10:23 -0700
Subject: [PATCH 0395/1273] Use UTF8mb4 default collation and encoding for
 default database.

---
 default.config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/default.config.yml b/default.config.yml
index 230ddcdef..4426a76fb 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -160,8 +160,8 @@ nginx_ppa_use: true
 # be used for the site.
 mysql_databases:
   - name: "{{ drupal_mysql_database }}"
-    encoding: utf8
-    collation: utf8_general_ci
+    encoding: utf8mb4
+    collation: utf8mb4_general_ci
 
 mysql_users:
   - name: "{{ drupal_mysql_user }}"

From a4f658ff6104545d2e29bc5be85d06e2339f5c54 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 27 Jul 2016 20:54:31 -0700
Subject: [PATCH 0396/1273] Bump MySQL role to 2.3.1.

---
 provisioning/requirements.yml                          | 2 +-
 provisioning/roles/geerlingguy.mysql/vars/Debian.yml   | 2 +-
 provisioning/roles/geerlingguy.mysql/vars/RedHat-7.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 94289ff21..def5ae627 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -32,7 +32,7 @@
 - src: geerlingguy.memcached
   version: 1.0.4
 - src: geerlingguy.mysql
-  version: 2.3.0
+  version: 2.3.1
 - src: geerlingguy.nginx
   version: 1.9.2
 - src: geerlingguy.nodejs
diff --git a/provisioning/roles/geerlingguy.mysql/vars/Debian.yml b/provisioning/roles/geerlingguy.mysql/vars/Debian.yml
index e191526e0..6eed79ccd 100644
--- a/provisioning/roles/geerlingguy.mysql/vars/Debian.yml
+++ b/provisioning/roles/geerlingguy.mysql/vars/Debian.yml
@@ -7,4 +7,4 @@ __mysql_slow_query_log_file: /var/log/mysql/mysql-slow.log
 mysql_config_file: /etc/mysql/my.cnf
 mysql_config_include_dir: /etc/mysql/conf.d
 mysql_socket: /var/run/mysqld/mysqld.sock
-mysql_supports_innodb_large_prefix: false
+mysql_supports_innodb_large_prefix: true
diff --git a/provisioning/roles/geerlingguy.mysql/vars/RedHat-7.yml b/provisioning/roles/geerlingguy.mysql/vars/RedHat-7.yml
index 60cefcd91..c026c99ce 100644
--- a/provisioning/roles/geerlingguy.mysql/vars/RedHat-7.yml
+++ b/provisioning/roles/geerlingguy.mysql/vars/RedHat-7.yml
@@ -13,4 +13,4 @@ mysql_pid_file: /var/run/mariadb/mariadb.pid
 mysql_config_file: /etc/my.cnf
 mysql_config_include_dir: /etc/my.cnf.d
 mysql_socket: /var/lib/mysql/mysql.sock
-mysql_supports_innodb_large_prefix: false
+mysql_supports_innodb_large_prefix: true

From 83f132312ad9898210915b1dcdb47ca85318b910 Mon Sep 17 00:00:00 2001
From: Joe Stewart <joe@joestewartjr.com>
Date: Sun, 31 Jul 2016 07:31:21 -0500
Subject: [PATCH 0397/1273] Check if VAGRANTFILE_API_VERSION is already
 defined.

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

diff --git a/Vagrantfile b/Vagrantfile
index 5166466fa..9936b69ab 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,6 +1,6 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
-VAGRANTFILE_API_VERSION = '2'
+VAGRANTFILE_API_VERSION = '2' unless defined? VAGRANTFILE_API_VERSION
 Vagrant.require_version '>= 1.8.1'
 
 # Absolute paths on the host machine.

From d0db425210f60b277b1b0d3a1ed8db36c842f165 Mon Sep 17 00:00:00 2001
From: MN DNR Dev <mndnrdev@gmail.com>
Date: Fri, 5 Aug 2016 12:48:59 -0500
Subject: [PATCH 0398/1273] added /web to the directory

---
 docs/extras/drupal-console.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/extras/drupal-console.md b/docs/extras/drupal-console.md
index dc2e7f564..253470830 100644
--- a/docs/extras/drupal-console.md
+++ b/docs/extras/drupal-console.md
@@ -5,13 +5,13 @@ Drupal VM will automatically install Drupal Console if you install Drupal 8 or l
 To use Drupal Console with a Drupal 8 site (in this case, using the default configuration that ships with Drupal VM):
 
   1. Log into the VM with `vagrant ssh`.
-  2. Change directory to the Drupal site's document root: `cd /var/www/drupalvm/drupal`.
+  2. Change directory to the Drupal site's document root: `cd /var/www/drupalvm/drupal/web`.
   3. Use Drupal console (e.g. `drupal cache:rebuild all`).
 
 You should see an output like:
 
 ```
-vagrant@drupalvm:/var/www/drupalvm/drupal$ drupal cache:rebuild all
+vagrant@drupalvm:/var/www/drupalvm/drupal/web$ drupal cache:rebuild all
 
 [+] Rebuilding cache(s), wait a moment please.
 [+] Done clearing cache(s).

From 367a4a5f918888e2f8a3df90c181fb47c1caf9e8 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 5 Aug 2016 17:08:33 -0500
Subject: [PATCH 0399/1273] Fixes #846: Update default version to 8.1.8 in
 example.drupal.make.yml.

---
 example.drupal.make.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/example.drupal.make.yml b/example.drupal.make.yml
index a6bd3566c..0fba08d49 100644
--- a/example.drupal.make.yml
+++ b/example.drupal.make.yml
@@ -11,7 +11,7 @@ projects:
 
   # Core.
   drupal:
-    version: "8.1.7"
+    version: "8.1.8"
     # Use this if you need a working git repository of Drupal core instead of
     # the latest stable.
     # type: "core"

From e986ab2d267e6206e5e1397d1859aeb5858b7fbd Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 9 Aug 2016 22:06:17 -0500
Subject: [PATCH 0400/1273] Fixes #856: NGINX 120 second hard PHP timeout.

---
 provisioning/templates/nginx-vhost.conf.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/templates/nginx-vhost.conf.j2 b/provisioning/templates/nginx-vhost.conf.j2
index 44f84bd58..ad7747f86 100644
--- a/provisioning/templates/nginx-vhost.conf.j2
+++ b/provisioning/templates/nginx-vhost.conf.j2
@@ -32,7 +32,7 @@ server {
         fastcgi_index index.php;
         fastcgi_param SCRIPT_FILENAME $request_filename;
         fastcgi_intercept_errors on;
-        fastcgi_read_timeout 120;
+        fastcgi_read_timeout {{ php_max_execution_time }};
         include fastcgi_params;
         fastcgi_pass {{ php_fpm_listen }};
     }

From 9930333f2314fc642b827dc00d7a857e08c64e0e Mon Sep 17 00:00:00 2001
From: Steven <stevenspasbo@gmail.com>
Date: Wed, 10 Aug 2016 16:49:44 -0700
Subject: [PATCH 0401/1273] Only set mysql_enablerepo when not defined

---
 provisioning/tasks/init-redhat.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/provisioning/tasks/init-redhat.yml b/provisioning/tasks/init-redhat.yml
index 387a02353..988040ba0 100644
--- a/provisioning/tasks/init-redhat.yml
+++ b/provisioning/tasks/init-redhat.yml
@@ -9,6 +9,7 @@
 
 - name: Enable remi repo for MySQL.
   set_fact: mysql_enablerepo="remi"
+  when: mysql_enablerepo is not defined
 
 - name: Enable remi repo for PHP 5.5.
   set_fact: php_enablerepo="remi,remi-php55"

From bf50b9e087bc06d4bc7903f47388951fa851b964 Mon Sep 17 00:00:00 2001
From: Scott Rigby <scott@r6by.com>
Date: Mon, 15 Aug 2016 22:05:44 -0400
Subject: [PATCH 0402/1273] Update default Selenium version to latest. Fixes
 #843

---
 default.config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.config.yml b/default.config.yml
index 4426a76fb..b2d3fbac3 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -290,7 +290,7 @@ solr_xms: "64M"
 solr_xmx: "128M"
 
 # Selenium configuration.
-selenium_version: 2.46.0
+selenium_version: 2.53.0
 
 # Other configuration.
 dashboard_install_dir: /var/www/dashboard

From 7116a237630e0281e82ba913535c4b6641d1d0b3 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 16 Aug 2016 15:13:24 -0500
Subject: [PATCH 0403/1273] Bump all role requirements to latest versions.

---
 provisioning/requirements.yml                 |  10 +-
 .../roles/franklinkim.newrelic/CHANGELOG.md   |  26 +++
 .../roles/franklinkim.newrelic/README.md      |  11 +-
 .../franklinkim.newrelic/defaults/main.yml    |   4 +
 .../roles/franklinkim.newrelic/meta/main.yml  | 210 +++++++++++-------
 .../templates/etc/newrelic/nrsysmond.cfg.j2   |  14 ++
 .../roles/geerlingguy.drush/meta/main.yml     |  62 +++---
 .../roles/geerlingguy.drush/tasks/main.yml    |   1 +
 .../roles/geerlingguy.drush/tests/test.yml    |   3 +
 .../geerlingguy.elasticsearch/meta/main.yml   |   2 +-
 .../roles/geerlingguy.nginx/README.md         |   4 +
 .../roles/geerlingguy.nginx/defaults/main.yml |   1 +
 .../roles/geerlingguy.nginx/tasks/vhosts.yml  |   5 +-
 .../roles/geerlingguy.security/README.md      |  12 +-
 .../geerlingguy.security/defaults/main.yml    |  10 +
 .../roles/geerlingguy.security/tasks/ssh.yml  |  10 +
 .../templates/50unattended-upgrades.j2        |   7 +
 17 files changed, 260 insertions(+), 132 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index def5ae627..c3abb735b 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -2,7 +2,7 @@
 - src: arknoll.selenium
   version: 1.3.0
 - src: franklinkim.newrelic
-  version: 1.2.0
+  version: 1.4.0
 - src: geerlingguy.adminer
   version: 1.1.0
 - src: geerlingguy.apache
@@ -18,9 +18,9 @@
 - src: geerlingguy.drupal-console
   version: 1.0.7
 - src: geerlingguy.drush
-  version: 1.1.2
+  version: 1.1.3
 - src: geerlingguy.elasticsearch
-  version: 2.1.0
+  version: 2.1.1
 - src: geerlingguy.firewall
   version: 1.0.9
 - src: geerlingguy.git
@@ -34,7 +34,7 @@
 - src: geerlingguy.mysql
   version: 2.3.1
 - src: geerlingguy.nginx
-  version: 1.9.2
+  version: 1.9.3
 - src: geerlingguy.nodejs
   version: 3.2.0
 - src: geerlingguy.php
@@ -62,7 +62,7 @@
 - src: geerlingguy.ruby
   version: 2.3.1
 - src: geerlingguy.security
-  version: 1.2.0
+  version: 1.4.0
 - src: geerlingguy.solr
   version: 3.1.3
 - src: geerlingguy.varnish
diff --git a/provisioning/roles/franklinkim.newrelic/CHANGELOG.md b/provisioning/roles/franklinkim.newrelic/CHANGELOG.md
index 2b6672b66..eded3d13a 100644
--- a/provisioning/roles/franklinkim.newrelic/CHANGELOG.md
+++ b/provisioning/roles/franklinkim.newrelic/CHANGELOG.md
@@ -1,3 +1,29 @@
+<a name="1.4.0"></a>
+## 1.4.0 (2016-08-05)
+
+
+#### Features
+
+*   add label settings ([169d3867](https://github.com/weareinteractive/ansible-newrelic/commit/169d386710aba0d7d1397cb68ef7f8426d1fac80))
+
+
+
+<a name="1.3.0"></a>
+## 1.3.0 (2016-07-04)
+
+
+
+
+<a name="1.2.1"></a>
+### 1.2.1 (2016-04-10)
+
+
+#### Bug Fixes
+
+*   default groups breaks install when docker monitoring is enabled ([3e507b30](https://github.com/weareinteractive/ansible-newrelic/commit/3e507b3080fa8040a3659577f1bdc25c3d97508a))
+
+
+
 <a name="1.2.0"></a>
 ## 1.2.0 (2016-02-13)
 
diff --git a/provisioning/roles/franklinkim.newrelic/README.md b/provisioning/roles/franklinkim.newrelic/README.md
index 9650109b1..5b4902f72 100644
--- a/provisioning/roles/franklinkim.newrelic/README.md
+++ b/provisioning/roles/franklinkim.newrelic/README.md
@@ -33,7 +33,7 @@ $ git clone https://github.com/weareinteractive/ansible-newrelic.git franklinkim
 
 ## Dependencies
 
-* Ansible >= 1.9
+* Ansible >= 2.0
 
 ## Variables
 
@@ -62,6 +62,10 @@ newrelic_disable_docker: yes
 newrelic_service_enabled: yes
 # current state: started, stopped
 newrelic_service_state: started
+# use default hostname, set a value to override the default hostname
+newrelic_override_hostname: ~
+# A series of label_type/label_value pairings: label_type:label_value
+newrelic_labels: ~
 
 ```
 
@@ -99,16 +103,17 @@ This is an example playbook:
 
 ```
 
+
 ## Testing
 
 ```shell
 $ git clone https://github.com/weareinteractive/ansible-newrelic.git
 $ cd ansible-newrelic
-$ vagrant up
+$ make test
 ```
 
 ## Contributing
-In lieu of a formal styleguide, take care to maintain the existing coding style. Add unit tests and examples for any new or changed functionality.
+In lieu of a formal style guide, take care to maintain the existing coding style. Add unit tests and examples for any new or changed functionality.
 
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)
diff --git a/provisioning/roles/franklinkim.newrelic/defaults/main.yml b/provisioning/roles/franklinkim.newrelic/defaults/main.yml
index 7195e1f1c..6ce045658 100644
--- a/provisioning/roles/franklinkim.newrelic/defaults/main.yml
+++ b/provisioning/roles/franklinkim.newrelic/defaults/main.yml
@@ -20,3 +20,7 @@ newrelic_disable_docker: yes
 newrelic_service_enabled: yes
 # current state: started, stopped
 newrelic_service_state: started
+# use default hostname, set a value to override the default hostname
+newrelic_override_hostname: ~
+# A series of label_type/label_value pairings: label_type:label_value
+newrelic_labels: ~
diff --git a/provisioning/roles/franklinkim.newrelic/meta/main.yml b/provisioning/roles/franklinkim.newrelic/meta/main.yml
index a1cbde7de..89849bcf4 100644
--- a/provisioning/roles/franklinkim.newrelic/meta/main.yml
+++ b/provisioning/roles/franklinkim.newrelic/meta/main.yml
@@ -3,102 +3,140 @@ galaxy_info:
   author: franklin
   company: We Are Interactive
   description: Installs and configure newrelic
-  min_ansible_version: 1.9
+  min_ansible_version: 2.0
   license: MIT
+  # Optionally specify the branch Galaxy will use when accessing the GitHub
+  # repo for this role. During role install, if no tags are available,
+  # Galaxy will use this branch. During import Galaxy will access files on
+  # this branch. If travis integration is cofigured, only notification for this
+  # branch will be accepted. Otherwise, in all cases, the repo's default branch
+  # (usually master) will be used.
+  github_branch: master
   #
   # Below are all platforms currently available. Just uncomment
   # the ones that apply to your role. If you don't see your
   # platform on this list, let us know and we'll get it added!
   #
   platforms:
-    - name: EL
-      versions:
-  #      - all
-  #      - 5
-  #      - 6
-        - 7
-  #  - name: GenericUNIX
-  #    versions:
-  #      - all
-  #      - any
-  #  - name: Fedora
-  #    versions:
-  #      - all
-  #      - 16
-  #      - 17
-  #      - 18
-  #      - 19
-  #      - 20
-  #  - name: opensuse
-  #    versions:
-  #      - all
-  #      - 12.1
-  #      - 12.2
-  #      - 12.3
-  #      - 13.1
-  #      - 13.2
-  #  - name: GenericBSD
-  #    versions:
-  #      - all
-  #      - any
-  #  - name: FreeBSD
-  #    versions:
-  #      - all
-  #      - 8.0
-  #      - 8.1
-  #      - 8.2
-  #      - 8.3
-  #      - 8.4
-  #      - 9.0
-  #      - 9.1
-  #      - 9.1
-  #      - 9.2
-    - name: Ubuntu
-      versions:
-        - all
-  #      - lucid
-  #      - maverick
-  #      - natty
-  #      - oneiric
-  #      - precise
-  #      - quantal
-  #      - raring
-  #      - saucy
-  #      - trusty
-  #  - name: SLES
-  #    versions:
-  #      - all
-  #      - 10SP3
-  #      - 10SP4
-  #      - 11
-  #      - 11SP1
-  #      - 11SP2
-  #      - 11SP3
-  #  - name: GenericLinux
-  #    versions:
-  #      - all
-  #      - any
-    - name: Debian
-      versions:
-        - all
-  #      - etch
-  #      - lenny
-  #      - squeeze
-  #      - wheezy
+  - name: EL
+    versions:
+    - all
+  #  - 5
+  #  - 6
+  #  - 7
+  #- name: GenericUNIX
+  #  versions:
+  #  - all
+  #  - any
+  #- name: Solaris
+  #  versions:
+  #  - all
+  #  - 10
+  #  - 11.0
+  #  - 11.1
+  #  - 11.2
+  #  - 11.3
+  #- name: Fedora
+  #  versions:
+  #  - all
+  #  - 16
+  #  - 17
+  #  - 18
+  #  - 19
+  #  - 20
+  #  - 21
+  #  - 22
+  #  - 23
+  #- name: Windows
+  #  versions:
+  #  - all
+  #  - 2012R2
+  #- name: SmartOS
+  #  versions:
+  #  - all
+  #  - any
+  #- name: opensuse
+  #  versions:
+  #  - all
+  #  - 12.1
+  #  - 12.2
+  #  - 12.3
+  #  - 13.1
+  #  - 13.2
+  #- name: Amazon
+  #  versions:
+  #  - all
+  #  - 2013.03
+  #  - 2013.09
+  #- name: GenericBSD
+  #  versions:
+  #  - all
+  #  - any
+  #- name: FreeBSD
+  #  versions:
+  #  - all
+  #  - 10.0
+  #  - 10.1
+  #  - 10.2
+  #  - 8.0
+  #  - 8.1
+  #  - 8.2
+  #  - 8.3
+  #  - 8.4
+  #  - 9.0
+  #  - 9.1
+  #  - 9.1
+  #  - 9.2
+  #  - 9.3
+  - name: Ubuntu
+    versions:
+    - all
+  #  - lucid
+  #  - maverick
+  #  - natty
+  #  - oneiric
+  #  - precise
+  #  - quantal
+  #  - raring
+  #  - saucy
+  #  - trusty
+  #  - utopic
+  #  - vivid
+  #  - wily
+  #- name: SLES
+  #  versions:
+  #  - all
+  #  - 10SP3
+  #  - 10SP4
+  #  - 11
+  #  - 11SP1
+  #  - 11SP2
+  #  - 11SP3
+  #- name: GenericLinux
+  #  versions:
+  #  - all
+  #  - any
+  - name: Debian
+    versions:
+    - all
+  #  - etch
+  #  - jessie
+  #  - lenny
+  #  - squeeze
+  #  - wheezy  categories:
   #
-  # Below are all categories currently available. Just as with
-  # the platforms above, uncomment those that apply to your role.
-  #
-  # The number of tags imported by Galaxy is limited to 20,
-  # and tag values containing non-alphanumeric characters will be ignored.
-  # Tag values containing a : will be split into multiple tags.
-  # The tag cloud:ec2, for example, will become two tags: cloud and ec2.
+  # List tags for your role here, one per line. A tag is
+  # a keyword that describes and categorizes the role.
+  # Users find roles by searching for tags. Be sure to
+  # remove the '[]' above if you add tags to this list.
   #
+  # NOTE: A tag is limited to a single word comprised of
+  # alphanumeric characters. Maximum 20 tags per role.
   galaxy_tags:
     - monitoring
     - newrelic
+# List your role dependencies here, one per line. Only
+# dependencies available via galaxy should be listed here.
+# Be sure to remove the '[]' above if you add dependencies
+# to this list.
 dependencies: []
-  # List your role dependencies here, one per line. Only
-  # dependencies available via galaxy should be listed here.
-  # Be sure to remove the '[]' above if you add dependencies
-  # to this list.
diff --git a/provisioning/roles/franklinkim.newrelic/templates/etc/newrelic/nrsysmond.cfg.j2 b/provisioning/roles/franklinkim.newrelic/templates/etc/newrelic/nrsysmond.cfg.j2
index 4185604f3..37a8eac3a 100644
--- a/provisioning/roles/franklinkim.newrelic/templates/etc/newrelic/nrsysmond.cfg.j2
+++ b/provisioning/roles/franklinkim.newrelic/templates/etc/newrelic/nrsysmond.cfg.j2
@@ -187,6 +187,9 @@ logfile={{ newrelic_logfile }}
 # Default: none
 #
 #labels=label_type:label_value
+{% if newrelic_labels %}
+labels={{ newrelic_labels }}
+{% endif %}
 
 #
 # Option : disable_nfs
@@ -203,3 +206,14 @@ disable_nfs={{ newrelic_disable_nfs | to_nice_json }}
 # Default: false
 #
 disable_docker={{ newrelic_disable_docker | to_nice_json }}
+
+#
+# Option : override_hostname
+# Type   : string
+# Value  : Set to a non-empty value to use as the hostname that will be reported to New Relic
+# Default: none
+#
+#hostname=newrelic.com
+{% if newrelic_override_hostname %}
+hostname={{ newrelic_override_hostname }}
+{% endif %}
diff --git a/provisioning/roles/geerlingguy.drush/meta/main.yml b/provisioning/roles/geerlingguy.drush/meta/main.yml
index 46be0d34d..0e0d58174 100644
--- a/provisioning/roles/geerlingguy.drush/meta/main.yml
+++ b/provisioning/roles/geerlingguy.drush/meta/main.yml
@@ -11,36 +11,36 @@ galaxy_info:
   license: "license (BSD, MIT)"
   min_ansible_version: 1.4
   platforms:
-  - name: EL
-    versions:
-    - all
-  - name: GenericUNIX
-    versions:
-    - all
-  - name: Fedora
-    versions:
-    - all
-  - name: opensuse
-    versions:
-    - all
-  - name: GenericBSD
-    versions:
-    - all
-  - name: FreeBSD
-    versions:
-    - all
-  - name: Ubuntu
-    versions:
-    - all
-  - name: SLES
-    versions:
-    - all
-  - name: GenericLinux
-    versions:
-    - all
-  - name: Debian
-    versions:
-    - all
-  categories:
+    - name: EL
+      versions:
+      - all
+    - name: GenericUNIX
+      versions:
+      - all
+    - name: Fedora
+      versions:
+      - all
+    - name: opensuse
+      versions:
+      - all
+    - name: GenericBSD
+      versions:
+      - all
+    - name: FreeBSD
+      versions:
+      - all
+    - name: Ubuntu
+      versions:
+      - all
+    - name: SLES
+      versions:
+      - all
+    - name: GenericLinux
+      versions:
+      - all
+    - name: Debian
+      versions:
+      - all
+  galaxy_tags:
     - development
     - web
diff --git a/provisioning/roles/geerlingguy.drush/tasks/main.yml b/provisioning/roles/geerlingguy.drush/tasks/main.yml
index 5b907aa64..287fa6505 100644
--- a/provisioning/roles/geerlingguy.drush/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.drush/tasks/main.yml
@@ -35,3 +35,4 @@
   command: "{{ drush_path }}"
   register: drush_result
   changed_when: "'Execute a drush command' not in drush_result.stdout"
+  become: no
diff --git a/provisioning/roles/geerlingguy.drush/tests/test.yml b/provisioning/roles/geerlingguy.drush/tests/test.yml
index df2c5033f..da27b634a 100644
--- a/provisioning/roles/geerlingguy.drush/tests/test.yml
+++ b/provisioning/roles/geerlingguy.drush/tests/test.yml
@@ -1,8 +1,11 @@
 ---
 - hosts: localhost
   remote_user: root
+
   vars:
+    php_enable_webserver: false
     php_opcache_enable: "0"
+
   roles:
     - geerlingguy.php
     - geerlingguy.composer
diff --git a/provisioning/roles/geerlingguy.elasticsearch/meta/main.yml b/provisioning/roles/geerlingguy.elasticsearch/meta/main.yml
index 8285a4b94..5be9d380b 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/meta/main.yml
+++ b/provisioning/roles/geerlingguy.elasticsearch/meta/main.yml
@@ -1,6 +1,6 @@
 ---
 dependencies:
-  - { role: geerlingguy.java }
+  - geerlingguy.java
 
 galaxy_info:
   author: geerlingguy
diff --git a/provisioning/roles/geerlingguy.nginx/README.md b/provisioning/roles/geerlingguy.nginx/README.md
index 854fa3294..e19da5b00 100644
--- a/provisioning/roles/geerlingguy.nginx/README.md
+++ b/provisioning/roles/geerlingguy.nginx/README.md
@@ -41,6 +41,10 @@ An example of a fully-populated nginx_vhosts entry, using a `|` to declare a blo
 
 Whether to remove the 'default' virtualhost configuration supplied by Nginx. Useful if you want the base `/` URL to be directed at one of your own virtual hosts configured in a separate .conf file.
 
+    nginx_vhosts_filename: "vhosts.conf"
+
+The filename to use to store vhosts configuration. If you run the role multiple times (e.g. include the role with `with_items`), you can change the name for each run, effectively creating a separate vhosts file per vhost configuration.
+
     nginx_upstreams: []
 
 If you are configuring Nginx as a load balancer, you can define one or more upstream sets using this variable. In addition to defining at least one upstream, you would need to configure one of your server blocks to proxy requests through the defined upstream (e.g. `proxy_pass http://myapp1;`). See the commented example in `defaults/main.yml` for more information.
diff --git a/provisioning/roles/geerlingguy.nginx/defaults/main.yml b/provisioning/roles/geerlingguy.nginx/defaults/main.yml
index 620dc098e..f0bda616b 100644
--- a/provisioning/roles/geerlingguy.nginx/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.nginx/defaults/main.yml
@@ -45,6 +45,7 @@ nginx_extra_http_options: ""
 #      proxy_set_header   Host $http_host;
 
 nginx_remove_default_vhost: false
+nginx_vhosts_filename: "vhosts.conf"
 nginx_vhosts: []
 # Example vhost below, showing all available options:
 # - listen: "80 default_server" # default: "80 default_server"
diff --git a/provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml b/provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml
index 583ff7773..1be63942f 100644
--- a/provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml
+++ b/provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml
@@ -10,7 +10,7 @@
 - name: Add managed vhost config file (if any vhosts are configured).
   template:
     src: vhosts.j2
-    dest: "{{ nginx_vhost_path }}/vhosts.conf"
+    dest: "{{ nginx_vhost_path }}/{{ nginx_vhosts_filename }}"
     mode: 0644
   when: nginx_vhosts|length > 0
   notify:
@@ -18,9 +18,8 @@
 
 - name: Remove managed vhost config file (if no vhosts are configured).
   file:
-    path: "{{ nginx_vhost_path }}/vhosts.conf"
+    path: "{{ nginx_vhost_path }}/{{ nginx_vhosts_filename }}"
     state: absent
   when: nginx_vhosts|length == 0
   notify:
     - reload nginx
-
diff --git a/provisioning/roles/geerlingguy.security/README.md b/provisioning/roles/geerlingguy.security/README.md
index 15afb12f1..0c8974b5c 100644
--- a/provisioning/roles/geerlingguy.security/README.md
+++ b/provisioning/roles/geerlingguy.security/README.md
@@ -34,10 +34,11 @@ Available variables are listed below, along with default values (see `defaults/m
 
 The port through which you'd like SSH to be accessible. The default is port 22, but if you're operating a server on the open internet, and have no firewall blocking access to port 22, you'll quickly find that thousands of login attempts per day are not uncommon. You can change the port to a nonstandard port (e.g. 2849) if you want to avoid these thousands of automated penetration attempts.
 
-    security_ssh_password_authentication: 'no'
-    security_ssh_permit_root_login: 'no'
+    security_ssh_password_authentication: "no"
+    security_ssh_permit_root_login: "no"
+    security_ssh_usedns: "no"
 
-Security settings for SSH authentication. It's best to leave these both set to `'no'`, but there are times (especially during initial server configuration or when you don't have key-based authentication in place) when one or both may be safely set to `'yes'`.
+Security settings for SSH authentication. It's best to leave these set to `"no"`, but there are times (especially during initial server configuration or when you don't have key-based authentication in place) when one or all may be safely set to `'yes'`.
 
     security_sudoers_passwordless: []
     security_sudoers_passworded: []
@@ -48,6 +49,11 @@ A list of users who should be added to the sudoers file so they can run any comm
 
 Whether to install/enable `yum-cron` (RedHat-based systems) or `unattended-upgrades` (Debian-based systems). System restarts will not happen automatically in any case, and automatic upgrades are no excuse for sloppy patch and package management, but automatic updates can be helpful as yet another security measure.
 
+    security_autoupdate_mail_to: ""
+    security_autoupdate_mail_on_error: true
+
+(Debian/Ubuntu only) If `security_autoupdate_mail_to` is set to an non empty value, unattended upgrades will send an e-mail to that address when some error occurs. You may either set this to a full email: `ops@example.com` or to something like `root`, which will use `/etc/aliases` to route the message. If you set `security_autoupdate_mail_on_error` to `false` you'll get an email after every package install.
+
     security_fail2ban_enabled: true
 
 Wether to install/enable `fail2ban`. You might not want to use fail2ban if you're already using some other service for login and intrusion detection (e.g. [ConfigServer](http://configserver.com/cp/csf.html)).
diff --git a/provisioning/roles/geerlingguy.security/defaults/main.yml b/provisioning/roles/geerlingguy.security/defaults/main.yml
index 9954803c9..6caf48817 100644
--- a/provisioning/roles/geerlingguy.security/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.security/defaults/main.yml
@@ -2,9 +2,19 @@
 security_ssh_port: 22
 security_ssh_password_authentication: "no"
 security_ssh_permit_root_login: "no"
+security_ssh_usedns: "no"
+security_ssh_permit_empty_password: "no"
+security_ssh_challenge_response_auth: "no"
+security_ssh_gss_api_authentication: "no"
+security_ssh_x11_forwarding: "no"
 
 security_sudoers_passwordless: []
 security_sudoers_passworded: []
 
 security_autoupdate_enabled: true
+
+# Autoupdate mail settings used on Debian/Ubuntu only.
+security_autoupdate_mail_to: ""
+security_autoupdate_mail_on_error: true
+
 security_fail2ban_enabled: true
diff --git a/provisioning/roles/geerlingguy.security/tasks/ssh.yml b/provisioning/roles/geerlingguy.security/tasks/ssh.yml
index 57f53f4a2..0f85032c3 100644
--- a/provisioning/roles/geerlingguy.security/tasks/ssh.yml
+++ b/provisioning/roles/geerlingguy.security/tasks/ssh.yml
@@ -12,6 +12,16 @@
       line: "PermitRootLogin {{ security_ssh_permit_root_login }}"
     - regexp: "^Port"
       line: "Port {{ security_ssh_port }}"
+    - regexp: "^UseDNS"
+      line: "UseDNS {{ security_ssh_usedns }}"
+    - regexp: "^PermitEmptyPasswords"
+      line: "PermitEmptyPasswords {{ security_ssh_permit_empty_password }}"
+    - regexp: "^ChallengeResponseAuthentication"
+      line: "ChallengeResponseAuthentication {{ security_ssh_challenge_response_auth }}"
+    - regexp: "^GSSAPIAuthentication"
+      line: "GSSAPIAuthentication {{ security_ssh_gss_api_authentication }}"
+    - regexp: "^X11Forwarding"
+      line: "X11Forwarding {{ security_ssh_x11_forwarding }}"
   notify: restart ssh
 
 - name: Add configured user accounts to passwordless sudoers.
diff --git a/provisioning/roles/geerlingguy.security/templates/50unattended-upgrades.j2 b/provisioning/roles/geerlingguy.security/templates/50unattended-upgrades.j2
index c1b7d48df..59e01cdbb 100644
--- a/provisioning/roles/geerlingguy.security/templates/50unattended-upgrades.j2
+++ b/provisioning/roles/geerlingguy.security/templates/50unattended-upgrades.j2
@@ -1,5 +1,12 @@
 Unattended-Upgrade::Automatic-Reboot "false";
 
+{% if security_autoupdate_mail_to %}
+Unattended-Upgrade::Mail "{{ security_autoupdate_mail_to }}";
+{% if security_autoupdate_mail_on_error %}
+Unattended-Upgrade::MailOnlyOnError "true";
+{% endif %}
+{% endif %}
+
 Unattended-Upgrade::Allowed-Origins {
         "${distro_id} ${distro_codename}-security";
 //      "${distro_id} ${distro_codename}-updates";

From 84e0ed145817ee7acfe7f0bd04af917bca8dedb9 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 17 Aug 2016 09:40:13 -0500
Subject: [PATCH 0404/1273] Issue #870: Use more compact and legible object
 syntax for cron example.

---
 default.config.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/default.config.yml b/default.config.yml
index b2d3fbac3..70bf8641f 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -80,11 +80,9 @@ drupal_site_install_extra_args: []
 # Cron jobs are added to the vagrant user's crontab. Keys include name
 # (required), minute, hour, day, weekday, month, job (required), and state.
 drupalvm_cron_jobs: []
-  # - {
-  #   name: "Drupal Cron",
+  # - name: "Drupal Cron",
   #   minute: "*/30",
   #   job: "drush -r {{ drupal_core_path }} core-cron"
-  # }
 
 # Drupal VM automatically creates a drush alias file in your ~/.drush folder if
 # this variable is 'true'.

From db9ffd3007e5d197be53b10acc7ea99cf5dc56d0 Mon Sep 17 00:00:00 2001
From: Joe Bartlett <joe.bartlett@vml.com>
Date: Wed, 24 Aug 2016 20:36:01 -0500
Subject: [PATCH 0405/1273] Fix for issue #845 - missing role config file for
 franklinkim.newrelic

---
 .gitignore                                    |  3 +++
 .../franklinkim.newrelic/tasks/config.yml     | 19 +++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 provisioning/roles/franklinkim.newrelic/tasks/config.yml

diff --git a/.gitignore b/.gitignore
index 3f516b04a..f74546b16 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,6 @@ examples/prod/inventory
 examples/prod/bootstrap/vars.yml
 scripts/
 drupal/
+!provisioning/roles/**/config.yml
+
+
diff --git a/provisioning/roles/franklinkim.newrelic/tasks/config.yml b/provisioning/roles/franklinkim.newrelic/tasks/config.yml
new file mode 100644
index 000000000..56b78b8f5
--- /dev/null
+++ b/provisioning/roles/franklinkim.newrelic/tasks/config.yml
@@ -0,0 +1,19 @@
+---
+
+- name: Configuring module
+  template:
+    src: "{{ item }}.j2"
+    dest: "/{{ item }}"
+    owner: "{{ newrelic_user }}"
+    group: "{{ newrelic_group }}"
+    mode: "0640"
+  notify: restart newrelic
+  with_items:
+    - "etc/newrelic/nrsysmond.cfg"
+
+- name: Configuring user groups
+  user:
+    name: "{{ newrelic_user }}"
+    groups: "{{ newrelic_groups|join(',') }}"
+    append: yes
+  when: not newrelic_disable_docker

From d0645cfefa94a7762ae17f49d3c68b638e750ae8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kalle=20Kipin=C3=A4?= <kalle.kipina@exove.fi>
Date: Fri, 2 Sep 2016 15:41:08 +0300
Subject: [PATCH 0406/1273] Issue #886: Add configuration option for forcing
 ansible_local.

---
 default.config.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/default.config.yml b/default.config.yml
index 70bf8641f..49914b474 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -32,6 +32,9 @@ vagrant_synced_folders:
 vagrant_memory: 1024
 vagrant_cpus: 2
 
+# Force use of ansible_local provisioner instead of ansible?
+force_ansible_local: false
+
 # The web server software to use. Can be either 'apache' or 'nginx'.
 drupalvm_webserver: apache
 

From 30f2c2468a9a9f32c5f9d9a037c711e354271ae3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kalle=20Kipin=C3=A4?= <kalle.kipina@exove.fi>
Date: Fri, 2 Sep 2016 15:41:28 +0300
Subject: [PATCH 0407/1273] Issue #886: Add support in Vagrantfile for the
 forced use of ansible_local.

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

diff --git a/Vagrantfile b/Vagrantfile
index 9936b69ab..1f669bb27 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -119,7 +119,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.synced_folder host_project_dir, '/vagrant', type: vconfig.include?('vagrant_synced_folder_default_type') ? vconfig['vagrant_synced_folder_default_type'] : 'nfs'
 
   # Provisioning. Use ansible if it's installed, ansible_local if not.
-  if which('ansible-playbook')
+  if which('ansible-playbook') && !vconfig['force_ansible_local']
     config.vm.provision 'ansible' do |ansible|
       ansible.playbook = "#{host_drupalvm_dir}/provisioning/playbook.yml"
       ansible.extra_vars = {

From 34625261b20355c826cb7a2cb433ad7fcad8b233 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kalle=20Kipin=C3=A4?= <kalle.kipina@exove.fi>
Date: Fri, 2 Sep 2016 15:49:35 +0300
Subject: [PATCH 0408/1273] Issue #886: Improve documentation for forced
 ansible_local.

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

diff --git a/Vagrantfile b/Vagrantfile
index 1f669bb27..ebe6fc8d2 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -118,7 +118,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # Allow override of the default synced folder type.
   config.vm.synced_folder host_project_dir, '/vagrant', type: vconfig.include?('vagrant_synced_folder_default_type') ? vconfig['vagrant_synced_folder_default_type'] : 'nfs'
 
-  # Provisioning. Use ansible if it's installed, ansible_local if not.
+  # Provisioning. Use ansible if it's installed, ansible_local if not or if forced.
   if which('ansible-playbook') && !vconfig['force_ansible_local']
     config.vm.provision 'ansible' do |ansible|
       ansible.playbook = "#{host_drupalvm_dir}/provisioning/playbook.yml"

From e1b9c10c235f4c90ad4985120bb7774ff8ebae40 Mon Sep 17 00:00:00 2001
From: Benji Fisher <bfisher@isovera.com>
Date: Fri, 2 Sep 2016 14:55:08 -0400
Subject: [PATCH 0409/1273] Document that Parallels requires paid version.

See http://parallels.github.io/vagrant-parallels/ (bottom of the page).
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c3fc429b2..75cd86747 100644
--- a/README.md
+++ b/README.md
@@ -68,7 +68,7 @@ But Drupal VM allows you to build your site exactly how you like, using whatever
 
 Download and install [Vagrant](https://www.vagrantup.com/downloads.html) and [VirtualBox](https://www.virtualbox.org/wiki/Downloads).
 
-You can also use an alternative provider like Parallels or VMware, (the latter also requires the paid [Vagrant VMware integration plugin](http://www.vagrantup.com/vmware)).
+You can also use an alternative provider like Parallels or VMware. (Parallels Desktop 11+ requires the "Pro" or "Business" edition and the [Parallels Provider](http://parallels.github.io/vagrant-parallels/), and VMware requires the paid [Vagrant VMware integration plugin](http://www.vagrantup.com/vmware)).
 
 Notes:
 

From 4206eec0e1620f88cb6600421c89a7c42d4a79e4 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 2 Sep 2016 14:03:37 -0500
Subject: [PATCH 0410/1273] PR #887: Slightly improved docs.

---
 default.config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.config.yml b/default.config.yml
index 49914b474..333d33b4e 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -32,7 +32,7 @@ vagrant_synced_folders:
 vagrant_memory: 1024
 vagrant_cpus: 2
 
-# Force use of ansible_local provisioner instead of ansible?
+# Force use of ansible_local provisioner, even if Ansible is installed on host.
 force_ansible_local: false
 
 # The web server software to use. Can be either 'apache' or 'nginx'.

From 7cd44a700f95797e57e334ab8cba97f09e2b448d Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 2 Sep 2016 14:06:14 -0500
Subject: [PATCH 0411/1273] Comments and whitespace fixes in gitignore.

---
 .gitignore | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index f74546b16..75e5baa25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,20 @@
+# OS-specific files.
 .DS_Store
+
+# Editor and language files.
 .idea/
 .project/
-.vagrant/
 .bundle/
+
+# Ansible files.
 *.retry
 .galaxy_install_info
+
+# Vagrant files.
+.vagrant/
 vagrant_ansible_inventory_default
+
+# Drupal VM specific files.
 local.config.yml
 config.yml
 drupal.make.yml
@@ -14,6 +23,6 @@ examples/prod/inventory
 examples/prod/bootstrap/vars.yml
 scripts/
 drupal/
-!provisioning/roles/**/config.yml
-
 
+# Some roles include 'config.yml' files.
+!provisioning/roles/**/config.yml

From 8d9c87919134e9696d0d7e46ee2f7c17d5cffbd4 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 9 Sep 2016 16:28:24 -0500
Subject: [PATCH 0412/1273] Fixes #896: Update all role versions, especially
 nodejs.

---
 provisioning/requirements.yml                 |  18 +--
 .../roles/geerlingguy.apache/.travis.yml      |  56 +++++----
 .../geerlingguy.apache/tasks/setup-Debian.yml |   2 +-
 .../tests/Dockerfile.centos-6                 |  15 ---
 .../tests/Dockerfile.centos-7                 |  27 -----
 .../tests/Dockerfile.ubuntu-12.04             |  11 --
 .../tests/Dockerfile.ubuntu-14.04             |  11 --
 .../roles/geerlingguy.composer/.travis.yml    |  31 +++--
 .../tests/Dockerfile.centos-7                 |  27 -----
 .../tests/Dockerfile.ubuntu-14.04             |  14 ---
 .../geerlingguy.composer/tests/initctl_faker  |  23 ----
 .../geerlingguy.composer/tests/inventory      |   1 -
 .../tests/requirements.yml                    |   1 +
 .../roles/geerlingguy.composer/tests/test.yml |  13 +-
 .../roles/geerlingguy.daemonize/.travis.yml   |  45 +++----
 .../roles/geerlingguy.daemonize/README.md     |   2 +-
 .../tests/Dockerfile.centos-6                 |  15 ---
 .../tests/Dockerfile.centos-7                 |  27 -----
 .../tests/Dockerfile.ubuntu-12.04             |  11 --
 .../tests/Dockerfile.ubuntu-14.04             |  11 --
 .../geerlingguy.daemonize/tests/test.yml      |   5 +
 .../roles/geerlingguy.firewall/.travis.yml    | 114 +++++++++++-------
 .../roles/geerlingguy.firewall/README.md      |   4 +-
 .../roles/geerlingguy.firewall/meta/main.yml  |   5 +-
 .../geerlingguy.firewall/tests/inventory      |   1 -
 .../roles/geerlingguy.firewall/tests/test.yml |  14 ++-
 .../roles/geerlingguy.java/.travis.yml        |  35 +++---
 provisioning/roles/geerlingguy.java/README.md |   2 +-
 .../geerlingguy.java/tasks/setup-Debian.yml   |   4 +-
 .../tests/Dockerfile.centos-6                 |  15 ---
 .../tests/Dockerfile.centos-7                 |  27 -----
 .../tests/Dockerfile.ubuntu-12.04             |  11 --
 .../tests/Dockerfile.ubuntu-14.04             |  11 --
 .../roles/geerlingguy.mysql/.travis.yml       |  15 +++
 .../roles/geerlingguy.mysql/defaults/main.yml |   3 +
 .../geerlingguy.mysql/templates/my.cnf.j2     |   4 +-
 .../roles/geerlingguy.nodejs/.travis.yml      |  39 +++---
 .../roles/geerlingguy.nodejs/README.md        |   2 +-
 .../geerlingguy.nodejs/tasks/setup-Debian.yml |   3 +-
 .../geerlingguy.nodejs/tasks/setup-RedHat.yml |   5 +
 .../tests/Dockerfile.centos-6                 |  15 ---
 .../tests/Dockerfile.centos-7                 |  27 -----
 .../tests/Dockerfile.ubuntu-12.04             |  11 --
 .../tests/Dockerfile.ubuntu-14.04             |  11 --
 .../roles/geerlingguy.nodejs/tests/test.yml   |   4 +
 provisioning/roles/geerlingguy.ruby/README.md |   8 +-
 .../roles/geerlingguy.ruby/defaults/main.yml  |   6 +-
 .../roles/geerlingguy.ruby/meta/main.yml      |   2 +-
 .../roles/geerlingguy.ruby/tasks/main.yml     |   6 +-
 .../roles/geerlingguy.varnish/tasks/main.yml  |   2 +-
 50 files changed, 272 insertions(+), 500 deletions(-)
 delete mode 100644 provisioning/roles/geerlingguy.apache/tests/Dockerfile.centos-6
 delete mode 100644 provisioning/roles/geerlingguy.apache/tests/Dockerfile.centos-7
 delete mode 100644 provisioning/roles/geerlingguy.apache/tests/Dockerfile.ubuntu-12.04
 delete mode 100644 provisioning/roles/geerlingguy.apache/tests/Dockerfile.ubuntu-14.04
 delete mode 100644 provisioning/roles/geerlingguy.composer/tests/Dockerfile.centos-7
 delete mode 100644 provisioning/roles/geerlingguy.composer/tests/Dockerfile.ubuntu-14.04
 delete mode 100644 provisioning/roles/geerlingguy.composer/tests/initctl_faker
 delete mode 100644 provisioning/roles/geerlingguy.composer/tests/inventory
 delete mode 100644 provisioning/roles/geerlingguy.daemonize/tests/Dockerfile.centos-6
 delete mode 100644 provisioning/roles/geerlingguy.daemonize/tests/Dockerfile.centos-7
 delete mode 100644 provisioning/roles/geerlingguy.daemonize/tests/Dockerfile.ubuntu-12.04
 delete mode 100644 provisioning/roles/geerlingguy.daemonize/tests/Dockerfile.ubuntu-14.04
 delete mode 100644 provisioning/roles/geerlingguy.firewall/tests/inventory
 delete mode 100644 provisioning/roles/geerlingguy.java/tests/Dockerfile.centos-6
 delete mode 100644 provisioning/roles/geerlingguy.java/tests/Dockerfile.centos-7
 delete mode 100644 provisioning/roles/geerlingguy.java/tests/Dockerfile.ubuntu-12.04
 delete mode 100644 provisioning/roles/geerlingguy.java/tests/Dockerfile.ubuntu-14.04
 delete mode 100644 provisioning/roles/geerlingguy.nodejs/tests/Dockerfile.centos-6
 delete mode 100644 provisioning/roles/geerlingguy.nodejs/tests/Dockerfile.centos-7
 delete mode 100644 provisioning/roles/geerlingguy.nodejs/tests/Dockerfile.ubuntu-12.04
 delete mode 100644 provisioning/roles/geerlingguy.nodejs/tests/Dockerfile.ubuntu-14.04

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index c3abb735b..588d2d897 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -6,15 +6,15 @@
 - src: geerlingguy.adminer
   version: 1.1.0
 - src: geerlingguy.apache
-  version: 1.7.2
+  version: 1.7.3
 - src: geerlingguy.apache-php-fpm
   version: 1.0.2
 - src: geerlingguy.blackfire
   version: 1.0.0
 - src: geerlingguy.composer
-  version: 1.4.1
+  version: 1.4.2
 - src: geerlingguy.daemonize
-  version: 1.1.0
+  version: 1.1.1
 - src: geerlingguy.drupal-console
   version: 1.0.7
 - src: geerlingguy.drush
@@ -22,21 +22,21 @@
 - src: geerlingguy.elasticsearch
   version: 2.1.1
 - src: geerlingguy.firewall
-  version: 1.0.9
+  version: 1.1.0
 - src: geerlingguy.git
   version: 1.1.1
 - src: geerlingguy.java
-  version: 1.4.0
+  version: 1.4.1
 - src: geerlingguy.mailhog
   version: 2.0.0
 - src: geerlingguy.memcached
   version: 1.0.4
 - src: geerlingguy.mysql
-  version: 2.3.1
+  version: 2.3.2
 - src: geerlingguy.nginx
   version: 1.9.3
 - src: geerlingguy.nodejs
-  version: 3.2.0
+  version: 3.3.0
 - src: geerlingguy.php
   version: 3.2.2
 - src: geerlingguy.php-memcached
@@ -60,10 +60,10 @@
 - src: geerlingguy.repo-remi
   version: 1.2.0
 - src: geerlingguy.ruby
-  version: 2.3.1
+  version: 2.4.0
 - src: geerlingguy.security
   version: 1.4.0
 - src: geerlingguy.solr
   version: 3.1.3
 - src: geerlingguy.varnish
-  version: 1.6.1
+  version: 1.6.2
diff --git a/provisioning/roles/geerlingguy.apache/.travis.yml b/provisioning/roles/geerlingguy.apache/.travis.yml
index 163e4c3b4..3792fd2fd 100644
--- a/provisioning/roles/geerlingguy.apache/.travis.yml
+++ b/provisioning/roles/geerlingguy.apache/.travis.yml
@@ -2,37 +2,47 @@
 sudo: required
 
 env:
-  - distribution: centos
-    version: 6
-    init: /sbin/init
-    run_opts: ""
-  - distribution: centos
-    version: 7
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-  - distribution: ubuntu
-    version: 14.04
-    init: /sbin/init
-    run_opts: ""
-  - distribution: ubuntu
-    version: 12.04
-    init: /sbin/init
-    run_opts: ""
+  global:
+    # https://github.com/travis-ci/travis-ci/issues/6461#issuecomment-239577306
+    DOCKER_VERSION: "1.9.1-0~trusty"
+  matrix:
+    - repository: geerlingguy/docker-centos7-ansible
+      version: latest
+      init: /usr/lib/systemd/systemd
+      run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    - repository: geerlingguy/docker-centos6-ansible
+      version: latest
+      init: /sbin/init
+      run_opts: ""
+    - repository: geerlingguy/docker-ubuntu1604-ansible
+      version: latest
+      init: /lib/systemd/systemd
+      run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    - repository: geerlingguy/docker-ubuntu1404-ansible
+      version: latest
+      init: /sbin/init
+      run_opts: ""
+    - repository: geerlingguy/docker-ubuntu1204-ansible
+      version: latest
+      init: /sbin/init
+      run_opts: ""
 
 services:
   - docker
 
 before_install:
-  # - sudo apt-get update
-  # Pull container
-  - 'sudo docker pull ${distribution}:${version}'
-  # Customize container
-  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+  # Downgrade to specific version of Docker engine.
+  - sudo apt-get update
+  - sudo apt-get remove docker-engine -yq
+  - sudo apt-get install docker-engine=$DOCKER_VERSION -yq --no-install-suggests --no-install-recommends --force-yes -o Dpkg::Options::="--force-confnew"
+
+  # Pull container.
+  - 'sudo docker pull ${repository}:${version}'
 
 script:
   - container_id=$(mktemp)
-    # Run container in detached state
-  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+    # Run container in detached state.
+  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${repository}:${version} "${init}" > "${container_id}"'
 
   # Ansible syntax check.
   - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
diff --git a/provisioning/roles/geerlingguy.apache/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.apache/tasks/setup-Debian.yml
index 8d72deb1b..43b9a77d8 100644
--- a/provisioning/roles/geerlingguy.apache/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.apache/tasks/setup-Debian.yml
@@ -1,6 +1,6 @@
 ---
 - name: Update apt cache.
-  apt: update_cache=yes cache_valid_time=86400
+  apt: update_cache=yes cache_valid_time=3600
 
 - name: Ensure Apache is installed on Debian.
   apt: "name={{ item }} state=installed"
diff --git a/provisioning/roles/geerlingguy.apache/tests/Dockerfile.centos-6 b/provisioning/roles/geerlingguy.apache/tests/Dockerfile.centos-6
deleted file mode 100644
index 4a4e7b8d6..000000000
--- a/provisioning/roles/geerlingguy.apache/tests/Dockerfile.centos-6
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM centos:6
-
-# Install Ansible
-RUN yum -y update; yum clean all;
-RUN yum -y install epel-release
-RUN yum -y install git ansible sudo
-RUN yum clean all
-
-# Disable requiretty
-RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
-
-# Install Ansible inventory file
-RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
-
-CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.apache/tests/Dockerfile.centos-7 b/provisioning/roles/geerlingguy.apache/tests/Dockerfile.centos-7
deleted file mode 100644
index 8aa065497..000000000
--- a/provisioning/roles/geerlingguy.apache/tests/Dockerfile.centos-7
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM centos:7
-
-# Install systemd -- See https://hub.docker.com/_/centos/
-RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
-RUN yum -y update; yum clean all; \
-(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
-rm -f /lib/systemd/system/multi-user.target.wants/*; \
-rm -f /etc/systemd/system/*.wants/*; \
-rm -f /lib/systemd/system/local-fs.target.wants/*; \
-rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
-rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
-rm -f /lib/systemd/system/basic.target.wants/*; \
-rm -f /lib/systemd/system/anaconda.target.wants/*;
-
-# Install Ansible
-RUN yum -y install epel-release
-RUN yum -y install git ansible sudo
-RUN yum clean all
-
-# Disable requiretty
-RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
-
-# Install Ansible inventory file
-RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
-
-VOLUME ["/sys/fs/cgroup"]
-CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.apache/tests/Dockerfile.ubuntu-12.04 b/provisioning/roles/geerlingguy.apache/tests/Dockerfile.ubuntu-12.04
deleted file mode 100644
index d0c130cdf..000000000
--- a/provisioning/roles/geerlingguy.apache/tests/Dockerfile.ubuntu-12.04
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM ubuntu:12.04
-RUN apt-get update
-
-# Install Ansible
-RUN apt-get install -y software-properties-common python-software-properties git
-RUN apt-add-repository -y ppa:ansible/ansible
-RUN apt-get update
-RUN apt-get install -y ansible
-
-# Install Ansible inventory file
-RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.apache/tests/Dockerfile.ubuntu-14.04 b/provisioning/roles/geerlingguy.apache/tests/Dockerfile.ubuntu-14.04
deleted file mode 100644
index ca332871f..000000000
--- a/provisioning/roles/geerlingguy.apache/tests/Dockerfile.ubuntu-14.04
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM ubuntu:14.04
-RUN apt-get update
-
-# Install Ansible
-RUN apt-get install -y software-properties-common git
-RUN apt-add-repository -y ppa:ansible/ansible
-RUN apt-get update
-RUN apt-get install -y ansible
-
-# Install Ansible inventory file
-RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.composer/.travis.yml b/provisioning/roles/geerlingguy.composer/.travis.yml
index 319088cb4..f0085c4ef 100644
--- a/provisioning/roles/geerlingguy.composer/.travis.yml
+++ b/provisioning/roles/geerlingguy.composer/.travis.yml
@@ -2,29 +2,26 @@
 sudo: required
 
 env:
-  - distribution: centos
-    version: 7
+  - repository: geerlingguy/docker-centos7-ansible
+    version: latest
     init: /usr/lib/systemd/systemd
     run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-  - distribution: ubuntu
-    version: 14.04
-    init: /sbin/init
-    run_opts: ""
+  - repository: geerlingguy/docker-ubuntu1604-ansible
+    version: latest
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
 
 services:
   - docker
 
 before_install:
-  # - sudo apt-get update
-  # Pull container
-  - 'sudo docker pull ${distribution}:${version}'
-  # Customize container
-  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+  # Pull container.
+  - 'sudo docker pull ${repository}:${version}'
 
 script:
   - container_id=$(mktemp)
-  # Run container in detached state
-  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+  # Run container in detached state.
+  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${repository}:${version} "${init}" > "${container_id}"'
 
   # Install dependencies.
   - 'sudo docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
@@ -36,16 +33,18 @@ script:
   - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
 
   # Test role idempotence.
+  - idempotence=$(mktemp)
+  - sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
   - >
-    sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml
+    tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
     && (echo 'Idempotence test: pass' && exit 0)
     || (echo 'Idempotence test: fail' && exit 1)
 
   # Ensure Composer is installed and working.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm composer'
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm composer || true'
 
-  # Clean up
+  # Clean up.
   - 'sudo docker stop "$(cat ${container_id})"'
 
 notifications:
diff --git a/provisioning/roles/geerlingguy.composer/tests/Dockerfile.centos-7 b/provisioning/roles/geerlingguy.composer/tests/Dockerfile.centos-7
deleted file mode 100644
index 8aa065497..000000000
--- a/provisioning/roles/geerlingguy.composer/tests/Dockerfile.centos-7
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM centos:7
-
-# Install systemd -- See https://hub.docker.com/_/centos/
-RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
-RUN yum -y update; yum clean all; \
-(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
-rm -f /lib/systemd/system/multi-user.target.wants/*; \
-rm -f /etc/systemd/system/*.wants/*; \
-rm -f /lib/systemd/system/local-fs.target.wants/*; \
-rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
-rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
-rm -f /lib/systemd/system/basic.target.wants/*; \
-rm -f /lib/systemd/system/anaconda.target.wants/*;
-
-# Install Ansible
-RUN yum -y install epel-release
-RUN yum -y install git ansible sudo
-RUN yum clean all
-
-# Disable requiretty
-RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
-
-# Install Ansible inventory file
-RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
-
-VOLUME ["/sys/fs/cgroup"]
-CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.composer/tests/Dockerfile.ubuntu-14.04 b/provisioning/roles/geerlingguy.composer/tests/Dockerfile.ubuntu-14.04
deleted file mode 100644
index f81cabec6..000000000
--- a/provisioning/roles/geerlingguy.composer/tests/Dockerfile.ubuntu-14.04
+++ /dev/null
@@ -1,14 +0,0 @@
-FROM ubuntu:14.04
-RUN apt-get update
-
-# Install Ansible
-RUN apt-get install -y software-properties-common git
-RUN apt-add-repository -y ppa:ansible/ansible
-RUN apt-get update
-RUN apt-get install -y ansible
-
-COPY initctl_faker .
-RUN chmod +x initctl_faker && rm -fr /sbin/initctl && ln -s /initctl_faker /sbin/initctl
-
-# Install Ansible inventory file
-RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.composer/tests/initctl_faker b/provisioning/roles/geerlingguy.composer/tests/initctl_faker
deleted file mode 100644
index a2267f30d..000000000
--- a/provisioning/roles/geerlingguy.composer/tests/initctl_faker
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-ALIAS_CMD="$(echo ""$0"" | sed -e 's?/sbin/??')"
-
-case "$ALIAS_CMD" in
-    start|stop|restart|reload|status)
-        exec service $1 $ALIAS_CMD
-        ;;
-esac
-
-case "$1" in
-    list )
-        exec service --status-all
-        ;;
-    reload-configuration )
-        exec service $2 restart
-        ;;
-    start|stop|restart|reload|status)
-        exec service $2 $1
-        ;;
-    \?)
-        exit 0
-        ;;
-esac
diff --git a/provisioning/roles/geerlingguy.composer/tests/inventory b/provisioning/roles/geerlingguy.composer/tests/inventory
deleted file mode 100644
index 2fbb50c4a..000000000
--- a/provisioning/roles/geerlingguy.composer/tests/inventory
+++ /dev/null
@@ -1 +0,0 @@
-localhost
diff --git a/provisioning/roles/geerlingguy.composer/tests/requirements.yml b/provisioning/roles/geerlingguy.composer/tests/requirements.yml
index 80e765f13..86d9ed78e 100644
--- a/provisioning/roles/geerlingguy.composer/tests/requirements.yml
+++ b/provisioning/roles/geerlingguy.composer/tests/requirements.yml
@@ -1,3 +1,4 @@
 ---
 - src: geerlingguy.repo-remi
+- src: geerlingguy.git
 - src: geerlingguy.php
diff --git a/provisioning/roles/geerlingguy.composer/tests/test.yml b/provisioning/roles/geerlingguy.composer/tests/test.yml
index c76d2a4b3..f560931dc 100644
--- a/provisioning/roles/geerlingguy.composer/tests/test.yml
+++ b/provisioning/roles/geerlingguy.composer/tests/test.yml
@@ -8,14 +8,17 @@
 
     # Test a global requirement.
     composer_global_packages:
-      - { name: phpunit/phpunit, release: "@stable" }
+      - name: phpunit/phpunit
+        release: "@stable"
 
   pre_tasks:
-    - name: Add repository for PHP 7.0.
-      apt_repository: repo='ppa:ondrej/php'
-      when: ansible_os_family == 'Debian'
+    - name: Update apt cache.
+      apt: update_cache=yes
+      when: ansible_distribution == 'Ubuntu'
 
   roles:
-    - { role: geerlingguy.repo-remi, when: ansible_os_family == 'RedHat' }
+    - role: geerlingguy.repo-remi
+      when: ansible_os_family == 'RedHat'
+    - geerlingguy.git
     - geerlingguy.php
     - role_under_test
diff --git a/provisioning/roles/geerlingguy.daemonize/.travis.yml b/provisioning/roles/geerlingguy.daemonize/.travis.yml
index fee7c8ba1..53f562446 100644
--- a/provisioning/roles/geerlingguy.daemonize/.travis.yml
+++ b/provisioning/roles/geerlingguy.daemonize/.travis.yml
@@ -2,20 +2,24 @@
 sudo: required
 
 env:
-  - distribution: centos
-    version: 6
+  - repository: geerlingguy/docker-centos7-ansible
+    version: latest
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - repository: geerlingguy/docker-centos6-ansible
+    version: latest
     init: /sbin/init
     run_opts: ""
-  - distribution: centos
-    version: 7
-    init: /usr/lib/systemd/systemd
+  - repository: geerlingguy/docker-ubuntu1604-ansible
+    version: latest
+    init: /lib/systemd/systemd
     run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-  - distribution: ubuntu
-    version: 14.04
+  - repository: geerlingguy/docker-ubuntu1404-ansible
+    version: latest
     init: /sbin/init
     run_opts: ""
-  - distribution: ubuntu
-    version: 12.04
+  - repository: geerlingguy/docker-ubuntu1204-ansible
+    version: latest
     init: /sbin/init
     run_opts: ""
 
@@ -23,16 +27,13 @@ services:
   - docker
 
 before_install:
-  # - sudo apt-get update
-  # Pull container
-  - 'sudo docker pull ${distribution}:${version}'
-  # Customize container
-  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+  # Pull container.
+  - 'sudo docker pull ${repository}:${version}'
 
 script:
   - container_id=$(mktemp)
-  # Run container in detached state
-  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+  # Run container in detached state.
+  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${repository}:${version} "${init}" > "${container_id}"'
 
   # Ansible syntax check.
   - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
@@ -40,17 +41,19 @@ script:
   # Test role.
   - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
 
-  # Ensure daemonize is available.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm which daemonize'
-
   # Test role idempotence.
+  - idempotence=$(mktemp)
+  - sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
   - >
-    sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml
+    tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
     && (echo 'Idempotence test: pass' && exit 0)
     || (echo 'Idempotence test: fail' && exit 1)
 
-  # Clean up
+  # Ensure daemonize is available.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm which daemonize'
+
+  # Clean up.
   - 'sudo docker stop "$(cat ${container_id})"'
 
 notifications:
diff --git a/provisioning/roles/geerlingguy.daemonize/README.md b/provisioning/roles/geerlingguy.daemonize/README.md
index 5beefbffd..c2f219022 100644
--- a/provisioning/roles/geerlingguy.daemonize/README.md
+++ b/provisioning/roles/geerlingguy.daemonize/README.md
@@ -40,4 +40,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.daemonize/tests/Dockerfile.centos-6 b/provisioning/roles/geerlingguy.daemonize/tests/Dockerfile.centos-6
deleted file mode 100644
index 4a4e7b8d6..000000000
--- a/provisioning/roles/geerlingguy.daemonize/tests/Dockerfile.centos-6
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM centos:6
-
-# Install Ansible
-RUN yum -y update; yum clean all;
-RUN yum -y install epel-release
-RUN yum -y install git ansible sudo
-RUN yum clean all
-
-# Disable requiretty
-RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
-
-# Install Ansible inventory file
-RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
-
-CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.daemonize/tests/Dockerfile.centos-7 b/provisioning/roles/geerlingguy.daemonize/tests/Dockerfile.centos-7
deleted file mode 100644
index 8aa065497..000000000
--- a/provisioning/roles/geerlingguy.daemonize/tests/Dockerfile.centos-7
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM centos:7
-
-# Install systemd -- See https://hub.docker.com/_/centos/
-RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
-RUN yum -y update; yum clean all; \
-(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
-rm -f /lib/systemd/system/multi-user.target.wants/*; \
-rm -f /etc/systemd/system/*.wants/*; \
-rm -f /lib/systemd/system/local-fs.target.wants/*; \
-rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
-rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
-rm -f /lib/systemd/system/basic.target.wants/*; \
-rm -f /lib/systemd/system/anaconda.target.wants/*;
-
-# Install Ansible
-RUN yum -y install epel-release
-RUN yum -y install git ansible sudo
-RUN yum clean all
-
-# Disable requiretty
-RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
-
-# Install Ansible inventory file
-RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
-
-VOLUME ["/sys/fs/cgroup"]
-CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.daemonize/tests/Dockerfile.ubuntu-12.04 b/provisioning/roles/geerlingguy.daemonize/tests/Dockerfile.ubuntu-12.04
deleted file mode 100644
index d0c130cdf..000000000
--- a/provisioning/roles/geerlingguy.daemonize/tests/Dockerfile.ubuntu-12.04
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM ubuntu:12.04
-RUN apt-get update
-
-# Install Ansible
-RUN apt-get install -y software-properties-common python-software-properties git
-RUN apt-add-repository -y ppa:ansible/ansible
-RUN apt-get update
-RUN apt-get install -y ansible
-
-# Install Ansible inventory file
-RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.daemonize/tests/Dockerfile.ubuntu-14.04 b/provisioning/roles/geerlingguy.daemonize/tests/Dockerfile.ubuntu-14.04
deleted file mode 100644
index ca332871f..000000000
--- a/provisioning/roles/geerlingguy.daemonize/tests/Dockerfile.ubuntu-14.04
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM ubuntu:14.04
-RUN apt-get update
-
-# Install Ansible
-RUN apt-get install -y software-properties-common git
-RUN apt-add-repository -y ppa:ansible/ansible
-RUN apt-get update
-RUN apt-get install -y ansible
-
-# Install Ansible inventory file
-RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.daemonize/tests/test.yml b/provisioning/roles/geerlingguy.daemonize/tests/test.yml
index 4b03ee45e..068c5e54d 100644
--- a/provisioning/roles/geerlingguy.daemonize/tests/test.yml
+++ b/provisioning/roles/geerlingguy.daemonize/tests/test.yml
@@ -1,3 +1,4 @@
+---
 - hosts: all
 
   pre_tasks:
@@ -11,6 +12,10 @@
         - which
       when: ansible_os_family == 'RedHat'
 
+    - name: Update apt cache.
+      apt: update_cache=yes
+      when: ansible_os_family == 'Debian'
+
     - name: Ensure build dependencies are installed (Debian).
       apt: 'name="{{ item }}" state=installed'
       with_items:
diff --git a/provisioning/roles/geerlingguy.firewall/.travis.yml b/provisioning/roles/geerlingguy.firewall/.travis.yml
index a26b16a82..661b78db5 100644
--- a/provisioning/roles/geerlingguy.firewall/.travis.yml
+++ b/provisioning/roles/geerlingguy.firewall/.travis.yml
@@ -1,60 +1,90 @@
 ---
-language: python
-python: "2.7"
+sudo: required
 
 env:
-  - SITE=test.yml
+  global:
+    # https://github.com/travis-ci/travis-ci/issues/6461#issuecomment-239577306
+    DOCKER_VERSION: "1.9.1-0~trusty"
+  matrix:
+    - distro: centos7
+      init: /usr/lib/systemd/systemd
+      run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    - distro: centos6
+      init: /sbin/init
+      run_opts: "--privileged"
+    - distro: ubuntu1604
+      init: /lib/systemd/systemd
+      run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    - distro: ubuntu1404
+      init: /sbin/init
+      run_opts: "--privileged"
+    - distro: ubuntu1204
+      init: /sbin/init
+      run_opts: "--privileged"
 
-before_install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -y curl
+services:
+  - docker
 
-install:
-  # Install Ansible.
-  - pip install ansible
+before_install:
+  # Downgrade to specific version of Docker engine.
+  - sudo apt-get update
+  - sudo apt-get remove docker-engine -yq
+  - sudo apt-get install docker-engine=$DOCKER_VERSION -yq --no-install-suggests --no-install-recommends --force-yes -o Dpkg::Options::="--force-confnew"
 
-  # Add ansible.cfg to pick up roles path.
-  - "{ echo '[defaults]'; echo 'roles_path = ../'; } >> ansible.cfg"
+  # Pull container.
+  - 'sudo docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
-  # Check the role/playbook's syntax.
-  - "ansible-playbook -i tests/inventory tests/$SITE --syntax-check"
+  - container_id=$(mktemp)
+  # Run container in detached state.
+  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
+
+  # Ansible syntax check.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
 
-  # Run the role/playbook with ansible-playbook.
-  - "ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo"
+  # Test role.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
 
-  # Run the role/playbook again, checking to make sure it's idempotent.
+  # Test role idempotence.
+  - idempotence=$(mktemp)
+  - sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
   - >
-    ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo
+    tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
     && (echo 'Idempotence test: pass' && exit 0)
     || (echo 'Idempotence test: fail' && exit 1)
 
-  # Check if TCP port 9123 is open.
-  - >
-    sudo iptables -L -n
-    | grep -q "ACCEPT.*dpt:9123"
-    && (echo 'Port 9123 is open - pass' && exit 0)
-    || (echo 'Port 9123 is not open - fail' && exit 1)
+  # # Check if TCP port 9123 is open.
+  # - >
+  #   sudo iptables -L -n
+  #   | grep -q "ACCEPT.*dpt:9123"
+  #   && (echo 'Port 9123 is open - pass' && exit 0)
+  #   || (echo 'Port 9123 is not open - fail' && exit 1)
 
-  # Check running firewall has exit code 0
-  - >
-    sudo service firewall status
-    && (echo 'Status of running firewall is 0 - pass' && exit 0)
-    || (echo 'Status of running firewall is not 0 - fail' && exit 1)
+  # # Check running firewall has exit code 0
+  # - >
+  #   sudo service firewall status
+  #   && (echo 'Status of running firewall is 0 - pass' && exit 0)
+  #   || (echo 'Status of running firewall is not 0 - fail' && exit 1)
 
-  # Stop firewall
-  - >
-    sudo service firewall stop
-    && (echo 'Stopping firewall - pass' && exit 0)
-    || (echo 'Stopping firewall - fail' && exit 1)
+  # # Stop firewall
+  # - >
+  #   sudo service firewall stop
+  #   && (echo 'Stopping firewall - pass' && exit 0)
+  #   || (echo 'Stopping firewall - fail' && exit 1)
 
-  # Check stopped firewall has exit code 3
-  - >
-    sudo service firewall status;
-    EXIT=$?;
-    if [ 3 -eq $EXIT ]; then
-      echo 'Status of stopped firewall is 3 - pass' && exit 0;
-    else
-      echo 'Status of stopped firewall is not 3 - fail' && exit 1;
-    fi 
+  # # Check stopped firewall has exit code 3
+  # - >
+  #   sudo service firewall status;
+  #   EXIT=$?;
+  #   if [ 3 -eq $EXIT ]; then
+  #     echo 'Status of stopped firewall is 3 - pass' && exit 0;
+  #   else
+  #     echo 'Status of stopped firewall is not 3 - fail' && exit 1;
+  #   fi
+
+  # Clean up.
+  - 'sudo docker stop "$(cat ${container_id})"'
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.firewall/README.md b/provisioning/roles/geerlingguy.firewall/README.md
index 415dec0cd..a0ee2d4c0 100644
--- a/provisioning/roles/geerlingguy.firewall/README.md
+++ b/provisioning/roles/geerlingguy.firewall/README.md
@@ -14,7 +14,7 @@ None.
 
 ## Role Variables
 
-Available variables are listed below, along with default values (see `vars/main.yml`):
+Available variables are listed below, along with default values (see `defaults/main.yml`):
 
     firewall_allowed_tcp_ports:
       - "22"
@@ -69,4 +69,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.firewall/meta/main.yml b/provisioning/roles/geerlingguy.firewall/meta/main.yml
index fb1434993..ad32fda49 100644
--- a/provisioning/roles/geerlingguy.firewall/meta/main.yml
+++ b/provisioning/roles/geerlingguy.firewall/meta/main.yml
@@ -6,7 +6,7 @@ galaxy_info:
   description: Simple iptables firewall for most Unix-like systems.
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 1.4
+  min_ansible_version: 1.8
   platforms:
   - name: EL
     versions:
@@ -17,6 +17,7 @@ galaxy_info:
   - name: Ubuntu
     versions:
     - all
-  categories:
+  galaxy_tags:
     - networking
     - system
+    - security
diff --git a/provisioning/roles/geerlingguy.firewall/tests/inventory b/provisioning/roles/geerlingguy.firewall/tests/inventory
deleted file mode 100644
index 2fbb50c4a..000000000
--- a/provisioning/roles/geerlingguy.firewall/tests/inventory
+++ /dev/null
@@ -1 +0,0 @@
-localhost
diff --git a/provisioning/roles/geerlingguy.firewall/tests/test.yml b/provisioning/roles/geerlingguy.firewall/tests/test.yml
index 20809d1f8..505ba5fe1 100644
--- a/provisioning/roles/geerlingguy.firewall/tests/test.yml
+++ b/provisioning/roles/geerlingguy.firewall/tests/test.yml
@@ -1,8 +1,14 @@
 ---
-- hosts: localhost
-  remote_user: root
+- hosts: all
+
   vars:
-    - firewall_allowed_tcp_ports:
+    firewall_allowed_tcp_ports:
       - "9123"
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=yes
+      when: ansible_os_family == 'Debian'
+
   roles:
-    - ansible-role-firewall
+    - role_under_test
diff --git a/provisioning/roles/geerlingguy.java/.travis.yml b/provisioning/roles/geerlingguy.java/.travis.yml
index e14ea79f1..d6c8ef8c5 100644
--- a/provisioning/roles/geerlingguy.java/.travis.yml
+++ b/provisioning/roles/geerlingguy.java/.travis.yml
@@ -2,20 +2,19 @@
 sudo: required
 
 env:
-  - distribution: centos
-    version: 6
+  - distro: centos6
     init: /sbin/init
     run_opts: ""
-  - distribution: centos
-    version: 7
+  - distro: centos7
     init: /usr/lib/systemd/systemd
     run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-  - distribution: ubuntu
-    version: 14.04
+  - distro: ubuntu1604
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distro: ubuntu1404
     init: /sbin/init
     run_opts: ""
-  - distribution: ubuntu
-    version: 12.04
+  - distro: ubuntu1204
     init: /sbin/init
     run_opts: ""
 
@@ -23,15 +22,13 @@ services:
   - docker
 
 before_install:
-  # Pull container
-  - 'sudo docker pull ${distribution}:${version}'
-  # Customize container
-  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+  # Pull container.
+  - 'sudo docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
   - container_id=$(mktemp)
-  # Run container in detached state
-  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+  # Run container in detached state.
+  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
 
   # Ansible syntax check.
   - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
@@ -40,18 +37,20 @@ script:
   - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
 
   # Test role idempotence.
+  - idempotence=$(mktemp)
+  - sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
   - >
-    sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml
+    tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
     && (echo 'Idempotence test: pass' && exit 0)
     || (echo 'Idempotence test: fail' && exit 1)
 
-  # Ensure daemonize is available.
+  # Ensure Java is installed.
   - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm which java'
 
-  # Clean up
+after_success:
+  # Clean up.
   - 'sudo docker stop "$(cat ${container_id})"'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
-
diff --git a/provisioning/roles/geerlingguy.java/README.md b/provisioning/roles/geerlingguy.java/README.md
index 483ad3f52..3a2295854 100644
--- a/provisioning/roles/geerlingguy.java/README.md
+++ b/provisioning/roles/geerlingguy.java/README.md
@@ -59,4 +59,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.java/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.java/tasks/setup-Debian.yml
index f1adc7574..205da4e8f 100644
--- a/provisioning/roles/geerlingguy.java/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.java/tasks/setup-Debian.yml
@@ -1,7 +1,7 @@
 ---
 - name: Update apt cache.
-  apt: update_cache=yes cache_valid_time=86400
+  apt: update_cache=yes cache_valid_time=3600
 
 - name: Ensure Java is installed.
-  apt: "name={{ item }} state=installed"
+  apt: "name={{ item }} state=present"
   with_items: "{{ java_packages }}"
diff --git a/provisioning/roles/geerlingguy.java/tests/Dockerfile.centos-6 b/provisioning/roles/geerlingguy.java/tests/Dockerfile.centos-6
deleted file mode 100644
index 4a4e7b8d6..000000000
--- a/provisioning/roles/geerlingguy.java/tests/Dockerfile.centos-6
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM centos:6
-
-# Install Ansible
-RUN yum -y update; yum clean all;
-RUN yum -y install epel-release
-RUN yum -y install git ansible sudo
-RUN yum clean all
-
-# Disable requiretty
-RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
-
-# Install Ansible inventory file
-RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
-
-CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.java/tests/Dockerfile.centos-7 b/provisioning/roles/geerlingguy.java/tests/Dockerfile.centos-7
deleted file mode 100644
index 8aa065497..000000000
--- a/provisioning/roles/geerlingguy.java/tests/Dockerfile.centos-7
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM centos:7
-
-# Install systemd -- See https://hub.docker.com/_/centos/
-RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
-RUN yum -y update; yum clean all; \
-(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
-rm -f /lib/systemd/system/multi-user.target.wants/*; \
-rm -f /etc/systemd/system/*.wants/*; \
-rm -f /lib/systemd/system/local-fs.target.wants/*; \
-rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
-rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
-rm -f /lib/systemd/system/basic.target.wants/*; \
-rm -f /lib/systemd/system/anaconda.target.wants/*;
-
-# Install Ansible
-RUN yum -y install epel-release
-RUN yum -y install git ansible sudo
-RUN yum clean all
-
-# Disable requiretty
-RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
-
-# Install Ansible inventory file
-RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
-
-VOLUME ["/sys/fs/cgroup"]
-CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.java/tests/Dockerfile.ubuntu-12.04 b/provisioning/roles/geerlingguy.java/tests/Dockerfile.ubuntu-12.04
deleted file mode 100644
index d0c130cdf..000000000
--- a/provisioning/roles/geerlingguy.java/tests/Dockerfile.ubuntu-12.04
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM ubuntu:12.04
-RUN apt-get update
-
-# Install Ansible
-RUN apt-get install -y software-properties-common python-software-properties git
-RUN apt-add-repository -y ppa:ansible/ansible
-RUN apt-get update
-RUN apt-get install -y ansible
-
-# Install Ansible inventory file
-RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.java/tests/Dockerfile.ubuntu-14.04 b/provisioning/roles/geerlingguy.java/tests/Dockerfile.ubuntu-14.04
deleted file mode 100644
index ca332871f..000000000
--- a/provisioning/roles/geerlingguy.java/tests/Dockerfile.ubuntu-14.04
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM ubuntu:14.04
-RUN apt-get update
-
-# Install Ansible
-RUN apt-get install -y software-properties-common git
-RUN apt-add-repository -y ppa:ansible/ansible
-RUN apt-get update
-RUN apt-get install -y ansible
-
-# Install Ansible inventory file
-RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.mysql/.travis.yml b/provisioning/roles/geerlingguy.mysql/.travis.yml
index 24c1c0910..5ffce09dd 100644
--- a/provisioning/roles/geerlingguy.mysql/.travis.yml
+++ b/provisioning/roles/geerlingguy.mysql/.travis.yml
@@ -7,26 +7,35 @@ env:
     init: /sbin/init
     run_opts: ""
     playbook: test.yml
+    DOCKER_VERSION: "1.9.1-0~trusty"
   - distribution: centos
     version: 7
     init: /usr/lib/systemd/systemd
     run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     playbook: centos-7-test.yml
+    DOCKER_VERSION: "1.9.1-0~trusty"
   - distribution: ubuntu
     version: 14.04
     init: /sbin/init
     run_opts: ""
     playbook: test.yml
+    DOCKER_VERSION: "1.9.1-0~trusty"
   # - distribution: ubuntu
   #   version: 12.04
   #   init: /sbin/init
   #   run_opts: ""
   #   playbook: test.yml
+  #   DOCKER_VERSION: "1.9.1-0~trusty"
 
 services:
   - docker
 
 before_install:
+  # Downgrade to older version of Docker engine.
+  - sudo apt-get update
+  - sudo apt-get remove docker-engine -yq
+  - sudo apt-get install docker-engine=$DOCKER_VERSION -yq --no-install-suggests --no-install-recommends --force-yes -o Dpkg::Options::="--force-confnew"
+
   # Pull container
   - 'sudo docker pull ${distribution}:${version}'
   # Customize container
@@ -74,5 +83,11 @@ script:
   # Clean up
   - sudo docker stop "$(cat ${container_id})"
 
+after_failure:
+  # Check MySQL settings.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm cat /var/log/mysql/error.log'
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm cat /var/log/mysql.err'
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm cat /var/log/mysql.log'
+
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.mysql/defaults/main.yml b/provisioning/roles/geerlingguy.mysql/defaults/main.yml
index 7f25f14f3..3bd78bbaa 100644
--- a/provisioning/roles/geerlingguy.mysql/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.mysql/defaults/main.yml
@@ -44,7 +44,10 @@ mysql_read_rnd_buffer_size: "4M"
 mysql_myisam_sort_buffer_size: "64M"
 mysql_thread_cache_size: "8"
 mysql_query_cache_size: "16M"
+mysql_query_cache_limit: "1M"
 mysql_max_connections: "151"
+mysql_tmp_table_size: "16M"
+mysql_max_heap_table_size: "16M"
 
 # Other settings.
 mysql_lower_case_table_names: "0"
diff --git a/provisioning/roles/geerlingguy.mysql/templates/my.cnf.j2 b/provisioning/roles/geerlingguy.mysql/templates/my.cnf.j2
index c16a91d3a..e3a3c0ca9 100644
--- a/provisioning/roles/geerlingguy.mysql/templates/my.cnf.j2
+++ b/provisioning/roles/geerlingguy.mysql/templates/my.cnf.j2
@@ -77,7 +77,10 @@ read_rnd_buffer_size = {{ mysql_read_rnd_buffer_size }}
 myisam_sort_buffer_size = {{ mysql_myisam_sort_buffer_size }}
 thread_cache_size = {{ mysql_thread_cache_size }}
 query_cache_size = {{ mysql_query_cache_size }}
+query_cache_limit = {{ mysql_query_cache_limit }}
 max_connections = {{ mysql_max_connections }}
+tmp_table_size = {{ mysql_tmp_table_size }}
+max_heap_table_size = {{ mysql_max_heap_table_size }}
 
 # Other settings.
 wait_timeout = {{ mysql_wait_timeout }}
@@ -108,4 +111,3 @@ pid-file = {{ mysql_pid_file }}
 #
 !includedir {{ mysql_config_include_dir }}
 {% endif %}
-
diff --git a/provisioning/roles/geerlingguy.nodejs/.travis.yml b/provisioning/roles/geerlingguy.nodejs/.travis.yml
index 6512b6b9e..85e7e06b5 100644
--- a/provisioning/roles/geerlingguy.nodejs/.travis.yml
+++ b/provisioning/roles/geerlingguy.nodejs/.travis.yml
@@ -2,20 +2,19 @@
 sudo: required
 
 env:
-  - distribution: centos
-    version: 6
-    init: /sbin/init
-    run_opts: ""
-  - distribution: centos
-    version: 7
+  - distro: centos7
     init: /usr/lib/systemd/systemd
     run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-  - distribution: ubuntu
-    version: 14.04
+  # - distro: centos6
+  #   init: /sbin/init
+  #   run_opts: ""
+  - distro: ubuntu1604
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distro: ubuntu1404
     init: /sbin/init
     run_opts: ""
-  - distribution: ubuntu
-    version: 12.04
+  - distro: ubuntu1204
     init: /sbin/init
     run_opts: ""
 
@@ -23,15 +22,16 @@ services:
   - docker
 
 before_install:
-  # Pull container
-  - 'sudo docker pull ${distribution}:${version}'
-  # Customize container
-  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+  # Pull container.
+  - 'sudo docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
   - container_id=$(mktemp)
-  # Run container in detached state
-  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+  # Run container in detached state.
+  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
+
+  # Install dependencies.
+  - 'sudo docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
 
   # Ansible syntax check.
   - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
@@ -40,8 +40,10 @@ script:
   - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
 
   # Test role idempotence.
+  - idempotence=$(mktemp)
+  - sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
   - >
-    sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml
+    tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
     && (echo 'Idempotence test: pass' && exit 0)
     || (echo 'Idempotence test: fail' && exit 1)
@@ -55,7 +57,8 @@ script:
   - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm bash --login -c "npm list -g --depth=0 node-sass"'
   - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm bash --login -c "npm list -g --depth=0 yo"'
 
-  # Clean up
+after_success:
+  # Clean up.
   - 'sudo docker stop "$(cat ${container_id})"'
 
 notifications:
diff --git a/provisioning/roles/geerlingguy.nodejs/README.md b/provisioning/roles/geerlingguy.nodejs/README.md
index 0fce6fcb4..12b89d7b3 100644
--- a/provisioning/roles/geerlingguy.nodejs/README.md
+++ b/provisioning/roles/geerlingguy.nodejs/README.md
@@ -63,4 +63,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.nodejs/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.nodejs/tasks/setup-Debian.yml
index f88c4eef0..c939617e4 100644
--- a/provisioning/roles/geerlingguy.nodejs/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.nodejs/tasks/setup-Debian.yml
@@ -4,7 +4,8 @@
 
 - name: Add Nodesource apt key.
   apt_key:
-    url: https://deb.nodesource.com/gpgkey/nodesource.gpg.key
+    url: https://keyserver.ubuntu.com/pks/lookup?op=get&fingerprint=on&search=0x1655A0AB68576280
+    id: "68576280"
     state: present
 
 - name: Add NodeSource repositories for Node.js.
diff --git a/provisioning/roles/geerlingguy.nodejs/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.nodejs/tasks/setup-RedHat.yml
index 984b1814d..40eabc0c9 100644
--- a/provisioning/roles/geerlingguy.nodejs/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.nodejs/tasks/setup-RedHat.yml
@@ -9,6 +9,11 @@
     nodejs_rhel_rpm_dir: "pub"
   when: nodejs_version == '0.10'
 
+- name: Import Nodesource RPM key.
+  rpm_key:
+    key: https://rpm.nodesource.com/pub/el/NODESOURCE-GPG-SIGNING-KEY-EL
+    state: present
+
 - name: Add Nodesource repositories for Node.js.
   yum:
     name: "https://rpm.nodesource.com/{{ nodejs_rhel_rpm_dir }}/el/{{ ansible_distribution_major_version }}/{{ ansible_architecture }}/nodesource-release-el{{ ansible_distribution_major_version }}-1.noarch.rpm"
diff --git a/provisioning/roles/geerlingguy.nodejs/tests/Dockerfile.centos-6 b/provisioning/roles/geerlingguy.nodejs/tests/Dockerfile.centos-6
deleted file mode 100644
index 4a4e7b8d6..000000000
--- a/provisioning/roles/geerlingguy.nodejs/tests/Dockerfile.centos-6
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM centos:6
-
-# Install Ansible
-RUN yum -y update; yum clean all;
-RUN yum -y install epel-release
-RUN yum -y install git ansible sudo
-RUN yum clean all
-
-# Disable requiretty
-RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
-
-# Install Ansible inventory file
-RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
-
-CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.nodejs/tests/Dockerfile.centos-7 b/provisioning/roles/geerlingguy.nodejs/tests/Dockerfile.centos-7
deleted file mode 100644
index 8aa065497..000000000
--- a/provisioning/roles/geerlingguy.nodejs/tests/Dockerfile.centos-7
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM centos:7
-
-# Install systemd -- See https://hub.docker.com/_/centos/
-RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
-RUN yum -y update; yum clean all; \
-(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
-rm -f /lib/systemd/system/multi-user.target.wants/*; \
-rm -f /etc/systemd/system/*.wants/*; \
-rm -f /lib/systemd/system/local-fs.target.wants/*; \
-rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
-rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
-rm -f /lib/systemd/system/basic.target.wants/*; \
-rm -f /lib/systemd/system/anaconda.target.wants/*;
-
-# Install Ansible
-RUN yum -y install epel-release
-RUN yum -y install git ansible sudo
-RUN yum clean all
-
-# Disable requiretty
-RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
-
-# Install Ansible inventory file
-RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
-
-VOLUME ["/sys/fs/cgroup"]
-CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.nodejs/tests/Dockerfile.ubuntu-12.04 b/provisioning/roles/geerlingguy.nodejs/tests/Dockerfile.ubuntu-12.04
deleted file mode 100644
index d0c130cdf..000000000
--- a/provisioning/roles/geerlingguy.nodejs/tests/Dockerfile.ubuntu-12.04
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM ubuntu:12.04
-RUN apt-get update
-
-# Install Ansible
-RUN apt-get install -y software-properties-common python-software-properties git
-RUN apt-add-repository -y ppa:ansible/ansible
-RUN apt-get update
-RUN apt-get install -y ansible
-
-# Install Ansible inventory file
-RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.nodejs/tests/Dockerfile.ubuntu-14.04 b/provisioning/roles/geerlingguy.nodejs/tests/Dockerfile.ubuntu-14.04
deleted file mode 100644
index ca332871f..000000000
--- a/provisioning/roles/geerlingguy.nodejs/tests/Dockerfile.ubuntu-14.04
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM ubuntu:14.04
-RUN apt-get update
-
-# Install Ansible
-RUN apt-get install -y software-properties-common git
-RUN apt-add-repository -y ppa:ansible/ansible
-RUN apt-get update
-RUN apt-get install -y ansible
-
-# Install Ansible inventory file
-RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.nodejs/tests/test.yml b/provisioning/roles/geerlingguy.nodejs/tests/test.yml
index 9dfa879bf..45c9f415e 100644
--- a/provisioning/roles/geerlingguy.nodejs/tests/test.yml
+++ b/provisioning/roles/geerlingguy.nodejs/tests/test.yml
@@ -19,6 +19,10 @@
         - which
       when: ansible_os_family == 'RedHat'
 
+    - name: Update apt cache.
+      apt: update_cache=yes
+      when: ansible_os_family == 'Debian'
+
     - name: Ensure build dependencies are installed (Debian).
       apt: 'name="{{ item }}" state=installed'
       with_items:
diff --git a/provisioning/roles/geerlingguy.ruby/README.md b/provisioning/roles/geerlingguy.ruby/README.md
index 2c0061724..e6ab8d9fa 100644
--- a/provisioning/roles/geerlingguy.ruby/README.md
+++ b/provisioning/roles/geerlingguy.ruby/README.md
@@ -16,9 +16,9 @@ Available variables are listed below, along with default values (see `defaults/m
 
 The location where temporary files will be downloaded in preparation for Ruby installation.
 
-    ruby_rubygems_package_name: rubygems
+    ruby_install_bundler: true
 
-The name of the `rubygems` package. Generally, the default should work; but it will be set to `rubygems-integration` automatically on Ubuntu Trusty (14.04).
+Whether this role should install [Bundler](http://bundler.io/).
 
     ruby_install_gems: []
 
@@ -40,6 +40,10 @@ The URL from which Ruby will be downloaded (only used if `ruby_install_from_sour
 
 The version of ruby that will be installed (only used if `ruby_install_from_source` is `true`).
 
+    ruby_rubygems_package_name: rubygems
+
+The name of the `rubygems` package. Generally, the default should work; but it will be set to `rubygems-integration` automatically on Ubuntu Trusty (14.04).
+
 ## Dependencies
 
 None.
diff --git a/provisioning/roles/geerlingguy.ruby/defaults/main.yml b/provisioning/roles/geerlingguy.ruby/defaults/main.yml
index bd0698362..93e4f9b9e 100644
--- a/provisioning/roles/geerlingguy.ruby/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.ruby/defaults/main.yml
@@ -1,11 +1,14 @@
 ---
 workspace: /root
 
+# Whether this role should install Bundler.
+ruby_install_bundler: true
+
 # A list of Ruby gems to install.
 ruby_install_gems: []
 
 # The user account under which Ruby gems will be installed.
-# ruby_install_gems_user: username
+ruby_install_gems_user: "{{ ansible_user }}"
 
 # If set to TRUE, ruby will be installed from source, using the version set with
 # the 'ruby_version' variable instead of using a package.
@@ -13,4 +16,5 @@ ruby_install_from_source: false
 ruby_download_url: http://cache.ruby-lang.org/pub/ruby/2.3/ruby-2.3.0.tar.gz
 ruby_version: 2.3.0
 
+# Default should usually work, but this will be overridden on Ubuntu 14.04.
 ruby_rubygems_package_name: rubygems
diff --git a/provisioning/roles/geerlingguy.ruby/meta/main.yml b/provisioning/roles/geerlingguy.ruby/meta/main.yml
index 6c5c21ba1..3cb9fa82c 100644
--- a/provisioning/roles/geerlingguy.ruby/meta/main.yml
+++ b/provisioning/roles/geerlingguy.ruby/meta/main.yml
@@ -6,7 +6,7 @@ galaxy_info:
   description: Ruby installation for Linux.
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 1.9
+  min_ansible_version: 2.0
   platforms:
     - name: EL
       versions:
diff --git a/provisioning/roles/geerlingguy.ruby/tasks/main.yml b/provisioning/roles/geerlingguy.ruby/tasks/main.yml
index b79d38b4e..6d959bbf5 100644
--- a/provisioning/roles/geerlingguy.ruby/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.ruby/tasks/main.yml
@@ -13,11 +13,7 @@
 # Install Bundler and configured gems.
 - name: Install Bundler.
   gem: name=bundler state=present user_install=no
-
-- name: Define ruby_install_gems_user.
-  set_fact:
-    ruby_install_gems_user: "{{ ansible_ssh_user }}"
-  when: ruby_install_gems_user is not defined
+  when: ruby_install_bundler
 
 - name: Install configured gems.
   gem: "name={{ item }} state=present"
diff --git a/provisioning/roles/geerlingguy.varnish/tasks/main.yml b/provisioning/roles/geerlingguy.varnish/tasks/main.yml
index ffdaae452..ffa76f313 100644
--- a/provisioning/roles/geerlingguy.varnish/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.varnish/tasks/main.yml
@@ -25,7 +25,7 @@
     dest: "{{ varnish_systemd_config_path }}/varnish.service"
     owner: root
     group: root
-    mode: 0655
+    mode: 0644
   when: >
     (ansible_os_family == 'Debian') and
     (ansible_distribution_release == "jessie" or ansible_distribution_release == "xenial")

From 3cd552b44d47516d90025f1e45e65bf3a2192d4d Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 13 Sep 2016 21:06:06 -0500
Subject: [PATCH 0413/1273] Update to 1.0.7 version of memcached role.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.memcached/.travis.yml   | 59 ++++++++++++-------
 .../roles/geerlingguy.memcached/README.md     |  2 +-
 .../geerlingguy.memcached/handlers/main.yml   |  1 +
 .../roles/geerlingguy.memcached/meta/main.yml | 27 +++++----
 .../geerlingguy.memcached/tasks/main.yml      | 10 ++--
 .../tasks/setup-Debian.yml                    |  6 --
 .../tasks/setup-RedHat.yml                    |  3 -
 .../templates/memcached-Debian.conf.j2        | 18 +++++-
 .../templates/memcached-RedHat.conf.j2        |  1 +
 .../geerlingguy.memcached/tests/inventory     |  1 -
 .../geerlingguy.memcached/tests/test.yml      |  6 +-
 12 files changed, 83 insertions(+), 53 deletions(-)
 delete mode 100644 provisioning/roles/geerlingguy.memcached/tasks/setup-Debian.yml
 delete mode 100644 provisioning/roles/geerlingguy.memcached/tasks/setup-RedHat.yml
 delete mode 100644 provisioning/roles/geerlingguy.memcached/tests/inventory

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 588d2d897..aa7bb334c 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -30,7 +30,7 @@
 - src: geerlingguy.mailhog
   version: 2.0.0
 - src: geerlingguy.memcached
-  version: 1.0.4
+  version: 1.0.7
 - src: geerlingguy.mysql
   version: 2.3.2
 - src: geerlingguy.nginx
diff --git a/provisioning/roles/geerlingguy.memcached/.travis.yml b/provisioning/roles/geerlingguy.memcached/.travis.yml
index 3f9719b3b..b4e17c489 100644
--- a/provisioning/roles/geerlingguy.memcached/.travis.yml
+++ b/provisioning/roles/geerlingguy.memcached/.travis.yml
@@ -1,34 +1,53 @@
 ---
-language: python
-python: "2.7"
+sudo: required
 
 env:
-  - SITE=test.yml
+  - distro: centos7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distro: ubuntu1604
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distro: ubuntu1404
+    init: /sbin/init
+    run_opts: ""
+  - distro: ubuntu1204
+    init: /sbin/init
+    run_opts: ""
+
+services:
+  - docker
 
 before_install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -y curl
-
-install:
-  # Install Ansible.
-  - pip install ansible
-
-  # Add ansible.cfg to pick up roles path.
-  - "{ echo '[defaults]'; echo 'roles_path = ../'; } >> ansible.cfg"
+  # Pull container
+  - 'sudo docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
-  # Check the role/playbook's syntax.
-  - "ansible-playbook -i tests/inventory tests/$SITE --syntax-check"
+  - container_id=$(mktemp)
+  # Run container in detached state.
+  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
+
+  # Ansible syntax check.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
 
-  # Run the role/playbook with ansible-playbook.
-  - "ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo"
+  # Test role.
+  - 'sudo docker exec "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
 
-  # Run the role/playbook again, checking to make sure it's idempotent.
+  # Test role idempotence.
+  - idempotence=$(mktemp)
+  - sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
   - >
-    ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo
+    tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
     && (echo 'Idempotence test: pass' && exit 0)
     || (echo 'Idempotence test: fail' && exit 1)
 
-  # Check the version of Memcached (if this output fails, it's not running).
-  - memcached -h | head -1
+  # Check if memcached is running.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm memcached -h'
+
+after_success:
+  # Clean up.
+  - 'sudo docker stop "$(cat ${container_id})"'
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.memcached/README.md b/provisioning/roles/geerlingguy.memcached/README.md
index 79af09a0c..fe35ae581 100644
--- a/provisioning/roles/geerlingguy.memcached/README.md
+++ b/provisioning/roles/geerlingguy.memcached/README.md
@@ -50,4 +50,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.memcached/handlers/main.yml b/provisioning/roles/geerlingguy.memcached/handlers/main.yml
index 9aaea02cb..af45c6f07 100644
--- a/provisioning/roles/geerlingguy.memcached/handlers/main.yml
+++ b/provisioning/roles/geerlingguy.memcached/handlers/main.yml
@@ -1,3 +1,4 @@
 ---
 - name: restart memcached
   service: name=memcached state=restarted
+  when: not memcached_install.changed
diff --git a/provisioning/roles/geerlingguy.memcached/meta/main.yml b/provisioning/roles/geerlingguy.memcached/meta/main.yml
index 876bbbc8f..8469ea699 100644
--- a/provisioning/roles/geerlingguy.memcached/meta/main.yml
+++ b/provisioning/roles/geerlingguy.memcached/meta/main.yml
@@ -6,19 +6,20 @@ galaxy_info:
   description: Memcached for Linux
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 1.4
+  min_ansible_version: 2.0
   platforms:
-  - name: EL
-    versions:
-    - 6
-    - 7
-  - name: Ubuntu
-    versions:
-    - precise
-    - trusty
-  - name: Debian
-    versions:
-    - all
-  categories:
+    - name: EL
+      versions:
+      - 6
+      - 7
+    - name: Ubuntu
+      versions:
+      - precise
+      - trusty
+      - xenial
+    - name: Debian
+      versions:
+      - all
+  galaxy_tags:
     - web
     - database
diff --git a/provisioning/roles/geerlingguy.memcached/tasks/main.yml b/provisioning/roles/geerlingguy.memcached/tasks/main.yml
index 2aa71cf0a..522b8065c 100644
--- a/provisioning/roles/geerlingguy.memcached/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.memcached/tasks/main.yml
@@ -9,12 +9,14 @@
   when: memcached_user is not defined
 
 # Setup/install tasks.
-- include: setup-RedHat.yml
-  when: ansible_os_family == 'RedHat'
-
-- include: setup-Debian.yml
+- name: Update apt cache.
+  apt: update_cache=yes cache_valid_time=86400
   when: ansible_os_family == 'Debian'
 
+- name: Install Memcached.
+  package: name=memcached state=installed
+  register: memcached_install
+
 # Configure Memcached.
 - name: Copy Memcached configuration.
   template:
diff --git a/provisioning/roles/geerlingguy.memcached/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.memcached/tasks/setup-Debian.yml
deleted file mode 100644
index 2a5b4145b..000000000
--- a/provisioning/roles/geerlingguy.memcached/tasks/setup-Debian.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-- name: Update apt cache.
-  apt: update_cache=yes cache_valid_time=86400
-
-- name: Install Memcached.
-  apt: name=memcached state=installed
diff --git a/provisioning/roles/geerlingguy.memcached/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.memcached/tasks/setup-RedHat.yml
deleted file mode 100644
index 461cc3538..000000000
--- a/provisioning/roles/geerlingguy.memcached/tasks/setup-RedHat.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-- name: Install Memcached.
-  yum: name=memcached state=installed
diff --git a/provisioning/roles/geerlingguy.memcached/templates/memcached-Debian.conf.j2 b/provisioning/roles/geerlingguy.memcached/templates/memcached-Debian.conf.j2
index 25f0aacdf..5ff4c84c1 100644
--- a/provisioning/roles/geerlingguy.memcached/templates/memcached-Debian.conf.j2
+++ b/provisioning/roles/geerlingguy.memcached/templates/memcached-Debian.conf.j2
@@ -1,5 +1,12 @@
+# {{ ansible_managed }}
+# memcached default config file
+# 2003 - Jay Bonci <jaybonci@debian.org>
+# This configuration file is read by the start-memcached script provided as
+# part of the Debian GNU/Linux distribution.
+
 # Run memcached as a daemon. This command is implied, and is not needed for the
-# daemon to run.
+# daemon to run. See the README.Debian that comes with this package for more
+# information.
 -d
 
 # Log memcached's output to /var/log/memcached
@@ -25,3 +32,12 @@ logfile {{ memcached_log_file }}
 
 # Limit the number of simultaneous incoming connections. The daemon default is 1024
 -c {{ memcached_connections }}
+
+# Lock down all paged memory. Consult with the README and homepage before you do this
+# -k
+
+# Return error when memory is exhausted (rather than removing items)
+# -M
+
+# Maximize core file limit
+# -r
diff --git a/provisioning/roles/geerlingguy.memcached/templates/memcached-RedHat.conf.j2 b/provisioning/roles/geerlingguy.memcached/templates/memcached-RedHat.conf.j2
index e57d425a4..c36f4f4ea 100644
--- a/provisioning/roles/geerlingguy.memcached/templates/memcached-RedHat.conf.j2
+++ b/provisioning/roles/geerlingguy.memcached/templates/memcached-RedHat.conf.j2
@@ -1,3 +1,4 @@
+# {{ ansible_managed }}
 # Default connection port is 11211
 PORT="{{ memcached_port }}"
 
diff --git a/provisioning/roles/geerlingguy.memcached/tests/inventory b/provisioning/roles/geerlingguy.memcached/tests/inventory
deleted file mode 100644
index 2fbb50c4a..000000000
--- a/provisioning/roles/geerlingguy.memcached/tests/inventory
+++ /dev/null
@@ -1 +0,0 @@
-localhost
diff --git a/provisioning/roles/geerlingguy.memcached/tests/test.yml b/provisioning/roles/geerlingguy.memcached/tests/test.yml
index cc7aee226..3646ff420 100644
--- a/provisioning/roles/geerlingguy.memcached/tests/test.yml
+++ b/provisioning/roles/geerlingguy.memcached/tests/test.yml
@@ -1,5 +1,5 @@
 ---
-- hosts: localhost
-  remote_user: root
+- hosts: all
+
   roles:
-    - ansible-role-memcached
+    - role_under_test

From 23eab1833aa87082362ff598ca03dd28bec1004f Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 15 Sep 2016 16:10:54 -0500
Subject: [PATCH 0414/1273] Update to latest version of XDebug role.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.php-xdebug/.travis.yml  | 51 ++++++++-----------
 .../roles/geerlingguy.php-xdebug/README.md    |  4 +-
 .../geerlingguy.php-xdebug/defaults/main.yml  |  2 +-
 .../geerlingguy.php-xdebug/meta/main.yml      |  2 +-
 .../geerlingguy.php-xdebug/tasks/main.yml     | 18 ++-----
 .../tests/Dockerfile.centos-6                 | 19 -------
 .../tests/Dockerfile.centos-7                 | 29 -----------
 .../tests/Dockerfile.ubuntu-12.04             | 11 ----
 .../tests/Dockerfile.ubuntu-14.04             | 11 ----
 .../geerlingguy.php-xdebug/tests/inventory    |  1 -
 .../tests/requirements.yml                    |  4 ++
 .../tests/test-source.yml                     | 21 --------
 .../geerlingguy.php-xdebug/tests/test.yml     | 31 +++++++++++
 14 files changed, 66 insertions(+), 140 deletions(-)
 delete mode 100644 provisioning/roles/geerlingguy.php-xdebug/tests/Dockerfile.centos-6
 delete mode 100644 provisioning/roles/geerlingguy.php-xdebug/tests/Dockerfile.centos-7
 delete mode 100644 provisioning/roles/geerlingguy.php-xdebug/tests/Dockerfile.ubuntu-12.04
 delete mode 100644 provisioning/roles/geerlingguy.php-xdebug/tests/Dockerfile.ubuntu-14.04
 delete mode 100644 provisioning/roles/geerlingguy.php-xdebug/tests/inventory
 create mode 100644 provisioning/roles/geerlingguy.php-xdebug/tests/requirements.yml
 delete mode 100644 provisioning/roles/geerlingguy.php-xdebug/tests/test-source.yml
 create mode 100644 provisioning/roles/geerlingguy.php-xdebug/tests/test.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index aa7bb334c..5626b2a78 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -48,7 +48,7 @@
 - src: geerlingguy.php-redis
   version: 3.0.0
 - src: geerlingguy.php-xdebug
-  version: 2.1.0
+  version: 2.1.1
 - src: geerlingguy.php-xhprof
   version: 2.1.2
 - src: geerlingguy.pimpmylog
diff --git a/provisioning/roles/geerlingguy.php-xdebug/.travis.yml b/provisioning/roles/geerlingguy.php-xdebug/.travis.yml
index f67ce39ed..f1d45daea 100644
--- a/provisioning/roles/geerlingguy.php-xdebug/.travis.yml
+++ b/provisioning/roles/geerlingguy.php-xdebug/.travis.yml
@@ -2,60 +2,51 @@
 sudo: required
 
 env:
-  - distribution: centos
-    version: 6
-    init: /sbin/init
-    run_opts: ""
-    SITE: source
-  - distribution: centos
-    version: 7
+  - distro: centos7
     init: /usr/lib/systemd/systemd
     run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-    SITE: source
-  - distribution: ubuntu
-    version: 14.04
-    init: /sbin/init
-    run_opts: ""
-    SITE: source
-  - distribution: ubuntu
-    version: 12.04
-    init: /sbin/init
-    run_opts: ""
-    SITE: source
+  - distro: ubuntu1604
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distro: debian8
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
 
 services:
   - docker
 
 before_install:
-  # Pull container
-  - 'sudo docker pull ${distribution}:${version}'
-  # Customize container
-  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+  # Pull container.
+  - 'sudo docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
   - container_id=$(mktemp)
-  # Run container in detached state
-  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+  # Run container in detached state.
+  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
 
   # Install dependencies.
-  - 'sudo docker exec "$(cat ${container_id})" ansible-galaxy install geerlingguy.php geerlingguy.repo-remi'
+  - 'sudo docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
 
   # Ansible syntax check.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test-${SITE}.yml --syntax-check'
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
 
   # Test role.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test-${SITE}.yml'
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
 
   # Test role idempotence.
+  - idempotence=$(mktemp)
+  - sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
   - >
-    sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test-${SITE}.yml
+    tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
     && (echo 'Idempotence test: pass' && exit 0)
     || (echo 'Idempotence test: fail' && exit 1)
+
   # Run script to test if Xdebug is available and working.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm php /etc/ansible/roles/role_under_test/tests/xdebug-test.php'
+  - 'sudo docker exec "$(cat ${container_id})" env TERM=xterm php /etc/ansible/roles/role_under_test/tests/xdebug-test.php'
 
-  # Clean up
+after_success:
+  # Clean up.
   - 'sudo docker stop "$(cat ${container_id})"'
 
 notifications:
diff --git a/provisioning/roles/geerlingguy.php-xdebug/README.md b/provisioning/roles/geerlingguy.php-xdebug/README.md
index 6fe84800d..9c50ac1de 100644
--- a/provisioning/roles/geerlingguy.php-xdebug/README.md
+++ b/provisioning/roles/geerlingguy.php-xdebug/README.md
@@ -16,7 +16,7 @@ Available variables are listed below, along with default values (see `defaults/m
 
 Where Xdebug setup files will be downloaded and built.
 
-    php_xdebug_version: 2.4.0
+    php_xdebug_version: 2.4.1
 
 The version of Xdebug to be installed (see [Updates](https://xdebug.org/updates.php) for a current listing).
 
@@ -74,4 +74,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.php-xdebug/defaults/main.yml b/provisioning/roles/geerlingguy.php-xdebug/defaults/main.yml
index ecccbf1ec..baa994755 100644
--- a/provisioning/roles/geerlingguy.php-xdebug/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.php-xdebug/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
 workspace: /root
 
-php_xdebug_version: 2.4.0
+php_xdebug_version: 2.4.1
 
 php_xdebug_coverage_enable: 1
 php_xdebug_default_enable: 1
diff --git a/provisioning/roles/geerlingguy.php-xdebug/meta/main.yml b/provisioning/roles/geerlingguy.php-xdebug/meta/main.yml
index 8724d2929..27c831b1c 100644
--- a/provisioning/roles/geerlingguy.php-xdebug/meta/main.yml
+++ b/provisioning/roles/geerlingguy.php-xdebug/meta/main.yml
@@ -7,7 +7,7 @@ galaxy_info:
   description: PHP XDebug for Linux
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 1.8
+  min_ansible_version: 2.0
   platforms:
     - name: EL
       versions:
diff --git a/provisioning/roles/geerlingguy.php-xdebug/tasks/main.yml b/provisioning/roles/geerlingguy.php-xdebug/tasks/main.yml
index 2a0302e2e..1f4eb8ebf 100644
--- a/provisioning/roles/geerlingguy.php-xdebug/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php-xdebug/tasks/main.yml
@@ -3,31 +3,23 @@
   include_vars: "{{ ansible_os_family }}.yml"
 
 - name: Ensure dependencies for building from source are installed (RedHat).
-  yum: "pkg={{ item }} state=installed"
+  yum: "name={{ item }} state=installed"
   with_items:
-    - make
+    - '@development'
   when: ansible_os_family == 'RedHat'
 
 - name: Ensure dependencies for building from source are installed (Debian).
-  apt: "pkg={{ item }} state=installed"
+  apt: "name={{ item }} state=installed"
   with_items:
-    - make
+    - build-essential
   when: ansible_os_family == 'Debian'
 
-- name: Download Xdebug.
-  get_url:
-    url: "https://xdebug.org/files/xdebug-{{ php_xdebug_version }}.tgz"
-    dest: "{{ workspace }}/xdebug-{{ php_xdebug_version }}.tgz"
-
-# TODO: In 2.0, we can set the 'src' to the URL from the get_url task above and
-# cut out one extra task :)
 - name: Untar Xdebug.
   unarchive:
-    src: "{{ workspace }}/xdebug-{{ php_xdebug_version }}.tgz"
+    src: "https://xdebug.org/files/xdebug-{{ php_xdebug_version }}.tgz"
     dest: "{{ workspace }}"
     copy: no
 
-
 - name: Build Xdebug.
   shell: >
     {{ item }}
diff --git a/provisioning/roles/geerlingguy.php-xdebug/tests/Dockerfile.centos-6 b/provisioning/roles/geerlingguy.php-xdebug/tests/Dockerfile.centos-6
deleted file mode 100644
index 7adc80e49..000000000
--- a/provisioning/roles/geerlingguy.php-xdebug/tests/Dockerfile.centos-6
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM centos:6
-
-# Install Ansible
-RUN yum -y update; yum clean all;
-RUN yum -y install epel-release
-RUN yum update openssl
-RUN yum -y install git python-setuptools gcc sudo libffi-devel python-devel openssl-devel
-RUN yum clean all
-RUN easy_install pip
-RUN pip install ansible
-
-# Disable requiretty
-RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
-
-# Install Ansible inventory file
-RUN mkdir -p /etc/ansible
-RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
-
-CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.php-xdebug/tests/Dockerfile.centos-7 b/provisioning/roles/geerlingguy.php-xdebug/tests/Dockerfile.centos-7
deleted file mode 100644
index 7df59cdbb..000000000
--- a/provisioning/roles/geerlingguy.php-xdebug/tests/Dockerfile.centos-7
+++ /dev/null
@@ -1,29 +0,0 @@
-FROM centos:7
-
-# Install systemd -- See https://hub.docker.com/_/centos/
-RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
-RUN yum -y update; yum clean all; \
-(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
-rm -f /lib/systemd/system/multi-user.target.wants/*; \
-rm -f /etc/systemd/system/*.wants/*; \
-rm -f /lib/systemd/system/local-fs.target.wants/*; \
-rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
-rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
-rm -f /lib/systemd/system/basic.target.wants/*; \
-rm -f /lib/systemd/system/anaconda.target.wants/*;
-
-# Install Ansible
-RUN yum -y install git python-setuptools gcc sudo libffi-devel python-devel openssl-devel
-RUN yum clean all
-RUN easy_install pip
-RUN pip install ansible
-
-# Disable requiretty
-RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
-
-# Install Ansible inventory file
-RUN mkdir -p /etc/ansible
-RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
-
-VOLUME ["/sys/fs/cgroup"]
-CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.php-xdebug/tests/Dockerfile.ubuntu-12.04 b/provisioning/roles/geerlingguy.php-xdebug/tests/Dockerfile.ubuntu-12.04
deleted file mode 100644
index d0c130cdf..000000000
--- a/provisioning/roles/geerlingguy.php-xdebug/tests/Dockerfile.ubuntu-12.04
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM ubuntu:12.04
-RUN apt-get update
-
-# Install Ansible
-RUN apt-get install -y software-properties-common python-software-properties git
-RUN apt-add-repository -y ppa:ansible/ansible
-RUN apt-get update
-RUN apt-get install -y ansible
-
-# Install Ansible inventory file
-RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.php-xdebug/tests/Dockerfile.ubuntu-14.04 b/provisioning/roles/geerlingguy.php-xdebug/tests/Dockerfile.ubuntu-14.04
deleted file mode 100644
index ca332871f..000000000
--- a/provisioning/roles/geerlingguy.php-xdebug/tests/Dockerfile.ubuntu-14.04
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM ubuntu:14.04
-RUN apt-get update
-
-# Install Ansible
-RUN apt-get install -y software-properties-common git
-RUN apt-add-repository -y ppa:ansible/ansible
-RUN apt-get update
-RUN apt-get install -y ansible
-
-# Install Ansible inventory file
-RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.php-xdebug/tests/inventory b/provisioning/roles/geerlingguy.php-xdebug/tests/inventory
deleted file mode 100644
index 2fbb50c4a..000000000
--- a/provisioning/roles/geerlingguy.php-xdebug/tests/inventory
+++ /dev/null
@@ -1 +0,0 @@
-localhost
diff --git a/provisioning/roles/geerlingguy.php-xdebug/tests/requirements.yml b/provisioning/roles/geerlingguy.php-xdebug/tests/requirements.yml
new file mode 100644
index 000000000..51eedd6a9
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xdebug/tests/requirements.yml
@@ -0,0 +1,4 @@
+---
+- src: geerlingguy.repo-remi
+- src: geerlingguy.repo-dotdeb
+- src: geerlingguy.php
diff --git a/provisioning/roles/geerlingguy.php-xdebug/tests/test-source.yml b/provisioning/roles/geerlingguy.php-xdebug/tests/test-source.yml
deleted file mode 100644
index 9f1e024b9..000000000
--- a/provisioning/roles/geerlingguy.php-xdebug/tests/test-source.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-- hosts: all
-
-  vars:
-    php_enable_webserver: false
-    php_version: 5.6
-    php_enablerepo: "remi,remi-php56"
-
-  pre_tasks:
-    - name: Ensure build dependencies are installed (RedHat).
-      yum: name=which state=present
-      when: ansible_os_family == 'RedHat'
-
-    - name: Add repository for PHP 5.6.
-      apt_repository: repo='ppa:ondrej/php5-5.6'
-      when: ansible_os_family == 'Debian'
-
-  roles:
-    - { role: geerlingguy.repo-remi, when: ansible_os_family == 'RedHat' }
-    - geerlingguy.php
-    - role_under_test
diff --git a/provisioning/roles/geerlingguy.php-xdebug/tests/test.yml b/provisioning/roles/geerlingguy.php-xdebug/tests/test.yml
new file mode 100644
index 000000000..498627ade
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xdebug/tests/test.yml
@@ -0,0 +1,31 @@
+---
+- hosts: all
+
+  vars:
+    php_enable_webserver: false
+    php_enablerepo: "remi,remi-php70"
+
+  pre_tasks:
+    - name: Ensure build dependencies are installed (RedHat).
+      yum: name=which state=present
+      when: ansible_os_family == 'RedHat'
+
+    - name: Set php_packages for PHP 7.0 Debian 8 install.
+      set_fact:
+        php_packages:
+          - php7.0-common
+          - php7.0-cli
+          - php7.0-dev
+          - php7.0-fpm
+          - libpcre3-dev
+          - php7.0-opcache
+          - php7.0-apcu
+      when: ansible_distribution == 'Debian'
+
+  roles:
+    - role: geerlingguy.repo-remi
+      when: ansible_os_family == 'RedHat'
+    - role: geerlingguy.repo-dotdeb
+      when: ansible_distribution == 'Debian'
+    - geerlingguy.php
+    - role_under_test

From 3dda2e848d77c199354d03862053bc0e361825b4 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 15 Sep 2016 17:11:15 -0500
Subject: [PATCH 0415/1273] Update XHProf role to latest version.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.php-xhprof/.travis.yml  | 47 +++++++++----------
 .../roles/geerlingguy.php-xhprof/README.md    |  2 +-
 .../geerlingguy.php-xhprof/meta/main.yml      |  2 +-
 .../geerlingguy.php-xhprof/tasks/main.yml     | 25 ++++------
 .../tasks/setup-Debian.yml                    |  8 ----
 .../tasks/setup-RedHat.yml                    |  8 ----
 .../tests/Dockerfile.centos-7                 | 30 ------------
 .../tests/Dockerfile.ubuntu-12.04             | 13 -----
 .../tests/Dockerfile.ubuntu-14.04             | 13 -----
 .../geerlingguy.php-xhprof/tests/inventory    |  1 -
 .../tests/requirements.yml                    |  4 ++
 .../tests/test-source.yml                     | 20 --------
 .../geerlingguy.php-xhprof/tests/test.yml     | 31 ++++++++++++
 14 files changed, 68 insertions(+), 138 deletions(-)
 delete mode 100644 provisioning/roles/geerlingguy.php-xhprof/tasks/setup-Debian.yml
 delete mode 100644 provisioning/roles/geerlingguy.php-xhprof/tasks/setup-RedHat.yml
 delete mode 100644 provisioning/roles/geerlingguy.php-xhprof/tests/Dockerfile.centos-7
 delete mode 100644 provisioning/roles/geerlingguy.php-xhprof/tests/Dockerfile.ubuntu-12.04
 delete mode 100644 provisioning/roles/geerlingguy.php-xhprof/tests/Dockerfile.ubuntu-14.04
 delete mode 100644 provisioning/roles/geerlingguy.php-xhprof/tests/inventory
 create mode 100644 provisioning/roles/geerlingguy.php-xhprof/tests/requirements.yml
 delete mode 100644 provisioning/roles/geerlingguy.php-xhprof/tests/test-source.yml
 create mode 100644 provisioning/roles/geerlingguy.php-xhprof/tests/test.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 5626b2a78..f9289e2c6 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -50,7 +50,7 @@
 - src: geerlingguy.php-xdebug
   version: 2.1.1
 - src: geerlingguy.php-xhprof
-  version: 2.1.2
+  version: 2.1.3
 - src: geerlingguy.pimpmylog
   version: 1.0.2
 - src: geerlingguy.postfix
diff --git a/provisioning/roles/geerlingguy.php-xhprof/.travis.yml b/provisioning/roles/geerlingguy.php-xhprof/.travis.yml
index 00c73d710..ca4ab385c 100644
--- a/provisioning/roles/geerlingguy.php-xhprof/.travis.yml
+++ b/provisioning/roles/geerlingguy.php-xhprof/.travis.yml
@@ -2,57 +2,52 @@
 sudo: required
 
 env:
-  - distribution: centos
-    version: 7
+  - distro: centos7
     init: /usr/lib/systemd/systemd
     run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-    SITE: source
-  - distribution: ubuntu
-    version: 14.04
-    init: /sbin/init
-    run_opts: ""
-    SITE: source
-  - distribution: ubuntu
-    version: 12.04
-    init: /sbin/init
-    run_opts: ""
-    SITE: source
+  - distro: ubuntu1604
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distro: debian8
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
 
 services:
   - docker
 
 before_install:
-  # Pull container
-  - 'sudo docker pull ${distribution}:${version}'
-  # Customize container
-  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+  # Pull container.
+  - 'sudo docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
   - container_id=$(mktemp)
-  # Run container in detached state
-  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+  # Run container in detached state.
+  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
 
   # Install dependencies.
-  - 'sudo docker exec "$(cat ${container_id})" ansible-galaxy install geerlingguy.php geerlingguy.repo-remi'
+  - 'sudo docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
 
   # Ansible syntax check.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test-${SITE}.yml --syntax-check'
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
 
   # Test role.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test-${SITE}.yml'
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
 
   # Test role idempotence.
+  - idempotence=$(mktemp)
+  - sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
   - >
-    sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test-${SITE}.yml
+    tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
     && (echo 'Idempotence test: pass' && exit 0)
     || (echo 'Idempotence test: fail' && exit 1)
 
   # Run script to test if XHProf is available and working.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm php /etc/ansible/roles/role_under_test/tests/xhprof-test.php'
+  - 'sudo docker exec "$(cat ${container_id})" env TERM=xterm php /etc/ansible/roles/role_under_test/tests/xhprof-test.php'
 
-  # Clean up
+after_success:
+  # Clean up.
   - 'sudo docker stop "$(cat ${container_id})"'
 
 notifications:
-   webhooks: https://galaxy.ansible.com/api/v1/notifications/
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.php-xhprof/README.md b/provisioning/roles/geerlingguy.php-xhprof/README.md
index fb2171cce..242aedeef 100644
--- a/provisioning/roles/geerlingguy.php-xhprof/README.md
+++ b/provisioning/roles/geerlingguy.php-xhprof/README.md
@@ -49,4 +49,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.php-xhprof/meta/main.yml b/provisioning/roles/geerlingguy.php-xhprof/meta/main.yml
index f4fd533b2..6077e3b10 100644
--- a/provisioning/roles/geerlingguy.php-xhprof/meta/main.yml
+++ b/provisioning/roles/geerlingguy.php-xhprof/meta/main.yml
@@ -7,7 +7,7 @@ galaxy_info:
   description: PHP XHProf for Linux
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 1.8
+  min_ansible_version: 2.0
   platforms:
     - name: EL
       versions:
diff --git a/provisioning/roles/geerlingguy.php-xhprof/tasks/main.yml b/provisioning/roles/geerlingguy.php-xhprof/tasks/main.yml
index 8189bacfb..6f0746884 100644
--- a/provisioning/roles/geerlingguy.php-xhprof/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php-xhprof/tasks/main.yml
@@ -3,26 +3,19 @@
   include_vars: "{{ ansible_os_family }}.yml"
 
 # Setup/install tasks.
-- include: setup-RedHat.yml
-  when: ansible_os_family == 'RedHat'
-
-- include: setup-Debian.yml
-  when: ansible_os_family == 'Debian'
-
-- name: Download XHProf source.
-  get_url:
-    url: "{{ xhprof_download_url }}"
-    dest: "{{ workspace }}/xhprof.tar.gz"
-  register: xhprof_download_get_url
+- name: Ensure dependencies for installing XHProf are present.
+  package: "name={{ item }} state=installed"
+  with_items:
+    - make
+    - gcc
+    - unzip
+    - graphviz
 
-# TODO: In 2.0, we can set the 'src' to the URL from the get_url task above and
-# cut out one extra task :)
-- name: Untar XHProf.
+- name: Download and untar XHProf.
   unarchive:
-    src: "{{ workspace }}/xhprof.tar.gz"
+    src: "{{ xhprof_download_url }}"
     dest: "{{ workspace }}"
     copy: no
-  when: xhprof_download_get_url.changed
 
 - name: Build XHProf.
   shell: >
diff --git a/provisioning/roles/geerlingguy.php-xhprof/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.php-xhprof/tasks/setup-Debian.yml
deleted file mode 100644
index 085cd098c..000000000
--- a/provisioning/roles/geerlingguy.php-xhprof/tasks/setup-Debian.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Ensure dependencies for installing from source are installed.
-  apt: "pkg={{ item }} state=installed"
-  with_items:
-    - make
-
-- name: Ensure GraphViz is installed.
-  apt: pkg=graphviz state=installed
diff --git a/provisioning/roles/geerlingguy.php-xhprof/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.php-xhprof/tasks/setup-RedHat.yml
deleted file mode 100644
index 334d8f5c6..000000000
--- a/provisioning/roles/geerlingguy.php-xhprof/tasks/setup-RedHat.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Ensure dependencies for installing from source are installed.
-  yum: "pkg={{ item }} state=installed"
-  with_items:
-    - make
-
-- name: Ensure GraphViz is installed.
-  yum: pkg=graphviz state=installed
diff --git a/provisioning/roles/geerlingguy.php-xhprof/tests/Dockerfile.centos-7 b/provisioning/roles/geerlingguy.php-xhprof/tests/Dockerfile.centos-7
deleted file mode 100644
index 10c2684ce..000000000
--- a/provisioning/roles/geerlingguy.php-xhprof/tests/Dockerfile.centos-7
+++ /dev/null
@@ -1,30 +0,0 @@
-FROM centos:7
-
-# Install systemd -- See https://hub.docker.com/_/centos/
-RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
-RUN yum -y update; yum clean all; \
-(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
-rm -f /lib/systemd/system/multi-user.target.wants/*; \
-rm -f /etc/systemd/system/*.wants/*; \
-rm -f /lib/systemd/system/local-fs.target.wants/*; \
-rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
-rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
-rm -f /lib/systemd/system/basic.target.wants/*; \
-rm -f /lib/systemd/system/anaconda.target.wants/*;
-
-# Install Ansible
-RUN yum -y install epel-release
-RUN yum -y install git ansible sudo
-RUN yum clean all
-
-RUN yum install -y unzip
-RUN yum groupinstall -y "Development Tools"
-
-# Disable requiretty
-RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
-
-# Install Ansible inventory file
-RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
-
-VOLUME ["/sys/fs/cgroup"]
-CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.php-xhprof/tests/Dockerfile.ubuntu-12.04 b/provisioning/roles/geerlingguy.php-xhprof/tests/Dockerfile.ubuntu-12.04
deleted file mode 100644
index 576e3bce8..000000000
--- a/provisioning/roles/geerlingguy.php-xhprof/tests/Dockerfile.ubuntu-12.04
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM ubuntu:12.04
-RUN apt-get update
-
-# Install Ansible
-RUN apt-get install -y software-properties-common python-software-properties git
-RUN apt-add-repository -y ppa:ansible/ansible
-RUN apt-get update
-RUN apt-get install -y ansible
-
-RUN apt-get install -y unzip
-
-# Install Ansible inventory file
-RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.php-xhprof/tests/Dockerfile.ubuntu-14.04 b/provisioning/roles/geerlingguy.php-xhprof/tests/Dockerfile.ubuntu-14.04
deleted file mode 100644
index cb7a7bda4..000000000
--- a/provisioning/roles/geerlingguy.php-xhprof/tests/Dockerfile.ubuntu-14.04
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM ubuntu:14.04
-RUN apt-get update
-
-# Install Ansible
-RUN apt-get install -y software-properties-common git
-RUN apt-add-repository -y ppa:ansible/ansible
-RUN apt-get update
-RUN apt-get install -y ansible
-
-RUN apt-get install -y unzip
-
-# Install Ansible inventory file
-RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.php-xhprof/tests/inventory b/provisioning/roles/geerlingguy.php-xhprof/tests/inventory
deleted file mode 100644
index 2fbb50c4a..000000000
--- a/provisioning/roles/geerlingguy.php-xhprof/tests/inventory
+++ /dev/null
@@ -1 +0,0 @@
-localhost
diff --git a/provisioning/roles/geerlingguy.php-xhprof/tests/requirements.yml b/provisioning/roles/geerlingguy.php-xhprof/tests/requirements.yml
new file mode 100644
index 000000000..51eedd6a9
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xhprof/tests/requirements.yml
@@ -0,0 +1,4 @@
+---
+- src: geerlingguy.repo-remi
+- src: geerlingguy.repo-dotdeb
+- src: geerlingguy.php
diff --git a/provisioning/roles/geerlingguy.php-xhprof/tests/test-source.yml b/provisioning/roles/geerlingguy.php-xhprof/tests/test-source.yml
deleted file mode 100644
index dee464c36..000000000
--- a/provisioning/roles/geerlingguy.php-xhprof/tests/test-source.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-- hosts: all
-
-  vars:
-    php_enable_webserver: false
-    php_enablerepo: "remi,remi-php70"
-
-  pre_tasks:
-    - name: Ensure build dependencies are installed (RedHat).
-      yum: name=which state=present
-      when: ansible_os_family == 'RedHat'
-
-    - name: Add repository for PHP 7.0.
-      apt_repository: repo='ppa:ondrej/php'
-      when: ansible_os_family == 'Debian'
-
-  roles:
-    - { role: geerlingguy.repo-remi, when: ansible_os_family == 'RedHat' }
-    - geerlingguy.php
-    - role_under_test
diff --git a/provisioning/roles/geerlingguy.php-xhprof/tests/test.yml b/provisioning/roles/geerlingguy.php-xhprof/tests/test.yml
new file mode 100644
index 000000000..498627ade
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xhprof/tests/test.yml
@@ -0,0 +1,31 @@
+---
+- hosts: all
+
+  vars:
+    php_enable_webserver: false
+    php_enablerepo: "remi,remi-php70"
+
+  pre_tasks:
+    - name: Ensure build dependencies are installed (RedHat).
+      yum: name=which state=present
+      when: ansible_os_family == 'RedHat'
+
+    - name: Set php_packages for PHP 7.0 Debian 8 install.
+      set_fact:
+        php_packages:
+          - php7.0-common
+          - php7.0-cli
+          - php7.0-dev
+          - php7.0-fpm
+          - libpcre3-dev
+          - php7.0-opcache
+          - php7.0-apcu
+      when: ansible_distribution == 'Debian'
+
+  roles:
+    - role: geerlingguy.repo-remi
+      when: ansible_os_family == 'RedHat'
+    - role: geerlingguy.repo-dotdeb
+      when: ansible_distribution == 'Debian'
+    - geerlingguy.php
+    - role_under_test

From 2997dc9a3db2108f14ac1e3bb0b6d1540a5beef3 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 16 Sep 2016 14:02:17 -0500
Subject: [PATCH 0416/1273] Updated Solr role to latest version.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.solr/.travis.yml        | 50 +++++++++++--------
 provisioning/roles/geerlingguy.solr/README.md |  2 +-
 .../roles/geerlingguy.solr/defaults/main.yml  |  2 +-
 .../roles/geerlingguy.solr/tasks/cores.yml    |  4 +-
 .../roles/geerlingguy.solr/tasks/install.yml  |  2 +-
 .../tests/Dockerfile.centos-7                 | 30 -----------
 .../tests/Dockerfile.ubuntu-12.04             | 11 ----
 .../tests/Dockerfile.ubuntu-14.04             | 11 ----
 .../geerlingguy.solr/tests/test-solr-6.yml    | 26 ++++++++--
 10 files changed, 56 insertions(+), 84 deletions(-)
 delete mode 100644 provisioning/roles/geerlingguy.solr/tests/Dockerfile.centos-7
 delete mode 100644 provisioning/roles/geerlingguy.solr/tests/Dockerfile.ubuntu-12.04
 delete mode 100644 provisioning/roles/geerlingguy.solr/tests/Dockerfile.ubuntu-14.04

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index f9289e2c6..4d1cef323 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -64,6 +64,6 @@
 - src: geerlingguy.security
   version: 1.4.0
 - src: geerlingguy.solr
-  version: 3.1.3
+  version: 3.2.0
 - src: geerlingguy.varnish
   version: 1.6.2
diff --git a/provisioning/roles/geerlingguy.solr/.travis.yml b/provisioning/roles/geerlingguy.solr/.travis.yml
index f9c87c8f4..7f9309a0b 100644
--- a/provisioning/roles/geerlingguy.solr/.travis.yml
+++ b/provisioning/roles/geerlingguy.solr/.travis.yml
@@ -2,28 +2,34 @@
 sudo: required
 
 env:
-  - distribution: centos
-    version: 7
+  # Test current version of Solr on latest supported OSes.
+  - distro: centos7
     init: /usr/lib/systemd/systemd
     run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     solr_major_version: 6
-  - distribution: ubuntu
-    version: 14.04
+  - distro: ubuntu1604
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    solr_major_version: 6
+  - distro: debian8
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    solr_major_version: 6
+
+  # Test older versions of Solr / OSes.
+  - distro: ubuntu1404
     init: /sbin/init
     run_opts: ""
-    solr_major_version: 6
-  - distribution: ubuntu
-    version: 14.04
+    solr_major_version: 5
+  - distro: ubuntu1204
     init: /sbin/init
     run_opts: ""
     solr_major_version: 5
-  - distribution: ubuntu
-    version: 12.04
+  - distro: ubuntu1404
     init: /sbin/init
     run_opts: ""
     solr_major_version: 4
-  - distribution: ubuntu
-    version: 12.04
+  - distro: ubuntu1404
     init: /sbin/init
     run_opts: ""
     solr_major_version: 3
@@ -32,16 +38,13 @@ services:
   - docker
 
 before_install:
-  # - sudo apt-get update
-  # Pull container
-  - 'sudo docker pull ${distribution}:${version}'
-  # Customize container
-  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+  # Pull container.
+  - 'sudo docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
   - container_id=$(mktemp)
-  # Run container in detached state
-  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+  # Run container in detached state.
+  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
 
   # Install dependencies.
   - 'sudo docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
@@ -50,7 +53,7 @@ script:
   - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test-solr-${solr_major_version}.yml --syntax-check'
 
   # Test role.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test-solr-${solr_major_version}.yml'
+  - 'sudo docker exec "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test-solr-${solr_major_version}.yml'
 
   # Test role idempotence.
   - idempotence=$(mktemp)
@@ -61,9 +64,14 @@ script:
     && (echo 'Idempotence test: pass' && exit 0)
     || (echo 'Idempotence test: fail' && exit 1)
 
-  # TODO: Test Solr actually running/working.
+  # Make sure Solr is running.
+  - >
+    sudo docker exec "$(cat ${container_id})" ps -ax | grep -q 'solr'
+    && (echo 'solr is running: pass' && exit 0)
+    || (echo 'solr is running: fail' && exit 1)
 
-  # Clean up
+after_success:
+  # Clean up.
   - 'sudo docker stop "$(cat ${container_id})"'
 
 notifications:
diff --git a/provisioning/roles/geerlingguy.solr/README.md b/provisioning/roles/geerlingguy.solr/README.md
index 5b9770df9..8269222d5 100644
--- a/provisioning/roles/geerlingguy.solr/README.md
+++ b/provisioning/roles/geerlingguy.solr/README.md
@@ -83,4 +83,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.solr/defaults/main.yml b/provisioning/roles/geerlingguy.solr/defaults/main.yml
index f18b751ac..6eaec97e3 100644
--- a/provisioning/roles/geerlingguy.solr/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.solr/defaults/main.yml
@@ -9,7 +9,7 @@ solr_mirror: "https://archive.apache.org/dist"
 
 solr_service_name: solr
 solr_install_dir: /opt
-solr_install_path: /opt/solr
+solr_install_path: "/opt/{{ solr_service_name }}"
 solr_home: /var/solr
 solr_port: "8983"
 
diff --git a/provisioning/roles/geerlingguy.solr/tasks/cores.yml b/provisioning/roles/geerlingguy.solr/tasks/cores.yml
index cf4e134bf..463bdb377 100644
--- a/provisioning/roles/geerlingguy.solr/tasks/cores.yml
+++ b/provisioning/roles/geerlingguy.solr/tasks/cores.yml
@@ -7,7 +7,7 @@
 
 - name: Ensure Solr conf directories exist.
   file:
-    path: "/var/solr/data/{{ item }}/conf"
+    path: "{{ solr_home }}/data/{{ item }}/conf"
     state: directory
     owner: "{{ solr_user }}"
     group: "{{ solr_user }}"
@@ -16,7 +16,7 @@
   with_items: "{{ solr_cores }}"
 
 - name: Ensure core configuration directories exist.
-  shell: "cp -r {{ solr_install_path }}/example/files/conf/ /var/solr/data/{{ item }}/"
+  shell: "cp -r {{ solr_install_path }}/example/files/conf/ {{ solr_home }}/data/{{ item }}/"
   when: "'{{ item }}' not in '{{ solr_cores_current.content }}'"
   with_items: "{{ solr_cores }}"
 
diff --git a/provisioning/roles/geerlingguy.solr/tasks/install.yml b/provisioning/roles/geerlingguy.solr/tasks/install.yml
index 72910cbd6..d541d6cf0 100644
--- a/provisioning/roles/geerlingguy.solr/tasks/install.yml
+++ b/provisioning/roles/geerlingguy.solr/tasks/install.yml
@@ -12,7 +12,7 @@
     -u {{ solr_user }}
     -s {{ solr_service_name }}
     -p {{ solr_port }}
-    creates={{ solr_install_dir }}/solr/bin/solr
+    creates={{ solr_install_path }}/bin/solr
   register: solr_install_script_result
 
 # Workaround for bug https://github.com/ansible/ansible-modules-core/issues/915.
diff --git a/provisioning/roles/geerlingguy.solr/tests/Dockerfile.centos-7 b/provisioning/roles/geerlingguy.solr/tests/Dockerfile.centos-7
deleted file mode 100644
index 75ef801a6..000000000
--- a/provisioning/roles/geerlingguy.solr/tests/Dockerfile.centos-7
+++ /dev/null
@@ -1,30 +0,0 @@
-FROM centos:7
-
-# Install systemd -- See https://hub.docker.com/_/centos/
-RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
-RUN yum -y update; yum clean all; \
-(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
-rm -f /lib/systemd/system/multi-user.target.wants/*; \
-rm -f /etc/systemd/system/*.wants/*; \
-rm -f /lib/systemd/system/local-fs.target.wants/*; \
-rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
-rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
-rm -f /lib/systemd/system/basic.target.wants/*; \
-rm -f /lib/systemd/system/anaconda.target.wants/*;
-
-# Install initscripts
-RUN yum -y install initscripts
-
-# Install Ansible
-RUN yum -y install epel-release
-RUN yum -y install git ansible sudo
-RUN yum clean all
-
-# Disable requiretty
-RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
-
-# Install Ansible inventory file
-RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
-
-VOLUME ["/sys/fs/cgroup"]
-CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.solr/tests/Dockerfile.ubuntu-12.04 b/provisioning/roles/geerlingguy.solr/tests/Dockerfile.ubuntu-12.04
deleted file mode 100644
index d0c130cdf..000000000
--- a/provisioning/roles/geerlingguy.solr/tests/Dockerfile.ubuntu-12.04
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM ubuntu:12.04
-RUN apt-get update
-
-# Install Ansible
-RUN apt-get install -y software-properties-common python-software-properties git
-RUN apt-add-repository -y ppa:ansible/ansible
-RUN apt-get update
-RUN apt-get install -y ansible
-
-# Install Ansible inventory file
-RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.solr/tests/Dockerfile.ubuntu-14.04 b/provisioning/roles/geerlingguy.solr/tests/Dockerfile.ubuntu-14.04
deleted file mode 100644
index ca332871f..000000000
--- a/provisioning/roles/geerlingguy.solr/tests/Dockerfile.ubuntu-14.04
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM ubuntu:14.04
-RUN apt-get update
-
-# Install Ansible
-RUN apt-get install -y software-properties-common git
-RUN apt-add-repository -y ppa:ansible/ansible
-RUN apt-get update
-RUN apt-get install -y ansible
-
-# Install Ansible inventory file
-RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.solr/tests/test-solr-6.yml b/provisioning/roles/geerlingguy.solr/tests/test-solr-6.yml
index cf24a1f20..920aea445 100644
--- a/provisioning/roles/geerlingguy.solr/tests/test-solr-6.yml
+++ b/provisioning/roles/geerlingguy.solr/tests/test-solr-6.yml
@@ -2,19 +2,35 @@
 - hosts: all
 
   pre_tasks:
-    - set_fact:
+    - name: Set Java 8 package for RedHat.
+      set_fact:
         java_packages:
           - java-1.8.0-openjdk
       when: ansible_os_family == "RedHat"
 
-    - set_fact:
+    - name: Set Java 8 package for Debian/Ubuntu.
+      set_fact:
         java_packages:
           - openjdk-8-jdk
-      when: ansible_os_family == "Debian" and ansible_distribution_version == "14.04"
+      when: >
+        ansible_distribution == "Debian" or
+        (ansible_distribution == "Ubuntu" and ansible_distribution_version == "14.04")
 
-    - name: Add repository for OpenJDK 8.
+    - name: Add repository for OpenJDK 8 (Ubuntu 14.04).
       apt_repository: repo='ppa:openjdk-r/ppa'
-      when: ansible_os_family == "Debian" and ansible_distribution_version == "14.04"
+      when: ansible_distribution == "Ubuntu" and ansible_distribution_version == "14.04"
+
+    - name: Enable Backports repository (Debian).
+      apt_repository:
+        repo: 'deb http://ftp.debian.org/debian {{ ansible_distribution_release }}-backports main'
+        state: present
+        filename: "{{ ansible_distribution_release }}_backports"
+      register: debian_backports
+      when: ansible_distribution == "Debian"
+
+    - name: Update apt cache.
+      apt: update_cache=yes
+      when: ansible_distribution == "Debian" and debian_backports.changed
 
   roles:
     - geerlingguy.java

From 1d6d6e76f54b72b762f3ba2f95146156191a1fc0 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 16 Sep 2016 22:17:54 -0500
Subject: [PATCH 0417/1273] Update Varnish role to latest version.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.varnish/.travis.yml     | 36 ++++++++++---------
 .../roles/geerlingguy.varnish/README.md       | 26 ++++++++++----
 .../geerlingguy.varnish/defaults/main.yml     | 10 +++++-
 .../roles/geerlingguy.varnish/meta/main.yml   |  3 +-
 .../tasks/setup-Debian.yml                    |  4 +--
 .../tasks/setup-RedHat.yml                    | 17 +++++----
 .../geerlingguy.varnish/templates/varnish.j2  |  7 +++-
 .../templates/varnish.service.j2              |  7 ++--
 .../tests/Dockerfile.centos-6                 | 15 --------
 .../tests/Dockerfile.centos-7                 | 27 --------------
 .../tests/Dockerfile.ubuntu-12.04             | 11 ------
 .../tests/Dockerfile.ubuntu-14.04             | 17 ---------
 .../roles/geerlingguy.varnish/tests/test.yml  |  9 +++++
 14 files changed, 82 insertions(+), 109 deletions(-)
 delete mode 100644 provisioning/roles/geerlingguy.varnish/tests/Dockerfile.centos-6
 delete mode 100644 provisioning/roles/geerlingguy.varnish/tests/Dockerfile.centos-7
 delete mode 100644 provisioning/roles/geerlingguy.varnish/tests/Dockerfile.ubuntu-12.04
 delete mode 100644 provisioning/roles/geerlingguy.varnish/tests/Dockerfile.ubuntu-14.04

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 4d1cef323..f088feb7e 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -66,4 +66,4 @@
 - src: geerlingguy.solr
   version: 3.2.0
 - src: geerlingguy.varnish
-  version: 1.6.2
+  version: 1.7.0
diff --git a/provisioning/roles/geerlingguy.varnish/.travis.yml b/provisioning/roles/geerlingguy.varnish/.travis.yml
index c7c83c6ad..28beffa0b 100644
--- a/provisioning/roles/geerlingguy.varnish/.travis.yml
+++ b/provisioning/roles/geerlingguy.varnish/.travis.yml
@@ -2,34 +2,33 @@
 sudo: required
 
 env:
-  - distribution: centos
-    version: 6
-    init: /sbin/init
-    run_opts: ""
-  - distribution: centos
-    version: 7
+  - distro: centos7
     init: /usr/lib/systemd/systemd
     run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-  - distribution: ubuntu
-    version: 14.04
-    init: /sbin/my_init
+  - distro: centos6
+    init: /sbin/init
     run_opts: ""
-  - distribution: ubuntu
-    version: 12.04
+  - distro: ubuntu1604
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distro: ubuntu1404
     init: /sbin/init
     run_opts: ""
+  - distro: debian8
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
 
 services:
   - docker
 
 before_install:
-  # Customize container
-  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+  # Pull container.
+  - 'sudo docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
   - container_id=$(mktemp)
-  # Run container in detached state
-  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+  # Run container in detached state.
+  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
 
   # Ansible syntax check.
   - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
@@ -38,8 +37,10 @@ script:
   - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
 
   # Test role idempotence.
+  - idempotence=$(mktemp)
+  - sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
   - >
-    sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml
+    tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
     && (echo 'Idempotence test: pass' && exit 0)
     || (echo 'Idempotence test: fail' && exit 1)
@@ -47,7 +48,8 @@ script:
   # Make sure Varnish is running.
   - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm varnishd -V'
 
-  # Clean up
+after_success:
+  # Clean up.
   - 'sudo docker stop "$(cat ${container_id})"'
 
 notifications:
diff --git a/provisioning/roles/geerlingguy.varnish/README.md b/provisioning/roles/geerlingguy.varnish/README.md
index c15d005fe..afee01984 100644
--- a/provisioning/roles/geerlingguy.varnish/README.md
+++ b/provisioning/roles/geerlingguy.varnish/README.md
@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/geerlingguy/ansible-role-varnish.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-varnish)
 
-An Ansible Role that installs Varnish on RedHat/CentOS or Debian/Ubuntu Linux.
+Installs the [Varnish HTTP Cache](https://varnish-cache.org/) on RedHat/CentOS or Debian/Ubuntu Linux.
 
 ## Requirements
 
@@ -12,9 +12,13 @@ Requires the EPEL repository on RedHat/CentOS (you can install it using the `gee
 
 Available variables are listed below, along with default values (see `defaults/main.yml`):
 
-    varnish_version: "4.0"
+    varnish_package_name: "varnish"
 
-Varnish version that should be installed. See `https://repo.varnish-cache.org/redhat/` for a listing of available versions (e.g. `3.0`, `4.0`, `4.1`). _Note: Ubuntu 16.04 "Xenial"
+Varnish package name you want to install. See `apt-cache policy varnish` or `yum list varnish` for a listing of available candidates.
+
+    varnish_version: "4.1"
+
+Varnish version that should be installed. See `https://repo.varnish-cache.org/redhat/` for a listing of available versions (e.g. `3.0`, `4.0`, `4.1`). _Note: Ubuntu 16.04 "Xenial" defaults to 4.1 from the universe repoistory_
 
     varnish_config_path: /etc/varnish
 
@@ -28,14 +32,18 @@ Whether to use the included (simplistic) default Varnish VCL, using the backend
 
 The default VCL file to be copied (if `varnish_use_default_vcl` is `true`). Defaults the the simple template inside `templates/default.vcl.j2`. This path should be relative to the directory from which you run your playbook.
 
+    varnish_listen_port: "80"
+
+The port on which Varnish will listen (typically port 80).
+
     varnish_default_backend_host: "127.0.0.1"
     varnish_default_backend_port: "8080"
 
 Some settings for the default "default.vcl" template that will be copied to the `varnish_config_path` folder. The default backend host/port could be Apache or Nginx (or some other HTTP server) running on the same host or some other host (in which case, you might use port 80 instead).
 
-    varnish_listen_port: "80"
+    varnish_limit_nofile: 131072
 
-The port on which Varnish will listen (typically port 80).
+The `nofiles` PAM limit Varnish will attempt to set for open files. The normal default is ~1024 which is much too low for Varnish usage.
 
     varnish_secret: "14bac2e6-1e34-4770-8078-974373b76c90"
 
@@ -48,7 +56,11 @@ The host and port through which Varnish will accept admin requests (like purge a
 
     varnish_storage: "file,/var/lib/varnish/varnish_storage.bin,256M"
 
-How Varnish stores cache entries (this is passed in as the argument for `-s`). If you want to use in-memory storage, change to something like `malloc,256M`. Please read Varnish's [Getting Started guide](https://www.varnish-software.com/static/book/Getting_started.html) for more information.
+How Varnish stores cache entries (this is passed in as the argument for `-s`). If you want to use in-memory storage, change to something like `malloc,256M`. Please read Varnish's [Getting Started guide](http://book.varnish-software.com/4.0/chapters/Getting_Started.html) for more information.
+
+    varnish_pidfile: /run/varnishd.pid
+
+Varnish PID file path. Set to an empty string if you don't want to use a PID file.
 
 ## Dependencies
 
@@ -74,4 +86,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.varnish/defaults/main.yml b/provisioning/roles/geerlingguy.varnish/defaults/main.yml
index bf5aac412..0d48d1fc0 100644
--- a/provisioning/roles/geerlingguy.varnish/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.varnish/defaults/main.yml
@@ -1,12 +1,20 @@
 ---
-varnish_version: "4.0"
+varnish_package_name: "varnish"
+varnish_version: "4.1"
+
 varnish_use_default_vcl: true
 varnish_default_vcl_template_path: default.vcl.j2
+
 varnish_default_backend_host: "127.0.0.1"
 varnish_default_backend_port: "8080"
+
 varnish_listen_port: "80"
 varnish_secret: "14bac2e6-1e34-4770-8078-974373b76c90"
 varnish_config_path: /etc/varnish
+varnish_limit_nofile: 131072
+
 varnish_admin_listen_host: "127.0.0.1"
 varnish_admin_listen_port: "6082"
+
 varnish_storage: "file,/var/lib/varnish/varnish_storage.bin,256M"
+varnish_pidfile: /run/varnishd.pid
diff --git a/provisioning/roles/geerlingguy.varnish/meta/main.yml b/provisioning/roles/geerlingguy.varnish/meta/main.yml
index f6096249f..c8ee42244 100644
--- a/provisioning/roles/geerlingguy.varnish/meta/main.yml
+++ b/provisioning/roles/geerlingguy.varnish/meta/main.yml
@@ -6,7 +6,7 @@ galaxy_info:
   description: Varnish for Linux.
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 1.8
+  min_ansible_version: 2.0
   platforms:
     - name: EL
       versions:
@@ -16,6 +16,7 @@ galaxy_info:
       versions:
       - precise
       - trusty
+      - xenial
     - name: Debian
       versions:
       - all
diff --git a/provisioning/roles/geerlingguy.varnish/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.varnish/tasks/setup-Debian.yml
index b7cbba314..51166e28f 100644
--- a/provisioning/roles/geerlingguy.varnish/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.varnish/tasks/setup-Debian.yml
@@ -5,9 +5,9 @@
 
 - name: Add Varnish apt repository.
   apt_repository:
-    repo: "deb http://repo.varnish-cache.org/ubuntu {{ ansible_distribution_release }} varnish-{{ varnish_version }}"
+    repo: "deb http://repo.varnish-cache.org/{{ ansible_distribution | lower }}  {{ ansible_distribution_release }} varnish-{{ varnish_version }}"
     state: present
   when: ansible_distribution_release != "xenial"
 
 - name: Install Varnish.
-  apt: name=varnish state=installed
+  apt: name="{{ varnish_package_name }}" state=installed
diff --git a/provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml
index b19e53985..913f0aa7f 100644
--- a/provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml
@@ -1,12 +1,15 @@
 ---
-- name: Ensure gcc is installed (Varnish dependency).
-  yum: name=gcc state=present
+- name: Ensure Varnish dependencies are installed.
+  yum: name={{ item }} state=present
+  with_items:
+    - gcc
+    - libedit-devel
+    - initscripts
 
 - name: Add Varnish repository.
-  command: >
-    rpm --nosignature -i https://repo.varnish-cache.org/redhat/varnish-{{ varnish_version }}.el6.rpm
-    creates=/var/lib/yum/repos/x86_64/6/varnish-{{ varnish_version }}
-  ignore_errors: true
+  yum:
+    name: https://repo.varnish-cache.org/redhat/varnish-{{ varnish_version }}.el6.rpm
+    state: present
   when: ansible_distribution_major_version|int < 7
 
 - name: Set repo fact appropriately.
@@ -15,7 +18,7 @@
 
 - name: Install Varnish.
   yum:
-    name: varnish
+    name: "{{ varnish_package_name }}"
     state: installed
     enablerepo: "{{ varnish_yum_enablerepo }}"
     disablerepo: "*"
diff --git a/provisioning/roles/geerlingguy.varnish/templates/varnish.j2 b/provisioning/roles/geerlingguy.varnish/templates/varnish.j2
index 6c3db0d5e..87a309465 100644
--- a/provisioning/roles/geerlingguy.varnish/templates/varnish.j2
+++ b/provisioning/roles/geerlingguy.varnish/templates/varnish.j2
@@ -8,7 +8,7 @@
 START=yes
 
 # Maximum number of open files (for ulimit -n)
-NFILES=131072
+NFILES={{ varnish_limit_nofile }}
 
 # Locked shared memory (for ulimit -l)
 # Default log size is 82MB + header
@@ -96,10 +96,15 @@ DAEMON_OPTS="-a ${VARNISH_LISTEN_ADDRESS}:${VARNISH_LISTEN_PORT} \
              -f ${VARNISH_VCL_CONF} \
              -T ${VARNISH_ADMIN_LISTEN_ADDRESS}:${VARNISH_ADMIN_LISTEN_PORT} \
              -t ${VARNISH_TTL} \
+{% if varnish_pidfile %}
+             -P {{ varnish_pidfile }} \
+{% endif %}
              -p thread_pool_min=${VARNISH_MIN_THREADS} \
              -p thread_pool_max=${VARNISH_MAX_THREADS} \
              -p thread_pool_timeout=${VARNISH_THREAD_TIMEOUT} \
+{% if varnish_version | version_compare('4.1', '<') %}
              -u varnish -g varnish \
+{% endif %}
              -S ${VARNISH_SECRET_FILE} \
              -s ${VARNISH_STORAGE}"
 #
diff --git a/provisioning/roles/geerlingguy.varnish/templates/varnish.service.j2 b/provisioning/roles/geerlingguy.varnish/templates/varnish.service.j2
index 737a52f0f..40c4e98df 100644
--- a/provisioning/roles/geerlingguy.varnish/templates/varnish.service.j2
+++ b/provisioning/roles/geerlingguy.varnish/templates/varnish.service.j2
@@ -3,9 +3,12 @@ Description=Varnish Cache, a high-performance HTTP accelerator
 
 [Service]
 Type=forking
-LimitNOFILE=131072
+{% if varnish_pidfile %}
+PIDFile={{ varnish_pidfile }}
+{% endif %}
+LimitNOFILE={{ varnish_limit_nofile }}
 LimitMEMLOCK=82000
-ExecStart=/usr/sbin/varnishd -a :{{ varnish_listen_port }} -T {{ varnish_admin_listen_host }}:{{ varnish_admin_listen_port }} -f /etc/varnish/default.vcl -S /etc/varnish/secret -s malloc,256m
+ExecStart=/usr/sbin/varnishd -a :{{ varnish_listen_port }} -T {{ varnish_admin_listen_host }}:{{ varnish_admin_listen_port }}{% if varnish_pidfile %} -P {{ varnish_pidfile }}{% endif %} -f {{ varnish_config_path }}/default.vcl -S {{ varnish_config_path }}/secret -s {{ varnish_storage }}
 ExecReload=/usr/share/varnish/reload-vcl
 
 [Install]
diff --git a/provisioning/roles/geerlingguy.varnish/tests/Dockerfile.centos-6 b/provisioning/roles/geerlingguy.varnish/tests/Dockerfile.centos-6
deleted file mode 100644
index 4a4e7b8d6..000000000
--- a/provisioning/roles/geerlingguy.varnish/tests/Dockerfile.centos-6
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM centos:6
-
-# Install Ansible
-RUN yum -y update; yum clean all;
-RUN yum -y install epel-release
-RUN yum -y install git ansible sudo
-RUN yum clean all
-
-# Disable requiretty
-RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
-
-# Install Ansible inventory file
-RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
-
-CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.varnish/tests/Dockerfile.centos-7 b/provisioning/roles/geerlingguy.varnish/tests/Dockerfile.centos-7
deleted file mode 100644
index 8aa065497..000000000
--- a/provisioning/roles/geerlingguy.varnish/tests/Dockerfile.centos-7
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM centos:7
-
-# Install systemd -- See https://hub.docker.com/_/centos/
-RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
-RUN yum -y update; yum clean all; \
-(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
-rm -f /lib/systemd/system/multi-user.target.wants/*; \
-rm -f /etc/systemd/system/*.wants/*; \
-rm -f /lib/systemd/system/local-fs.target.wants/*; \
-rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
-rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
-rm -f /lib/systemd/system/basic.target.wants/*; \
-rm -f /lib/systemd/system/anaconda.target.wants/*;
-
-# Install Ansible
-RUN yum -y install epel-release
-RUN yum -y install git ansible sudo
-RUN yum clean all
-
-# Disable requiretty
-RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
-
-# Install Ansible inventory file
-RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
-
-VOLUME ["/sys/fs/cgroup"]
-CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.varnish/tests/Dockerfile.ubuntu-12.04 b/provisioning/roles/geerlingguy.varnish/tests/Dockerfile.ubuntu-12.04
deleted file mode 100644
index d0c130cdf..000000000
--- a/provisioning/roles/geerlingguy.varnish/tests/Dockerfile.ubuntu-12.04
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM ubuntu:12.04
-RUN apt-get update
-
-# Install Ansible
-RUN apt-get install -y software-properties-common python-software-properties git
-RUN apt-add-repository -y ppa:ansible/ansible
-RUN apt-get update
-RUN apt-get install -y ansible
-
-# Install Ansible inventory file
-RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.varnish/tests/Dockerfile.ubuntu-14.04 b/provisioning/roles/geerlingguy.varnish/tests/Dockerfile.ubuntu-14.04
deleted file mode 100644
index 949fd976a..000000000
--- a/provisioning/roles/geerlingguy.varnish/tests/Dockerfile.ubuntu-14.04
+++ /dev/null
@@ -1,17 +0,0 @@
-FROM phusion/baseimage:0.9.18
-RUN apt-get update
-
-# Enable SSH
-RUN rm -f /etc/service/sshd/down
-
-# Create auth.log required by fail2ban.
-RUN touch /var/log/auth.log
-
-# Install Ansible
-RUN apt-get install -y software-properties-common git
-RUN apt-add-repository -y ppa:ansible/ansible
-RUN apt-get update
-RUN apt-get install -y ansible
-
-# Install Ansible inventory file
-RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.varnish/tests/test.yml b/provisioning/roles/geerlingguy.varnish/tests/test.yml
index 69e2a6818..e73971d57 100644
--- a/provisioning/roles/geerlingguy.varnish/tests/test.yml
+++ b/provisioning/roles/geerlingguy.varnish/tests/test.yml
@@ -1,6 +1,10 @@
 - hosts: all
 
   pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=yes
+      when: ansible_os_family == 'Debian'
+
     - name: Ensure build dependencies are installed (RedHat 7+).
       yum: 'name="{{ item }}" state=present'
       with_items:
@@ -16,5 +20,10 @@
         - logrotate
       when: ansible_os_family == 'RedHat' and ansible_distribution_major_version < '7'
 
+    - name: Force working version of Varnish on Ubuntu 14.04.
+      set_fact:
+        varnish_version: "4.0"
+      when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '14.04'
+
   roles:
     - role_under_test

From 7026fbfca461cb80d48a021e4a656ea654d873d1 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 17 Sep 2016 20:11:51 -0500
Subject: [PATCH 0418/1273] UPdate PHP, Java, and Git roles to latest versions.

---
 provisioning/requirements.yml                 |  8 +-
 .../roles/geerlingguy.composer/.travis.yml    | 13 +--
 .../roles/geerlingguy.composer/README.md      |  2 +-
 .../roles/geerlingguy.composer/tests/test.yml |  2 +-
 .../roles/geerlingguy.git/.travis.yml         | 85 ++++++++++---------
 provisioning/roles/geerlingguy.git/README.md  |  2 +-
 .../roles/geerlingguy.git/defaults/main.yml   |  2 +-
 .../roles/geerlingguy.git/meta/main.yml       |  5 +-
 .../tasks/install-from-source.yml             |  6 +-
 .../roles/geerlingguy.git/tasks/main.yml      |  2 +-
 .../geerlingguy.git/tests/Dockerfile.centos-6 | 15 ----
 .../geerlingguy.git/tests/Dockerfile.centos-7 | 27 ------
 .../tests/Dockerfile.ubuntu-12.04             | 11 ---
 .../tests/Dockerfile.ubuntu-14.04             | 11 ---
 .../geerlingguy.git/tests/test-source.yml     |  4 +-
 .../tests/{test-package.yml => test.yml}      |  2 +-
 .../roles/geerlingguy.java/.travis.yml        |  5 +-
 provisioning/roles/geerlingguy.java/README.md |  4 +
 .../roles/geerlingguy.java/defaults/main.yml  |  2 +
 .../roles/geerlingguy.java/meta/main.yml      |  5 +-
 .../roles/geerlingguy.java/tasks/main.yml     | 14 ++-
 .../geerlingguy.java/tasks/setup-RedHat.yml   |  2 +-
 .../templates/java_home.sh.j2                 |  1 +
 .../roles/geerlingguy.java/tests/test.yml     |  6 +-
 .../roles/geerlingguy.java/vars/Fedora.yml    |  6 ++
 .../roles/geerlingguy.php/.travis.yml         | 76 ++++++++---------
 provisioning/roles/geerlingguy.php/README.md  |  2 +-
 .../roles/geerlingguy.php/defaults/main.yml   |  3 +-
 .../roles/geerlingguy.php/meta/main.yml       |  5 +-
 .../tasks/install-from-source.yml             |  2 +-
 .../geerlingguy.php/tasks/setup-RedHat.yml    |  2 +-
 .../geerlingguy.php/tests/Dockerfile.centos-7 | 27 ------
 .../tests/Dockerfile.ubuntu-12.04             | 11 ---
 .../tests/Dockerfile.ubuntu-14.04             | 11 ---
 .../roles/geerlingguy.php/tests/inventory     |  1 -
 .../geerlingguy.php/tests/requirements.yml    |  1 +
 .../geerlingguy.php/tests/test-source.yml     |  3 +-
 .../tests/{test-package.yml => test.yml}      |  5 +-
 38 files changed, 162 insertions(+), 229 deletions(-)
 delete mode 100644 provisioning/roles/geerlingguy.git/tests/Dockerfile.centos-6
 delete mode 100644 provisioning/roles/geerlingguy.git/tests/Dockerfile.centos-7
 delete mode 100644 provisioning/roles/geerlingguy.git/tests/Dockerfile.ubuntu-12.04
 delete mode 100644 provisioning/roles/geerlingguy.git/tests/Dockerfile.ubuntu-14.04
 rename provisioning/roles/geerlingguy.git/tests/{test-package.yml => test.yml} (85%)
 create mode 100644 provisioning/roles/geerlingguy.java/templates/java_home.sh.j2
 create mode 100644 provisioning/roles/geerlingguy.java/vars/Fedora.yml
 delete mode 100644 provisioning/roles/geerlingguy.php/tests/Dockerfile.centos-7
 delete mode 100644 provisioning/roles/geerlingguy.php/tests/Dockerfile.ubuntu-12.04
 delete mode 100644 provisioning/roles/geerlingguy.php/tests/Dockerfile.ubuntu-14.04
 delete mode 100644 provisioning/roles/geerlingguy.php/tests/inventory
 rename provisioning/roles/geerlingguy.php/tests/{test-package.yml => test.yml} (83%)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index f088feb7e..4865680d8 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -12,7 +12,7 @@
 - src: geerlingguy.blackfire
   version: 1.0.0
 - src: geerlingguy.composer
-  version: 1.4.2
+  version: 1.5.0
 - src: geerlingguy.daemonize
   version: 1.1.1
 - src: geerlingguy.drupal-console
@@ -24,9 +24,9 @@
 - src: geerlingguy.firewall
   version: 1.1.0
 - src: geerlingguy.git
-  version: 1.1.1
+  version: 1.2.0
 - src: geerlingguy.java
-  version: 1.4.1
+  version: 1.7.0
 - src: geerlingguy.mailhog
   version: 2.0.0
 - src: geerlingguy.memcached
@@ -38,7 +38,7 @@
 - src: geerlingguy.nodejs
   version: 3.3.0
 - src: geerlingguy.php
-  version: 3.2.2
+  version: 3.3.0
 - src: geerlingguy.php-memcached
   version: 2.0.0
 - src: geerlingguy.php-mysql
diff --git a/provisioning/roles/geerlingguy.composer/.travis.yml b/provisioning/roles/geerlingguy.composer/.travis.yml
index f0085c4ef..04be4ceaf 100644
--- a/provisioning/roles/geerlingguy.composer/.travis.yml
+++ b/provisioning/roles/geerlingguy.composer/.travis.yml
@@ -2,12 +2,13 @@
 sudo: required
 
 env:
-  - repository: geerlingguy/docker-centos7-ansible
-    version: latest
+  - distro: centos7
     init: /usr/lib/systemd/systemd
     run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-  - repository: geerlingguy/docker-ubuntu1604-ansible
-    version: latest
+  - distro: fedora24
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distro: ubuntu1604
     init: /lib/systemd/systemd
     run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
 
@@ -16,12 +17,12 @@ services:
 
 before_install:
   # Pull container.
-  - 'sudo docker pull ${repository}:${version}'
+  - 'sudo docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
   - container_id=$(mktemp)
   # Run container in detached state.
-  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${repository}:${version} "${init}" > "${container_id}"'
+  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
 
   # Install dependencies.
   - 'sudo docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
diff --git a/provisioning/roles/geerlingguy.composer/README.md b/provisioning/roles/geerlingguy.composer/README.md
index 11def0422..0994cbb79 100644
--- a/provisioning/roles/geerlingguy.composer/README.md
+++ b/provisioning/roles/geerlingguy.composer/README.md
@@ -65,4 +65,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.composer/tests/test.yml b/provisioning/roles/geerlingguy.composer/tests/test.yml
index f560931dc..95b5fa7a4 100644
--- a/provisioning/roles/geerlingguy.composer/tests/test.yml
+++ b/provisioning/roles/geerlingguy.composer/tests/test.yml
@@ -18,7 +18,7 @@
 
   roles:
     - role: geerlingguy.repo-remi
-      when: ansible_os_family == 'RedHat'
+      when: ansible_os_family == 'RedHat' and ansible_distribution != 'Fedora'
     - geerlingguy.git
     - geerlingguy.php
     - role_under_test
diff --git a/provisioning/roles/geerlingguy.git/.travis.yml b/provisioning/roles/geerlingguy.git/.travis.yml
index a221fcc27..64ce03c6f 100644
--- a/provisioning/roles/geerlingguy.git/.travis.yml
+++ b/provisioning/roles/geerlingguy.git/.travis.yml
@@ -2,70 +2,73 @@
 sudo: required
 
 env:
-  # Only test source install on latest supported OSes.
-  # - distribution: centos
-  #   version: 7
-  #   init: /usr/lib/systemd/systemd
-  #   run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-  #   SITE: source
-  #   GIT_VERSION: 2.7.1
-  - distribution: ubuntu
-    version: 14.04
-    init: /sbin/init
-    run_opts: ""
-    SITE: source
-    GIT_VERSION: 2.7.1
+  # Test source install on latest supported OSes.
+  - distro: centos7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    playbook: test-source.yml
+    GIT_VERSION: 2.9.3
+  - distro: ubuntu1604
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    playbook: test-source.yml
+    GIT_VERSION: 2.9.3
 
   # Test package install on all supported OSes.
-  - distribution: centos
-    version: 6
-    init: /sbin/init
-    run_opts: ""
-    SITE: package
-    GIT_VERSION: 1.7.1
-  - distribution: centos
-    version: 7
+  - distro: centos7
     init: /usr/lib/systemd/systemd
     run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-    SITE: package
+    playbook: test.yml
     GIT_VERSION: 1.8.3.1
-  - distribution: ubuntu
-    version: 14.04
+  - distro: centos6
     init: /sbin/init
-    run_opts: ""
-    SITE: package
+    run_opts: "--privileged"
+    playbook: test.yml
+    GIT_VERSION: 1.7.1
+  - distro: ubuntu1604
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    playbook: test.yml
+    GIT_VERSION: 2.7.4
+  - distro: ubuntu1404
+    init: /sbin/init
+    run_opts: "--privileged"
+    playbook: test.yml
     GIT_VERSION: 1.9.1
-  - distribution: ubuntu
-    version: 12.04
+  - distro: ubuntu1204
     init: /sbin/init
-    run_opts: ""
-    SITE: package
+    run_opts: "--privileged"
+    playbook: test.yml
     GIT_VERSION: 1.7.9.5
+  - distro: debian8
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    playbook: test.yml
+    GIT_VERSION: 2.1.4
 
 services:
   - docker
 
 before_install:
-  # - sudo apt-get update
-  # Pull container
-  - 'sudo docker pull ${distribution}:${version}'
-  # Customize container
-  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+  # Pull container.
+  - 'sudo docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
   - container_id=$(mktemp)
-  # Run container in detached state
-  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+  # Run container in detached state.
+  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
 
   # Ansible syntax check.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test-${SITE}.yml --syntax-check'
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} --syntax-check'
 
   # Test role.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test-${SITE}.yml'
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook}'
 
   # Test role idempotence.
+  - idempotence=$(mktemp)
+  - sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} | tee -a ${idempotence}
   - >
-    sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test-${SITE}.yml
+    tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
     && (echo 'Idempotence test: pass' && exit 0)
     || (echo 'Idempotence test: fail' && exit 1)
@@ -77,7 +80,7 @@ script:
   - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm git --version'
   - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm /usr/bin/git --version | grep -qF "$GIT_VERSION"'
 
-  # Clean up
+  # Clean up.
   - 'sudo docker stop "$(cat ${container_id})"'
 
 notifications:
diff --git a/provisioning/roles/geerlingguy.git/README.md b/provisioning/roles/geerlingguy.git/README.md
index e7b66763a..0e7174610 100644
--- a/provisioning/roles/geerlingguy.git/README.md
+++ b/provisioning/roles/geerlingguy.git/README.md
@@ -52,4 +52,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.git/defaults/main.yml b/provisioning/roles/geerlingguy.git/defaults/main.yml
index 7c64bc22d..d08bf8c35 100644
--- a/provisioning/roles/geerlingguy.git/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.git/defaults/main.yml
@@ -13,7 +13,7 @@ git_packages:
 # the 'git_version' variable instead of using a package.
 git_install_from_source: false
 git_install_path: "/usr"
-git_version: "2.7.1"
+git_version: "2.9.3"
 
 # If git is already installed at and older version, force a new source build.
 # Only applies if git_install_from_source is `true`.
diff --git a/provisioning/roles/geerlingguy.git/meta/main.yml b/provisioning/roles/geerlingguy.git/meta/main.yml
index d119d20d0..fcfd140fa 100644
--- a/provisioning/roles/geerlingguy.git/meta/main.yml
+++ b/provisioning/roles/geerlingguy.git/meta/main.yml
@@ -6,11 +6,14 @@ galaxy_info:
   description: Git version control software
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 1.9
+  min_ansible_version: 2.0
   platforms:
   - name: EL
     versions:
     - all
+  - name: Fedora
+    versions:
+    - all
   - name: Debian
     versions:
     - all
diff --git a/provisioning/roles/geerlingguy.git/tasks/install-from-source.yml b/provisioning/roles/geerlingguy.git/tasks/install-from-source.yml
index 3dc0458e9..ff8b71b29 100644
--- a/provisioning/roles/geerlingguy.git/tasks/install-from-source.yml
+++ b/provisioning/roles/geerlingguy.git/tasks/install-from-source.yml
@@ -1,6 +1,6 @@
 ---
 - name: Ensure git's dependencies are installed (RedHat).
-  yum: "pkg={{ item }} state=installed"
+  package: "name={{ item }} state=installed"
   with_items:
     - gettext-devel
     - expat-devel
@@ -14,7 +14,7 @@
   when: ansible_os_family == 'RedHat'
 
 - name: Ensure git's dependencies are installed (Debian).
-  apt: "pkg={{ item }} state=installed"
+  apt: "name={{ item }} state=installed"
   with_items:
     - libcurl4-gnutls-dev
     - libexpat1-dev
@@ -28,8 +28,6 @@
   command: git --version
   changed_when: false
   failed_when: false
-  # Ansible 1.8 feature.
-  # warn: no
   register: git_installed_version
 
 - name: Force git install if the version numbers do not match
diff --git a/provisioning/roles/geerlingguy.git/tasks/main.yml b/provisioning/roles/geerlingguy.git/tasks/main.yml
index 22f2b81f6..d829b1c75 100644
--- a/provisioning/roles/geerlingguy.git/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.git/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: Ensure git is installed (RedHat).
-  yum:
+  package:
     name: "{{ item }}"
     state: installed
     enablerepo: "{{ git_enablerepo }}"
diff --git a/provisioning/roles/geerlingguy.git/tests/Dockerfile.centos-6 b/provisioning/roles/geerlingguy.git/tests/Dockerfile.centos-6
deleted file mode 100644
index 4a4e7b8d6..000000000
--- a/provisioning/roles/geerlingguy.git/tests/Dockerfile.centos-6
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM centos:6
-
-# Install Ansible
-RUN yum -y update; yum clean all;
-RUN yum -y install epel-release
-RUN yum -y install git ansible sudo
-RUN yum clean all
-
-# Disable requiretty
-RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
-
-# Install Ansible inventory file
-RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
-
-CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.git/tests/Dockerfile.centos-7 b/provisioning/roles/geerlingguy.git/tests/Dockerfile.centos-7
deleted file mode 100644
index 8aa065497..000000000
--- a/provisioning/roles/geerlingguy.git/tests/Dockerfile.centos-7
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM centos:7
-
-# Install systemd -- See https://hub.docker.com/_/centos/
-RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
-RUN yum -y update; yum clean all; \
-(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
-rm -f /lib/systemd/system/multi-user.target.wants/*; \
-rm -f /etc/systemd/system/*.wants/*; \
-rm -f /lib/systemd/system/local-fs.target.wants/*; \
-rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
-rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
-rm -f /lib/systemd/system/basic.target.wants/*; \
-rm -f /lib/systemd/system/anaconda.target.wants/*;
-
-# Install Ansible
-RUN yum -y install epel-release
-RUN yum -y install git ansible sudo
-RUN yum clean all
-
-# Disable requiretty
-RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
-
-# Install Ansible inventory file
-RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
-
-VOLUME ["/sys/fs/cgroup"]
-CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.git/tests/Dockerfile.ubuntu-12.04 b/provisioning/roles/geerlingguy.git/tests/Dockerfile.ubuntu-12.04
deleted file mode 100644
index d0c130cdf..000000000
--- a/provisioning/roles/geerlingguy.git/tests/Dockerfile.ubuntu-12.04
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM ubuntu:12.04
-RUN apt-get update
-
-# Install Ansible
-RUN apt-get install -y software-properties-common python-software-properties git
-RUN apt-add-repository -y ppa:ansible/ansible
-RUN apt-get update
-RUN apt-get install -y ansible
-
-# Install Ansible inventory file
-RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.git/tests/Dockerfile.ubuntu-14.04 b/provisioning/roles/geerlingguy.git/tests/Dockerfile.ubuntu-14.04
deleted file mode 100644
index ca332871f..000000000
--- a/provisioning/roles/geerlingguy.git/tests/Dockerfile.ubuntu-14.04
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM ubuntu:14.04
-RUN apt-get update
-
-# Install Ansible
-RUN apt-get install -y software-properties-common git
-RUN apt-add-repository -y ppa:ansible/ansible
-RUN apt-get update
-RUN apt-get install -y ansible
-
-# Install Ansible inventory file
-RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.git/tests/test-source.yml b/provisioning/roles/geerlingguy.git/tests/test-source.yml
index a31cc4e7d..ffde9906c 100644
--- a/provisioning/roles/geerlingguy.git/tests/test-source.yml
+++ b/provisioning/roles/geerlingguy.git/tests/test-source.yml
@@ -4,11 +4,11 @@
   vars:
     git_install_from_source: true
     git_install_from_source_force_update: true
-    git_version: 2.7.1
+    git_version: 2.9.3
 
   pre_tasks:
     - name: Ensure build dependencies are installed (RedHat).
-      yum: name=which state=present
+      package: name=which state=present
       when: ansible_os_family == 'RedHat'
 
   roles:
diff --git a/provisioning/roles/geerlingguy.git/tests/test-package.yml b/provisioning/roles/geerlingguy.git/tests/test.yml
similarity index 85%
rename from provisioning/roles/geerlingguy.git/tests/test-package.yml
rename to provisioning/roles/geerlingguy.git/tests/test.yml
index e76a3e01c..75248020d 100644
--- a/provisioning/roles/geerlingguy.git/tests/test-package.yml
+++ b/provisioning/roles/geerlingguy.git/tests/test.yml
@@ -7,7 +7,7 @@
 
   pre_tasks:
     - name: Ensure build dependencies are installed (RedHat).
-      yum: name=which state=present
+      package: name=which state=present
       when: ansible_os_family == 'RedHat'
 
   roles:
diff --git a/provisioning/roles/geerlingguy.java/.travis.yml b/provisioning/roles/geerlingguy.java/.travis.yml
index d6c8ef8c5..50b0ac639 100644
--- a/provisioning/roles/geerlingguy.java/.travis.yml
+++ b/provisioning/roles/geerlingguy.java/.travis.yml
@@ -2,10 +2,13 @@
 sudo: required
 
 env:
+  - distro: centos7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
   - distro: centos6
     init: /sbin/init
     run_opts: ""
-  - distro: centos7
+  - distro: fedora24
     init: /usr/lib/systemd/systemd
     run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
   - distro: ubuntu1604
diff --git a/provisioning/roles/geerlingguy.java/README.md b/provisioning/roles/geerlingguy.java/README.md
index 3a2295854..a18015790 100644
--- a/provisioning/roles/geerlingguy.java/README.md
+++ b/provisioning/roles/geerlingguy.java/README.md
@@ -18,6 +18,10 @@ Available variables are listed below, along with default values:
 
 Set the version/development kit of Java to install, along with any other necessary Java packages. Some other options include are included in the distribution-specific files in this role's 'defaults' folder.
 
+    java_home: ""
+
+If set, the role will set the global environment variable `JAVA_HOME` to this value.
+
 ## Dependencies
 
 None.
diff --git a/provisioning/roles/geerlingguy.java/defaults/main.yml b/provisioning/roles/geerlingguy.java/defaults/main.yml
index 43a7a0226..aaf519d84 100644
--- a/provisioning/roles/geerlingguy.java/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.java/defaults/main.yml
@@ -2,3 +2,5 @@
 # Set java_packages if you would like to use a different version than the
 # default (OpenJDK 1.7).
 # java_packages: []
+
+java_home: ""
diff --git a/provisioning/roles/geerlingguy.java/meta/main.yml b/provisioning/roles/geerlingguy.java/meta/main.yml
index 526ffadc2..d20d1243c 100644
--- a/provisioning/roles/geerlingguy.java/meta/main.yml
+++ b/provisioning/roles/geerlingguy.java/meta/main.yml
@@ -6,12 +6,15 @@ galaxy_info:
   description: Java for Linux
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 1.9
+  min_ansible_version: 2.0
   platforms:
     - name: EL
       versions:
       - 6
       - 7
+    - name: Fedora
+      versions:
+      - all
     - name: Debian
       versions:
       - all
diff --git a/provisioning/roles/geerlingguy.java/tasks/main.yml b/provisioning/roles/geerlingguy.java/tasks/main.yml
index 95f5b56ba..fdb2d0eb6 100644
--- a/provisioning/roles/geerlingguy.java/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.java/tasks/main.yml
@@ -1,7 +1,11 @@
 ---
 - name: Include OS-specific variables.
   include_vars: "{{ ansible_os_family }}.yml"
-  when: ansible_distribution != 'Ubuntu'
+  when: ansible_distribution != 'Ubuntu' or ansible_distribution != 'Fedora'
+
+- name: Include OS-specific variables for Fedora.
+  include_vars: "{{ ansible_distribution }}.yml"
+  when: ansible_distribution == 'Fedora'
 
 - name: Include version-specific variables for Ubuntu.
   include_vars: "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yml"
@@ -21,3 +25,11 @@
 
 - include: setup-FreeBSD.yml
   when: ansible_os_family == 'FreeBSD'
+
+# Environment setup.
+- name: Set JAVA_HOME if configured.
+  template:
+    src: java_home.sh.j2
+    dest: /etc/profile.d/java_home.sh
+    mode: 0644
+  when: java_home
diff --git a/provisioning/roles/geerlingguy.java/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.java/tasks/setup-RedHat.yml
index 4a616adce..053b84751 100644
--- a/provisioning/roles/geerlingguy.java/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.java/tasks/setup-RedHat.yml
@@ -1,4 +1,4 @@
 ---
 - name: Ensure Java is installed.
-  yum: "name={{ item }} state=installed"
+  package: "name={{ item }} state=installed"
   with_items: "{{ java_packages }}"
diff --git a/provisioning/roles/geerlingguy.java/templates/java_home.sh.j2 b/provisioning/roles/geerlingguy.java/templates/java_home.sh.j2
new file mode 100644
index 000000000..994e8b706
--- /dev/null
+++ b/provisioning/roles/geerlingguy.java/templates/java_home.sh.j2
@@ -0,0 +1 @@
+export JAVA_HOME=$JAVA_HOME:{{ java_home }}
diff --git a/provisioning/roles/geerlingguy.java/tests/test.yml b/provisioning/roles/geerlingguy.java/tests/test.yml
index b29465406..e5b6b77da 100644
--- a/provisioning/roles/geerlingguy.java/tests/test.yml
+++ b/provisioning/roles/geerlingguy.java/tests/test.yml
@@ -2,8 +2,12 @@
 - hosts: all
 
   pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=yes
+      when: ansible_os_family == 'Debian'
+
     - name: Ensure build dependencies are installed (RedHat).
-      yum: name=which state=present
+      package: name=which state=present
       when: ansible_os_family == 'RedHat'
 
   roles:
diff --git a/provisioning/roles/geerlingguy.java/vars/Fedora.yml b/provisioning/roles/geerlingguy.java/vars/Fedora.yml
new file mode 100644
index 000000000..47c5a0184
--- /dev/null
+++ b/provisioning/roles/geerlingguy.java/vars/Fedora.yml
@@ -0,0 +1,6 @@
+---
+# JDK version options include:
+#   - java
+#   - java-1.8.0-openjdk
+__java_packages:
+  - java-1.8.0-openjdk
diff --git a/provisioning/roles/geerlingguy.php/.travis.yml b/provisioning/roles/geerlingguy.php/.travis.yml
index 0fe9aaedf..f79942833 100644
--- a/provisioning/roles/geerlingguy.php/.travis.yml
+++ b/provisioning/roles/geerlingguy.php/.travis.yml
@@ -2,67 +2,66 @@
 sudo: required
 
 env:
-  # Only test source install on latest supported OSes.
-  - distribution: centos
-    version: 7
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-    SITE: source
-    PHP_VERSION: 7.0.5
-  - distribution: ubuntu
-    version: 14.04
-    init: /sbin/init
-    run_opts: ""
-    SITE: source
-    PHP_VERSION: 7.0.5
-
   # Test package install on all supported OSes.
-  - distribution: centos
-    version: 7
+  - distro: centos7
     init: /usr/lib/systemd/systemd
     run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-    SITE: package
-    PHP_VERSION: 7.0
-  - distribution: ubuntu
-    version: 14.04
+    playbook: test.yml
+    php_version: 7.0
+  - distro: ubuntu1604
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    playbook: test.yml
+    php_version: 7.0
+  - distro: ubuntu1404
     init: /sbin/init
     run_opts: ""
-    SITE: package
-    PHP_VERSION: 7.0
-  - distribution: ubuntu
-    version: 12.04
+    playbook: test.yml
+    php_version: 7.0
+  - distro: ubuntu1204
     init: /sbin/init
     run_opts: ""
-    SITE: package
-    PHP_VERSION: 5.6
+    playbook: test.yml
+    php_version: 5.6
+
+  # Only test source install on latest supported OSes.
+  - distro: centos7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    playbook: test-source.yml
+    php_version: 7.0.5
+  - distro: ubuntu1604
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    playbook: test-source.yml
+    php_version: 7.0.5
 
 services:
   - docker
 
 before_install:
-  # - sudo apt-get update
-  # Pull container
-  - 'sudo docker pull ${distribution}:${version}'
-  # Customize container
-  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+  # Pull container.
+  - 'sudo docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
   - container_id=$(mktemp)
-  # Run container in detached state
-  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+  # Run container in detached state.
+  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
 
   # Install dependencies.
   - 'sudo docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
 
   # Ansible syntax check.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test-${SITE}.yml --syntax-check'
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} --syntax-check'
 
   # Test role.
-  - 'travis_wait 30 sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test-${SITE}.yml'
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook}'
 
   # Test role idempotence.
+  - idempotence=$(mktemp)
+  - sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} | tee -a ${idempotence}
   - >
-    sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test-${SITE}.yml
+    tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
     && (echo 'Idempotence test: pass' && exit 0)
     || (echo 'Idempotence test: fail' && exit 1)
@@ -72,12 +71,13 @@ script:
   - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm test -x /usr/bin/php'
 
   - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm php --version'
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm /usr/bin/php --version | grep -qF "PHP $PHP_VERSION"'
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm /usr/bin/php --version | grep -qF "PHP ${php_version}"'
 
   # Ensure PHP configurations have taken effect.
   - sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm php -i | grep 'memory_limit.*192'
 
-  # Clean up
+after_success:
+  # Clean up.
   - 'sudo docker stop "$(cat ${container_id})"'
 
 notifications:
diff --git a/provisioning/roles/geerlingguy.php/README.md b/provisioning/roles/geerlingguy.php/README.md
index 9bdd4e36b..8ee4445a7 100644
--- a/provisioning/roles/geerlingguy.php/README.md
+++ b/provisioning/roles/geerlingguy.php/README.md
@@ -201,4 +201,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.php/defaults/main.yml b/provisioning/roles/geerlingguy.php/defaults/main.yml
index f0941f4e9..539903a32 100644
--- a/provisioning/roles/geerlingguy.php/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.php/defaults/main.yml
@@ -1,5 +1,6 @@
 ---
-# Pass in a comma-separated list of repos to use (e.g. "remi,epel").
+# Pass in a comma-separated list of repos to use (e.g. "remi,epel"). Used only
+# for RHEL/CentOS.
 php_enablerepo: ""
 
 # PHP package state; use 'installed' to make sure it's installed, or 'latest' if
diff --git a/provisioning/roles/geerlingguy.php/meta/main.yml b/provisioning/roles/geerlingguy.php/meta/main.yml
index fb04c15fd..44ec3c8fa 100644
--- a/provisioning/roles/geerlingguy.php/meta/main.yml
+++ b/provisioning/roles/geerlingguy.php/meta/main.yml
@@ -3,7 +3,7 @@ dependencies: []
 
 galaxy_info:
   author: geerlingguy
-  description: PHP for RedHat/CentOS/Debian/Ubuntu.
+  description: PHP for RedHat/CentOS/Fedora/Debian/Ubuntu.
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
   min_ansible_version: 2.0
@@ -12,6 +12,9 @@ galaxy_info:
     versions:
     - 6
     - 7
+  - name: Fedora
+    versions:
+    - all
   - name: Debian
     versions:
     - all
diff --git a/provisioning/roles/geerlingguy.php/tasks/install-from-source.yml b/provisioning/roles/geerlingguy.php/tasks/install-from-source.yml
index 83a52a383..1d0d985ec 100644
--- a/provisioning/roles/geerlingguy.php/tasks/install-from-source.yml
+++ b/provisioning/roles/geerlingguy.php/tasks/install-from-source.yml
@@ -1,6 +1,6 @@
 ---
 - name: Ensure dependencies for building from source are installed (RedHat).
-  yum: "pkg={{ item }} state=installed"
+  package: "name={{ item }} state=installed"
   with_items:
     - autoconf
     - automake
diff --git a/provisioning/roles/geerlingguy.php/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.php/tasks/setup-RedHat.yml
index 6cfde8cb0..a51e1e7ca 100644
--- a/provisioning/roles/geerlingguy.php/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.php/tasks/setup-RedHat.yml
@@ -1,6 +1,6 @@
 ---
 - name: Ensure PHP packages are installed.
-  yum:
+  package:
     name: "{{ item }}"
     state: "{{ php_packages_state }}"
     enablerepo: "{{ php_enablerepo }}"
diff --git a/provisioning/roles/geerlingguy.php/tests/Dockerfile.centos-7 b/provisioning/roles/geerlingguy.php/tests/Dockerfile.centos-7
deleted file mode 100644
index 8aa065497..000000000
--- a/provisioning/roles/geerlingguy.php/tests/Dockerfile.centos-7
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM centos:7
-
-# Install systemd -- See https://hub.docker.com/_/centos/
-RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
-RUN yum -y update; yum clean all; \
-(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
-rm -f /lib/systemd/system/multi-user.target.wants/*; \
-rm -f /etc/systemd/system/*.wants/*; \
-rm -f /lib/systemd/system/local-fs.target.wants/*; \
-rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
-rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
-rm -f /lib/systemd/system/basic.target.wants/*; \
-rm -f /lib/systemd/system/anaconda.target.wants/*;
-
-# Install Ansible
-RUN yum -y install epel-release
-RUN yum -y install git ansible sudo
-RUN yum clean all
-
-# Disable requiretty
-RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
-
-# Install Ansible inventory file
-RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
-
-VOLUME ["/sys/fs/cgroup"]
-CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.php/tests/Dockerfile.ubuntu-12.04 b/provisioning/roles/geerlingguy.php/tests/Dockerfile.ubuntu-12.04
deleted file mode 100644
index d0c130cdf..000000000
--- a/provisioning/roles/geerlingguy.php/tests/Dockerfile.ubuntu-12.04
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM ubuntu:12.04
-RUN apt-get update
-
-# Install Ansible
-RUN apt-get install -y software-properties-common python-software-properties git
-RUN apt-add-repository -y ppa:ansible/ansible
-RUN apt-get update
-RUN apt-get install -y ansible
-
-# Install Ansible inventory file
-RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.php/tests/Dockerfile.ubuntu-14.04 b/provisioning/roles/geerlingguy.php/tests/Dockerfile.ubuntu-14.04
deleted file mode 100644
index ca332871f..000000000
--- a/provisioning/roles/geerlingguy.php/tests/Dockerfile.ubuntu-14.04
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM ubuntu:14.04
-RUN apt-get update
-
-# Install Ansible
-RUN apt-get install -y software-properties-common git
-RUN apt-add-repository -y ppa:ansible/ansible
-RUN apt-get update
-RUN apt-get install -y ansible
-
-# Install Ansible inventory file
-RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.php/tests/inventory b/provisioning/roles/geerlingguy.php/tests/inventory
deleted file mode 100644
index 2fbb50c4a..000000000
--- a/provisioning/roles/geerlingguy.php/tests/inventory
+++ /dev/null
@@ -1 +0,0 @@
-localhost
diff --git a/provisioning/roles/geerlingguy.php/tests/requirements.yml b/provisioning/roles/geerlingguy.php/tests/requirements.yml
index 711227acc..809b89be8 100644
--- a/provisioning/roles/geerlingguy.php/tests/requirements.yml
+++ b/provisioning/roles/geerlingguy.php/tests/requirements.yml
@@ -1,2 +1,3 @@
 ---
 - src: geerlingguy.repo-remi
+- src: geerlingguy.git
diff --git a/provisioning/roles/geerlingguy.php/tests/test-source.yml b/provisioning/roles/geerlingguy.php/tests/test-source.yml
index cac53496a..4693ac59b 100644
--- a/provisioning/roles/geerlingguy.php/tests/test-source.yml
+++ b/provisioning/roles/geerlingguy.php/tests/test-source.yml
@@ -11,8 +11,9 @@
 
   pre_tasks:
     - name: Ensure build dependencies are installed (RedHat).
-      yum: name=which state=present
+      package: name=which state=present
       when: ansible_os_family == 'RedHat'
 
   roles:
+    - geerlingguy.git
     - role_under_test
diff --git a/provisioning/roles/geerlingguy.php/tests/test-package.yml b/provisioning/roles/geerlingguy.php/tests/test.yml
similarity index 83%
rename from provisioning/roles/geerlingguy.php/tests/test-package.yml
rename to provisioning/roles/geerlingguy.php/tests/test.yml
index 8e749e8d8..472b78160 100644
--- a/provisioning/roles/geerlingguy.php/tests/test-package.yml
+++ b/provisioning/roles/geerlingguy.php/tests/test.yml
@@ -11,7 +11,7 @@
       when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '12.04'
 
     - name: Ensure build dependencies are installed (RedHat).
-      yum: name=which state=present
+      package: name=which state=present
       when: ansible_os_family == 'RedHat'
 
     - name: Add repository for PHP 7.
@@ -23,5 +23,6 @@
       when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '12.04'
 
   roles:
-    - { role: geerlingguy.repo-remi, when: ansible_os_family == 'RedHat' }
+    - role: geerlingguy.repo-remi
+      when: ansible_os_family == 'RedHat' and ansible_distribution != 'Fedora'
     - role_under_test

From e06e3cc987e3a8e6cd6e0d50e849bf9d7288f6e3 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 23 Sep 2016 16:00:23 -0500
Subject: [PATCH 0419/1273] Update Acquia Cloud config example for extras
 config.

---
 examples/acquia/acquia.config.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/examples/acquia/acquia.config.yml b/examples/acquia/acquia.config.yml
index 035924095..e991adeed 100644
--- a/examples/acquia/acquia.config.yml
+++ b/examples/acquia/acquia.config.yml
@@ -29,6 +29,11 @@ php_fpm_daemon: php5-fpm
 php_fpm_conf_path: "/etc/php5/fpm"
 php_fpm_pool_conf_path: "/etc/php5/fpm/pool.d/www.conf"
 php_mysql_package: php5-mysql
+php_memcached_package: php5-memcached
+
+# Older version of XHProf.
+xhprof_download_url: https://github.com/phacility/xhprof/archive/master.tar.gz
+xhprof_download_folder_name: xhprof-master
 
 # Acquia Cloud Search defaults to Solr 4.x.
 solr_version: "4.5.1"

From 4dea24a84181e4f67d4ecb6f42f3c51e9193b66e Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 24 Sep 2016 10:45:12 -0500
Subject: [PATCH 0420/1273] Update Nginx role.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.nginx/.travis.yml       | 63 +++++++++++++------
 .../roles/geerlingguy.nginx/README.md         | 18 +++---
 .../roles/geerlingguy.nginx/defaults/main.yml |  3 +-
 .../roles/geerlingguy.nginx/tasks/vhosts.yml  | 15 +++--
 .../geerlingguy.nginx/templates/nginx.conf.j2 |  3 +
 .../geerlingguy.nginx/templates/vhosts.j2     | 30 ++++-----
 .../roles/geerlingguy.nginx/tests/inventory   |  1 -
 .../roles/geerlingguy.nginx/tests/test.yml    | 10 +--
 9 files changed, 89 insertions(+), 56 deletions(-)
 delete mode 100644 provisioning/roles/geerlingguy.nginx/tests/inventory

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 4865680d8..b548cd823 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -34,7 +34,7 @@
 - src: geerlingguy.mysql
   version: 2.3.2
 - src: geerlingguy.nginx
-  version: 1.9.3
+  version: 1.9.5
 - src: geerlingguy.nodejs
   version: 3.3.0
 - src: geerlingguy.php
diff --git a/provisioning/roles/geerlingguy.nginx/.travis.yml b/provisioning/roles/geerlingguy.nginx/.travis.yml
index 13d7de0a9..ce781f6a8 100644
--- a/provisioning/roles/geerlingguy.nginx/.travis.yml
+++ b/provisioning/roles/geerlingguy.nginx/.travis.yml
@@ -1,39 +1,62 @@
 ---
 sudo: required
-language: python
-python: "2.7"
 
 env:
-  - SITE=test.yml
+  global:
+    # https://github.com/travis-ci/travis-ci/issues/6461#issuecomment-239577306
+    DOCKER_VERSION: "1.9.1-0~trusty"
+  matrix:
+    - distro: centos7
+      init: /usr/lib/systemd/systemd
+      run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    - distro: ubuntu1604
+      init: /lib/systemd/systemd
+      run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    - distro: ubuntu1404
+      init: /sbin/init
+      run_opts: ""
+    - distro: ubuntu1204
+      init: /sbin/init
+      run_opts: ""
+
+services:
+  - docker
 
 before_install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -y curl
+  # Downgrade to older version of Docker engine.
+  - sudo apt-get update
+  - sudo apt-get remove docker-engine -yq
+  - sudo apt-get install docker-engine=$DOCKER_VERSION -yq --no-install-suggests --no-install-recommends --force-yes -o Dpkg::Options::="--force-confnew"
 
-install:
-  # Install Ansible.
-  - pip install ansible
-
-  # Add ansible.cfg to pick up roles path.
-  - "{ echo '[defaults]'; echo 'roles_path = ../'; } >> ansible.cfg"
+  # Pull container.
+  - 'sudo docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
-  # Check the role/playbook's syntax.
-  - "ansible-playbook -i tests/inventory tests/$SITE --syntax-check"
+  - container_id=$(mktemp)
+  # Run container in detached state.
+  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
+
+  # Ansible syntax check.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
 
-  # Run the role/playbook with ansible-playbook.
-  - "ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo"
+  # Test role.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
 
-  # Run the role/playbook again, checking to make sure it's idempotent.
+  # Test role idempotence.
+  - idempotence=$(mktemp)
+  - sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
   - >
-    ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo
+    tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
     && (echo 'Idempotence test: pass' && exit 0)
     || (echo 'Idempotence test: fail' && exit 1)
 
-  # TODO - get the test working. Probably need to add a virtual host.
-  # Request a page via Nginx, to make sure Nginx is running and responds.
-  # - "curl http://localhost/"
+  # Check if nginx is running.
+  # TODO
+
+after_success:
+  # Clean up.
+  - 'sudo docker stop "$(cat ${container_id})"'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.nginx/README.md b/provisioning/roles/geerlingguy.nginx/README.md
index e19da5b00..9bfcfeb4d 100644
--- a/provisioning/roles/geerlingguy.nginx/README.md
+++ b/provisioning/roles/geerlingguy.nginx/README.md
@@ -28,15 +28,17 @@ A list of vhost definitions (server blocks) for Nginx virtual hosts. If left emp
         error_log: ""
         extra_parameters: |
           location ~ \.php$ {
-            fastcgi_split_path_info ^(.+\.php)(/.+)$;
-            fastcgi_pass unix:/var/run/php5-fpm.sock;
-            fastcgi_index index.php;
-            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-            include fastcgi_params;
+              fastcgi_split_path_info ^(.+\.php)(/.+)$;
+              fastcgi_pass unix:/var/run/php5-fpm.sock;
+              fastcgi_index index.php;
+              fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+              include fastcgi_params;
           }
 
 An example of a fully-populated nginx_vhosts entry, using a `|` to declare a block of syntax for the `extra_parameters`.
 
+Please take note of the indentation in the above block. The first line should be a normal 2-space indent. All other lines should be indented normally relative to that line. In the generated file, the entire block will be 4-space indented. This style will ensure the config file is indented correctly.
+
     nginx_remove_default_vhost: false
 
 Whether to remove the 'default' virtualhost configuration supplied by Nginx. Useful if you want the base `/` URL to be directed at one of your own virtual hosts configured in a separate .conf file.
@@ -53,11 +55,11 @@ If you are configuring Nginx as a load balancer, you can define one or more upst
 
 The user under which Nginx will run. Defaults to `nginx` for RedHat, and `www-data` for Debian.
 
-    nginx_worker_processes: "1"
+    nginx_worker_processes: "{{ ansible_processor_vcpus|default(ansible_processor_count) }}"
     nginx_worker_connections: "1024"
     nginx_multi_accept: "off"
 
-`nginx_worker_processes` should be set to the number of cores present on your machine. Connections (find this number with `grep processor /proc/cpuinfo | wc -l`). `nginx_worker_connections` is the number of connections per process. Set this higher to handle more simultaneous connections (and remember that a connection will be used for as long as the keepalive timeout duration for every client!). You can set `nginx_multi_accept` to `on` if you want Nginx to accept all connections immediately.
+`nginx_worker_processes` should be set to the number of cores present on your machine (if the default is incorrect, find this number with `grep processor /proc/cpuinfo | wc -l`). `nginx_worker_connections` is the number of connections per process. Set this higher to handle more simultaneous connections (and remember that a connection will be used for as long as the keepalive timeout duration for every client!). You can set `nginx_multi_accept` to `on` if you want Nginx to accept all connections immediately.
 
     nginx_error_log: "/var/log/nginx/error.log warn"
     nginx_access_log: "/var/log/nginx/access.log main buffer=16k"
@@ -123,4 +125,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.nginx/defaults/main.yml b/provisioning/roles/geerlingguy.nginx/defaults/main.yml
index f0bda616b..34c43ef98 100644
--- a/provisioning/roles/geerlingguy.nginx/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.nginx/defaults/main.yml
@@ -9,7 +9,7 @@ nginx_ppa_version: stable
 # The name of the nginx apt/yum package to install.
 nginx_package_name: "nginx"
 
-nginx_worker_processes: "1"
+nginx_worker_processes: "{{ ansible_processor_vcpus | default(ansible_processor_count) }}"
 nginx_worker_connections: "1024"
 nginx_multi_accept: "off"
 
@@ -62,6 +62,7 @@ nginx_vhosts: []
 nginx_upstreams: []
 # - name: myapp1
 #   strategy: "ip_hash" # "least_conn", etc.
+#   keepalive: 16 # optional
 #   servers: {
 #     "srv1.example.com",
 #     "srv2.example.com weight=3",
diff --git a/provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml b/provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml
index 1be63942f..aca9315b0 100644
--- a/provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml
+++ b/provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml
@@ -4,8 +4,13 @@
     path: "{{ nginx_default_vhost_path }}"
     state: absent
   when: nginx_remove_default_vhost
-  notify:
-    - reload nginx
+  notify: reload nginx
+
+- name: Ensure nginx_vhost_path exists.
+  file:
+    path: "{{ nginx_vhost_path }}"
+    state: directory
+  notify: reload nginx
 
 - name: Add managed vhost config file (if any vhosts are configured).
   template:
@@ -13,13 +18,11 @@
     dest: "{{ nginx_vhost_path }}/{{ nginx_vhosts_filename }}"
     mode: 0644
   when: nginx_vhosts|length > 0
-  notify:
-    - reload nginx
+  notify: reload nginx
 
 - name: Remove managed vhost config file (if no vhosts are configured).
   file:
     path: "{{ nginx_vhost_path }}/{{ nginx_vhosts_filename }}"
     state: absent
   when: nginx_vhosts|length == 0
-  notify:
-    - reload nginx
+  notify: reload nginx
diff --git a/provisioning/roles/geerlingguy.nginx/templates/nginx.conf.j2 b/provisioning/roles/geerlingguy.nginx/templates/nginx.conf.j2
index e9499e706..38bf0cdfd 100644
--- a/provisioning/roles/geerlingguy.nginx/templates/nginx.conf.j2
+++ b/provisioning/roles/geerlingguy.nginx/templates/nginx.conf.j2
@@ -53,6 +53,9 @@ http {
 {% for server in upstream.servers %}
         server {{ server }};
 {% endfor %}
+{% if upstream.keepalive is defined %}
+        keepalive {{ upstream.keepalive }};
+{% endif %}
     }
 {% endfor %}
 
diff --git a/provisioning/roles/geerlingguy.nginx/templates/vhosts.j2 b/provisioning/roles/geerlingguy.nginx/templates/vhosts.j2
index 04dbf9ea3..e4e8c0517 100644
--- a/provisioning/roles/geerlingguy.nginx/templates/vhosts.j2
+++ b/provisioning/roles/geerlingguy.nginx/templates/vhosts.j2
@@ -2,32 +2,32 @@
 server {
     listen {{ vhost.listen | default('80 default_server') }};
 
-    {% if vhost.server_name is defined %}
+{% if vhost.server_name is defined %}
     server_name {{ vhost.server_name }};
-    {% endif %}
+{% endif %}
 
-    {% if vhost.root is defined %}
+{% if vhost.root is defined %}
     root {{ vhost.root }};
-    {% endif %}
+{% endif %}
 
     index {{ vhost.index | default('index.html index.htm') }};
 
-    {% if vhost.error_page is defined %}
+{% if vhost.error_page is defined %}
     error_page {{ vhost.error_page }};
-    {% endif %}
-    {% if vhost.access_log is defined %}
+{% endif %}
+{% if vhost.access_log is defined %}
     access_log {{ vhost.access_log }};
-    {% endif %}
-    {% if vhost.error_log is defined %}
+{% endif %}
+{% if vhost.error_log is defined %}
     error_log {{ vhost.error_log }} error;
-    {% endif %}
+{% endif %}
 
-    {% if vhost.return is defined %}
+{% if vhost.return is defined %}
     return {{ vhost.return }};
-    {% endif %}
+{% endif %}
 
-    {% if vhost.extra_parameters is defined %}
-    {{ vhost.extra_parameters }}
-    {% endif %}
+{% if vhost.extra_parameters is defined %}
+    {{ vhost.extra_parameters|indent(4) }}
+{% endif %}
 }
 {% endfor %}
diff --git a/provisioning/roles/geerlingguy.nginx/tests/inventory b/provisioning/roles/geerlingguy.nginx/tests/inventory
deleted file mode 100644
index 2fbb50c4a..000000000
--- a/provisioning/roles/geerlingguy.nginx/tests/inventory
+++ /dev/null
@@ -1 +0,0 @@
-localhost
diff --git a/provisioning/roles/geerlingguy.nginx/tests/test.yml b/provisioning/roles/geerlingguy.nginx/tests/test.yml
index 5b55b97fb..13426a9fa 100644
--- a/provisioning/roles/geerlingguy.nginx/tests/test.yml
+++ b/provisioning/roles/geerlingguy.nginx/tests/test.yml
@@ -1,6 +1,8 @@
 ---
-- hosts: localhost
-  remote_user: root
+- hosts: all
+
+  vars:
+    nginx_use_ppa: true
+
   roles:
-    - role: ansible-role-nginx
-      nginx_use_ppa: true
+    - role_under_test

From b90bd7900aac92c6b8d2d235ab7c29b80df5ebf3 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 24 Sep 2016 20:37:36 -0500
Subject: [PATCH 0421/1273] Update MySQL role to latest version.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.mysql/.travis.yml       | 48 ++++++++-----------
 .../roles/geerlingguy.mysql/README.md         |  2 +-
 .../roles/geerlingguy.mysql/tasks/main.yml    |  5 ++
 .../tests/Dockerfile.centos-6                 | 15 ------
 .../tests/Dockerfile.centos-7                 | 27 -----------
 .../tests/Dockerfile.ubuntu-12.04             | 14 ------
 .../tests/Dockerfile.ubuntu-14.04             | 14 ------
 .../roles/geerlingguy.mysql/tests/inventory   |  1 -
 .../roles/geerlingguy.mysql/tests/test.yml    | 11 +++++
 .../roles/geerlingguy.mysql/vars/Debian.yml   |  2 +-
 .../roles/geerlingguy.mysql/vars/RedHat-6.yml |  2 +-
 .../roles/geerlingguy.mysql/vars/RedHat-7.yml |  2 +-
 13 files changed, 42 insertions(+), 103 deletions(-)
 delete mode 100644 provisioning/roles/geerlingguy.mysql/tests/Dockerfile.centos-6
 delete mode 100644 provisioning/roles/geerlingguy.mysql/tests/Dockerfile.centos-7
 delete mode 100644 provisioning/roles/geerlingguy.mysql/tests/Dockerfile.ubuntu-12.04
 delete mode 100644 provisioning/roles/geerlingguy.mysql/tests/Dockerfile.ubuntu-14.04
 delete mode 100644 provisioning/roles/geerlingguy.mysql/tests/inventory

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index b548cd823..73f86511f 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -32,7 +32,7 @@
 - src: geerlingguy.memcached
   version: 1.0.7
 - src: geerlingguy.mysql
-  version: 2.3.2
+  version: 2.3.3
 - src: geerlingguy.nginx
   version: 1.9.5
 - src: geerlingguy.nodejs
diff --git a/provisioning/roles/geerlingguy.mysql/.travis.yml b/provisioning/roles/geerlingguy.mysql/.travis.yml
index 5ffce09dd..0edb87160 100644
--- a/provisioning/roles/geerlingguy.mysql/.travis.yml
+++ b/provisioning/roles/geerlingguy.mysql/.travis.yml
@@ -2,30 +2,26 @@
 sudo: required
 
 env:
-  - distribution: centos
-    version: 6
-    init: /sbin/init
-    run_opts: ""
-    playbook: test.yml
+  global:
+    # https://github.com/travis-ci/travis-ci/issues/6461#issuecomment-239577306
     DOCKER_VERSION: "1.9.1-0~trusty"
-  - distribution: centos
-    version: 7
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-    playbook: centos-7-test.yml
-    DOCKER_VERSION: "1.9.1-0~trusty"
-  - distribution: ubuntu
-    version: 14.04
-    init: /sbin/init
-    run_opts: ""
-    playbook: test.yml
-    DOCKER_VERSION: "1.9.1-0~trusty"
-  # - distribution: ubuntu
-  #   version: 12.04
-  #   init: /sbin/init
-  #   run_opts: ""
-  #   playbook: test.yml
-  #   DOCKER_VERSION: "1.9.1-0~trusty"
+  matrix:
+    - distro: centos7
+      init: /usr/lib/systemd/systemd
+      run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+      playbook: centos-7-test.yml
+    - distro: centos6
+      init: /sbin/init
+      run_opts: ""
+      playbook: test.yml
+    - distro: ubuntu1604
+      init: /lib/systemd/systemd
+      run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+      playbook: test.yml
+    - distro: ubuntu1404
+      init: /sbin/init
+      run_opts: ""
+      playbook: test.yml
 
 services:
   - docker
@@ -37,14 +33,12 @@ before_install:
   - sudo apt-get install docker-engine=$DOCKER_VERSION -yq --no-install-suggests --no-install-recommends --force-yes -o Dpkg::Options::="--force-confnew"
 
   # Pull container
-  - 'sudo docker pull ${distribution}:${version}'
-  # Customize container
-  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+  - 'sudo docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
   - container_id=$(mktemp)
     # Run container in detached state
-  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
 
   # Ansible syntax check.
   - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} --syntax-check'
diff --git a/provisioning/roles/geerlingguy.mysql/README.md b/provisioning/roles/geerlingguy.mysql/README.md
index 3218d1888..341c7f102 100644
--- a/provisioning/roles/geerlingguy.mysql/README.md
+++ b/provisioning/roles/geerlingguy.mysql/README.md
@@ -141,4 +141,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/main.yml b/provisioning/roles/geerlingguy.mysql/tasks/main.yml
index 627d917ee..bb0669b02 100644
--- a/provisioning/roles/geerlingguy.mysql/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.mysql/tasks/main.yml
@@ -23,6 +23,11 @@
     mysql_slow_query_log_file: "{{ __mysql_slow_query_log_file }}"
   when: mysql_slow_query_log_file is not defined
 
+- name: Define mysql_supports_innodb_large_prefix.
+  set_fact:
+    mysql_supports_innodb_large_prefix: "{{ __mysql_supports_innodb_large_prefix }}"
+  when: mysql_supports_innodb_large_prefix is not defined
+
 # Setup/install tasks.
 - include: setup-RedHat.yml
   when: ansible_os_family == 'RedHat'
diff --git a/provisioning/roles/geerlingguy.mysql/tests/Dockerfile.centos-6 b/provisioning/roles/geerlingguy.mysql/tests/Dockerfile.centos-6
deleted file mode 100644
index 4a4e7b8d6..000000000
--- a/provisioning/roles/geerlingguy.mysql/tests/Dockerfile.centos-6
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM centos:6
-
-# Install Ansible
-RUN yum -y update; yum clean all;
-RUN yum -y install epel-release
-RUN yum -y install git ansible sudo
-RUN yum clean all
-
-# Disable requiretty
-RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
-
-# Install Ansible inventory file
-RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
-
-CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.mysql/tests/Dockerfile.centos-7 b/provisioning/roles/geerlingguy.mysql/tests/Dockerfile.centos-7
deleted file mode 100644
index 8aa065497..000000000
--- a/provisioning/roles/geerlingguy.mysql/tests/Dockerfile.centos-7
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM centos:7
-
-# Install systemd -- See https://hub.docker.com/_/centos/
-RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
-RUN yum -y update; yum clean all; \
-(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
-rm -f /lib/systemd/system/multi-user.target.wants/*; \
-rm -f /etc/systemd/system/*.wants/*; \
-rm -f /lib/systemd/system/local-fs.target.wants/*; \
-rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
-rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
-rm -f /lib/systemd/system/basic.target.wants/*; \
-rm -f /lib/systemd/system/anaconda.target.wants/*;
-
-# Install Ansible
-RUN yum -y install epel-release
-RUN yum -y install git ansible sudo
-RUN yum clean all
-
-# Disable requiretty
-RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
-
-# Install Ansible inventory file
-RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
-
-VOLUME ["/sys/fs/cgroup"]
-CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.mysql/tests/Dockerfile.ubuntu-12.04 b/provisioning/roles/geerlingguy.mysql/tests/Dockerfile.ubuntu-12.04
deleted file mode 100644
index 8aebd6558..000000000
--- a/provisioning/roles/geerlingguy.mysql/tests/Dockerfile.ubuntu-12.04
+++ /dev/null
@@ -1,14 +0,0 @@
-FROM ubuntu:12.04
-RUN apt-get update
-
-# Install Ansible
-RUN apt-get install -y software-properties-common python-software-properties git
-RUN apt-add-repository -y ppa:ansible/ansible
-RUN apt-get update
-RUN apt-get install -y ansible
-
-COPY initctl_faker .
-RUN chmod +x initctl_faker && rm -fr /sbin/initctl && ln -s /initctl_faker /sbin/initctl
-
-# Install Ansible inventory file
-RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.mysql/tests/Dockerfile.ubuntu-14.04 b/provisioning/roles/geerlingguy.mysql/tests/Dockerfile.ubuntu-14.04
deleted file mode 100644
index f81cabec6..000000000
--- a/provisioning/roles/geerlingguy.mysql/tests/Dockerfile.ubuntu-14.04
+++ /dev/null
@@ -1,14 +0,0 @@
-FROM ubuntu:14.04
-RUN apt-get update
-
-# Install Ansible
-RUN apt-get install -y software-properties-common git
-RUN apt-add-repository -y ppa:ansible/ansible
-RUN apt-get update
-RUN apt-get install -y ansible
-
-COPY initctl_faker .
-RUN chmod +x initctl_faker && rm -fr /sbin/initctl && ln -s /initctl_faker /sbin/initctl
-
-# Install Ansible inventory file
-RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.mysql/tests/inventory b/provisioning/roles/geerlingguy.mysql/tests/inventory
deleted file mode 100644
index 2fbb50c4a..000000000
--- a/provisioning/roles/geerlingguy.mysql/tests/inventory
+++ /dev/null
@@ -1 +0,0 @@
-localhost
diff --git a/provisioning/roles/geerlingguy.mysql/tests/test.yml b/provisioning/roles/geerlingguy.mysql/tests/test.yml
index 0ed0b4324..97643828f 100644
--- a/provisioning/roles/geerlingguy.mysql/tests/test.yml
+++ b/provisioning/roles/geerlingguy.mysql/tests/test.yml
@@ -1,4 +1,15 @@
 ---
 - hosts: all
+
+  pre_tasks:
+    - name: Copy initctl_faker into place for Ubuntu 14.04.
+      copy:
+        src: initctl_faker
+        dest: /sbin/initctl
+        mode: 0755
+        force: yes
+      when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '14.04'
+      changed_when: false
+
   roles:
     - role_under_test
diff --git a/provisioning/roles/geerlingguy.mysql/vars/Debian.yml b/provisioning/roles/geerlingguy.mysql/vars/Debian.yml
index 6eed79ccd..354b22fd1 100644
--- a/provisioning/roles/geerlingguy.mysql/vars/Debian.yml
+++ b/provisioning/roles/geerlingguy.mysql/vars/Debian.yml
@@ -7,4 +7,4 @@ __mysql_slow_query_log_file: /var/log/mysql/mysql-slow.log
 mysql_config_file: /etc/mysql/my.cnf
 mysql_config_include_dir: /etc/mysql/conf.d
 mysql_socket: /var/run/mysqld/mysqld.sock
-mysql_supports_innodb_large_prefix: true
+__mysql_supports_innodb_large_prefix: true
diff --git a/provisioning/roles/geerlingguy.mysql/vars/RedHat-6.yml b/provisioning/roles/geerlingguy.mysql/vars/RedHat-6.yml
index 2cb7e3827..34de34606 100644
--- a/provisioning/roles/geerlingguy.mysql/vars/RedHat-6.yml
+++ b/provisioning/roles/geerlingguy.mysql/vars/RedHat-6.yml
@@ -7,4 +7,4 @@ __mysql_slow_query_log_file: /var/log/mysql-slow.log
 mysql_config_file: /etc/my.cnf
 mysql_config_include_dir: /etc/my.cnf.d
 mysql_socket: /var/lib/mysql/mysql.sock
-mysql_supports_innodb_large_prefix: false
+__mysql_supports_innodb_large_prefix: false
diff --git a/provisioning/roles/geerlingguy.mysql/vars/RedHat-7.yml b/provisioning/roles/geerlingguy.mysql/vars/RedHat-7.yml
index c026c99ce..281c98a7e 100644
--- a/provisioning/roles/geerlingguy.mysql/vars/RedHat-7.yml
+++ b/provisioning/roles/geerlingguy.mysql/vars/RedHat-7.yml
@@ -13,4 +13,4 @@ mysql_pid_file: /var/run/mariadb/mariadb.pid
 mysql_config_file: /etc/my.cnf
 mysql_config_include_dir: /etc/my.cnf.d
 mysql_socket: /var/lib/mysql/mysql.sock
-mysql_supports_innodb_large_prefix: true
+__mysql_supports_innodb_large_prefix: true

From 389ad75bf497fc2c157594767a0bc07c0b13d6d3 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 25 Sep 2016 16:33:48 -0500
Subject: [PATCH 0422/1273] More efficient Docker container setup for Travis
 tests.

---
 .travis.yml                   | 65 +++++++++++++++--------------------
 tests/Dockerfile.centos-7     | 34 ------------------
 tests/Dockerfile.ubuntu-16.04 | 16 ---------
 tests/initctl_faker           | 23 -------------
 4 files changed, 27 insertions(+), 111 deletions(-)
 delete mode 100644 tests/Dockerfile.centos-7
 delete mode 100644 tests/Dockerfile.ubuntu-16.04
 delete mode 100644 tests/initctl_faker

diff --git a/.travis.yml b/.travis.yml
index c7793e79a..4118c29a9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 ---
-sudo: required
+services: docker
 
 env:
   global:
@@ -11,111 +11,100 @@ env:
       IP: 192.168.88.88
       DRUPALVM_DIR: /var/www/drupalvm
   matrix:
-    - distribution: ubuntu
-      version: 16.04
+    - distro: ubuntu1604
       init: /sbin/init
       run_opts: "--privileged"
-    - distribution: ubuntu
-      version: 16.04
+    - distro: ubuntu1604
       init: /sbin/init
       run_opts: "--privileged"
       local_config: tests/ubuntu-16-nginx.config.yml
       config_dir: /var/www/drupalvm/config
-    - distribution: centos
-      version: 7
+    - distro: centos7
       init: /usr/lib/systemd/systemd
       run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
 
-services:
-  - docker
-
 before_install:
-  # Pull container
-  - 'sudo docker pull ${distribution}:${version}'
-  # Customize container
-  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+  # Pull container.
+  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
+
   # Install lint tools.
   - 'gem install rubocop'
 
 script:
   - container_id=$(mktemp)
-
   # Run container in detached state
-  - 'sudo docker run --detach --volume="${PWD}":${DRUPALVM_DIR}/:rw ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+  - 'docker run --detach --volume="${PWD}":${DRUPALVM_DIR}/:rw ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
 
   # Set hostname.
-  - 'sudo docker exec "$(cat ${container_id})" hostname ${HOSTNAME}'
+  - 'docker exec "$(cat ${container_id})" hostname ${HOSTNAME}'
 
   # Setup directories.
-  - 'sudo docker exec "$(cat ${container_id})" mkdir -p ${DRUPALVM_DIR}/drupal'
+  - 'docker exec "$(cat ${container_id})" mkdir -p ${DRUPALVM_DIR}/drupal'
 
   # Setup config directory.
-  - '[[ ! -z "${config_dir}" ]] && sudo docker exec "$(cat ${container_id})" mkdir -p ${config_dir} || true'
+  - '[[ ! -z "${config_dir}" ]] && docker exec "$(cat ${container_id})" mkdir -p ${config_dir} || true'
 
   # Copy configuration files into place.
-  - 'sudo docker exec "$(cat ${container_id})" cp ${DRUPALVM_DIR}/${CONFIG} ${config_dir:-$DRUPALVM_DIR}/config.yml'
-  - 'sudo docker exec "$(cat ${container_id})" cp ${DRUPALVM_DIR}/${MAKEFILE} ${config_dir:-$DRUPALVM_DIR}/drupal.make.yml'
-  - 'sudo docker exec "$(cat ${container_id})" cp ${DRUPALVM_DIR}/${COMPOSERFILE} ${config_dir:-$DRUPALVM_DIR}/drupal.composer.json'
+  - 'docker exec "$(cat ${container_id})" cp ${DRUPALVM_DIR}/${CONFIG} ${config_dir:-$DRUPALVM_DIR}/config.yml'
+  - 'docker exec "$(cat ${container_id})" cp ${DRUPALVM_DIR}/${MAKEFILE} ${config_dir:-$DRUPALVM_DIR}/drupal.make.yml'
+  - 'docker exec "$(cat ${container_id})" cp ${DRUPALVM_DIR}/${COMPOSERFILE} ${config_dir:-$DRUPALVM_DIR}/drupal.composer.json'
 
   # Override configuration variables.
-  - '[[ ! -z "${local_config}" ]] && sudo docker exec "$(cat ${container_id})" bash -c "cp ${DRUPALVM_DIR}/${local_config} ${config_dir:-$DRUPALVM_DIR}/local.config.yml" || true'
+  - '[[ ! -z "${local_config}" ]] && docker exec "$(cat ${container_id})" bash -c "cp ${DRUPALVM_DIR}/${local_config} ${config_dir:-$DRUPALVM_DIR}/local.config.yml" || true'
 
-  # Vagrantfile syntax check
+  # Vagrantfile syntax check.
   - 'rubocop ./Vagrantfile --except LineLength,Eval,MutableConstant'
 
   # Ansible syntax check.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook ${DRUPALVM_DIR}/provisioning/playbook.yml --syntax-check'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook ${DRUPALVM_DIR}/provisioning/playbook.yml --syntax-check'
 
   # Run the playbook with ansible-playbook.
   - >
     if [ ! -z "${config_dir}" ]; then
-      sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook ${DRUPALVM_DIR}/provisioning/playbook.yml --extra-vars="config_dir=${config_dir}";
+      docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook ${DRUPALVM_DIR}/provisioning/playbook.yml --extra-vars="config_dir=${config_dir}";
     else
-      sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook ${DRUPALVM_DIR}/provisioning/playbook.yml;
+      docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook ${DRUPALVM_DIR}/provisioning/playbook.yml;
     fi
 
-  # Run the integration tests
+  # Run integration tests.
   - >
-    sudo docker exec "$(cat ${container_id})" curl -s --header Host:${HOSTNAME} localhost
+    docker exec "$(cat ${container_id})" curl -s --header Host:${HOSTNAME} localhost
     | grep -q '<title>Welcome to Drupal'
     && (echo 'Drupal install pass' && exit 0)
     || (echo 'Drupal install fail' && exit 1)
 
   - >
-    sudo docker exec "$(cat ${container_id})" curl -s --header Host:adminer.${HOSTNAME} localhost
+    docker exec "$(cat ${container_id})" curl -s --header Host:adminer.${HOSTNAME} localhost
     | grep -q '<title>Login - Adminer'
     && (echo 'Admin install pass' && exit 0)
     || (echo 'Adminer install fail' && exit 1)
 
   - >
-    sudo docker exec "$(cat ${container_id})" curl -s --header Host:pimpmylog.${HOSTNAME} localhost
+    docker exec "$(cat ${container_id})" curl -s --header Host:pimpmylog.${HOSTNAME} localhost
     | grep -q '<title>Pimp my Log'
     && (echo 'Pimp my Log install pass' && exit 0)
     || (echo 'Pimp my Log install fail' && exit 1)
 
   - >
-    sudo docker exec "$(cat ${container_id})" curl -s --header Host:xhprof.${HOSTNAME} localhost
+    docker exec "$(cat ${container_id})" curl -s --header Host:xhprof.${HOSTNAME} localhost
     | grep -q '<title>XHProf'
     && (echo 'XHProf install pass' && exit 0)
     || (echo 'XHProf install fail' && exit 1)
 
   - >
-    sudo docker exec "$(cat ${container_id})" curl -s localhost:8025
+    docker exec "$(cat ${container_id})" curl -s localhost:8025
     | grep -q '<title>MailHog'
     && (echo 'MailHog install pass' && exit 0)
     || (echo 'MailHog install fail' && exit 1)
 
   - >
-    sudo docker exec "$(cat ${container_id})" curl -s --header Host:${IP} localhost
+    docker exec "$(cat ${container_id})" curl -s --header Host:${IP} localhost
     | grep -q "<li>${IP} ${HOSTNAME}</li>"
     && (echo 'Dashboard install pass' && exit 0)
     || (echo 'Dashboard install fail' && exit 1)
 
   - >
-    sudo docker exec "$(cat ${container_id})" drush @${MACHINE_NAME}.${HOSTNAME} status
+    docker exec "$(cat ${container_id})" drush @${MACHINE_NAME}.${HOSTNAME} status
     | grep -q 'Drupal bootstrap.*Successful'
     && (echo 'Drush install pass' && exit 0)
     || (echo 'Drush install fail' && exit 1)
-
-  # Clean up
-  - 'sudo docker stop "$(cat ${container_id})"'
diff --git a/tests/Dockerfile.centos-7 b/tests/Dockerfile.centos-7
deleted file mode 100644
index 9dda3efa4..000000000
--- a/tests/Dockerfile.centos-7
+++ /dev/null
@@ -1,34 +0,0 @@
-FROM centos:7
-
-# Install systemd -- See https://hub.docker.com/_/centos/
-RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
-RUN yum -y update; yum clean all; \
-(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
-rm -f /lib/systemd/system/multi-user.target.wants/*; \
-rm -f /etc/systemd/system/*.wants/*; \
-rm -f /lib/systemd/system/local-fs.target.wants/*; \
-rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
-rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
-rm -f /lib/systemd/system/basic.target.wants/*; \
-rm -f /lib/systemd/system/anaconda.target.wants/*;
-
-# Install Ansible
-RUN yum -y install epel-release
-RUN yum -y install git sudo which curl tar unzip xz logrotate initscripts
-RUN yum -y install python-setuptools gcc sudo libffi-devel python-devel openssl-devel
-RUN yum clean all
-RUN easy_install pip
-RUN pip install ansible
-
-# Fix weird issue with setuptools
-RUN pip install --upgrade setuptools --user python
-
-# Disable requiretty
-RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
-
-# Install Ansible inventory file
-RUN mkdir -p /etc/ansible
-RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
-
-VOLUME ["/sys/fs/cgroup"]
-CMD ["/usr/sbin/init"]
diff --git a/tests/Dockerfile.ubuntu-16.04 b/tests/Dockerfile.ubuntu-16.04
deleted file mode 100644
index 9313987fb..000000000
--- a/tests/Dockerfile.ubuntu-16.04
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM ubuntu:16.04
-RUN apt-get update
-
-# Install Ansible
-RUN apt-get install -y software-properties-common git
-# The ansible repository does not provide deb packages for Xenial yet
-# https://github.com/ansible/ansible/issues/15524
-# RUN apt-add-repository -y ppa:ansible/ansible
-RUN apt-get update
-RUN apt-get install -y ansible ufw curl
-
-COPY initctl_faker .
-RUN chmod +x initctl_faker && rm -fr /sbin/initctl && ln -s /initctl_faker /sbin/initctl
-
-# Install Ansible inventory file
-RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/tests/initctl_faker b/tests/initctl_faker
deleted file mode 100644
index a2267f30d..000000000
--- a/tests/initctl_faker
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-ALIAS_CMD="$(echo ""$0"" | sed -e 's?/sbin/??')"
-
-case "$ALIAS_CMD" in
-    start|stop|restart|reload|status)
-        exec service $1 $ALIAS_CMD
-        ;;
-esac
-
-case "$1" in
-    list )
-        exec service --status-all
-        ;;
-    reload-configuration )
-        exec service $2 restart
-        ;;
-    start|stop|restart|reload|status)
-        exec service $2 $1
-        ;;
-    \?)
-        exit 0
-        ;;
-esac

From dc2cf4179a09bcd6c82b7908af8b131261d5d4a3 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 25 Sep 2016 18:57:20 -0500
Subject: [PATCH 0423/1273] Fix broken tests.

---
 provisioning/tasks/init-debian.yml | 2 +-
 tests/config.yml                   | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/provisioning/tasks/init-debian.yml b/provisioning/tasks/init-debian.yml
index b6bc20aa7..d2c10e155 100644
--- a/provisioning/tasks/init-debian.yml
+++ b/provisioning/tasks/init-debian.yml
@@ -14,7 +14,7 @@
 
 - name: Disable the ufw firewall (since we use a simple iptables firewall).
   service: name=ufw state=stopped
-  when: ansible_distribution == "Ubuntu"
+  when: ansible_distribution == "Ubuntu" and {{ drupalvm_disable_ufw_firewall | default(true) }}
 
 - name: Add repository for Apache 2.4 on Ubuntu 12.
   apt_repository: repo='ppa:ondrej/apache2'
diff --git a/tests/config.yml b/tests/config.yml
index 0a5484114..4f02f26a1 100644
--- a/tests/config.yml
+++ b/tests/config.yml
@@ -1,6 +1,11 @@
 ---
+# Update the composer_home_path for global installs.
 composer_home_path: "/{{ drupalvm_user }}/.composer"
 
+# Don't run the 'disable ufw firewall' task in tests.
+drupalvm_disable_ufw_firewall: false
+
+# Install extra utilities to test.
 installed_extras:
   - adminer
   - drupalconsole

From 7cb87aed265bb97cba26fbcc86d0d073697c0a78 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 25 Sep 2016 20:26:53 -0500
Subject: [PATCH 0424/1273] Fix broken test on CentOS 7.

---
 .travis.yml          | 3 +++
 tests/test-setup.yml | 8 ++++++++
 2 files changed, 11 insertions(+)
 create mode 100644 tests/test-setup.yml

diff --git a/.travis.yml b/.travis.yml
index 4118c29a9..abab6879f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,6 +58,9 @@ script:
   # Ansible syntax check.
   - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook ${DRUPALVM_DIR}/provisioning/playbook.yml --syntax-check'
 
+  # Run the test setup playbook with ansible-playbook.
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook ${DRUPALVM_DIR}/provisioning/test-setup.yml'
+
   # Run the playbook with ansible-playbook.
   - >
     if [ ! -z "${config_dir}" ]; then
diff --git a/tests/test-setup.yml b/tests/test-setup.yml
new file mode 100644
index 000000000..5fb46f9d4
--- /dev/null
+++ b/tests/test-setup.yml
@@ -0,0 +1,8 @@
+---
+- hosts: all
+  become: yes
+
+  tasks:
+    - name: Install test dependencies (RedHat).
+      package: name=logrotate state=present
+      when: ansible_os_family == 'RedHat'

From 7d17bdb75ebede323fffade74585d636d0b171ab Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 25 Sep 2016 20:58:47 -0500
Subject: [PATCH 0425/1273] Proper path for test-setup playbook.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index abab6879f..b42deab09 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,7 +59,7 @@ script:
   - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook ${DRUPALVM_DIR}/provisioning/playbook.yml --syntax-check'
 
   # Run the test setup playbook with ansible-playbook.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook ${DRUPALVM_DIR}/provisioning/test-setup.yml'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook ${DRUPALVM_DIR}/tests/test-setup.yml'
 
   # Run the playbook with ansible-playbook.
   - >

From 6ba1758ab90568dc2c9f722fe1271f6713d45f0e Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 26 Sep 2016 09:16:11 -0500
Subject: [PATCH 0426/1273] Update MySQL role to 2.4.0.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.mysql/.travis.yml       | 70 ++++++++-----------
 .../roles/geerlingguy.mysql/README.md         | 13 +++-
 .../roles/geerlingguy.mysql/defaults/main.yml | 18 +++--
 .../roles/geerlingguy.mysql/tasks/main.yml    | 28 +-------
 .../geerlingguy.mysql/tasks/variables.yml     | 59 ++++++++++++++++
 .../roles/geerlingguy.mysql/vars/Debian.yml   |  9 ++-
 .../roles/geerlingguy.mysql/vars/RedHat-6.yml |  9 ++-
 .../roles/geerlingguy.mysql/vars/RedHat-7.yml | 12 ++--
 9 files changed, 131 insertions(+), 89 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.mysql/tasks/variables.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 73f86511f..16663c8b5 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -32,7 +32,7 @@
 - src: geerlingguy.memcached
   version: 1.0.7
 - src: geerlingguy.mysql
-  version: 2.3.3
+  version: 2.4.0
 - src: geerlingguy.nginx
   version: 1.9.5
 - src: geerlingguy.nodejs
diff --git a/provisioning/roles/geerlingguy.mysql/.travis.yml b/provisioning/roles/geerlingguy.mysql/.travis.yml
index 0edb87160..b8b941645 100644
--- a/provisioning/roles/geerlingguy.mysql/.travis.yml
+++ b/provisioning/roles/geerlingguy.mysql/.travis.yml
@@ -1,54 +1,45 @@
 ---
-sudo: required
+services: docker
 
 env:
-  global:
-    # https://github.com/travis-ci/travis-ci/issues/6461#issuecomment-239577306
-    DOCKER_VERSION: "1.9.1-0~trusty"
-  matrix:
-    - distro: centos7
-      init: /usr/lib/systemd/systemd
-      run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-      playbook: centos-7-test.yml
-    - distro: centos6
-      init: /sbin/init
-      run_opts: ""
-      playbook: test.yml
-    - distro: ubuntu1604
-      init: /lib/systemd/systemd
-      run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-      playbook: test.yml
-    - distro: ubuntu1404
-      init: /sbin/init
-      run_opts: ""
-      playbook: test.yml
+  - distro: centos7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    playbook: centos-7-test.yml
+  - distro: centos6
+    init: /sbin/init
+    run_opts: ""
+    playbook: test.yml
+  - distro: ubuntu1604
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    playbook: test.yml
+  - distro: ubuntu1404
+    init: /sbin/init
+    run_opts: ""
+    playbook: test.yml
 
 services:
   - docker
 
 before_install:
-  # Downgrade to older version of Docker engine.
-  - sudo apt-get update
-  - sudo apt-get remove docker-engine -yq
-  - sudo apt-get install docker-engine=$DOCKER_VERSION -yq --no-install-suggests --no-install-recommends --force-yes -o Dpkg::Options::="--force-confnew"
-
   # Pull container
-  - 'sudo docker pull geerlingguy/docker-${distro}-ansible:latest'
+  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
   - container_id=$(mktemp)
-    # Run container in detached state
-  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
+  # Run container in detached state.
+  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
 
   # Ansible syntax check.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} --syntax-check'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} --syntax-check'
 
   # Test role.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook}'
+  - 'docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook}'
 
   # Test role idempotence.
   - idempotence=$(mktemp)
-  - sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} | tee -a ${idempotence}
+  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} | tee -a ${idempotence}
   - >
     tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
@@ -56,9 +47,9 @@ script:
     || (echo 'Idempotence test: fail' && exit 1)
 
   # Some MySQL debugging (show all the logs).
-  - sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ls -lah /var/log
-  - sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm cat /var/log/mysql/error.log || true
-  - sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm cat /var/log/mysql.err || true
+  - docker exec --tty "$(cat ${container_id})" env TERM=xterm ls -lah /var/log
+  - docker exec --tty "$(cat ${container_id})" env TERM=xterm cat /var/log/mysql/error.log || true
+  - docker exec --tty "$(cat ${container_id})" env TERM=xterm cat /var/log/mysql.err || true
 
   # Check to make sure we can connect to MySQL via Unix socket.
   - >
@@ -74,14 +65,11 @@ script:
     && (echo 'MySQL running normally' && exit 0)
     || (echo 'MySQL not running' && exit 1)
 
-  # Clean up
-  - sudo docker stop "$(cat ${container_id})"
-
 after_failure:
   # Check MySQL settings.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm cat /var/log/mysql/error.log'
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm cat /var/log/mysql.err'
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm cat /var/log/mysql.log'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm cat /var/log/mysql/error.log'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm cat /var/log/mysql.err'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm cat /var/log/mysql.log'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.mysql/README.md b/provisioning/roles/geerlingguy.mysql/README.md
index 341c7f102..ddc5f03bc 100644
--- a/provisioning/roles/geerlingguy.mysql/README.md
+++ b/provisioning/roles/geerlingguy.mysql/README.md
@@ -35,6 +35,11 @@ Whether to force update the MySQL root user's password. By default, this role wi
 
 Whether MySQL should be enabled on startup.
 
+    mysql_config_file: *default value depends on OS*
+    mysql_config_include_dir: *default value depends on OS*
+    
+The main my.cnf configuration file and include directory.
+
     overwrite_global_mycnf: yes
 
 Whether the global my.cnf should be overwritten each time this role is run. Setting this to `no` tells Ansible to only create the `my.cnf` file if it doesn't exist. This should be left at its default value (`yes`) if you'd like to use this role's variables to configure MySQL.
@@ -64,17 +69,19 @@ The MySQL users and their privileges. A user has the values `name`, `host` (defa
     mysql_port: "3306"
     mysql_bind_address: '0.0.0.0'
     mysql_datadir: /var/lib/mysql
+    mysql_socket: *default value depends on OS*
+    mysql_pid_file: *default value depends on OS*
 
 Default MySQL connection configuration.
 
     mysql_log: ""
-    mysql_log_error: /var/log/mysqld.log
-    mysql_syslog_tag: mysqld
+    mysql_log_error: *default value depends on OS*
+    mysql_syslog_tag: *default value depends on OS*
 
 MySQL logging configuration. Setting `mysql_log` (the general query log) or `mysql_log_error` to `syslog` will make MySQL log to syslog using the `mysql_syslog_tag`.
 
     mysql_slow_query_log_enabled: no
-    mysql_slow_query_log_file: /var/log/mysql-slow.log
+    mysql_slow_query_log_file: *default value depends on OS*
     mysql_slow_query_time: 2
 
 Slow query log settings. Note that the log file will be created by this role, but if you're running on a server with SELinux or AppArmor, you may need to add this path to the allowed paths for MySQL, or disable the mysql profile. For example, on Debian/Ubuntu, you can run `sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/usr.sbin.mysqld && sudo service apparmor restart`.
diff --git a/provisioning/roles/geerlingguy.mysql/defaults/main.yml b/provisioning/roles/geerlingguy.mysql/defaults/main.yml
index 3bd78bbaa..46e58a8e2 100644
--- a/provisioning/roles/geerlingguy.mysql/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.mysql/defaults/main.yml
@@ -11,6 +11,10 @@ mysql_enabled_on_startup: yes
 # update my.cnf. each time role is run? yes | no
 overwrite_global_mycnf: yes
 
+# The following variables have a default value depending on operating system.
+# mysql_config_file: /etc/my.cnf
+# mysql_config_include_dir: /etc/my.cnf.d
+
 # Pass in a comma-separated list of repos to use (e.g. "remi,epel"). Used only
 # for RedHat systems (and derivatives).
 mysql_enablerepo: ""
@@ -25,14 +29,17 @@ mysql_enablerepo: ""
 # MySQL connection settings.
 mysql_port: "3306"
 mysql_bind_address: '0.0.0.0'
-mysql_datadir: /var/lib/mysql
-mysql_pid_file: /var/run/mysqld/mysqld.pid
 mysql_skip_name_resolve: no
+mysql_datadir: /var/lib/mysql
+# The following variables have a default value depending on operating system.
+# mysql_pid_file: /var/run/mysqld/mysqld.pid
+# mysql_socket: /var/lib/mysql/mysql.sock
 
 # Slow query log settings.
 mysql_slow_query_log_enabled: no
-mysql_slow_query_log_file: /var/log/mysql-slow.log
 mysql_slow_query_time: "2"
+# The following variable has a default value depending on operating system.
+# mysql_slow_query_log_file: /var/log/mysql-slow.log
 
 # Memory settings (default values optimized ~512MB RAM).
 mysql_key_buffer_size: "256M"
@@ -72,8 +79,9 @@ mysql_mysqldump_max_allowed_packet: "64M"
 
 # Logging settings.
 mysql_log: ""
-mysql_log_error: /var/log/mysql.err
-mysql_syslog_tag: mysql
+# The following variables have a default value depending on operating system.
+# mysql_log_error: /var/log/mysql.err
+# mysql_syslog_tag: mysql
 
 mysql_config_include_files: []
 #  - src: path/relative/to/playbook/file.cnf
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/main.yml b/provisioning/roles/geerlingguy.mysql/tasks/main.yml
index bb0669b02..6d3527796 100644
--- a/provisioning/roles/geerlingguy.mysql/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.mysql/tasks/main.yml
@@ -1,32 +1,6 @@
 ---
 # Variable configuration.
-- name: Include OS-specific variables.
-  include_vars: "{{ ansible_os_family }}.yml"
-  when: ansible_os_family != "RedHat"
-
-- name: Include OS-specific variables (RedHat).
-  include_vars: "{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml"
-  when: ansible_os_family == "RedHat"
-
-- name: Define mysql_packages.
-  set_fact:
-    mysql_packages: "{{ __mysql_packages | list }}"
-  when: mysql_packages is not defined
-
-- name: Define mysql_daemon.
-  set_fact:
-    mysql_daemon: "{{ __mysql_daemon }}"
-  when: mysql_daemon is not defined
-
-- name: Define mysql_slow_query_log_file.
-  set_fact:
-    mysql_slow_query_log_file: "{{ __mysql_slow_query_log_file }}"
-  when: mysql_slow_query_log_file is not defined
-
-- name: Define mysql_supports_innodb_large_prefix.
-  set_fact:
-    mysql_supports_innodb_large_prefix: "{{ __mysql_supports_innodb_large_prefix }}"
-  when: mysql_supports_innodb_large_prefix is not defined
+- include: variables.yml
 
 # Setup/install tasks.
 - include: setup-RedHat.yml
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/variables.yml b/provisioning/roles/geerlingguy.mysql/tasks/variables.yml
new file mode 100644
index 000000000..f03ee8c62
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/tasks/variables.yml
@@ -0,0 +1,59 @@
+---
+# Variable configuration.
+- name: Include OS-specific variables.
+  include_vars: "{{ ansible_os_family }}.yml"
+  when: ansible_os_family != "RedHat"
+
+- name: Include OS-specific variables (RedHat).
+  include_vars: "{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml"
+  when: ansible_os_family == "RedHat"
+
+- name: Define mysql_packages.
+  set_fact:
+    mysql_packages: "{{ __mysql_packages | list }}"
+  when: mysql_packages is not defined
+
+- name: Define mysql_daemon.
+  set_fact:
+    mysql_daemon: "{{ __mysql_daemon }}"
+  when: mysql_daemon is not defined
+
+- name: Define mysql_slow_query_log_file.
+  set_fact:
+    mysql_slow_query_log_file: "{{ __mysql_slow_query_log_file }}"
+  when: mysql_slow_query_log_file is not defined
+
+- name: Define mysql_log_error.
+  set_fact:
+    mysql_log_error: "{{ __mysql_log_error }}"
+  when: mysql_log_error is not defined
+
+- name: Define mysql_syslog_tag.
+  set_fact:
+    mysql_syslog_tag: "{{ __mysql_syslog_tag }}"
+  when: mysql_syslog_tag is not defined
+
+- name: Define mysql_pid_file.
+  set_fact:
+    mysql_pid_file: "{{ __mysql_pid_file }}"
+  when: mysql_pid_file is not defined
+
+- name: Define mysql_config_file.
+  set_fact:
+    mysql_config_file: "{{ __mysql_config_file }}"
+  when: mysql_config_file is not defined
+
+- name: Define mysql_config_include_dir.
+  set_fact:
+    mysql_config_include_dir: "{{ __mysql_config_include_dir }}"
+  when: mysql_config_include_dir is not defined
+
+- name: Define mysql_socket.
+  set_fact:
+    mysql_socket: "{{ __mysql_socket }}"
+  when: mysql_socket is not defined
+
+- name: Define mysql_supports_innodb_large_prefix.
+  set_fact:
+    mysql_supports_innodb_large_prefix: "{{ __mysql_supports_innodb_large_prefix }}"
+  when: mysql_supports_innodb_large_prefix is not defined
diff --git a/provisioning/roles/geerlingguy.mysql/vars/Debian.yml b/provisioning/roles/geerlingguy.mysql/vars/Debian.yml
index 354b22fd1..2ddf1e743 100644
--- a/provisioning/roles/geerlingguy.mysql/vars/Debian.yml
+++ b/provisioning/roles/geerlingguy.mysql/vars/Debian.yml
@@ -4,7 +4,10 @@ __mysql_packages:
   - mysql-common
   - mysql-server
 __mysql_slow_query_log_file: /var/log/mysql/mysql-slow.log
-mysql_config_file: /etc/mysql/my.cnf
-mysql_config_include_dir: /etc/mysql/conf.d
-mysql_socket: /var/run/mysqld/mysqld.sock
+__mysql_log_error: /var/log/mysql.err
+__mysql_syslog_tag: mysql
+__mysql_pid_file: /var/run/mysqld/mysqld.pid
+__mysql_config_file: /etc/mysql/my.cnf
+__mysql_config_include_dir: /etc/mysql/conf.d
+__mysql_socket: /var/run/mysqld/mysqld.sock
 __mysql_supports_innodb_large_prefix: true
diff --git a/provisioning/roles/geerlingguy.mysql/vars/RedHat-6.yml b/provisioning/roles/geerlingguy.mysql/vars/RedHat-6.yml
index 34de34606..96af1ff04 100644
--- a/provisioning/roles/geerlingguy.mysql/vars/RedHat-6.yml
+++ b/provisioning/roles/geerlingguy.mysql/vars/RedHat-6.yml
@@ -4,7 +4,10 @@ __mysql_packages:
   - mysql
   - mysql-server
 __mysql_slow_query_log_file: /var/log/mysql-slow.log
-mysql_config_file: /etc/my.cnf
-mysql_config_include_dir: /etc/my.cnf.d
-mysql_socket: /var/lib/mysql/mysql.sock
+__mysql_log_error: /var/log/mysql.err
+__mysql_syslog_tag: mysql
+__mysql_pid_file: /var/run/mysqld/mysqld.pid
+__mysql_config_file: /etc/my.cnf
+__mysql_config_include_dir: /etc/my.cnf.d
+__mysql_socket: /var/lib/mysql/mysql.sock
 __mysql_supports_innodb_large_prefix: false
diff --git a/provisioning/roles/geerlingguy.mysql/vars/RedHat-7.yml b/provisioning/roles/geerlingguy.mysql/vars/RedHat-7.yml
index 281c98a7e..6f989b3a4 100644
--- a/provisioning/roles/geerlingguy.mysql/vars/RedHat-7.yml
+++ b/provisioning/roles/geerlingguy.mysql/vars/RedHat-7.yml
@@ -7,10 +7,10 @@ __mysql_packages:
   - MySQL-python
   - perl-DBD-MySQL
 __mysql_slow_query_log_file: /var/log/mysql-slow.log
-mysql_log_error: /var/log/mariadb/mariadb.log
-mysql_syslog_tag: mariadb
-mysql_pid_file: /var/run/mariadb/mariadb.pid
-mysql_config_file: /etc/my.cnf
-mysql_config_include_dir: /etc/my.cnf.d
-mysql_socket: /var/lib/mysql/mysql.sock
+__mysql_log_error: /var/log/mariadb/mariadb.log
+__mysql_syslog_tag: mariadb
+__mysql_pid_file: /var/run/mariadb/mariadb.pid
+__mysql_config_file: /etc/my.cnf
+__mysql_config_include_dir: /etc/my.cnf.d
+__mysql_socket: /var/lib/mysql/mysql.sock
 __mysql_supports_innodb_large_prefix: true

From c9a82646c9c6984927cff33dec5d8fc98dd642b8 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 27 Sep 2016 17:09:23 -0500
Subject: [PATCH 0427/1273] Issue #907: Noticed typo in default.config.yml.

---
 default.config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.config.yml b/default.config.yml
index 333d33b4e..7144b65b1 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -171,7 +171,7 @@ mysql_users:
     priv: "{{ drupal_mysql_database }}.*:ALL"
 
 # Comment out any extra utilities you don't want to install. If you don't want
-# to install *any* extras, make set this value to an empty set, e.g. `[]`.
+# to install *any* extras, set this value to an empty set, e.g. `[]`.
 installed_extras:
   - adminer
   # - blackfire

From cace79dc7da99d40921d9555e65e7ea5630516e1 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 27 Sep 2016 17:25:34 -0500
Subject: [PATCH 0428/1273] Ensure Debian apt caches are updated when testing.

---
 tests/test-setup.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/test-setup.yml b/tests/test-setup.yml
index 5fb46f9d4..9ae3c099f 100644
--- a/tests/test-setup.yml
+++ b/tests/test-setup.yml
@@ -3,6 +3,10 @@
   become: yes
 
   tasks:
+    - name: Update apt cache.
+      apt: update_cache=yes
+      when: ansible_os_family == 'Debian'
+
     - name: Install test dependencies (RedHat).
       package: name=logrotate state=present
       when: ansible_os_family == 'RedHat'

From 139096a241cc245026b50843754c9672b9cbb35d Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 28 Sep 2016 19:31:42 -0500
Subject: [PATCH 0429/1273] Issue #908: Bump required version of Vagrant to
 1.8.5.

---
 README.md   | 2 +-
 Vagrantfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 75cd86747..b4343255f 100644
--- a/README.md
+++ b/README.md
@@ -74,7 +74,7 @@ Notes:
 
   - **For faster provisioning** (macOS/Linux only): *[Install Ansible](http://docs.ansible.com/intro_installation.html) on your host machine, so Drupal VM can run the provisioning steps locally instead of inside the VM.*
   - **NFS on Linux**: *If NFS is not already installed on your host, you will need to install it to use the default NFS synced folder configuration. See guides for [Debian/Ubuntu](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-ubuntu-14-04), [Arch](https://wiki.archlinux.org/index.php/NFS#Installation), and [RHEL/CentOS](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-centos-6).*
-  - **Versions**: *Make sure you're running the latest releases of Vagrant, VirtualBox, and Ansible—as of February 2016, Drupal VM recommends: Vagrant 1.8.5, VirtualBox 5.1.2, and Ansible 2.1.0.*
+  - **Versions**: *Make sure you're running the latest releases of Vagrant, VirtualBox, and Ansible—as of February 2016, Drupal VM recommends: Vagrant 1.8.5, VirtualBox 5.1.x, and Ansible 2.1.x.*
 
 ### 2 - Build the Virtual Machine
 
diff --git a/Vagrantfile b/Vagrantfile
index ebe6fc8d2..306719e1f 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,7 +1,7 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 VAGRANTFILE_API_VERSION = '2' unless defined? VAGRANTFILE_API_VERSION
-Vagrant.require_version '>= 1.8.1'
+Vagrant.require_version '>= 1.8.5'
 
 # Absolute paths on the host machine.
 host_drupalvm_dir = File.dirname(File.expand_path(__FILE__))

From d6a1872bdf35667547f1d4950adf1f13866c6d0c Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 28 Sep 2016 20:01:44 -0500
Subject: [PATCH 0430/1273] Fixes #908: Require minimum version of Ansible,
 Vagrant.

---
 Vagrantfile               | 3 ++-
 default.config.yml        | 4 ++++
 provisioning/playbook.yml | 6 ++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/Vagrantfile b/Vagrantfile
index 306719e1f..6618a85d4 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,7 +1,6 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 VAGRANTFILE_API_VERSION = '2' unless defined? VAGRANTFILE_API_VERSION
-Vagrant.require_version '>= 1.8.5'
 
 # Absolute paths on the host machine.
 host_drupalvm_dir = File.dirname(File.expand_path(__FILE__))
@@ -53,6 +52,8 @@ vconfig = walk(vconfig) do |value|
   value
 end
 
+Vagrant.require_version ">= #{vconfig['drupalvm_vagrant_version_min']}"
+
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # Networking configuration.
   config.vm.hostname = vconfig['vagrant_hostname']
diff --git a/default.config.yml b/default.config.yml
index 7144b65b1..34498a89a 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -32,6 +32,10 @@ vagrant_synced_folders:
 vagrant_memory: 1024
 vagrant_cpus: 2
 
+# Minimum required versions.
+drupalvm_vagrant_version_min: '1.8.5'
+drupalvm_ansible_version_min: '2.1'
+
 # Force use of ansible_local provisioner, even if Ansible is installed on host.
 force_ansible_local: false
 
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 9f11e7d14..452fa26da 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -7,6 +7,12 @@
     - ../default.config.yml
 
   pre_tasks:
+    - name: Verify Ansible meets Drupal VM's version requirements.
+      assert:
+        that: "ansible_version.full | version_compare(drupalvm_ansible_version_min, '>=')"
+        msg: >
+          "You must update Ansible to at least {{ drupalvm_ansible_version_min }} to use this version of Drupal VM."
+
     - name: Define config_dir.
       set_fact:
         config_dir: "{{ playbook_dir }}/.."

From 2d7291d9b299f8e107962d4b19870165d752f0e2 Mon Sep 17 00:00:00 2001
From: KentR <info@kentrichards.net>
Date: Wed, 28 Sep 2016 22:24:12 -0500
Subject: [PATCH 0431/1273] Fixes #855: Default to 1 vCPU core for better
 VirtualBox performance.

---
 default.config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.config.yml b/default.config.yml
index 34498a89a..6990362ba 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -30,7 +30,7 @@ vagrant_synced_folders:
 
 # Memory and CPU to use for this VM.
 vagrant_memory: 1024
-vagrant_cpus: 2
+vagrant_cpus: 1
 
 # Minimum required versions.
 drupalvm_vagrant_version_min: '1.8.5'

From c40e80530fad9e6db5936ee4aa41d59c8e57aab0 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 30 Sep 2016 19:03:38 -0500
Subject: [PATCH 0432/1273] Update PHP-MySQL Ansible role.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.php-mysql/.travis.yml   | 47 +++++++------------
 .../roles/geerlingguy.php-mysql/README.md     |  6 +--
 .../roles/geerlingguy.php-mysql/meta/main.yml |  4 +-
 .../tests/Dockerfile.centos-6                 | 18 -------
 .../tests/Dockerfile.centos-7                 | 30 ------------
 .../tests/Dockerfile.ubuntu-14.04             | 14 ------
 .../geerlingguy.php-mysql/tests/initctl_faker | 23 ---------
 .../geerlingguy.php-mysql/tests/inventory     |  1 -
 .../geerlingguy.php-mysql/tests/test.yml      | 17 ++++---
 10 files changed, 32 insertions(+), 130 deletions(-)
 delete mode 100644 provisioning/roles/geerlingguy.php-mysql/tests/Dockerfile.centos-6
 delete mode 100644 provisioning/roles/geerlingguy.php-mysql/tests/Dockerfile.centos-7
 delete mode 100644 provisioning/roles/geerlingguy.php-mysql/tests/Dockerfile.ubuntu-14.04
 delete mode 100644 provisioning/roles/geerlingguy.php-mysql/tests/initctl_faker
 delete mode 100644 provisioning/roles/geerlingguy.php-mysql/tests/inventory

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 16663c8b5..36938673b 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -42,7 +42,7 @@
 - src: geerlingguy.php-memcached
   version: 2.0.0
 - src: geerlingguy.php-mysql
-  version: 2.0.0
+  version: 2.0.1
 - src: geerlingguy.php-pecl
   version: 1.2.1
 - src: geerlingguy.php-redis
diff --git a/provisioning/roles/geerlingguy.php-mysql/.travis.yml b/provisioning/roles/geerlingguy.php-mysql/.travis.yml
index 293ca81d0..db654f869 100644
--- a/provisioning/roles/geerlingguy.php-mysql/.travis.yml
+++ b/provisioning/roles/geerlingguy.php-mysql/.travis.yml
@@ -1,56 +1,43 @@
 ---
-sudo: required
+services: docker
 
 env:
-  - distribution: centos
-    version: 6
-    init: /sbin/init
-    run_opts: ""
-  - distribution: centos
-    version: 7
+  - distro: centos7
     init: /usr/lib/systemd/systemd
     run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-  - distribution: ubuntu
-    version: 14.04
-    init: /sbin/init
-    run_opts: ""
-
-services:
-  - docker
+  - distro: ubuntu1604
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
 
 before_install:
-  # - sudo apt-get update
-  # Pull container
-  - 'sudo docker pull ${distribution}:${version}'
-  # Customize container
-  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+  # Pull container.
+  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
   - container_id=$(mktemp)
-  # Run container in detached state
-  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+  # Run container in detached state.
+  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
 
   # Install dependencies.
-  - 'sudo docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
+  - 'docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
 
   # Ansible syntax check.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
 
   # Test role.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
 
   # Test role idempotence.
+  - idempotence=$(mktemp)
+  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
   - >
-    sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml
+    tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
     && (echo 'Idempotence test: pass' && exit 0)
     || (echo 'Idempotence test: fail' && exit 1)
 
-  # Ensure PHP mysql support is enabled.
-  - sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm php -i | grep 'MySQL Support => enabled'
-
-  # Clean up
-  - 'sudo docker stop "$(cat ${container_id})"'
+  # Ensure PHP MySQL support is enabled.
+  - docker exec --tty "$(cat ${container_id})" env TERM=xterm php -i | grep 'mysqlnd => enabled'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.php-mysql/README.md b/provisioning/roles/geerlingguy.php-mysql/README.md
index dcc731417..3894f134b 100644
--- a/provisioning/roles/geerlingguy.php-mysql/README.md
+++ b/provisioning/roles/geerlingguy.php-mysql/README.md
@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/geerlingguy/ansible-role-php-mysql.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-php-mysql)
 
-Installs PHP MySQL support on RedHat/CentOS/Debian/Ubuntu.
+Installs PHP [MySQL](https://www.mysql.com/) support on Linux.
 
 ## Requirements
 
@@ -14,7 +14,7 @@ Available variables are listed below, along with default values (see `defaults/m
 
     php_enablerepo: ""
 
-(RedHat/CentOS only) If you have enabled any additional repositories (might I suggest geerlingguy.repo-epel or geerlingguy.repo-remi), those repositories can be listed under this variable (e.g. `remi,epel`). This can be handy, as an example, if you want to install the latest version of PHP 5.4, which is in the Remi repository.
+(RedHat/CentOS only) If you have enabled any additional repositories (might I suggest geerlingguy.repo-epel or geerlingguy.repo-remi), those repositories can be listed under this variable (e.g. `remi,epel`). This can allow you to install later versions of PHP packages.
 
     php_mysql_package: php-mysql # RedHat
     php_mysql_package: php5-mysql # Debian
@@ -37,4 +37,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.php-mysql/meta/main.yml b/provisioning/roles/geerlingguy.php-mysql/meta/main.yml
index b46eaeffa..e8fa30bc8 100644
--- a/provisioning/roles/geerlingguy.php-mysql/meta/main.yml
+++ b/provisioning/roles/geerlingguy.php-mysql/meta/main.yml
@@ -4,7 +4,7 @@ dependencies:
 
 galaxy_info:
   author: geerlingguy
-  description: PHP MySQL support for RedHat/CentOS and Debian/Ubuntu.
+  description: PHP MySQL support for Linux.
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
   min_ansible_version: 1.8
@@ -21,3 +21,5 @@ galaxy_info:
   galaxy_tags:
     - database
     - web
+    - mysql
+    - php
diff --git a/provisioning/roles/geerlingguy.php-mysql/tests/Dockerfile.centos-6 b/provisioning/roles/geerlingguy.php-mysql/tests/Dockerfile.centos-6
deleted file mode 100644
index db3f5b684..000000000
--- a/provisioning/roles/geerlingguy.php-mysql/tests/Dockerfile.centos-6
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM centos:6
-
-# Install Ansible
-RUN yum -y update; yum clean all;
-RUN yum -y install epel-release
-RUN yum -y install git python-setuptools gcc sudo libffi-devel python-devel openssl-devel
-RUN yum clean all
-RUN easy_install pip
-RUN pip install ansible
-
-# Disable requiretty
-RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
-
-# Install Ansible inventory file
-RUN mkdir - p /etc/ansible
-RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
-
-CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.php-mysql/tests/Dockerfile.centos-7 b/provisioning/roles/geerlingguy.php-mysql/tests/Dockerfile.centos-7
deleted file mode 100644
index 55bc14de6..000000000
--- a/provisioning/roles/geerlingguy.php-mysql/tests/Dockerfile.centos-7
+++ /dev/null
@@ -1,30 +0,0 @@
-FROM centos:7
-
-# Install systemd -- See https://hub.docker.com/_/centos/
-RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
-RUN yum -y update; yum clean all; \
-(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
-rm -f /lib/systemd/system/multi-user.target.wants/*; \
-rm -f /etc/systemd/system/*.wants/*; \
-rm -f /lib/systemd/system/local-fs.target.wants/*; \
-rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
-rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
-rm -f /lib/systemd/system/basic.target.wants/*; \
-rm -f /lib/systemd/system/anaconda.target.wants/*;
-
-# Install Ansible
-RUN yum -y install epel-release
-RUN yum -y install git python-setuptools gcc sudo libffi-devel python-devel openssl-devel
-RUN yum clean all
-RUN easy_install pip
-RUN pip install ansible
-
-# Disable requiretty
-RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
-
-# Install Ansible inventory file
-RUN mkdir - p /etc/ansible
-RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
-
-VOLUME ["/sys/fs/cgroup"]
-CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.php-mysql/tests/Dockerfile.ubuntu-14.04 b/provisioning/roles/geerlingguy.php-mysql/tests/Dockerfile.ubuntu-14.04
deleted file mode 100644
index f81cabec6..000000000
--- a/provisioning/roles/geerlingguy.php-mysql/tests/Dockerfile.ubuntu-14.04
+++ /dev/null
@@ -1,14 +0,0 @@
-FROM ubuntu:14.04
-RUN apt-get update
-
-# Install Ansible
-RUN apt-get install -y software-properties-common git
-RUN apt-add-repository -y ppa:ansible/ansible
-RUN apt-get update
-RUN apt-get install -y ansible
-
-COPY initctl_faker .
-RUN chmod +x initctl_faker && rm -fr /sbin/initctl && ln -s /initctl_faker /sbin/initctl
-
-# Install Ansible inventory file
-RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.php-mysql/tests/initctl_faker b/provisioning/roles/geerlingguy.php-mysql/tests/initctl_faker
deleted file mode 100644
index a2267f30d..000000000
--- a/provisioning/roles/geerlingguy.php-mysql/tests/initctl_faker
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-ALIAS_CMD="$(echo ""$0"" | sed -e 's?/sbin/??')"
-
-case "$ALIAS_CMD" in
-    start|stop|restart|reload|status)
-        exec service $1 $ALIAS_CMD
-        ;;
-esac
-
-case "$1" in
-    list )
-        exec service --status-all
-        ;;
-    reload-configuration )
-        exec service $2 restart
-        ;;
-    start|stop|restart|reload|status)
-        exec service $2 $1
-        ;;
-    \?)
-        exit 0
-        ;;
-esac
diff --git a/provisioning/roles/geerlingguy.php-mysql/tests/inventory b/provisioning/roles/geerlingguy.php-mysql/tests/inventory
deleted file mode 100644
index 2fbb50c4a..000000000
--- a/provisioning/roles/geerlingguy.php-mysql/tests/inventory
+++ /dev/null
@@ -1 +0,0 @@
-localhost
diff --git a/provisioning/roles/geerlingguy.php-mysql/tests/test.yml b/provisioning/roles/geerlingguy.php-mysql/tests/test.yml
index 2ac82459b..18be2d588 100644
--- a/provisioning/roles/geerlingguy.php-mysql/tests/test.yml
+++ b/provisioning/roles/geerlingguy.php-mysql/tests/test.yml
@@ -1,22 +1,21 @@
 ---
-- hosts: localhost
-  remote_user: root
+- hosts: all
 
   vars:
-    php_version: 5.6
-    php_enablerepo: "remi,remi-php56"
+    php_enablerepo: "remi,remi-php70"
 
   pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=yes
+      when: ansible_os_family == 'Debian'
+
     - name: Include CentOS 7-specific vars.
       include_vars: centos7-vars.yml
       when: ansible_os_family == 'RedHat' and ansible_distribution_major_version == "7"
 
-    - name: Add repository for PHP 5.6.
-      apt_repository: repo='ppa:ondrej/php5-5.6'
-      when: ansible_os_family == 'Debian'
-
   roles:
-    - { role: geerlingguy.repo-remi, when: ansible_os_family == 'RedHat' }
+    - role: geerlingguy.repo-remi
+      when: ansible_os_family == 'RedHat'
     - geerlingguy.apache
     - geerlingguy.mysql
     - geerlingguy.php

From 83c7fde7306bd0db9373230e355f7878e1e3124e Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 30 Sep 2016 19:26:50 -0500
Subject: [PATCH 0433/1273] Issue #146: Add PostgreSQL support.

---
 .travis.yml                                   |   9 ++
 README.md                                     |   2 +-
 default.config.yml                            |  29 +++--
 docs/extras/postgresql.md                     |   9 ++
 examples/prod/prod.config.yml                 |   2 +-
 mkdocs.yml                                    |   1 +
 provisioning/playbook.yml                     |   6 +-
 provisioning/requirements.yml                 |   4 +
 .../roles/geerlingguy.php-pgsql/.travis.yml   |  46 ++++++++
 .../roles/geerlingguy.php-pgsql/README.md     |  42 +++++++
 .../geerlingguy.php-pgsql/defaults/main.yml   |   3 +
 .../roles/geerlingguy.php-pgsql/meta/main.yml |  26 +++++
 .../geerlingguy.php-pgsql/tasks/main.yml      |  29 +++++
 .../tests/requirements.yml                    |   5 +
 .../geerlingguy.php-pgsql/tests/test.yml      |  18 +++
 .../geerlingguy.php-pgsql/vars/Debian.yml     |   2 +
 .../geerlingguy.php-pgsql/vars/RedHat.yml     |   2 +
 .../roles/geerlingguy.postgresql/.travis.yml  |  67 +++++++++++
 .../roles/geerlingguy.postgresql/README.md    | 110 ++++++++++++++++++
 .../geerlingguy.postgresql/defaults/main.yml  |  45 +++++++
 .../geerlingguy.postgresql/handlers/main.yml  |   3 +
 .../geerlingguy.postgresql/meta/main.yml      |  25 ++++
 .../tasks/configure.yml                       |  18 +++
 .../tasks/databases.yml                       |  20 ++++
 .../tasks/initialize.yml                      |  29 +++++
 .../geerlingguy.postgresql/tasks/main.yml     |  23 ++++
 .../tasks/setup-Debian.yml                    |  18 +++
 .../tasks/setup-RedHat.yml                    |   7 ++
 .../geerlingguy.postgresql/tasks/users.yml    |  20 ++++
 .../tasks/variables.yml                       |  39 +++++++
 .../templates/postgres.sh.j2                  |   2 +
 .../geerlingguy.postgresql/tests/test.yml     |  23 ++++
 .../geerlingguy.postgresql/vars/Debian-8.yml  |  10 ++
 .../geerlingguy.postgresql/vars/RedHat-6.yml  |  11 ++
 .../geerlingguy.postgresql/vars/RedHat-7.yml  |  11 ++
 .../geerlingguy.postgresql/vars/Ubuntu-14.yml |  10 ++
 .../geerlingguy.postgresql/vars/Ubuntu-16.yml |  10 ++
 provisioning/tasks/install-site.yml           |   2 +-
 tests/ubuntu-16-postgresql.config.yml         |   2 +
 39 files changed, 726 insertions(+), 14 deletions(-)
 create mode 100644 docs/extras/postgresql.md
 create mode 100644 provisioning/roles/geerlingguy.php-pgsql/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.php-pgsql/README.md
 create mode 100644 provisioning/roles/geerlingguy.php-pgsql/defaults/main.yml
 create mode 100644 provisioning/roles/geerlingguy.php-pgsql/meta/main.yml
 create mode 100644 provisioning/roles/geerlingguy.php-pgsql/tasks/main.yml
 create mode 100644 provisioning/roles/geerlingguy.php-pgsql/tests/requirements.yml
 create mode 100644 provisioning/roles/geerlingguy.php-pgsql/tests/test.yml
 create mode 100644 provisioning/roles/geerlingguy.php-pgsql/vars/Debian.yml
 create mode 100644 provisioning/roles/geerlingguy.php-pgsql/vars/RedHat.yml
 create mode 100644 provisioning/roles/geerlingguy.postgresql/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.postgresql/README.md
 create mode 100644 provisioning/roles/geerlingguy.postgresql/defaults/main.yml
 create mode 100644 provisioning/roles/geerlingguy.postgresql/handlers/main.yml
 create mode 100644 provisioning/roles/geerlingguy.postgresql/meta/main.yml
 create mode 100644 provisioning/roles/geerlingguy.postgresql/tasks/configure.yml
 create mode 100644 provisioning/roles/geerlingguy.postgresql/tasks/databases.yml
 create mode 100644 provisioning/roles/geerlingguy.postgresql/tasks/initialize.yml
 create mode 100644 provisioning/roles/geerlingguy.postgresql/tasks/main.yml
 create mode 100644 provisioning/roles/geerlingguy.postgresql/tasks/setup-Debian.yml
 create mode 100644 provisioning/roles/geerlingguy.postgresql/tasks/setup-RedHat.yml
 create mode 100644 provisioning/roles/geerlingguy.postgresql/tasks/users.yml
 create mode 100644 provisioning/roles/geerlingguy.postgresql/tasks/variables.yml
 create mode 100644 provisioning/roles/geerlingguy.postgresql/templates/postgres.sh.j2
 create mode 100644 provisioning/roles/geerlingguy.postgresql/tests/test.yml
 create mode 100644 provisioning/roles/geerlingguy.postgresql/vars/Debian-8.yml
 create mode 100644 provisioning/roles/geerlingguy.postgresql/vars/RedHat-6.yml
 create mode 100644 provisioning/roles/geerlingguy.postgresql/vars/RedHat-7.yml
 create mode 100644 provisioning/roles/geerlingguy.postgresql/vars/Ubuntu-14.yml
 create mode 100644 provisioning/roles/geerlingguy.postgresql/vars/Ubuntu-16.yml
 create mode 100644 tests/ubuntu-16-postgresql.config.yml

diff --git a/.travis.yml b/.travis.yml
index b42deab09..79b06f393 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,14 +11,23 @@ env:
       IP: 192.168.88.88
       DRUPALVM_DIR: /var/www/drupalvm
   matrix:
+    # Defaults - Ubuntu 16.04.
     - distro: ubuntu1604
       init: /sbin/init
       run_opts: "--privileged"
+    # Nginx and Drush make file test - Ubuntu 16.04.
     - distro: ubuntu1604
       init: /sbin/init
       run_opts: "--privileged"
       local_config: tests/ubuntu-16-nginx.config.yml
       config_dir: /var/www/drupalvm/config
+    # PostgreSQL - Ubuntu 16.04.
+    - distro: ubuntu1604
+      init: /sbin/init
+      run_opts: "--privileged"
+      local_config: tests/ubuntu-16-postgres.config.yml
+      config_dir: /var/www/drupalvm/config
+    # Defaults - CentOS 7.
     - distro: centos7
       init: /usr/lib/systemd/systemd
       run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
diff --git a/README.md b/README.md
index b4343255f..71aac4eaa 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ It will install the following on an Ubuntu 16.04 (by default) linux VM:
 
   - Apache 2.4.x (or Nginx 1.x)
   - PHP 7.0.x (configurable)
-  - MySQL 5.7.x
+  - MySQL 5.7.x (or PostgreSQL 9.x)
   - Drush (configurable)
   - Drupal 7.x, or 8.x.x (configurable)
   - Optional:
diff --git a/default.config.yml b/default.config.yml
index 6990362ba..1d90a31fc 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -42,6 +42,9 @@ force_ansible_local: false
 # The web server software to use. Can be either 'apache' or 'nginx'.
 drupalvm_webserver: apache
 
+# The database system to use. Can be either 'mysql' or 'pgsql'.
+drupalvm_database: mysql
+
 # Set this to 'false' if you are using a different site deployment strategy and
 # would like to configure 'vagrant_synced_folders' and 'apache_vhosts' manually.
 build_makefile: false
@@ -68,9 +71,9 @@ install_site: true
 
 # Required Drupal settings.
 drupal_core_path: "{{ drupal_composer_install_dir }}/web"
-drupal_mysql_user: drupal
-drupal_mysql_password: drupal
-drupal_mysql_database: drupal
+drupal_db_user: drupal
+drupal_db_password: drupal
+drupal_db_name: drupal
 
 # Settings for installing a Drupal site if 'install_site:' is 'true'.
 drupal_major_version: 8
@@ -161,18 +164,26 @@ nginx_hosts:
 nginx_remove_default_vhost: true
 nginx_ppa_use: true
 
-# MySQL Databases and users. If 'install_site' is 'true', first database will
-# be used for the site.
+# MySQL databases and users.
 mysql_databases:
-  - name: "{{ drupal_mysql_database }}"
+  - name: "{{ drupal_db_name }}"
     encoding: utf8mb4
     collation: utf8mb4_general_ci
 
 mysql_users:
-  - name: "{{ drupal_mysql_user }}"
+  - name: "{{ drupal_db_user }}"
     host: "%"
-    password: "{{ drupal_mysql_password }}"
-    priv: "{{ drupal_mysql_database }}.*:ALL"
+    password: "{{ drupal_db_password }}"
+    priv: "{{ drupal_db_name }}.*:ALL"
+
+# PostgreSQL databases and users.
+postgresql_databases:
+  - name: "{{ drupal_db_name }}"
+
+postgresql_users:
+  - name: "{{ drupal_db_user }}"
+    password: "{{ drupal_db_password }}"
+    priv: "ALL"
 
 # Comment out any extra utilities you don't want to install. If you don't want
 # to install *any* extras, set this value to an empty set, e.g. `[]`.
diff --git a/docs/extras/postgresql.md b/docs/extras/postgresql.md
new file mode 100644
index 000000000..ab385d059
--- /dev/null
+++ b/docs/extras/postgresql.md
@@ -0,0 +1,9 @@
+Since Drupal VM is built in a modular fashion, you can swap out the database engine and use [PostgreSQL](https://www.postgresql.org/) instead of MySQL (as long as the version of Drupal you're using supports it!).
+
+To switch from MySQL to PostgreSQL, switch the `drupalvm_database` setting in your local `config.yml` to `pgsql`:
+
+```yaml
+drupalvm_database: mysql
+```
+
+For more PostgreSQL configuration options, see the README included with the [`geerlingguy.postgresql](https://galaxy.ansible.com/geerlingguy/postgresql/) Ansible role.
diff --git a/examples/prod/prod.config.yml b/examples/prod/prod.config.yml
index 6018785ef..76b0ea6ef 100644
--- a/examples/prod/prod.config.yml
+++ b/examples/prod/prod.config.yml
@@ -13,7 +13,7 @@ apache_vhosts:
 # Since this will be a publicly-accessible instance of Drupal VM, make sure you
 # configure secure passwords, especially for Drupal and MySQL!
 drupal_account_pass: admin
-drupal_mysql_password: drupal
+drupal_db_password: drupal
 mysql_root_password: root
 
 # Only install extras that you will need/use on your site, and don't install
diff --git a/mkdocs.yml b/mkdocs.yml
index 681311816..7aa135bfd 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -23,6 +23,7 @@ pages:
     - 'Use Drupal Console with Drupal VM': 'extras/drupal-console.md'
     - 'Use Varnish with Drupal VM': 'extras/varnish.md'
     - 'Use MariaDB instead of MySQL': 'extras/mariadb.md'
+    - 'Use PostgreSQL instead of MySQL': 'extras/postgresql.md'
     - 'Use Node.js and NPM': 'extras/nodejs.md'
     - 'Use SSL vhosts with Apache': 'extras/ssl.md'
     - 'View Logs with Pimp my Log': 'extras/pimpmylog.md'
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 452fa26da..935a794e2 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -51,12 +51,14 @@
     - { role: geerlingguy.apache, when: drupalvm_webserver == 'apache' }
     - { role: geerlingguy.apache-php-fpm, when: drupalvm_webserver == 'apache' }
     - { role: geerlingguy.nginx, when: drupalvm_webserver == 'nginx' }
-    - geerlingguy.mysql
     - geerlingguy.php
     - geerlingguy.php-pecl
-    - geerlingguy.php-mysql
     - geerlingguy.composer
     - geerlingguy.drush
+    - { role: geerlingguy.mysql, when: drupalvm_database == 'mysql' }
+    - { role: geerlingguy.php-mysql, when: drupalvm_database == 'mysql' }
+    - { role: geerlingguy.postgresql, when: drupalvm_database == 'pgsql' }
+    - { role: geerlingguy.php-pgsql, when: drupalvm_database == 'pgsql' }
 
     # Conditionally-installed roles.
     - { role: geerlingguy.drupal-console, when: 'drupal_major_version > 7 and "drupalconsole" in installed_extras' }
diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 36938673b..578609aed 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -45,6 +45,8 @@
   version: 2.0.1
 - src: geerlingguy.php-pecl
   version: 1.2.1
+- src: geerlingguy.php-pgsql
+  version: 1.0.0
 - src: geerlingguy.php-redis
   version: 3.0.0
 - src: geerlingguy.php-xdebug
@@ -55,6 +57,8 @@
   version: 1.0.2
 - src: geerlingguy.postfix
   version: 1.1.0
+- src: geerlingguy.postgresql
+  version: 1.0.0
 - src: geerlingguy.redis
   version: 1.2.0
 - src: geerlingguy.repo-remi
diff --git a/provisioning/roles/geerlingguy.php-pgsql/.travis.yml b/provisioning/roles/geerlingguy.php-pgsql/.travis.yml
new file mode 100644
index 000000000..40a585f45
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-pgsql/.travis.yml
@@ -0,0 +1,46 @@
+---
+services: docker
+
+env:
+  - distro: centos7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distro: ubuntu1604
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+
+before_install:
+  # Pull container.
+  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
+
+script:
+  - container_id=$(mktemp)
+  # Run container in detached state.
+  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
+
+  # Install dependencies.
+  - 'docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
+
+  # Ansible syntax check.
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+
+  # Test role.
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+
+  # Test role idempotence.
+  - idempotence=$(mktemp)
+  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
+  - >
+    tail ${idempotence}
+    | grep -q 'changed=0.*failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)
+
+  # Ensure PHP PostgreSQL support is enabled.
+  - docker exec --tty "$(cat ${container_id})" env TERM=xterm php -i | grep 'PostgreSQL Support => enabled'
+
+after_failure:
+  - docker exec --tty "$(cat ${container_id})" env TERM=xterm php -i
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.php-pgsql/README.md b/provisioning/roles/geerlingguy.php-pgsql/README.md
new file mode 100644
index 000000000..eb2cccb91
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-pgsql/README.md
@@ -0,0 +1,42 @@
+# Ansible Role: PHP-PostgreSQL
+
+[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-php-pgsql.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-php-pgsql)
+
+Installs PHP [PostgreSQL](https://www.postgresql.org/) support on Linux.
+
+## Requirements
+
+None.
+
+## Role Variables
+
+Available variables are listed below, along with default values (see `defaults/main.yml`):
+
+    php_enablerepo: ""
+
+(RedHat/CentOS only) If you have enabled any additional repositories (might I suggest geerlingguy.repo-epel or geerlingguy.repo-remi), those repositories can be listed under this variable (e.g. `remi,epel`). This can allow you to install later versions of PHP packages.
+
+    php_pgsql_package: php-pgsql # RedHat
+    php_pgsql_package: php7.0-pgsql # Debian
+
+The PHP PostgreSQL package to install via apt/yum. This should only be overridden if you need to install a unique/special package for PostgreSQL support, as in the case of using software collections on Enterprise Linux.
+
+## Dependencies
+
+  - geerlingguy.php
+
+## Example Playbook
+
+    - hosts: webservers
+      roles:
+        - geerlingguy.postgresql
+        - geerlingguy.php
+        - geerlingguy.php-pgsql
+
+## License
+
+MIT / BSD
+
+## Author Information
+
+This role was created in 2016 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.php-pgsql/defaults/main.yml b/provisioning/roles/geerlingguy.php-pgsql/defaults/main.yml
new file mode 100644
index 000000000..f6a43ca96
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-pgsql/defaults/main.yml
@@ -0,0 +1,3 @@
+---
+# Pass in a comma-separated list of repos to use (e.g. "remi,epel").
+php_enablerepo: ""
diff --git a/provisioning/roles/geerlingguy.php-pgsql/meta/main.yml b/provisioning/roles/geerlingguy.php-pgsql/meta/main.yml
new file mode 100644
index 000000000..b00b837cf
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-pgsql/meta/main.yml
@@ -0,0 +1,26 @@
+---
+dependencies:
+  - geerlingguy.php
+
+galaxy_info:
+  author: geerlingguy
+  description: PHP PostgreSQL support for Linux.
+  company: "Midwestern Mac, LLC"
+  license: "license (BSD, MIT)"
+  min_ansible_version: 1.8
+  platforms:
+    - name: EL
+      versions:
+      - all
+    - name: Debian
+      versions:
+      - all
+    - name: Ubuntu
+      versions:
+      - all
+  galaxy_tags:
+    - database
+    - web
+    - postgres
+    - php
+    - pgsql
diff --git a/provisioning/roles/geerlingguy.php-pgsql/tasks/main.yml b/provisioning/roles/geerlingguy.php-pgsql/tasks/main.yml
new file mode 100644
index 000000000..3efa31c51
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-pgsql/tasks/main.yml
@@ -0,0 +1,29 @@
+---
+# Variable setup.
+- name: Include OS-specific variables.
+  include_vars: "{{ ansible_os_family }}.yml"
+
+- name: Define php_pgsql_package.
+  set_fact:
+    php_pgsql_package: "{{ __php_pgsql_package }}"
+  when: php_pgsql_package is not defined
+
+# Installation.
+- name: Install PHP PostgreSQL dependencies (RedHat).
+  yum:
+    name: "{{ php_pgsql_package }}"
+    state: present
+    enablerepo: "{{ php_enablerepo }}"
+  notify:
+    - restart webserver
+    - restart php-fpm
+  when: ansible_os_family == 'RedHat'
+
+- name: Install PHP PostgreSQL dependencies (Debian).
+  apt:
+    name: "{{ php_pgsql_package }}"
+    state: present
+  notify:
+    - restart webserver
+    - restart php-fpm
+  when: ansible_os_family == 'Debian'
diff --git a/provisioning/roles/geerlingguy.php-pgsql/tests/requirements.yml b/provisioning/roles/geerlingguy.php-pgsql/tests/requirements.yml
new file mode 100644
index 000000000..66c00dfec
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-pgsql/tests/requirements.yml
@@ -0,0 +1,5 @@
+---
+- src: geerlingguy.repo-remi
+- src: geerlingguy.apache
+- src: geerlingguy.postgresql
+- src: geerlingguy.php
diff --git a/provisioning/roles/geerlingguy.php-pgsql/tests/test.yml b/provisioning/roles/geerlingguy.php-pgsql/tests/test.yml
new file mode 100644
index 000000000..f703f78f7
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-pgsql/tests/test.yml
@@ -0,0 +1,18 @@
+---
+- hosts: all
+
+  vars:
+    php_enablerepo: "remi,remi-php70"
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=yes
+      when: ansible_os_family == 'Debian'
+
+  roles:
+    - role: geerlingguy.repo-remi
+      when: ansible_os_family == 'RedHat'
+    - geerlingguy.apache
+    - geerlingguy.postgresql
+    - geerlingguy.php
+    - role_under_test
diff --git a/provisioning/roles/geerlingguy.php-pgsql/vars/Debian.yml b/provisioning/roles/geerlingguy.php-pgsql/vars/Debian.yml
new file mode 100644
index 000000000..aad287dc3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-pgsql/vars/Debian.yml
@@ -0,0 +1,2 @@
+---
+__php_pgsql_package: php7.0-pgsql
diff --git a/provisioning/roles/geerlingguy.php-pgsql/vars/RedHat.yml b/provisioning/roles/geerlingguy.php-pgsql/vars/RedHat.yml
new file mode 100644
index 000000000..87f5c1ee2
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-pgsql/vars/RedHat.yml
@@ -0,0 +1,2 @@
+---
+__php_pgsql_package: php-pgsql
diff --git a/provisioning/roles/geerlingguy.postgresql/.travis.yml b/provisioning/roles/geerlingguy.postgresql/.travis.yml
new file mode 100644
index 000000000..d7e22e201
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/.travis.yml
@@ -0,0 +1,67 @@
+---
+services: docker
+
+env:
+  - distro: centos7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    postgresql_bin_dir: /usr/bin
+    postgresql_data_dir: /var/lib/pgsql/data
+  - distro: centos6
+    init: /sbin/init
+    run_opts: ""
+    postgresql_bin_dir: /usr/bin
+    postgresql_data_dir: /var/lib/pgsql/data
+  - distro: ubuntu1604
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    postgresql_bin_dir: /usr/lib/postgresql/9.5/bin
+    postgresql_data_dir: /var/lib/postgresql/9.5/main
+  - distro: ubuntu1404
+    init: /sbin/init
+    run_opts: ""
+    postgresql_bin_dir: /usr/lib/postgresql/9.3/bin
+    postgresql_data_dir: /var/lib/postgresql/9.3/main
+  - distro: debian8
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    postgresql_bin_dir: /usr/lib/postgresql/9.4/bin
+    postgresql_data_dir: /var/lib/postgresql/9.4/main
+
+services:
+  - docker
+
+before_install:
+  # Pull container
+  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
+
+script:
+  - container_id=$(mktemp)
+  # Run container in detached state.
+  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
+
+  # Ansible syntax check.
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+
+  # Test role.
+  - 'docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+
+  # Test role idempotence.
+  - idempotence=$(mktemp)
+  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
+  - >
+    tail ${idempotence}
+    | grep -q 'changed=0.*failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)
+
+  # Check PostgreSQL status.
+  - 'docker exec -u postgres "$(cat ${container_id})" ${postgresql_bin_dir}/pg_ctl -D ${postgresql_data_dir} status'
+
+after_failure:
+  # Check what happened on systemd systems.
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm systemctl -l status postgresql.service'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm journalctl -xe --no-pager'
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.postgresql/README.md b/provisioning/roles/geerlingguy.postgresql/README.md
new file mode 100644
index 000000000..e1544426c
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/README.md
@@ -0,0 +1,110 @@
+# Ansible Role: PostgreSQL
+
+[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-postgresql.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-postgresql)
+
+Installs and configures PostgreSQL server on RHEL/CentOS or Debian/Ubuntu servers.
+
+## Requirements
+
+No special requirements; note that this role requires root access, so either run it in a playbook with a global `become: yes`, or invoke the role in your playbook like:
+
+    - hosts: database
+      roles:
+        - role: geerlingguy.postgresql
+          become: yes
+
+## Role Variables
+
+Available variables are listed below, along with default values (see `defaults/main.yml`):
+
+    postgresql_enablerepo: ""
+
+(RHEL/CentOS only) You can set a repo to use for the PostgreSQL installation by passing it in here.
+
+    postgresql_user: postgres
+    postgresql_group: postgres
+
+The user and group under which PostgreSQL will run.
+
+    postgresql_unix_socket_directories:
+      - /var/run/postgresql
+
+The directories (usually one, but can be multiple) where PostgreSQL's socket will be created.
+
+    postgresql_global_config_options:
+      - option: unix_socket_directories
+        value: '{{ postgresql_unix_socket_directories | join(",") }}'
+
+Global configuration options that will be set in `postgresql.conf`. Note that for RHEL/CentOS 6 (or very old versions of PostgreSQL), you need to at least override this variable and set the `option` to `unix_socket_directory`.
+
+    postgresql_locales:
+      - 'en_US.UTF-8'
+
+(Debian/Ubuntu only) Used to generate the locales used by PostgreSQL databases.
+
+    postgresql_databases:
+      - name: exampledb # required; the rest are optional
+        lc_collate: # defaults to 'en_US.UTF-8'
+        lc_ctype: # defaults to 'en_US.UTF-8'
+        encoding: # defaults to 'UTF-8'
+        template: # defaults to 'template0'
+        login_host: # defaults to 'localhost'
+        login_password: # defaults to not set
+        login_user: # defaults to 'postgresql_user'
+        login_unix_socket: # defaults to 1st of postgresql_unix_socket_directories
+        port: # defaults to not set
+        state: # defaults to 'present'
+
+A list of databases to ensure exist on the server. Only the `name` is required; all other properties are optional.
+
+    postgresql_users:
+      - name: jdoe #required; the rest are optional
+        password: # defaults to not set
+        priv: # defaults to not set
+        role_attr_flags: # defaults to not set
+        login_host: # defaults to 'localhost'
+        login_password: # defaults to not set
+        login_user: # defaults to '{{ postgresql_user }}'
+        login_unix_socket: # defaults to 1st of postgresql_unix_socket_directories
+        port: # defaults to not set
+        state: # defaults to 'present'
+
+A list of users to ensure exist on the server. Only the `name` is required; all other properties are optional.
+
+    postgresql_version: [OS-specific]
+    postgresql_data_dir: [OS-specific]
+    postgresql_bin_path: [OS-specific]
+    postgresql_config_path: [OS-specific]
+    postgresql_daemon: [OS-specific]
+    postgresql_packages: [OS-specific]
+
+OS-specific variables that are set by include files in this role's `vars` directory. These shouldn't be overridden unless you're using a verison of PostgreSQL that wasn't installed using system packages.
+
+## Dependencies
+
+None.
+
+## Example Playbook
+
+    - hosts: database
+      become: yes
+      vars_files:
+        - vars/main.yml
+      roles:
+        - geerlingguy.postgresql
+
+*Inside `vars/main.yml`*:
+
+    postgresql_databases:
+      - name: example_db
+    postgresql_users:
+      - name: example_user
+        password: supersecure
+
+## License
+
+MIT / BSD
+
+## Author Information
+
+This role was created in 2016 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.postgresql/defaults/main.yml b/provisioning/roles/geerlingguy.postgresql/defaults/main.yml
new file mode 100644
index 000000000..6e92ae2b6
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/defaults/main.yml
@@ -0,0 +1,45 @@
+---
+# RHEL/CentOS only. Set a repository to use for PostgreSQL installation.
+postgresql_enablerepo: ""
+
+postgresql_user: postgres
+postgresql_group: postgres
+
+postgresql_unix_socket_directories:
+  - /var/run/postgresql
+
+# Global configuration options that will be set in postgresql.conf.
+postgresql_global_config_options:
+  - option: unix_socket_directories
+    value: '{{ postgresql_unix_socket_directories | join(",") }}'
+
+# Debian only. Used to generate the locales used by PostgreSQL databases.
+postgresql_locales:
+  - 'en_US.UTF-8'
+
+# Databases to ensure exist.
+postgresql_databases: []
+  # - name: exampledb # required; the rest are optional
+  #   lc_collate: # defaults to 'en_US.UTF-8'
+  #   lc_ctype: # defaults to 'en_US.UTF-8'
+  #   encoding: # defaults to 'UTF-8'
+  #   template: # defaults to 'template0'
+  #   login_host: # defaults to 'localhost'
+  #   login_password: # defaults to not set
+  #   login_user: # defaults to '{{ postgresql_user }}'
+  #   login_unix_socket: # defaults to 1st of postgresql_unix_socket_directories
+  #   port: # defaults to not set
+  #   state: # defaults to 'present'
+
+# Users to ensure exist.
+postgresql_users: []
+  # - name: jdoe #required; the rest are optional
+  #   password: # defaults to not set
+  #   priv: # defaults to not set
+  #   role_attr_flags: # defaults to not set
+  #   login_host: # defaults to 'localhost'
+  #   login_password: # defaults to not set
+  #   login_user: # defaults to '{{ postgresql_user }}'
+  #   login_unix_socket: # defaults to 1st of postgresql_unix_socket_directories
+  #   port: # defaults to not set
+  #   state: # defaults to 'present'
diff --git a/provisioning/roles/geerlingguy.postgresql/handlers/main.yml b/provisioning/roles/geerlingguy.postgresql/handlers/main.yml
new file mode 100644
index 000000000..523ad1b17
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/handlers/main.yml
@@ -0,0 +1,3 @@
+---
+- name: restart postgresql
+  service: "name={{ postgresql_daemon }} state=restarted sleep=5"
diff --git a/provisioning/roles/geerlingguy.postgresql/meta/main.yml b/provisioning/roles/geerlingguy.postgresql/meta/main.yml
new file mode 100644
index 000000000..db0b759d6
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/meta/main.yml
@@ -0,0 +1,25 @@
+---
+dependencies: []
+
+galaxy_info:
+  author: geerlingguy
+  description: PostgreSQL server for Linux.
+  company: "Midwestern Mac, LLC"
+  license: "license (BSD, MIT)"
+  min_ansible_version: 2.0
+  platforms:
+    - name: EL
+      versions:
+      - 6
+      - 7
+    - name: Ubuntu
+      versions:
+      - all
+    - name: Debian
+      versions:
+      - all
+  galaxy_tags:
+    - database
+    - postgresql
+    - postgres
+    - rdbms
diff --git a/provisioning/roles/geerlingguy.postgresql/tasks/configure.yml b/provisioning/roles/geerlingguy.postgresql/tasks/configure.yml
new file mode 100644
index 000000000..9b03d9e95
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/tasks/configure.yml
@@ -0,0 +1,18 @@
+---
+- name: Configure global settings.
+  lineinfile:
+    dest: "{{ postgresql_config_path }}/postgresql.conf"
+    regexp: "^#?{{ item.option }}.+$"
+    line: "{{ item.option }} = '{{ item.value }}'"
+    state: "{{ item.state | default('present') }}"
+  with_items: "{{ postgresql_global_config_options }}"
+  notify: restart postgresql
+
+- name: Ensure PostgreSQL unix socket dirs exist.
+  file:
+    path: "{{ item }}"
+    state: directory
+    owner: "{{ postgresql_user }}"
+    group: "{{ postgresql_group }}"
+    mode: 02775
+  with_items: "{{ postgresql_unix_socket_directories }}"
diff --git a/provisioning/roles/geerlingguy.postgresql/tasks/databases.yml b/provisioning/roles/geerlingguy.postgresql/tasks/databases.yml
new file mode 100644
index 000000000..772ee1bb6
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/tasks/databases.yml
@@ -0,0 +1,20 @@
+---
+- name: Ensure PostgreSQL databases are present.
+  postgresql_db:
+    name: "{{ item.name }}"
+    lc_collate: "{{ item.lc_collate | default('en_US.UTF-8') }}"
+    lc_ctype: "{{ item.lc_ctype | default('en_US.UTF-8') }}"
+    encoding: "{{ item.encoding | default('UTF-8') }}"
+    template: "{{ item.template | default('template0') }}"
+    login_host: "{{ item.login_host | default('localhost') }}"
+    login_password: "{{ item.login_password | default(omit) }}"
+    login_user: "{{ item.login_user | default(postgresql_user) }}"
+    login_unix_socket: "{{ item.login_unix_socket | default(postgresql_unix_socket_directories[0]) }}"
+    port: "{{ item.port | default(omit) }}"
+    state: "{{ item.state | default('present') }}"
+  with_items: "{{ postgresql_databases }}"
+  become: yes
+  become_user: "{{ postgresql_user }}"
+  # See: https://github.com/ansible/ansible/issues/16048#issuecomment-229012509
+  vars:
+    ansible_ssh_pipelining: true
diff --git a/provisioning/roles/geerlingguy.postgresql/tasks/initialize.yml b/provisioning/roles/geerlingguy.postgresql/tasks/initialize.yml
new file mode 100644
index 000000000..44ffd9b31
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/tasks/initialize.yml
@@ -0,0 +1,29 @@
+---
+- name: Set PostgreSQL environment variables.
+  template:
+    src: postgres.sh.j2
+    dest: /etc/profile.d/postgres.sh
+    mode: 0644
+  notify: restart postgresql
+
+- name: Ensure PostgreSQL data directory exists.
+  file:
+    path: "{{ postgresql_data_dir }}"
+    owner: "{{ postgresql_user }}"
+    group: "{{ postgresql_group }}"
+    state: directory
+    mode: 0700
+
+- name: Check if PostgreSQL database is initialized.
+  stat:
+    path: "{{ postgresql_data_dir }}/PG_VERSION"
+  register: pgdata_dir_version
+
+- name: Ensure PostgreSQL database is initialized.
+  command: "{{ postgresql_bin_path }}/initdb -D {{ postgresql_data_dir }}"
+  when: not pgdata_dir_version.stat.exists
+  become: yes
+  become_user: "{{ postgresql_user }}"
+  # See: https://github.com/ansible/ansible/issues/16048#issuecomment-229012509
+  vars:
+    ansible_ssh_pipelining: true
diff --git a/provisioning/roles/geerlingguy.postgresql/tasks/main.yml b/provisioning/roles/geerlingguy.postgresql/tasks/main.yml
new file mode 100644
index 000000000..0a7bef121
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/tasks/main.yml
@@ -0,0 +1,23 @@
+---
+# Variable configuration.
+- include: variables.yml
+
+# Setup/install tasks.
+- include: setup-RedHat.yml
+  when: ansible_os_family == 'RedHat'
+
+- include: setup-Debian.yml
+  when: ansible_os_family == 'Debian'
+
+- include: initialize.yml
+- include: configure.yml
+
+- name: Ensure PostgreSQL is started and enabled on boot.
+  service:
+    name: "{{ postgresql_daemon }}"
+    state: started
+    enabled: yes
+
+# Configure PostgreSQL.
+- include: databases.yml
+- include: users.yml
diff --git a/provisioning/roles/geerlingguy.postgresql/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.postgresql/tasks/setup-Debian.yml
new file mode 100644
index 000000000..13700d34e
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/tasks/setup-Debian.yml
@@ -0,0 +1,18 @@
+---
+- name: Ensure PostgreSQL Python libraries are installed.
+  apt: "name=python-psycopg2 state=installed"
+
+- name: Ensure PostgreSQL packages are installed.
+  apt: "name={{ item }} state=installed"
+  with_items: "{{ postgresql_packages }}"
+
+- name: Ensure all configured locales are present.
+  locale_gen: "name={{ item }} state=present"
+  with_items: "{{ postgresql_locales }}"
+  register: locale_gen_result
+
+- name: Force-restart PostgreSQL after new locales are generated.
+  service:
+    name: "{{ postgresql_daemon }}"
+    state: restarted
+  when: locale_gen_result.changed
diff --git a/provisioning/roles/geerlingguy.postgresql/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.postgresql/tasks/setup-RedHat.yml
new file mode 100644
index 000000000..050c84202
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/tasks/setup-RedHat.yml
@@ -0,0 +1,7 @@
+---
+- name: Ensure PostgreSQL packages are installed.
+  package: "name={{ item }} state=installed enablerepo={{ postgresql_enablerepo }}"
+  with_items: "{{ postgresql_packages }}"
+
+- name: Ensure PostgreSQL Python libraries are installed.
+  package: "name=python-psycopg2 state=installed enablerepo={{ postgresql_enablerepo }}"
diff --git a/provisioning/roles/geerlingguy.postgresql/tasks/users.yml b/provisioning/roles/geerlingguy.postgresql/tasks/users.yml
new file mode 100644
index 000000000..941c3c756
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/tasks/users.yml
@@ -0,0 +1,20 @@
+---
+- name: Ensure PostgreSQL users are present.
+  postgresql_user:
+    name: "{{ item.name }}"
+    password: "{{ item.password | default(omit) }}"
+    priv: "{{ item.priv | default(omit) }}"
+    role_attr_flags: "{{ item.role_attr_flags | default(omit) }}"
+    login_host: "{{ item.login_host | default('localhost') }}"
+    login_password: "{{ item.login_password | default(omit) }}"
+    login_user: "{{ item.login_user | default(postgresql_user) }}"
+    login_unix_socket: "{{ item.login_unix_socket | default(postgresql_unix_socket_directories[0]) }}"
+    port: "{{ item.port | default(omit) }}"
+    state: "{{ item.state | default('present') }}"
+  with_items: "{{ postgresql_users }}"
+  no_log: true
+  become: yes
+  become_user: "{{ postgresql_user }}"
+  # See: https://github.com/ansible/ansible/issues/16048#issuecomment-229012509
+  vars:
+    ansible_ssh_pipelining: true
diff --git a/provisioning/roles/geerlingguy.postgresql/tasks/variables.yml b/provisioning/roles/geerlingguy.postgresql/tasks/variables.yml
new file mode 100644
index 000000000..530990d7e
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/tasks/variables.yml
@@ -0,0 +1,39 @@
+---
+# Variable configuration.
+- name: Include OS-specific variables (Debian).
+  include_vars: "{{ ansible_distribution }}-{{ ansible_distribution_version.split('.')[0] }}.yml"
+  when: ansible_os_family == 'Debian'
+
+- name: Include OS-specific variables (RedHat).
+  include_vars: "{{ ansible_os_family }}-{{ ansible_distribution_version.split('.')[0] }}.yml"
+  when: ansible_os_family == 'RedHat'
+
+- name: Define postgresql_packages.
+  set_fact:
+    postgresql_packages: "{{ __postgresql_packages | list }}"
+  when: postgresql_packages is not defined
+
+- name: Define postgresql_daemon.
+  set_fact:
+    postgresql_daemon: "{{ __postgresql_daemon }}"
+  when: postgresql_daemon is not defined
+
+- name: Define postgresql_version.
+  set_fact:
+    postgresql_version: "{{ __postgresql_version }}"
+  when: postgresql_version is not defined
+
+- name: Define postgresql_data_dir.
+  set_fact:
+    postgresql_data_dir: "{{ __postgresql_data_dir }}"
+  when: postgresql_data_dir is not defined
+
+- name: Define postgresql_bin_path.
+  set_fact:
+    postgresql_bin_path: "{{ __postgresql_bin_path }}"
+  when: postgresql_bin_path is not defined
+
+- name: Define postgresql_config_path.
+  set_fact:
+    postgresql_config_path: "{{ __postgresql_config_path }}"
+  when: postgresql_config_path is not defined
diff --git a/provisioning/roles/geerlingguy.postgresql/templates/postgres.sh.j2 b/provisioning/roles/geerlingguy.postgresql/templates/postgres.sh.j2
new file mode 100644
index 000000000..72640647d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/templates/postgres.sh.j2
@@ -0,0 +1,2 @@
+export PGDATA={{ postgresql_data_dir }}
+export PATH=$PATH:{{ postgresql_bin_path }}
diff --git a/provisioning/roles/geerlingguy.postgresql/tests/test.yml b/provisioning/roles/geerlingguy.postgresql/tests/test.yml
new file mode 100644
index 000000000..731d75303
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/tests/test.yml
@@ -0,0 +1,23 @@
+---
+- hosts: all
+
+  vars:
+    postgresql_databases:
+      - name: example
+    postgresql_users:
+      - name: jdoe
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=yes
+      when: ansible_os_family == 'Debian'
+
+    - name: Set custom variable name for old CentOS 6 PostgreSQL install.
+      set_fact:
+        postgresql_global_config_options:
+          - option: unix_socket_directory
+            value: '{{ postgresql_unix_socket_directories[0] }}'
+      when: ansible_os_family == 'RedHat' and ansible_distribution_version.split('.')[0] == '6'
+
+  roles:
+    - role_under_test
diff --git a/provisioning/roles/geerlingguy.postgresql/vars/Debian-8.yml b/provisioning/roles/geerlingguy.postgresql/vars/Debian-8.yml
new file mode 100644
index 000000000..f6ad232b5
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/vars/Debian-8.yml
@@ -0,0 +1,10 @@
+---
+__postgresql_version: "9.4"
+__postgresql_data_dir: "/var/lib/postgresql/{{ __postgresql_version }}/main"
+__postgresql_bin_path: "/usr/lib/postgresql/{{ __postgresql_version }}/bin"
+__postgresql_config_path: "/etc/postgresql/{{ __postgresql_version }}/main"
+__postgresql_daemon: postgresql
+__postgresql_packages:
+  - postgresql
+  - postgresql-contrib
+  - libpq-dev
diff --git a/provisioning/roles/geerlingguy.postgresql/vars/RedHat-6.yml b/provisioning/roles/geerlingguy.postgresql/vars/RedHat-6.yml
new file mode 100644
index 000000000..8923c50dd
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/vars/RedHat-6.yml
@@ -0,0 +1,11 @@
+---
+__postgresql_version: "8.4"
+__postgresql_data_dir: "/var/lib/pgsql/data"
+__postgresql_bin_path: "/usr/bin"
+__postgresql_config_path: "/var/lib/pgsql/data"
+__postgresql_daemon: postgresql
+__postgresql_packages:
+  - postgresql
+  - postgresql-server
+  - postgresql-contrib
+  - postgresql-libs
diff --git a/provisioning/roles/geerlingguy.postgresql/vars/RedHat-7.yml b/provisioning/roles/geerlingguy.postgresql/vars/RedHat-7.yml
new file mode 100644
index 000000000..1d5c517df
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/vars/RedHat-7.yml
@@ -0,0 +1,11 @@
+---
+__postgresql_version: "9.2"
+__postgresql_data_dir: "/var/lib/pgsql/data"
+__postgresql_bin_path: "/usr/bin"
+__postgresql_config_path: "/var/lib/pgsql/data"
+__postgresql_daemon: postgresql
+__postgresql_packages:
+  - postgresql
+  - postgresql-server
+  - postgresql-contrib
+  - postgresql-libs
diff --git a/provisioning/roles/geerlingguy.postgresql/vars/Ubuntu-14.yml b/provisioning/roles/geerlingguy.postgresql/vars/Ubuntu-14.yml
new file mode 100644
index 000000000..bd6c17475
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/vars/Ubuntu-14.yml
@@ -0,0 +1,10 @@
+---
+__postgresql_version: "9.3"
+__postgresql_data_dir: "/var/lib/postgresql/{{ __postgresql_version }}/main"
+__postgresql_bin_path: "/usr/lib/postgresql/{{ __postgresql_version }}/bin"
+__postgresql_config_path: "/etc/postgresql/{{ __postgresql_version }}/main"
+__postgresql_daemon: postgresql
+__postgresql_packages:
+  - postgresql
+  - postgresql-contrib
+  - libpq-dev
diff --git a/provisioning/roles/geerlingguy.postgresql/vars/Ubuntu-16.yml b/provisioning/roles/geerlingguy.postgresql/vars/Ubuntu-16.yml
new file mode 100644
index 000000000..cf2ebb8dd
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/vars/Ubuntu-16.yml
@@ -0,0 +1,10 @@
+---
+__postgresql_version: "9.5"
+__postgresql_data_dir: "/var/lib/postgresql/{{ __postgresql_version }}/main"
+__postgresql_bin_path: "/usr/lib/postgresql/{{ __postgresql_version }}/bin"
+__postgresql_config_path: "/etc/postgresql/{{ __postgresql_version }}/main"
+__postgresql_daemon: postgresql
+__postgresql_packages:
+  - postgresql
+  - postgresql-contrib
+  - libpq-dev
diff --git a/provisioning/tasks/install-site.yml b/provisioning/tasks/install-site.yml
index a5f1c1bc1..1c3566dfa 100644
--- a/provisioning/tasks/install-site.yml
+++ b/provisioning/tasks/install-site.yml
@@ -14,7 +14,7 @@
     --site-name="{{ drupal_site_name }}"
     --account-name={{ drupal_account_name }}
     --account-pass={{ drupal_account_pass }}
-    --db-url=mysql://{{ drupal_mysql_user }}:{{ drupal_mysql_password }}@localhost/{{ mysql_databases[0].name }}
+    --db-url={{ drupalvm_database }}://{{ drupal_db_user }}:{{ drupal_db_password }}@localhost/{{ drupal_db_name }}
     {{ drupal_site_install_extra_args | default([]) | join(" ") }}
     chdir={{ drupal_core_path }}
   notify: restart webserver
diff --git a/tests/ubuntu-16-postgresql.config.yml b/tests/ubuntu-16-postgresql.config.yml
new file mode 100644
index 000000000..9137e4c11
--- /dev/null
+++ b/tests/ubuntu-16-postgresql.config.yml
@@ -0,0 +1,2 @@
+---
+drupalvm_database: pgsql

From b8336ffa256ebf124d257bd3b9858889d7291140 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 30 Sep 2016 20:20:10 -0500
Subject: [PATCH 0434/1273] Issue #146: Switch to PostgreSQL correctly.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 79b06f393..3908b595f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,7 @@ env:
     - distro: ubuntu1604
       init: /sbin/init
       run_opts: "--privileged"
-      local_config: tests/ubuntu-16-postgres.config.yml
+      local_config: tests/ubuntu-16-postgresql.config.yml
       config_dir: /var/www/drupalvm/config
     # Defaults - CentOS 7.
     - distro: centos7

From 1464e249d95fa7cdff7e0994f731fd8fd2deb5ca Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 30 Sep 2016 21:38:32 -0500
Subject: [PATCH 0435/1273] Issue #146: Fix PostgreSQL db var and bytea_output
 issue.

---
 .travis.yml                                          | 12 ++++++++----
 default.config.yml                                   |  8 ++++++++
 provisioning/playbook.yml                            |  2 +-
 provisioning/requirements.yml                        |  2 +-
 provisioning/roles/geerlingguy.postgresql/README.md  |  1 +
 .../roles/geerlingguy.postgresql/defaults/main.yml   |  1 +
 .../roles/geerlingguy.postgresql/tasks/users.yml     |  1 +
 7 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3908b595f..b3bcad550 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,23 +12,27 @@ env:
       DRUPALVM_DIR: /var/www/drupalvm
   matrix:
     # Defaults - Ubuntu 16.04.
-    - distro: ubuntu1604
+    - type: defaults
+      distro: ubuntu1604
       init: /sbin/init
       run_opts: "--privileged"
     # Nginx and Drush make file test - Ubuntu 16.04.
-    - distro: ubuntu1604
+    - type: nginx-drush-make
+      distro: ubuntu1604
       init: /sbin/init
       run_opts: "--privileged"
       local_config: tests/ubuntu-16-nginx.config.yml
       config_dir: /var/www/drupalvm/config
     # PostgreSQL - Ubuntu 16.04.
-    - distro: ubuntu1604
+    - type: postgresql
+      distro: ubuntu1604
       init: /sbin/init
       run_opts: "--privileged"
       local_config: tests/ubuntu-16-postgresql.config.yml
       config_dir: /var/www/drupalvm/config
     # Defaults - CentOS 7.
-    - distro: centos7
+    - type: centos
+      distro: centos7
       init: /usr/lib/systemd/systemd
       run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
 
diff --git a/default.config.yml b/default.config.yml
index 1d90a31fc..4dbd380c2 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -183,6 +183,7 @@ postgresql_databases:
 postgresql_users:
   - name: "{{ drupal_db_user }}"
     password: "{{ drupal_db_password }}"
+    db: "{{ drupal_db_name }}"
     priv: "ALL"
 
 # Comment out any extra utilities you don't want to install. If you don't want
@@ -269,6 +270,13 @@ mysql_slow_query_time: 2
 mysql_wait_timeout: 300
 adminer_install_filename: index.php
 
+# PostgreSQL configuration.
+postgresql_global_config_options:
+  - option: unix_socket_directories
+    value: '{{ postgresql_unix_socket_directories | join(",") }}'
+  - option: bytea_output
+    value: 'escape'
+
 # Node.js configuration (if enabled above).
 # Valid examples: "0.10", "0.12", "4.x", "5.x".
 nodejs_version: "0.12"
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 935a794e2..bcc962c9c 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -99,7 +99,7 @@
     - include: tasks/extras.yml
     - include: tasks/www.yml
     - include: tasks/apparmor.yml
-      when: ansible_os_family == 'Debian'
+      when: ansible_os_family == 'Debian' and drupalvm_database == 'mysql'
 
     # Build makefile if configured.
     - include: tasks/build-makefile.yml
diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 578609aed..30e1d2c07 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -58,7 +58,7 @@
 - src: geerlingguy.postfix
   version: 1.1.0
 - src: geerlingguy.postgresql
-  version: 1.0.0
+  version: 1.0.1
 - src: geerlingguy.redis
   version: 1.2.0
 - src: geerlingguy.repo-remi
diff --git a/provisioning/roles/geerlingguy.postgresql/README.md b/provisioning/roles/geerlingguy.postgresql/README.md
index e1544426c..e23baeb9e 100644
--- a/provisioning/roles/geerlingguy.postgresql/README.md
+++ b/provisioning/roles/geerlingguy.postgresql/README.md
@@ -62,6 +62,7 @@ A list of databases to ensure exist on the server. Only the `name` is required;
         password: # defaults to not set
         priv: # defaults to not set
         role_attr_flags: # defaults to not set
+        db: # defaults to not set
         login_host: # defaults to 'localhost'
         login_password: # defaults to not set
         login_user: # defaults to '{{ postgresql_user }}'
diff --git a/provisioning/roles/geerlingguy.postgresql/defaults/main.yml b/provisioning/roles/geerlingguy.postgresql/defaults/main.yml
index 6e92ae2b6..10cb662f8 100644
--- a/provisioning/roles/geerlingguy.postgresql/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.postgresql/defaults/main.yml
@@ -37,6 +37,7 @@ postgresql_users: []
   #   password: # defaults to not set
   #   priv: # defaults to not set
   #   role_attr_flags: # defaults to not set
+  #   db: # defaults to not set
   #   login_host: # defaults to 'localhost'
   #   login_password: # defaults to not set
   #   login_user: # defaults to '{{ postgresql_user }}'
diff --git a/provisioning/roles/geerlingguy.postgresql/tasks/users.yml b/provisioning/roles/geerlingguy.postgresql/tasks/users.yml
index 941c3c756..33e5ebdbb 100644
--- a/provisioning/roles/geerlingguy.postgresql/tasks/users.yml
+++ b/provisioning/roles/geerlingguy.postgresql/tasks/users.yml
@@ -5,6 +5,7 @@
     password: "{{ item.password | default(omit) }}"
     priv: "{{ item.priv | default(omit) }}"
     role_attr_flags: "{{ item.role_attr_flags | default(omit) }}"
+    db: "{{ item.db | default(omit) }}"
     login_host: "{{ item.login_host | default('localhost') }}"
     login_password: "{{ item.login_password | default(omit) }}"
     login_user: "{{ item.login_user | default(postgresql_user) }}"

From 48c1b04d7babdc696773e0e869537e4baf4aebc1 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 30 Sep 2016 22:17:03 -0500
Subject: [PATCH 0436/1273] Fixes #146: Ensure PostgreSQL database is set up
 for Drupal install.

---
 default.config.yml                  |  7 -------
 provisioning/tasks/install-site.yml | 10 ++++++++++
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/default.config.yml b/default.config.yml
index 4dbd380c2..c5020f209 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -270,13 +270,6 @@ mysql_slow_query_time: 2
 mysql_wait_timeout: 300
 adminer_install_filename: index.php
 
-# PostgreSQL configuration.
-postgresql_global_config_options:
-  - option: unix_socket_directories
-    value: '{{ postgresql_unix_socket_directories | join(",") }}'
-  - option: bytea_output
-    value: 'escape'
-
 # Node.js configuration (if enabled above).
 # Valid examples: "0.10", "0.12", "4.x", "5.x".
 nodejs_version: "0.12"
diff --git a/provisioning/tasks/install-site.yml b/provisioning/tasks/install-site.yml
index 1c3566dfa..8ff631230 100644
--- a/provisioning/tasks/install-site.yml
+++ b/provisioning/tasks/install-site.yml
@@ -8,6 +8,16 @@
   changed_when: false
   become: no
 
+# See: https://www.drupal.org/node/2569365#comment-11680807
+- name: Configure database correctly if using PostgreSQL.
+  command: psql -c "ALTER DATABASE {{ drupal_db_name }} SET bytea_output = 'escape';"
+  when: "'Successful' not in drupal_site_installed.stdout"
+  become: yes
+  become_user: "{{ postgresql_user }}"
+  # See: https://github.com/ansible/ansible/issues/16048#issuecomment-229012509
+  vars:
+    ansible_ssh_pipelining: true
+
 - name: Install Drupal with drush.
   command: >
     {{ drush_path }} site-install {{ drupal_install_profile | default('standard') }} -y

From 68316e02ada92b2bf93d26c683e7a78fdeaa05df Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 30 Sep 2016 22:29:02 -0500
Subject: [PATCH 0437/1273] Issue #146: Fix condition for PostgreSQL database
 configuration.

---
 provisioning/tasks/install-site.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/tasks/install-site.yml b/provisioning/tasks/install-site.yml
index 8ff631230..35c55c2ad 100644
--- a/provisioning/tasks/install-site.yml
+++ b/provisioning/tasks/install-site.yml
@@ -11,7 +11,7 @@
 # See: https://www.drupal.org/node/2569365#comment-11680807
 - name: Configure database correctly if using PostgreSQL.
   command: psql -c "ALTER DATABASE {{ drupal_db_name }} SET bytea_output = 'escape';"
-  when: "'Successful' not in drupal_site_installed.stdout"
+  when: "('Successful' not in drupal_site_installed.stdout) and (drupalvm_database == 'pgsql')"
   become: yes
   become_user: "{{ postgresql_user }}"
   # See: https://github.com/ansible/ansible/issues/16048#issuecomment-229012509

From 2cc4e85c7dd147bfddef27754bb3ee4e3d98fd43 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 30 Sep 2016 22:49:06 -0500
Subject: [PATCH 0438/1273] Fixes #421, Fixes #367: Additions to Behat/Selenium
 docs.

---
 docs/extras/behat.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/extras/behat.md b/docs/extras/behat.md
index 904548a2d..ec02226a6 100644
--- a/docs/extras/behat.md
+++ b/docs/extras/behat.md
@@ -92,3 +92,12 @@ Hooray! Now you're ready to get started testing ALL THE THINGS! Check out the fo
 
   - [Behat 3.0 Documentation](http://behat.readthedocs.org/en/v3.0/)
   - [Drupal Extension Documentation](https://behat-drupal-extension.readthedocs.org/en/3.0/)
+
+## Debugging issues
+
+There are many different ways you can run Behat tests via PhantomJS and other drivers, and some people have encountered issues and workarounds with different approaches. Here are some relevant issues you can read through for more background:
+
+  - [Selenium Questions](https://github.com/geerlingguy/drupal-vm/issues/367)
+  - [Trying to achieve a Visual Regression Testing Strategy](https://github.com/geerlingguy/drupal-vm/issues/421)
+
+Also, see Acquia's [BLT](https://github.com/acquia/blt) project for a good example of Behat test integration with Drupal VM.

From 40fe675cda434548e53cbc783f82365ee2edc751 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 30 Sep 2016 22:56:21 -0500
Subject: [PATCH 0439/1273] Update version and software notes.

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 71aac4eaa..99905d1cb 100644
--- a/README.md
+++ b/README.md
@@ -8,9 +8,9 @@ This project aims to make spinning up a simple local Drupal test/development env
 
 It will install the following on an Ubuntu 16.04 (by default) linux VM:
 
-  - Apache 2.4.x (or Nginx 1.x)
+  - Apache 2.4.x (or Nginx)
   - PHP 7.0.x (configurable)
-  - MySQL 5.7.x (or PostgreSQL 9.x)
+  - MySQL 5.7.x (or MariaDB, or PostgreSQL)
   - Drush (configurable)
   - Drupal 7.x, or 8.x.x (configurable)
   - Optional:

From eebc5f60b84f188f024cf5d918e601e266a9edff Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 1 Oct 2016 13:07:00 -0500
Subject: [PATCH 0440/1273] Fix typos in PostgreSQL documentation.

---
 docs/extras/postgresql.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/extras/postgresql.md b/docs/extras/postgresql.md
index ab385d059..68786bc93 100644
--- a/docs/extras/postgresql.md
+++ b/docs/extras/postgresql.md
@@ -3,7 +3,7 @@ Since Drupal VM is built in a modular fashion, you can swap out the database eng
 To switch from MySQL to PostgreSQL, switch the `drupalvm_database` setting in your local `config.yml` to `pgsql`:
 
 ```yaml
-drupalvm_database: mysql
+drupalvm_database: pgsql
 ```
 
-For more PostgreSQL configuration options, see the README included with the [`geerlingguy.postgresql](https://galaxy.ansible.com/geerlingguy/postgresql/) Ansible role.
+For more PostgreSQL configuration options, see the README included with the [`geerlingguy.postgresql`](https://galaxy.ansible.com/geerlingguy/postgresql/) Ansible role.

From 8ed9665690183e95971c4014552205eb120208b3 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 3 Oct 2016 10:14:05 -0500
Subject: [PATCH 0441/1273] Fixes #911: Document how to disable MailHog
 correctly.

---
 docs/extras/mailhog.md | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/docs/extras/mailhog.md b/docs/extras/mailhog.md
index e7d5d0350..91e03d6a0 100644
--- a/docs/extras/mailhog.md
+++ b/docs/extras/mailhog.md
@@ -1,3 +1,11 @@
 By default, Drupal VM redirects all PHP emails to [MailHog](https://github.com/mailhog/MailHog) (instead of sending them to the outside world). You can access the MailHog UI at `http://drupalvm.dev:8025/` (or whatever domain you have configured in `config.yml`).
 
-You can override the default behavior of redirecting email to MailHog by editing or removing the `php_sendmail_path` inside `config.yml`, and you can choose to not install MailHog at all by removing it from `installed_extras` in `config.yml`.
\ No newline at end of file
+## Disable MailHog
+
+If you don't want to use MailHog, you can set the following override (back to PHP's default, as defined in the [`geerlingguy.php`](https://github.com/geerlingguy/ansible-role-php#role-variables) role) in your `config.yml` file:
+
+```
+php_sendmail_path: "/usr/sbin/sendmail -t -i"
+```
+
+After doing this, you can also prevent MailHog's installation by removing `mailhog` from the `installed_extras` list.

From 81812990a5a4ca704c0f3012a6fcb988f07d8a95 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 5 Oct 2016 09:57:19 -0500
Subject: [PATCH 0442/1273] Fixes #913: Update devel project version for
 drupal.org packagist.

---
 default.config.yml           | 2 +-
 example.drupal.composer.json | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/default.config.yml b/default.config.yml
index c5020f209..e3fcfc767 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -57,7 +57,7 @@ build_composer: false
 drupal_composer_path: "{{ config_dir }}/drupal.composer.json"
 drupal_composer_install_dir: "/var/www/drupalvm/drupal"
 drupal_composer_dependencies:
-  - "drupal/devel:8.*"
+  - "drupal/devel:1.x-dev"
 
 # Set this to 'true' and 'build_makefile', 'build_composer' to 'false' if you
 # are using Composer's create-project as a site deployment strategy.
diff --git a/example.drupal.composer.json b/example.drupal.composer.json
index 02eb9386d..e682239b2 100644
--- a/example.drupal.composer.json
+++ b/example.drupal.composer.json
@@ -18,8 +18,8 @@
     "require": {
         "composer/installers": "^1.0.20",
         "drupal-composer/drupal-scaffold": "^2.0.1",
-        "drupal/core": "~8.0",
-        "drupal/devel": "1.0.x-dev"
+        "drupal/core": "~8.1",
+        "drupal/devel": "1.x-dev"
     },
     "replace": {
         "drupal/drupal": "*"

From d1288ddb1322c14275d53a93f364c83df0ec7e38 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 6 Oct 2016 12:57:07 -0500
Subject: [PATCH 0443/1273] Fixes #915: Allow Java JDK to be installed by
 itself.

---
 default.config.yml        | 1 +
 provisioning/playbook.yml | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/default.config.yml b/default.config.yml
index e3fcfc767..724c5b839 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -193,6 +193,7 @@ installed_extras:
   # - blackfire
   - drupalconsole
   # - elasticsearch
+  # - java
   - mailhog
   # - memcached
   # - newrelic
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index bcc962c9c..6a32407b5 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -76,7 +76,12 @@
     - { role: geerlingguy.redis, when: '"redis" in installed_extras' }
     - { role: geerlingguy.php-redis, when: '"redis" in installed_extras' }
     - { role: geerlingguy.ruby, when: '"ruby" in installed_extras' }
-    - { role: geerlingguy.java, when: '"solr" in installed_extras or "selenium" in installed_extras or "elasticsearch" in installed_extras'}
+    - role: geerlingguy.java
+      when: >
+        "java" in installed_extras or
+        "solr" in installed_extras or
+        "selenium" in installed_extras or
+        "elasticsearch" in installed_extras
     - { role: arknoll.selenium, when: '"selenium" in installed_extras' }
     - { role: geerlingguy.solr, when: '"solr" in installed_extras' }
     - { role: geerlingguy.elasticsearch, when: '"elasticsearch" in installed_extras' }

From e102203b85d4e3b5f38b0c9473b7eee302c28de0 Mon Sep 17 00:00:00 2001
From: arknoll <alex.knoll@acquia.com>
Date: Wed, 12 Oct 2016 12:20:13 -0500
Subject: [PATCH 0444/1273] Update role arknoll.selenium to 2.0.0

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/arknoll.selenium/.travis.yml        | 50 +++++++----
 provisioning/roles/arknoll.selenium/README.md | 20 ++++-
 .../roles/arknoll.selenium/defaults/main.yml  |  5 +-
 .../roles/arknoll.selenium/meta/main.yml      |  2 +-
 .../roles/arknoll.selenium/tasks/main.yml     | 88 +++++++++++++------
 .../templates/selenium-init-Debian.j2         | 26 ++++--
 .../roles/arknoll.selenium/tests/inventory    |  1 -
 .../roles/arknoll.selenium/tests/test.yml     | 11 ++-
 .../roles/arknoll.selenium/vars/Debian.yml    |  2 +
 .../roles/arknoll.selenium/vars/RedHat.yml    |  2 +
 .../roles/arknoll.selenium/vars/main.yml      |  2 -
 12 files changed, 146 insertions(+), 65 deletions(-)
 delete mode 100644 provisioning/roles/arknoll.selenium/tests/inventory
 create mode 100644 provisioning/roles/arknoll.selenium/vars/Debian.yml
 create mode 100644 provisioning/roles/arknoll.selenium/vars/RedHat.yml
 delete mode 100644 provisioning/roles/arknoll.selenium/vars/main.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 30e1d2c07..4ea8c9a78 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -1,6 +1,6 @@
 ---
 - src: arknoll.selenium
-  version: 1.3.0
+  version: 2.0.0
 - src: franklinkim.newrelic
   version: 1.4.0
 - src: geerlingguy.adminer
diff --git a/provisioning/roles/arknoll.selenium/.travis.yml b/provisioning/roles/arknoll.selenium/.travis.yml
index 490fc5265..cb75c496a 100644
--- a/provisioning/roles/arknoll.selenium/.travis.yml
+++ b/provisioning/roles/arknoll.selenium/.travis.yml
@@ -1,35 +1,47 @@
 ---
-language: python
-python: "2.7"
+services: docker
 
 env:
-  - ANSIBLE_VERSION=1.6
-  - ANSIBLE_VERSION=1.7
-  - ANSIBLE_VERSION=1.8
+  - distro: centos7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distro: centos6
+    init: /sbin/init
+    run_opts: "--privileged"
+  - distro: ubuntu1604
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distro: ubuntu1404
+    init: /sbin/init
+    run_opts: "--privileged"
+  - distro: ubuntu1204
+    init: /sbin/init
+    run_opts: "--privileged"
 
 before_install:
-  - sudo apt-get update -qq
-
-install:
-  # Install Ansible.
-  - pip install ansible==$ANSIBLE_VERSION
-
-  # Add ansible.cfg to pick up roles path.
-  - "printf '[defaults]\\nroles_path = ../' > ansible.cfg"
+  # Pull container.
+  - 'sudo docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
-  # Check the role/playbook's syntax.
-  - "ansible-playbook -i tests/inventory tests/test.yml --syntax-check"
+  - container_id=$(mktemp)
+  # Run container in detached state.
+  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
+
+  # Ansible syntax check.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
 
-  # Run the role/playbook with ansible-playbook.
-  - "ansible-playbook -i tests/inventory tests/test.yml --connection=local --sudo -vvvv"
+  # Test role.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
 
-  # Run the role/playbook again, checking to make sure it's idempotent.
+  # Test role idempotence.
+  - idempotence=$(mktemp)
+  - sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
   - >
-    ansible-playbook -i tests/inventory tests/test.yml --connection=local --sudo
+    tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
     && (echo 'Idempotence test: pass' && exit 0)
     || (echo 'Idempotence test: fail' && exit 1)
 
 notifications:
   email: false
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/arknoll.selenium/README.md b/provisioning/roles/arknoll.selenium/README.md
index f2a027dfe..901c8fc60 100644
--- a/provisioning/roles/arknoll.selenium/README.md
+++ b/provisioning/roles/arknoll.selenium/README.md
@@ -9,7 +9,9 @@ Set up selenium and Firefox for running selenium tests.
 #### Variables
 
 * `selenium_install_dir`: [default: `/opt`] Install directory
-* `selenium_version`: [default: `2.44.0`] Install version
+* `selenium_version`: [default: `2.53.0`] Install version
+* `selenium_install_firefox`: [default: `no`] Whether to install FireFox
+* `selenium_install_chrome`: [default: `yes`] Whether to install Google Chrome
 
 ## Dependencies
 
@@ -32,6 +34,22 @@ $ service selenium stop
 $ service selenium restart
 ```
 
+#### Known issue with Firefox
+
+For some OS combinations the package manager version of Firefox 
+doesn't work appropriately with Selenium. In these circumstances 
+you may see an error like:
+
+```
+WebDriver\Exception\UnknownError: Unable to connect to host 127.0.0.1 on port 7055 after 45000 ms. Firefox console output:
+```
+
+Chrome and chromedriver don't appear to have this issue. If 
+possible, use Chrome. If you still want to use firefox, then 
+I suggest using https://galaxy.ansible.com/arknoll/firefox/ 
+to install an older version of firefox. (38.0 worked for me 
+on Ubuntu 16.04).
+
 #### License and Author
 
 Author:: Alex Knoll (arknoll@gmail.com)
diff --git a/provisioning/roles/arknoll.selenium/defaults/main.yml b/provisioning/roles/arknoll.selenium/defaults/main.yml
index bc0af10b4..9cd8d1c74 100644
--- a/provisioning/roles/arknoll.selenium/defaults/main.yml
+++ b/provisioning/roles/arknoll.selenium/defaults/main.yml
@@ -1,5 +1,6 @@
 ---
 # defaults file for selenium
 selenium_install_dir: /opt
-selenium_version: 2.53.0
-selenium_install_firefox: yes
+selenium_version: "2.53.0"
+selenium_install_firefox: no
+selenium_install_chrome: yes
diff --git a/provisioning/roles/arknoll.selenium/meta/main.yml b/provisioning/roles/arknoll.selenium/meta/main.yml
index 77b083784..81cc3dbb9 100644
--- a/provisioning/roles/arknoll.selenium/meta/main.yml
+++ b/provisioning/roles/arknoll.selenium/meta/main.yml
@@ -4,7 +4,7 @@ galaxy_info:
   author: Alex Knoll
   description: Set up selenium and Firefox for running selenium tests.
   license: Apache V2
-  min_ansible_version: 1.3
+  min_ansible_version: 2.0
   platforms:
   - name: EL
     versions:
diff --git a/provisioning/roles/arknoll.selenium/tasks/main.yml b/provisioning/roles/arknoll.selenium/tasks/main.yml
index 3c1ac5919..283332562 100644
--- a/provisioning/roles/arknoll.selenium/tasks/main.yml
+++ b/provisioning/roles/arknoll.selenium/tasks/main.yml
@@ -1,42 +1,72 @@
 ---
 # Tasks file for selenium
+- name: Include OS-Specific variables
+  include_vars: "{{ ansible_os_family }}.yml"
+  tags: [configuration, selenium]
+
+- name: Install dependencies
+  package: name=unzip
+  tags: [configuration, selenium]
+
 - name: create directory
   file: "path={{ selenium_install_dir }}/selenium state=directory recurse=yes"
   tags: [configuration, selenium, selenium-create-directory]
 
-- name: download
-  get_url: "url=http://selenium-release.storage.googleapis.com/{{ selenium_version | regex_replace('\\.[0-9]+$', '') }}/selenium-server-standalone-{{ selenium_version }}.jar dest=/opt/selenium/selenium-server-standalone-{{ selenium_version }}.jar"
+- name: Download Selenium
+  get_url:
+    url: "http://selenium-release.storage.googleapis.com/{{ selenium_version | regex_replace('\\.[0-9]+$', '') }}/selenium-server-standalone-{{ selenium_version }}.jar"
+    dest: "{{ selenium_install_dir }}/selenium/selenium-server-standalone-{{ selenium_version }}.jar"
   tags: [configuration, selenium, selenium-download]
 
+- name: Install FireFox (if configured)
+  package: name=firefox state=present
+  when: selenium_install_firefox
+  tags: [configuration, selenium, selenium-firefox]
+
+- name: Install Chrome (if configured, Debian)
+  apt:
+    deb: https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+    state: present
+  when: ansible_os_family == 'Debian' and selenium_install_chrome
+  tags: [configuration, selenium, selenium-chrome]
+
+- name: Install Chrome (if configured, RedHat)
+  yum:
+    name: https://dl.google.com/linux/direct/google-chrome-stable_current_x86_64.rpm
+    state: present
+  when: ansible_os_family == 'RedHat' and selenium_install_chrome
+  tags: [configuration, selenium, selenium-chrome]
+
+- name: Get the latest release for chromedriver
+  uri:
+    url: http://chromedriver.storage.googleapis.com/LATEST_RELEASE
+    return_content: yes
+  register: chromedriver_latest
+  when: selenium_install_chrome
+  tags: [configuration, selenium, selenium-chrome]
+
+- name: Install chromedriver
+  unarchive:
+    src: "http://chromedriver.storage.googleapis.com/{{ chromedriver_latest.content | trim }}/chromedriver_linux64.zip"
+    dest: /usr/bin
+    mode: 0755
+    copy: no
+  when: selenium_install_chrome
+  tags: [configuration, selenium, selenium-chrome]
+
 - name: Install xvfb
-  apt: name={{item}}
-  with_items:
-    - xvfb
-  when: ansible_os_family == 'Debian'
-
-- name: Install browser
-  apt: name={{item}}
-  with_items:
-    - firefox
-  when: ansible_os_family == 'Debian' and selenium_install_firefox
-
-- name: Install browser Xvfb
-  yum: name={{item}}
-  with_items:
-    - xorg-x11-server-Xvfb
-  when: ansible_os_family == 'RedHat'
-
-- name: Install browser
-  yum: name={{item}}
-  with_items:
-    - firefox
-  when: ansible_os_family == 'RedHat' and selenium_install_firefox
-
-
-- name: install
-  template: src=selenium-init-{{ ansible_os_family }}.j2 dest=/etc/init.d/selenium owner=root group=root mode=0755
+  package: name={{ selenium_xvfb_package }}
+  tags: [configuration, selenium, selenium-xvfb]
+
+- name: Install init script
+  template:
+    src: "selenium-init-{{ ansible_os_family }}.j2"
+    dest: /etc/init.d/selenium
+    owner: root
+    group: root
+    mode: 0755
   tags: [configuration, selenium, selenium-install]
 
-- name: run
+- name: Ensure selenium is running
   service: name=selenium state=started enabled=yes
   tags: [configuration, selenium, selenium-run]
diff --git a/provisioning/roles/arknoll.selenium/templates/selenium-init-Debian.j2 b/provisioning/roles/arknoll.selenium/templates/selenium-init-Debian.j2
index 3a8ca8598..f8cbc6827 100644
--- a/provisioning/roles/arknoll.selenium/templates/selenium-init-Debian.j2
+++ b/provisioning/roles/arknoll.selenium/templates/selenium-init-Debian.j2
@@ -1,4 +1,13 @@
 #!/bin/bash
+### BEGIN INIT INFO
+# Provides:          selenium
+# Required-Start:    $local_fs $network
+# Required-Stop:     $local_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: selenium
+# Description:       selenium test framework
+### END INIT INFO
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 
@@ -10,8 +19,8 @@ JAVA_BIN=/usr/bin/java
 XVFB_BIN=/usr/bin/xvfb-run
 
 SELENIUM_DIR={{ selenium_install_dir }}/selenium
-SELENIUM_PID_FILE="$SELENIUM_DIR/selenium.pid"
 SELENIUM_JAR_FILE="$SELENIUM_DIR/selenium-server-standalone-{{ selenium_version }}.jar"
+DAEMON_PID_FILE="$SELENIUM_DIR/selenium.pid"
 SELENIUM_LOG_FILE="$SELENIUM_DIR/selenium.log"
 SELENIUM_DAEMON_OPTS=" -client -jar $SELENIUM_JAR_FILE -log $SELENIUM_LOG_FILE"
 
@@ -23,20 +32,25 @@ set -e
 
 case "$1" in
     start)
-        if status_of_proc -p $SELENIUM_PID_FILE "$SELENIUM_JAR_FILE" $SELENIUM_JAR_FILE > /dev/null; then
+        if status_of_proc -p $DAEMON_PID_FILE "$SELENIUM_JAR_FILE" $SELENIUM_JAR_FILE > /dev/null; then
             log_progress_msg "Service already running"
         else
             log_daemon_msg "Starting Selenium server"
             log_progress_msg "selenium"
-            start-stop-daemon -c $RUN_AS --start --quiet --background --pidfile $SELENIUM_PID_FILE --make-pidfile --exec $XVFB_BIN $JAVA_BIN -- $SELENIUM_DAEMON_OPTS
+            start-stop-daemon -c $RUN_AS --start --quiet --background --pidfile $DAEMON_PID_FILE --make-pidfile --exec $XVFB_BIN $JAVA_BIN -- $SELENIUM_DAEMON_OPTS
         fi
         ;;
 
     stop)
-        if status_of_proc -p $SELENIUM_PID_FILE "$SELENIUM_JAR_FILE" $SELENIUM_JAR_FILE > /dev/null; then
+        if status_of_proc -p $DAEMON_PID_FILE "$SELENIUM_JAR_FILE" $SELENIUM_JAR_FILE > /dev/null; then
             log_daemon_msg "Stopping Selenium server"
             log_progress_msg "selenium"
-            start-stop-daemon --stop --pidfile $SELENIUM_PID_FILE
+            DAEMON_PID=$(cat $DAEMON_PID_FILE)
+            DAEMON_CHILDREN=$(pstree -l -p $DAEMON_PID |grep "([[:digit:]]*)" -o |tr -d '()')
+            # Stop daemon itself.
+            start-stop-daemon --stop --pidfile $DAEMON_PID_FILE
+            # Stop all child processes.
+            sudo kill $DAEMON_CHILDREN
         else
             log_progress_msg "Service not running"
         fi
@@ -49,7 +63,7 @@ case "$1" in
 	;;
 
 	status)
-        status_of_proc -p $SELENIUM_PID_FILE "$SELENIUM_JAR_FILE" $SELENIUM_JAR_FILE && exit 0 || exit $?
+        status_of_proc -p $DAEMON_PID_FILE "$SELENIUM_JAR_FILE" $SELENIUM_JAR_FILE && exit 0 || exit $?
     ;;
 
     *)
diff --git a/provisioning/roles/arknoll.selenium/tests/inventory b/provisioning/roles/arknoll.selenium/tests/inventory
deleted file mode 100644
index 2fbb50c4a..000000000
--- a/provisioning/roles/arknoll.selenium/tests/inventory
+++ /dev/null
@@ -1 +0,0 @@
-localhost
diff --git a/provisioning/roles/arknoll.selenium/tests/test.yml b/provisioning/roles/arknoll.selenium/tests/test.yml
index 640e29ed6..fa569fc01 100644
--- a/provisioning/roles/arknoll.selenium/tests/test.yml
+++ b/provisioning/roles/arknoll.selenium/tests/test.yml
@@ -1,6 +1,11 @@
 ---
 # Test file for selenium
-- hosts: localhost
-  remote_user: root
+- hosts: all
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=yes
+      when: ansible_os_family == 'Debian'
+
   roles:
-    - ansible-role-selenium
+    - role_under_test
diff --git a/provisioning/roles/arknoll.selenium/vars/Debian.yml b/provisioning/roles/arknoll.selenium/vars/Debian.yml
new file mode 100644
index 000000000..03f8ea6d2
--- /dev/null
+++ b/provisioning/roles/arknoll.selenium/vars/Debian.yml
@@ -0,0 +1,2 @@
+---
+selenium_xvfb_package: xvfb
diff --git a/provisioning/roles/arknoll.selenium/vars/RedHat.yml b/provisioning/roles/arknoll.selenium/vars/RedHat.yml
new file mode 100644
index 000000000..1b0f59d07
--- /dev/null
+++ b/provisioning/roles/arknoll.selenium/vars/RedHat.yml
@@ -0,0 +1,2 @@
+---
+selenium_xvfb_package: xorg-x11-server-Xvfb
diff --git a/provisioning/roles/arknoll.selenium/vars/main.yml b/provisioning/roles/arknoll.selenium/vars/main.yml
deleted file mode 100644
index 9a60dec17..000000000
--- a/provisioning/roles/arknoll.selenium/vars/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# vars file for selenium

From f200ee104777ffc7b651180bc78b3ec9868c3abd Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 12 Oct 2016 14:04:38 -0500
Subject: [PATCH 0445/1273] PR #924 follow-up: Update Behat/Selenium docs.

---
 docs/extras/behat.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/extras/behat.md b/docs/extras/behat.md
index ec02226a6..7d5e6b767 100644
--- a/docs/extras/behat.md
+++ b/docs/extras/behat.md
@@ -1,4 +1,4 @@
-Behat is an open source behavior-driven development tool for PHP. You can use Behat to build and run automated tests for site functionality on your Drupal sites, and Drupal VM has excellent built-in support for Behat, using Selenium to run tests in a headless instance of FireFox.
+Behat is an open source behavior-driven development tool for PHP. You can use Behat to build and run automated tests for site functionality on your Drupal sites, and Drupal VM has excellent built-in support for Behat, using Selenium to run tests in a headless instance of either Google Chrome (default) or Firefox.
 
 ## Getting Started - Installing Prerequisites
 
@@ -23,7 +23,7 @@ $ behat --version
 behat version 3.0.15
 ```
 
-_You can also include `drupal/drupal-extension` directly in your project's `composer.json` file, and install the dependencies per-project. Either option (installing globally, like above, or installing per-project) is perfectly acceptable._
+_You can also include `drupal/drupal-extension` directly in your project's `composer.json` file, and install the dependencies per-project._
 
 ## Setting up Behat for your project
 

From 23306c836aaebb204122611d94e0c7f02f31b9f4 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 12 Oct 2016 14:06:02 -0500
Subject: [PATCH 0446/1273] Fixes #922: Increase default memory usage.

---
 default.config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.config.yml b/default.config.yml
index 724c5b839..ed4632cd0 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -29,7 +29,7 @@ vagrant_synced_folders:
     create: true
 
 # Memory and CPU to use for this VM.
-vagrant_memory: 1024
+vagrant_memory: 2048
 vagrant_cpus: 1
 
 # Minimum required versions.

From 91f6d97622694a6bda5df2ef54766990fd2000bf Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 12 Oct 2016 16:59:38 -0500
Subject: [PATCH 0447/1273] Fixes #921: Switch to mainline PHP 5.6 PPA on
 Ubuntu.

---
 docs/other/php-56.md                          | 51 ++++++++++---------
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.php/.travis.yml         | 36 +++++++------
 provisioning/roles/geerlingguy.php/README.md  |  4 ++
 .../roles/geerlingguy.php/defaults/main.yml   |  3 ++
 .../geerlingguy.php/tasks/setup-Debian.yml    |  1 +
 .../geerlingguy.php/tests/test-source.yml     |  6 +--
 .../roles/geerlingguy.php/tests/test.yml      |  8 +--
 provisioning/tasks/init-debian.yml            | 11 ++--
 9 files changed, 66 insertions(+), 56 deletions(-)

diff --git a/docs/other/php-56.md b/docs/other/php-56.md
index 14a6f8b8f..bffab6c3c 100644
--- a/docs/other/php-56.md
+++ b/docs/other/php-56.md
@@ -11,43 +11,48 @@ Ondřej Surý's PPA for PHP 7.0 is used to install PHP 7, but you can switch to
 ```yaml
 vagrant_box: geerlingguy/ubuntu1404
 php_version: "5.6"
+php_install_recommends: no
+php_version: "5.6"
+php_install_recommends: no
 php_packages:
-  - php5
-  - php5-apcu
-  - php5-mcrypt
-  - php5-cli
-  - php5-common
-  - php5-curl
-  - php5-dev
-  - php5-fpm
-  - php5-gd
-  - php5-sqlite
+  - php5.6
+  - php5.6-apcu
+  - php5.6-mcrypt
+  - php5.6-cli
+  - php5.6-common
+  - php5.6-curl
+  - php5.6-dev
+  - php5.6-fpm
+  - php5.6-gd
+  - php5.6-sqlite3
+  - php5.6-xml
+  - php5.6-mbstring
   - php-pear
   - libpcre3-dev
 php_conf_paths:
-  - /etc/php5/fpm
-  - /etc/php5/apache2
-  - /etc/php5/cli
+  - /etc/php/5.6/fpm
+  - /etc/php/5.6/apache2
+  - /etc/php/5.6/cli
 php_extension_conf_paths:
-  - /etc/php5/fpm/conf.d
-  - /etc/php5/apache2/conf.d
-  - /etc/php5/cli/conf.d
-php_fpm_daemon: php5-fpm
-php_fpm_conf_path: "/etc/php5/fpm"
-php_fpm_pool_conf_path: "/etc/php5/fpm/pool.d/www.conf"
-php_mysql_package: php5-mysql
+  - /etc/php/5.6/fpm/conf.d
+  - /etc/php/5.6/apache2/conf.d
+  - /etc/php/5.6/cli/conf.d
+php_fpm_daemon: php5.6-fpm
+php_fpm_conf_path: "/etc/php/5.6/fpm"
+php_fpm_pool_conf_path: "/etc/php/5.6/fpm/pool.d/www.conf"
+php_mysql_package: php5.6-mysql
 ```
 
-If you're using Apache with `mod_php` you should also add `libapache2-mod-php5` to the `php_packages` list.
+If you're using Apache with `mod_php` you should also add `libapache2-mod-php5.6` to the `php_packages` list.
 
 Also, if you're using one of the `installed_extras`, you may need to update the package names accordingly:
 
 ```yaml
 # If you install `redis`:
-php_redis_package: php5-redis
+php_redis_package: php5.6-redis
 
 # If you install `memcached`:
-php_memcached_package: php5-memcached
+php_memcached_package: php5.6-memcached
 
 # If you install `xhprof`:
 xhprof_download_url: https://github.com/phacility/xhprof/archive/master.tar.gz
diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 4ea8c9a78..a17757dab 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -38,7 +38,7 @@
 - src: geerlingguy.nodejs
   version: 3.3.0
 - src: geerlingguy.php
-  version: 3.3.0
+  version: 3.3.2
 - src: geerlingguy.php-memcached
   version: 2.0.0
 - src: geerlingguy.php-mysql
diff --git a/provisioning/roles/geerlingguy.php/.travis.yml b/provisioning/roles/geerlingguy.php/.travis.yml
index f79942833..f79975808 100644
--- a/provisioning/roles/geerlingguy.php/.travis.yml
+++ b/provisioning/roles/geerlingguy.php/.travis.yml
@@ -1,5 +1,5 @@
 ---
-sudo: required
+services: docker
 
 env:
   # Test package install on all supported OSes.
@@ -8,6 +8,11 @@ env:
     run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     playbook: test.yml
     php_version: 7.0
+  - distro: fedora24
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    playbook: test.yml
+    php_version: 5.6
   - distro: ubuntu1604
     init: /lib/systemd/systemd
     run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
@@ -36,30 +41,27 @@ env:
     playbook: test-source.yml
     php_version: 7.0.5
 
-services:
-  - docker
-
 before_install:
   # Pull container.
-  - 'sudo docker pull geerlingguy/docker-${distro}-ansible:latest'
+  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
   - container_id=$(mktemp)
   # Run container in detached state.
-  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
+  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
 
   # Install dependencies.
-  - 'sudo docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
+  - 'docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
 
   # Ansible syntax check.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} --syntax-check'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} --syntax-check'
 
   # Test role.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook}'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook}'
 
   # Test role idempotence.
   - idempotence=$(mktemp)
-  - sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} | tee -a ${idempotence}
+  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} | tee -a ${idempotence}
   - >
     tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
@@ -67,18 +69,14 @@ script:
     || (echo 'Idempotence test: fail' && exit 1)
 
   # Ensure PHP is installed and at the right version.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm which php'
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm test -x /usr/bin/php'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm which php'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm test -x /usr/bin/php'
 
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm php --version'
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm /usr/bin/php --version | grep -qF "PHP ${php_version}"'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm php --version'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm /usr/bin/php --version | grep -qF "PHP ${php_version}"'
 
   # Ensure PHP configurations have taken effect.
-  - sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm php -i | grep 'memory_limit.*192'
-
-after_success:
-  # Clean up.
-  - 'sudo docker stop "$(cat ${container_id})"'
+  - docker exec --tty "$(cat ${container_id})" env TERM=xterm php -i | grep 'memory_limit.*192'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.php/README.md b/provisioning/roles/geerlingguy.php/README.md
index 8ee4445a7..ad49ecb19 100644
--- a/provisioning/roles/geerlingguy.php/README.md
+++ b/provisioning/roles/geerlingguy.php/README.md
@@ -34,6 +34,10 @@ The default values for the HTTP server deamon are `httpd` (used by Apache) for R
 
 If you have enabled any additional repositories such as [geerlingguy.repo-epel](https://github.com/geerlingguy/ansible-role-repo-epel) or [geerlingguy.repo-remi](https://github.com/geerlingguy/ansible-role-repo-remi), you may want an easy way to swap PHP versions on the fly. By default, this is set to 'installed'. You can now override this variable to 'latest'. Combined with php_enablerepo, a user now doesn't need to manually uninstall the existing PHP packages before installing them from a different repository.
 
+    php_install_recommends: yes
+
+(Debian/Ubuntu only) Whether to install recommended packages when installing `php_packages`; you might want to set this to `no` explicitly if you're installing a PPA that recommends certain packages you don't want (e.g. Ondrej's `php` PPA will install `php7.0-cli` if you install `php-pear` alongside `php5.6-cli`... which is often not desired!).
+
     php_executable: "php"
 
 The executable to run when calling PHP from the command line. You should only change this if running `php` on your server doesn't target the correct executable, or if you're using software collections on RHEL/CentOS and need to target a different version of PHP.
diff --git a/provisioning/roles/geerlingguy.php/defaults/main.yml b/provisioning/roles/geerlingguy.php/defaults/main.yml
index 539903a32..e06ca3c3f 100644
--- a/provisioning/roles/geerlingguy.php/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.php/defaults/main.yml
@@ -7,6 +7,9 @@ php_enablerepo: ""
 # you want to upgrade or switch versions using a new repo.
 php_packages_state: installed
 
+# Whether to install recommended packages. Used only for Debian/Ubuntu.
+php_install_recommends: yes
+
 # Set this to false if you're not using PHP with Apache/Nginx/etc.
 php_enable_webserver: true
 
diff --git a/provisioning/roles/geerlingguy.php/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.php/tasks/setup-Debian.yml
index f77278a35..3b3d6d3b9 100644
--- a/provisioning/roles/geerlingguy.php/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.php/tasks/setup-Debian.yml
@@ -6,6 +6,7 @@
   apt:
     name: "{{ item }}"
     state: "{{ php_packages_state }}"
+    install_recommends: "{{ php_install_recommends }}"
   with_items: "{{ php_packages }}"
   register: php_package_install
   notify: restart webserver
diff --git a/provisioning/roles/geerlingguy.php/tests/test-source.yml b/provisioning/roles/geerlingguy.php/tests/test-source.yml
index 4693ac59b..ac8b7a0b1 100644
--- a/provisioning/roles/geerlingguy.php/tests/test-source.yml
+++ b/provisioning/roles/geerlingguy.php/tests/test-source.yml
@@ -10,9 +10,9 @@
     php_memory_limit: "192M"
 
   pre_tasks:
-    - name: Ensure build dependencies are installed (RedHat).
-      package: name=which state=present
-      when: ansible_os_family == 'RedHat'
+    - name: Update apt cache.
+      apt: update_cache=yes
+      when: ansible_os_family == 'Debian'
 
   roles:
     - geerlingguy.git
diff --git a/provisioning/roles/geerlingguy.php/tests/test.yml b/provisioning/roles/geerlingguy.php/tests/test.yml
index 472b78160..295fcb7b8 100644
--- a/provisioning/roles/geerlingguy.php/tests/test.yml
+++ b/provisioning/roles/geerlingguy.php/tests/test.yml
@@ -7,13 +7,13 @@
     php_enablerepo: "remi,remi-php70"
 
   pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=yes
+      when: ansible_os_family == 'Debian'
+
     - include_vars: test-vars-ubuntu1204.yml
       when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '12.04'
 
-    - name: Ensure build dependencies are installed (RedHat).
-      package: name=which state=present
-      when: ansible_os_family == 'RedHat'
-
     - name: Add repository for PHP 7.
       apt_repository: repo='ppa:ondrej/php'
       when: ansible_distribution == 'Ubuntu' and ansible_distribution_version != '12.04'
diff --git a/provisioning/tasks/init-debian.yml b/provisioning/tasks/init-debian.yml
index d2c10e155..b30c1c71c 100644
--- a/provisioning/tasks/init-debian.yml
+++ b/provisioning/tasks/init-debian.yml
@@ -24,13 +24,12 @@
   apt_repository: repo='ppa:ondrej/php5'
   when: php_version == "5.5" and ansible_distribution == "Ubuntu" and ansible_distribution_version == "12.04"
 
-- name: Add repository for PHP 5.6.
-  apt_repository: repo='ppa:ondrej/php5-5.6'
-  when: php_version == "5.6" and ansible_distribution == "Ubuntu" and ansible_distribution_version != "16.04"
-
-- name: Add repository for PHP 7.0.
+- name: Add repository for PHP 5.6 or 7.0.
   apt_repository: repo='ppa:ondrej/php'
-  when: php_version == "7.0" and ansible_distribution == "Ubuntu" and ansible_distribution_version != "16.04"
+  when: >
+    (php_version == "5.6" or php_version == "7.0") and
+    ansible_distribution == "Ubuntu" and
+    ansible_distribution_version != "16.04"
 
 - name: Define php_xhprof_html_dir.
   set_fact:

From ac56269b0cc4468e384d7b8640456d78481d5f3c Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 12 Oct 2016 17:15:20 -0500
Subject: [PATCH 0448/1273] Fixes #916: Document Drupal VM setup/use in WSL.

---
 docs/other/windows.md | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/docs/other/windows.md b/docs/other/windows.md
index b3866d2ca..329c037a6 100644
--- a/docs/other/windows.md
+++ b/docs/other/windows.md
@@ -1,8 +1,25 @@
 There are a few caveats when using Drupal VM on Windows, and this page will try to identify the main gotchas or optimization tips for those wishing to use Drupal VM on a Windows host.
 
+## Windows Subsystem for Linux / Ubuntu bash
+
+If you are running Windows 10 (Anniversary edition) or later, you can install the Windows Subsytem for Linux, which allows you to install an Ubuntu-based CLI inside of Windows. With this installed, you can then manage and run Drupal VM inside the Linux-like environment. Follow these steps to use Drupal VM in the WSL:
+
+  1. Install Vagrant and VirtualBox in Windows (links in the [Drupal VM Quick Start Guide](https://github.com/geerlingguy/drupal-vm#quick-start-guide)).
+  2. [Install/Enable the Windows Subsystem for Linux](https://msdn.microsoft.com/en-us/commandline/wsl/install_guide).
+    1. Create an admin account for the Ubuntu Bash environment when prompted.
+  3. Download the latest release of [cbwin](https://github.com/xilun/cbwin) and follow the [cbwin installation instructions](https://github.com/xilun/cbwin#installation).
+  4. Open an instance of `outbash.exe`.
+  5. In a local copy of Drupal VM (downloaded or Git cloned into a path that's in the Windows filesystem, e.g. `/mnt/c/Users/yourusername/Sites/drupal-vm`), run `wrun vagrant up`.
+
+If you need to run any other `vagrant` commands (with the exception of `vagrant ssh`—for now, that must be run in a different environment; see [Vagrant: Use Linux Subsystem on Windows](https://github.com/mitchellh/vagrant/issues/7731)), you can do so by prefixing them with `wrun`.
+
+> Note: using `wrun`, interactive prompts don't seem to work (e.g. if you run `vagrant destroy` without `-f`, you have to Ctrl-C out of it because it just hangs).
+>
+> Note 2: that the WSL is still in beta, and tools like `cbwin` are still undergoing rapid development, so some of these instructions are subject to change!
+
 ## Command line environment
 
-You can use PowerShell, Git Bash, Git Shell, or other PowerShell-based environments with Drupal VM and Vagrant; however you might want to consider using a more POSIX-like environment so you can more easily work with Drupal VM:
+If you're not on Windows 10, or if you don't want to install the WSL, you can use PowerShell, Git Bash, Git Shell, or other PowerShell-based environments with Drupal VM and Vagrant; however you might want to consider using a more POSIX-like environment so you can more easily work with Drupal VM:
 
   - [Cmder](http://cmder.net/) includes built-in git and SSH support, so you can do most things that you need without any additional plugins.
   - [Cygwin](https://www.cygwin.com/) allows you to install a large variety of linux packages inside its bash environment, though it can be a little more tricky to manage and is less integrated into the Windows environment.
@@ -28,6 +45,8 @@ There are two parts to this:
   1. VirtualBox does not allow gets VMs to create symlinks in synced folders by default.
   2. Windows does not allow the creation of symlinks unless your local policy allows it; see [TechNet article](https://technet.microsoft.com/en-us/library/dn221947%28v=ws.10%29.aspx). Even if local policy allows it, many users experience problems in the creation of symlinks.
 
+Using Ubuntu bash under Windows 10 _can_ make this easier, but there are still issues when creating and managing symlinks between the bash environment and the guest Vagrant operating system.
+
 ### Git and File permissions
 
 If you're using a synced folder for your project, you should choose to either work _only_ inside the VM, or _only_ on the host machine. Don't commit changes both inside the VM and on the host unless you know what you're doing and have Git configured properly for Unix vs. Windows line endings. File permissions and line endings can be changed in ways that can break your project if you're not careful!

From a290271ff138030d7af297a5361df79b439f9484 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 15 Oct 2016 10:30:58 -0400
Subject: [PATCH 0449/1273] Fixes #925, Followup #859: Remi repo is not enabled
 for mysql by default

---
 provisioning/tasks/init-redhat.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/tasks/init-redhat.yml b/provisioning/tasks/init-redhat.yml
index 988040ba0..80707fc96 100644
--- a/provisioning/tasks/init-redhat.yml
+++ b/provisioning/tasks/init-redhat.yml
@@ -9,7 +9,7 @@
 
 - name: Enable remi repo for MySQL.
   set_fact: mysql_enablerepo="remi"
-  when: mysql_enablerepo is not defined
+  when: mysql_enablerepo is not defined or mysql_enablerepo == ""
 
 - name: Enable remi repo for PHP 5.5.
   set_fact: php_enablerepo="remi,remi-php55"

From b350d698de63a187dc88acbf19d50278ee8d8c0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 15 Oct 2016 10:45:46 -0400
Subject: [PATCH 0450/1273] Remove duplicate config variables in php docs

---
 docs/other/php-56.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/other/php-56.md b/docs/other/php-56.md
index bffab6c3c..7abd2d144 100644
--- a/docs/other/php-56.md
+++ b/docs/other/php-56.md
@@ -12,8 +12,6 @@ Ondřej Surý's PPA for PHP 7.0 is used to install PHP 7, but you can switch to
 vagrant_box: geerlingguy/ubuntu1404
 php_version: "5.6"
 php_install_recommends: no
-php_version: "5.6"
-php_install_recommends: no
 php_packages:
   - php5.6
   - php5.6-apcu

From eb2228e8ade9dec7d188b4374e6c79a0f08fc7fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 15 Oct 2016 11:07:51 -0400
Subject: [PATCH 0451/1273] Disable rubocop block length check

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b3bcad550..3d3678300 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -66,7 +66,7 @@ script:
   - '[[ ! -z "${local_config}" ]] && docker exec "$(cat ${container_id})" bash -c "cp ${DRUPALVM_DIR}/${local_config} ${config_dir:-$DRUPALVM_DIR}/local.config.yml" || true'
 
   # Vagrantfile syntax check.
-  - 'rubocop ./Vagrantfile --except LineLength,Eval,MutableConstant'
+  - 'rubocop ./Vagrantfile --except LineLength,Eval,MutableConstant,BlockLength'
 
   # Ansible syntax check.
   - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook ${DRUPALVM_DIR}/provisioning/playbook.yml --syntax-check'

From 8218df0459a36cb885362752d780b47f8d418bbf Mon Sep 17 00:00:00 2001
From: tomislav <tomislav@dreamfony.com>
Date: Thu, 20 Oct 2016 19:12:07 +0200
Subject: [PATCH 0452/1273] Change variable names in documentation

---
 docs/extras/mysql.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/extras/mysql.md b/docs/extras/mysql.md
index c461cf5f0..73668dd9b 100644
--- a/docs/extras/mysql.md
+++ b/docs/extras/mysql.md
@@ -1,8 +1,8 @@
-By default, this VM is set up so you can manage MySQL databases on your own. The default root MySQL user credentials are `root` for username and password, but you can change the password via `config.yml` (changing the `mysql_root_password` variable). I use [Sequel Pro](http://www.sequelpro.com/) (macOS-only) to connect to and manage databases, and Drush to sync databases (sometimes I'll just do a dump and import, but Drush is usually quicker, and is easier to do over and over again when you need it).
+By default, this VM is set up so you can manage MySQL databases on your own. The default root MySQL user credentials are `drupal` for username and password, but you can change the password via `config.yml` (changing the `drupal_db_password` variable). I use [Sequel Pro](http://www.sequelpro.com/) (macOS-only) to connect to and manage databases, and Drush to sync databases (sometimes I'll just do a dump and import, but Drush is usually quicker, and is easier to do over and over again when you need it).
 
 ## Connect using Adminer
 
-If you have `adminer` listed as one of the `installed_extras` inside `config.yml`, you can use Adminer's web-based interface to interact with databases. With Drupal VM running, visit `http://adminer.drupalvm.dev/`, and log in with `root` as the username and the password you set in `config.yml` (`mysql_root_password`). Leave the "Server" field blank. The "Database" field is optional.
+If you have `adminer` listed as one of the `installed_extras` inside `config.yml`, you can use Adminer's web-based interface to interact with databases. With Drupal VM running, visit `http://adminer.drupalvm.dev/`, and log in with `drupal` as the username and the password you set in `config.yml` (`drupal_db_password`). Leave the "Server" field blank. The "Database" field is optional.
 
 More about how to use Adminer: [Adminer website](http://www.adminer.org/).
 
@@ -11,8 +11,8 @@ More about how to use Adminer: [Adminer website](http://www.adminer.org/).
   1. Use the SSH connection type.
   2. Set the following options:
     - MySQL Host: `127.0.0.1`
-    - Username: `root`
-    - Password: `root` (or the password configured in `config.yml`)
+    - Username: `drupal`
+    - Password: `drupal` (or the password configured in `config.yml`)
     - SSH Host: `192.168.88.88` (or  the IP configured in `config.yml`)
     - SSH User: `vagrant`
     - SSH Key: (browse to your `~/.vagrant.d/` folder and choose `insecure_private_key`)

From 3449246d231039a83586822fac3b196c88fdea48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 22 Oct 2016 13:49:00 -0400
Subject: [PATCH 0453/1273] Followup #870: Fix invalid cron example by removing
 trailing commas

---
 default.config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/default.config.yml b/default.config.yml
index ed4632cd0..8efffdd8c 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -90,8 +90,8 @@ drupal_site_install_extra_args: []
 # Cron jobs are added to the vagrant user's crontab. Keys include name
 # (required), minute, hour, day, weekday, month, job (required), and state.
 drupalvm_cron_jobs: []
-  # - name: "Drupal Cron",
-  #   minute: "*/30",
+  # - name: "Drupal Cron"
+  #   minute: "*/30"
   #   job: "drush -r {{ drupal_core_path }} core-cron"
 
 # Drupal VM automatically creates a drush alias file in your ~/.drush folder if

From 010268174c67a8125b86b60f6360b536e40c93ab Mon Sep 17 00:00:00 2001
From: Justin Levi Winter <justinlevi@users.noreply.github.com>
Date: Fri, 28 Oct 2016 11:59:23 -0400
Subject: [PATCH 0454/1273] I think the PURGE request needs to return (purge);

description here:
https://github.com/geerlingguy/drupal-vm/issues/947
---
 provisioning/templates/drupalvm.vcl.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/templates/drupalvm.vcl.j2 b/provisioning/templates/drupalvm.vcl.j2
index 90400c4ff..4cf2dc19a 100644
--- a/provisioning/templates/drupalvm.vcl.j2
+++ b/provisioning/templates/drupalvm.vcl.j2
@@ -31,7 +31,7 @@ sub vcl_recv {
         if (!client.ip ~ purge) {
             return (synth(405, "Not allowed."));
         }
-        return (hash);
+        return (purge);
     }
 
     # Only allow BAN requests from IP addresses in the 'purge' ACL.

From 9f10d274019644857263d6b5686ab18cf3fa0be1 Mon Sep 17 00:00:00 2001
From: hw <hussainweb@gmail.com>
Date: Sun, 30 Oct 2016 16:04:08 +0530
Subject: [PATCH 0455/1273] Issue #950: Allow sync folder type for cachier
 location to be configured

This commit allows the sync folder sharing type for the location of vagrant cachier to be
configured. It also sets it to 'nfs' as default.
---
 Vagrantfile        | 3 +++
 default.config.yml | 1 +
 2 files changed, 4 insertions(+)

diff --git a/Vagrantfile b/Vagrantfile
index 6618a85d4..428aabc50 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -175,6 +175,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     config.cache.enable :apt
     # Cache the composer directory.
     config.cache.enable :generic, cache_dir: '/home/vagrant/.composer/cache'
+    config.cache.synced_folder_opts = {
+      type: vconfig.include?('vagrant_cachier_folder_default_type') ? vconfig['vagrant_cachier_folder_default_type'] : 'nfs'
+    }
   end
 
   # Allow an untracked Vagrantfile to modify the configurations
diff --git a/default.config.yml b/default.config.yml
index 8efffdd8c..a78a0890b 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -4,6 +4,7 @@
 vagrant_box: geerlingguy/ubuntu1604
 vagrant_user: vagrant
 vagrant_synced_folder_default_type: nfs
+vagrant_cachier_folder_default_type: nfs
 
 # If you need to run multiple instances of Drupal VM, set a unique hostname,
 # machine name, and IP address for each instance.

From e727b8f3e5eb013529e8838ab260b3dbf9202a02 Mon Sep 17 00:00:00 2001
From: hw <hussainweb@gmail.com>
Date: Mon, 31 Oct 2016 07:28:40 +0530
Subject: [PATCH 0456/1273] Use the variable vagrant_synced_folder_default_type
 instead of a new one

---
 Vagrantfile        | 2 +-
 default.config.yml | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 428aabc50..b1ef7e722 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -176,7 +176,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     # Cache the composer directory.
     config.cache.enable :generic, cache_dir: '/home/vagrant/.composer/cache'
     config.cache.synced_folder_opts = {
-      type: vconfig.include?('vagrant_cachier_folder_default_type') ? vconfig['vagrant_cachier_folder_default_type'] : 'nfs'
+      type: vconfig.include?('vagrant_synced_folder_default_type') ? vconfig['vagrant_synced_folder_default_type'] : 'nfs'
     }
   end
 
diff --git a/default.config.yml b/default.config.yml
index a78a0890b..8efffdd8c 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -4,7 +4,6 @@
 vagrant_box: geerlingguy/ubuntu1604
 vagrant_user: vagrant
 vagrant_synced_folder_default_type: nfs
-vagrant_cachier_folder_default_type: nfs
 
 # If you need to run multiple instances of Drupal VM, set a unique hostname,
 # machine name, and IP address for each instance.

From a49ae606f045754aa8c85b88367b6599a3936a01 Mon Sep 17 00:00:00 2001
From: Justin Levi Winter <justinlevi@users.noreply.github.com>
Date: Mon, 31 Oct 2016 11:52:07 -0400
Subject: [PATCH 0457/1273] Updating BAN Request for the new Cache-Tags header

---
 provisioning/templates/drupalvm.vcl.j2 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/provisioning/templates/drupalvm.vcl.j2 b/provisioning/templates/drupalvm.vcl.j2
index 4cf2dc19a..2e7a2b00b 100644
--- a/provisioning/templates/drupalvm.vcl.j2
+++ b/provisioning/templates/drupalvm.vcl.j2
@@ -41,13 +41,13 @@ sub vcl_recv {
             return (synth(403, "Not allowed."));
         }
 
-        # Logic for the ban, using the Purge-Cache-Tags header. For more info
+        # Logic for the ban, using the Cache-Tags header. For more info
         # see https://github.com/geerlingguy/drupal-vm/issues/397.
-        if (req.http.Purge-Cache-Tags) {
-            ban("obj.http.Purge-Cache-Tags ~ " + req.http.Purge-Cache-Tags);
+        if (req.http.Cache-Tags) {
+            ban("obj.http.Cache-Tags ~ " + req.http.Cache-Tags);
         }
         else {
-            return (synth(403, "Purge-Cache-Tags header missing."));
+            return (synth(403, "Cache-Tags header missing."));
         }
 
         # Throw a synthetic page so the request won't go to the backend.

From 53fdfed63627911531d5f6bf7525b15fa200cc71 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 2 Nov 2016 15:25:59 -0500
Subject: [PATCH 0458/1273] Fixes #958, Fixes #957: Update roles for Ansible
 2.2 compatibility.

---
 provisioning/requirements.yml                 |  8 +--
 .../roles/geerlingguy.firewall/.travis.yml    | 60 ++++++++-----------
 .../roles/geerlingguy.firewall/meta/main.yml  |  2 +-
 .../roles/geerlingguy.firewall/tasks/main.yml | 40 +++++++++----
 .../{firewall.j2 => firewall.init.j2}         |  0
 .../templates/firewall.unit.j2                | 12 ++++
 .../roles/geerlingguy.java/.travis.yml        | 24 ++++----
 .../roles/geerlingguy.java/tasks/main.yml     |  3 +
 .../geerlingguy.java/tasks/setup-Debian.yml   |  2 +-
 .../roles/geerlingguy.java/tests/test.yml     |  4 --
 .../roles/geerlingguy.mailhog/.travis.yml     | 51 ++++++----------
 .../roles/geerlingguy.mailhog/README.md       |  2 +-
 .../roles/geerlingguy.mailhog/tasks/main.yml  | 13 ++++
 .../templates/mailhog.unit.j2                 | 12 ++++
 .../tests/Dockerfile.centos-6                 | 15 -----
 .../tests/Dockerfile.centos-7                 | 27 ---------
 .../tests/Dockerfile.ubuntu-12.04             | 11 ----
 .../tests/Dockerfile.ubuntu-14.04             | 11 ----
 .../tests/requirements.yml                    |  2 +
 .../roles/geerlingguy.mailhog/tests/test.yml  | 13 ++--
 .../geerlingguy.postgresql/tasks/main.yml     |  3 +
 21 files changed, 142 insertions(+), 173 deletions(-)
 rename provisioning/roles/geerlingguy.firewall/templates/{firewall.j2 => firewall.init.j2} (100%)
 create mode 100644 provisioning/roles/geerlingguy.firewall/templates/firewall.unit.j2
 create mode 100644 provisioning/roles/geerlingguy.mailhog/templates/mailhog.unit.j2
 delete mode 100644 provisioning/roles/geerlingguy.mailhog/tests/Dockerfile.centos-6
 delete mode 100644 provisioning/roles/geerlingguy.mailhog/tests/Dockerfile.centos-7
 delete mode 100644 provisioning/roles/geerlingguy.mailhog/tests/Dockerfile.ubuntu-12.04
 delete mode 100644 provisioning/roles/geerlingguy.mailhog/tests/Dockerfile.ubuntu-14.04
 create mode 100644 provisioning/roles/geerlingguy.mailhog/tests/requirements.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index a17757dab..395190af6 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -22,13 +22,13 @@
 - src: geerlingguy.elasticsearch
   version: 2.1.1
 - src: geerlingguy.firewall
-  version: 1.1.0
+  version: 1.3.0
 - src: geerlingguy.git
   version: 1.2.0
 - src: geerlingguy.java
-  version: 1.7.0
+  version: 1.7.1
 - src: geerlingguy.mailhog
-  version: 2.0.0
+  version: 2.1.0
 - src: geerlingguy.memcached
   version: 1.0.7
 - src: geerlingguy.mysql
@@ -58,7 +58,7 @@
 - src: geerlingguy.postfix
   version: 1.1.0
 - src: geerlingguy.postgresql
-  version: 1.0.1
+  version: 1.0.2
 - src: geerlingguy.redis
   version: 1.2.0
 - src: geerlingguy.repo-remi
diff --git a/provisioning/roles/geerlingguy.firewall/.travis.yml b/provisioning/roles/geerlingguy.firewall/.travis.yml
index 661b78db5..5306881f5 100644
--- a/provisioning/roles/geerlingguy.firewall/.travis.yml
+++ b/provisioning/roles/geerlingguy.firewall/.travis.yml
@@ -1,53 +1,44 @@
 ---
-sudo: required
+services: docker
 
 env:
-  global:
-    # https://github.com/travis-ci/travis-ci/issues/6461#issuecomment-239577306
-    DOCKER_VERSION: "1.9.1-0~trusty"
-  matrix:
-    - distro: centos7
-      init: /usr/lib/systemd/systemd
-      run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-    - distro: centos6
-      init: /sbin/init
-      run_opts: "--privileged"
-    - distro: ubuntu1604
-      init: /lib/systemd/systemd
-      run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-    - distro: ubuntu1404
-      init: /sbin/init
-      run_opts: "--privileged"
-    - distro: ubuntu1204
-      init: /sbin/init
-      run_opts: "--privileged"
-
-services:
-  - docker
+  - distro: centos7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distro: centos6
+    init: /sbin/init
+    run_opts: "--privileged"
+  - distro: ubuntu1604
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distro: ubuntu1404
+    init: /sbin/init
+    run_opts: "--privileged"
+  - distro: ubuntu1204
+    init: /sbin/init
+    run_opts: "--privileged"
+  - distro: debian8
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
 
 before_install:
-  # Downgrade to specific version of Docker engine.
-  - sudo apt-get update
-  - sudo apt-get remove docker-engine -yq
-  - sudo apt-get install docker-engine=$DOCKER_VERSION -yq --no-install-suggests --no-install-recommends --force-yes -o Dpkg::Options::="--force-confnew"
-
   # Pull container.
-  - 'sudo docker pull geerlingguy/docker-${distro}-ansible:latest'
+  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
   - container_id=$(mktemp)
   # Run container in detached state.
-  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
+  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
 
   # Ansible syntax check.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
 
   # Test role.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+  - 'docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
 
   # Test role idempotence.
   - idempotence=$(mktemp)
-  - sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
+  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
   - >
     tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
@@ -83,8 +74,5 @@ script:
   #     echo 'Status of stopped firewall is not 3 - fail' && exit 1;
   #   fi
 
-  # Clean up.
-  - 'sudo docker stop "$(cat ${container_id})"'
-
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.firewall/meta/main.yml b/provisioning/roles/geerlingguy.firewall/meta/main.yml
index ad32fda49..233866cf4 100644
--- a/provisioning/roles/geerlingguy.firewall/meta/main.yml
+++ b/provisioning/roles/geerlingguy.firewall/meta/main.yml
@@ -6,7 +6,7 @@ galaxy_info:
   description: Simple iptables firewall for most Unix-like systems.
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 1.8
+  min_ansible_version: 2.0
   platforms:
   - name: EL
     versions:
diff --git a/provisioning/roles/geerlingguy.firewall/tasks/main.yml b/provisioning/roles/geerlingguy.firewall/tasks/main.yml
index b8bd8357e..5650b8518 100644
--- a/provisioning/roles/geerlingguy.firewall/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.firewall/tasks/main.yml
@@ -1,21 +1,41 @@
 ---
-- name: Ensure iptables is installed (RedHat).
-  yum: pkg=iptables state=installed
-  when: ansible_os_family == 'RedHat'
-
-- name: Ensure iptables is installed (Debian).
-  apt: pkg=iptables state=installed
-  when: ansible_os_family == 'Debian'
+- name: Ensure iptables is installed.
+  package: name=iptables state=installed
 
 - name: Flush iptables the first time playbook runs.
-  command: iptables -F creates=/etc/init.d/firewall
+  command: >
+    iptables -F
+    creates=/etc/init.d/firewall
 
 - name: Copy firewall script into place.
-  template: src=firewall.bash.j2 dest=/etc/firewall.bash owner=root group=root mode=0744
+  template:
+    src: firewall.bash.j2
+    dest: /etc/firewall.bash
+    owner: root
+    group: root
+    mode: 0744
   notify: restart firewall
 
 - name: Copy firewall init script into place.
-  template: src=firewall.j2 dest=/etc/init.d/firewall owner=root group=root mode=0755
+  template:
+    src: firewall.init.j2
+    dest: /etc/init.d/firewall
+    owner: root
+    group: root
+    mode: 0755
+
+- name: Copy firewall systemd unit file into place (for systemd systems).
+  template:
+    src: firewall.unit.j2
+    dest: /etc/systemd/system/firewall.service
+    owner: root
+    group: root
+    mode: 0755
+  when: >
+    (ansible_distribution == 'Ubuntu' and ansible_distribution_version == '16.04') or
+    (ansible_distribution == 'Debian' and ansible_distribution_version|int >= 8) or
+    (ansible_distribution == 'CentOS' and ansible_distribution_version|int >= 7) or
+    (ansible_distribution == 'Fedora')
 
 - name: Ensure the firewall is enabled and will start on boot.
   service: name=firewall state=started enabled=yes
diff --git a/provisioning/roles/geerlingguy.firewall/templates/firewall.j2 b/provisioning/roles/geerlingguy.firewall/templates/firewall.init.j2
similarity index 100%
rename from provisioning/roles/geerlingguy.firewall/templates/firewall.j2
rename to provisioning/roles/geerlingguy.firewall/templates/firewall.init.j2
diff --git a/provisioning/roles/geerlingguy.firewall/templates/firewall.unit.j2 b/provisioning/roles/geerlingguy.firewall/templates/firewall.unit.j2
new file mode 100644
index 000000000..5165d88ff
--- /dev/null
+++ b/provisioning/roles/geerlingguy.firewall/templates/firewall.unit.j2
@@ -0,0 +1,12 @@
+[Unit]
+Description=Firewall
+After=syslog.target network.target
+
+[Service]
+Type=oneshot
+ExecStart=/etc/firewall.bash
+ExecStop=/sbin/iptables -F
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/provisioning/roles/geerlingguy.java/.travis.yml b/provisioning/roles/geerlingguy.java/.travis.yml
index 50b0ac639..f8a882fa0 100644
--- a/provisioning/roles/geerlingguy.java/.travis.yml
+++ b/provisioning/roles/geerlingguy.java/.travis.yml
@@ -1,5 +1,5 @@
 ---
-sudo: required
+services: docker
 
 env:
   - distro: centos7
@@ -20,28 +20,28 @@ env:
   - distro: ubuntu1204
     init: /sbin/init
     run_opts: ""
-
-services:
-  - docker
+  - distro: debian8
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
 
 before_install:
   # Pull container.
-  - 'sudo docker pull geerlingguy/docker-${distro}-ansible:latest'
+  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
   - container_id=$(mktemp)
   # Run container in detached state.
-  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
+  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
 
   # Ansible syntax check.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
 
   # Test role.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
 
   # Test role idempotence.
   - idempotence=$(mktemp)
-  - sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
+  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
   - >
     tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
@@ -49,11 +49,7 @@ script:
     || (echo 'Idempotence test: fail' && exit 1)
 
   # Ensure Java is installed.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm which java'
-
-after_success:
-  # Clean up.
-  - 'sudo docker stop "$(cat ${container_id})"'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm which java'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.java/tasks/main.yml b/provisioning/roles/geerlingguy.java/tasks/main.yml
index fdb2d0eb6..c6719cbfd 100644
--- a/provisioning/roles/geerlingguy.java/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.java/tasks/main.yml
@@ -19,12 +19,15 @@
 # Setup/install tasks.
 - include: setup-RedHat.yml
   when: ansible_os_family == 'RedHat'
+  static: no
 
 - include: setup-Debian.yml
   when: ansible_os_family == 'Debian'
+  static: no
 
 - include: setup-FreeBSD.yml
   when: ansible_os_family == 'FreeBSD'
+  static: no
 
 # Environment setup.
 - name: Set JAVA_HOME if configured.
diff --git a/provisioning/roles/geerlingguy.java/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.java/tasks/setup-Debian.yml
index 205da4e8f..9ea60f7b7 100644
--- a/provisioning/roles/geerlingguy.java/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.java/tasks/setup-Debian.yml
@@ -1,6 +1,6 @@
 ---
 - name: Update apt cache.
-  apt: update_cache=yes cache_valid_time=3600
+  apt: update_cache=yes cache_valid_time=600
 
 - name: Ensure Java is installed.
   apt: "name={{ item }} state=present"
diff --git a/provisioning/roles/geerlingguy.java/tests/test.yml b/provisioning/roles/geerlingguy.java/tests/test.yml
index e5b6b77da..7744b497a 100644
--- a/provisioning/roles/geerlingguy.java/tests/test.yml
+++ b/provisioning/roles/geerlingguy.java/tests/test.yml
@@ -6,9 +6,5 @@
       apt: update_cache=yes
       when: ansible_os_family == 'Debian'
 
-    - name: Ensure build dependencies are installed (RedHat).
-      package: name=which state=present
-      when: ansible_os_family == 'RedHat'
-
   roles:
     - role_under_test
diff --git a/provisioning/roles/geerlingguy.mailhog/.travis.yml b/provisioning/roles/geerlingguy.mailhog/.travis.yml
index 135e0d568..60c6ae06e 100644
--- a/provisioning/roles/geerlingguy.mailhog/.travis.yml
+++ b/provisioning/roles/geerlingguy.mailhog/.travis.yml
@@ -1,67 +1,52 @@
 ---
-sudo: required
+services: docker
 
 env:
-  - distribution: centos
-    version: 6
-    init: /sbin/init
-    run_opts: ""
-  - distribution: centos
-    version: 7
+  - distro: centos7
     init: /usr/lib/systemd/systemd
     run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-  - distribution: ubuntu
-    version: 14.04
+  - distro: centos6
     init: /sbin/init
     run_opts: ""
-  - distribution: ubuntu
-    version: 12.04
+  - distro: ubuntu1604
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distro: ubuntu1404
     init: /sbin/init
     run_opts: ""
 
-services:
-  - docker
-
 before_install:
-  # Pull container
-  - 'sudo docker pull ${distribution}:${version}'
-  # Customize container
-  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+  # Pull container.
+  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
   - container_id=$(mktemp)
-  # Run container in detached state
-  - 'sudo docker run --detach -p 8025:8025 --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+  # Run container in detached state.
+  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
 
-  # Install required Galaxy roles.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-galaxy install geerlingguy.daemonize'
+  # Install dependencies.
+  - 'docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
 
   # Ansible syntax check.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
 
   # Test role.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+  - 'docker exec "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
 
   # Test role idempotence.
   - idempotence=$(mktemp)
-  - sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
+  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
   - >
     tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
     && (echo 'Idempotence test: pass' && exit 0)
     || (echo 'Idempotence test: fail' && exit 1)
 
-  # Make sure mailhog is listening on ports 1025 and 8025.
-  # TODO.
-
   # Send an email via mhsendmail.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm sh -c "cat /etc/ansible/roles/role_under_test/tests/message | /opt/mailhog/mhsendmail johndoe@example.com"'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm sh -c "cat /etc/ansible/roles/role_under_test/tests/message | /opt/mailhog/mhsendmail johndoe@example.com"'
 
   # Test retrieving messages via MailHog API.
-  - 'curl http://localhost:8025/api/v2/messages | grep id'
-
-  # Clean up
-  - 'sudo docker stop "$(cat ${container_id})"'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm sh -c "curl http://localhost:8025/api/v2/messages | grep id"'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.mailhog/README.md b/provisioning/roles/geerlingguy.mailhog/README.md
index 9fac45635..521ad3527 100644
--- a/provisioning/roles/geerlingguy.mailhog/README.md
+++ b/provisioning/roles/geerlingguy.mailhog/README.md
@@ -52,4 +52,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.mailhog/tasks/main.yml b/provisioning/roles/geerlingguy.mailhog/tasks/main.yml
index 3ee62d118..5ee14831a 100644
--- a/provisioning/roles/geerlingguy.mailhog/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.mailhog/tasks/main.yml
@@ -29,5 +29,18 @@
     group: root
     mode: 0755
 
+- name: Copy mailhog systemd unit file into place (for systemd systems).
+  template:
+    src: mailhog.unit.j2
+    dest: /etc/systemd/system/mailhog.service
+    owner: root
+    group: root
+    mode: 0755
+  when: >
+    (ansible_distribution == 'Ubuntu' and ansible_distribution_version == '16.04') or
+    (ansible_distribution == 'Debian' and ansible_distribution_version|int >= 8) or
+    (ansible_distribution == 'CentOS' and ansible_distribution_version|int >= 7) or
+    (ansible_distribution == 'Fedora')
+
 - name: Ensure mailhog is enabled and will start on boot.
   service: name=mailhog state=started enabled=yes
diff --git a/provisioning/roles/geerlingguy.mailhog/templates/mailhog.unit.j2 b/provisioning/roles/geerlingguy.mailhog/templates/mailhog.unit.j2
new file mode 100644
index 000000000..10f3b1f74
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mailhog/templates/mailhog.unit.j2
@@ -0,0 +1,12 @@
+[Unit]
+Description=MailHog Email Catcher
+After=syslog.target network.target
+
+[Service]
+Type=simple
+ExecStart={{ mailhog_install_dir }}/mailhog
+StandardOutput=journal
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
diff --git a/provisioning/roles/geerlingguy.mailhog/tests/Dockerfile.centos-6 b/provisioning/roles/geerlingguy.mailhog/tests/Dockerfile.centos-6
deleted file mode 100644
index 4a4e7b8d6..000000000
--- a/provisioning/roles/geerlingguy.mailhog/tests/Dockerfile.centos-6
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM centos:6
-
-# Install Ansible
-RUN yum -y update; yum clean all;
-RUN yum -y install epel-release
-RUN yum -y install git ansible sudo
-RUN yum clean all
-
-# Disable requiretty
-RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
-
-# Install Ansible inventory file
-RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
-
-CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.mailhog/tests/Dockerfile.centos-7 b/provisioning/roles/geerlingguy.mailhog/tests/Dockerfile.centos-7
deleted file mode 100644
index 8aa065497..000000000
--- a/provisioning/roles/geerlingguy.mailhog/tests/Dockerfile.centos-7
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM centos:7
-
-# Install systemd -- See https://hub.docker.com/_/centos/
-RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
-RUN yum -y update; yum clean all; \
-(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
-rm -f /lib/systemd/system/multi-user.target.wants/*; \
-rm -f /etc/systemd/system/*.wants/*; \
-rm -f /lib/systemd/system/local-fs.target.wants/*; \
-rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
-rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
-rm -f /lib/systemd/system/basic.target.wants/*; \
-rm -f /lib/systemd/system/anaconda.target.wants/*;
-
-# Install Ansible
-RUN yum -y install epel-release
-RUN yum -y install git ansible sudo
-RUN yum clean all
-
-# Disable requiretty
-RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
-
-# Install Ansible inventory file
-RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
-
-VOLUME ["/sys/fs/cgroup"]
-CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.mailhog/tests/Dockerfile.ubuntu-12.04 b/provisioning/roles/geerlingguy.mailhog/tests/Dockerfile.ubuntu-12.04
deleted file mode 100644
index d0c130cdf..000000000
--- a/provisioning/roles/geerlingguy.mailhog/tests/Dockerfile.ubuntu-12.04
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM ubuntu:12.04
-RUN apt-get update
-
-# Install Ansible
-RUN apt-get install -y software-properties-common python-software-properties git
-RUN apt-add-repository -y ppa:ansible/ansible
-RUN apt-get update
-RUN apt-get install -y ansible
-
-# Install Ansible inventory file
-RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.mailhog/tests/Dockerfile.ubuntu-14.04 b/provisioning/roles/geerlingguy.mailhog/tests/Dockerfile.ubuntu-14.04
deleted file mode 100644
index ca332871f..000000000
--- a/provisioning/roles/geerlingguy.mailhog/tests/Dockerfile.ubuntu-14.04
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM ubuntu:14.04
-RUN apt-get update
-
-# Install Ansible
-RUN apt-get install -y software-properties-common git
-RUN apt-add-repository -y ppa:ansible/ansible
-RUN apt-get update
-RUN apt-get install -y ansible
-
-# Install Ansible inventory file
-RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.mailhog/tests/requirements.yml b/provisioning/roles/geerlingguy.mailhog/tests/requirements.yml
new file mode 100644
index 000000000..96fb8e39b
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mailhog/tests/requirements.yml
@@ -0,0 +1,2 @@
+---
+- src: geerlingguy.daemonize
diff --git a/provisioning/roles/geerlingguy.mailhog/tests/test.yml b/provisioning/roles/geerlingguy.mailhog/tests/test.yml
index 3fd4e5d05..1d0fda341 100644
--- a/provisioning/roles/geerlingguy.mailhog/tests/test.yml
+++ b/provisioning/roles/geerlingguy.mailhog/tests/test.yml
@@ -1,25 +1,28 @@
 - hosts: all
 
   pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=yes
+      when: ansible_os_family == 'Debian'
+
     - name: Ensure build dependencies are installed (RedHat).
-      yum: 'name="{{ item }}" state=present'
+      package: 'name="{{ item }}" state=present'
       with_items:
         - "@Development tools"
         - tar
         - unzip
-        - sudo
-        - which
         - net-tools
+        - curl
       when: ansible_os_family == 'RedHat'
 
     - name: Ensure build dependencies are installed (Debian).
       apt: 'name="{{ item }}" state=installed'
       with_items:
         - build-essential
-        - unzip
         - tar
-        - sudo
+        - unzip
         - net-tools
+        - curl
       when: ansible_os_family == 'Debian'
 
   roles:
diff --git a/provisioning/roles/geerlingguy.postgresql/tasks/main.yml b/provisioning/roles/geerlingguy.postgresql/tasks/main.yml
index 0a7bef121..3e5111478 100644
--- a/provisioning/roles/geerlingguy.postgresql/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.postgresql/tasks/main.yml
@@ -1,13 +1,16 @@
 ---
 # Variable configuration.
 - include: variables.yml
+  static: no
 
 # Setup/install tasks.
 - include: setup-RedHat.yml
   when: ansible_os_family == 'RedHat'
+  static: no
 
 - include: setup-Debian.yml
   when: ansible_os_family == 'Debian'
+  static: no
 
 - include: initialize.yml
 - include: configure.yml

From 296e2b3f34fb171709a8389d523235b88d7ea7fb Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 2 Nov 2016 15:47:02 -0500
Subject: [PATCH 0459/1273] Fixes #962: Allow configuration of PHP's
 disable_functions.

---
 provisioning/requirements.yml                           | 2 +-
 provisioning/roles/geerlingguy.php/README.md            | 1 +
 provisioning/roles/geerlingguy.php/defaults/main.yml    | 1 +
 provisioning/roles/geerlingguy.php/templates/php.ini.j2 | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 395190af6..f9cc51193 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -38,7 +38,7 @@
 - src: geerlingguy.nodejs
   version: 3.3.0
 - src: geerlingguy.php
-  version: 3.3.2
+  version: 3.3.3
 - src: geerlingguy.php-memcached
   version: 2.0.0
 - src: geerlingguy.php-mysql
diff --git a/provisioning/roles/geerlingguy.php/README.md b/provisioning/roles/geerlingguy.php/README.md
index ad49ecb19..133a11169 100644
--- a/provisioning/roles/geerlingguy.php/README.md
+++ b/provisioning/roles/geerlingguy.php/README.md
@@ -89,6 +89,7 @@ By default, all the extra defaults below are applied through the php.ini include
     php_session_gc_maxlifetime: 1440
     php_session_save_handler: files
     php_session_save_path: ''
+    php_disable_functions: []
 
 Various defaults for PHP. Only used if `php_use_managed_ini` is set to `true`.
 
diff --git a/provisioning/roles/geerlingguy.php/defaults/main.yml b/provisioning/roles/geerlingguy.php/defaults/main.yml
index e06ca3c3f..c9a47d4c8 100644
--- a/provisioning/roles/geerlingguy.php/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.php/defaults/main.yml
@@ -61,6 +61,7 @@ php_allow_url_fopen: "On"
 php_sendmail_path: "/usr/sbin/sendmail -t -i"
 php_output_buffering: "4096"
 php_short_open_tag: false
+php_disable_functions: []
 
 php_session_cookie_lifetime: 0
 php_session_gc_probability: 1
diff --git a/provisioning/roles/geerlingguy.php/templates/php.ini.j2 b/provisioning/roles/geerlingguy.php/templates/php.ini.j2
index d6ad9df97..2ab925df2 100644
--- a/provisioning/roles/geerlingguy.php/templates/php.ini.j2
+++ b/provisioning/roles/geerlingguy.php/templates/php.ini.j2
@@ -15,7 +15,7 @@ zlib.output_compression = Off
 implicit_flush = Off
 unserialize_callback_func =
 serialize_precision = 17
-disable_functions =
+disable_functions = {{ php_disable_functions|join(",") }}
 disable_classes =
 
 zend.enable_gc = On

From 6dcc9f2800ac09405450a2c2df420b68768ab52d Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 2 Nov 2016 15:55:17 -0500
Subject: [PATCH 0460/1273] Fixes #956: Task: ensure Apache is installed fails.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.apache/.travis.yml      | 66 +++++++------------
 .../roles/geerlingguy.apache/README.md        |  2 +-
 .../roles/geerlingguy.apache/tasks/main.yml   | 26 ++------
 4 files changed, 30 insertions(+), 66 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index f9cc51193..b98cd3516 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -6,7 +6,7 @@
 - src: geerlingguy.adminer
   version: 1.1.0
 - src: geerlingguy.apache
-  version: 1.7.3
+  version: 1.7.4
 - src: geerlingguy.apache-php-fpm
   version: 1.0.2
 - src: geerlingguy.blackfire
diff --git a/provisioning/roles/geerlingguy.apache/.travis.yml b/provisioning/roles/geerlingguy.apache/.travis.yml
index 3792fd2fd..eea0fbae7 100644
--- a/provisioning/roles/geerlingguy.apache/.travis.yml
+++ b/provisioning/roles/geerlingguy.apache/.travis.yml
@@ -1,64 +1,46 @@
 ---
-sudo: required
+services: docker
 
 env:
-  global:
-    # https://github.com/travis-ci/travis-ci/issues/6461#issuecomment-239577306
-    DOCKER_VERSION: "1.9.1-0~trusty"
-  matrix:
-    - repository: geerlingguy/docker-centos7-ansible
-      version: latest
-      init: /usr/lib/systemd/systemd
-      run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-    - repository: geerlingguy/docker-centos6-ansible
-      version: latest
-      init: /sbin/init
-      run_opts: ""
-    - repository: geerlingguy/docker-ubuntu1604-ansible
-      version: latest
-      init: /lib/systemd/systemd
-      run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-    - repository: geerlingguy/docker-ubuntu1404-ansible
-      version: latest
-      init: /sbin/init
-      run_opts: ""
-    - repository: geerlingguy/docker-ubuntu1204-ansible
-      version: latest
-      init: /sbin/init
-      run_opts: ""
-
-services:
-  - docker
+  - distro: centos7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distro: centos6
+    init: /sbin/init
+    run_opts: ""
+  - distro: ubuntu1604
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distro: ubuntu1404
+    init: /sbin/init
+    run_opts: ""
+  - distro: ubuntu1204
+    init: /sbin/init
+    run_opts: ""
 
 before_install:
-  # Downgrade to specific version of Docker engine.
-  - sudo apt-get update
-  - sudo apt-get remove docker-engine -yq
-  - sudo apt-get install docker-engine=$DOCKER_VERSION -yq --no-install-suggests --no-install-recommends --force-yes -o Dpkg::Options::="--force-confnew"
-
   # Pull container.
-  - 'sudo docker pull ${repository}:${version}'
+  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
   - container_id=$(mktemp)
-    # Run container in detached state.
-  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${repository}:${version} "${init}" > "${container_id}"'
+  # Run container in detached state.
+  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
 
   # Ansible syntax check.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
 
   # Test role.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+  - 'docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
 
   # Test role idempotence.
+  - idempotence=$(mktemp)
+  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
   - >
-    sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml
+    tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
     && (echo 'Idempotence test: pass' && exit 0)
     || (echo 'Idempotence test: fail' && exit 1)
 
-  # Clean up
-  - 'sudo docker stop "$(cat ${container_id})"'
-
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.apache/README.md b/provisioning/roles/geerlingguy.apache/README.md
index 100614d0d..9e54bf6d3 100644
--- a/provisioning/roles/geerlingguy.apache/README.md
+++ b/provisioning/roles/geerlingguy.apache/README.md
@@ -121,4 +121,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.apache/tasks/main.yml b/provisioning/roles/geerlingguy.apache/tasks/main.yml
index 0715fc2bc..e013f392c 100644
--- a/provisioning/roles/geerlingguy.apache/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.apache/tasks/main.yml
@@ -9,17 +9,8 @@
   when: apache_packages is not defined
 
 # Setup/install tasks.
-- include: setup-RedHat.yml
-  when: ansible_os_family == 'RedHat'
-
-- include: setup-Suse.yml
-  when: ansible_os_family == 'Suse'
-
-- include: setup-Debian.yml
-  when: ansible_os_family == 'Debian'
-
-- include: setup-Solaris.yml
-  when: ansible_os_family == 'Solaris'
+- include: "setup-{{ ansible_os_family }}.yml"
+  static: no
 
 # Figure out what version of Apache is installed.
 - name: Get installed version of Apache.
@@ -39,17 +30,8 @@
   when: "apache_version.split('.')[1] == '4'"
 
 # Configure Apache.
-- include: configure-RedHat.yml
-  when: ansible_os_family == 'RedHat'
-
-- include: configure-Suse.yml
-  when: ansible_os_family == 'Suse'
-
-- include: configure-Debian.yml
-  when: ansible_os_family == 'Debian'
-
-- include: configure-Solaris.yml
-  when: ansible_os_family == 'Solaris'
+- include: "configure-{{ ansible_os_family }}.yml"
+  static: no
 
 - name: Ensure Apache has selected state and enabled on boot.
   service:

From e3dcbf4d0ab594c5e9a0b1eca136639260412d7d Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 2 Nov 2016 16:06:23 -0500
Subject: [PATCH 0461/1273] Fixes #963: Bump required Vagrant version.

---
 README.md          | 2 +-
 default.config.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 99905d1cb..544294cf7 100644
--- a/README.md
+++ b/README.md
@@ -74,7 +74,7 @@ Notes:
 
   - **For faster provisioning** (macOS/Linux only): *[Install Ansible](http://docs.ansible.com/intro_installation.html) on your host machine, so Drupal VM can run the provisioning steps locally instead of inside the VM.*
   - **NFS on Linux**: *If NFS is not already installed on your host, you will need to install it to use the default NFS synced folder configuration. See guides for [Debian/Ubuntu](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-ubuntu-14-04), [Arch](https://wiki.archlinux.org/index.php/NFS#Installation), and [RHEL/CentOS](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-centos-6).*
-  - **Versions**: *Make sure you're running the latest releases of Vagrant, VirtualBox, and Ansible—as of February 2016, Drupal VM recommends: Vagrant 1.8.5, VirtualBox 5.1.x, and Ansible 2.1.x.*
+  - **Versions**: *Make sure you're running the latest releases of Vagrant, VirtualBox, and Ansible—as of February 2016, Drupal VM recommends: Vagrant 1.8.6, VirtualBox 5.1.8+, and Ansible 2.2.x*
 
 ### 2 - Build the Virtual Machine
 
diff --git a/default.config.yml b/default.config.yml
index 8efffdd8c..b896e570a 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -33,7 +33,7 @@ vagrant_memory: 2048
 vagrant_cpus: 1
 
 # Minimum required versions.
-drupalvm_vagrant_version_min: '1.8.5'
+drupalvm_vagrant_version_min: '1.8.6'
 drupalvm_ansible_version_min: '2.1'
 
 # Force use of ansible_local provisioner, even if Ansible is installed on host.

From ef417be698b8256f17d345cec7ed420cb3e0cba7 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 3 Nov 2016 23:30:59 -0500
Subject: [PATCH 0462/1273] Fixes #968: Ansible 2.2.0 and PostgreSQL provision
 leads to error.

---
 provisioning/requirements.yml                               | 2 +-
 provisioning/roles/geerlingguy.mysql/tasks/main.yml         | 2 ++
 .../roles/geerlingguy.mysql/tasks/secure-installation.yml   | 6 +++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index b98cd3516..6d7c50728 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -32,7 +32,7 @@
 - src: geerlingguy.memcached
   version: 1.0.7
 - src: geerlingguy.mysql
-  version: 2.4.0
+  version: 2.4.1
 - src: geerlingguy.nginx
   version: 1.9.5
 - src: geerlingguy.nodejs
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/main.yml b/provisioning/roles/geerlingguy.mysql/tasks/main.yml
index 6d3527796..f7d8ead1e 100644
--- a/provisioning/roles/geerlingguy.mysql/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.mysql/tasks/main.yml
@@ -5,9 +5,11 @@
 # Setup/install tasks.
 - include: setup-RedHat.yml
   when: ansible_os_family == 'RedHat'
+  static: no
 
 - include: setup-Debian.yml
   when: ansible_os_family == 'Debian'
+  static: no
 
 - name: Check if MySQL packages were installed.
   set_fact:
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/secure-installation.yml b/provisioning/roles/geerlingguy.mysql/tasks/secure-installation.yml
index db4a8edeb..fc079baac 100644
--- a/provisioning/roles/geerlingguy.mysql/tasks/secure-installation.yml
+++ b/provisioning/roles/geerlingguy.mysql/tasks/secure-installation.yml
@@ -23,7 +23,7 @@
   shell: >
     mysql -u root -NBe
     'ALTER USER "{{ mysql_root_username }}"@"{{ item }}" IDENTIFIED WITH mysql_native_password BY "{{ mysql_root_password }}";'
-  with_items: "{{ mysql_root_hosts.stdout_lines }}"
+  with_items: "{{ mysql_root_hosts.stdout_lines|default([]) }}"
   when: ((mysql_install_packages | bool) or mysql_root_password_update) and ('5.7.' in mysql_cli_version.stdout)
 
 # Set root password for MySQL < 5.7.x.
@@ -31,7 +31,7 @@
   shell: >
     mysql -u root -NBe
     'SET PASSWORD FOR "{{ mysql_root_username }}"@"{{ item }}" = PASSWORD("{{ mysql_root_password }}");'
-  with_items: "{{ mysql_root_hosts.stdout_lines }}"
+  with_items: "{{ mysql_root_hosts.stdout_lines|default([]) }}"
   when: ((mysql_install_packages | bool) or mysql_root_password_update) and ('5.7.' not in mysql_cli_version.stdout)
 
 # Has to be after the root password assignment, for idempotency.
@@ -54,7 +54,7 @@
      name: ""
      host: "{{ item }}"
      state: absent
-  with_items: "{{ mysql_anonymous_hosts.stdout_lines }}"
+  with_items: "{{ mysql_anonymous_hosts.stdout_lines|default([]) }}"
 
 - name: Remove MySQL test database.
   mysql_db: "name='test' state=absent"

From a702f930226ac00c87220528be977a2907faff44 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 5 Nov 2016 17:15:26 -0500
Subject: [PATCH 0463/1273] Update to latest version of Drush role for
 --prefer-dist.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.drush/.travis.yml       | 51 ++++++++++---------
 .../roles/geerlingguy.drush/README.md         |  2 +-
 .../roles/geerlingguy.drush/defaults/main.yml |  4 +-
 .../roles/geerlingguy.drush/meta/main.yml     |  2 +-
 .../roles/geerlingguy.drush/tests/inventory   |  1 -
 .../geerlingguy.drush/tests/requirements.yml  |  5 ++
 .../roles/geerlingguy.drush/tests/test.yml    | 16 ++++--
 8 files changed, 48 insertions(+), 35 deletions(-)
 delete mode 100644 provisioning/roles/geerlingguy.drush/tests/inventory
 create mode 100644 provisioning/roles/geerlingguy.drush/tests/requirements.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 6d7c50728..3f0ccac6e 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -18,7 +18,7 @@
 - src: geerlingguy.drupal-console
   version: 1.0.7
 - src: geerlingguy.drush
-  version: 1.1.3
+  version: 1.1.4
 - src: geerlingguy.elasticsearch
   version: 2.1.1
 - src: geerlingguy.firewall
diff --git a/provisioning/roles/geerlingguy.drush/.travis.yml b/provisioning/roles/geerlingguy.drush/.travis.yml
index 7125a00a3..54494a6bf 100644
--- a/provisioning/roles/geerlingguy.drush/.travis.yml
+++ b/provisioning/roles/geerlingguy.drush/.travis.yml
@@ -1,42 +1,43 @@
 ---
-language: python
-python: "2.7"
+services: docker
 
 env:
-  - SITE=test.yml
+  - distro: centos7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distro: ubuntu1604
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
 
 before_install:
-  - sudo add-apt-repository ppa:ondrej/php5 -y
-  - sudo apt-get update -q
-  - sudo apt-get update -qq
-  - sudo apt-get install curl
+  # Pull container.
+  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
 
-install:
-  # Install Ansible.
-  - pip install ansible
-
-  # Add ansible.cfg to pick up roles path.
-  - "{ echo '[defaults]'; echo 'roles_path = ../'; } >> ansible.cfg"
+script:
+  - container_id=$(mktemp)
+  # Run container in detached state.
+  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
 
-  # Install required dependencies.
-  - ansible-galaxy install geerlingguy.php geerlingguy.composer geerlingguy.git
+  # Install dependencies.
+  - 'docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
 
-script:
-  # Check the role/playbook's syntax.
-  - "ansible-playbook -i tests/inventory tests/$SITE --syntax-check"
+  # Ansible syntax check.
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
 
-  # Run the role/playbook with ansible-playbook.
-  - "ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo"
+  # Test role.
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
 
-  # Run the role/playbook again, checking to make sure it's idempotent.
+  # Test role idempotence.
+  - idempotence=$(mktemp)
+  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
   - >
-    ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo
+    tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
     && (echo 'Idempotence test: pass' && exit 0)
     || (echo 'Idempotence test: fail' && exit 1)
 
-  # Check if drush is installed and working.
-  - drush --version
+  # Test Drush.
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm drush --version || true'
 
 notifications:
-   webhooks: https://galaxy.ansible.com/api/v1/notifications/
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.drush/README.md b/provisioning/roles/geerlingguy.drush/README.md
index 6e8dc8883..32422a140 100644
--- a/provisioning/roles/geerlingguy.drush/README.md
+++ b/provisioning/roles/geerlingguy.drush/README.md
@@ -53,4 +53,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.drush/defaults/main.yml b/provisioning/roles/geerlingguy.drush/defaults/main.yml
index eff2827a0..cd42d280b 100644
--- a/provisioning/roles/geerlingguy.drush/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.drush/defaults/main.yml
@@ -5,6 +5,4 @@ drush_version: "master"
 drush_keep_updated: no
 drush_force_update: no
 
-# These options are the safest for avoiding GitHub API rate limits, but builds
-# can be sped up substantially by changing to --prefer-dist.
-drush_composer_cli_options: "--prefer-source --no-interaction"
+drush_composer_cli_options: "--prefer-dist --no-interaction"
diff --git a/provisioning/roles/geerlingguy.drush/meta/main.yml b/provisioning/roles/geerlingguy.drush/meta/main.yml
index 0e0d58174..a57ca5311 100644
--- a/provisioning/roles/geerlingguy.drush/meta/main.yml
+++ b/provisioning/roles/geerlingguy.drush/meta/main.yml
@@ -9,7 +9,7 @@ galaxy_info:
   description: Drush - command line shell for Drupal
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 1.4
+  min_ansible_version: 1.8
   platforms:
     - name: EL
       versions:
diff --git a/provisioning/roles/geerlingguy.drush/tests/inventory b/provisioning/roles/geerlingguy.drush/tests/inventory
deleted file mode 100644
index 2fbb50c4a..000000000
--- a/provisioning/roles/geerlingguy.drush/tests/inventory
+++ /dev/null
@@ -1 +0,0 @@
-localhost
diff --git a/provisioning/roles/geerlingguy.drush/tests/requirements.yml b/provisioning/roles/geerlingguy.drush/tests/requirements.yml
new file mode 100644
index 000000000..521a77ebf
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drush/tests/requirements.yml
@@ -0,0 +1,5 @@
+---
+- src: geerlingguy.repo-remi
+- src: geerlingguy.php
+- src: geerlingguy.composer
+- src: geerlingguy.git
diff --git a/provisioning/roles/geerlingguy.drush/tests/test.yml b/provisioning/roles/geerlingguy.drush/tests/test.yml
index da27b634a..6e246260a 100644
--- a/provisioning/roles/geerlingguy.drush/tests/test.yml
+++ b/provisioning/roles/geerlingguy.drush/tests/test.yml
@@ -1,13 +1,23 @@
 ---
-- hosts: localhost
-  remote_user: root
+- hosts: all
 
   vars:
     php_enable_webserver: false
     php_opcache_enable: "0"
 
+  pre_tasks:
+    - name: Enable remi repo for PHP 7.0 (RedHat).
+      set_fact: php_enablerepo="remi,remi-php70"
+      when: ansible_os_family == 'RedHat'
+
+    - name: Update apt cache.
+      apt: update_cache=yes
+      when: ansible_os_family == 'Debian'
+
   roles:
+    - role: geerlingguy.repo-remi
+      when: ansible_os_family == 'RedHat'
     - geerlingguy.php
     - geerlingguy.composer
     - geerlingguy.git
-    - ansible-role-drush
+    - role_under_test

From e7f01690dc70322797c9eb5cee5959ed0b154f62 Mon Sep 17 00:00:00 2001
From: Thom Toogood <thomtoogood@gmail.com>
Date: Mon, 7 Nov 2016 20:19:30 +1100
Subject: [PATCH 0464/1273] Remove deprecated PPA ondrej/php5.

---
 provisioning/tasks/init-debian.yml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/provisioning/tasks/init-debian.yml b/provisioning/tasks/init-debian.yml
index b30c1c71c..83d84bb54 100644
--- a/provisioning/tasks/init-debian.yml
+++ b/provisioning/tasks/init-debian.yml
@@ -20,14 +20,10 @@
   apt_repository: repo='ppa:ondrej/apache2'
   when: ansible_distribution_release == "precise" and ansible_distribution == "Ubuntu"
 
-- name: Add repository for PHP 5.5.
-  apt_repository: repo='ppa:ondrej/php5'
-  when: php_version == "5.5" and ansible_distribution == "Ubuntu" and ansible_distribution_version == "12.04"
-
-- name: Add repository for PHP 5.6 or 7.0.
+- name: Add repository for PHP 5.5, 5.6 or 7.0.
   apt_repository: repo='ppa:ondrej/php'
   when: >
-    (php_version == "5.6" or php_version == "7.0") and
+    (php_version == "5.5" or php_version == "5.6" or php_version == "7.0") and
     ansible_distribution == "Ubuntu" and
     ansible_distribution_version != "16.04"
 

From 7678931ae0646c322f42c4fc9f30f8de6cfd6fe2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Mon, 7 Nov 2016 11:35:02 -0500
Subject: [PATCH 0465/1273] Issue #912: Fix Vagrant 1.8.6 failing to mount
 synced folders with empty mount_options

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

diff --git a/Vagrantfile b/Vagrantfile
index b1ef7e722..0382b5ceb 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -108,7 +108,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       rsync__args: ['--verbose', '--archive', '--delete', '-z', '--chmod=ugo=rwX'],
       id: synced_folder['id'],
       create: synced_folder.include?('create') ? synced_folder['create'] : false,
-      mount_options: synced_folder.include?('mount_options') ? synced_folder['mount_options'] : nil
+      mount_options: synced_folder.include?('mount_options') ? synced_folder['mount_options'] : []
     }
     if synced_folder.include?('options_override')
       options = options.merge(synced_folder['options_override'])

From f5cbc5340a5312bb3f1d08066b0461a0ef70df6b Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 7 Nov 2016 13:48:24 -0600
Subject: [PATCH 0466/1273] Update to latest version of PHP-PECL role.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.php-pecl/.travis.yml    | 45 ++++++++++---------
 .../roles/geerlingguy.php-pecl/README.md      |  6 ++-
 .../geerlingguy.php-pecl/defaults/main.yml    |  2 +
 .../roles/geerlingguy.php-pecl/tasks/main.yml |  2 +-
 .../geerlingguy.php-pecl/tests/inventory      |  1 -
 .../tests/requirements.yml                    |  3 ++
 .../roles/geerlingguy.php-pecl/tests/test.yml | 17 +++++--
 8 files changed, 50 insertions(+), 28 deletions(-)
 delete mode 100644 provisioning/roles/geerlingguy.php-pecl/tests/inventory
 create mode 100644 provisioning/roles/geerlingguy.php-pecl/tests/requirements.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 3f0ccac6e..50b83a8d4 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -44,7 +44,7 @@
 - src: geerlingguy.php-mysql
   version: 2.0.1
 - src: geerlingguy.php-pecl
-  version: 1.2.1
+  version: 1.3.0
 - src: geerlingguy.php-pgsql
   version: 1.0.0
 - src: geerlingguy.php-redis
diff --git a/provisioning/roles/geerlingguy.php-pecl/.travis.yml b/provisioning/roles/geerlingguy.php-pecl/.travis.yml
index e0a3f7cc7..52e85f65b 100644
--- a/provisioning/roles/geerlingguy.php-pecl/.travis.yml
+++ b/provisioning/roles/geerlingguy.php-pecl/.travis.yml
@@ -1,41 +1,44 @@
 ---
-sudo: required
-language: python
-python: "2.7"
+services: docker
 
 env:
-  - SITE=test.yml
+  - distro: centos7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distro: ubuntu1604
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
 
 before_install:
-  - sudo apt-get update -qq
+  # Pull container.
+  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
 
-install:
-  # Install Ansible.
-  - pip install ansible
-
-  # Add ansible.cfg to pick up roles path.
-  - "{ echo '[defaults]'; echo 'roles_path = ../'; } >> ansible.cfg"
+script:
+  - container_id=$(mktemp)
+  # Run container in detached state.
+  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
 
-  # Install required dependencies.
-  - ansible-galaxy install geerlingguy.php
+  # Install dependencies.
+  - 'docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
 
-script:
-  # Check the role/playbook's syntax.
-  - "ansible-playbook -i tests/inventory tests/$SITE --syntax-check"
+  # Ansible syntax check.
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
 
-  # Run the role/playbook with ansible-playbook.
-  - "ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo"
+  # Test role.
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
 
-  # Run the role/playbook again, checking to make sure it's idempotent.
+  # Test role idempotence.
+  - idempotence=$(mktemp)
+  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
   - >
-    ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo
+    tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
     && (echo 'Idempotence test: pass' && exit 0)
     || (echo 'Idempotence test: fail' && exit 1)
 
   # Make sure Pecl is installed.
   - >
-    which pecl
+    sudo docker exec "$(cat ${container_id})" which pecl
     && (echo 'Pecl is installed' && exit 0)
     || (echo 'Pecl is not installed' && exit 1)
 
diff --git a/provisioning/roles/geerlingguy.php-pecl/README.md b/provisioning/roles/geerlingguy.php-pecl/README.md
index cf642b1ca..0f8d69beb 100644
--- a/provisioning/roles/geerlingguy.php-pecl/README.md
+++ b/provisioning/roles/geerlingguy.php-pecl/README.md
@@ -12,6 +12,10 @@ PHP must already be installed on the server (along with the package `php-pear`),
 
 Available variables are listed below, along with default values (see `defaults/main.yml`):
 
+    php_pecl_install_command: "pecl install"
+
+The command that will be run to install extensions. The default is generally correct, but if you're running Ubuntu 14.04 LTS and run into [this issue](https://github.com/geerlingguy/ansible-role-php-pecl/pull/7), you should override this default with `"pecl install -Z"`
+
     php_pecl_extensions: []
 
 A list of extensions that should be installed via `pecl install`. If you'd like to have this role install extensions like XDebug, just add it in the list, like so:
@@ -42,4 +46,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.php-pecl/defaults/main.yml b/provisioning/roles/geerlingguy.php-pecl/defaults/main.yml
index 397c65753..90f29e0b1 100644
--- a/provisioning/roles/geerlingguy.php-pecl/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.php-pecl/defaults/main.yml
@@ -1,4 +1,6 @@
 ---
+php_pecl_install_command: "pecl install"
+
 # Add extensions to this list to have them installed with this role.
 php_pecl_extensions: []
   # - xdebug
diff --git a/provisioning/roles/geerlingguy.php-pecl/tasks/main.yml b/provisioning/roles/geerlingguy.php-pecl/tasks/main.yml
index 840b61e70..44577c142 100644
--- a/provisioning/roles/geerlingguy.php-pecl/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php-pecl/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: Install PECL libaries.
-  shell: "yes \"\" | pecl install {{ item }}"
+  shell: "yes \"\" | {{ php_pecl_install_command }} {{ item }}"
   register: pecl_result
   changed_when: "pecl_result.rc == 0"
   failed_when: "not (('already installed' in pecl_result.stdout) or ('install ok:' in pecl_result.stdout))"
diff --git a/provisioning/roles/geerlingguy.php-pecl/tests/inventory b/provisioning/roles/geerlingguy.php-pecl/tests/inventory
deleted file mode 100644
index 2fbb50c4a..000000000
--- a/provisioning/roles/geerlingguy.php-pecl/tests/inventory
+++ /dev/null
@@ -1 +0,0 @@
-localhost
diff --git a/provisioning/roles/geerlingguy.php-pecl/tests/requirements.yml b/provisioning/roles/geerlingguy.php-pecl/tests/requirements.yml
new file mode 100644
index 000000000..80e765f13
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-pecl/tests/requirements.yml
@@ -0,0 +1,3 @@
+---
+- src: geerlingguy.repo-remi
+- src: geerlingguy.php
diff --git a/provisioning/roles/geerlingguy.php-pecl/tests/test.yml b/provisioning/roles/geerlingguy.php-pecl/tests/test.yml
index a1369f2e5..f5256d43f 100644
--- a/provisioning/roles/geerlingguy.php-pecl/tests/test.yml
+++ b/provisioning/roles/geerlingguy.php-pecl/tests/test.yml
@@ -1,6 +1,17 @@
 ---
-- hosts: localhost
-  remote_user: root
+- hosts: all
+
+  vars:
+    php_enable_webserver: false
+    php_enablerepo: "remi,remi-php70"
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=yes
+      when: ansible_os_family == 'Debian'
+
   roles:
+    - role: geerlingguy.repo-remi
+      when: ansible_os_family == 'RedHat'
     - geerlingguy.php
-    - ansible-role-php-pecl
+    - role_under_test
\ No newline at end of file

From 6eb30fc3c4e901e72ac2ea0fdfd6cb5e548c3f2d Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 9 Nov 2016 09:23:23 -0600
Subject: [PATCH 0467/1273] Fixes #980: CentOS install for firewall and mailhog
 fixed.

---
 provisioning/requirements.yml                          | 4 ++--
 provisioning/roles/geerlingguy.firewall/tasks/main.yml | 6 +++---
 provisioning/roles/geerlingguy.firewall/tests/test.yml | 2 +-
 provisioning/roles/geerlingguy.mailhog/tasks/main.yml  | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 50b83a8d4..4c4c61c2f 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -22,13 +22,13 @@
 - src: geerlingguy.elasticsearch
   version: 2.1.1
 - src: geerlingguy.firewall
-  version: 1.3.0
+  version: 1.3.1
 - src: geerlingguy.git
   version: 1.2.0
 - src: geerlingguy.java
   version: 1.7.1
 - src: geerlingguy.mailhog
-  version: 2.1.0
+  version: 2.1.1
 - src: geerlingguy.memcached
   version: 1.0.7
 - src: geerlingguy.mysql
diff --git a/provisioning/roles/geerlingguy.firewall/tasks/main.yml b/provisioning/roles/geerlingguy.firewall/tasks/main.yml
index 5650b8518..ee54ea13c 100644
--- a/provisioning/roles/geerlingguy.firewall/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.firewall/tasks/main.yml
@@ -32,9 +32,9 @@
     group: root
     mode: 0755
   when: >
-    (ansible_distribution == 'Ubuntu' and ansible_distribution_version == '16.04') or
-    (ansible_distribution == 'Debian' and ansible_distribution_version|int >= 8) or
-    (ansible_distribution == 'CentOS' and ansible_distribution_version|int >= 7) or
+    (ansible_distribution == 'Ubuntu' and ansible_distribution_version.split(".")[0]|int >= 16) or
+    (ansible_distribution == 'Debian' and ansible_distribution_version.split(".")[0]|int >= 8) or
+    (ansible_distribution == 'CentOS' and ansible_distribution_version.split(".")[0]|int >= 7) or
     (ansible_distribution == 'Fedora')
 
 - name: Ensure the firewall is enabled and will start on boot.
diff --git a/provisioning/roles/geerlingguy.firewall/tests/test.yml b/provisioning/roles/geerlingguy.firewall/tests/test.yml
index 505ba5fe1..0cd1de80f 100644
--- a/provisioning/roles/geerlingguy.firewall/tests/test.yml
+++ b/provisioning/roles/geerlingguy.firewall/tests/test.yml
@@ -7,7 +7,7 @@
 
   pre_tasks:
     - name: Update apt cache.
-      apt: update_cache=yes
+      apt: update_cache=yes cache_valid_time=1200
       when: ansible_os_family == 'Debian'
 
   roles:
diff --git a/provisioning/roles/geerlingguy.mailhog/tasks/main.yml b/provisioning/roles/geerlingguy.mailhog/tasks/main.yml
index 5ee14831a..68689f64c 100644
--- a/provisioning/roles/geerlingguy.mailhog/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.mailhog/tasks/main.yml
@@ -37,9 +37,9 @@
     group: root
     mode: 0755
   when: >
-    (ansible_distribution == 'Ubuntu' and ansible_distribution_version == '16.04') or
-    (ansible_distribution == 'Debian' and ansible_distribution_version|int >= 8) or
-    (ansible_distribution == 'CentOS' and ansible_distribution_version|int >= 7) or
+    (ansible_distribution == 'Ubuntu' and ansible_distribution_version.split(".")[0]|int >= 16) or
+    (ansible_distribution == 'Debian' and ansible_distribution_version.split(".")[0]|int >= 8) or
+    (ansible_distribution == 'CentOS' and ansible_distribution_version.split(".")[0]|int >= 7) or
     (ansible_distribution == 'Fedora')
 
 - name: Ensure mailhog is enabled and will start on boot.

From 44e030bea84030e4378b8bf78bead0541b778cbc Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 11 Nov 2016 10:10:00 -0600
Subject: [PATCH 0468/1273] Update PHP 5.6 docs to remove package that installs
 PHP 7.

---
 docs/other/php-56.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/other/php-56.md b/docs/other/php-56.md
index 7abd2d144..d89cf1825 100644
--- a/docs/other/php-56.md
+++ b/docs/other/php-56.md
@@ -25,7 +25,6 @@ php_packages:
   - php5.6-sqlite3
   - php5.6-xml
   - php5.6-mbstring
-  - php-pear
   - libpcre3-dev
 php_conf_paths:
   - /etc/php/5.6/fpm

From 88d54f675e3aabc24db08a620a5fe17f2d7a4d5e Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 11 Nov 2016 10:42:59 -0600
Subject: [PATCH 0469/1273] Update Varnish role to latest version.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.varnish/.travis.yml     | 21 +++++++------------
 .../roles/geerlingguy.varnish/README.md       |  5 +++++
 .../geerlingguy.varnish/defaults/main.yml     |  5 ++++-
 .../roles/geerlingguy.varnish/meta/main.yml   |  2 +-
 .../roles/geerlingguy.varnish/tasks/main.yml  |  9 ++++++--
 .../tasks/setup-Debian.yml                    | 16 +++++++++++---
 .../tasks/setup-RedHat.yml                    | 16 ++------------
 .../roles/geerlingguy.varnish/tests/test.yml  |  7 +------
 9 files changed, 41 insertions(+), 42 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 4c4c61c2f..b499e0924 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -70,4 +70,4 @@
 - src: geerlingguy.solr
   version: 3.2.0
 - src: geerlingguy.varnish
-  version: 1.7.0
+  version: 1.8.0
diff --git a/provisioning/roles/geerlingguy.varnish/.travis.yml b/provisioning/roles/geerlingguy.varnish/.travis.yml
index 28beffa0b..874c63d5e 100644
--- a/provisioning/roles/geerlingguy.varnish/.travis.yml
+++ b/provisioning/roles/geerlingguy.varnish/.travis.yml
@@ -1,5 +1,5 @@
 ---
-sudo: required
+services: docker
 
 env:
   - distro: centos7
@@ -18,27 +18,24 @@ env:
     init: /lib/systemd/systemd
     run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
 
-services:
-  - docker
-
 before_install:
   # Pull container.
-  - 'sudo docker pull geerlingguy/docker-${distro}-ansible:latest'
+  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
   - container_id=$(mktemp)
   # Run container in detached state.
-  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
+  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
 
   # Ansible syntax check.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
 
   # Test role.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
 
   # Test role idempotence.
   - idempotence=$(mktemp)
-  - sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
+  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
   - >
     tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
@@ -46,11 +43,7 @@ script:
     || (echo 'Idempotence test: fail' && exit 1)
 
   # Make sure Varnish is running.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm varnishd -V'
-
-after_success:
-  # Clean up.
-  - 'sudo docker stop "$(cat ${container_id})"'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm varnishd -V'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.varnish/README.md b/provisioning/roles/geerlingguy.varnish/README.md
index afee01984..bd3cbf07e 100644
--- a/provisioning/roles/geerlingguy.varnish/README.md
+++ b/provisioning/roles/geerlingguy.varnish/README.md
@@ -62,6 +62,11 @@ How Varnish stores cache entries (this is passed in as the argument for `-s`). I
 
 Varnish PID file path. Set to an empty string if you don't want to use a PID file.
 
+    varnish_enabled_services:
+      - varnish
+
+Services that will be started at boot and should be running after this role is complete. You might need to add additional services if required, e.g. `varnishncsa` and `varnishlog`. If set to an empty array, no services will be enabled at startup.
+
 ## Dependencies
 
 None.
diff --git a/provisioning/roles/geerlingguy.varnish/defaults/main.yml b/provisioning/roles/geerlingguy.varnish/defaults/main.yml
index 0d48d1fc0..517d25246 100644
--- a/provisioning/roles/geerlingguy.varnish/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.varnish/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
 varnish_package_name: "varnish"
-varnish_version: "4.1"
+varnish_version: "5.0.0"
 
 varnish_use_default_vcl: true
 varnish_default_vcl_template_path: default.vcl.j2
@@ -18,3 +18,6 @@ varnish_admin_listen_port: "6082"
 
 varnish_storage: "file,/var/lib/varnish/varnish_storage.bin,256M"
 varnish_pidfile: /run/varnishd.pid
+
+varnish_enabled_services:
+  - varnish
diff --git a/provisioning/roles/geerlingguy.varnish/meta/main.yml b/provisioning/roles/geerlingguy.varnish/meta/main.yml
index c8ee42244..5c6976181 100644
--- a/provisioning/roles/geerlingguy.varnish/meta/main.yml
+++ b/provisioning/roles/geerlingguy.varnish/meta/main.yml
@@ -6,7 +6,7 @@ galaxy_info:
   description: Varnish for Linux.
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 2.0
+  min_ansible_version: 2.1
   platforms:
     - name: EL
       versions:
diff --git a/provisioning/roles/geerlingguy.varnish/tasks/main.yml b/provisioning/roles/geerlingguy.varnish/tasks/main.yml
index ffa76f313..cd3b921ce 100644
--- a/provisioning/roles/geerlingguy.varnish/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.varnish/tasks/main.yml
@@ -68,5 +68,10 @@
     mode: 0644
   notify: restart varnish
 
-- name: Ensure Varnish is started and set to run on startup.
-  service: name=varnish state=started enabled=yes
+- name: Ensure Varnish services are started enabled on startup.
+  service:
+    name: "{{ item }}"
+    state: started
+    enabled: yes
+  with_items: "{{ varnish_enabled_services | default([]) }}"
+  when: varnish_enabled_services
diff --git a/provisioning/roles/geerlingguy.varnish/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.varnish/tasks/setup-Debian.yml
index 51166e28f..be59e3a29 100644
--- a/provisioning/roles/geerlingguy.varnish/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.varnish/tasks/setup-Debian.yml
@@ -1,13 +1,23 @@
 ---
+- name: Ensure APT HTTPS Transport is installed.
+  apt:
+    name: apt-transport-https
+    state: installed
+  when: ansible_distribution_release != "xenial"
+
 - name: Add Varnish apt key.
-  apt_key: url=http://repo.varnish-cache.org/debian/GPG-key.txt state=present
+  apt_key:
+    url: https://repo.varnish-cache.org/GPG-key.txt
+    state: present
   when: ansible_distribution_release != "xenial"
 
 - name: Add Varnish apt repository.
   apt_repository:
-    repo: "deb http://repo.varnish-cache.org/{{ ansible_distribution | lower }}  {{ ansible_distribution_release }} varnish-{{ varnish_version }}"
+    repo: "deb https://repo.varnish-cache.org/{{ ansible_distribution | lower }}/ {{ ansible_distribution_release }} varnish-{{ varnish_version }}"
     state: present
   when: ansible_distribution_release != "xenial"
 
 - name: Install Varnish.
-  apt: name="{{ varnish_package_name }}" state=installed
+  apt:
+    name: "{{ varnish_package_name }}"
+    state: present
diff --git a/provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml
index 913f0aa7f..a420a814f 100644
--- a/provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml
@@ -6,19 +6,7 @@
     - libedit-devel
     - initscripts
 
-- name: Add Varnish repository.
+- name: Install Varnish from package.
   yum:
-    name: https://repo.varnish-cache.org/redhat/varnish-{{ varnish_version }}.el6.rpm
+    name: https://repo.varnish-cache.org/pkg/{{ varnish_version }}/varnish-{{ varnish_version }}-1.el{{ ansible_distribution_version.split(".")[0] }}.{{ ansible_architecture }}.rpm
     state: present
-  when: ansible_distribution_major_version|int < 7
-
-- name: Set repo fact appropriately.
-  set_fact:
-    varnish_yum_enablerepo: "{{ 'varnish-{{ varnish_version }},epel' if (ansible_distribution_major_version|int < 7) else 'epel' }}"
-
-- name: Install Varnish.
-  yum:
-    name: "{{ varnish_package_name }}"
-    state: installed
-    enablerepo: "{{ varnish_yum_enablerepo }}"
-    disablerepo: "*"
diff --git a/provisioning/roles/geerlingguy.varnish/tests/test.yml b/provisioning/roles/geerlingguy.varnish/tests/test.yml
index e73971d57..c6d3c049c 100644
--- a/provisioning/roles/geerlingguy.varnish/tests/test.yml
+++ b/provisioning/roles/geerlingguy.varnish/tests/test.yml
@@ -2,7 +2,7 @@
 
   pre_tasks:
     - name: Update apt cache.
-      apt: update_cache=yes
+      apt: update_cache=yes cache_valid_time=600
       when: ansible_os_family == 'Debian'
 
     - name: Ensure build dependencies are installed (RedHat 7+).
@@ -20,10 +20,5 @@
         - logrotate
       when: ansible_os_family == 'RedHat' and ansible_distribution_major_version < '7'
 
-    - name: Force working version of Varnish on Ubuntu 14.04.
-      set_fact:
-        varnish_version: "4.0"
-      when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '14.04'
-
   roles:
     - role_under_test

From d8aadd87e1c8885aa003b0799e999161ee41db2a Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 14 Nov 2016 09:23:25 -0600
Subject: [PATCH 0470/1273] Update MySQL role to latest version.

---
 provisioning/requirements.yml                              | 2 +-
 provisioning/roles/geerlingguy.mysql/tasks/replication.yml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index b499e0924..21d48e85e 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -32,7 +32,7 @@
 - src: geerlingguy.memcached
   version: 1.0.7
 - src: geerlingguy.mysql
-  version: 2.4.1
+  version: 2.4.2
 - src: geerlingguy.nginx
   version: 1.9.5
 - src: geerlingguy.nodejs
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/replication.yml b/provisioning/roles/geerlingguy.mysql/tasks/replication.yml
index ec56dfc29..2a163cc0e 100644
--- a/provisioning/roles/geerlingguy.mysql/tasks/replication.yml
+++ b/provisioning/roles/geerlingguy.mysql/tasks/replication.yml
@@ -24,7 +24,7 @@
   delegate_to: "{{ mysql_replication_master }}"
   register: master
   when: >
-    slave|failed
+    ((slave.Is_Slave is defined and not slave.Is_Slave) or (slave.Is_Slave is not defined and slave|failed))
     and (mysql_replication_role == 'slave')
     and (mysql_replication_master != '')
 
@@ -38,7 +38,7 @@
     master_log_pos: "{{ master.Position }}"
   ignore_errors: True
   when: >
-    slave|failed
+    ((slave.Is_Slave is defined and not slave.Is_Slave) or (slave.Is_Slave is not defined and slave|failed))
     and (mysql_replication_role == 'slave')
     and (mysql_replication_master != '')
     and mysql_replication_user
@@ -46,6 +46,6 @@
 - name: Start replication.
   mysql_replication: mode=startslave
   when: >
-    slave|failed
+    ((slave.Is_Slave is defined and not slave.Is_Slave) or (slave.Is_Slave is not defined and slave|failed))
     and (mysql_replication_role == 'slave')
     and (mysql_replication_master != '')

From 47d5ae2ef4488fd7db8f396c6ea8032829625089 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 14 Nov 2016 09:27:21 -0600
Subject: [PATCH 0471/1273] Update Solr role to latest version.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.solr/.travis.yml        | 21 +++++++------------
 provisioning/roles/geerlingguy.solr/README.md | 10 ++++-----
 .../roles/geerlingguy.solr/defaults/main.yml  |  2 +-
 .../templates/solr-init-Debian-pre5.j2        |  2 +-
 .../geerlingguy.solr/tests/test-solr-5.yml    |  2 +-
 6 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 21d48e85e..ee64042ac 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -68,6 +68,6 @@
 - src: geerlingguy.security
   version: 1.4.0
 - src: geerlingguy.solr
-  version: 3.2.0
+  version: 3.2.2
 - src: geerlingguy.varnish
   version: 1.8.0
diff --git a/provisioning/roles/geerlingguy.solr/.travis.yml b/provisioning/roles/geerlingguy.solr/.travis.yml
index 7f9309a0b..2f9504246 100644
--- a/provisioning/roles/geerlingguy.solr/.travis.yml
+++ b/provisioning/roles/geerlingguy.solr/.travis.yml
@@ -1,5 +1,5 @@
 ---
-sudo: required
+services: docker
 
 env:
   # Test current version of Solr on latest supported OSes.
@@ -34,30 +34,27 @@ env:
     run_opts: ""
     solr_major_version: 3
 
-services:
-  - docker
-
 before_install:
   # Pull container.
-  - 'sudo docker pull geerlingguy/docker-${distro}-ansible:latest'
+  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
   - container_id=$(mktemp)
   # Run container in detached state.
-  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
+  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
 
   # Install dependencies.
-  - 'sudo docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
+  - 'docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
 
   # Ansible syntax check.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test-solr-${solr_major_version}.yml --syntax-check'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test-solr-${solr_major_version}.yml --syntax-check'
 
   # Test role.
-  - 'sudo docker exec "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test-solr-${solr_major_version}.yml'
+  - 'docker exec "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test-solr-${solr_major_version}.yml'
 
   # Test role idempotence.
   - idempotence=$(mktemp)
-  - sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test-solr-${solr_major_version}.yml | tee -a ${idempotence}
+  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test-solr-${solr_major_version}.yml | tee -a ${idempotence}
   - >
     tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
@@ -70,9 +67,5 @@ script:
     && (echo 'solr is running: pass' && exit 0)
     || (echo 'solr is running: fail' && exit 1)
 
-after_success:
-  # Clean up.
-  - 'sudo docker stop "$(cat ${container_id})"'
-
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.solr/README.md b/provisioning/roles/geerlingguy.solr/README.md
index 8269222d5..e773b267f 100644
--- a/provisioning/roles/geerlingguy.solr/README.md
+++ b/provisioning/roles/geerlingguy.solr/README.md
@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/geerlingguy/ansible-role-solr.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-solr)
 
-An Ansible Role that installs Apache Solr on Linux servers.
+Installs [Apache Solr](http://lucene.apache.org/solr/) on Linux servers.
 
 ## Requirements
 
@@ -23,9 +23,9 @@ Files will be downloaded to this path on the remote server before being moved in
 
 Solr will be run under the `solr_user`. Set `solr_create_user` to `false` if `solr_user` is created before this role runs, or if you're using Solr 5+ and want Solr's own installation script to set up the user.
 
-    solr_version: "5.5.1"
+    solr_version: "6.2.0"
 
-The Apache Solr version to install.
+The Apache Solr version to install. For a full list, see [available Apache Solr versions](http://archive.apache.org/dist/lucene/solr/).
 
     solr_mirror: "https://archive.apache.org/dist"
 
@@ -74,8 +74,8 @@ None.
 
     - hosts: solr-servers
       roles:
-        - { role: geerlingguy.java }
-        - { role: geerlingguy.solr }
+        - geerlingguy.java
+        - geerlingguy.solr
 
 ## License
 
diff --git a/provisioning/roles/geerlingguy.solr/defaults/main.yml b/provisioning/roles/geerlingguy.solr/defaults/main.yml
index 6eaec97e3..fd6581cdc 100644
--- a/provisioning/roles/geerlingguy.solr/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.solr/defaults/main.yml
@@ -4,7 +4,7 @@ solr_workspace: /root
 solr_create_user: true
 solr_user: solr
 
-solr_version: "6.1.0"
+solr_version: "6.2.0"
 solr_mirror: "https://archive.apache.org/dist"
 
 solr_service_name: solr
diff --git a/provisioning/roles/geerlingguy.solr/templates/solr-init-Debian-pre5.j2 b/provisioning/roles/geerlingguy.solr/templates/solr-init-Debian-pre5.j2
index b4a4a8d4f..ff2704d5e 100644
--- a/provisioning/roles/geerlingguy.solr/templates/solr-init-Debian-pre5.j2
+++ b/provisioning/roles/geerlingguy.solr/templates/solr-init-Debian-pre5.j2
@@ -9,7 +9,7 @@
 # Adapted by Jeff Geerling from http://stackoverflow.com/a/8014720/100134
 
 ### BEGIN INIT INFO
-# Provides:             solr
+# Provides:             {{ solr_service_name }}
 # Required-Start:       $remote_fs $syslog
 # Required-Stop:        $remote_fs $syslog
 # Default-Start:        2 3 4 5
diff --git a/provisioning/roles/geerlingguy.solr/tests/test-solr-5.yml b/provisioning/roles/geerlingguy.solr/tests/test-solr-5.yml
index 9dcb9ee72..a29cf7ed8 100644
--- a/provisioning/roles/geerlingguy.solr/tests/test-solr-5.yml
+++ b/provisioning/roles/geerlingguy.solr/tests/test-solr-5.yml
@@ -2,7 +2,7 @@
 - hosts: all
 
   vars:
-    solr_version: "5.5.2"
+    solr_version: "5.5.3"
     java_packages:
       - openjdk-7-jdk
 

From 99d6efd667bb74c26f422a950cfbb30972ea898f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Tue, 15 Nov 2016 18:01:39 -0500
Subject: [PATCH 0472/1273] Cleanup docker exec commands

---
 .travis.yml | 43 ++++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3d3678300..8243392a3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,83 +44,84 @@ before_install:
   - 'gem install rubocop'
 
 script:
-  - container_id=$(mktemp)
-  # Run container in detached state
-  - 'docker run --detach --volume="${PWD}":${DRUPALVM_DIR}/:rw ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
+  # Run container in detached state and store the id.
+  - 'tmpfile=$(mktemp)'
+  - 'docker run --detach --volume="${PWD}":${DRUPALVM_DIR}/:rw ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${tmpfile}"'
+  - 'container_id=$(cat ${tmpfile})'
 
   # Set hostname.
-  - 'docker exec "$(cat ${container_id})" hostname ${HOSTNAME}'
+  - 'docker exec ${container_id} hostname ${HOSTNAME}'
 
   # Setup directories.
-  - 'docker exec "$(cat ${container_id})" mkdir -p ${DRUPALVM_DIR}/drupal'
+  - 'docker exec ${container_id} mkdir -p ${DRUPALVM_DIR}/drupal'
 
   # Setup config directory.
-  - '[[ ! -z "${config_dir}" ]] && docker exec "$(cat ${container_id})" mkdir -p ${config_dir} || true'
+  - '[[ ! -z "${config_dir}" ]] && docker exec ${container_id} mkdir -p ${config_dir} || true'
 
   # Copy configuration files into place.
-  - 'docker exec "$(cat ${container_id})" cp ${DRUPALVM_DIR}/${CONFIG} ${config_dir:-$DRUPALVM_DIR}/config.yml'
-  - 'docker exec "$(cat ${container_id})" cp ${DRUPALVM_DIR}/${MAKEFILE} ${config_dir:-$DRUPALVM_DIR}/drupal.make.yml'
-  - 'docker exec "$(cat ${container_id})" cp ${DRUPALVM_DIR}/${COMPOSERFILE} ${config_dir:-$DRUPALVM_DIR}/drupal.composer.json'
+  - 'docker exec ${container_id} cp ${DRUPALVM_DIR}/${CONFIG} ${config_dir:-$DRUPALVM_DIR}/config.yml'
+  - 'docker exec ${container_id} cp ${DRUPALVM_DIR}/${MAKEFILE} ${config_dir:-$DRUPALVM_DIR}/drupal.make.yml'
+  - 'docker exec ${container_id} cp ${DRUPALVM_DIR}/${COMPOSERFILE} ${config_dir:-$DRUPALVM_DIR}/drupal.composer.json'
 
   # Override configuration variables.
-  - '[[ ! -z "${local_config}" ]] && docker exec "$(cat ${container_id})" bash -c "cp ${DRUPALVM_DIR}/${local_config} ${config_dir:-$DRUPALVM_DIR}/local.config.yml" || true'
+  - '[[ ! -z "${local_config}" ]] && docker exec ${container_id} bash -c "cp ${DRUPALVM_DIR}/${local_config} ${config_dir:-$DRUPALVM_DIR}/local.config.yml" || true'
 
   # Vagrantfile syntax check.
   - 'rubocop ./Vagrantfile --except LineLength,Eval,MutableConstant,BlockLength'
 
   # Ansible syntax check.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook ${DRUPALVM_DIR}/provisioning/playbook.yml --syntax-check'
+  - 'docker exec --tty ${container_id} env TERM=xterm ansible-playbook ${DRUPALVM_DIR}/provisioning/playbook.yml --syntax-check'
 
   # Run the test setup playbook with ansible-playbook.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook ${DRUPALVM_DIR}/tests/test-setup.yml'
+  - 'docker exec --tty ${container_id} env TERM=xterm ansible-playbook ${DRUPALVM_DIR}/tests/test-setup.yml'
 
   # Run the playbook with ansible-playbook.
   - >
     if [ ! -z "${config_dir}" ]; then
-      docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook ${DRUPALVM_DIR}/provisioning/playbook.yml --extra-vars="config_dir=${config_dir}";
+      docker exec --tty ${container_id} env TERM=xterm ansible-playbook ${DRUPALVM_DIR}/provisioning/playbook.yml --extra-vars="config_dir=${config_dir}";
     else
-      docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook ${DRUPALVM_DIR}/provisioning/playbook.yml;
+      docker exec --tty ${container_id} env TERM=xterm ansible-playbook ${DRUPALVM_DIR}/provisioning/playbook.yml;
     fi
 
   # Run integration tests.
   - >
-    docker exec "$(cat ${container_id})" curl -s --header Host:${HOSTNAME} localhost
+    docker exec ${container_id} curl -s --header Host:${HOSTNAME} localhost
     | grep -q '<title>Welcome to Drupal'
     && (echo 'Drupal install pass' && exit 0)
     || (echo 'Drupal install fail' && exit 1)
 
   - >
-    docker exec "$(cat ${container_id})" curl -s --header Host:adminer.${HOSTNAME} localhost
+    docker exec ${container_id} curl -s --header Host:adminer.${HOSTNAME} localhost
     | grep -q '<title>Login - Adminer'
     && (echo 'Admin install pass' && exit 0)
     || (echo 'Adminer install fail' && exit 1)
 
   - >
-    docker exec "$(cat ${container_id})" curl -s --header Host:pimpmylog.${HOSTNAME} localhost
+    docker exec ${container_id} curl -s --header Host:pimpmylog.${HOSTNAME} localhost
     | grep -q '<title>Pimp my Log'
     && (echo 'Pimp my Log install pass' && exit 0)
     || (echo 'Pimp my Log install fail' && exit 1)
 
   - >
-    docker exec "$(cat ${container_id})" curl -s --header Host:xhprof.${HOSTNAME} localhost
+    docker exec ${container_id} curl -s --header Host:xhprof.${HOSTNAME} localhost
     | grep -q '<title>XHProf'
     && (echo 'XHProf install pass' && exit 0)
     || (echo 'XHProf install fail' && exit 1)
 
   - >
-    docker exec "$(cat ${container_id})" curl -s localhost:8025
+    docker exec ${container_id} curl -s localhost:8025
     | grep -q '<title>MailHog'
     && (echo 'MailHog install pass' && exit 0)
     || (echo 'MailHog install fail' && exit 1)
 
   - >
-    docker exec "$(cat ${container_id})" curl -s --header Host:${IP} localhost
+    docker exec ${container_id} curl -s --header Host:${IP} localhost
     | grep -q "<li>${IP} ${HOSTNAME}</li>"
     && (echo 'Dashboard install pass' && exit 0)
     || (echo 'Dashboard install fail' && exit 1)
 
   - >
-    docker exec "$(cat ${container_id})" drush @${MACHINE_NAME}.${HOSTNAME} status
+    docker exec ${container_id} drush @${MACHINE_NAME}.${HOSTNAME} status
     | grep -q 'Drupal bootstrap.*Successful'
     && (echo 'Drush install pass' && exit 0)
     || (echo 'Drush install fail' && exit 1)

From fea737943d9c9adad76efee8d914c10c7a17bac5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Tue, 15 Nov 2016 18:18:33 -0500
Subject: [PATCH 0473/1273] Remove duplicate integration tests

---
 .travis.yml                           | 42 +++++++++++++++++----------
 tests/ubuntu-16-postgresql.config.yml |  1 +
 2 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8243392a3..33c692b27 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,7 @@ env:
       MACHINE_NAME: drupalvm
       IP: 192.168.88.88
       DRUPALVM_DIR: /var/www/drupalvm
+      TEST_INSTALLED_EXTRAS: true
   matrix:
     # Defaults - Ubuntu 16.04.
     - type: defaults
@@ -30,6 +31,7 @@ env:
       run_opts: "--privileged"
       local_config: tests/ubuntu-16-postgresql.config.yml
       config_dir: /var/www/drupalvm/config
+      TEST_INSTALLED_EXTRAS: false
     # Defaults - CentOS 7.
     - type: centos
       distro: centos7
@@ -91,28 +93,36 @@ script:
     || (echo 'Drupal install fail' && exit 1)
 
   - >
-    docker exec ${container_id} curl -s --header Host:adminer.${HOSTNAME} localhost
-    | grep -q '<title>Login - Adminer'
-    && (echo 'Admin install pass' && exit 0)
-    || (echo 'Adminer install fail' && exit 1)
+    if [ $TEST_INSTALLED_EXTRAS = true ]; then
+      docker exec ${container_id} curl -s --header Host:adminer.${HOSTNAME} localhost
+      | grep -q '<title>Login - Adminer'
+      && (echo 'Adminer install pass' && exit 0)
+      || (echo 'Adminer install fail' && exit 1)
+    fi
 
   - >
-    docker exec ${container_id} curl -s --header Host:pimpmylog.${HOSTNAME} localhost
-    | grep -q '<title>Pimp my Log'
-    && (echo 'Pimp my Log install pass' && exit 0)
-    || (echo 'Pimp my Log install fail' && exit 1)
+    if [ $TEST_INSTALLED_EXTRAS = true ]; then
+      docker exec ${container_id} curl -s --header Host:pimpmylog.${HOSTNAME} localhost
+      | grep -q '<title>Pimp my Log'
+      && (echo 'Pimp my Log install pass' && exit 0)
+      || (echo 'Pimp my Log install fail' && exit 1)
+    fi
 
   - >
-    docker exec ${container_id} curl -s --header Host:xhprof.${HOSTNAME} localhost
-    | grep -q '<title>XHProf'
-    && (echo 'XHProf install pass' && exit 0)
-    || (echo 'XHProf install fail' && exit 1)
+    if [ $TEST_INSTALLED_EXTRAS = true ]; then
+      docker exec ${container_id} curl -s --header Host:xhprof.${HOSTNAME} localhost
+      | grep -q '<title>XHProf'
+      && (echo 'XHProf install pass' && exit 0)
+      || (echo 'XHProf install fail' && exit 1)
+    fi
 
   - >
-    docker exec ${container_id} curl -s localhost:8025
-    | grep -q '<title>MailHog'
-    && (echo 'MailHog install pass' && exit 0)
-    || (echo 'MailHog install fail' && exit 1)
+    if [ $TEST_INSTALLED_EXTRAS = true ]; then
+      docker exec ${container_id} curl -s localhost:8025
+      | grep -q '<title>MailHog'
+      && (echo 'MailHog install pass' && exit 0)
+      || (echo 'MailHog install fail' && exit 1)
+    fi
 
   - >
     docker exec ${container_id} curl -s --header Host:${IP} localhost
diff --git a/tests/ubuntu-16-postgresql.config.yml b/tests/ubuntu-16-postgresql.config.yml
index 9137e4c11..327733428 100644
--- a/tests/ubuntu-16-postgresql.config.yml
+++ b/tests/ubuntu-16-postgresql.config.yml
@@ -1,2 +1,3 @@
 ---
 drupalvm_database: pgsql
+installed_extras: []

From a6683f580d2b58793fbae868d213215569d3a9cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Tue, 15 Nov 2016 18:19:42 -0500
Subject: [PATCH 0474/1273] Remove xhprof integration test so that the defaults
 are always tested

---
 .travis.yml      | 8 --------
 tests/config.yml | 9 ---------
 2 files changed, 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 33c692b27..447664079 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -108,14 +108,6 @@ script:
       || (echo 'Pimp my Log install fail' && exit 1)
     fi
 
-  - >
-    if [ $TEST_INSTALLED_EXTRAS = true ]; then
-      docker exec ${container_id} curl -s --header Host:xhprof.${HOSTNAME} localhost
-      | grep -q '<title>XHProf'
-      && (echo 'XHProf install pass' && exit 0)
-      || (echo 'XHProf install fail' && exit 1)
-    fi
-
   - >
     if [ $TEST_INSTALLED_EXTRAS = true ]; then
       docker exec ${container_id} curl -s localhost:8025
diff --git a/tests/config.yml b/tests/config.yml
index 4f02f26a1..754649ee5 100644
--- a/tests/config.yml
+++ b/tests/config.yml
@@ -4,12 +4,3 @@ composer_home_path: "/{{ drupalvm_user }}/.composer"
 
 # Don't run the 'disable ufw firewall' task in tests.
 drupalvm_disable_ufw_firewall: false
-
-# Install extra utilities to test.
-installed_extras:
-  - adminer
-  - drupalconsole
-  - mailhog
-  - pimpmylog
-  - varnish
-  - xhprof

From 52e5214c2310993e91f57f9bf9c45ba2db1e2807 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Tue, 15 Nov 2016 18:40:21 -0500
Subject: [PATCH 0475/1273] Fix travis syntax

---
 .travis.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 447664079..de47f212c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -94,25 +94,25 @@ script:
 
   - >
     if [ $TEST_INSTALLED_EXTRAS = true ]; then
-      docker exec ${container_id} curl -s --header Host:adminer.${HOSTNAME} localhost
-      | grep -q '<title>Login - Adminer'
-      && (echo 'Adminer install pass' && exit 0)
+      docker exec ${container_id} curl -s --header Host:adminer.${HOSTNAME} localhost \
+      | grep -q '<title>Login - Adminer' \
+      && (echo 'Adminer install pass' && exit 0) \
       || (echo 'Adminer install fail' && exit 1)
     fi
 
   - >
     if [ $TEST_INSTALLED_EXTRAS = true ]; then
-      docker exec ${container_id} curl -s --header Host:pimpmylog.${HOSTNAME} localhost
-      | grep -q '<title>Pimp my Log'
-      && (echo 'Pimp my Log install pass' && exit 0)
+      docker exec ${container_id} curl -s --header Host:pimpmylog.${HOSTNAME} localhost \
+      | grep -q '<title>Pimp my Log' \
+      && (echo 'Pimp my Log install pass' && exit 0) \
       || (echo 'Pimp my Log install fail' && exit 1)
     fi
 
   - >
     if [ $TEST_INSTALLED_EXTRAS = true ]; then
-      docker exec ${container_id} curl -s localhost:8025
-      | grep -q '<title>MailHog'
-      && (echo 'MailHog install pass' && exit 0)
+      docker exec ${container_id} curl -s localhost:8025 \
+      | grep -q '<title>MailHog' \
+      && (echo 'MailHog install pass' && exit 0) \
       || (echo 'MailHog install fail' && exit 1)
     fi
 

From 32b8c034bd613c3659b1830419a2228ca713b55d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Tue, 15 Nov 2016 18:56:35 -0500
Subject: [PATCH 0476/1273] Add varnish integration test

---
 .travis.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index de47f212c..a30f50165 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -116,6 +116,14 @@ script:
       || (echo 'MailHog install fail' && exit 1)
     fi
 
+  - >
+    if [ $TEST_INSTALLED_EXTRAS = true ]; then
+      docker exec ${container_id} curl -sI --header Host:${HOSTNAME} localhost:81 \
+      | grep -q 'Via: .* varnish' \
+      && (echo 'Varnish install pass' && exit 0) \
+      || (echo 'Varnish install fail' && exit 1)
+    fi
+
   - >
     docker exec ${container_id} curl -s --header Host:${IP} localhost
     | grep -q "<li>${IP} ${HOSTNAME}</li>"

From 5dba29acf363ee4df74da22d3428a9d795e2b375 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Mon, 6 Jun 2016 19:07:30 -0400
Subject: [PATCH 0477/1273] Make drush optional

---
 .travis.yml                                            |  4 +++-
 default.config.yml                                     |  2 ++
 provisioning/playbook.yml                              |  2 +-
 provisioning/templates/drupalvm.aliases.drushrc.php.j2 |  3 +++
 tests/ubuntu-16-nginx.config.yml                       | 10 ++++++++++
 5 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a30f50165..75c6ae40c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,7 @@ env:
       MACHINE_NAME: drupalvm
       IP: 192.168.88.88
       DRUPALVM_DIR: /var/www/drupalvm
+      DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/drush/drush/drush"
       TEST_INSTALLED_EXTRAS: true
   matrix:
     # Defaults - Ubuntu 16.04.
@@ -24,6 +25,7 @@ env:
       run_opts: "--privileged"
       local_config: tests/ubuntu-16-nginx.config.yml
       config_dir: /var/www/drupalvm/config
+      DRUSH_BIN: "/usr/local/bin/drush"
     # PostgreSQL - Ubuntu 16.04.
     - type: postgresql
       distro: ubuntu1604
@@ -131,7 +133,7 @@ script:
     || (echo 'Dashboard install fail' && exit 1)
 
   - >
-    docker exec ${container_id} drush @${MACHINE_NAME}.${HOSTNAME} status
+    docker exec ${container_id} ${DRUSH_BIN} @${MACHINE_NAME}.${HOSTNAME} status
     | grep -q 'Drupal bootstrap.*Successful'
     && (echo 'Drush install pass' && exit 0)
     || (echo 'Drush install fail' && exit 1)
diff --git a/default.config.yml b/default.config.yml
index b896e570a..b50c98722 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -194,6 +194,7 @@ installed_extras:
   - drupalconsole
   # - elasticsearch
   # - java
+  # - drush
   - mailhog
   # - memcached
   # - newrelic
@@ -215,6 +216,7 @@ extra_packages:
 extra_security_enabled: false
 
 drush_version: "master"
+drush_path: "{{ drupal_composer_install_dir }}/vendor/drush/drush/drush"
 drush_keep_updated: true
 drush_composer_cli_options: "--prefer-dist --no-interaction"
 
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 6a32407b5..b616735af 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -54,7 +54,6 @@
     - geerlingguy.php
     - geerlingguy.php-pecl
     - geerlingguy.composer
-    - geerlingguy.drush
     - { role: geerlingguy.mysql, when: drupalvm_database == 'mysql' }
     - { role: geerlingguy.php-mysql, when: drupalvm_database == 'mysql' }
     - { role: geerlingguy.postgresql, when: drupalvm_database == 'pgsql' }
@@ -62,6 +61,7 @@
 
     # Conditionally-installed roles.
     - { role: geerlingguy.drupal-console, when: 'drupal_major_version > 7 and "drupalconsole" in installed_extras' }
+    - { role: geerlingguy.drush, when: '"drush" in installed_extras' }
     - { role: geerlingguy.memcached, when: '"memcached" in installed_extras' }
     - { role: geerlingguy.php-memcached, when: '"memcached" in installed_extras' }
     - { role: geerlingguy.php-xdebug, when: '"xdebug" in installed_extras' }
diff --git a/provisioning/templates/drupalvm.aliases.drushrc.php.j2 b/provisioning/templates/drupalvm.aliases.drushrc.php.j2
index cc9249bf6..1fff6d7be 100644
--- a/provisioning/templates/drupalvm.aliases.drushrc.php.j2
+++ b/provisioning/templates/drupalvm.aliases.drushrc.php.j2
@@ -14,6 +14,9 @@ $aliases['{{ host }}'] = array(
   'remote-host' => '{{ host }}',
   'remote-user' => '{{ vagrant_user }}',
   'ssh-options' => '-o PasswordAuthentication=no -i ' . drush_server_home() . '/.vagrant.d/insecure_private_key',
+  'path-aliases' => array(
+    '%drush-script' => '{{ drush_path }}',
+  ),
 );
 
 {% endif -%}
diff --git a/tests/ubuntu-16-nginx.config.yml b/tests/ubuntu-16-nginx.config.yml
index c3c8833c5..5b4802489 100644
--- a/tests/ubuntu-16-nginx.config.yml
+++ b/tests/ubuntu-16-nginx.config.yml
@@ -5,3 +5,13 @@ drupalvm_webserver: nginx
 build_makefile: true
 build_composer_project: false
 drupal_core_path: "/var/www/drupalvm/drupal"
+
+drush_path: "/usr/local/bin/drush"
+installed_extras:
+  - adminer
+  - drupalconsole
+  - mailhog
+  - pimpmylog
+  - varnish
+  - xhprof
+  - drush

From afa848054beb7bb020d731cb615d51320e603527 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Tue, 15 Nov 2016 20:19:27 -0500
Subject: [PATCH 0478/1273] Add drush as a default installed utility

---
 .travis.yml                      |  4 ++--
 default.config.yml               |  2 +-
 tests/ubuntu-16-nginx.config.yml | 10 ----------
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 75c6ae40c..bbb236cd6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ env:
       MACHINE_NAME: drupalvm
       IP: 192.168.88.88
       DRUPALVM_DIR: /var/www/drupalvm
-      DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/drush/drush/drush"
+      DRUSH_BIN: drush
       TEST_INSTALLED_EXTRAS: true
   matrix:
     # Defaults - Ubuntu 16.04.
@@ -25,7 +25,6 @@ env:
       run_opts: "--privileged"
       local_config: tests/ubuntu-16-nginx.config.yml
       config_dir: /var/www/drupalvm/config
-      DRUSH_BIN: "/usr/local/bin/drush"
     # PostgreSQL - Ubuntu 16.04.
     - type: postgresql
       distro: ubuntu1604
@@ -34,6 +33,7 @@ env:
       local_config: tests/ubuntu-16-postgresql.config.yml
       config_dir: /var/www/drupalvm/config
       TEST_INSTALLED_EXTRAS: false
+      DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/drush/drush/drush"
     # Defaults - CentOS 7.
     - type: centos
       distro: centos7
diff --git a/default.config.yml b/default.config.yml
index b50c98722..10d6984cd 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -192,9 +192,9 @@ installed_extras:
   - adminer
   # - blackfire
   - drupalconsole
+  - drush
   # - elasticsearch
   # - java
-  # - drush
   - mailhog
   # - memcached
   # - newrelic
diff --git a/tests/ubuntu-16-nginx.config.yml b/tests/ubuntu-16-nginx.config.yml
index 5b4802489..c3c8833c5 100644
--- a/tests/ubuntu-16-nginx.config.yml
+++ b/tests/ubuntu-16-nginx.config.yml
@@ -5,13 +5,3 @@ drupalvm_webserver: nginx
 build_makefile: true
 build_composer_project: false
 drupal_core_path: "/var/www/drupalvm/drupal"
-
-drush_path: "/usr/local/bin/drush"
-installed_extras:
-  - adminer
-  - drupalconsole
-  - mailhog
-  - pimpmylog
-  - varnish
-  - xhprof
-  - drush

From c4c65c4413620d45277e57da9f5f0b067e51da34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Tue, 15 Nov 2016 20:31:00 -0500
Subject: [PATCH 0479/1273] Minor travis.yml nitpick [ci skip]

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index bbb236cd6..215d465e9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,8 +32,8 @@ env:
       run_opts: "--privileged"
       local_config: tests/ubuntu-16-postgresql.config.yml
       config_dir: /var/www/drupalvm/config
-      TEST_INSTALLED_EXTRAS: false
       DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/drush/drush/drush"
+      TEST_INSTALLED_EXTRAS: false
     # Defaults - CentOS 7.
     - type: centos
       distro: centos7

From 96e0bc14705ac25b08bbd89ef9b136540bc97efb Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 15 Nov 2016 19:34:43 -0600
Subject: [PATCH 0480/1273] Update to latest version of PHP role.

---
 provisioning/requirements.yml                 |  2 +-
 provisioning/roles/geerlingguy.php/README.md  |  3 ++
 .../roles/geerlingguy.php/defaults/main.yml   |  1 +
 .../roles/geerlingguy.php/tasks/main.yml      |  7 ++++
 .../geerlingguy.php/templates/opcache.ini.j2  |  2 +-
 .../tests/test-vars-ubuntu1204.yml            | 34 +++++++++----------
 .../roles/geerlingguy.php/tests/test.yml      |  3 +-
 7 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index ee64042ac..e47ce7728 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -38,7 +38,7 @@
 - src: geerlingguy.nodejs
   version: 3.3.0
 - src: geerlingguy.php
-  version: 3.3.3
+  version: 3.4.1
 - src: geerlingguy.php-memcached
   version: 2.0.0
 - src: geerlingguy.php-mysql
diff --git a/provisioning/roles/geerlingguy.php/README.md b/provisioning/roles/geerlingguy.php/README.md
index 133a11169..723cebb15 100644
--- a/provisioning/roles/geerlingguy.php/README.md
+++ b/provisioning/roles/geerlingguy.php/README.md
@@ -97,6 +97,7 @@ Various defaults for PHP. Only used if `php_use_managed_ini` is set to `true`.
 
 The OpCache is included in PHP starting in version 5.5, and the following variables will only take effect if the version of PHP you have installed is 5.5 or greater.
 
+    php_opcache_zend_extension: "opcache.so"
     php_opcache_enable: "1"
     php_opcache_enable_cli: "0"
     php_opcache_memory_consumption: "96"
@@ -110,6 +111,8 @@ The OpCache is included in PHP starting in version 5.5, and the following variab
 
 OpCache ini directives that are often customized on a system. Make sure you have enough memory and file slots allocated in the OpCache (`php_opcache_memory_consumption`, in MB, and `php_opcache_max_accelerated_files`) to contain all the PHP code you are running. If not, you may get less-than-optimal performance!
 
+For custom opcache.so location provide full path with `php_opcache_zend_extension`.
+
     php_opcache_conf_filename: [platform-specific]
 
 The platform-specific opcache configuration filename. Generally the default should work, but in some cases, you may need to override the filename.
diff --git a/provisioning/roles/geerlingguy.php/defaults/main.yml b/provisioning/roles/geerlingguy.php/defaults/main.yml
index c9a47d4c8..db1564337 100644
--- a/provisioning/roles/geerlingguy.php/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.php/defaults/main.yml
@@ -26,6 +26,7 @@ php_fpm_pm_max_spare_servers: 5
 php_executable: "php"
 
 # OpCache settings (useful for PHP >=5.5).
+php_opcache_zend_extension: "opcache.so"
 php_opcache_enable: "1"
 php_opcache_enable_cli: "0"
 php_opcache_memory_consumption: "96"
diff --git a/provisioning/roles/geerlingguy.php/tasks/main.yml b/provisioning/roles/geerlingguy.php/tasks/main.yml
index 1e82ceedd..c6306ccad 100644
--- a/provisioning/roles/geerlingguy.php/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php/tasks/main.yml
@@ -46,16 +46,23 @@
 # Setup/install tasks.
 - include: setup-RedHat.yml
   when: (php_install_from_source == false) and (ansible_os_family == 'RedHat')
+  static: no
 
 - include: setup-Debian.yml
   when: (php_install_from_source == false) and (ansible_os_family == 'Debian')
+  static: no
 
 # Install PHP from source when php_install_from_source is true.
 - include: install-from-source.yml
   when: php_install_from_source == true
+  static: no
 
 # Configure PHP.
 - include: configure.yml
+  static: no
 - include: configure-apcu.yml
+  static: no
 - include: configure-opcache.yml
+  static: no
 - include: configure-fpm.yml
+  static: no
diff --git a/provisioning/roles/geerlingguy.php/templates/opcache.ini.j2 b/provisioning/roles/geerlingguy.php/templates/opcache.ini.j2
index f60fb8927..61464539f 100644
--- a/provisioning/roles/geerlingguy.php/templates/opcache.ini.j2
+++ b/provisioning/roles/geerlingguy.php/templates/opcache.ini.j2
@@ -1,4 +1,4 @@
-zend_extension=opcache.so
+zend_extension={{ php_opcache_zend_extension }}
 opcache.enable={{ php_opcache_enable }}
 opcache.enable_cli={{ php_opcache_enable_cli }}
 opcache.memory_consumption={{ php_opcache_memory_consumption }}
diff --git a/provisioning/roles/geerlingguy.php/tests/test-vars-ubuntu1204.yml b/provisioning/roles/geerlingguy.php/tests/test-vars-ubuntu1204.yml
index 9fabcac42..49c96b888 100644
--- a/provisioning/roles/geerlingguy.php/tests/test-vars-ubuntu1204.yml
+++ b/provisioning/roles/geerlingguy.php/tests/test-vars-ubuntu1204.yml
@@ -1,23 +1,21 @@
 ---
-php_version: "5.6"
 php_packages:
-  - php5
-  - php5-mcrypt
-  - php5-cli
-  - php5-common
-  - php5-curl
-  - php5-dev
-  - php5-fpm
-  - php5-gd
-  - php-pear
+  - php5.6
+  - php5.6-mcrypt
+  - php5.6-cli
+  - php5.6-common
+  - php5.6-curl
+  - php5.6-dev
+  - php5.6-fpm
+  - php5.6-gd
   - libpcre3-dev
 php_conf_paths:
-  - /etc/php5/fpm
-  - /etc/php5/apache2
-  - /etc/php5/cli
+  - /etc/php/5.6/fpm
+  - /etc/php/5.6/apache2
+  - /etc/php/5.6/cli
 php_extension_conf_paths:
-  - /etc/php5/fpm/conf.d
-  - /etc/php5/apache2/conf.d
-  - /etc/php5/cli/conf.d
-php_fpm_daemon: php5-fpm
-php_fpm_conf_path: "/etc/php5/fpm"
+  - /etc/php/5.6/fpm/conf.d
+  - /etc/php/5.6/apache2/conf.d
+  - /etc/php/5.6/cli/conf.d
+php_fpm_daemon: php5.6-fpm
+php_fpm_conf_path: "/etc/php/5.6/fpm"
diff --git a/provisioning/roles/geerlingguy.php/tests/test.yml b/provisioning/roles/geerlingguy.php/tests/test.yml
index 295fcb7b8..29d42e49e 100644
--- a/provisioning/roles/geerlingguy.php/tests/test.yml
+++ b/provisioning/roles/geerlingguy.php/tests/test.yml
@@ -5,6 +5,7 @@
     php_enable_webserver: false
     php_memory_limit: "192M"
     php_enablerepo: "remi,remi-php70"
+    php_install_recommends: no
 
   pre_tasks:
     - name: Update apt cache.
@@ -19,7 +20,7 @@
       when: ansible_distribution == 'Ubuntu' and ansible_distribution_version != '12.04'
 
     - name: Add repository for PHP 5.6.
-      apt_repository: repo='ppa:ondrej/php5-5.6'
+      apt_repository: repo='ppa:ondrej/php'
       when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '12.04'
 
   roles:

From acbaa9244dfe281dedc403261a7af1893527285f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Tue, 15 Nov 2016 20:51:09 -0500
Subject: [PATCH 0481/1273] Only use project specific drush binary if a global
 drush is unavailable

---
 default.config.yml        | 1 -
 provisioning/playbook.yml | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/default.config.yml b/default.config.yml
index 10d6984cd..deec7e8af 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -216,7 +216,6 @@ extra_packages:
 extra_security_enabled: false
 
 drush_version: "master"
-drush_path: "{{ drupal_composer_install_dir }}/vendor/drush/drush/drush"
 drush_keep_updated: true
 drush_composer_cli_options: "--prefer-dist --no-interaction"
 
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index b616735af..0de3fd10f 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -100,6 +100,11 @@
       set_fact:
         drupal_site_exists: "{{ drupal_site.stat.exists|default(false) }}"
 
+    - name: Update drush_path if drush is not available globally.
+      set_fact:
+        drush_path: "{{ drupal_composer_install_dir }}/vendor/drush/drush/drush"
+      when: "'drush' not in installed_extras"
+
     - include: tasks/sshd.yml
     - include: tasks/extras.yml
     - include: tasks/www.yml

From 3518a5d47b2ec793ecf2943ced4a44471f9a6019 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 16 Nov 2016 00:49:08 -0500
Subject: [PATCH 0482/1273] Fixes #872: Update synced folder troubleshooting
 docs taking into account options_override

---
 docs/extras/syncing-folders.md | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/docs/extras/syncing-folders.md b/docs/extras/syncing-folders.md
index cacda49a7..824fb4410 100644
--- a/docs/extras/syncing-folders.md
+++ b/docs/extras/syncing-folders.md
@@ -93,12 +93,18 @@ Otherwise, you will need to make sure you're using the officially supported `gee
 
 ### Permissions-related errors
 
-If you're encountering errors where Drupal or some other software inside the VM is having permissions issues creating or deleting files inside a synced folder, you might need to either make sure the file permissions are correct on your host machine (if a folder is not readable by you, it probably also won't be readable when mounted via NFS!), or add extra configuration to the synced folders item inside the Vagrantfile (if using a sync method like `rsync`):
+If you're encountering errors where Drupal or some other software inside the VM is having permissions issues creating or deleting files inside a synced folder, you might need to either make sure the file permissions are correct on your host machine (if a folder is not readable by you, it probably also won't be readable when mounted via NFS!), or add extra configuration to the synced folders item (if using a sync method like `rsync`):
 
-```
-owner: "vagrant",
-group: "www-data",
-mount_options: ["dmode=775,fmode=664"]
+```yaml
+vagrant_synced_folders:
+  - local_path: .
+    destination: /var/www/drupalvm
+    type: nfs
+    create: true
+    mount_options: ["dmode=775,fmode=664"]
+    options_override:
+      owner: "vagrant"
+      group: "www-data"
 ```
 
 See [this issue](https://github.com/geerlingguy/drupal-vm/issues/66) for more details.

From 8550e88939ca1a2b27309a7a7b35bddb2fc19d2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 16 Nov 2016 09:12:42 -0500
Subject: [PATCH 0483/1273] Fixes #847, Followup #848: Add docs on using
 vagrant-proxyconf

---
 docs/other/overriding-configurations.md | 27 ++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/docs/other/overriding-configurations.md b/docs/other/overriding-configurations.md
index 36e1ccdaa..bc818754b 100644
--- a/docs/other/overriding-configurations.md
+++ b/docs/other/overriding-configurations.md
@@ -80,4 +80,29 @@ Add the `AWS_ACCESS_KEY_ID` and the `AWS_SECRET_ACCESS_KEY` environment variable
 
 Then run `vagrant up --provider=aws` to provision the instance.
 
-_For additional configuring options read the [Vagrant AWS Provider's README](https://github.com/mitchellh/vagrant-aws#readme)_
+_For additional configuration options read the [Vagrant AWS Provider's README](https://github.com/mitchellh/vagrant-aws#readme)._
+
+### Example: Using Drupal VM behind a corporate proxy with `vagrant-proxyconf`
+
+Add the following variables to your `config.yml`.
+
+```yaml
+proxy_http: 'http://192.168.0.2:3128/'
+proxy_https: 'http://192.168.0.2:3128/'
+proxy_ftp: 'http://192.168.0.2:3128/'
+proxy_none: 'localhost,127.0.0.1,{{ drupal_domain }}'
+```
+
+Create a `Vagrantfile.local` in the root directory of your project.
+
+```ruby
+if Vagrant.has_plugin?('vagrant-proxyconf')
+  config.proxy.http = vconfig['proxy_http']
+  config.proxy.https = vconfig['proxy_https']
+  config.git_proxy.http = vconfig['proxy_http']
+  config.proxy.no_proxy = vconfig['proxy_none']
+  config.proxy.ftp = vconfig['proxy_ftp']
+end
+```
+
+_For additional configuration options read [Vagrant Proxyconf's README](https://github.com/tmatilai/vagrant-proxyconf#readme)._

From a454e57a5b7e47a6b05c83799125b4377e30d636 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 16 Nov 2016 08:50:06 -0500
Subject: [PATCH 0484/1273] Always use project specific drush when available

---
 provisioning/playbook.yml           |  5 -----
 provisioning/tasks/install-site.yml | 10 ++++++++++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 0de3fd10f..b616735af 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -100,11 +100,6 @@
       set_fact:
         drupal_site_exists: "{{ drupal_site.stat.exists|default(false) }}"
 
-    - name: Update drush_path if drush is not available globally.
-      set_fact:
-        drush_path: "{{ drupal_composer_install_dir }}/vendor/drush/drush/drush"
-      when: "'drush' not in installed_extras"
-
     - include: tasks/sshd.yml
     - include: tasks/extras.yml
     - include: tasks/www.yml
diff --git a/provisioning/tasks/install-site.yml b/provisioning/tasks/install-site.yml
index 35c55c2ad..509924abe 100644
--- a/provisioning/tasks/install-site.yml
+++ b/provisioning/tasks/install-site.yml
@@ -1,4 +1,14 @@
 ---
+- name: Check if a project specific Drush binary exists.
+  stat: "path={{ drupal_composer_install_dir }}/vendor/drush/drush/drush"
+  register: drush_vendor_bin
+  ignore_errors: true
+
+- name: Use project specific Drush if available.
+  set_fact:
+    drush_path: "{{ drupal_composer_install_dir }}/vendor/drush/drush/drush"
+  when: drush_vendor_bin.stat.exists
+
 - name: Check if site is already installed.
   command: >
     {{ drush_path }} status bootstrap

From eadf230e423b17ba42513a8f2015af90f8fa901e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 16 Nov 2016 09:26:14 -0500
Subject: [PATCH 0485/1273] Ensure drush aliases use correct drush_path when
 install_site is false

---
 provisioning/playbook.yml           | 10 ++++++++++
 provisioning/tasks/install-site.yml | 10 ----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index b616735af..0301de3ad 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -118,6 +118,16 @@
     - include: tasks/build-composer-project.yml
       when: build_composer_project
 
+    - name: Check if a project specific Drush binary exists.
+      stat: "path={{ drupal_composer_install_dir }}/vendor/drush/drush/drush"
+      register: drush_vendor_bin
+      ignore_errors: true
+
+    - name: Use project specific Drush if available.
+      set_fact:
+        drush_path: "{{ drupal_composer_install_dir }}/vendor/drush/drush/drush"
+      when: drush_vendor_bin.stat.exists
+
     # Install site if configured.
     - include: tasks/install-site.yml
       when: install_site
diff --git a/provisioning/tasks/install-site.yml b/provisioning/tasks/install-site.yml
index 509924abe..35c55c2ad 100644
--- a/provisioning/tasks/install-site.yml
+++ b/provisioning/tasks/install-site.yml
@@ -1,14 +1,4 @@
 ---
-- name: Check if a project specific Drush binary exists.
-  stat: "path={{ drupal_composer_install_dir }}/vendor/drush/drush/drush"
-  register: drush_vendor_bin
-  ignore_errors: true
-
-- name: Use project specific Drush if available.
-  set_fact:
-    drush_path: "{{ drupal_composer_install_dir }}/vendor/drush/drush/drush"
-  when: drush_vendor_bin.stat.exists
-
 - name: Check if site is already installed.
   command: >
     {{ drush_path }} status bootstrap

From 0d74bf5747c24638b4c7a5dbf7c3dfda3946cfa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 16 Nov 2016 10:53:53 -0500
Subject: [PATCH 0486/1273] Issue #455: Allow for environment specific config
 files

---
 Vagrantfile               | 4 +++-
 provisioning/playbook.yml | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Vagrantfile b/Vagrantfile
index 0382b5ceb..1b5bff9a0 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -12,6 +12,8 @@ guest_project_dir = '/vagrant'
 guest_drupalvm_dir = ENV['DRUPALVM_DIR'] ? "/vagrant/#{ENV['DRUPALVM_DIR']}" : guest_project_dir
 guest_config_dir = ENV['DRUPALVM_CONFIG_DIR'] ? "/vagrant/#{ENV['DRUPALVM_CONFIG_DIR']}" : guest_project_dir
 
+environment = ENV['DRUPALVM_ENV'] = ENV['DRUPALVM_ENV'] || 'vagrant'
+
 # Cross-platform way of finding an executable in the $PATH.
 def which(cmd)
   exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
@@ -38,7 +40,7 @@ require 'yaml'
 # Load default VM configurations.
 vconfig = YAML.load_file("#{host_drupalvm_dir}/default.config.yml")
 # Use optional config.yml and local.config.yml for configuration overrides.
-['config.yml', 'local.config.yml'].each do |config_file|
+['config.yml', 'local.config.yml', "#{environment}.config.yml"].each do |config_file|
   if File.exist?("#{host_config_dir}/#{config_file}")
     vconfig.merge!(YAML.load_file("#{host_config_dir}/#{config_file}"))
   end
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 6a32407b5..d8f8d8fe6 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -22,6 +22,7 @@
       with_fileglob:
         - "{{ config_dir }}/config.yml"
         - "{{ config_dir }}/local.config.yml"
+        - "{{ config_dir }}/{{ lookup('env', 'DRUPALVM_ENV') }}.config.yml"
 
     - include: tasks/init-debian.yml
       when: ansible_os_family == 'Debian'

From 27ca7971a8dcc4755b873240c798745e4c3a7443 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 16 Nov 2016 11:32:08 -0500
Subject: [PATCH 0487/1273] Fix environment not being detected with
 ansible_local

---
 Vagrantfile               | 10 ++++++----
 provisioning/playbook.yml |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 1b5bff9a0..4cb59c272 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -12,7 +12,7 @@ guest_project_dir = '/vagrant'
 guest_drupalvm_dir = ENV['DRUPALVM_DIR'] ? "/vagrant/#{ENV['DRUPALVM_DIR']}" : guest_project_dir
 guest_config_dir = ENV['DRUPALVM_CONFIG_DIR'] ? "/vagrant/#{ENV['DRUPALVM_CONFIG_DIR']}" : guest_project_dir
 
-environment = ENV['DRUPALVM_ENV'] = ENV['DRUPALVM_ENV'] || 'vagrant'
+drupalvm_env = ENV['DRUPALVM_ENV'] || 'vagrant'
 
 # Cross-platform way of finding an executable in the $PATH.
 def which(cmd)
@@ -40,7 +40,7 @@ require 'yaml'
 # Load default VM configurations.
 vconfig = YAML.load_file("#{host_drupalvm_dir}/default.config.yml")
 # Use optional config.yml and local.config.yml for configuration overrides.
-['config.yml', 'local.config.yml', "#{environment}.config.yml"].each do |config_file|
+['config.yml', 'local.config.yml', "#{drupalvm_env}.config.yml"].each do |config_file|
   if File.exist?("#{host_config_dir}/#{config_file}")
     vconfig.merge!(YAML.load_file("#{host_config_dir}/#{config_file}"))
   end
@@ -126,14 +126,16 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     config.vm.provision 'ansible' do |ansible|
       ansible.playbook = "#{host_drupalvm_dir}/provisioning/playbook.yml"
       ansible.extra_vars = {
-        config_dir: host_config_dir
+        config_dir: host_config_dir,
+        drupalvm_env: drupalvm_env
       }
     end
   else
     config.vm.provision 'ansible_local' do |ansible|
       ansible.playbook = "#{guest_drupalvm_dir}/provisioning/playbook.yml"
       ansible.extra_vars = {
-        config_dir: guest_config_dir
+        config_dir: guest_config_dir,
+        drupalvm_env: drupalvm_env
       }
     end
   end
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index d8f8d8fe6..36cf07d61 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -22,7 +22,7 @@
       with_fileglob:
         - "{{ config_dir }}/config.yml"
         - "{{ config_dir }}/local.config.yml"
-        - "{{ config_dir }}/{{ lookup('env', 'DRUPALVM_ENV') }}.config.yml"
+        - "{{ config_dir }}/{{ lookup('env', 'DRUPALVM_ENV')|default(drupalvm_env, true)|default(omit) }}.config.yml"
 
     - include: tasks/init-debian.yml
       when: ansible_os_family == 'Debian'

From 24450a9e0a640f7f24c80100ef1c15e1a7bf727d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 16 Nov 2016 11:57:34 -0500
Subject: [PATCH 0488/1273] Look for DRUPALVM_ENV on remote host

---
 provisioning/playbook.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 36cf07d61..2b67c22a0 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -22,7 +22,7 @@
       with_fileglob:
         - "{{ config_dir }}/config.yml"
         - "{{ config_dir }}/local.config.yml"
-        - "{{ config_dir }}/{{ lookup('env', 'DRUPALVM_ENV')|default(drupalvm_env, true)|default(omit) }}.config.yml"
+        - "{{ config_dir }}/{{ lookup('env', 'DRUPALVM_ENV')|default(drupalvm_env, true)|default(ansible_env.DRUPALVM_ENV)|default(omit) }}.config.yml"
 
     - include: tasks/init-debian.yml
       when: ansible_os_family == 'Debian'

From 59e0f8ed2ab2d7402f0fc66c6d3f9d705526f676 Mon Sep 17 00:00:00 2001
From: Joe Stewart <joe@joestewartjr.com>
Date: Sun, 24 Jul 2016 09:49:07 -0500
Subject: [PATCH 0489/1273] Pass ansible arguments via environment variable if
 provided.

---
 Vagrantfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Vagrantfile b/Vagrantfile
index 4cb59c272..c4d141ac5 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -129,6 +129,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
         config_dir: host_config_dir,
         drupalvm_env: drupalvm_env
       }
+      ansible.raw_arguments = ENV['ANSIBLE_ARGS']
     end
   else
     config.vm.provision 'ansible_local' do |ansible|
@@ -137,6 +138,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
         config_dir: guest_config_dir,
         drupalvm_env: drupalvm_env
       }
+      ansible.raw_arguments = ENV['ANSIBLE_ARGS']
     end
   end
 

From 141317e1295e2c59793eee10eaffcc15b1dc4473 Mon Sep 17 00:00:00 2001
From: Joe Stewart <joe@joestewartjr.com>
Date: Mon, 25 Jul 2016 17:10:27 -0500
Subject: [PATCH 0490/1273] Use DRUPALVM_ANSIBLE_ARGS environment variable

---
 Vagrantfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index c4d141ac5..88ca1580f 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -129,7 +129,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
         config_dir: host_config_dir,
         drupalvm_env: drupalvm_env
       }
-      ansible.raw_arguments = ENV['ANSIBLE_ARGS']
+      ansible.raw_arguments = ENV['DRUPALVM_ANSIBLE_ARGS']
     end
   else
     config.vm.provision 'ansible_local' do |ansible|
@@ -138,7 +138,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
         config_dir: guest_config_dir,
         drupalvm_env: drupalvm_env
       }
-      ansible.raw_arguments = ENV['ANSIBLE_ARGS']
+      ansible.raw_arguments = ENV['DRUPALVM_ANSIBLE_ARGS']
     end
   end
 

From 0ba5f054f8dfa41dce0c24f825721a5db680bbde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 16 Nov 2016 00:25:07 -0500
Subject: [PATCH 0491/1273] Add docs for passing arguments to ansible during a
 provision

---
 docs/other/overriding-configurations.md | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/docs/other/overriding-configurations.md b/docs/other/overriding-configurations.md
index bc818754b..ac430a1d7 100644
--- a/docs/other/overriding-configurations.md
+++ b/docs/other/overriding-configurations.md
@@ -106,3 +106,27 @@ end
 ```
 
 _For additional configuration options read [Vagrant Proxyconf's README](https://github.com/tmatilai/vagrant-proxyconf#readme)._
+
+## Passing arguments to ansible during a provision
+
+You can specify an additional argument to the `ansible-playbook` command by using the `DRUPALVM_ANSIBLE_ARGS` environment variable. This can be useful when debugging a task failure.
+
+_Currently this feature has two quirks. It's only possible to pass on a single argument. You should not quote a flag's value as you would normally do in the shell._
+
+Display verbose ansible output:
+
+```sh
+DRUPALVM_ANSIBLE_ARGS='--verbose' vagrant provision
+```
+
+Begin the provisioning at a particular task:
+
+```sh
+DRUPALVM_ANSIBLE_ARGS='--start-at-task=*post-provision shell*' vagrant provision
+```
+
+Override a config variable:
+
+```sh
+DRUPALVM_ANSIBLE_ARGS='--extra-vars=drupalvm_database=pgsql' vagrant provision
+```

From 2f115c9824ef911a4187a29abdc1f5fa3e5e7850 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 16 Nov 2016 13:25:52 -0500
Subject: [PATCH 0492/1273] Update docs referencing installed_extras [ci skip]

---
 README.md                         | 3 +++
 examples/acquia/acquia.config.yml | 1 +
 examples/prod/prod.config.yml     | 1 +
 3 files changed, 5 insertions(+)

diff --git a/README.md b/README.md
index 544294cf7..fb93f26e4 100644
--- a/README.md
+++ b/README.md
@@ -103,6 +103,9 @@ By default, this VM includes the extras listed in the `config.yml` option `insta
       - adminer
       # - blackfire
       - drupalconsole
+      - drush
+      # - elasticsearch
+      # - java
       - mailhog
       # - memcached
       # - newrelic
diff --git a/examples/acquia/acquia.config.yml b/examples/acquia/acquia.config.yml
index e991adeed..23b485fe5 100644
--- a/examples/acquia/acquia.config.yml
+++ b/examples/acquia/acquia.config.yml
@@ -38,4 +38,5 @@ xhprof_download_folder_name: xhprof-master
 # Acquia Cloud Search defaults to Solr 4.x.
 solr_version: "4.5.1"
 installed_extras:
+  - drush
   - solr
diff --git a/examples/prod/prod.config.yml b/examples/prod/prod.config.yml
index 76b0ea6ef..4f0fa06d1 100644
--- a/examples/prod/prod.config.yml
+++ b/examples/prod/prod.config.yml
@@ -19,6 +19,7 @@ mysql_root_password: root
 # Only install extras that you will need/use on your site, and don't install
 # development-related software on production environments!
 installed_extras:
+  - drush
   # - memcached
   # - redis
   # - solr

From e9e390127a228da4f182a808bbada20933c76154 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 16 Nov 2016 12:26:58 -0600
Subject: [PATCH 0493/1273] Fixes #989: Use Varnish role 1.8.1 version.

---
 provisioning/requirements.yml                    |  2 +-
 .../roles/geerlingguy.varnish/defaults/main.yml  |  2 +-
 .../geerlingguy.varnish/tasks/setup-RedHat.yml   | 16 ++++++++++++++--
 .../roles/geerlingguy.varnish/tests/test.yml     |  5 +++++
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index e47ce7728..bc1c4ee7c 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -70,4 +70,4 @@
 - src: geerlingguy.solr
   version: 3.2.2
 - src: geerlingguy.varnish
-  version: 1.8.0
+  version: 1.8.1
diff --git a/provisioning/roles/geerlingguy.varnish/defaults/main.yml b/provisioning/roles/geerlingguy.varnish/defaults/main.yml
index 517d25246..91e14e7fa 100644
--- a/provisioning/roles/geerlingguy.varnish/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.varnish/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
 varnish_package_name: "varnish"
-varnish_version: "5.0.0"
+varnish_version: "4.1"
 
 varnish_use_default_vcl: true
 varnish_default_vcl_template_path: default.vcl.j2
diff --git a/provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml
index a420a814f..913f0aa7f 100644
--- a/provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml
@@ -6,7 +6,19 @@
     - libedit-devel
     - initscripts
 
-- name: Install Varnish from package.
+- name: Add Varnish repository.
   yum:
-    name: https://repo.varnish-cache.org/pkg/{{ varnish_version }}/varnish-{{ varnish_version }}-1.el{{ ansible_distribution_version.split(".")[0] }}.{{ ansible_architecture }}.rpm
+    name: https://repo.varnish-cache.org/redhat/varnish-{{ varnish_version }}.el6.rpm
     state: present
+  when: ansible_distribution_major_version|int < 7
+
+- name: Set repo fact appropriately.
+  set_fact:
+    varnish_yum_enablerepo: "{{ 'varnish-{{ varnish_version }},epel' if (ansible_distribution_major_version|int < 7) else 'epel' }}"
+
+- name: Install Varnish.
+  yum:
+    name: "{{ varnish_package_name }}"
+    state: installed
+    enablerepo: "{{ varnish_yum_enablerepo }}"
+    disablerepo: "*"
diff --git a/provisioning/roles/geerlingguy.varnish/tests/test.yml b/provisioning/roles/geerlingguy.varnish/tests/test.yml
index c6d3c049c..9a57544f3 100644
--- a/provisioning/roles/geerlingguy.varnish/tests/test.yml
+++ b/provisioning/roles/geerlingguy.varnish/tests/test.yml
@@ -20,5 +20,10 @@
         - logrotate
       when: ansible_os_family == 'RedHat' and ansible_distribution_major_version < '7'
 
+    - name: Force working version of Varnish on Ubuntu 14.04.
+      set_fact:
+        varnish_version: "4.0"
+      when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '14.04'
+
   roles:
     - role_under_test

From 0200d42510b2c4a3b90592ec1e93a227d22b91cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 16 Nov 2016 14:11:01 -0500
Subject: [PATCH 0494/1273] Issue #455: Add docs on environment specific
 configs

---
 docs/other/production.md | 34 ++++++++++++++++++++++++++++++++++
 mkdocs.yml               |  1 +
 2 files changed, 35 insertions(+)
 create mode 100644 docs/other/production.md

diff --git a/docs/other/production.md b/docs/other/production.md
new file mode 100644
index 000000000..f4f431a28
--- /dev/null
+++ b/docs/other/production.md
@@ -0,0 +1,34 @@
+Drupal VM has _experimental_ support for deploying Drupal VM to a production environment. The security of your servers is _your_ responsibility.
+
+For a configuration example and instructions on how to build a Drupal environment with Drupal VM on DigitalOcean see the [`examples/prod` directory and README](https://github.com/geerlingguy/drupal-vm/tree/master/examples/prod).
+
+## Production specific overrides.
+
+Drupal VM supports loading configuration files depending on the environment variable `DRUPALVM_ENV` and using this feature you can have different configurations between development and production environments.
+
+```sh
+# Loads vagrant.config.yml if available (default).
+vagrant provision
+
+# Loads prod.config.yml if available.
+DRUPALVM_ENV=prod vagrant provision --provisioner=aws
+```
+
+If you're issuing a provision directly through `ansible-playbook` as you would do for most production environments you can either set the `DRUPALVM_ENV` variable on your host, or on the remote production machine.
+
+```sh
+# By default it doesn't try to load any other config file.
+ansible-playbook -i examples/prod/inventory provisioning/playbook.yml --sudo --ask-sudo-pass
+
+# Loads prod.config.yml if available.
+DRUPALVM_ENV=prod ansible-playbook -i examples/prod/inventory provisioning/playbook.yml --sudo --ask-sudo-pass
+```
+
+If you add `DRUPALVM_ENV=prod` to the `/etc/environment` file on your production environment:
+
+```sh
+# Loads prod.config.yml if available.
+ansible-playbook -i examples/prod/inventory provisioning/playbook.yml --sudo --ask-sudo-pass
+```
+
+_Note: Having the variable set locally takes precedence over having it on the remote machine._
diff --git a/mkdocs.yml b/mkdocs.yml
index 7aa135bfd..1769ac0ba 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -40,6 +40,7 @@ pages:
     - 'PHP 5.6 on Drupal VM': 'other/php-56.md'
     - 'BigPipe with Drupal VM': 'other/bigpipe.md'
     - 'Drupal VM Management Tools': 'other/management-tools.md'
+    - 'Deploying Drupal VM to a production environment': 'other/production.md'
     - 'Networking Notes': 'other/networking.md'
     - 'Drupal 6 Notes': 'other/drupal-6.md'
     - 'Linux Notes': 'other/linux.md'

From 9d9e1b6dfd3734d46ab6660a7ee50beb2a2bdf7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 16 Nov 2016 15:36:43 -0500
Subject: [PATCH 0495/1273] Fix ReadTheDocs search feature

---
 docs/js/fix_search.js | 44 +++++++++++++++++++++++++++++++++++++++++++
 mkdocs.yml            |  3 +++
 2 files changed, 47 insertions(+)
 create mode 100644 docs/js/fix_search.js

diff --git a/docs/js/fix_search.js b/docs/js/fix_search.js
new file mode 100644
index 000000000..6dd9fb202
--- /dev/null
+++ b/docs/js/fix_search.js
@@ -0,0 +1,44 @@
+(function (){
+  var MutationObserver = (function () {
+    var prefixes = ['WebKit', 'Moz', 'O', 'Ms', '']
+    for (var i=0; i < prefixes.length; i++) {
+      if (prefixes[i] + 'MutationObserver' in window) {
+        return window[prefixes[i] + 'MutationObserver'];
+      }
+    }
+    return false;
+  }());
+
+  /*
+  * RTD messes up MkDocs' search feature by tinkering with the search box defined in the theme, see
+  * https://github.com/rtfd/readthedocs.org/issues/1088. This function sets up a DOM4 MutationObserver
+  * to react to changes to the search form (triggered by RTD on doc ready). It then reverts everything
+  * the RTD JS code modified.
+  *
+  * @see https://github.com/rtfd/readthedocs.org/issues/1088#issuecomment-224715045
+  */
+  $(document).ready(function () {
+    if (!MutationObserver) {
+      return;
+    }
+    var target = document.getElementById('rtd-search-form');
+    var config = {attributes: true, childList: true};
+
+    var observer = new MutationObserver(function(mutations) {
+      // if it isn't disconnected it'll loop infinitely because the observed element is modified
+      observer.disconnect();
+      var form = $('#rtd-search-form');
+      var path = window.location.pathname;
+      var branch = path.split('/')[2];
+      form.empty();
+      form.attr('action', window.location.origin + '/en/' + branch + '/search.html');
+      $('<input>').attr({
+        type: "text",
+        name: "q",
+        placeholder: "Search docs"
+      }).appendTo(form);
+    });
+
+    observer.observe(target, config);
+  });
+}());
diff --git a/mkdocs.yml b/mkdocs.yml
index 7aa135bfd..7bfed0986 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -4,6 +4,9 @@ repo_url: https://github.com/geerlingguy/drupal-vm
 site_description: 'Drupal VM - A VM for local Drupal development, built with Vagrant + Ansible'
 theme: readthedocs
 
+extra_javascript:
+  - js/fix_search.js
+
 markdown_extensions:
   - toc:
       permalink: True

From ada72e29aa1925a4b256f6ed24bb2591d17b6f88 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 17 Nov 2016 14:59:29 -0600
Subject: [PATCH 0496/1273] Fixes #983: Add a CHANGELOG for Drupal VM.

---
 CHANGELOG.md | 392 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 392 insertions(+)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000..0adf00951
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,392 @@
+# Drupal VM Changelog
+
+## 3.5.2 (2016-11-17)
+
+### Improvements
+
+  * #872: Improve synced folder documentation for owner/group.
+  * #847: Add documentation on using `vagrant-proxyconf` in local Vagrantfile.
+  * #455: Environment-specific config file support (e.g. `prod.config.yml`).
+  * #991: Reduce tasks run during Travis CI validation, clean up tests.
+  * Update to latest role versions: PHP, PHP-PECL, Varnish, MySQL, Solr
+
+### Bugfixes
+
+  * #998: Fix documentation search capability on http://docs.drupalvm.com/en/latest/.
+  * #947: Fix Varnish default configuration to purge correctly.
+  * #989: Use latest (correct) version of Varnish role.
+  * #980: CentOS install for Firewall and Mailhog fixed.
+  * (No issue) Fix PHP 5.6 documentation to make sure PHP 7 doesn't also get installed.
+
+
+## 3.5.1 (2016-11-07)
+
+### Improvements
+
+  * Update to latest version of Drush Ansible role for better composer performance.
+
+### Bugfixes
+
+  * #968: Fix for Ansible 2.2.x and PostgreSQL as database server.
+  * #971: Fix for PHP 5.5 PPA usage on Ubuntu 12/14.
+  * #912: Fix for Vagrant 1.8.6+ not mounting synced folders if `mount_options` is empty.
+
+
+## 3.5.0 "Tron Scherzo" (2016-11-02)
+
+### Breaking changes
+
+  * Latest `geerlingguy/*` Vagrant box versions recommend VirtualBox 5.1.6+ and Vagrant 1.8.6+.
+  * Roles should work with any Ansible version later than 2.0... but 2.2+ is now recommended.
+
+### New/changed variables in default.config.yml
+
+  * `drupalvm_vagrant_version_min` is now `1.8.6` (was `1.8.5`)
+
+### Improvements
+
+  * #950: Use default sync folder type for `vagrant-cachier` if present.
+  * #957: Update various roles for better Ansible 2.2.x compatibility.
+  * #962: Allow configuration of PHP `disable_functions`.
+  * #963: Bump required Vagrant version.
+
+### Bugfixes
+
+  * #925: Fix MySQL install on CentOS 6.
+  * #870: Fix invalid cron example syntax.
+  * #956: Fix Apache failure if using Nginx as webserver.
+  * #928: Fix rubocop test on Travis.
+  * #927: Fix PHP docs duplicate config vars.
+  * #936: Fix `mysql_*`/`db_*` variable names in documentation.
+
+
+## 3.4.0 "Anthem for Keyboard Solo" (2016-10-12)
+
+### Breaking changes
+
+  * _If you have `selenium` in installed extras_: The `arknoll.selenium` role now defaults to installing Google Chrome / chromedriver instead of Firefox. See the role's [documentation](https://github.com/arknoll/ansible-role-selenium#variables) to see which variables should be set if you want to stick with Firefox (see: #924).
+  * _If you're running PHP 5.6 with the `geerlingguy/ubuntu1404` box_: PHP 5.6 under Ubuntu 14.04 was using a deprecated PPA. Since switching to Ondrej's updated PPA, we had to also update the list of packages/paths in the [documentation for running PHP 5.6 under Drupal VM](http://docs.drupalvm.com/en/latest/other/php-56/). If you are using PHP 5.6, be sure to update your `php_*` variables (see: #921).
+
+### New/changed variables in default.config.yml
+
+  * `vagrant_memory` has been increased to `2048` (was `1024`).
+
+### Improvements
+
+  * #924: Upgrade to `arknoll.selenium` 2.0.0 role, adding support for Chrome/chromedriver with Selenium.
+  * #922: Increase default memory usage from 1024 MB to 2048 MB.
+  * #916: Document setup within Windows Subsystem for Linux / Ubuntu Bash environment.
+
+### Bugfixes
+
+  * #921: Switch to mainline/supported PHP 5.6.x releases instead of deprecated PPA releases.
+
+
+## 3.3.2 (2016-10-06)
+
+### New/changed variables in default.config.yml
+
+  * You can now add `java` to `installed_extras` if you want Java installed without installing any of the other dependent extras (e.g. Apache Solr, Elasticsearch, or Selenium).
+
+### Improvements
+
+  * #915: Add 'java' as valid option in installed_extras
+
+
+## 3.3.1 (2016-10-05)
+
+### New/changed variables in default.config.yml
+
+  * Updated the devel module version number in the `drupal_composer_dependencies` variable: formerly `"drupal/devel:8.*"`, now `"drupal/devel:1.x-dev"`.
+
+### Bugfixes
+
+  * #911: Document how to bypass/replace MailHog correctly.
+  * #913: Update project version conventions for Composer-based installs since upstream drupal-project switched to using the drupal.org-hosted packagist.
+
+## 3.3.0 "1990's Theme" (2016-09-30)
+
+### Breaking changes
+
+  * Update the three `drupal_mysql_*` variables to `drupal_db_*`.
+  * Update the default `mysql_databases` and `mysql_users` variables to use the new variable names.
+
+### New/changed variables in default.config.yml
+
+  * `vagrant_cpus` set to `1` instead of `2` (see #855)
+  * Added two variables to control minimum required dependency versions:
+    * `drupalvm_vagrant_version_min: '1.8.5'`
+    * `drupalvm_ansible_version_min: '2.1'`
+  * Added `drupalvm_database` variable (defaults to `mysql`) to control database engine (see #146)
+  * Changed `drupal_mysql_*` variables to `drupal_db_*` for better compatibility:
+    * `drupal_mysql_user` is now `drupal_db_user`
+    * `drupal_mysql_password` is now `drupal_db_password`
+    * `drupal_mysql_name` is now `drupal_db_name`
+  * Updated `mysql_databases` and `mysql_users` to use the new variable names listed above
+  * Added `postgresql_databases` and `postgresql_users` (same kind of structure as the `mysql_*` variables)
+
+### Improvements
+
+  * #146: Add PostgreSQL support.
+  * #908: Require minimum version of Ansible 2.1.0, Vagrant 1.8.5.
+  * #855: Default to 1 vCPU core for better VirtualBox performance.
+  * Update PHP-MySQL Ansible role.
+  * #421, #367: Add to Behat/Selenium documentation.
+
+### Bugfixes
+
+  * Ensure Debian apt caches are updated when running tests on Travis.
+
+
+## 3.2.3 (2016-09-27)
+
+### Improvements
+
+  * Updated all Ansible roles to latest releases (stability fixes).
+  * Updated Travis CI tests to use more efficient Docker setup.
+
+### Bugfixes
+
+  * Nothing substantial, just a few typo corrections in comments.
+
+
+## 3.2.2 (2016-09-09)
+
+### Breaking changes
+
+N/A
+
+### New/changed variables in default.config.yml
+
+N/A
+
+### Improvements
+
+  * #870: Use more compact and legible object syntax for cron example.
+  * #886: Allow forcing use of ansible_local even if ansible is present on host.
+
+### Bugfixes
+
+  * #889: Document Parallels requires paid version.
+  * #845: Fix missing config.yml file in newrelic role.
+  * #896: Update Node.js role to fix Nodesource SSL issues on older OSes. Update other roles too.
+
+
+## 3.2.1 (2016-08-16)
+
+### New/changed variables in default.config.yml
+
+  * Default database defined in `mysql_databases` now uses `utf8mb4` encoding and `utf8mb4_general_ci` collation.
+  * `selenium_version` now defaults to `2.53.0`
+
+### Improvements
+
+  * #866: Use latest Selenium release.
+  * #859: Only set `mysql_enablerepo` when not defined.
+  * #856: Link Nginx CGI timeout time to PHP timeout time.
+  * #846: Default to Drupal 8.1.8.
+  * #839: Don't throw warning if `VAGRANTFILE_API_VERSION` is set twice.
+  * (No issue): Bump required role versions to latest point releases.
+
+### Bugfixes
+
+  * #853: Add `/web` to directory in Drupal Console instructions.
+
+
+## 3.2.0 "Tronaction" (2016-07-26)
+
+### Breaking changes
+
+Drupal VM now uses Vagrant's `ansible_local` provisioner if you don't have Ansible installed on your host. Make sure you're running Vagrant 1.8.2 or later (1.8.5+ recommended!).
+
+### New variables in default.config.yml
+
+  * `drush_make_options: "--no-gitinfofile"` added to allow overriding of the default options passed into the `drush make` command.
+  * `elasticsearch` is now an optional `installed_extra`
+  * port `9200` is now included in the list of `firewall_allowed_tcp_ports` (to support optional Elasticsearch installation)
+  * `solr_version: "5.5.2"` – the default Solr version was bumped from 5.5.1 to 5.5.2.
+
+### Improvements
+
+  * #814 / #815: Include roles in Drupal VM codebase (for faster/more stable install).
+  * #803: Add optional Elasticsearch installation.
+  * #450: Switch to Vagrant 1.8.2+'s `ansible_local` provisioner.
+  * #807: Add ability to override `drush make` CLI options.
+  * #775: Recommend manual VirtualBox installation as part of Quick Start guide.
+  * #777: Document how to switch Java versions for newer Apache Solr versions.
+
+### Bugfixes
+
+  * #800: Add php5-apcu to default Acquia Cloud package list.
+  * #798: Update selenium role so it doesn't cause build failure.
+  * #821: Bump upstream Solr role version to fix some Solr install bugs.
+  * #825: Fix typo in dashboard.
+  * #799: Quote the Drupal core version in the example makefile to avoid duck typing problems.
+
+
+## 3.1.4 (2016-07-11)
+
+### Breaking changes
+
+  * `php_sendmail_path` now defaults to `"/opt/mailhog/mhsendmail"` (see https://github.com/geerlingguy/drupal-vm/commit/2d835826de127e427b9a8287bdd2d84a65779761)
+
+### Improvements
+
+  * #776: Switch from ssmtp to mhsendmail.
+  * #782: Favicon for Drupal VM dashboard page.
+  * #791: Update URLs to https (yay Let's Encrypt!).
+  * #794: Bump PHP role version so FPM user is configurable.
+  * (No issue): Bump MySQL role version so large innodb prefixes are configurable.
+
+### Bugfixes
+
+  * #795: Fix Your Site links on dashboard for certain Nginx configs.
+  * #793: Document composer.json devel module dependency for default config.
+
+
+## 3.1.3 (2016-06-29)
+
+## Improvements
+
+  * #762: Support including extra_parameters for nginx vhosts.
+
+## Bugfixes
+
+  * #744: Fix npm_config_prefix directory created under root instead of vagrant.
+  * #766: Document requirement of `vagrant_box: ubuntu1404` for PHP 5.6.
+  * #726: Fix permissions on the synced folder for composer project build.
+
+
+## 3.1.2 (2016-06-16)
+
+### Improvements
+
+  * #730: Improve dashboard for users who have ip set to `0.0.0.0`.
+  * #733: Update example composer.json to work with Drupal.org packagist.
+
+### Bugfixes
+
+  * #736: Fix hardcoded NFS reference that broke on Windows with vagrant-cachier plugin.
+  * #734: Fix a setting that caused Vagrant 1.8.3/1.8.4 to fail to mount shared folders.
+  * #733 and #741: Adjust composer and timeout values to be more robust with slower filesystems.
+  * Bumped composer role version.
+
+
+## 3.1.1 (2016-06-12)
+
+### New variables in default.config.yml
+
+  * `#ssh_home: "{{ drupal_core_path }}"` - The `SSH_HOME` the default Drupal VM user would be redirected to upon SSH login (e.g. `vagrant ssh`). This new variable is entirely optional and commented by default.
+
+### Improvements
+
+  * #709: Add strict vagrant version requirement for easier debugging.
+  * #707: Use official packages.drupal.org for Composer drupal package repository.
+  * #724: Add default www.drupalvm.dev alias to Apache and Nginx vhosts.
+  * #725: Better ordering and description of Drupal-related variables in `default.config.yml`.
+  * #665: Add ssh_home var as default pwd for SSH.
+
+### Bugfixes
+
+  * #715: Set node global install directory to a location writable by the vagrant user.
+  * #726: Ensure correct permissions when using Composer create-project.
+  * #650: Bump MySQL role version to fix root user account password.
+
+
+## 3.1.0 "Love Theme" (2016-06-06)
+
+### New variables in default.config.yml
+
+  * `local_path: .` - the default Vagrant synced folder `local_path` is set to the Drupal VM directory. This way multiple copies of Drupal VM can have independent Drupal codebases by default.
+  * `build_makefile: false` - Drupal VM now defaults to a composer-based workflow. To keep using a makefile, set this `true` and set all the `build_composer*` variables to `false`.
+  * `build_composer`, `drupal_composer_*`, `build_composer_project`, `drupal_composer_project_*` - New variables to support `composer.json` or `composer create-project` site builds.
+  * `extra_parameters` added to the default Apache vhost definition for the Drupal VM dashboard (to support displaying PHP information on the dashboard).
+  * `hirak/prestissimo` added to `composer_global_packages` (to speed up Composer operations inside the VM).
+  * `solr_version: "5.5.1"` - New default version of Apache Solr, if `solr` is in `installed_extras`.
+  * `configure_local_drush_aliases` has been changed to `configure_drush_aliases` (there is a shim to allow the use of the old variable name).
+
+### Improvements
+
+  * #648: Make config.yml optional (always load default configuration).
+  * #693: Default to Apache Solr 5.x.
+  * #687: Default the synced folder to the Drupal VM directory.
+  * #688: Add docs on how to run custom Ansible playbooks using a local Vagrantfile.
+  * #694, #701: Add support for, and default to, Composer-based Drupal 8 site builds.
+  * #698: Add docs about `vagrant-bindfs` to help those with NFS permissions issues.
+  * #703: Include default `vagrant-cachier` configuration, with an :apt bucket and a :generic bucket for Composer.
+  * #705: Add Packagist project badge.
+  * #706: Updated docs for 3.1.0 and default Composer workflow.
+
+### Bugfixes
+
+  * #654: Remove ansible.cfg because role install is handled by Vagrant.
+  * #653: Update docs for PHP 5.6 and apcu.
+  * #663: Change `configure_local_drush_aliases` to `configure_drush_aliases` so it's purpose is clearer.
+  * #678: Clarify requirement of Ansible on host for host Drush alias setup.
+
+
+## 3.0.0 "The Light Sailer" (2016-05-19)
+
+Read the [Drupal VM 3 announcement blog post](http://www.jeffgeerling.com/blog/2016/drupal-vm-3-here).
+
+### Breaking changes
+
+  * Some new defaults (e.g. PHP 7 or upgrading to Ubuntu 16.04) require a full box rebuild (`vagrant destroy` and `vagrant up`)
+  * Requirements: Vagrant 1.8.1+, VirtualBox 5.0.20+, and (if using Ansible installed locally) Ansible 2.0.1+.
+
+### New variables in config.yml
+
+  * `vagrant_box` now defaults to `geerlingguy/ubuntu1604` (was `geerlingguy/ubuntu1404`)
+  * `drush_makefile_path` is now `"{{ config_dir }}/drupal.make.yml"` (to support Drupal VM in a subdirectory)
+  * `memcached`, `xdebug`, and `xhprof` are now commented from `installed_extras` by default
+  * `extra_packages` now includes `sqlite` by default
+  * `php_version` is now `"7.0"`
+
+### Improvements
+
+  * #522: Add SQLite support to Drupal VM.
+  * #455: Add support for local.config.yml.
+  * #608: Automate `ansible-galaxy` role installation (requires Vagrant 1.8+).
+  * #609: Default to Ubuntu 16.04, PHP 7, and MySQL 5.7.
+  * #616: Update Travis CI automated tests to test on Ubuntu 16.04 in addition to other OSes.
+  * #618: Use latest stable Drupal 8 release instead of working-copy (git clone) by default.
+  * #633: Support custom pre/post provision Ansible task files.
+  * #378: Decouple Drupal VM from it's existing directory so it can be managed in other directories.
+  * #378: Add a composer.json ([Drupal VM is on Packagist!](https://packagist.org/packages/geerlingguy/drupal-vm))
+  * #526: Added Blackfire.io support (PHP 7 or 5.x).
+
+### Bugfixes
+
+  * #614: Install cron jobs as the SSH user instead of as root.
+  * #620: Update JJG-Ansible-Windows to latest version.
+  * #635: PHP 5.6 documentation didn't include required `php_fpm_pool_conf_path`.
+  * #619: Fix OpCache CLI error caused by conflicting ini files.
+
+
+## 2.5.1 (2016-05-11)
+
+## 2.5.0 "Magic Landings" (2016-05-10)
+
+## 2.4.0 "A New Tron and the MCP" (2016-03-30)
+
+## 2.3.1 (2016-02-23)
+
+## 2.3.0 "Miracle and Magician" (2016-02-20)
+
+## 2.2.1 (2016-01-25)
+
+## 2.2.0 "Wormhole" (2016-01-15)
+
+## 2.1.2 (2015-12-04)
+
+## 2.1.1 (2015-10-07)
+
+## 2.1.0 (2015-09-22)
+
+## 2.0.1 (2015-08-21)
+
+## 2.0.0 (2015-07-29)
+
+...
+
+## 1.0.0 (2014-03-24)

From 3e1cbb189ffdceaf2939ea33a12de02b95aed832 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 17 Nov 2016 15:02:23 -0600
Subject: [PATCH 0497/1273] Follow-up for #983: Add line about CHANGELOG in
 CHANGELOG.

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0adf00951..226331e67 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Improvements
 
+  * #983: Added a CHANGELOG.md (this thing you're reading!).
   * #872: Improve synced folder documentation for owner/group.
   * #847: Add documentation on using `vagrant-proxyconf` in local Vagrantfile.
   * #455: Environment-specific config file support (e.g. `prod.config.yml`).

From b4f10e324bfa2f106afe3df243d73a06861f899e Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 18 Nov 2016 09:10:45 -0600
Subject: [PATCH 0498/1273] Add a GitHub ISSUE_TEMPLATE.

---
 .github/ISSUE_TEMPLATE | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE

diff --git a/.github/ISSUE_TEMPLATE b/.github/ISSUE_TEMPLATE
new file mode 100644
index 000000000..6c982f3ba
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE
@@ -0,0 +1,26 @@
+
+Drupal VM is used by developers in a wide variety of circumstances. Please use this template when reporting issues or suggesting features so we can help you more efficiently. **Delete this section** and fill in the rest of the template below, deleting the commented sections marked by `<!--- -->`:
+
+### Issue Type
+
+<!--- Pick one below and delete the rest: -->
+ - Bug Report
+ - Feature Idea
+ - Documentation Report
+
+### Your Environment
+
+<!--- Paste the output from the following command: `vagrant --version && echo "VirtualBox `vboxmanage --version`" && ansible --version` (paste it in the space between the three tildes) -->
+```
+```
+
+### Your OS
+
+<!--- Pick one below and delete the rest: -->
+ - macOS (version)
+ - Windows (version)
+ - Linux (version)
+
+### Summary
+
+<!--- Explain the problem briefly. If submitting a bug report or support request, PLEASE paste the entire error message you're getting. -->

From d879dd10586225711dd6dda85f3b21e2e4f180a7 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 18 Nov 2016 09:13:08 -0600
Subject: [PATCH 0499/1273] Formatting fixes for ISSUE_TEMPLATE.

---
 .github/ISSUE_TEMPLATE | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE b/.github/ISSUE_TEMPLATE
index 6c982f3ba..9af55f453 100644
--- a/.github/ISSUE_TEMPLATE
+++ b/.github/ISSUE_TEMPLATE
@@ -4,7 +4,7 @@ Drupal VM is used by developers in a wide variety of circumstances. Please use t
 ### Issue Type
 
 <!--- Pick one below and delete the rest: -->
- - Bug Report
+ - Bug Report / Support Request
  - Feature Idea
  - Documentation Report
 
@@ -12,14 +12,15 @@ Drupal VM is used by developers in a wide variety of circumstances. Please use t
 
 <!--- Paste the output from the following command: `vagrant --version && echo "VirtualBox `vboxmanage --version`" && ansible --version` (paste it in the space between the three tildes) -->
 ```
+
 ```
 
 ### Your OS
 
 <!--- Pick one below and delete the rest: -->
- - macOS (version)
- - Windows (version)
- - Linux (version)
+ - **macOS** (version)
+ - **Windows** (version)
+ - **Linux** (version)
 
 ### Summary
 

From 740a3c26c435024f8597f805404359930ccebab3 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 18 Nov 2016 16:54:45 -0600
Subject: [PATCH 0500/1273] Fixes #1002: Update Drush role to allow for shallow
 git clones.

---
 provisioning/requirements.yml                          | 2 +-
 provisioning/roles/geerlingguy.drush/README.md         | 8 ++++++--
 provisioning/roles/geerlingguy.drush/defaults/main.yml | 1 +
 provisioning/roles/geerlingguy.drush/tasks/main.yml    | 1 +
 provisioning/roles/geerlingguy.drush/tests/test.yml    | 2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index bc1c4ee7c..469976025 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -18,7 +18,7 @@
 - src: geerlingguy.drupal-console
   version: 1.0.7
 - src: geerlingguy.drush
-  version: 1.1.4
+  version: 1.2.0
 - src: geerlingguy.elasticsearch
   version: 2.1.1
 - src: geerlingguy.firewall
diff --git a/provisioning/roles/geerlingguy.drush/README.md b/provisioning/roles/geerlingguy.drush/README.md
index 32422a140..f024bb4a8 100644
--- a/provisioning/roles/geerlingguy.drush/README.md
+++ b/provisioning/roles/geerlingguy.drush/README.md
@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/geerlingguy/ansible-role-drush.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-drush)
 
-Installs Drush, a command line shell and scripting interface for Drupal, on any Linux or UNIX system.
+Installs [Drush](http://www.drush.org/en/master/), a command line shell and scripting interface for Drupal, on any Linux or UNIX system.
 
 ## Requirements
 
@@ -33,6 +33,10 @@ Whether to keep Drush up-to-date with the latest revision of the branch specifie
 
 These options are the safest for avoiding GitHub API rate limits when installing Drush, and can be very helpful when working on dependencies/installation, but builds can be sped up substantially by changing the first option to --prefer-dist.
 
+    drush_clone_depth: 1
+
+Whether to clone the entire repo (by default), or specify the number of previous commits for a smaller and faster clone.
+
 ## Dependencies
 
   - geerlingguy.git (Installs Git).
@@ -43,7 +47,7 @@ These options are the safest for avoiding GitHub API rate limits when installing
 
     - hosts: servers
       roles:
-        - { role: geerlingguy.drush }
+        - geerlingguy.drush
 
 After the playbook runs, the `drush` command will be accessible from normal system accounts.
 
diff --git a/provisioning/roles/geerlingguy.drush/defaults/main.yml b/provisioning/roles/geerlingguy.drush/defaults/main.yml
index cd42d280b..77f4583c3 100644
--- a/provisioning/roles/geerlingguy.drush/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.drush/defaults/main.yml
@@ -6,3 +6,4 @@ drush_keep_updated: no
 drush_force_update: no
 
 drush_composer_cli_options: "--prefer-dist --no-interaction"
+drush_clone_depth: 1
diff --git a/provisioning/roles/geerlingguy.drush/tasks/main.yml b/provisioning/roles/geerlingguy.drush/tasks/main.yml
index 287fa6505..203312cf6 100644
--- a/provisioning/roles/geerlingguy.drush/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.drush/tasks/main.yml
@@ -6,6 +6,7 @@
     version: "{{ drush_version }}"
     update: "{{ drush_keep_updated }}"
     force: "{{ drush_force_update }}"
+    depth: "{{ drush_clone_depth }}"
   register: drush_clone
 
 - name: Check for composer.json
diff --git a/provisioning/roles/geerlingguy.drush/tests/test.yml b/provisioning/roles/geerlingguy.drush/tests/test.yml
index 6e246260a..6a8360a01 100644
--- a/provisioning/roles/geerlingguy.drush/tests/test.yml
+++ b/provisioning/roles/geerlingguy.drush/tests/test.yml
@@ -11,7 +11,7 @@
       when: ansible_os_family == 'RedHat'
 
     - name: Update apt cache.
-      apt: update_cache=yes
+      apt: update_cache=yes cache_valid_time=600
       when: ansible_os_family == 'Debian'
 
   roles:

From 47e2f6d7bd7906bd7e4fcd79d78cf8fed7621e71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sun, 20 Nov 2016 11:55:25 -0500
Subject: [PATCH 0501/1273] Add php_pgsql_package note to PHP 5.6 docs

---
 docs/other/php-56.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/other/php-56.md b/docs/other/php-56.md
index d89cf1825..bd5fb6276 100644
--- a/docs/other/php-56.md
+++ b/docs/other/php-56.md
@@ -51,6 +51,9 @@ php_redis_package: php5.6-redis
 # If you install `memcached`:
 php_memcached_package: php5.6-memcached
 
+# If you have `drupalvm_database` set to `pgsql`:
+php_pgsql_package: php5.6-pgsql
+
 # If you install `xhprof`:
 xhprof_download_url: https://github.com/phacility/xhprof/archive/master.tar.gz
 xhprof_download_folder_name: xhprof-master

From efa622b755a3f5ed94a664961b3d170de58b5e32 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 22 Nov 2016 11:44:18 -0600
Subject: [PATCH 0502/1273] Fixes #1009, Fixes #1007: Updates to GitHub
 ISSUE_TEMPLATE.

---
 .github/ISSUE_TEMPLATE | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE b/.github/ISSUE_TEMPLATE
index 9af55f453..7f0e3575e 100644
--- a/.github/ISSUE_TEMPLATE
+++ b/.github/ISSUE_TEMPLATE
@@ -10,7 +10,7 @@ Drupal VM is used by developers in a wide variety of circumstances. Please use t
 
 ### Your Environment
 
-<!--- Paste the output from the following command: `vagrant --version && echo "VirtualBox `vboxmanage --version`" && ansible --version` (paste it in the space between the three tildes) -->
+<!--- Paste the output from the following command: `vagrant --version && echo "VirtualBox `vboxmanage --version`" && ansible --version` (paste it in the space between the three graves) -->
 ```
 
 ```
@@ -22,6 +22,10 @@ Drupal VM is used by developers in a wide variety of circumstances. Please use t
  - **Windows** (version)
  - **Linux** (version)
 
+### Full console output
+
+<!--- If this is a Bug Report / Support Request, please copy the ENTIRE contents of your console (including the command that was run), paste it into a new Gist on https://gist.github.com, then paste the link to the gist here. -->
+
 ### Summary
 
 <!--- Explain the problem briefly. If submitting a bug report or support request, PLEASE paste the entire error message you're getting. -->

From c13feef44a0fb6c63f36d6983d9408f9a57f06d2 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 23 Nov 2016 09:39:56 -0600
Subject: [PATCH 0503/1273] Update Nginx role to latest version.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.nginx/.travis.yml       | 52 +++++++------------
 .../geerlingguy.nginx/tasks/setup-Debian.yml  |  1 +
 .../roles/geerlingguy.nginx/tasks/vhosts.yml  |  2 +-
 .../geerlingguy.nginx/templates/nginx.conf.j2 |  2 +-
 5 files changed, 22 insertions(+), 37 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 469976025..ae5b07d6e 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -34,7 +34,7 @@
 - src: geerlingguy.mysql
   version: 2.4.2
 - src: geerlingguy.nginx
-  version: 1.9.5
+  version: 1.9.6
 - src: geerlingguy.nodejs
   version: 3.3.0
 - src: geerlingguy.php
diff --git a/provisioning/roles/geerlingguy.nginx/.travis.yml b/provisioning/roles/geerlingguy.nginx/.travis.yml
index ce781f6a8..c1f98605d 100644
--- a/provisioning/roles/geerlingguy.nginx/.travis.yml
+++ b/provisioning/roles/geerlingguy.nginx/.travis.yml
@@ -1,50 +1,38 @@
 ---
-sudo: required
+services: docker
 
 env:
-  global:
-    # https://github.com/travis-ci/travis-ci/issues/6461#issuecomment-239577306
-    DOCKER_VERSION: "1.9.1-0~trusty"
-  matrix:
-    - distro: centos7
-      init: /usr/lib/systemd/systemd
-      run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-    - distro: ubuntu1604
-      init: /lib/systemd/systemd
-      run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-    - distro: ubuntu1404
-      init: /sbin/init
-      run_opts: ""
-    - distro: ubuntu1204
-      init: /sbin/init
-      run_opts: ""
-
-services:
-  - docker
+  - distro: centos7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distro: ubuntu1604
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distro: ubuntu1404
+    init: /sbin/init
+    run_opts: ""
+  - distro: ubuntu1204
+    init: /sbin/init
+    run_opts: ""
 
 before_install:
-  # Downgrade to older version of Docker engine.
-  - sudo apt-get update
-  - sudo apt-get remove docker-engine -yq
-  - sudo apt-get install docker-engine=$DOCKER_VERSION -yq --no-install-suggests --no-install-recommends --force-yes -o Dpkg::Options::="--force-confnew"
-
   # Pull container.
-  - 'sudo docker pull geerlingguy/docker-${distro}-ansible:latest'
+  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
   - container_id=$(mktemp)
   # Run container in detached state.
-  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
+  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
 
   # Ansible syntax check.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
 
   # Test role.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+  - 'docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
 
   # Test role idempotence.
   - idempotence=$(mktemp)
-  - sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
+  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
   - >
     tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
@@ -54,9 +42,5 @@ script:
   # Check if nginx is running.
   # TODO
 
-after_success:
-  # Clean up.
-  - 'sudo docker stop "$(cat ${container_id})"'
-
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.nginx/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.nginx/tasks/setup-Debian.yml
index 43f9ab84d..2638ce052 100644
--- a/provisioning/roles/geerlingguy.nginx/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.nginx/tasks/setup-Debian.yml
@@ -1,6 +1,7 @@
 ---
 - name: Update apt cache.
   apt: update_cache=yes cache_valid_time=86400
+  changed_when: false
 
 - name: Ensure nginx is installed.
   apt:
diff --git a/provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml b/provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml
index aca9315b0..cf27c146e 100644
--- a/provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml
+++ b/provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml
@@ -4,7 +4,7 @@
     path: "{{ nginx_default_vhost_path }}"
     state: absent
   when: nginx_remove_default_vhost
-  notify: reload nginx
+  notify: restart nginx
 
 - name: Ensure nginx_vhost_path exists.
   file:
diff --git a/provisioning/roles/geerlingguy.nginx/templates/nginx.conf.j2 b/provisioning/roles/geerlingguy.nginx/templates/nginx.conf.j2
index 38bf0cdfd..cedfd72fc 100644
--- a/provisioning/roles/geerlingguy.nginx/templates/nginx.conf.j2
+++ b/provisioning/roles/geerlingguy.nginx/templates/nginx.conf.j2
@@ -42,7 +42,7 @@ http {
 {% endif %}
 
 {% if nginx_extra_http_options %}
-    {{ nginx_extra_http_options }}
+    {{ nginx_extra_http_options|indent(4, False) }}
 {% endif %}
 
 {% for upstream in nginx_upstreams %}

From 2182f03e358638f1ad2b5e8cf1d3a6cb98b6940e Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 23 Nov 2016 12:13:03 -0600
Subject: [PATCH 0504/1273] Update Solr role to latest version.

---
 provisioning/requirements.yml                      |  2 +-
 .../roles/geerlingguy.solr/tasks/install.yml       | 14 +++++++++++++-
 .../roles/geerlingguy.solr/tests/test-solr-6.yml   |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index ae5b07d6e..32f925116 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -68,6 +68,6 @@
 - src: geerlingguy.security
   version: 1.4.0
 - src: geerlingguy.solr
-  version: 3.2.2
+  version: 3.2.3
 - src: geerlingguy.varnish
   version: 1.8.1
diff --git a/provisioning/roles/geerlingguy.solr/tasks/install.yml b/provisioning/roles/geerlingguy.solr/tasks/install.yml
index d541d6cf0..7f76d026f 100644
--- a/provisioning/roles/geerlingguy.solr/tasks/install.yml
+++ b/provisioning/roles/geerlingguy.solr/tasks/install.yml
@@ -18,5 +18,17 @@
 # Workaround for bug https://github.com/ansible/ansible-modules-core/issues/915.
 - name: Ensure solr is stopped (RHEL 7 workaround).
   command: service {{ solr_service_name }} stop
-  when: (ansible_os_family == 'RedHat') and (ansible_distribution_version.split(".")[0] == '7') and (solr_install_script_result.changed)
+  when: >
+    (ansible_os_family == 'RedHat')
+    and (ansible_distribution_version.split(".")[0] == '7')
+    and (solr_install_script_result.changed)
   failed_when: false
+
+- name: Run systemd daemon_reload (RHEL 7 workaround).
+  systemd:
+    name: solr
+    daemon_reload: yes
+  when: >
+    (ansible_os_family == 'RedHat')
+    and (ansible_distribution_version.split(".")[0] == '7')
+    and (solr_install_script_result.changed)
diff --git a/provisioning/roles/geerlingguy.solr/tests/test-solr-6.yml b/provisioning/roles/geerlingguy.solr/tests/test-solr-6.yml
index 920aea445..2bd2b6c89 100644
--- a/provisioning/roles/geerlingguy.solr/tests/test-solr-6.yml
+++ b/provisioning/roles/geerlingguy.solr/tests/test-solr-6.yml
@@ -29,7 +29,7 @@
       when: ansible_distribution == "Debian"
 
     - name: Update apt cache.
-      apt: update_cache=yes
+      apt: update_cache=yes cache_valid_time=600
       when: ansible_distribution == "Debian" and debian_backports.changed
 
   roles:

From b2217865840ac042ad040d5fc1b7daeb8c314d21 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 23 Nov 2016 14:09:32 -0600
Subject: [PATCH 0505/1273] Update Git and PHP roles to latest versions.

---
 provisioning/requirements.yml                 |  4 +--
 .../roles/geerlingguy.git/.travis.yml         | 31 +++++++++----------
 .../tasks/install-from-source.yml             |  5 ++-
 .../geerlingguy.git/tests/test-source.yml     |  7 +++--
 .../roles/geerlingguy.git/tests/test.yml      |  7 +++--
 .../roles/geerlingguy.php/.travis.yml         |  4 +--
 provisioning/roles/geerlingguy.php/README.md  |  1 +
 .../roles/geerlingguy.php/defaults/main.yml   |  1 +
 .../tasks/install-from-source.yml             |  2 +-
 .../geerlingguy.php/tests/test-source.yml     |  7 +++--
 .../roles/geerlingguy.php/tests/test.yml      |  3 +-
 11 files changed, 41 insertions(+), 31 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 32f925116..e8847d0fa 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -24,7 +24,7 @@
 - src: geerlingguy.firewall
   version: 1.3.1
 - src: geerlingguy.git
-  version: 1.2.0
+  version: 1.2.1
 - src: geerlingguy.java
   version: 1.7.1
 - src: geerlingguy.mailhog
@@ -38,7 +38,7 @@
 - src: geerlingguy.nodejs
   version: 3.3.0
 - src: geerlingguy.php
-  version: 3.4.1
+  version: 3.4.2
 - src: geerlingguy.php-memcached
   version: 2.0.0
 - src: geerlingguy.php-mysql
diff --git a/provisioning/roles/geerlingguy.git/.travis.yml b/provisioning/roles/geerlingguy.git/.travis.yml
index 64ce03c6f..68cc3cecd 100644
--- a/provisioning/roles/geerlingguy.git/.travis.yml
+++ b/provisioning/roles/geerlingguy.git/.travis.yml
@@ -1,5 +1,5 @@
 ---
-sudo: required
+services: docker
 
 env:
   # Test source install on latest supported OSes.
@@ -25,6 +25,11 @@ env:
     run_opts: "--privileged"
     playbook: test.yml
     GIT_VERSION: 1.7.1
+  - distro: fedora24
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    playbook: test.yml
+    GIT_VERSION: 2.7.4
   - distro: ubuntu1604
     init: /lib/systemd/systemd
     run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
@@ -46,27 +51,24 @@ env:
     playbook: test.yml
     GIT_VERSION: 2.1.4
 
-services:
-  - docker
-
 before_install:
   # Pull container.
-  - 'sudo docker pull geerlingguy/docker-${distro}-ansible:latest'
+  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
   - container_id=$(mktemp)
   # Run container in detached state.
-  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
+  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
 
   # Ansible syntax check.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} --syntax-check'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} --syntax-check'
 
   # Test role.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook}'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook}'
 
   # Test role idempotence.
   - idempotence=$(mktemp)
-  - sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} | tee -a ${idempotence}
+  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} | tee -a ${idempotence}
   - >
     tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
@@ -74,14 +76,11 @@ script:
     || (echo 'Idempotence test: fail' && exit 1)
 
   # Ensure Git is installed and at the right version.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm which git'
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm test -x /usr/bin/git'
-
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm git --version'
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm /usr/bin/git --version | grep -qF "$GIT_VERSION"'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm which git'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm test -x /usr/bin/git'
 
-  # Clean up.
-  - 'sudo docker stop "$(cat ${container_id})"'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm git --version'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm /usr/bin/git --version | grep -qF "$GIT_VERSION"'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.git/tasks/install-from-source.yml b/provisioning/roles/geerlingguy.git/tasks/install-from-source.yml
index ff8b71b29..d634652e6 100644
--- a/provisioning/roles/geerlingguy.git/tasks/install-from-source.yml
+++ b/provisioning/roles/geerlingguy.git/tasks/install-from-source.yml
@@ -25,9 +25,12 @@
   when: ansible_os_family == 'Debian'
 
 - name: Get installed version
-  command: git --version
+  command: >
+    git --version
+    warn=no
   changed_when: false
   failed_when: false
+  always_run: yes
   register: git_installed_version
 
 - name: Force git install if the version numbers do not match
diff --git a/provisioning/roles/geerlingguy.git/tests/test-source.yml b/provisioning/roles/geerlingguy.git/tests/test-source.yml
index ffde9906c..207c48215 100644
--- a/provisioning/roles/geerlingguy.git/tests/test-source.yml
+++ b/provisioning/roles/geerlingguy.git/tests/test-source.yml
@@ -7,9 +7,10 @@
     git_version: 2.9.3
 
   pre_tasks:
-    - name: Ensure build dependencies are installed (RedHat).
-      package: name=which state=present
-      when: ansible_os_family == 'RedHat'
+    - name: Update apt cache.
+      apt: update_cache=yes cache_valid_time=600
+      when: ansible_os_family == 'Debian'
+      changed_when: false
 
   roles:
     - role_under_test
diff --git a/provisioning/roles/geerlingguy.git/tests/test.yml b/provisioning/roles/geerlingguy.git/tests/test.yml
index 75248020d..728ac2425 100644
--- a/provisioning/roles/geerlingguy.git/tests/test.yml
+++ b/provisioning/roles/geerlingguy.git/tests/test.yml
@@ -6,9 +6,10 @@
     git_install_path: /usr/local
 
   pre_tasks:
-    - name: Ensure build dependencies are installed (RedHat).
-      package: name=which state=present
-      when: ansible_os_family == 'RedHat'
+    - name: Update apt cache.
+      apt: update_cache=yes cache_valid_time=600
+      when: ansible_os_family == 'Debian'
+      changed_when: false
 
   roles:
     - role_under_test
diff --git a/provisioning/roles/geerlingguy.php/.travis.yml b/provisioning/roles/geerlingguy.php/.travis.yml
index f79975808..0c2146fb9 100644
--- a/provisioning/roles/geerlingguy.php/.travis.yml
+++ b/provisioning/roles/geerlingguy.php/.travis.yml
@@ -34,12 +34,12 @@ env:
     init: /usr/lib/systemd/systemd
     run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     playbook: test-source.yml
-    php_version: 7.0.5
+    php_version: 7.0.13
   - distro: ubuntu1604
     init: /lib/systemd/systemd
     run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     playbook: test-source.yml
-    php_version: 7.0.5
+    php_version: 7.0.13
 
 before_install:
   # Pull container.
diff --git a/provisioning/roles/geerlingguy.php/README.md b/provisioning/roles/geerlingguy.php/README.md
index 723cebb15..857458898 100644
--- a/provisioning/roles/geerlingguy.php/README.md
+++ b/provisioning/roles/geerlingguy.php/README.md
@@ -154,6 +154,7 @@ Set this to `true` to install PHP from source instead of installing from package
 The version of PHP to install from source (a git branch, tag, or commit hash).
 
     php_source_clone_dir: "~/php-src"
+    php_source_clone_depth: 1
     php_source_install_path: "/opt/php"
     php_source_install_gmp_path: "/usr/include/x86_64-linux-gnu/gmp.h"
 
diff --git a/provisioning/roles/geerlingguy.php/defaults/main.yml b/provisioning/roles/geerlingguy.php/defaults/main.yml
index db1564337..cfdbb1986 100644
--- a/provisioning/roles/geerlingguy.php/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.php/defaults/main.yml
@@ -79,6 +79,7 @@ php_display_startup_errors: "Off"
 php_install_from_source: false
 php_source_version: "master"
 php_source_clone_dir: "~/php-src"
+php_source_clone_depth: 1
 php_source_install_path: "/opt/php"
 php_source_install_gmp_path: "/usr/include/x86_64-linux-gnu/gmp.h"
 # For faster compile time: "make --jobs=X" where X is # of cores present.
diff --git a/provisioning/roles/geerlingguy.php/tasks/install-from-source.yml b/provisioning/roles/geerlingguy.php/tasks/install-from-source.yml
index 1d0d985ec..fdbad6beb 100644
--- a/provisioning/roles/geerlingguy.php/tasks/install-from-source.yml
+++ b/provisioning/roles/geerlingguy.php/tasks/install-from-source.yml
@@ -82,7 +82,7 @@
     dest: "{{ php_source_clone_dir }}"
     version: "{{ php_source_version }}"
     accept_hostkey: yes
-    depth: 1
+    depth: "{{ php_source_clone_depth }}"
   when: php_installed|failed
 
 - name: Ensure PHP installation path exists.
diff --git a/provisioning/roles/geerlingguy.php/tests/test-source.yml b/provisioning/roles/geerlingguy.php/tests/test-source.yml
index ac8b7a0b1..5bd5bb16d 100644
--- a/provisioning/roles/geerlingguy.php/tests/test-source.yml
+++ b/provisioning/roles/geerlingguy.php/tests/test-source.yml
@@ -5,14 +5,17 @@
     php_enable_webserver: false
     php_install_from_source: true
     php_source_clone_dir: /root/php-src
+    # Workaround for https://github.com/ansible/ansible-modules-core/issues/5457
+    php_source_clone_depth: 0
     php_source_make_command: "make --jobs=2"
-    php_source_version: "php-7.0.5"
+    php_source_version: "php-7.0.13"
     php_memory_limit: "192M"
 
   pre_tasks:
     - name: Update apt cache.
-      apt: update_cache=yes
+      apt: update_cache=yes cache_valid_time=600
       when: ansible_os_family == 'Debian'
+      changed_when: false
 
   roles:
     - geerlingguy.git
diff --git a/provisioning/roles/geerlingguy.php/tests/test.yml b/provisioning/roles/geerlingguy.php/tests/test.yml
index 29d42e49e..eecafef2c 100644
--- a/provisioning/roles/geerlingguy.php/tests/test.yml
+++ b/provisioning/roles/geerlingguy.php/tests/test.yml
@@ -9,8 +9,9 @@
 
   pre_tasks:
     - name: Update apt cache.
-      apt: update_cache=yes
+      apt: update_cache=yes cache_valid_time=600
       when: ansible_os_family == 'Debian'
+      changed_when: false
 
     - include_vars: test-vars-ubuntu1204.yml
       when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '12.04'

From da79ab78b80acff34cb5a787b3b33ac097bec28d Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 24 Nov 2016 10:09:28 -0600
Subject: [PATCH 0506/1273] Update to Solr role version 3.3.1.

---
 provisioning/requirements.yml                     | 2 +-
 provisioning/roles/geerlingguy.solr/meta/main.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index e8847d0fa..fbea3ef8c 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -68,6 +68,6 @@
 - src: geerlingguy.security
   version: 1.4.0
 - src: geerlingguy.solr
-  version: 3.2.3
+  version: 3.3.1
 - src: geerlingguy.varnish
   version: 1.8.1
diff --git a/provisioning/roles/geerlingguy.solr/meta/main.yml b/provisioning/roles/geerlingguy.solr/meta/main.yml
index 90d9f7692..77548dd65 100644
--- a/provisioning/roles/geerlingguy.solr/meta/main.yml
+++ b/provisioning/roles/geerlingguy.solr/meta/main.yml
@@ -6,7 +6,7 @@ galaxy_info:
   description: Apache Solr for Linux.
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 1.8
+  min_ansible_version: 2.2
   platforms:
     - name: EL
       versions:

From 8beb84bbba661cf3e3ffec81f156b3926fab8dae Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 27 Nov 2016 09:58:59 -0600
Subject: [PATCH 0507/1273] Fixes #1018: Possible syntax problem in solr role.

---
 default.config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.config.yml b/default.config.yml
index deec7e8af..18531c041 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -34,7 +34,7 @@ vagrant_cpus: 1
 
 # Minimum required versions.
 drupalvm_vagrant_version_min: '1.8.6'
-drupalvm_ansible_version_min: '2.1'
+drupalvm_ansible_version_min: '2.2'
 
 # Force use of ansible_local provisioner, even if Ansible is installed on host.
 force_ansible_local: false

From 4aa05538f02c847c36415feea6a1bfe868901d0b Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 29 Nov 2016 15:52:06 -0600
Subject: [PATCH 0508/1273] Fixes #1020: Stick to Drush 8.x for now, for D7
 compatibility.

---
 default.config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.config.yml b/default.config.yml
index 18531c041..b4105a0d4 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -215,7 +215,7 @@ extra_packages:
 # You can configure almost anything else on the server in the rest of this file.
 extra_security_enabled: false
 
-drush_version: "master"
+drush_version: "8.x"
 drush_keep_updated: true
 drush_composer_cli_options: "--prefer-dist --no-interaction"
 

From c5fb62ecab2b53ed308f06ee90077a0d1997ab11 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 29 Nov 2016 15:53:15 -0600
Subject: [PATCH 0509/1273] Update issue template to make it nicer if section
 isn't deleted.

---
 .github/ISSUE_TEMPLATE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE b/.github/ISSUE_TEMPLATE
index 7f0e3575e..ca026daad 100644
--- a/.github/ISSUE_TEMPLATE
+++ b/.github/ISSUE_TEMPLATE
@@ -1,5 +1,5 @@
 
-Drupal VM is used by developers in a wide variety of circumstances. Please use this template when reporting issues or suggesting features so we can help you more efficiently. **Delete this section** and fill in the rest of the template below, deleting the commented sections marked by `<!--- -->`:
+<!--- Drupal VM is used by developers in a wide variety of circumstances. Please use this template when reporting issues or suggesting features so we can help you more efficiently. **Delete this section** and fill in the rest of the template below, deleting the commented sections marked by `<!--- -->`: -->
 
 ### Issue Type
 

From 77741f6b6ee0516212b3ea4bcc6c0ac5c5eae6ab Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 30 Nov 2016 14:15:03 -0600
Subject: [PATCH 0510/1273] Fixes #981: Bump minimum required Vagrant and
 VirtualBox versions.

---
 README.md          | 2 +-
 default.config.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index fb93f26e4..599aebdb7 100644
--- a/README.md
+++ b/README.md
@@ -74,7 +74,7 @@ Notes:
 
   - **For faster provisioning** (macOS/Linux only): *[Install Ansible](http://docs.ansible.com/intro_installation.html) on your host machine, so Drupal VM can run the provisioning steps locally instead of inside the VM.*
   - **NFS on Linux**: *If NFS is not already installed on your host, you will need to install it to use the default NFS synced folder configuration. See guides for [Debian/Ubuntu](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-ubuntu-14-04), [Arch](https://wiki.archlinux.org/index.php/NFS#Installation), and [RHEL/CentOS](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-centos-6).*
-  - **Versions**: *Make sure you're running the latest releases of Vagrant, VirtualBox, and Ansible—as of February 2016, Drupal VM recommends: Vagrant 1.8.6, VirtualBox 5.1.8+, and Ansible 2.2.x*
+  - **Versions**: *Make sure you're running the latest releases of Vagrant, VirtualBox, and Ansible—as of late 2016, Drupal VM recommends: Vagrant 1.9.0, VirtualBox 5.1.10+, and Ansible 2.2.x*
 
 ### 2 - Build the Virtual Machine
 
diff --git a/default.config.yml b/default.config.yml
index b4105a0d4..10d30d65c 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -33,7 +33,7 @@ vagrant_memory: 2048
 vagrant_cpus: 1
 
 # Minimum required versions.
-drupalvm_vagrant_version_min: '1.8.6'
+drupalvm_vagrant_version_min: '1.9.0'
 drupalvm_ansible_version_min: '2.2'
 
 # Force use of ansible_local provisioner, even if Ansible is installed on host.

From c6d204fff6eacaef70f5b4b10d50e1430aac0bb6 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 30 Nov 2016 14:47:19 -0600
Subject: [PATCH 0511/1273] Fixes #1014: Wrong path in extra tasks example.

---
 docs/extras/scripts.md | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/docs/extras/scripts.md b/docs/extras/scripts.md
index ea2f4699f..c3c71cc45 100644
--- a/docs/extras/scripts.md
+++ b/docs/extras/scripts.md
@@ -24,17 +24,14 @@ Place your pre and post provision scripts inside a `scripts` directory in the ro
 To use an extra ansible task file, configure the path to the file (relative to `provisioning/files/`) in `config.yml`:
 
 ```yaml
-pre_provision_tasks_dir: "../../scripts/pre/*"
-post_provision_tasks_dir: "../../scripts/post-provision.yml"
+pre_provision_tasks_dir: "../scripts/pre/*"
+post_provision_tasks_dir: "../scripts/post-provision.yml"
 ```
 
 The path will be evaluated as a [glob pattern](https://docs.python.org/2/library/glob.html) so you can point to a single file or a directory matching a set of files.
 
 The files matched will run in alphabetical order, and as with shell scripts, pre-provision task files will run before any other packages are installed.
 
-_Note: Unlike pre- and post-provision scripts, extra task files will be relative to `provisioning/files/` instead of `provisioning/`._
-
-
 ## Ansible playbooks
 
 Out of the box Drupal VM does not support running additional playbooks or adding your own roles but using [`Vagrantfile.local`](../other/overriding-configurations.md#extending-the-vagrantfile-with-vagrantfilelocal) you can add any number of additional provisioners to vagrant.

From cdd98f14d9f1789b614fe74d7cd0a89b33f472d1 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 30 Nov 2016 15:32:51 -0600
Subject: [PATCH 0512/1273] Aaaand we're back to Vagrant 1.8.6. Grr.

---
 README.md          | 2 +-
 default.config.yml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 599aebdb7..2f1645261 100644
--- a/README.md
+++ b/README.md
@@ -74,7 +74,7 @@ Notes:
 
   - **For faster provisioning** (macOS/Linux only): *[Install Ansible](http://docs.ansible.com/intro_installation.html) on your host machine, so Drupal VM can run the provisioning steps locally instead of inside the VM.*
   - **NFS on Linux**: *If NFS is not already installed on your host, you will need to install it to use the default NFS synced folder configuration. See guides for [Debian/Ubuntu](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-ubuntu-14-04), [Arch](https://wiki.archlinux.org/index.php/NFS#Installation), and [RHEL/CentOS](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-centos-6).*
-  - **Versions**: *Make sure you're running the latest releases of Vagrant, VirtualBox, and Ansible—as of late 2016, Drupal VM recommends: Vagrant 1.9.0, VirtualBox 5.1.10+, and Ansible 2.2.x*
+  - **Versions**: *Make sure you're running the latest releases of Vagrant, VirtualBox, and Ansible—as of late 2016, Drupal VM recommends: Vagrant 1.8.6, VirtualBox 5.1.10+, and Ansible 2.2.x*
 
 ### 2 - Build the Virtual Machine
 
diff --git a/default.config.yml b/default.config.yml
index 10d30d65c..c13d780eb 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -33,7 +33,7 @@ vagrant_memory: 2048
 vagrant_cpus: 1
 
 # Minimum required versions.
-drupalvm_vagrant_version_min: '1.9.0'
+drupalvm_vagrant_version_min: '1.8.6'
 drupalvm_ansible_version_min: '2.2'
 
 # Force use of ansible_local provisioner, even if Ansible is installed on host.
@@ -304,7 +304,7 @@ php_xdebug_idekey: PHPSTORM
 php_xdebug_max_nesting_level: 256
 
 # Solr Configuration (if enabled above).
-solr_version: "5.5.2"
+solr_version: "5.5.3"
 solr_xms: "64M"
 solr_xmx: "128M"
 

From 29abd947ff1e17e6c941f9fc7c385fd1666b63ff Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 30 Nov 2016 16:16:33 -0600
Subject: [PATCH 0513/1273] Update to latest Solr role version - 3.4.0.

---
 provisioning/requirements.yml                             | 2 +-
 provisioning/roles/geerlingguy.solr/README.md             | 4 ++++
 provisioning/roles/geerlingguy.solr/defaults/main.yml     | 4 +++-
 provisioning/roles/geerlingguy.solr/tasks/configure.yml   | 4 +++-
 provisioning/roles/geerlingguy.solr/tasks/cores.yml       | 2 ++
 provisioning/roles/geerlingguy.solr/tests/test-solr-5.yml | 8 ++++++++
 6 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index fbea3ef8c..d486e063b 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -68,6 +68,6 @@
 - src: geerlingguy.security
   version: 1.4.0
 - src: geerlingguy.solr
-  version: 3.3.1
+  version: 3.4.0
 - src: geerlingguy.varnish
   version: 1.8.1
diff --git a/provisioning/roles/geerlingguy.solr/README.md b/provisioning/roles/geerlingguy.solr/README.md
index e773b267f..2a241d40e 100644
--- a/provisioning/roles/geerlingguy.solr/README.md
+++ b/provisioning/roles/geerlingguy.solr/README.md
@@ -49,6 +49,10 @@ The port on which Solr will run.
 
 Memory settings for the JVM. These should be set as high as you can allow for best performance and to reduce the chance of Solr restarting itself due to OOM situations.
 
+    solr_timezone: "UTC"
+
+Default timezone of JVM running solr. You can override this if needed when using dataimport and delta imports (ex: comparing against a MySQL external data source). Read through Apache Solr's [Working with Dates](https://cwiki.apache.org/confluence/display/solr/Working+with+Dates) documentation for more background.
+
     solr_cores:
       - collection1
 
diff --git a/provisioning/roles/geerlingguy.solr/defaults/main.yml b/provisioning/roles/geerlingguy.solr/defaults/main.yml
index fd6581cdc..152d29342 100644
--- a/provisioning/roles/geerlingguy.solr/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.solr/defaults/main.yml
@@ -4,7 +4,7 @@ solr_workspace: /root
 solr_create_user: true
 solr_user: solr
 
-solr_version: "6.2.0"
+solr_version: "6.3.0"
 solr_mirror: "https://archive.apache.org/dist"
 
 solr_service_name: solr
@@ -16,6 +16,8 @@ solr_port: "8983"
 solr_xms: "256M"
 solr_xmx: "512M"
 
+solr_timezone: "UTC"
+
 solr_cores:
   - collection1
 
diff --git a/provisioning/roles/geerlingguy.solr/tasks/configure.yml b/provisioning/roles/geerlingguy.solr/tasks/configure.yml
index 9dc575c6b..26b5f7a77 100644
--- a/provisioning/roles/geerlingguy.solr/tasks/configure.yml
+++ b/provisioning/roles/geerlingguy.solr/tasks/configure.yml
@@ -6,7 +6,7 @@
     state: absent
   notify: restart solr
 
-- name: Apply Solr memory configuration changes.
+- name: Apply Solr configuration changes.
   lineinfile:
     dest: "{{ solr_config_file }}"
     regexp: "{{ item.regexp }}"
@@ -17,4 +17,6 @@
       line: 'SOLR_JAVA_MEM="-Xms{{ solr_xms }} -Xmx{{ solr_xmx }}"'
     - regexp: "^SOLR_PORT="
       line: 'SOLR_PORT="{{ solr_port }}"'
+    - regexp: "^.?SOLR_TIMEZONE="
+      line: 'SOLR_TIMEZONE="{{ solr_timezone }}"'
   notify: restart solr
\ No newline at end of file
diff --git a/provisioning/roles/geerlingguy.solr/tasks/cores.yml b/provisioning/roles/geerlingguy.solr/tasks/cores.yml
index 463bdb377..1d50a2c4f 100644
--- a/provisioning/roles/geerlingguy.solr/tasks/cores.yml
+++ b/provisioning/roles/geerlingguy.solr/tasks/cores.yml
@@ -24,3 +24,5 @@
   shell: "{{ solr_install_path }}/bin/solr create -c {{ item }}"
   when: "'{{ item }}' not in '{{ solr_cores_current.content }}'"
   with_items: "{{ solr_cores }}"
+  become: yes
+  become_user: "{{ solr_user }}"
diff --git a/provisioning/roles/geerlingguy.solr/tests/test-solr-5.yml b/provisioning/roles/geerlingguy.solr/tests/test-solr-5.yml
index a29cf7ed8..5acedc20f 100644
--- a/provisioning/roles/geerlingguy.solr/tests/test-solr-5.yml
+++ b/provisioning/roles/geerlingguy.solr/tests/test-solr-5.yml
@@ -6,6 +6,14 @@
     java_packages:
       - openjdk-7-jdk
 
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=yes cache_valid_time=600
+      when: ansible_os_family == "Debian"
+
+    - name: Ensure sudo is present.
+      package: name=sudo state=present
+
   roles:
     - geerlingguy.java
     - role_under_test

From 635a3a8488f13dc36d3ea1bf0ea58a5552745c6f Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 2 Dec 2016 13:45:51 -0600
Subject: [PATCH 0514/1273] Fixes #823: Set composer.json type to 'vm' instead
 of 'project'.

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 5a4cd713a..1b9922d36 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "geerlingguy/drupal-vm",
-    "type": "project",
+    "type": "vm",
     "description": "A VM for local Drupal development, built with Vagrant + Ansible",
     "keywords": ["vagrant", "vm", "virtual machine", "drupal"],
     "homepage": "https://www.drupalvm.com",

From f71007b7bb68fa27380555342315d1e892c15a5a Mon Sep 17 00:00:00 2001
From: Tim Cosgrove <timcosgrove@pinterest.com>
Date: Tue, 6 Dec 2016 12:53:21 -0800
Subject: [PATCH 0515/1273] 1036: update acquia.config.yml example with correct
 PHP 5.6 config.

---
 examples/acquia/acquia.config.yml | 46 ++++++++++++++++---------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/examples/acquia/acquia.config.yml b/examples/acquia/acquia.config.yml
index 23b485fe5..51fa380d1 100644
--- a/examples/acquia/acquia.config.yml
+++ b/examples/acquia/acquia.config.yml
@@ -4,32 +4,34 @@ vagrant_box: geerlingguy/ubuntu1204
 
 # Acquia Cloud defaults to PHP 5.6.
 php_version: "5.6"
+php_install_recommends: no
 php_packages:
-  - php5
-  - php5-mcrypt
-  - php5-cli
-  - php5-common
-  - php5-curl
-  - php5-dev
-  - php5-fpm
-  - php5-gd
-  - php5-sqlite
-  - php5-apcu
-  - php-pear
+  - php5.6
+  - php5.6-apcu
+  - php5.6-mcrypt
+  - php5.6-cli
+  - php5.6-common
+  - php5.6-curl
+  - php5.6-dev
+  - php5.6-fpm
+  - php5.6-gd
+  - php5.6-sqlite3
+  - php5.6-xml
+  - php5.6-mbstring
   - libpcre3-dev
 php_conf_paths:
-  - /etc/php5/fpm
-  - /etc/php5/apache2
-  - /etc/php5/cli
+  - /etc/php/5.6/fpm
+  - /etc/php/5.6/apache2
+  - /etc/php/5.6/cli
 php_extension_conf_paths:
-  - /etc/php5/fpm/conf.d
-  - /etc/php5/apache2/conf.d
-  - /etc/php5/cli/conf.d
-php_fpm_daemon: php5-fpm
-php_fpm_conf_path: "/etc/php5/fpm"
-php_fpm_pool_conf_path: "/etc/php5/fpm/pool.d/www.conf"
-php_mysql_package: php5-mysql
-php_memcached_package: php5-memcached
+  - /etc/php/5.6/fpm/conf.d
+  - /etc/php/5.6/apache2/conf.d
+  - /etc/php/5.6/cli/conf.d
+php_fpm_daemon: php5.6-fpm
+php_fpm_conf_path: "/etc/php/5.6/fpm"
+php_fpm_pool_conf_path: "/etc/php/5.6/fpm/pool.d/www.conf"
+php_mysql_package: php5.6-mysql
+php_memcached_package: php5.6-memcached
 
 # Older version of XHProf.
 xhprof_download_url: https://github.com/phacility/xhprof/archive/master.tar.gz

From 9f013f1354f410fe23973c7fd08dd1ecb3c3ef09 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 9 Dec 2016 09:33:47 -0600
Subject: [PATCH 0516/1273] Upgrade Firewall role to latest version.

---
 docs/other/windows.md                         |  4 +-
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.firewall/README.md      | 15 ++++-
 .../geerlingguy.firewall/defaults/main.yml    |  1 +
 .../templates/firewall.bash.j2                | 55 ++++++++++++++++++-
 .../roles/geerlingguy.firewall/tests/test.yml |  1 +
 6 files changed, 71 insertions(+), 7 deletions(-)

diff --git a/docs/other/windows.md b/docs/other/windows.md
index 329c037a6..c0e72acc0 100644
--- a/docs/other/windows.md
+++ b/docs/other/windows.md
@@ -7,9 +7,7 @@ If you are running Windows 10 (Anniversary edition) or later, you can install th
   1. Install Vagrant and VirtualBox in Windows (links in the [Drupal VM Quick Start Guide](https://github.com/geerlingguy/drupal-vm#quick-start-guide)).
   2. [Install/Enable the Windows Subsystem for Linux](https://msdn.microsoft.com/en-us/commandline/wsl/install_guide).
     1. Create an admin account for the Ubuntu Bash environment when prompted.
-  3. Download the latest release of [cbwin](https://github.com/xilun/cbwin) and follow the [cbwin installation instructions](https://github.com/xilun/cbwin#installation).
-  4. Open an instance of `outbash.exe`.
-  5. In a local copy of Drupal VM (downloaded or Git cloned into a path that's in the Windows filesystem, e.g. `/mnt/c/Users/yourusername/Sites/drupal-vm`), run `wrun vagrant up`.
+  3. In a local copy of Drupal VM (downloaded or Git cloned into a path that's in the Windows filesystem, e.g. `/mnt/c/Users/yourusername/Sites/drupal-vm`), run `wrun vagrant up`.
 
 If you need to run any other `vagrant` commands (with the exception of `vagrant ssh`—for now, that must be run in a different environment; see [Vagrant: Use Linux Subsystem on Windows](https://github.com/mitchellh/vagrant/issues/7731)), you can do so by prefixing them with `wrun`.
 
diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index d486e063b..521dc7c14 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -22,7 +22,7 @@
 - src: geerlingguy.elasticsearch
   version: 2.1.1
 - src: geerlingguy.firewall
-  version: 1.3.1
+  version: 2.0.0
 - src: geerlingguy.git
   version: 1.2.1
 - src: geerlingguy.java
diff --git a/provisioning/roles/geerlingguy.firewall/README.md b/provisioning/roles/geerlingguy.firewall/README.md
index a0ee2d4c0..80c86b57b 100644
--- a/provisioning/roles/geerlingguy.firewall/README.md
+++ b/provisioning/roles/geerlingguy.firewall/README.md
@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/geerlingguy/ansible-role-firewall.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-firewall)
 
-Installs a simple iptables-based firewall for RHEL/CentOS or Debian/Ubunty systems.
+Installs a simple iptables-based firewall for RHEL/CentOS or Debian/Ubuntu systems. Supports both IPv4 (`iptables`) and IPv6 (`ip6tables`).
 
 This firewall aims for simplicity over complexity, and only opens a few specific ports for incoming traffic (configurable through Ansible variables). If you have a rudimentary knowledge of `iptables` and/or firewalls in general, this role should be a good starting point for a secure system firewall.
 
@@ -32,8 +32,19 @@ A list of TCP or UDP ports (respectively) to open to incoming traffic.
 Forward `src` port to `dest` port, either TCP or UDP (respectively).
 
     firewall_additional_rules: []
+    firewall_ip6_additional_rules: []
 
-Any additional (custom) rules to be added to the firewall (in the same format you would add them via command line, e.g. `iptables [rule]`).
+Any additional (custom) rules to be added to the firewall (in the same format you would add them via command line, e.g. `iptables [rule]`/`ip6tables [rule]`). A few examples of how this could be used:
+
+    # Allow only the IP 167.89.89.18 to access port 4949 (Munin).
+    firewall_additional_rules:
+      - "iptables -A INPUT -p tcp --dport 4949 -s 167.89.89.18 -j ACCEPT"
+    
+    # Allow only the IP 214.192.48.21 to access port 3306 (MySQL).
+    firewall_additional_rules:
+      - "iptables -A INPUT -p tcp --dport 3306 -s 214.192.48.21 -j ACCEPT"
+
+See [Iptables Essentials: Common Firewall Rules and Commands](https://www.digitalocean.com/community/tutorials/iptables-essentials-common-firewall-rules-and-commands) for more examples.
 
     firewall_log_dropped_packets: true
 
diff --git a/provisioning/roles/geerlingguy.firewall/defaults/main.yml b/provisioning/roles/geerlingguy.firewall/defaults/main.yml
index e20845849..103dacd0f 100644
--- a/provisioning/roles/geerlingguy.firewall/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.firewall/defaults/main.yml
@@ -8,4 +8,5 @@ firewall_allowed_udp_ports: []
 firewall_forwarded_tcp_ports: []
 firewall_forwarded_udp_ports: []
 firewall_additional_rules: []
+firewall_ip6_additional_rules: []
 firewall_log_dropped_packets: true
diff --git a/provisioning/roles/geerlingguy.firewall/templates/firewall.bash.j2 b/provisioning/roles/geerlingguy.firewall/templates/firewall.bash.j2
index bbe6436e9..df9021e9e 100755
--- a/provisioning/roles/geerlingguy.firewall/templates/firewall.bash.j2
+++ b/provisioning/roles/geerlingguy.firewall/templates/firewall.bash.j2
@@ -29,7 +29,12 @@ echo 1 > $filter
 done
 fi
 
-# Remove all rules and chains.
+# Completely reset the firewall by removing all rules and chains.
+iptables -P INPUT ACCEPT
+iptables -P FORWARD ACCEPT
+iptables -P OUTPUT ACCEPT
+iptables -t nat -F
+iptables -t mangle -F
 iptables -F
 iptables -X
 
@@ -81,3 +86,51 @@ iptables -A INPUT -m limit --limit 15/minute -j LOG --log-level 7 --log-prefix "
 
 # Drop all other traffic.
 iptables -A INPUT -j DROP
+
+
+# Configure IPv6 if ip6tables is present.
+if [ -x $(which ip6tables) ]; then
+
+  # Remove all rules and chains.
+  ip6tables -F
+  ip6tables -X
+
+  # Accept traffic from loopback interface (localhost).
+  ip6tables -A INPUT -i lo -j ACCEPT
+
+  # Open ports.
+  {# Add a rule for each open port #}
+  {% for port in firewall_allowed_tcp_ports %}
+  ip6tables -A INPUT -p tcp -m tcp --dport {{ port }} -j ACCEPT
+  {% endfor %}
+  {% for port in firewall_allowed_udp_ports %}
+  ip6tables -A INPUT -p udp -m udp --dport {{ port }} -j ACCEPT
+  {% endfor %}
+
+  # Accept icmp ping requests.
+  ip6tables -A INPUT -p icmp -j ACCEPT
+
+  # Allow NTP traffic for time synchronization.
+  ip6tables -A OUTPUT -p udp --dport 123 -j ACCEPT
+  ip6tables -A INPUT -p udp --sport 123 -j ACCEPT
+
+  # Additional custom rules.
+  {% for rule in firewall_ip6_additional_rules %}
+  {{ rule }}
+  {% endfor %}
+
+  # Allow established connections:
+  ip6tables -A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT
+
+  # Log EVERYTHING (ONLY for Debug).
+  # ip6tables -A INPUT -j LOG
+
+  {% if firewall_log_dropped_packets %}
+  # Log other incoming requests (all of which are dropped) at 15/minute max.
+  ip6tables -A INPUT -m limit --limit 15/minute -j LOG --log-level 7 --log-prefix "Dropped by firewall: "
+  {% endif %}
+
+  # Drop all other traffic.
+  ip6tables -A INPUT -j DROP
+
+fi
diff --git a/provisioning/roles/geerlingguy.firewall/tests/test.yml b/provisioning/roles/geerlingguy.firewall/tests/test.yml
index 0cd1de80f..5521003f9 100644
--- a/provisioning/roles/geerlingguy.firewall/tests/test.yml
+++ b/provisioning/roles/geerlingguy.firewall/tests/test.yml
@@ -9,6 +9,7 @@
     - name: Update apt cache.
       apt: update_cache=yes cache_valid_time=1200
       when: ansible_os_family == 'Debian'
+      changed_when: false
 
   roles:
     - role_under_test

From d7f4035dc8284f3f116fbd08bab95087acf7cab5 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 9 Dec 2016 10:11:09 -0600
Subject: [PATCH 0517/1273] Upgrade to latest version of Apache role.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.apache/README.md        | 31 +++++++++++++++++--
 .../geerlingguy.apache/defaults/main.yml      | 14 +++++++--
 .../geerlingguy.apache/handlers/main.yml      |  2 +-
 .../roles/geerlingguy.apache/meta/main.yml    |  2 ++
 .../tasks/configure-Debian.yml                |  2 +-
 .../tasks/configure-RedHat.yml                |  2 +-
 .../tasks/configure-Solaris.yml               |  2 +-
 .../tasks/configure-Suse.yml                  |  2 +-
 .../templates/vhosts.conf.j2                  |  8 ++---
 10 files changed, 53 insertions(+), 14 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 521dc7c14..ed35c7bfc 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -6,7 +6,7 @@
 - src: geerlingguy.adminer
   version: 1.1.0
 - src: geerlingguy.apache
-  version: 1.7.4
+  version: 2.0.0
 - src: geerlingguy.apache-php-fpm
   version: 1.0.2
 - src: geerlingguy.blackfire
diff --git a/provisioning/roles/geerlingguy.apache/README.md b/provisioning/roles/geerlingguy.apache/README.md
index 9e54bf6d3..35cbbf283 100644
--- a/provisioning/roles/geerlingguy.apache/README.md
+++ b/provisioning/roles/geerlingguy.apache/README.md
@@ -26,8 +26,9 @@ The IP address and ports on which apache should be listening. Useful if you have
 
     apache_create_vhosts: true
     apache_vhosts_filename: "vhosts.conf"
+    apache_vhosts_template: "vhosts.conf.j2"
 
-If set to true, a vhosts file, managed by this role's variables (see below), will be created and placed in the Apache configuration folder. If set to false, you can place your own vhosts file into Apache's configuration folder and skip the convenient (but more basic) one added by this role.
+If set to true, a vhosts file, managed by this role's variables (see below), will be created and placed in the Apache configuration folder. If set to false, you can place your own vhosts file into Apache's configuration folder and skip the convenient (but more basic) one added by this role. You can also override the template used and set a path to your own template, if you need to further customize the layout of your VirtualHosts.
 
     apache_remove_default_vhost: false
 
@@ -44,7 +45,7 @@ You can add or override global Apache configuration settings in the role-provide
       - servername: "local.dev"
         documentroot: "/var/www/html"
 
-Add a set of properties per virtualhost, including `servername` (required), `documentroot` (required), `serveradmin` (optional), `serveralias` (optional) and `extra_parameters` (optional: you can add whatever additional configuration lines you'd like in here).
+Add a set of properties per virtualhost, including `servername` (required), `documentroot` (required), `allow_override` (optional: defaults to the value of `apache_allow_override`), `options` (optional: defaults to the value of `apache_options`), `serveradmin` (optional), `serveralias` (optional) and `extra_parameters` (optional: you can add whatever additional configuration lines you'd like in here).
 
 Here's an example using `extra_parameters` to add a RewriteRule to redirect all requests to the `www.` site:
 
@@ -77,6 +78,11 @@ Other SSL directives can be managed with other SSL-related role variables.
 
 The SSL protocols and cipher suites that are used/allowed when clients make secure connections to your server. These are secure/sane defaults, but for maximum security, performand, and/or compatibility, you may need to adjust these settings.
 
+    apache_allow_override: "All"
+    apache_options: "-Indexes +FollowSymLinks"
+
+The default values for the `AllowOverride` and `Options` directives for the `documentroot` directory of each vhost.  A vhost can overwrite these values by specifying `allow_override` or `options`.
+
     apache_mods_enabled:
       - rewrite.load
       - ssl.load
@@ -97,6 +103,27 @@ Set initial Apache daemon state to be enforced when this role is run. This shoul
 
 If you would like to only create SSL vhosts when the vhost certificate is present (e.g. when using Let’s Encrypt), set `apache_ignore_missing_ssl_certificate` to `false`. When doing this, you might need to run your playbook more than once so all the vhosts are configured (if another part of the playbook generates the SSL certificates).
 
+## .htaccess-based Basic Authorization
+
+If you require Basic Auth support, you can add it either through a custom template, or by adding `extra_parameters` to a VirtualHost configuration, like so:
+
+    extra_parameters: |
+      <Directory "/var/www/password-protected-directory">
+        Require valid-user
+        AuthType Basic
+        AuthName "Please authenticate"
+        AuthUserFile /var/www/password-protected-directory/.htpasswd
+      </Directory>
+
+To password protect everything within a VirtualHost directive, use the `Location` block instead of `Directory`:
+
+    <Location "/">
+      Require valid-user
+      ....
+    </Location>
+
+You would need to generate/upload your own `.htpasswd` file in your own playbook. There may be other roles that support this functionality in a more integrated way.
+
 ## Dependencies
 
 None.
diff --git a/provisioning/roles/geerlingguy.apache/defaults/main.yml b/provisioning/roles/geerlingguy.apache/defaults/main.yml
index 4acdfce37..4ddfc3b95 100644
--- a/provisioning/roles/geerlingguy.apache/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.apache/defaults/main.yml
@@ -7,6 +7,7 @@ apache_listen_port_ssl: 443
 
 apache_create_vhosts: true
 apache_vhosts_filename: "vhosts.conf"
+apache_vhosts_template: "vhosts.conf.j2"
 
 # On Debian/Ubuntu, a default virtualhost is included in Apache's configuration.
 # Set this to `true` to remove that default.
@@ -16,12 +17,17 @@ apache_global_vhost_settings: |
   DirectoryIndex index.php index.html
 
 apache_vhosts:
-  # Additional properties: 'serveradmin, serveralias, extra_parameters'.
+  # Additional properties:
+  # 'serveradmin, serveralias, allow_override, options, extra_parameters'.
   - servername: "local.dev"
     documentroot: "/var/www/html"
 
+apache_allow_override: "All"
+apache_options: "-Indexes +FollowSymLinks"
+
 apache_vhosts_ssl: []
-  # Additional properties: 'serveradmin, extra_parameters'.
+  # Additional properties:
+  # 'serveradmin, serveralias, allow_override, options, extra_parameters'.
   # - servername: "local.dev",
   #   documentroot: "/var/www/html",
   #   certificate_file: "/path/to/certificate.crt",
@@ -42,3 +48,7 @@ apache_mods_disabled: []
 
 # Set initial apache state. Recommended values: `started` or `stopped`
 apache_state: started
+
+# Set apache state when configuration changes are made. Recommended values:
+# `restarted` or `reloaded`
+apache_restart_state: restarted
diff --git a/provisioning/roles/geerlingguy.apache/handlers/main.yml b/provisioning/roles/geerlingguy.apache/handlers/main.yml
index 25d14ec17..53abffb69 100644
--- a/provisioning/roles/geerlingguy.apache/handlers/main.yml
+++ b/provisioning/roles/geerlingguy.apache/handlers/main.yml
@@ -2,4 +2,4 @@
 - name: restart apache
   service:
     name: "{{ apache_service }}"
-    state: restarted
+    state: "{{ apache_restart_state }}"
diff --git a/provisioning/roles/geerlingguy.apache/meta/main.yml b/provisioning/roles/geerlingguy.apache/meta/main.yml
index 12200db07..3765e63c5 100644
--- a/provisioning/roles/geerlingguy.apache/meta/main.yml
+++ b/provisioning/roles/geerlingguy.apache/meta/main.yml
@@ -29,3 +29,5 @@ galaxy_info:
       - 11.3
   galaxy_tags:
     - web
+
+allow_duplicates: yes
diff --git a/provisioning/roles/geerlingguy.apache/tasks/configure-Debian.yml b/provisioning/roles/geerlingguy.apache/tasks/configure-Debian.yml
index 94b9b2380..2f2b29868 100644
--- a/provisioning/roles/geerlingguy.apache/tasks/configure-Debian.yml
+++ b/provisioning/roles/geerlingguy.apache/tasks/configure-Debian.yml
@@ -30,7 +30,7 @@
 
 - name: Add apache vhosts configuration.
   template:
-    src: "vhosts.conf.j2"
+    src: "{{ apache_vhosts_template }}"
     dest: "{{ apache_conf_path }}/sites-available/{{ apache_vhosts_filename }}"
     owner: root
     group: root
diff --git a/provisioning/roles/geerlingguy.apache/tasks/configure-RedHat.yml b/provisioning/roles/geerlingguy.apache/tasks/configure-RedHat.yml
index 0c3a01f5a..1483e9bf6 100644
--- a/provisioning/roles/geerlingguy.apache/tasks/configure-RedHat.yml
+++ b/provisioning/roles/geerlingguy.apache/tasks/configure-RedHat.yml
@@ -15,7 +15,7 @@
 
 - name: Add apache vhosts configuration.
   template:
-    src: "vhosts.conf.j2"
+    src: "{{ apache_vhosts_template }}"
     dest: "{{ apache_conf_path }}/{{ apache_vhosts_filename }}"
     owner: root
     group: root
diff --git a/provisioning/roles/geerlingguy.apache/tasks/configure-Solaris.yml b/provisioning/roles/geerlingguy.apache/tasks/configure-Solaris.yml
index a95654bed..76d32e657 100644
--- a/provisioning/roles/geerlingguy.apache/tasks/configure-Solaris.yml
+++ b/provisioning/roles/geerlingguy.apache/tasks/configure-Solaris.yml
@@ -10,7 +10,7 @@
 
 - name: Add apache vhosts configuration.
   template:
-    src: "vhosts.conf.j2"
+    src: "{{ apache_vhosts_template }}"
     dest: "{{ apache_conf_path }}/{{ apache_vhosts_filename }}"
     owner: root
     group: root
diff --git a/provisioning/roles/geerlingguy.apache/tasks/configure-Suse.yml b/provisioning/roles/geerlingguy.apache/tasks/configure-Suse.yml
index 16d89f81c..77e11117e 100644
--- a/provisioning/roles/geerlingguy.apache/tasks/configure-Suse.yml
+++ b/provisioning/roles/geerlingguy.apache/tasks/configure-Suse.yml
@@ -15,7 +15,7 @@
 
 - name: Add apache vhosts configuration.
   template:
-    src: "vhosts.conf.j2"
+    src: "{{ apache_vhosts_template }}"
     dest: "{{ apache_conf_path }}/{{ apache_vhosts_filename }}"
     owner: root
     group: root
diff --git a/provisioning/roles/geerlingguy.apache/templates/vhosts.conf.j2 b/provisioning/roles/geerlingguy.apache/templates/vhosts.conf.j2
index 766554fb3..2ec5279b1 100644
--- a/provisioning/roles/geerlingguy.apache/templates/vhosts.conf.j2
+++ b/provisioning/roles/geerlingguy.apache/templates/vhosts.conf.j2
@@ -16,8 +16,8 @@
 {% endif %}
 {% if vhost.documentroot is defined %}
   <Directory "{{ vhost.documentroot }}">
-    AllowOverride All
-    Options -Indexes +FollowSymLinks
+    AllowOverride {{ vhost.allow_override | default(apache_allow_override) }}
+    Options {{ vhost.options | default(apache_options) }}
 {% if apache_vhosts_version == "2.2" %}
     Order allow,deny
     Allow from all
@@ -63,8 +63,8 @@
 {% endif %}
 {% if vhost.documentroot is defined %}
   <Directory "{{ vhost.documentroot }}">
-    AllowOverride All
-    Options -Indexes +FollowSymLinks
+    AllowOverride {{ vhost.allow_override | default(apache_allow_override) }}
+    Options {{ vhost.options | default(apache_options) }}
 {% if apache_vhosts_version == "2.2" %}
     Order allow,deny
     Allow from all

From 03b40cf4008d2ae529f7b1baa74ac03077955043 Mon Sep 17 00:00:00 2001
From: Thom Toogood <thomtoogood@gmail.com>
Date: Sat, 10 Dec 2016 11:39:14 +1100
Subject: [PATCH 0518/1273] Added upload-progress role.

---
 default.config.yml                            |  1 +
 provisioning/playbook.yml                     |  1 +
 provisioning/requirements.yml                 |  2 +
 .../thom8.php-upload-progress/.travis.yml     | 58 +++++++++++++++++++
 .../roles/thom8.php-upload-progress/README.md | 39 +++++++++++++
 .../defaults/main.yml                         |  2 +
 .../thom8.php-upload-progress/meta/main.yml   | 43 ++++++++++++++
 .../thom8.php-upload-progress/tasks/main.yml  | 56 ++++++++++++++++++
 .../templates/uploadprogress.ini.j2           |  2 +
 .../tests/Dockerfile.centos-7                 | 30 ++++++++++
 .../tests/Dockerfile.ubuntu-12.04             | 13 +++++
 .../tests/Dockerfile.ubuntu-14.04             | 13 +++++
 .../thom8.php-upload-progress/tests/inventory |  1 +
 .../tests/test-source.yml                     | 20 +++++++
 .../tests/uploadprogress-test.php             | 20 +++++++
 .../thom8.php-upload-progress/vars/Debian.yml |  3 +
 .../thom8.php-upload-progress/vars/RedHat.yml |  3 +
 17 files changed, 307 insertions(+)
 create mode 100644 provisioning/roles/thom8.php-upload-progress/.travis.yml
 create mode 100644 provisioning/roles/thom8.php-upload-progress/README.md
 create mode 100644 provisioning/roles/thom8.php-upload-progress/defaults/main.yml
 create mode 100644 provisioning/roles/thom8.php-upload-progress/meta/main.yml
 create mode 100644 provisioning/roles/thom8.php-upload-progress/tasks/main.yml
 create mode 100644 provisioning/roles/thom8.php-upload-progress/templates/uploadprogress.ini.j2
 create mode 100644 provisioning/roles/thom8.php-upload-progress/tests/Dockerfile.centos-7
 create mode 100644 provisioning/roles/thom8.php-upload-progress/tests/Dockerfile.ubuntu-12.04
 create mode 100644 provisioning/roles/thom8.php-upload-progress/tests/Dockerfile.ubuntu-14.04
 create mode 100644 provisioning/roles/thom8.php-upload-progress/tests/inventory
 create mode 100644 provisioning/roles/thom8.php-upload-progress/tests/test-source.yml
 create mode 100644 provisioning/roles/thom8.php-upload-progress/tests/uploadprogress-test.php
 create mode 100644 provisioning/roles/thom8.php-upload-progress/vars/Debian.yml
 create mode 100644 provisioning/roles/thom8.php-upload-progress/vars/RedHat.yml

diff --git a/default.config.yml b/default.config.yml
index c13d780eb..4aca5052b 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -204,6 +204,7 @@ installed_extras:
   # - ruby
   # - selenium
   # - solr
+  # - upload-progress
   - varnish
   # - xdebug
   # - xhprof
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index a2522d41c..cf3abedb4 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -67,6 +67,7 @@
     - { role: geerlingguy.php-memcached, when: '"memcached" in installed_extras' }
     - { role: geerlingguy.php-xdebug, when: '"xdebug" in installed_extras' }
     - { role: geerlingguy.php-xhprof, when: '"xhprof" in installed_extras' }
+    - { role: thom8.php-upload-progress, when: '"upload-progress" in installed_extras' }
     - { role: geerlingguy.blackfire, when: '"blackfire" in installed_extras' }
     - { role: geerlingguy.adminer, when: '"adminer" in installed_extras' }
     - { role: geerlingguy.pimpmylog, when: '"pimpmylog" in installed_extras' }
diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index ed35c7bfc..3882ca8d8 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -1,6 +1,8 @@
 ---
 - src: arknoll.selenium
   version: 2.0.0
+- src: thom8.php-upload-progress
+  version: 1.0.1
 - src: franklinkim.newrelic
   version: 1.4.0
 - src: geerlingguy.adminer
diff --git a/provisioning/roles/thom8.php-upload-progress/.travis.yml b/provisioning/roles/thom8.php-upload-progress/.travis.yml
new file mode 100644
index 000000000..67d45cf08
--- /dev/null
+++ b/provisioning/roles/thom8.php-upload-progress/.travis.yml
@@ -0,0 +1,58 @@
+---
+sudo: required
+
+env:
+  - distribution: centos
+    version: 7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    SITE: source
+  - distribution: ubuntu
+    version: 14.04
+    init: /sbin/init
+    run_opts: ""
+    SITE: source
+  - distribution: ubuntu
+    version: 12.04
+    init: /sbin/init
+    run_opts: ""
+    SITE: source
+
+services:
+  - docker
+
+before_install:
+  # Pull container
+  - 'sudo docker pull ${distribution}:${version}'
+  # Customize container
+  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+
+script:
+  - container_id=$(mktemp)
+  # Run container in detached state
+  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+
+  # Install dependencies.
+  - 'sudo docker exec "$(cat ${container_id})" ansible-galaxy install geerlingguy.php geerlingguy.repo-remi'
+
+  # Ansible syntax check.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test-${SITE}.yml --syntax-check'
+
+  # Test role.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test-${SITE}.yml'
+
+  # Test role idempotence.
+  - >
+    sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test-${SITE}.yml
+    | grep -q 'changed=0.*failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)
+
+  # Run script to test if Upload progress is available and working.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm php /etc/ansible/roles/role_under_test/tests/uploadprogress-test.php'
+
+  # Clean up
+  - 'sudo docker stop "$(cat ${container_id})"'
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/thom8.php-upload-progress/README.md b/provisioning/roles/thom8.php-upload-progress/README.md
new file mode 100644
index 000000000..c369de5f5
--- /dev/null
+++ b/provisioning/roles/thom8.php-upload-progress/README.md
@@ -0,0 +1,39 @@
+# Ansible Role: Upload progress
+
+[![CircleCI](https://circleci.com/gh/beetboxvm/ansible-role-beetbox-upload-progress.svg?style=svg)](https://circleci.com/gh/beetboxvm/ansible-role-beetbox-upload-progress)
+
+Installs Upload progress PHP extension on Linux servers.
+
+## Requirements
+
+Prior to running this role, make sure the `php-devel` and `@Development Tools` (for RHEL/CentOS) or `php5-dev` + `build-essential` packages (for Debian/Ubuntu) are present on the system, as they are required for the build of Upload progress.
+
+## Role Variables
+
+Available variables are listed below, along with default values (see `defaults/main.yml`):
+
+    workspace: /root
+
+Where Xdebug setup files will be downloaded and built.
+
+    php_uploadprogress_module_path: /usr/lib/php5/modules
+    
+The path where `uploadprogress.so` will be installed.
+    
+    php_uploadprogress_config_filename: 20-uploadprogress.ini
+    
+The file name for PHP config.
+
+## Dependencies
+
+  - geerlingguy.php
+
+## Example Playbook
+
+    - hosts: webservers
+      roles:
+        - { role: beetboxvm.upload-progress }
+
+## License
+
+MIT
diff --git a/provisioning/roles/thom8.php-upload-progress/defaults/main.yml b/provisioning/roles/thom8.php-upload-progress/defaults/main.yml
new file mode 100644
index 000000000..8279f6ad8
--- /dev/null
+++ b/provisioning/roles/thom8.php-upload-progress/defaults/main.yml
@@ -0,0 +1,2 @@
+---
+workspace: /root
diff --git a/provisioning/roles/thom8.php-upload-progress/meta/main.yml b/provisioning/roles/thom8.php-upload-progress/meta/main.yml
new file mode 100644
index 000000000..885eb036e
--- /dev/null
+++ b/provisioning/roles/thom8.php-upload-progress/meta/main.yml
@@ -0,0 +1,43 @@
+---
+dependencies:
+  - geerlingguy.php
+
+galaxy_info:
+  author: beetboxvm
+  description: PHP Upload progress for Linux.
+  license: "license (BSD, MIT)"
+  min_ansible_version: 2.0
+  platforms:
+    - name: EL
+      versions:
+      - all
+    - name: GenericUNIX
+      versions:
+      - all
+    - name: Fedora
+      versions:
+      - all
+    - name: opensuse
+      versions:
+      - all
+    - name: GenericBSD
+      versions:
+      - all
+    - name: FreeBSD
+      versions:
+      - all
+    - name: Ubuntu
+      versions:
+      - all
+    - name: SLES
+      versions:
+      - all
+    - name: GenericLinux
+      versions:
+      - all
+    - name: Debian
+      versions:
+      - all
+  categories:
+    - development
+    - web
diff --git a/provisioning/roles/thom8.php-upload-progress/tasks/main.yml b/provisioning/roles/thom8.php-upload-progress/tasks/main.yml
new file mode 100644
index 000000000..dc7c6698a
--- /dev/null
+++ b/provisioning/roles/thom8.php-upload-progress/tasks/main.yml
@@ -0,0 +1,56 @@
+---
+- name: Include OS-specific variables.
+  include_vars: "{{ ansible_os_family }}.yml"
+
+- name: Define php_uploadprogress_module_path.
+  set_fact:
+    php_uploadprogress_module_path: "{{ __php_uploadprogress_module_path }}"
+  when: php_uploadprogress_module_path is not defined
+
+- name: Define php_uploadprogress_config_filename.
+  set_fact:
+    php_uploadprogress_config_filename: "{{ __php_uploadprogress_config_filename }}"
+  when: php_uploadprogress_config_filename is not defined
+
+- name: Download and untar uploadprogress.
+  unarchive:
+    src: "https://github.com/php/pecl-php-uploadprogress/archive/master.tar.gz"
+    dest: "{{ workspace }}"
+    copy: no
+    creates: "{{ workspace }}/pecl-php-uploadprogress-master"
+
+- name: Build uploadprogress.
+  shell: >
+    {{ item }}
+    chdir={{ workspace }}/pecl-php-uploadprogress-master
+    creates={{ workspace }}/pecl-php-uploadprogress-master/modules/uploadprogress.so
+  with_items:
+    - phpize
+    - ./configure
+    - make
+  notify: restart webserver
+
+- name: Ensure uploadprogress module path exists.
+  file:
+    path: "{{ php_uploadprogress_module_path }}"
+    state: directory
+    owner: root
+    group: root
+    mode: 0755
+
+- name: Move uploadprogress module into place.
+  shell: >
+    cp {{ workspace }}/pecl-php-uploadprogress-master/modules/uploadprogress.so {{ php_uploadprogress_module_path }}/uploadprogress.so
+    creates={{ php_uploadprogress_module_path }}/uploadprogress.so
+  notify: restart webserver
+
+- name: Add php extension config for uploadprogress.
+  template:
+    src: uploadprogress.ini.j2
+    dest: "{{ item }}/{{ php_uploadprogress_config_filename }}"
+    owner: root
+    group: root
+    force: yes
+    mode: 0644
+  with_items: "{{ php_extension_conf_paths }}"
+  notify: restart webserver
diff --git a/provisioning/roles/thom8.php-upload-progress/templates/uploadprogress.ini.j2 b/provisioning/roles/thom8.php-upload-progress/templates/uploadprogress.ini.j2
new file mode 100644
index 000000000..6bcbad366
--- /dev/null
+++ b/provisioning/roles/thom8.php-upload-progress/templates/uploadprogress.ini.j2
@@ -0,0 +1,2 @@
+; activate and configurate for php uploadprogress module
+extension={{ php_uploadprogress_module_path }}/uploadprogress.so
diff --git a/provisioning/roles/thom8.php-upload-progress/tests/Dockerfile.centos-7 b/provisioning/roles/thom8.php-upload-progress/tests/Dockerfile.centos-7
new file mode 100644
index 000000000..10c2684ce
--- /dev/null
+++ b/provisioning/roles/thom8.php-upload-progress/tests/Dockerfile.centos-7
@@ -0,0 +1,30 @@
+FROM centos:7
+
+# Install systemd -- See https://hub.docker.com/_/centos/
+RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
+RUN yum -y update; yum clean all; \
+(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
+rm -f /lib/systemd/system/multi-user.target.wants/*; \
+rm -f /etc/systemd/system/*.wants/*; \
+rm -f /lib/systemd/system/local-fs.target.wants/*; \
+rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
+rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
+rm -f /lib/systemd/system/basic.target.wants/*; \
+rm -f /lib/systemd/system/anaconda.target.wants/*;
+
+# Install Ansible
+RUN yum -y install epel-release
+RUN yum -y install git ansible sudo
+RUN yum clean all
+
+RUN yum install -y unzip
+RUN yum groupinstall -y "Development Tools"
+
+# Disable requiretty
+RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
+
+# Install Ansible inventory file
+RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
+
+VOLUME ["/sys/fs/cgroup"]
+CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/thom8.php-upload-progress/tests/Dockerfile.ubuntu-12.04 b/provisioning/roles/thom8.php-upload-progress/tests/Dockerfile.ubuntu-12.04
new file mode 100644
index 000000000..576e3bce8
--- /dev/null
+++ b/provisioning/roles/thom8.php-upload-progress/tests/Dockerfile.ubuntu-12.04
@@ -0,0 +1,13 @@
+FROM ubuntu:12.04
+RUN apt-get update
+
+# Install Ansible
+RUN apt-get install -y software-properties-common python-software-properties git
+RUN apt-add-repository -y ppa:ansible/ansible
+RUN apt-get update
+RUN apt-get install -y ansible
+
+RUN apt-get install -y unzip
+
+# Install Ansible inventory file
+RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/thom8.php-upload-progress/tests/Dockerfile.ubuntu-14.04 b/provisioning/roles/thom8.php-upload-progress/tests/Dockerfile.ubuntu-14.04
new file mode 100644
index 000000000..cb7a7bda4
--- /dev/null
+++ b/provisioning/roles/thom8.php-upload-progress/tests/Dockerfile.ubuntu-14.04
@@ -0,0 +1,13 @@
+FROM ubuntu:14.04
+RUN apt-get update
+
+# Install Ansible
+RUN apt-get install -y software-properties-common git
+RUN apt-add-repository -y ppa:ansible/ansible
+RUN apt-get update
+RUN apt-get install -y ansible
+
+RUN apt-get install -y unzip
+
+# Install Ansible inventory file
+RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/thom8.php-upload-progress/tests/inventory b/provisioning/roles/thom8.php-upload-progress/tests/inventory
new file mode 100644
index 000000000..2fbb50c4a
--- /dev/null
+++ b/provisioning/roles/thom8.php-upload-progress/tests/inventory
@@ -0,0 +1 @@
+localhost
diff --git a/provisioning/roles/thom8.php-upload-progress/tests/test-source.yml b/provisioning/roles/thom8.php-upload-progress/tests/test-source.yml
new file mode 100644
index 000000000..dee464c36
--- /dev/null
+++ b/provisioning/roles/thom8.php-upload-progress/tests/test-source.yml
@@ -0,0 +1,20 @@
+---
+- hosts: all
+
+  vars:
+    php_enable_webserver: false
+    php_enablerepo: "remi,remi-php70"
+
+  pre_tasks:
+    - name: Ensure build dependencies are installed (RedHat).
+      yum: name=which state=present
+      when: ansible_os_family == 'RedHat'
+
+    - name: Add repository for PHP 7.0.
+      apt_repository: repo='ppa:ondrej/php'
+      when: ansible_os_family == 'Debian'
+
+  roles:
+    - { role: geerlingguy.repo-remi, when: ansible_os_family == 'RedHat' }
+    - geerlingguy.php
+    - role_under_test
diff --git a/provisioning/roles/thom8.php-upload-progress/tests/uploadprogress-test.php b/provisioning/roles/thom8.php-upload-progress/tests/uploadprogress-test.php
new file mode 100644
index 000000000..a77ff8e5a
--- /dev/null
+++ b/provisioning/roles/thom8.php-upload-progress/tests/uploadprogress-test.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * @file
+ * Test if Upload progress is available and working.
+ */
+
+$success = FALSE;
+
+// Check uploadprogress extension is loaded.
+if (extension_loaded('uploadprogress')) {
+  $success = TRUE;
+  print "Upload progress working properly.\r\n";
+  exit(0);
+}
+
+if (!$success) {
+  print "Upload progress not working properly.\r\n";
+  exit(1);
+}
diff --git a/provisioning/roles/thom8.php-upload-progress/vars/Debian.yml b/provisioning/roles/thom8.php-upload-progress/vars/Debian.yml
new file mode 100644
index 000000000..4240c7dab
--- /dev/null
+++ b/provisioning/roles/thom8.php-upload-progress/vars/Debian.yml
@@ -0,0 +1,3 @@
+---
+__php_uploadprogress_module_path: /usr/lib/php5/modules
+__php_uploadprogress_config_filename: 20-uploadprogress.ini
diff --git a/provisioning/roles/thom8.php-upload-progress/vars/RedHat.yml b/provisioning/roles/thom8.php-upload-progress/vars/RedHat.yml
new file mode 100644
index 000000000..3bd391bed
--- /dev/null
+++ b/provisioning/roles/thom8.php-upload-progress/vars/RedHat.yml
@@ -0,0 +1,3 @@
+---
+__php_uploadprogress_module_path: /usr/lib64/php/modules
+__php_uploadprogress_config_filename: uploadprogress.ini

From 9de21e94e4e3505a39cdab785bb7248c384246f5 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 9 Dec 2016 21:40:57 -0600
Subject: [PATCH 0519/1273] Update PHP XDebug and XHProf roles to latest
 versions.

---
 provisioning/requirements.yml                 |  4 ++--
 .../roles/geerlingguy.php-xdebug/.travis.yml  | 23 ++++++++-----------
 .../geerlingguy.php-xdebug/tasks/main.yml     | 10 ++++++++
 .../tests/test-vars-ubuntu1404.yml            | 21 +++++++++++++++++
 .../geerlingguy.php-xdebug/tests/test.yml     | 13 ++++++++---
 .../geerlingguy.php-xdebug/vars/Debian.yml    |  4 ++--
 .../geerlingguy.php-xdebug/vars/RedHat.yml    |  4 ++--
 .../roles/geerlingguy.php-xhprof/.travis.yml  | 23 +++++++------------
 .../geerlingguy.php-xhprof/tasks/main.yml     | 10 ++++++++
 .../geerlingguy.php-xhprof/tests/test.yml     |  6 ++---
 .../geerlingguy.php-xhprof/vars/Debian.yml    |  5 ++--
 .../geerlingguy.php-xhprof/vars/RedHat.yml    |  5 ++--
 12 files changed, 81 insertions(+), 47 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.php-xdebug/tests/test-vars-ubuntu1404.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 3882ca8d8..0cf598f35 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -52,9 +52,9 @@
 - src: geerlingguy.php-redis
   version: 3.0.0
 - src: geerlingguy.php-xdebug
-  version: 2.1.1
+  version: 2.2.0
 - src: geerlingguy.php-xhprof
-  version: 2.1.3
+  version: 2.2.0
 - src: geerlingguy.pimpmylog
   version: 1.0.2
 - src: geerlingguy.postfix
diff --git a/provisioning/roles/geerlingguy.php-xdebug/.travis.yml b/provisioning/roles/geerlingguy.php-xdebug/.travis.yml
index f1d45daea..bb377e0a5 100644
--- a/provisioning/roles/geerlingguy.php-xdebug/.travis.yml
+++ b/provisioning/roles/geerlingguy.php-xdebug/.travis.yml
@@ -1,5 +1,5 @@
 ---
-sudo: required
+services: docker
 
 env:
   - distro: centos7
@@ -12,30 +12,27 @@ env:
     init: /lib/systemd/systemd
     run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
 
-services:
-  - docker
-
 before_install:
   # Pull container.
-  - 'sudo docker pull geerlingguy/docker-${distro}-ansible:latest'
+  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
   - container_id=$(mktemp)
   # Run container in detached state.
-  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
+  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
 
   # Install dependencies.
-  - 'sudo docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
+  - 'docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
 
   # Ansible syntax check.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
 
   # Test role.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
 
   # Test role idempotence.
   - idempotence=$(mktemp)
-  - sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
+  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
   - >
     tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
@@ -43,11 +40,9 @@ script:
     || (echo 'Idempotence test: fail' && exit 1)
 
   # Run script to test if Xdebug is available and working.
-  - 'sudo docker exec "$(cat ${container_id})" env TERM=xterm php /etc/ansible/roles/role_under_test/tests/xdebug-test.php'
+  - 'docker exec "$(cat ${container_id})" env TERM=xterm php /etc/ansible/roles/role_under_test/tests/xdebug-test.php'
 
-after_success:
-  # Clean up.
-  - 'sudo docker stop "$(cat ${container_id})"'
+  - 'docker exec "$(cat ${container_id})" env TERM=xterm php --version'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.php-xdebug/tasks/main.yml b/provisioning/roles/geerlingguy.php-xdebug/tasks/main.yml
index 1f4eb8ebf..421d263a1 100644
--- a/provisioning/roles/geerlingguy.php-xdebug/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php-xdebug/tasks/main.yml
@@ -2,6 +2,16 @@
 - name: Include OS-specific variables.
   include_vars: "{{ ansible_os_family }}.yml"
 
+- name: Define php_xdebug_module_path.
+  set_fact:
+    php_xdebug_module_path: "{{ __php_xdebug_module_path }}"
+  when: php_xdebug_module_path is not defined
+
+- name: Define php_xdebug_config_filename.
+  set_fact:
+    php_xdebug_config_filename: "{{ __php_xdebug_config_filename }}"
+  when: php_xdebug_config_filename is not defined
+
 - name: Ensure dependencies for building from source are installed (RedHat).
   yum: "name={{ item }} state=installed"
   with_items:
diff --git a/provisioning/roles/geerlingguy.php-xdebug/tests/test-vars-ubuntu1404.yml b/provisioning/roles/geerlingguy.php-xdebug/tests/test-vars-ubuntu1404.yml
new file mode 100644
index 000000000..49c96b888
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xdebug/tests/test-vars-ubuntu1404.yml
@@ -0,0 +1,21 @@
+---
+php_packages:
+  - php5.6
+  - php5.6-mcrypt
+  - php5.6-cli
+  - php5.6-common
+  - php5.6-curl
+  - php5.6-dev
+  - php5.6-fpm
+  - php5.6-gd
+  - libpcre3-dev
+php_conf_paths:
+  - /etc/php/5.6/fpm
+  - /etc/php/5.6/apache2
+  - /etc/php/5.6/cli
+php_extension_conf_paths:
+  - /etc/php/5.6/fpm/conf.d
+  - /etc/php/5.6/apache2/conf.d
+  - /etc/php/5.6/cli/conf.d
+php_fpm_daemon: php5.6-fpm
+php_fpm_conf_path: "/etc/php/5.6/fpm"
diff --git a/provisioning/roles/geerlingguy.php-xdebug/tests/test.yml b/provisioning/roles/geerlingguy.php-xdebug/tests/test.yml
index 498627ade..70d5c1d18 100644
--- a/provisioning/roles/geerlingguy.php-xdebug/tests/test.yml
+++ b/provisioning/roles/geerlingguy.php-xdebug/tests/test.yml
@@ -6,9 +6,9 @@
     php_enablerepo: "remi,remi-php70"
 
   pre_tasks:
-    - name: Ensure build dependencies are installed (RedHat).
-      yum: name=which state=present
-      when: ansible_os_family == 'RedHat'
+    - name: Update apt cache.
+      apt: update_cache=yes cache_valid_time=600
+      when: ansible_os_family == 'Debian'
 
     - name: Set php_packages for PHP 7.0 Debian 8 install.
       set_fact:
@@ -22,6 +22,13 @@
           - php7.0-apcu
       when: ansible_distribution == 'Debian'
 
+    - include_vars: test-vars-ubuntu1404.yml
+      when: ansible_distribution == 'Ubuntu'
+
+    - name: Add repository for PHP 5.6.
+      apt_repository: repo='ppa:ondrej/php'
+      when: ansible_distribution == 'Ubuntu'
+
   roles:
     - role: geerlingguy.repo-remi
       when: ansible_os_family == 'RedHat'
diff --git a/provisioning/roles/geerlingguy.php-xdebug/vars/Debian.yml b/provisioning/roles/geerlingguy.php-xdebug/vars/Debian.yml
index cff33a28f..560abbde8 100644
--- a/provisioning/roles/geerlingguy.php-xdebug/vars/Debian.yml
+++ b/provisioning/roles/geerlingguy.php-xdebug/vars/Debian.yml
@@ -1,3 +1,3 @@
 ---
-php_xdebug_module_path: /usr/lib/php5/modules
-php_xdebug_config_filename: 20-xdebug.ini
+__php_xdebug_module_path: /usr/lib/php5/modules
+__php_xdebug_config_filename: 20-xdebug.ini
diff --git a/provisioning/roles/geerlingguy.php-xdebug/vars/RedHat.yml b/provisioning/roles/geerlingguy.php-xdebug/vars/RedHat.yml
index b66a725a8..7d7c7fbb0 100644
--- a/provisioning/roles/geerlingguy.php-xdebug/vars/RedHat.yml
+++ b/provisioning/roles/geerlingguy.php-xdebug/vars/RedHat.yml
@@ -1,3 +1,3 @@
 ---
-php_xdebug_module_path: /usr/lib64/php/modules
-php_xdebug_config_filename: xdebug.ini
+__php_xdebug_module_path: /usr/lib64/php/modules
+__php_xdebug_config_filename: xdebug.ini
diff --git a/provisioning/roles/geerlingguy.php-xhprof/.travis.yml b/provisioning/roles/geerlingguy.php-xhprof/.travis.yml
index ca4ab385c..d0014ec41 100644
--- a/provisioning/roles/geerlingguy.php-xhprof/.travis.yml
+++ b/provisioning/roles/geerlingguy.php-xhprof/.travis.yml
@@ -1,5 +1,5 @@
 ---
-sudo: required
+services: docker
 
 env:
   - distro: centos7
@@ -12,30 +12,27 @@ env:
     init: /lib/systemd/systemd
     run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
 
-services:
-  - docker
-
 before_install:
   # Pull container.
-  - 'sudo docker pull geerlingguy/docker-${distro}-ansible:latest'
+  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
   - container_id=$(mktemp)
   # Run container in detached state.
-  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
+  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
 
   # Install dependencies.
-  - 'sudo docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
+  - 'docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
 
   # Ansible syntax check.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
 
   # Test role.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
 
   # Test role idempotence.
   - idempotence=$(mktemp)
-  - sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
+  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
   - >
     tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
@@ -43,11 +40,7 @@ script:
     || (echo 'Idempotence test: fail' && exit 1)
 
   # Run script to test if XHProf is available and working.
-  - 'sudo docker exec "$(cat ${container_id})" env TERM=xterm php /etc/ansible/roles/role_under_test/tests/xhprof-test.php'
-
-after_success:
-  # Clean up.
-  - 'sudo docker stop "$(cat ${container_id})"'
+  - 'docker exec "$(cat ${container_id})" env TERM=xterm php /etc/ansible/roles/role_under_test/tests/xhprof-test.php'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.php-xhprof/tasks/main.yml b/provisioning/roles/geerlingguy.php-xhprof/tasks/main.yml
index 6f0746884..1e5637ecb 100644
--- a/provisioning/roles/geerlingguy.php-xhprof/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php-xhprof/tasks/main.yml
@@ -2,6 +2,16 @@
 - name: Include OS-specific variables.
   include_vars: "{{ ansible_os_family }}.yml"
 
+- name: Define php_xhprof_module_path.
+  set_fact:
+    php_xhprof_module_path: "{{ __php_xhprof_module_path }}"
+  when: php_xhprof_module_path is not defined
+
+- name: Define php_xhprof_config_filename.
+  set_fact:
+    php_xhprof_config_filename: "{{ __php_xhprof_config_filename }}"
+  when: php_xhprof_config_filename is not defined
+
 # Setup/install tasks.
 - name: Ensure dependencies for installing XHProf are present.
   package: "name={{ item }} state=installed"
diff --git a/provisioning/roles/geerlingguy.php-xhprof/tests/test.yml b/provisioning/roles/geerlingguy.php-xhprof/tests/test.yml
index 498627ade..942f6d7e6 100644
--- a/provisioning/roles/geerlingguy.php-xhprof/tests/test.yml
+++ b/provisioning/roles/geerlingguy.php-xhprof/tests/test.yml
@@ -6,9 +6,9 @@
     php_enablerepo: "remi,remi-php70"
 
   pre_tasks:
-    - name: Ensure build dependencies are installed (RedHat).
-      yum: name=which state=present
-      when: ansible_os_family == 'RedHat'
+    - name: Update apt cache.
+      apt: update_cache=yes cache_valid_time=600
+      when: ansible_os_family == 'Debian'
 
     - name: Set php_packages for PHP 7.0 Debian 8 install.
       set_fact:
diff --git a/provisioning/roles/geerlingguy.php-xhprof/vars/Debian.yml b/provisioning/roles/geerlingguy.php-xhprof/vars/Debian.yml
index 37fae2e1d..1b0a970b3 100644
--- a/provisioning/roles/geerlingguy.php-xhprof/vars/Debian.yml
+++ b/provisioning/roles/geerlingguy.php-xhprof/vars/Debian.yml
@@ -1,4 +1,3 @@
 ---
-php_xhprof_module_path: /usr/lib/php5/modules
-
-php_xhprof_config_filename: 20-xhprof.ini
+__php_xhprof_module_path: /usr/lib/php5/modules
+__php_xhprof_config_filename: 20-xhprof.ini
diff --git a/provisioning/roles/geerlingguy.php-xhprof/vars/RedHat.yml b/provisioning/roles/geerlingguy.php-xhprof/vars/RedHat.yml
index e487f1b91..b380b2b97 100644
--- a/provisioning/roles/geerlingguy.php-xhprof/vars/RedHat.yml
+++ b/provisioning/roles/geerlingguy.php-xhprof/vars/RedHat.yml
@@ -1,4 +1,3 @@
 ---
-php_xhprof_module_path: /usr/lib64/php/modules
-
-php_xhprof_config_filename: xhprof.ini
+__php_xhprof_module_path: /usr/lib64/php/modules
+__php_xhprof_config_filename: xhprof.ini

From 852ebe2fe2819acac2b53f2c1ce8e6506a5c092c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Fri, 9 Dec 2016 14:15:49 -0500
Subject: [PATCH 0520/1273] Make it easier to switch between PHP versions

---
 default.config.yml                 |  1 +
 provisioning/playbook.yml          | 11 ++++++++
 provisioning/tasks/init-debian.yml | 45 +++++++++++++++++++++++++++---
 provisioning/tasks/init-redhat.yml |  4 +++
 provisioning/vars/Debian.yml       | 34 ++++++++++++++++++++++
 provisioning/vars/RedHat.yml       |  1 +
 6 files changed, 92 insertions(+), 4 deletions(-)
 create mode 100644 provisioning/vars/Debian.yml
 create mode 100644 provisioning/vars/RedHat.yml

diff --git a/default.config.yml b/default.config.yml
index 4aca5052b..dd49e862e 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -237,6 +237,7 @@ firewall_log_dropped_packets: false
 # PHP Configuration. Currently-supported versions: 5.6, 7.0.
 # To use 5.6, see: http://docs.drupalvm.com/en/latest/other/php-56/
 php_version: "7.0"
+php_install_recommends: no
 php_memory_limit: "192M"
 php_display_errors: "On"
 php_display_startup_errors: "On"
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index cf3abedb4..d4b6452c8 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -13,6 +13,9 @@
         msg: >
           "You must update Ansible to at least {{ drupalvm_ansible_version_min }} to use this version of Drupal VM."
 
+    - name: Include OS-specific variables.
+      include_vars: "{{ ansible_os_family }}.yml"
+
     - name: Define config_dir.
       set_fact:
         config_dir: "{{ playbook_dir }}/.."
@@ -26,8 +29,10 @@
 
     - include: tasks/init-debian.yml
       when: ansible_os_family == 'Debian'
+      static: no
     - include: tasks/init-redhat.yml
       when: ansible_os_family == 'RedHat'
+      static: no
 
     - name: Run configured pre-provision shell scripts.
       script: "{{ item }}"
@@ -43,6 +48,12 @@
         php_webserver_daemon: nginx
       when: drupalvm_webserver == 'nginx'
 
+    - name: Set the correct XHProf package when PHP 5.5 or 5.6 is used.
+      set_fact:
+        xhprof_download_url: https://github.com/phacility/xhprof/archive/master.tar.gz
+        xhprof_download_folder_name: xhprof-master
+      when: php_version == '5.5' or php_version == '5.6'
+
   roles:
     # Essential roles.
     - { role: geerlingguy.repo-remi, when: ansible_os_family == 'RedHat' }
diff --git a/provisioning/tasks/init-debian.yml b/provisioning/tasks/init-debian.yml
index 83d84bb54..f5f312a44 100644
--- a/provisioning/tasks/init-debian.yml
+++ b/provisioning/tasks/init-debian.yml
@@ -20,12 +20,49 @@
   apt_repository: repo='ppa:ondrej/apache2'
   when: ansible_distribution_release == "precise" and ansible_distribution == "Ubuntu"
 
-- name: Add repository for PHP 5.5, 5.6 or 7.0.
+- name: Add repository for PHP 5.5, 5.6, 7.0 or 7.1.
   apt_repository: repo='ppa:ondrej/php'
+  when: ansible_distribution == "Ubuntu"
+  register: php_ondrej_repo
+
+- name: Add repository for PHP 5 compatibility packages.
+  apt_repository: repo='ppa:ondrej/php5-compat'
   when: >
-    (php_version == "5.5" or php_version == "5.6" or php_version == "7.0") and
-    ansible_distribution == "Ubuntu" and
-    ansible_distribution_version != "16.04"
+    (php_version == "5.5" or php_version == "5.6") and
+    ansible_distribution == "Ubuntu"
+
+- name: Purge PHP version packages.
+  apt:
+    name: "{{ item }}"
+    state: absent
+    purge: yes
+    force: yes
+  when: "'php{{ php_version }}' not in item"
+  with_flattened:
+    - "{{ php_packages|regex_replace('php' + php_version, 'php5.5') }}"
+    - "{{ php_packages|regex_replace('php' + php_version, 'php5.6') }}"
+    - "{{ php_packages|regex_replace('php' + php_version, 'php7.0') }}"
+    - "{{ php_packages|regex_replace('php' + php_version, 'php7.1') }}"
+  register: php_purge
+
+- name: Purge PHP packages installed by default on Ubuntu.
+  apt:
+    name: "{{ item }}"
+    state: absent
+    purge: yes
+    force: yes
+  when: php_purge.changed or php_ondrej_repo.changed
+  with_items:
+    - php-common
+
+- name: Purge PHP modules directory.
+  file:
+    path: "{{ item }}"
+    state: absent
+  when: php_purge.changed
+  with_items:
+    - "/usr/lib/php5/modules"
+    - "/usr/lib/php/modules"
 
 - name: Define php_xhprof_html_dir.
   set_fact:
diff --git a/provisioning/tasks/init-redhat.yml b/provisioning/tasks/init-redhat.yml
index 80707fc96..599223eea 100644
--- a/provisioning/tasks/init-redhat.yml
+++ b/provisioning/tasks/init-redhat.yml
@@ -23,6 +23,10 @@
   set_fact: php_enablerepo="remi,remi-php70"
   when: php_version == "7.0"
 
+- name: Enable remi repo for PHP 7.1
+  set_fact: php_enablerepo="remi,remi-php71"
+  when: php_version == "7.1"
+
 - name: Define php_xhprof_html_dir.
   set_fact:
     php_xhprof_html_dir: "/usr/share/pear/xhprof_html"
diff --git a/provisioning/vars/Debian.yml b/provisioning/vars/Debian.yml
new file mode 100644
index 000000000..c9db91e02
--- /dev/null
+++ b/provisioning/vars/Debian.yml
@@ -0,0 +1,34 @@
+---
+# Configure PHP paths and packages for PHP 5.6 and PHP 7.0.
+php_conf_paths:
+  - "/etc/php/{{ php_version }}/fpm"
+  - "/etc/php/{{ php_version }}/apache2"
+  - "/etc/php/{{ php_version }}/cli"
+php_extension_conf_paths:
+  - "/etc/php/{{ php_version }}/fpm/conf.d"
+  - "/etc/php/{{ php_version }}/apache2/conf.d"
+  - "/etc/php/{{ php_version }}/cli/conf.d"
+php_fpm_daemon: "php{{ php_version }}-fpm"
+php_fpm_conf_path: "/etc/php/{{ php_version }}/fpm"
+php_fpm_pool_conf_path: "{{ php_fpm_conf_path }}/pool.d/www.conf"
+php_mysql_package: "php{{ php_version }}-mysql"
+php_redis_package: "php{{ php_version }}-redis"
+php_memcached_package: "php{{ php_version }}-memcached"
+php_pgsql_package: "php{{ php_version }}-pgsql"
+
+php_packages:
+  - "php{{ php_version }}"
+  - "php{{ php_version }}-apcu"
+  - "php{{ php_version }}-cli"
+  - "php{{ php_version }}-common"
+  - "php{{ php_version }}-curl"
+  - "php{{ php_version }}-dev"
+  - "php{{ php_version }}-fpm"
+  - "php{{ php_version }}-gd"
+  - "php{{ php_version }}-imap"
+  - "php{{ php_version }}-json"
+  - "php{{ php_version }}-mbstring"
+  - "php{{ php_version }}-mcrypt"
+  - "php{{ php_version }}-opcache"
+  - "php{{ php_version }}-sqlite3"
+  - "php{{ php_version }}-xml"
diff --git a/provisioning/vars/RedHat.yml b/provisioning/vars/RedHat.yml
new file mode 100644
index 000000000..ed97d539c
--- /dev/null
+++ b/provisioning/vars/RedHat.yml
@@ -0,0 +1 @@
+---

From 84ddbcc1f68328241c5983f77b52830e724a8d06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Fri, 9 Dec 2016 14:16:08 -0500
Subject: [PATCH 0521/1273] Update docs for PHP < 7

---
 docs/extras/profile-code.md       |  9 +----
 docs/other/php-56.md              | 67 -------------------------------
 docs/other/php.md                 | 14 +++++++
 examples/acquia/acquia.config.yml | 32 ---------------
 mkdocs.yml                        |  2 +-
 5 files changed, 16 insertions(+), 108 deletions(-)
 delete mode 100644 docs/other/php-56.md
 create mode 100644 docs/other/php.md

diff --git a/docs/extras/profile-code.md b/docs/extras/profile-code.md
index 32d2a2a01..28d6a0c54 100644
--- a/docs/extras/profile-code.md
+++ b/docs/extras/profile-code.md
@@ -28,14 +28,7 @@ SQL             n/a       -
 
 ## XHProf
 
-[XHProf](http://xhprof.io/) allows easy code profiling and can be used in many different ways. Ensure `xhprof` is in the list of `installed_extras` inside `config.yml`, and if you're using PHP 5.6, make sure you also add the following variables inside `config.yml`:
-
-```
-xhprof_download_url: https://github.com/phacility/xhprof/archive/master.tar.gz
-xhprof_download_folder_name: xhprof-master
-```
-
-This will ensure the version of XHProf installed is compatible with the older version of PHP.
+[XHProf](http://xhprof.io/) allows easy code profiling and can be used in many different ways. Ensure `xhprof` is in the list of `installed_extras` inside `config.yml`.
 
 ### XHProf module
 
diff --git a/docs/other/php-56.md b/docs/other/php-56.md
deleted file mode 100644
index bd5fb6276..000000000
--- a/docs/other/php-56.md
+++ /dev/null
@@ -1,67 +0,0 @@
-Drupal VM defaults to PHP 7, but you can install and use 5.6 if you need to maximize compatibility with older Drupal 6 and 7 sites.
-
-## Ubuntu 16.04
-
-Ubuntu 16.04 Xenial defaults to PHP 7.0 in it's system packages. No older versions of PHP will be supported if using this base box.
-
-## Ubuntu 14.04 / Ubuntu 12.04
-
-Ondřej Surý's PPA for PHP 7.0 is used to install PHP 7, but you can switch to using different 5.6 packages instead by making the following changes to `config.yml`:
-
-```yaml
-vagrant_box: geerlingguy/ubuntu1404
-php_version: "5.6"
-php_install_recommends: no
-php_packages:
-  - php5.6
-  - php5.6-apcu
-  - php5.6-mcrypt
-  - php5.6-cli
-  - php5.6-common
-  - php5.6-curl
-  - php5.6-dev
-  - php5.6-fpm
-  - php5.6-gd
-  - php5.6-sqlite3
-  - php5.6-xml
-  - php5.6-mbstring
-  - libpcre3-dev
-php_conf_paths:
-  - /etc/php/5.6/fpm
-  - /etc/php/5.6/apache2
-  - /etc/php/5.6/cli
-php_extension_conf_paths:
-  - /etc/php/5.6/fpm/conf.d
-  - /etc/php/5.6/apache2/conf.d
-  - /etc/php/5.6/cli/conf.d
-php_fpm_daemon: php5.6-fpm
-php_fpm_conf_path: "/etc/php/5.6/fpm"
-php_fpm_pool_conf_path: "/etc/php/5.6/fpm/pool.d/www.conf"
-php_mysql_package: php5.6-mysql
-```
-
-If you're using Apache with `mod_php` you should also add `libapache2-mod-php5.6` to the `php_packages` list.
-
-Also, if you're using one of the `installed_extras`, you may need to update the package names accordingly:
-
-```yaml
-# If you install `redis`:
-php_redis_package: php5.6-redis
-
-# If you install `memcached`:
-php_memcached_package: php5.6-memcached
-
-# If you have `drupalvm_database` set to `pgsql`:
-php_pgsql_package: php5.6-pgsql
-
-# If you install `xhprof`:
-xhprof_download_url: https://github.com/phacility/xhprof/archive/master.tar.gz
-xhprof_download_folder_name: xhprof-master
-```
-
-## RedHat/CentOS 7
-
-Remi's RPM repository is included with Drupal VM, and you can make the following changes to use it to install PHP 5.6 instead of 7:
-
-  1. Make sure you've followed the directions for switching to CentOS 7 in the [use a different base OS](base-os.md) guide.
-  2. Change `php_version` inside `config.yml` to `"5.6"`.
diff --git a/docs/other/php.md b/docs/other/php.md
new file mode 100644
index 000000000..6a8aa5e0e
--- /dev/null
+++ b/docs/other/php.md
@@ -0,0 +1,14 @@
+Drupal VM defaults to PHP 7.0, but you can also install and use 5.6 or 7.1.
+
+## Ubuntu
+
+Ondřej Surý's PPA for PHP is used to install PHP 7.0, but you can switch to using 5.6 or 7.1 packages by changing `php_version` inside `config.yml` to eg. `"7.1"`.
+
+If you're using Apache with `mod_php` you should also add `libapache2-mod-php7.1` to the `extra_packages` list.
+
+## RedHat/CentOS 7
+
+Remi's RPM repository is included with Drupal VM, and you can make the following changes to use it to install PHP 7.1 or PHP 5.6 instead of 7.0:
+
+  1. Make sure you've followed the directions for switching to CentOS 7 in the [use a different base OS](base-os.md) guide.
+  2. Change `php_version` inside `config.yml` to `"5.6"` or `"7.1"`.
diff --git a/examples/acquia/acquia.config.yml b/examples/acquia/acquia.config.yml
index 51fa380d1..8f50db0c4 100644
--- a/examples/acquia/acquia.config.yml
+++ b/examples/acquia/acquia.config.yml
@@ -4,38 +4,6 @@ vagrant_box: geerlingguy/ubuntu1204
 
 # Acquia Cloud defaults to PHP 5.6.
 php_version: "5.6"
-php_install_recommends: no
-php_packages:
-  - php5.6
-  - php5.6-apcu
-  - php5.6-mcrypt
-  - php5.6-cli
-  - php5.6-common
-  - php5.6-curl
-  - php5.6-dev
-  - php5.6-fpm
-  - php5.6-gd
-  - php5.6-sqlite3
-  - php5.6-xml
-  - php5.6-mbstring
-  - libpcre3-dev
-php_conf_paths:
-  - /etc/php/5.6/fpm
-  - /etc/php/5.6/apache2
-  - /etc/php/5.6/cli
-php_extension_conf_paths:
-  - /etc/php/5.6/fpm/conf.d
-  - /etc/php/5.6/apache2/conf.d
-  - /etc/php/5.6/cli/conf.d
-php_fpm_daemon: php5.6-fpm
-php_fpm_conf_path: "/etc/php/5.6/fpm"
-php_fpm_pool_conf_path: "/etc/php/5.6/fpm/pool.d/www.conf"
-php_mysql_package: php5.6-mysql
-php_memcached_package: php5.6-memcached
-
-# Older version of XHProf.
-xhprof_download_url: https://github.com/phacility/xhprof/archive/master.tar.gz
-xhprof_download_folder_name: xhprof-master
 
 # Acquia Cloud Search defaults to Solr 4.x.
 solr_version: "4.5.1"
diff --git a/mkdocs.yml b/mkdocs.yml
index 35db5a0db..8437d69c2 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -40,7 +40,7 @@ pages:
     - 'Using Different Webservers': 'other/webservers.md'
     - 'Overriding configurations': 'other/overriding-configurations.md'
     - 'Installing Drupal VM as a Composer Dependency': 'other/drupalvm-composer-dependency.md'
-    - 'PHP 5.6 on Drupal VM': 'other/php-56.md'
+    - 'Using other versions of PHP': 'other/php.md'
     - 'BigPipe with Drupal VM': 'other/bigpipe.md'
     - 'Drupal VM Management Tools': 'other/management-tools.md'
     - 'Deploying Drupal VM to a production environment': 'other/production.md'

From af16df513ded0f361585995d7609cb1ef42653ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Fri, 9 Dec 2016 23:13:48 -0500
Subject: [PATCH 0522/1273] Add notes about XHProf not working with PHP 7.1 [ci
 skip]

---
 docs/extras/profile-code.md | 2 ++
 docs/other/php.md           | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/docs/extras/profile-code.md b/docs/extras/profile-code.md
index 28d6a0c54..b2d2899c3 100644
--- a/docs/extras/profile-code.md
+++ b/docs/extras/profile-code.md
@@ -30,6 +30,8 @@ SQL             n/a       -
 
 [XHProf](http://xhprof.io/) allows easy code profiling and can be used in many different ways. Ensure `xhprof` is in the list of `installed_extras` inside `config.yml`.
 
+_Note: XHProf does currently not work with PHP 7.1._
+
 ### XHProf module
 
 The easiest way to use XHProf to profile your PHP code on a Drupal site is to install the [XHProf](https://www.drupal.org/project/xhprof) module, then in XHProf's configuration (at `/admin/config/development/xhprof`), check the 'Enable profiling of page views and drush requests' checkbox.
diff --git a/docs/other/php.md b/docs/other/php.md
index 6a8aa5e0e..7c6320d4d 100644
--- a/docs/other/php.md
+++ b/docs/other/php.md
@@ -6,6 +6,8 @@ Ondřej Surý's PPA for PHP is used to install PHP 7.0, but you can switch to us
 
 If you're using Apache with `mod_php` you should also add `libapache2-mod-php7.1` to the `extra_packages` list.
 
+_Note: XHProf does currently not work with PHP 7.1, make sure you don't have it listed in `installed_extras`._
+
 ## RedHat/CentOS 7
 
 Remi's RPM repository is included with Drupal VM, and you can make the following changes to use it to install PHP 7.1 or PHP 5.6 instead of 7.0:

From ba88250f3b1a1796c5423aba07f8de33f2757dde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Fri, 9 Dec 2016 14:16:30 -0500
Subject: [PATCH 0523/1273] Add tests for PHP 5.6

---
 .travis.yml                      | 14 ++++++++++++--
 tests/ubuntu-16-php56.config.yml |  3 +++
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 tests/ubuntu-16-php56.config.yml

diff --git a/.travis.yml b/.travis.yml
index 215d465e9..edceaade0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,12 +12,20 @@ env:
       DRUPALVM_DIR: /var/www/drupalvm
       DRUSH_BIN: drush
       TEST_INSTALLED_EXTRAS: true
+
   matrix:
     # Defaults - Ubuntu 16.04.
     - type: defaults
       distro: ubuntu1604
       init: /sbin/init
       run_opts: "--privileged"
+    # PHP 5.6 - Ubuntu 16.04.
+    - type: defaults
+      distro: ubuntu1604
+      init: /sbin/init
+      run_opts: "--privileged"
+      local_config: tests/ubuntu-16-php56.config.yml
+      TEST_INSTALLED_EXTRAS: false
     # Nginx and Drush make file test - Ubuntu 16.04.
     - type: nginx-drush-make
       distro: ubuntu1604
@@ -67,6 +75,8 @@ script:
   - 'docker exec ${container_id} cp ${DRUPALVM_DIR}/${MAKEFILE} ${config_dir:-$DRUPALVM_DIR}/drupal.make.yml'
   - 'docker exec ${container_id} cp ${DRUPALVM_DIR}/${COMPOSERFILE} ${config_dir:-$DRUPALVM_DIR}/drupal.composer.json'
 
+  - '[[ ! -z "${DRUPALVM_ENV}" ]] && docker exec ${container_id} bash -c "cp ${DRUPALVM_DIR}/tests/${DRUPALVM_ENV}.config.yml ${config_dir:-$DRUPALVM_DIR}/${DRUPALVM_ENV}.config.yml" || true'
+
   # Override configuration variables.
   - '[[ ! -z "${local_config}" ]] && docker exec ${container_id} bash -c "cp ${DRUPALVM_DIR}/${local_config} ${config_dir:-$DRUPALVM_DIR}/local.config.yml" || true'
 
@@ -82,9 +92,9 @@ script:
   # Run the playbook with ansible-playbook.
   - >
     if [ ! -z "${config_dir}" ]; then
-      docker exec --tty ${container_id} env TERM=xterm ansible-playbook ${DRUPALVM_DIR}/provisioning/playbook.yml --extra-vars="config_dir=${config_dir}";
+      docker exec --tty ${container_id} env TERM=xterm DRUPALVM_ENV=${DRUPALVM_ENV} ansible-playbook ${DRUPALVM_DIR}/provisioning/playbook.yml --extra-vars="config_dir=${config_dir}";
     else
-      docker exec --tty ${container_id} env TERM=xterm ansible-playbook ${DRUPALVM_DIR}/provisioning/playbook.yml;
+      docker exec --tty ${container_id} env TERM=xterm DRUPALVM_ENV=${DRUPALVM_ENV} ansible-playbook ${DRUPALVM_DIR}/provisioning/playbook.yml;
     fi
 
   # Run integration tests.
diff --git a/tests/ubuntu-16-php56.config.yml b/tests/ubuntu-16-php56.config.yml
new file mode 100644
index 000000000..a4782a83f
--- /dev/null
+++ b/tests/ubuntu-16-php56.config.yml
@@ -0,0 +1,3 @@
+---
+php_version: "5.6"
+installed_extras: []

From 3cabc5907aab67dccbe0cf62becd0793e4c5ae50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Fri, 9 Dec 2016 23:33:54 -0500
Subject: [PATCH 0524/1273] fix travis failure

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index edceaade0..faf1ebe7e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,6 +25,7 @@ env:
       init: /sbin/init
       run_opts: "--privileged"
       local_config: tests/ubuntu-16-php56.config.yml
+      DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/drush/drush/drush"
       TEST_INSTALLED_EXTRAS: false
     # Nginx and Drush make file test - Ubuntu 16.04.
     - type: nginx-drush-make

From a6a954f54e1b7f6f021b8daca3679859bae2c025 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 9 Dec 2016 22:41:38 -0600
Subject: [PATCH 0525/1273] Update to latest PHP XDebug and Redis roles.

---
 provisioning/requirements.yml                 |  4 +-
 .../roles/geerlingguy.php-redis/.travis.yml   | 45 ++++++++++---------
 .../roles/geerlingguy.php-redis/README.md     |  4 +-
 .../geerlingguy.php-redis/tasks/main.yml      |  5 ---
 .../geerlingguy.php-redis/tests/inventory     |  1 -
 .../tests/requirements.yml                    |  4 ++
 .../geerlingguy.php-redis/tests/test.yml      | 16 ++++---
 .../roles/geerlingguy.php-xdebug/.travis.yml  |  2 -
 .../geerlingguy.php-xdebug/defaults/main.yml  |  2 +-
 .../geerlingguy.php-xdebug/meta/main.yml      |  3 +-
 .../tests/test-vars-ubuntu1404.yml            | 21 ---------
 .../geerlingguy.php-xdebug/tests/test.yml     |  7 ---
 12 files changed, 44 insertions(+), 70 deletions(-)
 delete mode 100644 provisioning/roles/geerlingguy.php-redis/tests/inventory
 create mode 100644 provisioning/roles/geerlingguy.php-redis/tests/requirements.yml
 delete mode 100644 provisioning/roles/geerlingguy.php-xdebug/tests/test-vars-ubuntu1404.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 0cf598f35..ccbced44e 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -50,9 +50,9 @@
 - src: geerlingguy.php-pgsql
   version: 1.0.0
 - src: geerlingguy.php-redis
-  version: 3.0.0
+  version: 3.1.0
 - src: geerlingguy.php-xdebug
-  version: 2.2.0
+  version: 2.2.2
 - src: geerlingguy.php-xhprof
   version: 2.2.0
 - src: geerlingguy.pimpmylog
diff --git a/provisioning/roles/geerlingguy.php-redis/.travis.yml b/provisioning/roles/geerlingguy.php-redis/.travis.yml
index f4fe38645..c01ba821e 100644
--- a/provisioning/roles/geerlingguy.php-redis/.travis.yml
+++ b/provisioning/roles/geerlingguy.php-redis/.travis.yml
@@ -1,40 +1,43 @@
 ---
-sudo: required
-language: python
-python: "2.7"
+services: docker
 
 env:
-  - SITE=test.yml
+  - distro: centos7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distro: ubuntu1604
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
 
 before_install:
-  - sudo apt-get update -qq
+  # Pull container.
+  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
 
-install:
-  # Install Ansible.
-  - pip install ansible
-
-  # Add ansible.cfg to pick up roles path.
-  - "{ echo '[defaults]'; echo 'roles_path = ../'; } >> ansible.cfg"
+script:
+  - container_id=$(mktemp)
+  # Run container in detached state.
+  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
 
   # Install dependencies.
-  - ansible-galaxy install geerlingguy.redis geerlingguy.php
+  - 'docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
 
-script:
-  # Check the role/playbook's syntax.
-  - "ansible-playbook -i tests/inventory tests/$SITE --syntax-check"
+  # Ansible syntax check.
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
 
-  # Run the role/playbook with ansible-playbook.
-  - "ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo"
+  # Test role.
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
 
-  # Run the role/playbook again, checking to make sure it's idempotent.
+  # Test role idempotence.
+  - idempotence=$(mktemp)
+  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
   - >
-    ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo
+    tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
     && (echo 'Idempotence test: pass' && exit 0)
     || (echo 'Idempotence test: fail' && exit 1)
 
-  # Run script to test if Redis is available and working.
-  - php tests/redis-test.php
+  # Run script to test if Memcached is available and working.
+  - 'docker exec "$(cat ${container_id})" env TERM=xterm php /etc/ansible/roles/role_under_test/tests/redis-test.php'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.php-redis/README.md b/provisioning/roles/geerlingguy.php-redis/README.md
index 74f5dfe8d..70652506b 100644
--- a/provisioning/roles/geerlingguy.php-redis/README.md
+++ b/provisioning/roles/geerlingguy.php-redis/README.md
@@ -26,7 +26,7 @@ If you want to install PhpRedis directly from source (if you're on an OS that do
 
     php_redis_install_from_source: false
 
-Whether to install PhpRedis from source. If you'd like to install a specific version of PhpRedis not available via the system package manager, you can compile the extension from source. Note that source installation is forced on Ubuntu 12.04.
+Whether to install PhpRedis from source. If you'd like to install a specific version of PhpRedis not available via the system package manager, you can compile the extension from source.
 
     php_redis_source_repo: https://github.com/phpredis/phpredis.git
 
@@ -60,4 +60,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2015 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
+This role was created in 2015 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.php-redis/tasks/main.yml b/provisioning/roles/geerlingguy.php-redis/tasks/main.yml
index bca9bef4e..766f5fa1f 100644
--- a/provisioning/roles/geerlingguy.php-redis/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php-redis/tasks/main.yml
@@ -8,11 +8,6 @@
     php_redis_package: "{{ __php_redis_package }}"
   when: php_redis_package is not defined
 
-- name: Force install from source on Ubuntu 12.04.
-  set_fact:
-    php_redis_install_from_source: true
-  when: ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'precise'
-
 # Install PhpRedis from the system package manager.
 - name: Install PhpRedis extension (RedHat).
   yum:
diff --git a/provisioning/roles/geerlingguy.php-redis/tests/inventory b/provisioning/roles/geerlingguy.php-redis/tests/inventory
deleted file mode 100644
index 2fbb50c4a..000000000
--- a/provisioning/roles/geerlingguy.php-redis/tests/inventory
+++ /dev/null
@@ -1 +0,0 @@
-localhost
diff --git a/provisioning/roles/geerlingguy.php-redis/tests/requirements.yml b/provisioning/roles/geerlingguy.php-redis/tests/requirements.yml
new file mode 100644
index 000000000..414cad3c6
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-redis/tests/requirements.yml
@@ -0,0 +1,4 @@
+---
+- src: geerlingguy.repo-remi
+- src: geerlingguy.redis
+- src: geerlingguy.php
diff --git a/provisioning/roles/geerlingguy.php-redis/tests/test.yml b/provisioning/roles/geerlingguy.php-redis/tests/test.yml
index f101e0872..442ba8676 100644
--- a/provisioning/roles/geerlingguy.php-redis/tests/test.yml
+++ b/provisioning/roles/geerlingguy.php-redis/tests/test.yml
@@ -1,14 +1,18 @@
 ---
-- hosts: localhost
-  remote_user: root
+- hosts: all
 
   vars:
-    # Because Travis runs on Ubuntu 12.04, PhpRedis is not available via package
-    # so we have to install from source.
-    php_redis_install_from_source: true
     php_enable_webserver: false
+    php_enablerepo: "remi,remi-php70"
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=yes cache_valid_time=600
+      when: ansible_os_family == 'Debian'
 
   roles:
+    - role: geerlingguy.repo-remi
+      when: ansible_os_family == 'RedHat'
     - geerlingguy.redis
     - geerlingguy.php
-    - ansible-role-php-redis
+    - role_under_test
diff --git a/provisioning/roles/geerlingguy.php-xdebug/.travis.yml b/provisioning/roles/geerlingguy.php-xdebug/.travis.yml
index bb377e0a5..4849f250e 100644
--- a/provisioning/roles/geerlingguy.php-xdebug/.travis.yml
+++ b/provisioning/roles/geerlingguy.php-xdebug/.travis.yml
@@ -42,7 +42,5 @@ script:
   # Run script to test if Xdebug is available and working.
   - 'docker exec "$(cat ${container_id})" env TERM=xterm php /etc/ansible/roles/role_under_test/tests/xdebug-test.php'
 
-  - 'docker exec "$(cat ${container_id})" env TERM=xterm php --version'
-
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.php-xdebug/defaults/main.yml b/provisioning/roles/geerlingguy.php-xdebug/defaults/main.yml
index baa994755..bcb47358e 100644
--- a/provisioning/roles/geerlingguy.php-xdebug/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.php-xdebug/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
 workspace: /root
 
-php_xdebug_version: 2.4.1
+php_xdebug_version: 2.5.0
 
 php_xdebug_coverage_enable: 1
 php_xdebug_default_enable: 1
diff --git a/provisioning/roles/geerlingguy.php-xdebug/meta/main.yml b/provisioning/roles/geerlingguy.php-xdebug/meta/main.yml
index 27c831b1c..026a37a7e 100644
--- a/provisioning/roles/geerlingguy.php-xdebug/meta/main.yml
+++ b/provisioning/roles/geerlingguy.php-xdebug/meta/main.yml
@@ -1,6 +1,5 @@
 ---
-dependencies:
-  - geerlingguy.php
+dependencies: []
 
 galaxy_info:
   author: geerlingguy
diff --git a/provisioning/roles/geerlingguy.php-xdebug/tests/test-vars-ubuntu1404.yml b/provisioning/roles/geerlingguy.php-xdebug/tests/test-vars-ubuntu1404.yml
deleted file mode 100644
index 49c96b888..000000000
--- a/provisioning/roles/geerlingguy.php-xdebug/tests/test-vars-ubuntu1404.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-php_packages:
-  - php5.6
-  - php5.6-mcrypt
-  - php5.6-cli
-  - php5.6-common
-  - php5.6-curl
-  - php5.6-dev
-  - php5.6-fpm
-  - php5.6-gd
-  - libpcre3-dev
-php_conf_paths:
-  - /etc/php/5.6/fpm
-  - /etc/php/5.6/apache2
-  - /etc/php/5.6/cli
-php_extension_conf_paths:
-  - /etc/php/5.6/fpm/conf.d
-  - /etc/php/5.6/apache2/conf.d
-  - /etc/php/5.6/cli/conf.d
-php_fpm_daemon: php5.6-fpm
-php_fpm_conf_path: "/etc/php/5.6/fpm"
diff --git a/provisioning/roles/geerlingguy.php-xdebug/tests/test.yml b/provisioning/roles/geerlingguy.php-xdebug/tests/test.yml
index 70d5c1d18..942f6d7e6 100644
--- a/provisioning/roles/geerlingguy.php-xdebug/tests/test.yml
+++ b/provisioning/roles/geerlingguy.php-xdebug/tests/test.yml
@@ -22,13 +22,6 @@
           - php7.0-apcu
       when: ansible_distribution == 'Debian'
 
-    - include_vars: test-vars-ubuntu1404.yml
-      when: ansible_distribution == 'Ubuntu'
-
-    - name: Add repository for PHP 5.6.
-      apt_repository: repo='ppa:ondrej/php'
-      when: ansible_distribution == 'Ubuntu'
-
   roles:
     - role: geerlingguy.repo-remi
       when: ansible_os_family == 'RedHat'

From aa362c9179409ef2c82cc96d7201f39870ea66be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Fri, 9 Dec 2016 23:58:39 -0500
Subject: [PATCH 0526/1273] Mention both PHP 5.6 and PHP 7.1 in PHP docs [ci
 skip]

---
 docs/other/php.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/other/php.md b/docs/other/php.md
index 7c6320d4d..25823a389 100644
--- a/docs/other/php.md
+++ b/docs/other/php.md
@@ -2,9 +2,9 @@ Drupal VM defaults to PHP 7.0, but you can also install and use 5.6 or 7.1.
 
 ## Ubuntu
 
-Ondřej Surý's PPA for PHP is used to install PHP 7.0, but you can switch to using 5.6 or 7.1 packages by changing `php_version` inside `config.yml` to eg. `"7.1"`.
+Ondřej Surý's PPA for PHP is used to install PHP 7.0, but you can switch to using 5.6 or 7.1 packages by changing `php_version` inside `config.yml` to `"5.6"` or `"7.1"`.
 
-If you're using Apache with `mod_php` you should also add `libapache2-mod-php7.1` to the `extra_packages` list.
+If you're using Apache with `mod_php` you should also add `libapache2-mod-php5.6` or `libapache2-mod-php7.1` to the `extra_packages` list.
 
 _Note: XHProf does currently not work with PHP 7.1, make sure you don't have it listed in `installed_extras`._
 

From 8cd9729bae385ea0b62708229aebdc8cf35258a1 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 10 Dec 2016 10:54:45 -0600
Subject: [PATCH 0527/1273] Adjust list of installed packages for accuracy.

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 2f1645261..a0678051b 100644
--- a/README.md
+++ b/README.md
@@ -11,10 +11,10 @@ It will install the following on an Ubuntu 16.04 (by default) linux VM:
   - Apache 2.4.x (or Nginx)
   - PHP 7.0.x (configurable)
   - MySQL 5.7.x (or MariaDB, or PostgreSQL)
-  - Drush (configurable)
-  - Drupal 7.x, or 8.x.x (configurable)
+  - Drupal 7 or 8
   - Optional:
     - Drupal Console
+    - Drush
     - Varnish 4.x (configurable)
     - Apache Solr 4.10.x (configurable)
     - Elasticsearch

From ca7814bc137d9287cf1c990ff3ed2e18f02063d5 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 10 Dec 2016 10:57:19 -0600
Subject: [PATCH 0528/1273] Fixes #1030: Encourage installation of
 vagrant-vbguest plugin.

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

diff --git a/README.md b/README.md
index a0678051b..3a6b86f30 100644
--- a/README.md
+++ b/README.md
@@ -73,6 +73,7 @@ You can also use an alternative provider like Parallels or VMware. (Parallels De
 Notes:
 
   - **For faster provisioning** (macOS/Linux only): *[Install Ansible](http://docs.ansible.com/intro_installation.html) on your host machine, so Drupal VM can run the provisioning steps locally instead of inside the VM.*
+  - **For stability**: Because every version of VirtualBox introduces changes to networking, for the best stability, you should install Vagrant's `vbguest` plugin: `vagrant plugin install vagrant-vbguest`.
   - **NFS on Linux**: *If NFS is not already installed on your host, you will need to install it to use the default NFS synced folder configuration. See guides for [Debian/Ubuntu](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-ubuntu-14-04), [Arch](https://wiki.archlinux.org/index.php/NFS#Installation), and [RHEL/CentOS](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-centos-6).*
   - **Versions**: *Make sure you're running the latest releases of Vagrant, VirtualBox, and Ansible—as of late 2016, Drupal VM recommends: Vagrant 1.8.6, VirtualBox 5.1.10+, and Ansible 2.2.x*
 

From 519033a09e16fda8361eddddb8e712e59be72892 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 10 Dec 2016 10:57:46 -0600
Subject: [PATCH 0529/1273] Issue #1045: Update CHANGELOG for 4.0.0 release.

---
 CHANGELOG.md | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 226331e67..5c2af25bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,38 @@
 # Drupal VM Changelog
 
+## 4.0.0 "We've Got Company" (2016-12-10)
+
+### Breaking Changes
+
+  * Drush is now an optional `installed_extra`. **If you use Drush, and it's not installed as part of your own project's dependencies**, make sure you add `drush` as one of the `installed_extras` in your `config.yml`.
+  * Vagrant 1.8.6 or later, VirtualBox 5.1.10 or later, and Ansible 2.2.0 or later (if installed on host) are now required.
+  * PHP 7.0 is still the default, but **you can install PHP 7.1**, or **switch to PHP 5.6** on-the-fly, thanks to #1043—on any supported OS! See the updated docs: [Using other versions of PHP](http://docs.drupalvm.com/en/latest/other/php/)
+
+### New/changed variables in default.config.yml
+
+  * TODO
+
+### Improvements
+
+  * #1043: Make switching PHP versions easier, and add support for PHP 7.1.
+  * #711: Make Drush optional.
+  * #788: Add optional PHP upload_progress support.
+  * #992: Add optional `DRUPALVM_ANSIBLE_ARGS` support for Ansible CLI options.
+  * #1002: Allow shallow Drush clones for faster builds.
+  * #1007, #1009: Added a GitHub ISSUE_TEMPLATE to help my sanity.
+  * #1018: Fix Solr versioning error in Solr role.
+  * #823: Set composer.json type to `vm` instead of `project`.
+  * Update following Ansible roles to newer versions: Solr, Nginx, Git, PHP, Firewall, Apache, PHP-XDebug, PHP-Redis.
+
+### Bugfixes
+
+  * #981: Bump minimum required Vagrant and VirtualBox versions.
+  * #1014: Fix path in extra tasks example.
+  * #1020: Switch to Drush `8.x` branch (instead of `master`/`9.x`) for Drupal 6/7 compatibility.
+  * #1004: Add note about `php_pgsql_package` for PHP 5.6 (superceded by later work).
+  * #1037: Fix Acquia configuration example for PHP 5.6 (superceded by later work).
+
+
 ## 3.5.2 (2016-11-17)
 
 ### Improvements

From c626a3e5cb0800f2ba163bec9d580597d98fa210 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 10 Dec 2016 13:19:48 -0600
Subject: [PATCH 0530/1273] Update config docs on PHP versions.

---
 default.config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/default.config.yml b/default.config.yml
index dd49e862e..ba9bcb8bd 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -234,8 +234,8 @@ firewall_allowed_tcp_ports:
   - "9200"
 firewall_log_dropped_packets: false
 
-# PHP Configuration. Currently-supported versions: 5.6, 7.0.
-# To use 5.6, see: http://docs.drupalvm.com/en/latest/other/php-56/
+# PHP Configuration. Currently-supported versions: 5.6, 7.0, 7.1.
+# See version-specific notes: http://docs.drupalvm.com/en/latest/other/php/
 php_version: "7.0"
 php_install_recommends: no
 php_memory_limit: "192M"

From a247ddbcbfad8f40a7db96ec262f10793812fd6a Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 16 Dec 2016 11:13:51 -0600
Subject: [PATCH 0531/1273] Update MySQL role to latest version.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.mysql/README.md         |  8 +++--
 .../roles/geerlingguy.mysql/defaults/main.yml |  8 +++++
 .../tasks/secure-installation.yml             | 30 +++++++++++++++----
 .../templates/root-my.cnf.j2                  |  3 ++
 .../templates/user-my.cnf.j2                  |  4 +--
 6 files changed, 45 insertions(+), 10 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.mysql/templates/root-my.cnf.j2

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index ccbced44e..2ddbb991d 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -34,7 +34,7 @@
 - src: geerlingguy.memcached
   version: 1.0.7
 - src: geerlingguy.mysql
-  version: 2.4.2
+  version: 2.5.0
 - src: geerlingguy.nginx
   version: 1.9.6
 - src: geerlingguy.nodejs
diff --git a/provisioning/roles/geerlingguy.mysql/README.md b/provisioning/roles/geerlingguy.mysql/README.md
index ddc5f03bc..975f0d730 100644
--- a/provisioning/roles/geerlingguy.mysql/README.md
+++ b/provisioning/roles/geerlingguy.mysql/README.md
@@ -18,12 +18,16 @@ No special requirements; note that this role requires root access, so either run
 Available variables are listed below, along with default values (see `defaults/main.yml`):
 
     mysql_user_home: /root
+    mysql_user_name: root
+    mysql_user_password: root
 
-The home directory inside which Python MySQL settings will be stored, which Ansible will use when connecting to MySQL. This should be the home directory of the user which runs this Ansible role.
+The home directory inside which Python MySQL settings will be stored, which Ansible will use when connecting to MySQL. This should be the home directory of the user which runs this Ansible role. The `mysql_user_name` and `mysql_user_password` can be set if you are running this role under a non-root user account and want to set a non-root user.
 
+    mysql_root_home: /root
+    mysql_root_username: root
     mysql_root_password: root
 
-The MySQL root user account password.
+The MySQL root user account details.
 
     mysql_root_password_update: no
 
diff --git a/provisioning/roles/geerlingguy.mysql/defaults/main.yml b/provisioning/roles/geerlingguy.mysql/defaults/main.yml
index 46e58a8e2..33c5405a6 100644
--- a/provisioning/roles/geerlingguy.mysql/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.mysql/defaults/main.yml
@@ -1,10 +1,18 @@
 ---
+# Set this to the user ansible is logging in as - should have root
+# or sudo access
 mysql_user_home: /root
+mysql_user_name: root
+mysql_user_password: root
+
+# The default root user installed by mysql - almost always root
+mysql_root_home: /root
 mysql_root_username: root
 mysql_root_password: root
 
 # Set this to `yes` to forcibly update the root password.
 mysql_root_password_update: no
+mysql_user_password_update: no
 
 mysql_enabled_on_startup: yes
 
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/secure-installation.yml b/provisioning/roles/geerlingguy.mysql/tasks/secure-installation.yml
index fc079baac..3e386c5e0 100644
--- a/provisioning/roles/geerlingguy.mysql/tasks/secure-installation.yml
+++ b/provisioning/roles/geerlingguy.mysql/tasks/secure-installation.yml
@@ -4,17 +4,36 @@
   register: mysql_cli_version
   changed_when: false
 
+- name: Ensure default user is present.
+  mysql_user:
+    name: "{{ mysql_user_name }}"
+    host: 'localhost'
+    password: "{{ mysql_user_password }}"
+    priv: '*.*:ALL,GRANT'
+    state: present
+  when: mysql_user_name != mysql_root_username
+
+# Has to be after the password assignment, for idempotency.
+- name: Copy user-my.cnf file with password credentials.
+  template:
+    src: "user-my.cnf.j2"
+    dest: "{{ mysql_user_home }}/.my.cnf"
+    owner: "{{ mysql_user_name }}"
+    mode: 0600
+  when: mysql_user_name != mysql_root_username and (mysql_install_packages | bool or mysql_user_password_update)
+
 - name: Disallow root login remotely
   command: 'mysql -NBe "{{ item }}"'
   with_items:
-    - DELETE FROM mysql.user WHERE User='root' AND Host NOT IN ('localhost', '127.0.0.1', '::1')
+    - DELETE FROM mysql.user WHERE User='{{ mysql_root_username }}' AND Host NOT IN ('localhost', '127.0.0.1', '::1')
   changed_when: false
 
 - name: Get list of hosts for the root user.
-  command: mysql -NBe 'SELECT Host FROM mysql.user WHERE User = "root" ORDER BY (Host="localhost") ASC'
+  command: mysql -NBe "SELECT Host FROM mysql.user WHERE User = '{{ mysql_root_username }}' ORDER BY (Host='localhost') ASC"
   register: mysql_root_hosts
   changed_when: false
   always_run: true
+  when: mysql_install_packages | bool or mysql_root_password_update
 
 # Note: We do not use mysql_user for this operation, as it doesn't always update
 # the root password correctly. See: https://goo.gl/MSOejW
@@ -29,7 +48,7 @@
 # Set root password for MySQL < 5.7.x.
 - name: Update MySQL root password for localhost root account (< 5.7.x).
   shell: >
-    mysql -u root -NBe
+    mysql -NBe
     'SET PASSWORD FOR "{{ mysql_root_username }}"@"{{ item }}" = PASSWORD("{{ mysql_root_password }}");'
   with_items: "{{ mysql_root_hosts.stdout_lines|default([]) }}"
   when: ((mysql_install_packages | bool) or mysql_root_password_update) and ('5.7.' not in mysql_cli_version.stdout)
@@ -37,11 +56,12 @@
 # Has to be after the root password assignment, for idempotency.
 - name: Copy .my.cnf file with root password credentials.
   template:
-    src: "user-my.cnf.j2"
-    dest: "{{ mysql_user_home }}/.my.cnf"
+    src: "root-my.cnf.j2"
+    dest: "{{ mysql_root_home }}/.my.cnf"
     owner: root
     group: root
     mode: 0600
+  when: mysql_install_packages | bool or mysql_root_password_update
 
 - name: Get list of hosts for the anonymous user.
   command: mysql -NBe 'SELECT Host FROM mysql.user WHERE User = ""'
diff --git a/provisioning/roles/geerlingguy.mysql/templates/root-my.cnf.j2 b/provisioning/roles/geerlingguy.mysql/templates/root-my.cnf.j2
new file mode 100644
index 000000000..43de06aae
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/templates/root-my.cnf.j2
@@ -0,0 +1,3 @@
+[client]
+user={{ mysql_root_username }}
+password={{ mysql_root_password }}
diff --git a/provisioning/roles/geerlingguy.mysql/templates/user-my.cnf.j2 b/provisioning/roles/geerlingguy.mysql/templates/user-my.cnf.j2
index 95cae6622..d6d9259cf 100644
--- a/provisioning/roles/geerlingguy.mysql/templates/user-my.cnf.j2
+++ b/provisioning/roles/geerlingguy.mysql/templates/user-my.cnf.j2
@@ -1,3 +1,3 @@
 [client]
-user={{ mysql_root_username }}
-password="{{ mysql_root_password }}"
+user={{ mysql_user_name }}
+password={{ mysql_user_password }}

From 4c84529bc08b314526fa1d3202e27162603e88cb Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 16 Dec 2016 11:27:42 -0600
Subject: [PATCH 0532/1273] Fixes #1054: Update Solr role to prevent
 permissions error.

---
 provisioning/requirements.yml                         | 2 +-
 provisioning/roles/geerlingguy.solr/tasks/install.yml | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 2ddbb991d..c787d970c 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -70,6 +70,6 @@
 - src: geerlingguy.security
   version: 1.4.0
 - src: geerlingguy.solr
-  version: 3.4.0
+  version: 3.4.1
 - src: geerlingguy.varnish
   version: 1.8.1
diff --git a/provisioning/roles/geerlingguy.solr/tasks/install.yml b/provisioning/roles/geerlingguy.solr/tasks/install.yml
index 7f76d026f..aa32ea430 100644
--- a/provisioning/roles/geerlingguy.solr/tasks/install.yml
+++ b/provisioning/roles/geerlingguy.solr/tasks/install.yml
@@ -3,6 +3,9 @@
   yum: name=lsof state=present
   when: ansible_os_family == "RedHat"
 
+- name: Ensure setfacl support is present.
+  package: name=acl state=present
+
 - name: Run Solr installation script.
   shell: >
     {{ solr_workspace }}/{{ solr_filename }}/bin/install_solr_service.sh

From 0475dd9b672dbdfcaf1ee507992d4da5b3ac11b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Fri, 16 Dec 2016 19:54:41 -0500
Subject: [PATCH 0533/1273] Issue #455: Move examples/prod readme to docs

---
 docs/other/production.md | 106 ++++++++++++++++++++++++++++++++++++++-
 examples/prod/README.md  |  86 +------------------------------
 2 files changed, 105 insertions(+), 87 deletions(-)

diff --git a/docs/other/production.md b/docs/other/production.md
index f4f431a28..08fa5024a 100644
--- a/docs/other/production.md
+++ b/docs/other/production.md
@@ -1,7 +1,5 @@
 Drupal VM has _experimental_ support for deploying Drupal VM to a production environment. The security of your servers is _your_ responsibility.
 
-For a configuration example and instructions on how to build a Drupal environment with Drupal VM on DigitalOcean see the [`examples/prod` directory and README](https://github.com/geerlingguy/drupal-vm/tree/master/examples/prod).
-
 ## Production specific overrides.
 
 Drupal VM supports loading configuration files depending on the environment variable `DRUPALVM_ENV` and using this feature you can have different configurations between development and production environments.
@@ -32,3 +30,107 @@ ansible-playbook -i examples/prod/inventory provisioning/playbook.yml --sudo --a
 ```
 
 _Note: Having the variable set locally takes precedence over having it on the remote machine._
+
+As a precaution not to accidentally provision a production server with insecure configurations, you should set your security hardening configurations in `config.yml`, your local development overrides in `vagrant.config.yml` and finally any additional production specific overrides in `prod.config.yml`. This way, a production environment will never be provisioned with development tools, even if the `prod.config.yml` is not read.
+
+## Example: Drupal VM on DigitalOcean
+
+The [`examples/prod` directory](https://github.com/geerlingguy/drupal-vm/tree/master/examples/prod) contains an example production configuration for Drupal VM which can be used to deploy Drupal VM to a production environment on a cloud provider like DigitalOcean, Linode, or AWS.
+
+This guide contains instructions for how you can build a Drupal environment with Drupal VM on DigitalOcean.
+
+### Create a DigitalOcean Droplet
+
+If you don't already have a DigitalOcean account, create one (you can use geerlingguy's [affiliate link](https://www.digitalocean.com/?refcode=b9c57af84643) to sign up, otherwise, visit the normal [DigitalOcean Sign Up form](https://cloud.digitalocean.com/registrations/new).
+
+Make sure you have an SSH key you can use to connect to your DigitalOcean droplets, and if you don't already have one set up, or if you need to add your existing key to your account, follow the instructions in this guide: [How to use SSH keys with DigitalOcean Droplets](https://www.digitalocean.com/community/tutorials/how-to-use-ssh-keys-with-digitalocean-droplets).
+
+Once you are logged into DigitalOcean and have added your SSH key, click the 'Create Droplet' button on your Droplets page. For the Droplet, choose the following options:
+
+  - **Image**: Choose `Ubuntu 16.04.x x64`
+  - **Size**: 1 GB / 1 CPU (currently $10/month; you can choose a higher plan if needed)
+  - **Region**: Choose whatever region is geographically nearest to you and your site visitors
+  - **Settings**: (Nothing here affects how Drupal VM works, choose what you'd like)
+  - **Add SSH Keys**: Select the SSH key you added to your account earlier.
+  - **Hostname**: Choose a hostname for your site (e.g. `example.drupalvm.com`)
+
+Click 'Create Droplet', and wait a minute or so while the Droplet is booted. Once it's booted, make sure you can log into it from your local computer:
+
+    ssh root@[droplet-hostname-or-ip]
+
+(Make sure you replace `[droplet-hostname-or-ip]`) with the hostname or IP address of your Droplet!)
+
+If you get a warning like "the authenticity of the host can't be established", answer yes to the prompt and hit enter. You should now be logged into the Droplet. Log back out by typing `exit` at the prompt and hitting return.
+
+Your DigitalOcean Droplet is booted and ready to have Drupal VM installed on it.
+
+### Customize `config.yml` for production
+
+Copy [`examples/prod/prod.config.yml`](https://github.com/geerlingguy/drupal-vm/blob/master/examples/prod/prod.config.yml) to `config.yml`, and by looking at `default.config.yml` add any other overrides you'd like. Whatever variables you have set in `config.yml` will override the defaults set by `default.config.yml`.
+
+The changes outlined in the [example `prod.config.yml`](https://github.com/geerlingguy/drupal-vm/blob/master/examples/prod/prod.config.yml) disable development-environment tools (like Pimp My Log and Adminer) and add extra security hardening configuration (via the `extra_security_enabled` variable).
+
+You now have Drupal VM configured for production by default. This is the recommended and safest way, so that you can't accidentally provision a production server with development tools. If desired you can also use the [environment variable `DRUPALVM_ENV`](#production-specific-overrides) to load an additional `<ENV>.config.yml` with production specific overrides. In most cases this is not needed though.
+
+### Customize `vagrant.config.yml` for local development
+
+To re-use the same setup for local development, copy `default.config.yml` to `vagrant.config.yml` and configure it so that you override the security hardening configurations that were added in `config.yml`.
+
+When you run `vagrant up` or `vagrant provision` the order of the configuration files read will be:
+
+- `default.config.yml`
+- `config.yml`
+- `local.config.yml`
+- `vagrant.config.yml`
+
+### Customize `inventory` for production
+
+The only other thing you need to do is copy the inventory file `example.inventory` to `inventory` (so it is located at `prod/inventory`). By default, it reads:
+
+    [drupalvm]
+    1.2.3.4 ansible_ssh_user=my_admin_username
+
+Change the host `1.2.3.4` to either the IP address or the hostname of your DigitalOcean Droplet. Remember that if you would like to use a hostname, you need to make sure the hostname actually resolves to your Droplet's IP address, either in your domain's public DNS configuration, or via your local hosts file.
+
+### Initialize the server with an administrative account
+
+> Note: This guide assumes you have Ansible [installed](http://docs.ansible.com/ansible/intro_installation.html) on your host machine.
+
+The first step in setting up Drupal VM on the cloud server is to initialize the server with an administrative account (which is separate from the `root` user account for better security).
+
+Inside the `examples/prod/bootstrap` folder, copy the `example.vars.yml` file to `vars.yml` and update the variables in that file for your own administrative account (make sure especially to update the `admin_password` value!).
+
+Then, run the following command within Drupal VM's root directory (the folder containing the `Vagrantfile`):
+
+    ansible-playbook -i examples/prod/inventory examples/prod/bootstrap/init.yml -e "ansible_ssh_user=root"
+
+Once the initialization is complete, you can test your new admin login with `ssh my_admin_username@droplet-hostname-or-ip`. You should be logged in via your existing SSH key. Log back out with `exit`.
+
+### Provision Drupal VM on the Droplet
+
+Run the following command within Drupal VM's root directory (the folder containing the `Vagrantfile`):
+
+    ansible-playbook -i examples/prod/inventory provisioning/playbook.yml --sudo --ask-sudo-pass
+
+Ansible will prompt you for your admin account's `sudo` password (the same as the password you encrypted and saved as `admin_password`). Enter it and press return.
+
+After a few minutes, your Drupal-VM-in-the-cloud Droplet should be fully configured to match your local development environment! You can visit your Droplet and access the fresh Drupal site just like you would locally (e.g. `http://example.drupalvm.com/`).
+
+### Known issues
+
+  - You may need to manually create the `drupal_core_path` directory on the server at this time; it's not always created automatically due to permissions errors.
+  - The `files` folder that is generated during the initial Drupal installation is set to be owned by the admin account; to make it work (and to allow Drupal to generate stylesheets and files correctly), you have to manually log into the server and run the following two commands after provisioning is complete:
+
+      ```
+      $ sudo chown -R www-data /var/www/drupalvm/drupal/sites/default/files
+      $ sudo chmod -R 0700 /var/www/drupalvm/drupal/sites/default/files
+      ```
+
+  - You can't synchronize folders between your host machine and DigitalOcean (at least not in any sane way); so you'll need to either have Drupal VM install a site from a given Drush make file or composer.json, or deploy your site yourself.
+  - Drupal VM doesn't include any kind of backup system. You should use one if you have any kind of important data on your server!
+
+### Go Further
+
+You can use Ubuntu 12.04, Ubuntu 14.04, Ubuntu 16.04, CentOS 6 or CentOS 7 when you build the DigitalOcean Droplet. Just like with Drupal VM running locally, you can customize almost every aspect of the server!
+
+You may want to customize your configuration even further, to make sure Drupal VM is tuned for your specific Drupal site's needs, or you may want to change things and make the server configuration more flexible, etc. For all that, the book [Ansible for DevOps](http://ansiblefordevops.com/) will give you a great introduction to using Ansible to make Drupal VM and the included Ansible configuration do exactly what you need!
diff --git a/examples/prod/README.md b/examples/prod/README.md
index a159a2927..113b0732c 100644
--- a/examples/prod/README.md
+++ b/examples/prod/README.md
@@ -2,88 +2,4 @@
 
 > **Important**: This feature is currently in 'experimental' status, and the security of your servers is _your_ responsibility.
 
-This directory contains an example production configuration for Drupal VM which can be used to deploy Drupal VM to a production environment on a cloud provider like DigitalOcean, Linode, or AWS.
-
-This README file contains instructions for how you can use this configuration file to build a Drupal environment with Drupal VM on DigitalOcean.
-
-## Create a DigitalOcean Droplet
-
-If you don't already have a DigitalOcean account, create one (you can use geerlingguy's [affiliate link](https://www.digitalocean.com/?refcode=b9c57af84643) to sign up, otherwise, visit the normal [DigitalOcean Sign Up form](https://cloud.digitalocean.com/registrations/new).
-
-Make sure you have an SSH key you can use to connect to your DigitalOcean droplets, and if you don't already have one set up, or if you need to add your existing key to your account, follow the instructions in this guide: [How to use SSH keys with DigitalOcean Droplets](https://www.digitalocean.com/community/tutorials/how-to-use-ssh-keys-with-digitalocean-droplets).
-
-Once you are logged into DigitalOcean and have added your SSH key, click the 'Create Droplet' button on your Droplets page. For the Droplet, choose the following options:
-
-  - **Image**: Choose `Ubuntu 16.04.x x64`
-  - **Size**: 1 GB / 1 CPU (currently $10/month; you can choose a higher plan if needed)
-  - **Region**: Choose whatever region is geographically nearest to you and your site visitors
-  - **Settings**: (Nothing here affects how Drupal VM works, choose what you'd like)
-  - **Add SSH Keys**: Select the SSH key you added to your account earlier.
-  - **Hostname**: Choose a hostname for your site (e.g. `example.drupalvm.com`)
-
-Click 'Create Droplet', and wait a minute or so while the Droplet is booted. Once it's booted, make sure you can log into it from your local computer:
-
-    ssh root@[droplet-hostname-or-ip]
-
-(Make sure you replace `[droplet-hostname-or-ip]`) with the hostname or IP address of your Droplet!)
-
-If you get a warning like "the authenticity of the host can't be established", answer yes to the prompt and hit enter. You should now be logged into the Droplet. Log back out by typing `exit` at the prompt and hitting return.
-
-Your DigitalOcean Droplet is booted and ready to have Drupal VM installed on it.
-
-## Customize `config.yml` and `inventory` for production
-
-Copy `prod.config.yml` to `config.yml`, and by looking at `default.config.yml` add any other overrides you'd like. Whatever variables you have set in `config.yml` will override the defaults set by `default.config.yml`.
-
-The changes outlined in `prod.config.yml` disable development-environment tools (like Pimp My Log and Adminer) and add extra security hardening configuration (via the `extra_security_enabled` variable).
-
-The only other thing you need to do is copy the inventory file `example.inventory` to `inventory` (so it is located at `prod/inventory`). By default, it reads:
-
-    [drupalvm]
-    1.2.3.4 ansible_ssh_user=my_admin_username
-
-Change the host `1.2.3.4` to either the IP address or the hostname of your DigitalOcean Droplet. Remember that if you would like to use a hostname, you need to make sure the hostname actually resolves to your Droplet's IP address, either in your domain's public DNS configuration, or via your local hosts file.
-
-## Initialize the server with an administrative account
-
-> Note: This guide assumes you have Ansible [installed](http://docs.ansible.com/ansible/intro_installation.html) on your host machine.
-
-The first step in setting up Drupal VM on the cloud server is to initialize the server with an administrative account (which is separate from the `root` user account for better security).
-
-Inside the `examples/prod/bootstrap` folder, copy the `example.vars.yml` file to `vars.yml` and update the variables in that file for your own administrative account (make sure especially to update the `admin_password` value!).
-
-Then, run the following command within Drupal VM's root directory (the folder containing the `Vagrantfile`):
-
-    ansible-playbook -i examples/prod/inventory examples/prod/bootstrap/init.yml -e "ansible_ssh_user=root"
-
-Once the initialization is complete, you can test your new admin login with `ssh my_admin_username@droplet-hostname-or-ip`. You should be logged in via your existing SSH key. Log back out with `exit`.
-
-## Provision Drupal VM on the Droplet
-
-Run the following command within Drupal VM's root directory (the folder containing the `Vagrantfile`):
-
-    ansible-playbook -i examples/prod/inventory provisioning/playbook.yml --sudo --ask-sudo-pass
-
-Ansible will prompt you for your admin account's `sudo` password (the same as the password you encrypted and saved as `admin_password`). Enter it and press return.
-
-After a few minutes, your Drupal-VM-in-the-cloud Droplet should be fully configured to match your local development environment! You can visit your Droplet and access the fresh Drupal site just like you would locally (e.g. `http://example.drupalvm.com/`).
-
-## Known issues
-
-  - You may need to manually create the `drupal_core_path` directory on the server at this time; it's not always created automatically due to permissions errors.
-  - The `files` folder that is generated during the initial Drupal installation is set to be owned by the admin account; to make it work (and to allow Drupal to generate stylesheets and files correctly), you have to manually log into the server and run the following two commands after provisioning is complete:
-
-      ```
-      $ sudo chown -R www-data /var/www/drupalvm/drupal/sites/default/files
-      $ sudo chmod -R 0700 /var/www/drupalvm/drupal/sites/default/files
-      ```
-
-  - You can't synchronize folders between your host machine and DigitalOcean (at least not in any sane way); so you'll need to either have Drupal VM install a site from a given Drush make file or composer.json, or deploy your site yourself.
-  - The way you build a production Drupal VM instance (vs. a local instance) is a little bit of a kludge. Follow https://github.com/geerlingguy/drupal-vm/issues/455 to track progress on a more streamlined process.
-  - Drupal VM doesn't include any kind of backup system. You should use one if you have any kind of important data on your server!
-
-## Go Further
-
-You can use Ubuntu 12.04, Ubuntu 14.04, Ubuntu 16.04, CentOS 6 or CentOS 7 when you build the DigitalOcean Droplet. Just like with Drupal VM running locally, you can customize almost every aspect of the server!
-
-You may want to customize your configuration even further, to make sure Drupal VM is tuned for your specific Drupal site's needs, or you may want to change things and make the server configuration more flexible, etc. For all that, the book [Ansible for DevOps](http://ansiblefordevops.com/) will give you a great introduction to using Ansible to make Drupal VM and the included Ansible configuration do exactly what you need!
+See [Deploying Drupal VM to a production environment](http://docs.drupalvm.com/en/latest/other/production/#example-drupal-vm-on-digitalocean) for a guide on how you can build a Drupal environment with Drupal VM on a cloud provider such as DigitalOcean.

From bdc85ca10cd936b1fc3b4320564231f5b3d5d97e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Mon, 19 Dec 2016 14:35:07 -0500
Subject: [PATCH 0534/1273] Fix prod/bootstrap/init not taking into account
 admin_copy_ssh_pubkey

---
 examples/prod/bootstrap/init.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/examples/prod/bootstrap/init.yml b/examples/prod/bootstrap/init.yml
index 5bdfc3bdf..793664000 100644
--- a/examples/prod/bootstrap/init.yml
+++ b/examples/prod/bootstrap/init.yml
@@ -19,8 +19,9 @@
     - name: Add local SSH public key to admin account authorized_keys.
       authorized_key:
         user: "{{ admin_user }}"
-        key: "{{ lookup('file', '{{ admin_pubkey }}') }}"
+        key: "{{ lookup('file', admin_pubkey) }}"
         manage_dir: yes
+      when: admin_copy_ssh_pubkey
 
     - name: Disable requiretty.
       lineinfile:

From fe6914d6ebb6334e96fd2d95dd7e98e436ff45f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Mon, 19 Dec 2016 14:53:36 -0500
Subject: [PATCH 0535/1273] Fix hostsupdater trying to add wildcard aliases

---
 Vagrantfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Vagrantfile b/Vagrantfile
index 88ca1580f..7c96cbf74 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -92,6 +92,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     end
   end
   aliases = aliases.uniq - [config.vm.hostname, vconfig['vagrant_ip']]
+  # Remove wildcard subdomains.
+  aliases.delete_if { |vhost| vhost.include?('*') }
 
   if Vagrant.has_plugin?('vagrant-hostsupdater')
     config.hostsupdater.aliases = aliases

From 2772fad1e850fbf527fa38b15fa1190c67af67bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Mon, 19 Dec 2016 17:08:31 -0500
Subject: [PATCH 0536/1273] Fix bug where dashboard assumes optional vhost
 docroot is defined

---
 provisioning/templates/dashboard.html.j2 | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/provisioning/templates/dashboard.html.j2 b/provisioning/templates/dashboard.html.j2
index 8e097ee87..7630b6114 100644
--- a/provisioning/templates/dashboard.html.j2
+++ b/provisioning/templates/dashboard.html.j2
@@ -102,13 +102,17 @@
         <tbody>
           {% if drupalvm_webserver == 'apache' -%}
             {%- for host in apache_vhosts -%}
-              {{ printSite(host.servername, host.documentroot) }}
+              {%- if host.documentroot is defined -%}
+                {{ printSite(host.servername, host.documentroot) }}
+              {%- endif -%}
             {%- endfor -%}
           {%- elif drupalvm_webserver == 'nginx' -%}
             {%- for host in nginx_hosts -%}
-              {%- for hostname in host.server_name.split() -%}
-                {{ printSite(hostname, host.root) }}
-              {%- endfor -%}
+              {%- if host.root is defined -%}
+                {%- for hostname in host.server_name.split() -%}
+                  {{ printSite(hostname, host.root) }}
+                {%- endfor -%}
+              {%- endif -%}
             {%- endfor -%}
           {%- endif %}
           <tr><td colspan=3><small>*Note: If Ansible isn't installed on your host, Drush aliases are only created inside the VM.</small></td></tr>

From ee4210e2def31a60d84d9ded5c617c077a23f941 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Tue, 20 Dec 2016 08:38:46 -0500
Subject: [PATCH 0537/1273] Allow post-provision tasks to use the item variable

---
 provisioning/playbook.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index d4b6452c8..3df294735 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -39,7 +39,9 @@
       with_items: "{{ pre_provision_scripts|default([]) }}"
 
     - name: Run configured pre-provision ansible task files.
-      include: "{{ item }}"
+      include: "{{ outer_item }}"
+      loop_control:
+        loop_var: outer_item
       with_fileglob:
         - "{{ pre_provision_tasks_dir|default(omit) }}"
 
@@ -156,6 +158,8 @@
       with_items: "{{ post_provision_scripts|default([]) }}"
 
     - name: Run configured post-provision ansible task files.
-      include: "{{ item }}"
+      include: "{{ outer_item }}"
+      loop_control:
+        loop_var: outer_item
       with_fileglob:
         - "{{ post_provision_tasks_dir|default(omit) }}"

From 744f09c61a8921231d7e54d60137e21922b2a996 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Tue, 20 Dec 2016 14:13:49 -0500
Subject: [PATCH 0538/1273] Docs: add a note on how to pass the config_dir
 variable when provisiong a production environment

---
 docs/other/production.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/other/production.md b/docs/other/production.md
index 08fa5024a..c1c7dec75 100644
--- a/docs/other/production.md
+++ b/docs/other/production.md
@@ -112,6 +112,10 @@ Run the following command within Drupal VM's root directory (the folder containi
 
     ansible-playbook -i examples/prod/inventory provisioning/playbook.yml --sudo --ask-sudo-pass
 
+_Note: If you have installed [Drupal VM as a Composer dependency](drupalvm-composer-dependency.md) you also need to specify the path of the config directory where you have your `config.yml` located._
+
+    ansible-playbook -i examples/prod/inventory provisioning/playbook.yml -e "config_dir=$(pwd)/config" --sudo --ask-sudo-pass
+
 Ansible will prompt you for your admin account's `sudo` password (the same as the password you encrypted and saved as `admin_password`). Enter it and press return.
 
 After a few minutes, your Drupal-VM-in-the-cloud Droplet should be fully configured to match your local development environment! You can visit your Droplet and access the fresh Drupal site just like you would locally (e.g. `http://example.drupalvm.com/`).

From e751d94c977566ef3a94b1da34b6982be24aa8f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Tue, 20 Dec 2016 14:16:17 -0500
Subject: [PATCH 0539/1273] Actually use vendor as the path example [ci skip]

---
 docs/other/production.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/other/production.md b/docs/other/production.md
index c1c7dec75..94aee40d6 100644
--- a/docs/other/production.md
+++ b/docs/other/production.md
@@ -114,7 +114,7 @@ Run the following command within Drupal VM's root directory (the folder containi
 
 _Note: If you have installed [Drupal VM as a Composer dependency](drupalvm-composer-dependency.md) you also need to specify the path of the config directory where you have your `config.yml` located._
 
-    ansible-playbook -i examples/prod/inventory provisioning/playbook.yml -e "config_dir=$(pwd)/config" --sudo --ask-sudo-pass
+    ansible-playbook -i config/prod/inventory vendor/geerlingguy/drupal-vm/provisioning/playbook.yml -e "config_dir=$(pwd)/config" --sudo --ask-sudo-pass
 
 Ansible will prompt you for your admin account's `sudo` password (the same as the password you encrypted and saved as `admin_password`). Enter it and press return.
 

From 35e9ebc01b4f1e86a805c249db9e7aa9cc596549 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 21 Dec 2016 12:38:52 -0500
Subject: [PATCH 0540/1273] Issue #1067: Configure hostname for environments
 other than VMs

---
 .travis.yml                        |  3 ---
 provisioning/playbook.yml          |  2 ++
 provisioning/tasks/hostname.yml    | 26 ++++++++++++++++++++++++++
 provisioning/tasks/init-debian.yml |  5 +++++
 4 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 provisioning/tasks/hostname.yml

diff --git a/.travis.yml b/.travis.yml
index faf1ebe7e..a0d07f183 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,9 +62,6 @@ script:
   - 'docker run --detach --volume="${PWD}":${DRUPALVM_DIR}/:rw ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${tmpfile}"'
   - 'container_id=$(cat ${tmpfile})'
 
-  # Set hostname.
-  - 'docker exec ${container_id} hostname ${HOSTNAME}'
-
   # Setup directories.
   - 'docker exec ${container_id} mkdir -p ${DRUPALVM_DIR}/drupal'
 
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 3df294735..767d205d0 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -27,6 +27,8 @@
         - "{{ config_dir }}/local.config.yml"
         - "{{ config_dir }}/{{ lookup('env', 'DRUPALVM_ENV')|default(drupalvm_env, true)|default(ansible_env.DRUPALVM_ENV)|default(omit) }}.config.yml"
 
+    - include: tasks/hostname.yml
+
     - include: tasks/init-debian.yml
       when: ansible_os_family == 'Debian'
       static: no
diff --git a/provisioning/tasks/hostname.yml b/provisioning/tasks/hostname.yml
new file mode 100644
index 000000000..f35f46cbd
--- /dev/null
+++ b/provisioning/tasks/hostname.yml
@@ -0,0 +1,26 @@
+- name: Define fully qualified domain name.
+  set_fact:
+    hostname_fqdn: "{{ vagrant_hostname }}"
+  when: hostname_fqdn is undefined
+
+- name: Define short hostname.
+  set_fact:
+    hostname_short: "{{ hostname_fqdn|regex_replace('^([^.]+).*$', '\\1') }}"
+  when: hostname_short is undefined
+
+- name: Add hostname to /etc/hosts.
+  lineinfile:
+    dest: /etc/hosts
+    regexp: '.*\t{{ hostname_short }}$'
+    line: "127.0.0.1\t{{ hostname_fqdn }}\t{{ hostname_short }}"
+    state: present
+
+- name: Configure hostname.
+  copy:
+    content: "{{ (ansible_os_family == 'Debian') | ternary(hostname_short, hostname_fqdn) }}\n"
+    dest: /etc/hostname
+  register: set_hostname
+
+- name: Set the hostname for current session.
+  shell: hostname --file /etc/hostname
+  when: set_hostname.changed
diff --git a/provisioning/tasks/init-debian.yml b/provisioning/tasks/init-debian.yml
index f5f312a44..3ff271128 100644
--- a/provisioning/tasks/init-debian.yml
+++ b/provisioning/tasks/init-debian.yml
@@ -12,6 +12,11 @@
     - sudo
     - unzip
 
+- name: Configure /etc/mailname.
+  copy:
+    content: "{{ hostname_fqdn }}\n"
+    dest: /etc/mailname
+
 - name: Disable the ufw firewall (since we use a simple iptables firewall).
   service: name=ufw state=stopped
   when: ansible_distribution == "Ubuntu" and {{ drupalvm_disable_ufw_firewall | default(true) }}

From 18294dcbd7325a0829217bc18e940abe279cb359 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 21 Dec 2016 12:41:34 -0500
Subject: [PATCH 0541/1273] Specify vagrant_hostname in prod example so
 /etc/hostname and dashboards tools use the correct host

---
 examples/prod/prod.config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/examples/prod/prod.config.yml b/examples/prod/prod.config.yml
index 4f0fa06d1..02155b96a 100644
--- a/examples/prod/prod.config.yml
+++ b/examples/prod/prod.config.yml
@@ -1,6 +1,7 @@
 ---
 # Normally, this would be set to the hostname of your DigitalOcean Droplet.
 drupal_domain: "drupalvm.dev"
+vagrant_hostname: "{{ drupal_domain }}"
 
 # Add only the `apache_vhosts` or `nginx_hosts` you need. If installing a
 # single Drupal site, the variable should look like this (Apache):

From f5370bceb18315e60e29582f98b86ba93405de5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 21 Dec 2016 13:20:47 -0500
Subject: [PATCH 0542/1273] Fix /etc/hosts not writable within docker
 containers

---
 .travis.yml                     | 5 ++++-
 provisioning/tasks/hostname.yml | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a0d07f183..b1decb424 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,9 +57,12 @@ before_install:
   - 'gem install rubocop'
 
 script:
+  # Figure out hostname dependening on OS. Ubuntu uses shortened version while CentOS uses FQDN.
+  - 'docker_hostname=$([[ $distro == ubuntu* ]] && echo ${MACHINE_NAME} || echo ${HOSTNAME})'
+
   # Run container in detached state and store the id.
   - 'tmpfile=$(mktemp)'
-  - 'docker run --detach --volume="${PWD}":${DRUPALVM_DIR}/:rw ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${tmpfile}"'
+  - 'docker run --detach --hostname "${docker_hostname}" --add-host "${HOSTNAME}$(echo -e "\t")${MACHINE_NAME}":127.0.0.1 --volume="${PWD}":${DRUPALVM_DIR}/:rw ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${tmpfile}"'
   - 'container_id=$(cat ${tmpfile})'
 
   # Setup directories.
diff --git a/provisioning/tasks/hostname.yml b/provisioning/tasks/hostname.yml
index f35f46cbd..50cc4e79d 100644
--- a/provisioning/tasks/hostname.yml
+++ b/provisioning/tasks/hostname.yml
@@ -14,11 +14,13 @@
     regexp: '.*\t{{ hostname_short }}$'
     line: "127.0.0.1\t{{ hostname_fqdn }}\t{{ hostname_short }}"
     state: present
+    unsafe_writes: "{{ (ansible_virtualization_type == 'docker')|ternary('yes', 'no')|bool }}"
 
 - name: Configure hostname.
   copy:
     content: "{{ (ansible_os_family == 'Debian') | ternary(hostname_short, hostname_fqdn) }}\n"
     dest: /etc/hostname
+    unsafe_writes: "{{ (ansible_virtualization_type == 'docker')|ternary('yes', 'no')|bool }}"
   register: set_hostname
 
 - name: Set the hostname for current session.

From c21bb8a14e93833486499900f84c40bbf81a1e0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 21 Dec 2016 14:23:49 -0500
Subject: [PATCH 0543/1273] Dont override hostname as it should be managed by
 docker itself

---
 .travis.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b1decb424..3a11e1465 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,12 +57,9 @@ before_install:
   - 'gem install rubocop'
 
 script:
-  # Figure out hostname dependening on OS. Ubuntu uses shortened version while CentOS uses FQDN.
-  - 'docker_hostname=$([[ $distro == ubuntu* ]] && echo ${MACHINE_NAME} || echo ${HOSTNAME})'
-
   # Run container in detached state and store the id.
   - 'tmpfile=$(mktemp)'
-  - 'docker run --detach --hostname "${docker_hostname}" --add-host "${HOSTNAME}$(echo -e "\t")${MACHINE_NAME}":127.0.0.1 --volume="${PWD}":${DRUPALVM_DIR}/:rw ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${tmpfile}"'
+  - 'docker run --detach --add-host "${HOSTNAME}$(echo -e "\t")${MACHINE_NAME}":127.0.0.1 --volume="${PWD}":${DRUPALVM_DIR}/:rw ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${tmpfile}"'
   - 'container_id=$(cat ${tmpfile})'
 
   # Setup directories.

From 15366f11fe1f92b436dc63428b92ca8b49695bf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 21 Dec 2016 16:42:31 -0500
Subject: [PATCH 0544/1273] Issue #754: Add docs on using HTTPS with Nginx [ci
 skip]

---
 docs/extras/ssl.md | 46 ++++++++++++++++++++++++++++++++++++++++++----
 mkdocs.yml         |  2 +-
 2 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/docs/extras/ssl.md b/docs/extras/ssl.md
index 709cbae31..ae26b6f86 100644
--- a/docs/extras/ssl.md
+++ b/docs/extras/ssl.md
@@ -2,7 +2,13 @@ To enable SSL support for you virtual hosts you first need a certificate file. Y
 
     openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout example.key -out example.crt
 
-Place the files in your project directory and add the following to your `config.yml`.
+Place the files in your project directory and edit your `config.yml`.
+
+_If you're using an actual production certificate you should of course **NOT** track it in git but transfer it to the VM before running `vagrant provision`_
+
+### Apache
+
+Add the following to your `config.yml`:
 
 ```yaml
 apache_vhosts_ssl:
@@ -14,14 +20,32 @@ apache_vhosts_ssl:
           ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ drupal_core_path }}"
 ```
 
-_If you're using an actual production certificate you should of course **NOT** track it in git but transfer it to the VM before running `vagrant provision`_
-
 For a list of all configuration options see the [`geerlingguy.apache` Ansible role's README](https://github.com/geerlingguy/ansible-role-apache#readme).
 
-### Using Ubuntu's snakeoil certificate
+### Nginx
+
+Modify your nginx host configuration by adding the following `extra_parameters` to the first entry in `nginx_hosts`:
+
+```yaml
+- server_name: "{{ drupal_domain }} www.{{ drupal_domain }}"
+  root: "{{ drupal_core_path }}"
+  is_php: true
+  extra_parameters: |
+        listen 443 ssl;
+        ssl_certificate     /vagrant/example.crt;
+        ssl_certificate_key /vagrant/example.key;
+        ssl_protocols       TLSv1.1 TLSv1.2;
+        ssl_ciphers         HIGH:!aNULL:!MD5;
+```
+
+For a list of all configuration options see the [`geerlingguy.nginx` Ansible role's README](https://github.com/geerlingguy/ansible-role-nginx#readme).
+
+## Using Ubuntu's snakeoil certificate
 
 If you are using Ubuntu as your base OS and you want to get started quickly with a local development environment you can use the snakeoil certificate that is already generated.
 
+#### Apache
+
 ```yaml
 apache_vhosts_ssl:
   - servername: "{{ drupal_domain }}"
@@ -31,3 +55,17 @@ apache_vhosts_ssl:
     extra_parameters: |
           ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ drupal_core_path }}"
 ```
+
+#### Nginx
+
+```yaml
+- server_name: "{{ drupal_domain }} www.{{ drupal_domain }}"
+  root: "{{ drupal_core_path }}"
+  is_php: true
+  extra_parameters: |
+        listen 443 ssl;
+        ssl_certificate     /etc/ssl/certs/ssl-cert-snakeoil.pem;
+        ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key;
+        ssl_protocols       TLSv1.1 TLSv1.2;
+        ssl_ciphers         HIGH:!aNULL:!MD5;
+```
diff --git a/mkdocs.yml b/mkdocs.yml
index 8437d69c2..7bc403bb7 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -28,7 +28,7 @@ pages:
     - 'Use MariaDB instead of MySQL': 'extras/mariadb.md'
     - 'Use PostgreSQL instead of MySQL': 'extras/postgresql.md'
     - 'Use Node.js and NPM': 'extras/nodejs.md'
-    - 'Use SSL vhosts with Apache': 'extras/ssl.md'
+    - 'Use SSL vhosts with Apache/Nginx': 'extras/ssl.md'
     - 'View Logs with Pimp my Log': 'extras/pimpmylog.md'
     - 'Profile Code - XHProf, Blackfire, Xdebug': 'extras/profile-code.md'
     - 'Debug Code with XDebug': 'extras/xdebug.md'

From 6e5fda6b97f46f316be2aa574c00b7c8110cd161 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 21 Dec 2016 16:43:11 -0500
Subject: [PATCH 0545/1273] Add a note on how to automatically add a ssl vhost
 for every apache_vhost [ci skip]

---
 docs/extras/ssl.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/docs/extras/ssl.md b/docs/extras/ssl.md
index ae26b6f86..52e2f0aa5 100644
--- a/docs/extras/ssl.md
+++ b/docs/extras/ssl.md
@@ -69,3 +69,16 @@ apache_vhosts_ssl:
         ssl_protocols       TLSv1.1 TLSv1.2;
         ssl_ciphers         HIGH:!aNULL:!MD5;
 ```
+
+## Tips & Tricks
+
+To automatically add a SSL virtual host for every Apache host defined in `apache_vhosts` you can add the following to your `config.yml`:
+
+```yaml
+apache_vhost_ssl_parameters:
+  certificate_file: "/etc/ssl/certs/ssl-cert-snakeoil.pem"
+  certificate_key_file: "/etc/ssl/private/ssl-cert-snakeoil.key"
+
+# Generate a SSL virtual host for every regular vhost.
+apache_vhosts_ssl: "{% set vhosts = [] %}{% for vhost in apache_vhosts %}{% if vhosts.append(vhost|combine(apache_vhost_ssl_parameters)) %}{% endif %}{% endfor %}{{ vhosts }}"
+```

From 242fa9f3c8a95b0fd29089ad71190bcbb52340fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Tue, 20 Dec 2016 08:29:09 -0500
Subject: [PATCH 0546/1273] Allow user defined post-provision-tasks to use tags
 while drupal vm does not

---
 provisioning/playbook.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 3df294735..38daf432b 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -20,12 +20,14 @@
       set_fact:
         config_dir: "{{ playbook_dir }}/.."
       when: config_dir is not defined
+      tags: ['always']
 
     - include_vars: "{{ item }}"
       with_fileglob:
         - "{{ config_dir }}/config.yml"
         - "{{ config_dir }}/local.config.yml"
         - "{{ config_dir }}/{{ lookup('env', 'DRUPALVM_ENV')|default(drupalvm_env, true)|default(ansible_env.DRUPALVM_ENV)|default(omit) }}.config.yml"
+      tags: ['always']
 
     - include: tasks/init-debian.yml
       when: ansible_os_family == 'Debian'

From f41724e927f58cc49bcd9b77349851c8b698c680 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 22 Dec 2016 12:28:07 -0500
Subject: [PATCH 0547/1273] Issue #1068: Add php-yaml as a default php package

---
 provisioning/vars/Debian.yml |  1 +
 provisioning/vars/RedHat.yml | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/provisioning/vars/Debian.yml b/provisioning/vars/Debian.yml
index c9db91e02..22383cfcd 100644
--- a/provisioning/vars/Debian.yml
+++ b/provisioning/vars/Debian.yml
@@ -32,3 +32,4 @@ php_packages:
   - "php{{ php_version }}-opcache"
   - "php{{ php_version }}-sqlite3"
   - "php{{ php_version }}-xml"
+  - "php{{ php_version }}-yaml"
diff --git a/provisioning/vars/RedHat.yml b/provisioning/vars/RedHat.yml
index ed97d539c..ab3c1a715 100644
--- a/provisioning/vars/RedHat.yml
+++ b/provisioning/vars/RedHat.yml
@@ -1 +1,19 @@
 ---
+# Defaults set by `ansible-role-php` with the addition of `php-pecl-yaml`.
+php_packages:
+  - php
+  - php-cli
+  - php-common
+  - php-devel
+  - php-fpm
+  - php-gd
+  - php-imap
+  - php-ldap
+  - php-mbstring
+  - php-opcache
+  - php-pdo
+  - php-pear
+  - php-pecl-apcu
+  - php-xml
+  - php-xmlrpc
+  - php-pecl-yaml

From 350851b573f16910b509b49d8a0ffd95dbea703f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 22 Dec 2016 18:38:50 -0500
Subject: [PATCH 0548/1273] Move ansible version requirements to Vagrantfile
 for better UX

---
 Vagrantfile               | 28 ++++++++++++++++++++--------
 provisioning/playbook.yml |  6 ------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 7c96cbf74..cc5630eb7 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -26,6 +26,10 @@ def which(cmd)
   nil
 end
 
+def get_ansible_version(exe)
+  /^[^\s]+ (.+)$/.match(`#{exe} --version`) { |match| return match[1] }
+end
+
 def walk(obj, &fn)
   if obj.is_a?(Array)
     obj.map { |value| walk(value, &fn) }
@@ -56,6 +60,10 @@ end
 
 Vagrant.require_version ">= #{vconfig['drupalvm_vagrant_version_min']}"
 
+ansible_bin = which('ansible-playbook')
+ansible_version = Gem::Version.new(get_ansible_version(ansible_bin)) if ansible_bin
+ansible_version_min = Gem::Version.new(vconfig['drupalvm_ansible_version_min'])
+
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # Networking configuration.
   config.vm.hostname = vconfig['vagrant_hostname']
@@ -124,14 +132,18 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.synced_folder host_project_dir, '/vagrant', type: vconfig.include?('vagrant_synced_folder_default_type') ? vconfig['vagrant_synced_folder_default_type'] : 'nfs'
 
   # Provisioning. Use ansible if it's installed, ansible_local if not or if forced.
-  if which('ansible-playbook') && !vconfig['force_ansible_local']
-    config.vm.provision 'ansible' do |ansible|
-      ansible.playbook = "#{host_drupalvm_dir}/provisioning/playbook.yml"
-      ansible.extra_vars = {
-        config_dir: host_config_dir,
-        drupalvm_env: drupalvm_env
-      }
-      ansible.raw_arguments = ENV['DRUPALVM_ANSIBLE_ARGS']
+  if ansible_bin && !vconfig['force_ansible_local']
+    if ansible_version >= ansible_version_min
+      config.vm.provision 'ansible' do |ansible|
+        ansible.playbook = "#{host_drupalvm_dir}/provisioning/playbook.yml"
+        ansible.extra_vars = {
+          config_dir: host_config_dir,
+          drupalvm_env: drupalvm_env
+        }
+        ansible.raw_arguments = ENV['DRUPALVM_ANSIBLE_ARGS']
+      end
+    else
+      raise "You must update Ansible to at least #{ansible_version_min} to use this version of Drupal VM."
     end
   else
     config.vm.provision 'ansible_local' do |ansible|
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 38daf432b..e0e99948c 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -7,12 +7,6 @@
     - ../default.config.yml
 
   pre_tasks:
-    - name: Verify Ansible meets Drupal VM's version requirements.
-      assert:
-        that: "ansible_version.full | version_compare(drupalvm_ansible_version_min, '>=')"
-        msg: >
-          "You must update Ansible to at least {{ drupalvm_ansible_version_min }} to use this version of Drupal VM."
-
     - name: Include OS-specific variables.
       include_vars: "{{ ansible_os_family }}.yml"
 

From 1c8b798ffb2bddaf9fc4437588fe53bb6ceb5b23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 22 Dec 2016 18:56:47 -0500
Subject: [PATCH 0549/1273] Fix rubocop warning

---
 Vagrantfile | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index cc5630eb7..95babcf45 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -133,18 +133,17 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   # Provisioning. Use ansible if it's installed, ansible_local if not or if forced.
   if ansible_bin && !vconfig['force_ansible_local']
-    if ansible_version >= ansible_version_min
-      config.vm.provision 'ansible' do |ansible|
-        ansible.playbook = "#{host_drupalvm_dir}/provisioning/playbook.yml"
-        ansible.extra_vars = {
-          config_dir: host_config_dir,
-          drupalvm_env: drupalvm_env
-        }
-        ansible.raw_arguments = ENV['DRUPALVM_ANSIBLE_ARGS']
-      end
-    else
+    if ansible_version < ansible_version_min
       raise "You must update Ansible to at least #{ansible_version_min} to use this version of Drupal VM."
     end
+    config.vm.provision 'ansible' do |ansible|
+      ansible.playbook = "#{host_drupalvm_dir}/provisioning/playbook.yml"
+      ansible.extra_vars = {
+        config_dir: host_config_dir,
+        drupalvm_env: drupalvm_env
+      }
+      ansible.raw_arguments = ENV['DRUPALVM_ANSIBLE_ARGS']
+    end
   else
     config.vm.provision 'ansible_local' do |ansible|
       ansible.playbook = "#{guest_drupalvm_dir}/provisioning/playbook.yml"

From 9ec2237a00d8392942551d5ecbadadd016b11e3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 22 Dec 2016 19:44:06 -0500
Subject: [PATCH 0550/1273] Issue #1076: Fix PHP modules not re-compiling on
 PHP version changes

---
 default.config.yml        | 1 +
 provisioning/playbook.yml | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/default.config.yml b/default.config.yml
index ba9bcb8bd..1550f9a28 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -314,6 +314,7 @@ solr_xmx: "128M"
 selenium_version: 2.53.0
 
 # Other configuration.
+workspace: "/root/php{{ php_version }}"
 dashboard_install_dir: /var/www/dashboard
 known_hosts_path: ~/.ssh/known_hosts
 #ssh_home: "{{ drupal_core_path }}"
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 38daf432b..a44d126e9 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -36,6 +36,13 @@
       when: ansible_os_family == 'RedHat'
       static: no
 
+    - name: Ensure workspace directory exists.
+      file:
+        path: "{{ workspace }}"
+        state: directory
+        mode: 0775
+      when: workspace is defined
+
     - name: Run configured pre-provision shell scripts.
       script: "{{ item }}"
       with_items: "{{ pre_provision_scripts|default([]) }}"

From 96a02824547242d22ea9c009fe0496a5e326dc49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Fri, 23 Dec 2016 23:46:15 -0500
Subject: [PATCH 0551/1273] Revert "Issue #1076: Fix PHP modules not
 re-compiling on PHP version changes"

This reverts commit 9ec2237a00d8392942551d5ecbadadd016b11e3f.
---
 default.config.yml        | 1 -
 provisioning/playbook.yml | 7 -------
 2 files changed, 8 deletions(-)

diff --git a/default.config.yml b/default.config.yml
index 1550f9a28..ba9bcb8bd 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -314,7 +314,6 @@ solr_xmx: "128M"
 selenium_version: 2.53.0
 
 # Other configuration.
-workspace: "/root/php{{ php_version }}"
 dashboard_install_dir: /var/www/dashboard
 known_hosts_path: ~/.ssh/known_hosts
 #ssh_home: "{{ drupal_core_path }}"
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index a44d126e9..38daf432b 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -36,13 +36,6 @@
       when: ansible_os_family == 'RedHat'
       static: no
 
-    - name: Ensure workspace directory exists.
-      file:
-        path: "{{ workspace }}"
-        state: directory
-        mode: 0775
-      when: workspace is defined
-
     - name: Run configured pre-provision shell scripts.
       script: "{{ item }}"
       with_items: "{{ pre_provision_scripts|default([]) }}"

From 2594f29480830cf4f89126c51dee16a24066aa62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Fri, 23 Dec 2016 23:50:29 -0500
Subject: [PATCH 0552/1273] Issue #1076: Fix PHP extensions not moved into
 place on PHP version changes

---
 provisioning/playbook.yml | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 38daf432b..4eea2f412 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -58,6 +58,12 @@
         xhprof_download_folder_name: xhprof-master
       when: php_version == '5.5' or php_version == '5.6'
 
+    - name: Ensure PHP version -specific workspace directory exists.
+      file:
+        path: "/root/php{{ php_version }}"
+        state: directory
+        mode: 0775
+
   roles:
     # Essential roles.
     - { role: geerlingguy.repo-remi, when: ansible_os_family == 'RedHat' }
@@ -80,9 +86,15 @@
     - { role: geerlingguy.drush, when: '"drush" in installed_extras' }
     - { role: geerlingguy.memcached, when: '"memcached" in installed_extras' }
     - { role: geerlingguy.php-memcached, when: '"memcached" in installed_extras' }
-    - { role: geerlingguy.php-xdebug, when: '"xdebug" in installed_extras' }
-    - { role: geerlingguy.php-xhprof, when: '"xhprof" in installed_extras' }
-    - { role: thom8.php-upload-progress, when: '"upload-progress" in installed_extras' }
+    - role: geerlingguy.php-xdebug
+      workspace: "/root/php{{ php_version }}"
+      when: '"xdebug" in installed_extras'
+    - role: geerlingguy.php-xhprof
+      workspace: "/root/php{{ php_version }}"
+      when: '"xhprof" in installed_extras'
+    - role: thom8.php-upload-progress
+      workspace: "/root/php{{ php_version }}"
+      when: '"upload-progress" in installed_extras'
     - { role: geerlingguy.blackfire, when: '"blackfire" in installed_extras' }
     - { role: geerlingguy.adminer, when: '"adminer" in installed_extras' }
     - { role: geerlingguy.pimpmylog, when: '"pimpmylog" in installed_extras' }

From ce20abbd49bbf76cc30fd3645aae98085b81d6c4 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 28 Dec 2016 11:02:15 -0600
Subject: [PATCH 0553/1273] Fixes #1076: Update PHP XDebug role to latest
 version.

---
 provisioning/requirements.yml                             | 2 +-
 provisioning/roles/geerlingguy.php-xdebug/tasks/main.yml  | 8 ++++----
 .../roles/geerlingguy.php-xdebug/templates/xdebug.ini.j2  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index c787d970c..663ae8e83 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -52,7 +52,7 @@
 - src: geerlingguy.php-redis
   version: 3.1.0
 - src: geerlingguy.php-xdebug
-  version: 2.2.2
+  version: 2.3.0
 - src: geerlingguy.php-xhprof
   version: 2.2.0
 - src: geerlingguy.pimpmylog
diff --git a/provisioning/roles/geerlingguy.php-xdebug/tasks/main.yml b/provisioning/roles/geerlingguy.php-xdebug/tasks/main.yml
index 421d263a1..4d493c09b 100644
--- a/provisioning/roles/geerlingguy.php-xdebug/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php-xdebug/tasks/main.yml
@@ -28,6 +28,7 @@
   unarchive:
     src: "https://xdebug.org/files/xdebug-{{ php_xdebug_version }}.tgz"
     dest: "{{ workspace }}"
+    creates: "{{ workspace }}/xdebug-{{ php_xdebug_version }}"
     copy: no
 
 - name: Build Xdebug.
@@ -39,7 +40,6 @@
     - phpize
     - ./configure
     - make
-  notify: restart webserver
 
 - name: Ensure Xdebug module path exists.
   file:
@@ -50,9 +50,9 @@
     mode: 0755
 
 - name: Move Xdebug module into place.
-  shell: >
-    cp {{ workspace }}/xdebug-{{ php_xdebug_version }}/modules/xdebug.so {{ php_xdebug_module_path }}/xdebug.so
-    creates={{ php_xdebug_module_path }}/xdebug.so
+  copy:
+    src: "{{ workspace }}/xdebug-{{ php_xdebug_version }}/modules/xdebug.so"
+    dest: "{{ php_xdebug_module_path }}/xdebug-{{ php_xdebug_version }}.so"
   notify: restart webserver
 
 - include: configure.yml
diff --git a/provisioning/roles/geerlingguy.php-xdebug/templates/xdebug.ini.j2 b/provisioning/roles/geerlingguy.php-xdebug/templates/xdebug.ini.j2
index e787262f2..2de4d442a 100644
--- a/provisioning/roles/geerlingguy.php-xdebug/templates/xdebug.ini.j2
+++ b/provisioning/roles/geerlingguy.php-xdebug/templates/xdebug.ini.j2
@@ -1,5 +1,5 @@
 [XDebug]
-zend_extension="{{ php_xdebug_module_path }}/xdebug.so"
+zend_extension="{{ php_xdebug_module_path }}/xdebug-{{ php_xdebug_version }}.so"
 
 xdebug.coverage_enable={{ php_xdebug_coverage_enable }}
 xdebug.default_enable={{ php_xdebug_default_enable }}

From b1a035edac37d29c6802fd29dcca8fac8681c749 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 28 Dec 2016 21:59:14 -0500
Subject: [PATCH 0554/1273] Issue #1047: Add docs on Drupal Console remote
 command execution [ci skip]

---
 docs/extras/drupal-console.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/docs/extras/drupal-console.md b/docs/extras/drupal-console.md
index 253470830..82c24452f 100644
--- a/docs/extras/drupal-console.md
+++ b/docs/extras/drupal-console.md
@@ -18,3 +18,21 @@ vagrant@drupalvm:/var/www/drupalvm/drupal/web$ drupal cache:rebuild all
 
  The command was executed successfully!
 ```
+
+## Remote command execution
+
+To run commands on your host computer but execute them on the VM, add a new sites file `~/.console/sites/drupalvm.yml` on your host computer:
+
+```yaml
+dev:
+  root: /var/www/drupalvm/drupal
+  host: 192.168.88.88
+  user: vagrant
+  password: vagrant
+```
+
+Execute from host machine using the `--target` option.
+
+    drupal --target=drupalvm.dev site:status
+
+For more details, see [Drupal Console's documentation](https://hechoendrupal.gitbooks.io/drupal-console/content/en/using/how-to-use-drupal-console-in-a-remote-installation.html)

From a9e328d2487381db998ae646afb4345755e5cefb Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 28 Dec 2016 22:54:33 -0600
Subject: [PATCH 0555/1273] Fix PHP XDebug install by updating to latest role
 version.

---
 provisioning/requirements.yml                            | 2 +-
 provisioning/roles/geerlingguy.php-xdebug/tasks/main.yml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 663ae8e83..6805b9deb 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -52,7 +52,7 @@
 - src: geerlingguy.php-redis
   version: 3.1.0
 - src: geerlingguy.php-xdebug
-  version: 2.3.0
+  version: 2.3.1
 - src: geerlingguy.php-xhprof
   version: 2.2.0
 - src: geerlingguy.pimpmylog
diff --git a/provisioning/roles/geerlingguy.php-xdebug/tasks/main.yml b/provisioning/roles/geerlingguy.php-xdebug/tasks/main.yml
index 4d493c09b..ae83c8eaf 100644
--- a/provisioning/roles/geerlingguy.php-xdebug/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php-xdebug/tasks/main.yml
@@ -53,6 +53,7 @@
   copy:
     src: "{{ workspace }}/xdebug-{{ php_xdebug_version }}/modules/xdebug.so"
     dest: "{{ php_xdebug_module_path }}/xdebug-{{ php_xdebug_version }}.so"
+    remote_src: True
   notify: restart webserver
 
 - include: configure.yml

From efd6360aea44f9279b9151263e185c0138c48840 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 28 Dec 2016 23:57:35 -0500
Subject: [PATCH 0556/1273] Issue #617: Use SetHandler and PHP-FPM unix sockets
 fixing mod_rewrite and DirectoryIndex issues

---
 default.config.yml                         | 23 +++++++++++++++-------
 provisioning/templates/nginx-vhost.conf.j2 |  2 +-
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/default.config.yml b/default.config.yml
index ba9bcb8bd..0b6342f68 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -106,29 +106,38 @@ apache_vhosts:
     serveralias: "www.{{ drupal_domain }}"
     documentroot: "{{ drupal_core_path }}"
     extra_parameters: |
-          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ drupal_core_path }}"
+          <FilesMatch \.php$>
+            SetHandler "proxy:unix:{{ php_fpm_listen }}|fcgi://{{ drupal_domain }}/"
+          </FilesMatch>
 
   - servername: "adminer.{{ vagrant_hostname }}"
     documentroot: "{{ adminer_install_dir }}"
     extra_parameters: |
-          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ adminer_install_dir }}"
+          <FilesMatch \.php$>
+            SetHandler "proxy:unix:{{ php_fpm_listen }}|fcgi://adminer.{{ vagrant_hostname }}/"
+          </FilesMatch>
 
   - servername: "xhprof.{{ vagrant_hostname }}"
     documentroot: "{{ php_xhprof_html_dir }}"
     extra_parameters: |
-          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ php_xhprof_html_dir }}"
+          <FilesMatch \.php$>
+            SetHandler "proxy:unix:{{ php_fpm_listen }}|fcgi://xhprof.{{ vagrant_hostname }}/"
+          </FilesMatch>
 
   - servername: "pimpmylog.{{ vagrant_hostname }}"
     documentroot: "{{ pimpmylog_install_dir }}"
     extra_parameters: |
-          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ pimpmylog_install_dir }}"
+          <FilesMatch \.php$>
+            SetHandler "proxy:unix:{{ php_fpm_listen }}|fcgi://pimpmylog.{{ vagrant_hostname }}/"
+          </FilesMatch>
 
   - servername: "{{ vagrant_ip }}"
     serveralias: "dashboard.{{ vagrant_hostname }}"
     documentroot: "{{ dashboard_install_dir }}"
     extra_parameters: |
-          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ dashboard_install_dir }}"
-          DirectoryIndex index.html
+          <FilesMatch \.php$>
+            SetHandler "proxy:unix:{{ php_fpm_listen }}|fcgi://dashboard.{{ vagrant_hostname }}/"
+          </FilesMatch>
 
 apache_remove_default_vhost: true
 apache_mods_enabled:
@@ -252,7 +261,7 @@ php_max_input_vars: "4000"
 # to instead use Apache + mod_php with an Ubuntu base box, make sure you add
 # libapache2-mod-php7.0 to `extra_packages` elsewhere in this config file.
 php_enable_php_fpm: true
-php_fpm_listen: "127.0.0.1:9000"
+php_fpm_listen: /var/run/php-fpm.sock
 
 composer_path: /usr/bin/composer
 composer_home_path: "/home/{{ drupalvm_user }}/.composer"
diff --git a/provisioning/templates/nginx-vhost.conf.j2 b/provisioning/templates/nginx-vhost.conf.j2
index ad7747f86..b9dfc6867 100644
--- a/provisioning/templates/nginx-vhost.conf.j2
+++ b/provisioning/templates/nginx-vhost.conf.j2
@@ -34,7 +34,7 @@ server {
         fastcgi_intercept_errors on;
         fastcgi_read_timeout {{ php_max_execution_time }};
         include fastcgi_params;
-        fastcgi_pass {{ php_fpm_listen }};
+        fastcgi_pass unix:{{ php_fpm_listen }};
     }
 
     location @rewrite {

From 17947feb9a7accbef5508490b25abbfcd8609405 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 29 Dec 2016 00:16:56 -0500
Subject: [PATCH 0557/1273] Use TCP sockets rather than Unix sockets

---
 default.config.yml                         | 12 ++++++------
 provisioning/templates/nginx-vhost.conf.j2 |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/default.config.yml b/default.config.yml
index 0b6342f68..9872a9dba 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -107,28 +107,28 @@ apache_vhosts:
     documentroot: "{{ drupal_core_path }}"
     extra_parameters: |
           <FilesMatch \.php$>
-            SetHandler "proxy:unix:{{ php_fpm_listen }}|fcgi://{{ drupal_domain }}/"
+            SetHandler "proxy:fcgi://{{ php_fpm_listen }}"
           </FilesMatch>
 
   - servername: "adminer.{{ vagrant_hostname }}"
     documentroot: "{{ adminer_install_dir }}"
     extra_parameters: |
           <FilesMatch \.php$>
-            SetHandler "proxy:unix:{{ php_fpm_listen }}|fcgi://adminer.{{ vagrant_hostname }}/"
+            SetHandler "proxy:fcgi://{{ php_fpm_listen }}"
           </FilesMatch>
 
   - servername: "xhprof.{{ vagrant_hostname }}"
     documentroot: "{{ php_xhprof_html_dir }}"
     extra_parameters: |
           <FilesMatch \.php$>
-            SetHandler "proxy:unix:{{ php_fpm_listen }}|fcgi://xhprof.{{ vagrant_hostname }}/"
+            SetHandler "proxy:fcgi://{{ php_fpm_listen }}"
           </FilesMatch>
 
   - servername: "pimpmylog.{{ vagrant_hostname }}"
     documentroot: "{{ pimpmylog_install_dir }}"
     extra_parameters: |
           <FilesMatch \.php$>
-            SetHandler "proxy:unix:{{ php_fpm_listen }}|fcgi://pimpmylog.{{ vagrant_hostname }}/"
+            SetHandler "proxy:fcgi://{{ php_fpm_listen }}"
           </FilesMatch>
 
   - servername: "{{ vagrant_ip }}"
@@ -136,7 +136,7 @@ apache_vhosts:
     documentroot: "{{ dashboard_install_dir }}"
     extra_parameters: |
           <FilesMatch \.php$>
-            SetHandler "proxy:unix:{{ php_fpm_listen }}|fcgi://dashboard.{{ vagrant_hostname }}/"
+            SetHandler "proxy:fcgi://{{ php_fpm_listen }}"
           </FilesMatch>
 
 apache_remove_default_vhost: true
@@ -261,7 +261,7 @@ php_max_input_vars: "4000"
 # to instead use Apache + mod_php with an Ubuntu base box, make sure you add
 # libapache2-mod-php7.0 to `extra_packages` elsewhere in this config file.
 php_enable_php_fpm: true
-php_fpm_listen: /var/run/php-fpm.sock
+php_fpm_listen: "127.0.0.1:9000"
 
 composer_path: /usr/bin/composer
 composer_home_path: "/home/{{ drupalvm_user }}/.composer"
diff --git a/provisioning/templates/nginx-vhost.conf.j2 b/provisioning/templates/nginx-vhost.conf.j2
index b9dfc6867..ad7747f86 100644
--- a/provisioning/templates/nginx-vhost.conf.j2
+++ b/provisioning/templates/nginx-vhost.conf.j2
@@ -34,7 +34,7 @@ server {
         fastcgi_intercept_errors on;
         fastcgi_read_timeout {{ php_max_execution_time }};
         include fastcgi_params;
-        fastcgi_pass unix:{{ php_fpm_listen }};
+        fastcgi_pass {{ php_fpm_listen }};
     }
 
     location @rewrite {

From d4284e9f43b78bc14423f6be2dfd980b5b646c9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 29 Dec 2016 00:27:05 -0500
Subject: [PATCH 0558/1273] Use a helper variable to configure vhosts with
 PHP-FPM

---
 default.config.yml | 32 ++++++++++++--------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/default.config.yml b/default.config.yml
index 9872a9dba..ef8b5da91 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -98,6 +98,13 @@ drupalvm_cron_jobs: []
 # this variable is 'true'.
 configure_drush_aliases: true
 
+# Helper variable to configure the PHP-FPM connection for each Apache
+# VirtualHost in the `apache_vhosts` list.
+apache_vhost_php_fpm_parameters: |
+    <FilesMatch \.php$>
+      SetHandler "proxy:fcgi://{{ php_fpm_listen }}"
+    </FilesMatch>
+
 # Apache VirtualHosts. Add one for each site you are running inside the VM. For
 # multisite deployments, you can point multiple servernames at one documentroot.
 # View the geerlingguy.apache Ansible Role README for more options.
@@ -105,39 +112,24 @@ apache_vhosts:
   - servername: "{{ drupal_domain }}"
     serveralias: "www.{{ drupal_domain }}"
     documentroot: "{{ drupal_core_path }}"
-    extra_parameters: |
-          <FilesMatch \.php$>
-            SetHandler "proxy:fcgi://{{ php_fpm_listen }}"
-          </FilesMatch>
+    extra_parameters: "{{ apache_vhost_php_fpm_parameters }}"
 
   - servername: "adminer.{{ vagrant_hostname }}"
     documentroot: "{{ adminer_install_dir }}"
-    extra_parameters: |
-          <FilesMatch \.php$>
-            SetHandler "proxy:fcgi://{{ php_fpm_listen }}"
-          </FilesMatch>
+    extra_parameters: "{{ apache_vhost_php_fpm_parameters }}"
 
   - servername: "xhprof.{{ vagrant_hostname }}"
     documentroot: "{{ php_xhprof_html_dir }}"
-    extra_parameters: |
-          <FilesMatch \.php$>
-            SetHandler "proxy:fcgi://{{ php_fpm_listen }}"
-          </FilesMatch>
+    extra_parameters: "{{ apache_vhost_php_fpm_parameters }}"
 
   - servername: "pimpmylog.{{ vagrant_hostname }}"
     documentroot: "{{ pimpmylog_install_dir }}"
-    extra_parameters: |
-          <FilesMatch \.php$>
-            SetHandler "proxy:fcgi://{{ php_fpm_listen }}"
-          </FilesMatch>
+    extra_parameters: "{{ apache_vhost_php_fpm_parameters }}"
 
   - servername: "{{ vagrant_ip }}"
     serveralias: "dashboard.{{ vagrant_hostname }}"
     documentroot: "{{ dashboard_install_dir }}"
-    extra_parameters: |
-          <FilesMatch \.php$>
-            SetHandler "proxy:fcgi://{{ php_fpm_listen }}"
-          </FilesMatch>
+    extra_parameters: "{{ apache_vhost_php_fpm_parameters }}"
 
 apache_remove_default_vhost: true
 apache_mods_enabled:

From 92b5bbec65b2370a27395d5a678d987b2079b2e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 29 Dec 2016 15:00:26 -0500
Subject: [PATCH 0559/1273] Fix Nginx not displaying index.html

---
 provisioning/templates/nginx-vhost.conf.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/templates/nginx-vhost.conf.j2 b/provisioning/templates/nginx-vhost.conf.j2
index ad7747f86..99c4d0f56 100644
--- a/provisioning/templates/nginx-vhost.conf.j2
+++ b/provisioning/templates/nginx-vhost.conf.j2
@@ -17,7 +17,7 @@ server {
 {% if item.is_php is defined and item.is_php %}
     location / {
         # Don't touch PHP for static content.
-        try_files $uri /index.php?$query_string;
+        try_files $uri $uri/ /index.php?$query_string;
     }
 
     # Don't allow direct access to PHP files in the vendor directory.

From 3843efa46852f863172b7f48f7ba99c93f9fc0c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 29 Dec 2016 15:00:47 -0500
Subject: [PATCH 0560/1273] Fix dashboard php_info not rendered

---
 default.config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/default.config.yml b/default.config.yml
index ef8b5da91..e1a890a69 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -161,6 +161,7 @@ nginx_hosts:
 
   - server_name: "{{ vagrant_ip }} dashboard.{{ vagrant_hostname }}"
     root: "{{ dashboard_install_dir }}"
+    is_php: true
 
 nginx_remove_default_vhost: true
 nginx_ppa_use: true

From 0247e2cefe88246e8314059fc48a84b57dd95d08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 29 Dec 2016 16:29:43 -0500
Subject: [PATCH 0561/1273] Add Nginx redirect for install.php/rebuild.php
 mimicing Drupal's .htaccess

---
 provisioning/templates/nginx-vhost.conf.j2 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/provisioning/templates/nginx-vhost.conf.j2 b/provisioning/templates/nginx-vhost.conf.j2
index 99c4d0f56..7469dc8eb 100644
--- a/provisioning/templates/nginx-vhost.conf.j2
+++ b/provisioning/templates/nginx-vhost.conf.j2
@@ -26,6 +26,11 @@ server {
         return 404;
     }
 
+    # Redirect common PHP files to their new locations.
+    location ~ ^((?!.*(?:core)).*)/(install.php|rebuild.php) {
+         return 301 $scheme://$host$1/core/$2$is_args$args;
+    }
+
     # Use fastcgi for all php files.
     location ~ \.php$|^/update.php {
         fastcgi_split_path_info ^(.+?\.php)(|/.*)$;

From aa149a1b051f31a2d7fb6be875a38c97633dd5e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 29 Dec 2016 17:32:20 -0500
Subject: [PATCH 0562/1273] Docs: Update examples to use SetHandler instead of
 ProxyPassMatch [ci skip]

---
 docs/deployment/local-codebase.md | 14 +-------------
 docs/deployment/multisite.md      | 10 ++++------
 docs/extras/ssl.md                |  6 ++----
 docs/other/base-os.md             |  2 +-
 docs/other/bigpipe.md             | 12 +++++++++---
 5 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/docs/deployment/local-codebase.md b/docs/deployment/local-codebase.md
index 63fac15a3..4f0e82f6f 100644
--- a/docs/deployment/local-codebase.md
+++ b/docs/deployment/local-codebase.md
@@ -47,19 +47,7 @@ If you prefer using your domain as the root of all extra packages installed, ie.
 
 ```
 vagrant_hostname: "my-drupal-site.com"
-
-apache_vhosts:
-  # Resolves to http://my-drupal-site.com/
-  - servername: "{{ drupal_domain }}"
-    documentroot: "{{ drupal_core_path }}"
-    extra_parameters: |
-          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ drupal_core_path }}"
-
-  # Resolves to http://adminer.my-drupal-site.com/
-  - servername: "adminer.{{ vagrant_hostname }}"
-    documentroot: "{{ adminer_install_dir }}"
-    extra_parameters: |
-          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ adminer_install_dir }}"
+drupal_domain: "{{ vagrant_hostname }}"
 ```
 
 ## Update MySQL info
diff --git a/docs/deployment/multisite.md b/docs/deployment/multisite.md
index 15b96f95f..bb1475792 100644
--- a/docs/deployment/multisite.md
+++ b/docs/deployment/multisite.md
@@ -8,19 +8,17 @@ drupal_core_path: "/var/www/my-drupal-site"
 apache_vhosts:
   # Drupal VM's default domain, evaluating to whatever `vagrant_hostname` is set to (drupalvm.dev by default).
   - servername: "{{ drupal_domain }}"
+    serveralias: "www.{{ drupal_domain }}"
     documentroot: "{{ drupal_core_path }}"
-    extra_parameters: |
-          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ drupal_core_path }}"
+    extra_parameters: "{{ apache_vhost_php_fpm_parameters }}"
 
   - servername: "local.second-drupal-site.com"
     documentroot: "{{ drupal_core_path }}"
-    extra_parameters: |
-          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ drupal_core_path }}"
+    extra_parameters: "{{ apache_vhost_php_fpm_parameters }}"
 
   - servername: "local.third-drupal-site.com"
     documentroot: "{{ drupal_core_path }}"
-    extra_parameters: |
-          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ drupal_core_path }}"
+    extra_parameters: "{{ apache_vhost_php_fpm_parameters }}"
 ```
 
 If you need additional databases and database users, add them to the list of `mysql_databases` and `mysql_users`:
diff --git a/docs/extras/ssl.md b/docs/extras/ssl.md
index 52e2f0aa5..8feb0039f 100644
--- a/docs/extras/ssl.md
+++ b/docs/extras/ssl.md
@@ -16,8 +16,7 @@ apache_vhosts_ssl:
     documentroot: "{{ drupal_core_path }}"
     certificate_file: "/vagrant/example.crt"
     certificate_key_file: "/vagrant/example.key"
-    extra_parameters: |
-          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ drupal_core_path }}"
+    extra_parameters: "{{ apache_vhost_php_fpm_parameters }}"
 ```
 
 For a list of all configuration options see the [`geerlingguy.apache` Ansible role's README](https://github.com/geerlingguy/ansible-role-apache#readme).
@@ -52,8 +51,7 @@ apache_vhosts_ssl:
     documentroot: "{{ drupal_core_path }}"
     certificate_file: "/etc/ssl/certs/ssl-cert-snakeoil.pem"
     certificate_key_file: "/etc/ssl/private/ssl-cert-snakeoil.key"
-    extra_parameters: |
-          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ drupal_core_path }}"
+    extra_parameters: "{{ apache_vhost_php_fpm_parameters }}"
 ```
 
 #### Nginx
diff --git a/docs/other/base-os.md b/docs/other/base-os.md
index 482a1795b..af8ff68bd 100644
--- a/docs/other/base-os.md
+++ b/docs/other/base-os.md
@@ -30,7 +30,7 @@ Everything should work out of the box with RHEL 7.
 
 ## RedHat Enterprise Linux / CentOS 6
 
-**Apache without FastCGI**: If you want to use Apache with CentOS 6 on Drupal VM, you will need to modify the syntax of your `apache_vhosts` and remove the `ProxyPassMatch` parameters from each one. Alternatively, you can use Nginx with the default configuration by setting `drupalvm_webserver: nginx` inside `config.yml`.
+**Apache without FastCGI**: If you want to use Apache with CentOS 6 on Drupal VM, you will need to modify the syntax of your `apache_vhosts` and remove the `extra_parameters: "{{ apache_vhost_php_fpm_parameters }}"` line from each one. Alternatively, you can use Nginx with the default configuration by setting `drupalvm_webserver: nginx` inside `config.yml`.
 
 **PHP OpCache**: PHP's OpCache (if you're using PHP > 5.5) requires the following setting to be configured in `config.yml` (see upstream bug: [CentOS (6) needs additional php-opcache package](https://github.com/geerlingguy/ansible-role-php/issues/39)):
 
diff --git a/docs/other/bigpipe.md b/docs/other/bigpipe.md
index 08af8704e..5ead7b530 100644
--- a/docs/other/bigpipe.md
+++ b/docs/other/bigpipe.md
@@ -23,15 +23,21 @@ Nginx is the recommended way to use BigPipe, for the following reasons:
 
 Apache has three primary means of interacting with PHP applications like Drupal: `mod_php`, `mod_fastcgi`, and `mod_proxy_fcgi`. Drupal VM uses `mod_proxy_fcgi`, which is the most widely used and supported method of using Apache with PHP-FPM for the best scalability and memory management with Apache + PHP.
 
-For all of these methods, you have to make sure `mod_deflate` gzip compression is disabled; you can do this by adding the following line immediately after the `ProxyPassMatch` line under a host in the `apache_vhosts` list inside `config.yml`:
+For all of these methods, you have to make sure `mod_deflate` gzip compression is disabled; you can do this by modifying the VirtualHost's `extra_parameters` parameter in the `apache_vhosts` list inside `config.yml`:
 
-    SetEnv no-gzip 1
+    apache_vhosts:
+      - servername: "{{ drupal_domain }}"
+        serveralias: "www.{{ drupal_domain }}"
+        documentroot: "{{ drupal_core_path }}"
+        extra_parameters: |
+            {{ apache_vhost_php_fpm_parameters }}
+            SetEnv no-gzip 1
 
 This will disable the `mod_deflate` module for any requests inside that directory.
 
 If you want to switch Apache to use `mod_php` instead of proxying requests through PHP-FPM, you can make the following changes in `config.yml`:
 
   1. Add `libapache2-mod-php7.0` to `extra_packages` in `config.yml`.
-  2. Delete the `extra_parameters` under any Drupal site in the list of `apache_vhosts` (so there is no `ProxyPassMatch` rule).
+  2. Delete the `extra_parameters` under any Drupal site in the list of `apache_vhosts` (so there is no `SetHandler` rule).
 
 You can also disable PHP-FPM and remove the two `proxy` entries from `apache_mods_enabled` if you don't want to use PHP-FPM with Apache at all, but that's optional; it won't break anything to run Apache with `mod_php` and `mod_proxy_fastcgi` at the same time.

From eaee8cbafe477140ef974d9b1ead7ddcbd7dba0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 29 Dec 2016 17:37:23 -0500
Subject: [PATCH 0563/1273] Followup #1090: Use SetHandler in prod config
 example [ci skip]

---
 examples/prod/prod.config.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/examples/prod/prod.config.yml b/examples/prod/prod.config.yml
index 02155b96a..2924eb92a 100644
--- a/examples/prod/prod.config.yml
+++ b/examples/prod/prod.config.yml
@@ -8,8 +8,7 @@ vagrant_hostname: "{{ drupal_domain }}"
 apache_vhosts:
   - servername: "{{ drupal_domain }}"
     documentroot: "{{ drupal_core_path }}"
-    extra_parameters: |
-          ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000{{ drupal_core_path }}"
+    extra_parameters: "{{ apache_vhost_php_fpm_parameters }}"
 
 # Since this will be a publicly-accessible instance of Drupal VM, make sure you
 # configure secure passwords, especially for Drupal and MySQL!

From aaabd2a651e28b6f16f2d1040b152e3898e78742 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 30 Dec 2016 09:28:24 -0600
Subject: [PATCH 0564/1273] Issue #1098: Update CHANGELOG for 4.1.0.

---
 CHANGELOG.md | 39 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c2af25bd..8c218ff15 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,38 @@
 # Drupal VM Changelog
 
+## 4.1.0 "Anthem" (2016-12-30)
+
+### Breaking Changes
+
+  * N/A
+
+### New/changed variables in default.config.yml
+
+  * There's a new `apache_vhost_php_fpm_parameters` variable that defines the PHP-FPM handler Apache uses per-virtualhost. The old `extra_parameters` pre-4.1.0 will continue to work, but the new `SetHandler` technique is better for most scenarios than using `ProxyPassMatch`.
+  * The Dashboard entry in `nginx_hosts` now has `is_php: true`.
+
+### Improvements
+
+  * #617: Switch to `SetHandler` instead of `ProxyPassMatch` (fixes #617, #876, #945, #1055).
+  * #1090: Update docs to reference `SetHandler`.
+  * #1047: Add docs on Drupal Console remote command execution.
+  * #1076: Update PHP XDebug role to latest version
+  * #1067: Configure hostname for environments other than VMs.
+  * #1068: Add php-yaml extension.
+  * #1078: Move Ansible version check to Vagrantfile for better UX.
+  * #1071: Improve docs for SSL under Apache and Nginx.
+  * #455: Move prod readme to docs instead of README file.
+
+### Bugfixes
+
+  * #1076: Fix PHP modules not re-compiling on PHP version changes.
+  * #1061: Allow user defined post-provision-tasks to use tags.
+  * #1060: Fix bug where dashboard assumes optional vhost docroot is defined.
+  * #1062: Allow post-provision tasks to use the item variable.
+  * #1059: Fix hostsupdater trying to add wildcard aliases.
+  * #1054: Update Solr role to prevent permissions error.
+
+
 ## 4.0.0 "We've Got Company" (2016-12-10)
 
 ### Breaking Changes
@@ -10,7 +43,11 @@
 
 ### New/changed variables in default.config.yml
 
-  * TODO
+  * `drush` is now a default item in `installed_extras`.
+  * `upload-progress` is now an optional item in `installed_extras`.
+  * `drush_version` now defaults to `8.x` (`master` was causing issues with Drupal < 8).
+  * `php_install_recommends` was removed from the default set of variables.
+  * `solr_version` was bumped to `5.5.3` (was `5.5.2`).
 
 ### Improvements
 

From 665a12f8077b06690ff5e68c7e21f8f1cdff05b1 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 30 Dec 2016 10:55:28 -0600
Subject: [PATCH 0565/1273] Update to latest version of PHP XHProf role.

---
 provisioning/requirements.yml                            | 2 +-
 provisioning/roles/geerlingguy.php-xhprof/tasks/main.yml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 6805b9deb..3bf69e182 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -54,7 +54,7 @@
 - src: geerlingguy.php-xdebug
   version: 2.3.1
 - src: geerlingguy.php-xhprof
-  version: 2.2.0
+  version: 2.2.1
 - src: geerlingguy.pimpmylog
   version: 1.0.2
 - src: geerlingguy.postfix
diff --git a/provisioning/roles/geerlingguy.php-xhprof/tasks/main.yml b/provisioning/roles/geerlingguy.php-xhprof/tasks/main.yml
index 1e5637ecb..3cad6d729 100644
--- a/provisioning/roles/geerlingguy.php-xhprof/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php-xhprof/tasks/main.yml
@@ -26,6 +26,7 @@
     src: "{{ xhprof_download_url }}"
     dest: "{{ workspace }}"
     copy: no
+    creates: "{{ workspace }}/{{ xhprof_download_folder_name }}"
 
 - name: Build XHProf.
   shell: >

From 26b9cd8e8e90a53667f7acf156a5850efaeb95b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Fri, 30 Dec 2016 15:43:05 -0500
Subject: [PATCH 0566/1273] Issue #1093: Install Apache 2.4.9+ on Ubuntu 14.04

---
 provisioning/tasks/init-debian.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/provisioning/tasks/init-debian.yml b/provisioning/tasks/init-debian.yml
index 3ff271128..43f02bb1b 100644
--- a/provisioning/tasks/init-debian.yml
+++ b/provisioning/tasks/init-debian.yml
@@ -21,9 +21,11 @@
   service: name=ufw state=stopped
   when: ansible_distribution == "Ubuntu" and {{ drupalvm_disable_ufw_firewall | default(true) }}
 
-- name: Add repository for Apache 2.4 on Ubuntu 12.
+- name: Add repository for Apache 2.4.9+ on Ubuntu 12 and 14.
   apt_repository: repo='ppa:ondrej/apache2'
-  when: ansible_distribution_release == "precise" and ansible_distribution == "Ubuntu"
+  when: >
+    (ansible_distribution_release == "precise" or ansible_distribution_release == "trusty") and
+    ansible_distribution == "Ubuntu"
 
 - name: Add repository for PHP 5.5, 5.6, 7.0 or 7.1.
   apt_repository: repo='ppa:ondrej/php'

From 68feefa163f2d25e9668af9ac33eab9b151ac8a6 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 30 Dec 2016 16:05:00 -0600
Subject: [PATCH 0567/1273] Update CHANGELOG for 4.1.1 release.

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c218ff15..4363918e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Drupal VM Changelog
 
+## 4.1.1 (2016-12-30)
+
+### Bugfixes
+
+  * #1093: Install correct version of Apache on Ubuntu 12.04 and 14.04 for `SetHandler`.
+
+
 ## 4.1.0 "Anthem" (2016-12-30)
 
 ### Breaking Changes

From 80f2677b66b754550723f502bf0d943542feefe5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Fri, 30 Dec 2016 17:04:05 -0500
Subject: [PATCH 0568/1273] Add a travis test for Ubuntu 14.04

---
 .travis.yml          |  9 +++++++--
 tests/initctl_faker  | 23 +++++++++++++++++++++++
 tests/test-setup.yml |  9 +++++++++
 3 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 tests/initctl_faker

diff --git a/.travis.yml b/.travis.yml
index 3a11e1465..8a2d4099e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,6 +19,11 @@ env:
       distro: ubuntu1604
       init: /sbin/init
       run_opts: "--privileged"
+    # Defaults - Ubuntu 14.04.
+    - type: defaults
+      distro: ubuntu1404
+      init: /sbin/init
+      run_opts: "--privileged"
     # PHP 5.6 - Ubuntu 16.04.
     - type: defaults
       distro: ubuntu1604
@@ -90,9 +95,9 @@ script:
   # Run the playbook with ansible-playbook.
   - >
     if [ ! -z "${config_dir}" ]; then
-      docker exec --tty ${container_id} env TERM=xterm DRUPALVM_ENV=${DRUPALVM_ENV} ansible-playbook ${DRUPALVM_DIR}/provisioning/playbook.yml --extra-vars="config_dir=${config_dir}";
+      docker exec ${container_id} env TERM=xterm DRUPALVM_ENV=${DRUPALVM_ENV} ansible-playbook ${DRUPALVM_DIR}/provisioning/playbook.yml --extra-vars="config_dir=${config_dir}";
     else
-      docker exec --tty ${container_id} env TERM=xterm DRUPALVM_ENV=${DRUPALVM_ENV} ansible-playbook ${DRUPALVM_DIR}/provisioning/playbook.yml;
+      docker exec ${container_id} env TERM=xterm DRUPALVM_ENV=${DRUPALVM_ENV} ansible-playbook ${DRUPALVM_DIR}/provisioning/playbook.yml;
     fi
 
   # Run integration tests.
diff --git a/tests/initctl_faker b/tests/initctl_faker
new file mode 100644
index 000000000..a2267f30d
--- /dev/null
+++ b/tests/initctl_faker
@@ -0,0 +1,23 @@
+#!/bin/sh
+ALIAS_CMD="$(echo ""$0"" | sed -e 's?/sbin/??')"
+
+case "$ALIAS_CMD" in
+    start|stop|restart|reload|status)
+        exec service $1 $ALIAS_CMD
+        ;;
+esac
+
+case "$1" in
+    list )
+        exec service --status-all
+        ;;
+    reload-configuration )
+        exec service $2 restart
+        ;;
+    start|stop|restart|reload|status)
+        exec service $2 $1
+        ;;
+    \?)
+        exit 0
+        ;;
+esac
diff --git a/tests/test-setup.yml b/tests/test-setup.yml
index 9ae3c099f..375c9cdd5 100644
--- a/tests/test-setup.yml
+++ b/tests/test-setup.yml
@@ -10,3 +10,12 @@
     - name: Install test dependencies (RedHat).
       package: name=logrotate state=present
       when: ansible_os_family == 'RedHat'
+
+    - name: Copy initctl_faker into place for Ubuntu 14.04.
+      copy:
+        src: initctl_faker
+        dest: /sbin/initctl
+        mode: 0755
+        force: yes
+      when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '14.04'
+      changed_when: false

From 36d5ffee677abcd4c8aeb618a452fa509bce04ff Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 31 Dec 2016 20:32:27 -0600
Subject: [PATCH 0569/1273] Update Firewall role to latest version.

---
 provisioning/requirements.yml                                   | 2 +-
 .../roles/geerlingguy.firewall/templates/firewall.bash.j2       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 3bf69e182..eb9025a06 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -24,7 +24,7 @@
 - src: geerlingguy.elasticsearch
   version: 2.1.1
 - src: geerlingguy.firewall
-  version: 2.0.0
+  version: 2.0.1
 - src: geerlingguy.git
   version: 1.2.1
 - src: geerlingguy.java
diff --git a/provisioning/roles/geerlingguy.firewall/templates/firewall.bash.j2 b/provisioning/roles/geerlingguy.firewall/templates/firewall.bash.j2
index df9021e9e..ab0f459d1 100755
--- a/provisioning/roles/geerlingguy.firewall/templates/firewall.bash.j2
+++ b/provisioning/roles/geerlingguy.firewall/templates/firewall.bash.j2
@@ -89,7 +89,7 @@ iptables -A INPUT -j DROP
 
 
 # Configure IPv6 if ip6tables is present.
-if [ -x $(which ip6tables) ]; then
+if [ -x "$(which ip6tables 2>/dev/null)" ]; then
 
   # Remove all rules and chains.
   ip6tables -F

From d6c62acd175888f87b595c2aea6aac5889b36a4a Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 3 Jan 2017 12:04:16 -0600
Subject: [PATCH 0570/1273] Fixes #1101: Update Selenium role to work on
 systemd systems.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/arknoll.selenium/.travis.yml        |  6 +++
 .../roles/arknoll.selenium/tasks/main.yml     | 43 ++++++++++++++++++-
 .../templates/selenium-unit.j2                | 11 +++++
 .../arknoll.selenium/tests/requirements.yml   |  2 +
 .../roles/arknoll.selenium/tests/test.yml     | 11 ++++-
 6 files changed, 72 insertions(+), 3 deletions(-)
 create mode 100644 provisioning/roles/arknoll.selenium/templates/selenium-unit.j2
 create mode 100644 provisioning/roles/arknoll.selenium/tests/requirements.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index eb9025a06..9cf08a844 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -1,6 +1,6 @@
 ---
 - src: arknoll.selenium
-  version: 2.0.0
+  version: 2.1.0
 - src: thom8.php-upload-progress
   version: 1.0.1
 - src: franklinkim.newrelic
diff --git a/provisioning/roles/arknoll.selenium/.travis.yml b/provisioning/roles/arknoll.selenium/.travis.yml
index cb75c496a..cc071973c 100644
--- a/provisioning/roles/arknoll.selenium/.travis.yml
+++ b/provisioning/roles/arknoll.selenium/.travis.yml
@@ -11,6 +11,9 @@ env:
   - distro: ubuntu1604
     init: /lib/systemd/systemd
     run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distro: debian8
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
   - distro: ubuntu1404
     init: /sbin/init
     run_opts: "--privileged"
@@ -27,6 +30,9 @@ script:
   # Run container in detached state.
   - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
 
+  # Install dependencies.
+  - 'sudo docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
+
   # Ansible syntax check.
   - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
 
diff --git a/provisioning/roles/arknoll.selenium/tasks/main.yml b/provisioning/roles/arknoll.selenium/tasks/main.yml
index 283332562..f9dc23e1e 100644
--- a/provisioning/roles/arknoll.selenium/tasks/main.yml
+++ b/provisioning/roles/arknoll.selenium/tasks/main.yml
@@ -23,9 +23,24 @@
   when: selenium_install_firefox
   tags: [configuration, selenium, selenium-firefox]
 
+- name: Add Chrome key (if configured, Debian)
+  apt_key:
+    url: "https://dl-ssl.google.com/linux/linux_signing_key.pub"
+    state: present
+  when: ansible_os_family == 'Debian' and selenium_install_chrome
+  tags: [configuration, selenium, selenium-chrome]
+
+- name: Add Chrome repo (if configured, Debian)
+  apt_repository:
+    repo: "deb http://dl.google.com/linux/chrome/deb/ stable main"
+    state: present
+    update_cache: yes
+  when: ansible_os_family == 'Debian' and selenium_install_chrome
+  tags: [configuration, selenium, selenium-chrome]
+
 - name: Install Chrome (if configured, Debian)
   apt:
-    deb: https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+    name: google-chrome-stable
     state: present
   when: ansible_os_family == 'Debian' and selenium_install_chrome
   tags: [configuration, selenium, selenium-chrome]
@@ -67,6 +82,32 @@
     mode: 0755
   tags: [configuration, selenium, selenium-install]
 
+- name: Install systemd unit file (for systemd systems)
+  template:
+    src: "selenium-unit.j2"
+    dest: /etc/systemd/system/selenium.service
+    owner: root
+    group: root
+    mode: 0755
+  when: >
+    (ansible_distribution == 'Ubuntu' and ansible_distribution_version.split(".")[0]|int >= 16) or
+    (ansible_distribution == 'Debian' and ansible_distribution_version.split(".")[0]|int >= 8) or
+    (ansible_distribution == 'CentOS' and ansible_distribution_version.split(".")[0]|int >= 7) or
+    (ansible_distribution == 'Fedora')
+  tags: [configuration, selenium, selenium-install]
+
+- name: Register systemd service status (for systemd systems)
+  shell: 'systemctl status selenium | grep "active (running)"'
+  when: >
+    (ansible_distribution == 'Ubuntu' and ansible_distribution_version.split(".")[0]|int >= 16) or
+    (ansible_distribution == 'Debian' and ansible_distribution_version.split(".")[0]|int >= 8) or
+    (ansible_distribution == 'CentOS' and ansible_distribution_version.split(".")[0]|int >= 7) or
+    (ansible_distribution == 'Fedora')
+  register: selenium_running
+  ignore_errors: yes
+  changed_when: false
+
 - name: Ensure selenium is running
   service: name=selenium state=started enabled=yes
   tags: [configuration, selenium, selenium-run]
+  when: selenium_running.failed is defined and selenium_running.failed == true
diff --git a/provisioning/roles/arknoll.selenium/templates/selenium-unit.j2 b/provisioning/roles/arknoll.selenium/templates/selenium-unit.j2
new file mode 100644
index 000000000..ff1053615
--- /dev/null
+++ b/provisioning/roles/arknoll.selenium/templates/selenium-unit.j2
@@ -0,0 +1,11 @@
+[Unit]
+Description=selenium test framework
+After=syslog.target network.target
+
+[Service]
+ExecStart=/usr/bin/xvfb-run /usr/bin/java -client -jar {{ selenium_install_dir }}/selenium/selenium-server-standalone-{{ selenium_version }}.jar
+Restart=on-failure
+RestartSec=20s
+
+[Install]
+WantedBy=multi-user.target
diff --git a/provisioning/roles/arknoll.selenium/tests/requirements.yml b/provisioning/roles/arknoll.selenium/tests/requirements.yml
new file mode 100644
index 000000000..8fbe7cb66
--- /dev/null
+++ b/provisioning/roles/arknoll.selenium/tests/requirements.yml
@@ -0,0 +1,2 @@
+---
+- src: geerlingguy.java
diff --git a/provisioning/roles/arknoll.selenium/tests/test.yml b/provisioning/roles/arknoll.selenium/tests/test.yml
index fa569fc01..4fb579e31 100644
--- a/provisioning/roles/arknoll.selenium/tests/test.yml
+++ b/provisioning/roles/arknoll.selenium/tests/test.yml
@@ -4,8 +4,17 @@
 
   pre_tasks:
     - name: Update apt cache.
-      apt: update_cache=yes
+      apt: update_cache=yes cache_valid_time=3600
       when: ansible_os_family == 'Debian'
 
+    - name: Don't install Chrome on old OSes.
+      set_fact:
+        selenium_install_firefox: yes
+        selenium_install_chrome: no
+      when: >
+        (ansible_distribution == 'Ubuntu' and ansible_distribution_version == '12.04')
+        or (ansible_os_family == 'RedHat' and ansible_distribution_version.split('.')[0] == '6')
+
   roles:
+    - geerlingguy.java
     - role_under_test

From 980769fb23575bbc86d9f19a14360a4aad03adb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 5 Jan 2017 17:21:09 -0500
Subject: [PATCH 0571/1273] Issue #1093: Update Apache role to allow upgrading
 apache packages on provision

---
 provisioning/requirements.yml                                 | 2 +-
 provisioning/roles/geerlingguy.apache/README.md               | 4 ++++
 provisioning/roles/geerlingguy.apache/defaults/main.yml       | 4 ++++
 provisioning/roles/geerlingguy.apache/tasks/setup-Debian.yml  | 2 +-
 provisioning/roles/geerlingguy.apache/tasks/setup-RedHat.yml  | 2 +-
 provisioning/roles/geerlingguy.apache/tasks/setup-Solaris.yml | 2 +-
 provisioning/roles/geerlingguy.apache/tasks/setup-Suse.yml    | 2 +-
 7 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 9cf08a844..39ebb21d8 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -8,7 +8,7 @@
 - src: geerlingguy.adminer
   version: 1.1.0
 - src: geerlingguy.apache
-  version: 2.0.0
+  version: 2.0.1
 - src: geerlingguy.apache-php-fpm
   version: 1.0.2
 - src: geerlingguy.blackfire
diff --git a/provisioning/roles/geerlingguy.apache/README.md b/provisioning/roles/geerlingguy.apache/README.md
index 35cbbf283..c9187ff76 100644
--- a/provisioning/roles/geerlingguy.apache/README.md
+++ b/provisioning/roles/geerlingguy.apache/README.md
@@ -99,6 +99,10 @@ The list of packages to be installed. This defaults to a set of platform-specifi
 
 Set initial Apache daemon state to be enforced when this role is run. This should generally remain `started`, but you can set it to `stopped` if you need to fix the Apache config during a playbook run or otherwise would not like Apache started at the time this role is run.
 
+    apache_packages_state: installed
+
+If you have enabled any additional repositories such as _ondrej/apache2_, [geerlingguy.repo-epel](https://github.com/geerlingguy/ansible-role-repo-epel), or [geerlingguy.repo-remi](https://github.com/geerlingguy/ansible-role-repo-remi), you may want an easy way to upgrade versions. You can set this to `latest` (combined with `apache_enablerepo` on RHEL) and can directly upgrade to a different Apache version from a different repo (instead of uninstalling and reinstalling Apache).
+
     apache_ignore_missing_ssl_certificate: true
 
 If you would like to only create SSL vhosts when the vhost certificate is present (e.g. when using Let’s Encrypt), set `apache_ignore_missing_ssl_certificate` to `false`. When doing this, you might need to run your playbook more than once so all the vhosts are configured (if another part of the playbook generates the SSL certificates).
diff --git a/provisioning/roles/geerlingguy.apache/defaults/main.yml b/provisioning/roles/geerlingguy.apache/defaults/main.yml
index 4ddfc3b95..12ee9379d 100644
--- a/provisioning/roles/geerlingguy.apache/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.apache/defaults/main.yml
@@ -52,3 +52,7 @@ apache_state: started
 # Set apache state when configuration changes are made. Recommended values:
 # `restarted` or `reloaded`
 apache_restart_state: restarted
+
+# Apache package state; use `installed` to make sure it's installed, or `latest` if
+# you want to upgrade or switch versions using a new repo.
+apache_packages_state: installed
diff --git a/provisioning/roles/geerlingguy.apache/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.apache/tasks/setup-Debian.yml
index 43b9a77d8..2918b92da 100644
--- a/provisioning/roles/geerlingguy.apache/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.apache/tasks/setup-Debian.yml
@@ -3,5 +3,5 @@
   apt: update_cache=yes cache_valid_time=3600
 
 - name: Ensure Apache is installed on Debian.
-  apt: "name={{ item }} state=installed"
+  apt: "name={{ item }} state={{ apache_packages_state }}"
   with_items: "{{ apache_packages }}"
diff --git a/provisioning/roles/geerlingguy.apache/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.apache/tasks/setup-RedHat.yml
index f4a838f20..6021b9f1b 100644
--- a/provisioning/roles/geerlingguy.apache/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.apache/tasks/setup-RedHat.yml
@@ -2,6 +2,6 @@
 - name: Ensure Apache is installed on RHEL.
   yum:
     name: "{{ item }}"
-    state: installed
+    state: "{{ apache_packages_state }}"
     enablerepo: "{{ apache_enablerepo }}"
   with_items: "{{ apache_packages }}"
diff --git a/provisioning/roles/geerlingguy.apache/tasks/setup-Solaris.yml b/provisioning/roles/geerlingguy.apache/tasks/setup-Solaris.yml
index 989e32e86..91b84ff4f 100644
--- a/provisioning/roles/geerlingguy.apache/tasks/setup-Solaris.yml
+++ b/provisioning/roles/geerlingguy.apache/tasks/setup-Solaris.yml
@@ -2,5 +2,5 @@
 - name: Ensure Apache is installed on Solaris.
   pkg5:
     name: "{{ item }}"
-    state: installed
+    state: "{{ apache_packages_state }}"
   with_items: "{{ apache_packages }}"
diff --git a/provisioning/roles/geerlingguy.apache/tasks/setup-Suse.yml b/provisioning/roles/geerlingguy.apache/tasks/setup-Suse.yml
index 80c65cafa..d77ebb1f9 100644
--- a/provisioning/roles/geerlingguy.apache/tasks/setup-Suse.yml
+++ b/provisioning/roles/geerlingguy.apache/tasks/setup-Suse.yml
@@ -2,5 +2,5 @@
 - name: Ensure Apache is installed on Suse.
   zypper:
     name: "{{ item }}"
-    state: installed
+    state: "{{ apache_packages_state }}"
   with_items: "{{ apache_packages }}"

From 5b6ff1c81e6f2ba37f46788f24320b0b72344fbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 5 Jan 2017 17:23:56 -0500
Subject: [PATCH 0572/1273] Fixes #1093: Upgrade Apache packages on provision,
 fixing SetHandler usage on previously built Ubuntu 14.04 boxes

---
 default.config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/default.config.yml b/default.config.yml
index e1a890a69..1125a333e 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -131,6 +131,7 @@ apache_vhosts:
     documentroot: "{{ dashboard_install_dir }}"
     extra_parameters: "{{ apache_vhost_php_fpm_parameters }}"
 
+apache_packages_state: latest
 apache_remove_default_vhost: true
 apache_mods_enabled:
   - expires.load

From bc59c072f1d3c9338b202c2f8b5b21cdf1a68c26 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 6 Jan 2017 11:39:57 -0600
Subject: [PATCH 0573/1273] Fixes #1107: Allow additions to PHP packages via
 php_packages_extra.

---
 provisioning/requirements.yml                     | 2 +-
 provisioning/roles/geerlingguy.php/README.md      | 4 ++++
 provisioning/roles/geerlingguy.php/tasks/main.yml | 5 +++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 39ebb21d8..b0e0c2f6e 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -40,7 +40,7 @@
 - src: geerlingguy.nodejs
   version: 3.3.0
 - src: geerlingguy.php
-  version: 3.4.2
+  version: 3.4.4
 - src: geerlingguy.php-memcached
   version: 2.0.0
 - src: geerlingguy.php-mysql
diff --git a/provisioning/roles/geerlingguy.php/README.md b/provisioning/roles/geerlingguy.php/README.md
index 857458898..5d2143cd2 100644
--- a/provisioning/roles/geerlingguy.php/README.md
+++ b/provisioning/roles/geerlingguy.php/README.md
@@ -18,6 +18,10 @@ A list of the PHP packages to install (OS-specific by default). You'll likely wa
 
 _Note: If you're using Debian/Ubuntu, you also need to install `libapache2-mod-fastcgi` (for cgi/PHP-FPM) or `libapache2-mod-php7.0` (or a similar package depending on PHP version) if you want to use `mod_php` with Apache._
 
+    php_packages_extra: []
+
+A list of extra PHP packages to install without overriding the default list.
+
     php_enable_webserver: true
 
 If your usage of PHP is tied to a web server (e.g. Apache or Nginx), leave this default value. If you are using PHP server-side or to run some small application, set this value to `false` so this role doesn't attempt to interact with a web server.
diff --git a/provisioning/roles/geerlingguy.php/tasks/main.yml b/provisioning/roles/geerlingguy.php/tasks/main.yml
index c6306ccad..5afcce871 100644
--- a/provisioning/roles/geerlingguy.php/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php/tasks/main.yml
@@ -8,6 +8,11 @@
     php_packages: "{{ __php_packages | list }}"
   when: php_packages is not defined
 
+- name: Define extra php_packages.
+  set_fact:
+    php_packages: "{{ php_packages | list + php_packages_extra | list }}"
+  when: php_packages_extra is defined
+
 - name: Define php_webserver_daemon.
   set_fact:
     php_webserver_daemon: "{{ __php_webserver_daemon }}"

From 1b00ca759f749d672f5e0a84f381d4436acf06a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 5 Jan 2017 21:30:27 -0500
Subject: [PATCH 0574/1273] Follow-up #1093: Disable apache package upgrades in
 prod example config

---
 examples/prod/prod.config.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/examples/prod/prod.config.yml b/examples/prod/prod.config.yml
index 2924eb92a..0c04dab39 100644
--- a/examples/prod/prod.config.yml
+++ b/examples/prod/prod.config.yml
@@ -25,6 +25,9 @@ installed_extras:
   # - solr
   - varnish
 
+# Disable Apache package upgrades.
+apache_packages_state: installed
+
 # Disable the dashboard page. Also remove any unneeded virtualhosts.
 dashboard_install_dir: ''
 

From ac1d318f94aad36788750d36a487077cce753b5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Mon, 9 Jan 2017 16:22:46 -0500
Subject: [PATCH 0575/1273] Fixes #1102: Update ruby role to add gem bin
 directory to $PATH

---
 provisioning/requirements.yml                 |   2 +-
 .../roles/geerlingguy.ruby/.travis.yml        | 104 +++++++++++-------
 provisioning/roles/geerlingguy.ruby/README.md |   2 +-
 .../roles/geerlingguy.ruby/files/rubygems.sh  |   3 +
 .../tasks/install-from-source.yml             |   4 +-
 .../roles/geerlingguy.ruby/tasks/main.yml     |   6 +
 .../roles/geerlingguy.ruby/tests/inventory    |   1 -
 .../tests/test-install-from-source.yml        |  11 --
 .../tests/test-install-package.yml            |   5 -
 .../geerlingguy.ruby/tests/test-source.yml    |  18 +++
 .../roles/geerlingguy.ruby/tests/test.yml     |  15 +++
 11 files changed, 114 insertions(+), 57 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.ruby/files/rubygems.sh
 delete mode 100644 provisioning/roles/geerlingguy.ruby/tests/inventory
 delete mode 100644 provisioning/roles/geerlingguy.ruby/tests/test-install-from-source.yml
 delete mode 100644 provisioning/roles/geerlingguy.ruby/tests/test-install-package.yml
 create mode 100644 provisioning/roles/geerlingguy.ruby/tests/test-source.yml
 create mode 100644 provisioning/roles/geerlingguy.ruby/tests/test.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index b0e0c2f6e..d5182390b 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -66,7 +66,7 @@
 - src: geerlingguy.repo-remi
   version: 1.2.0
 - src: geerlingguy.ruby
-  version: 2.4.0
+  version: 2.4.2
 - src: geerlingguy.security
   version: 1.4.0
 - src: geerlingguy.solr
diff --git a/provisioning/roles/geerlingguy.ruby/.travis.yml b/provisioning/roles/geerlingguy.ruby/.travis.yml
index d09b9b48e..c6bbd6902 100644
--- a/provisioning/roles/geerlingguy.ruby/.travis.yml
+++ b/provisioning/roles/geerlingguy.ruby/.travis.yml
@@ -1,61 +1,91 @@
 ---
-sudo: required
-language: python
-python: "2.7"
+services: docker
 
 env:
-  - SITE=test-install-from-source.yml
-    RUBY_VERSION=2.3.0
-    RUBY_PATH_PREFIX=/usr/local
-  - SITE=test-install-package.yml
-    RUBY_VERSION=1.8.7
-    RUBY_PATH_PREFIX=/usr
+  # Package install on all OSes.
+  - distro: centos7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    playbook: test.yml
+    ruby_version: 2.0.0
+    ruby_path_prefix: /usr
+  - distro: ubuntu1604
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    playbook: test.yml
+    ruby_version: 2.3.1
+    ruby_path_prefix: /usr
+  - distro: ubuntu1404
+    init: /sbin/init
+    run_opts: ""
+    playbook: test.yml
+    ruby_version: 1.9.3
+    ruby_path_prefix: /usr
+  - distro: debian8
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    playbook: test.yml
+    ruby_version: 2.1.5
+    ruby_path_prefix: /usr
+
+  # Source install on latest OSes.
+  - distro: centos7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    playbook: test-source.yml
+    ruby_version: 2.3.0
+    ruby_path_prefix: /usr/local
+  - distro: ubuntu1604
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    playbook: test-source.yml
+    ruby_version: 2.3.0
+    ruby_path_prefix: /usr/local
 
 before_install:
-  - sudo apt-get update -qq
+  # Pull container.
+  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
 
-install:
-  # Install Ansible.
-  - pip install ansible
+script:
+  - container_id=$(mktemp)
+  # Run container in detached state.
+  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
 
-  # Ensure ruby is not installed.
-  - yes | gem uninstall --all
-  - yes "yes" | rvm implode --force
-  - sudo apt-get purge -y ruby
-  - sudo rm -rf ~/.rvm
+  # Install dependencies.
+  - 'docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
 
-  # Add ansible.cfg to pick up roles path.
-  - "{ echo '[defaults]'; echo 'roles_path = ../'; } >> ansible.cfg"
+  # Ansible syntax check.
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} --syntax-check'
 
-script:
-  # Check the role/playbook's syntax.
-  - "ansible-playbook -i tests/inventory tests/$SITE --syntax-check"
+  # Test role.
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook}'
 
-  # Run the role/playbook with ansible-playbook.
-  - "ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo"
-
-  # Run the role/playbook again, checking to make sure it's idempotent.
+  # Test role idempotence.
+  - idempotence=$(mktemp)
+  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} | tee -a ${idempotence}
   - >
-    ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo
+    tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
     && (echo 'Idempotence test: pass' && exit 0)
     || (echo 'Idempotence test: fail' && exit 1)
 
   # Make sure ruby is installed and at the correct version.
-  - which ruby
-  - test -x $RUBY_PATH_PREFIX/bin/ruby
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm which ruby'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm test -x ${ruby_path_prefix}/bin/ruby'
 
-  - ruby --version
-  - $RUBY_PATH_PREFIX/bin/ruby --version | grep -qF "$RUBY_VERSION"
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ruby --version'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ${ruby_path_prefix}/bin/ruby --version | grep -qF ${ruby_version}'
 
   # Make sure bundler is installed.
-  - ls -lah /usr/local/bin
-  - which bundle
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ls -lah /usr/local/bin'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm which bundle'
+
+  # Make sure user installed gems are available.
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm bash --login -c "which sass"'
 
 after_failure:
-  # If we failed, it's likely due to Travis environment changes.
-  - which ruby
-  - ruby --version
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm which ruby'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ruby --version'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.ruby/README.md b/provisioning/roles/geerlingguy.ruby/README.md
index e6ab8d9fa..da0fad8a2 100644
--- a/provisioning/roles/geerlingguy.ruby/README.md
+++ b/provisioning/roles/geerlingguy.ruby/README.md
@@ -60,4 +60,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.ruby/files/rubygems.sh b/provisioning/roles/geerlingguy.ruby/files/rubygems.sh
new file mode 100644
index 000000000..dcac53f4a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.ruby/files/rubygems.sh
@@ -0,0 +1,3 @@
+if which ruby >/dev/null && which gem >/dev/null; then
+    PATH="$(ruby -rubygems -e 'puts Gem.user_dir')/bin:$PATH"
+fi
diff --git a/provisioning/roles/geerlingguy.ruby/tasks/install-from-source.yml b/provisioning/roles/geerlingguy.ruby/tasks/install-from-source.yml
index 2ae8ac796..e3f37f4d6 100644
--- a/provisioning/roles/geerlingguy.ruby/tasks/install-from-source.yml
+++ b/provisioning/roles/geerlingguy.ruby/tasks/install-from-source.yml
@@ -2,6 +2,7 @@
 - name: Install packages required to build ruby (RedHat).
   yum: "name={{ item }} state=present"
   with_items:
+    - '@development'
     - zlib-devel
     - openssl-static
   when: ansible_os_family == 'RedHat'
@@ -13,6 +14,7 @@
 - name: Install packages required to build ruby (Debian).
   apt: "name={{ item }} state=present"
   with_items:
+    - build-essential
     - zlib1g-dev
     - libssl-dev
     - libyaml-dev
@@ -43,7 +45,7 @@
   with_items:
     - ./configure --enable-shared
     - make
-    - sudo make install
+    - make install
 
 - name: Add ruby symlinks.
   file:
diff --git a/provisioning/roles/geerlingguy.ruby/tasks/main.yml b/provisioning/roles/geerlingguy.ruby/tasks/main.yml
index 6d959bbf5..ab7d3247e 100644
--- a/provisioning/roles/geerlingguy.ruby/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.ruby/tasks/main.yml
@@ -10,6 +10,12 @@
 - include: install-from-source.yml
   when: ruby_install_from_source == true
 
+- name: Add user installed RubyGems bin directory to global $PATH.
+  copy:
+    src: rubygems.sh
+    dest: /etc/profile.d/rubygems.sh
+    mode: 0644
+
 # Install Bundler and configured gems.
 - name: Install Bundler.
   gem: name=bundler state=present user_install=no
diff --git a/provisioning/roles/geerlingguy.ruby/tests/inventory b/provisioning/roles/geerlingguy.ruby/tests/inventory
deleted file mode 100644
index 2fbb50c4a..000000000
--- a/provisioning/roles/geerlingguy.ruby/tests/inventory
+++ /dev/null
@@ -1 +0,0 @@
-localhost
diff --git a/provisioning/roles/geerlingguy.ruby/tests/test-install-from-source.yml b/provisioning/roles/geerlingguy.ruby/tests/test-install-from-source.yml
deleted file mode 100644
index 8c0fe37f0..000000000
--- a/provisioning/roles/geerlingguy.ruby/tests/test-install-from-source.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-- hosts: localhost
-  remote_user: root
-
-  vars:
-    ruby_install_from_source: true
-    ruby_download_url: http://cache.ruby-lang.org/pub/ruby/2.3/ruby-2.3.0.tar.gz
-    ruby_version: 2.3.0
-
-  roles:
-    - ansible-role-ruby
diff --git a/provisioning/roles/geerlingguy.ruby/tests/test-install-package.yml b/provisioning/roles/geerlingguy.ruby/tests/test-install-package.yml
deleted file mode 100644
index 125a9cd68..000000000
--- a/provisioning/roles/geerlingguy.ruby/tests/test-install-package.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- hosts: localhost
-  remote_user: root
-  roles:
-    - ansible-role-ruby
diff --git a/provisioning/roles/geerlingguy.ruby/tests/test-source.yml b/provisioning/roles/geerlingguy.ruby/tests/test-source.yml
new file mode 100644
index 000000000..3c1e51bc0
--- /dev/null
+++ b/provisioning/roles/geerlingguy.ruby/tests/test-source.yml
@@ -0,0 +1,18 @@
+---
+- hosts: all
+
+  vars:
+    ruby_install_from_source: true
+    ruby_download_url: http://cache.ruby-lang.org/pub/ruby/2.3/ruby-2.3.0.tar.gz
+    ruby_version: 2.3.0
+    ruby_install_gems_user: root
+    ruby_install_gems:
+      - sass
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=yes cache_valid_time=600
+      when: ansible_os_family == 'Debian'
+
+  roles:
+    - role_under_test
diff --git a/provisioning/roles/geerlingguy.ruby/tests/test.yml b/provisioning/roles/geerlingguy.ruby/tests/test.yml
new file mode 100644
index 000000000..1e3fecd26
--- /dev/null
+++ b/provisioning/roles/geerlingguy.ruby/tests/test.yml
@@ -0,0 +1,15 @@
+---
+- hosts: all
+
+  vars:
+    ruby_install_gems_user: root
+    ruby_install_gems:
+      - sass
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=yes cache_valid_time=600
+      when: ansible_os_family == 'Debian'
+
+  roles:
+    - role_under_test

From ea5871df680ade53d291abcec1e07ac1d147058a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Mon, 9 Jan 2017 17:52:52 -0500
Subject: [PATCH 0576/1273] Update all roles to their latest versions

---
 provisioning/requirements.yml                 | 12 ++--
 .../roles/franklinkim.newrelic/CHANGELOG.md   | 46 ++++++++++++++
 .../roles/franklinkim.newrelic/README.md      | 11 ++--
 .../franklinkim.newrelic/defaults/main.yml    |  6 +-
 .../franklinkim.newrelic/meta/readme.yml      |  2 +-
 .../templates/etc/newrelic/nrsysmond.cfg.j2   | 20 +++++-
 .../roles/franklinkim.newrelic/tests/main.yml |  3 +-
 .../geerlingguy.elasticsearch/.travis.yml     | 40 ++++++------
 .../roles/geerlingguy.elasticsearch/README.md |  2 +-
 .../geerlingguy.elasticsearch/tasks/main.yml  |  3 +
 .../tests/Dockerfile.centos-6                 | 15 -----
 .../tests/Dockerfile.centos-7                 | 27 --------
 .../tests/Dockerfile.ubuntu-12.04             | 11 ----
 .../tests/Dockerfile.ubuntu-14.04             | 11 ----
 .../tests/requirements.yml                    |  2 +
 .../geerlingguy.elasticsearch/tests/test.yml  |  4 ++
 .../templates/java_home.sh.j2                 |  2 +-
 .../roles/geerlingguy.java/tests/test.yml     |  3 +-
 .../roles/geerlingguy.nodejs/.travis.yml      | 31 ++++-----
 .../geerlingguy.nodejs/tasks/setup-RedHat.yml |  2 +-
 .../roles/geerlingguy.nodejs/tests/test.yml   | 12 ----
 .../roles/geerlingguy.redis/.travis.yml       | 63 +++++++++++--------
 .../roles/geerlingguy.redis/README.md         | 14 ++++-
 .../roles/geerlingguy.redis/defaults/main.yml |  3 +
 .../roles/geerlingguy.redis/meta/main.yml     |  5 +-
 .../roles/geerlingguy.redis/tasks/main.yml    |  7 ++-
 .../geerlingguy.redis/tasks/setup-Debian.yml  |  6 +-
 .../geerlingguy.redis/tasks/setup-RedHat.yml  |  7 ++-
 .../roles/geerlingguy.redis/tests/inventory   |  1 -
 .../roles/geerlingguy.redis/tests/test.yml    | 15 ++++-
 .../roles/geerlingguy.redis/vars/Debian.yml   |  1 +
 .../roles/geerlingguy.redis/vars/RedHat.yml   |  1 +
 .../roles/geerlingguy.security/.travis.yml    | 45 ++++++-------
 .../roles/geerlingguy.security/README.md      |  6 +-
 .../geerlingguy.security/defaults/main.yml    |  1 +
 .../templates/50unattended-upgrades.j2        |  6 ++
 .../tests/Dockerfile.centos-6                 | 15 -----
 .../tests/Dockerfile.centos-7                 | 27 --------
 .../tests/Dockerfile.ubuntu-12.04             | 11 ----
 .../tests/Dockerfile.ubuntu-14.04             | 17 -----
 .../roles/geerlingguy.security/tests/test.yml | 15 ++++-
 .../tests/Dockerfile.centos-7                 |  2 +-
 .../thom8.php-upload-progress/vars/Debian.yml |  2 +-
 43 files changed, 260 insertions(+), 275 deletions(-)
 delete mode 100644 provisioning/roles/geerlingguy.elasticsearch/tests/Dockerfile.centos-6
 delete mode 100644 provisioning/roles/geerlingguy.elasticsearch/tests/Dockerfile.centos-7
 delete mode 100644 provisioning/roles/geerlingguy.elasticsearch/tests/Dockerfile.ubuntu-12.04
 delete mode 100644 provisioning/roles/geerlingguy.elasticsearch/tests/Dockerfile.ubuntu-14.04
 create mode 100644 provisioning/roles/geerlingguy.elasticsearch/tests/requirements.yml
 delete mode 100644 provisioning/roles/geerlingguy.redis/tests/inventory
 delete mode 100644 provisioning/roles/geerlingguy.security/tests/Dockerfile.centos-6
 delete mode 100644 provisioning/roles/geerlingguy.security/tests/Dockerfile.centos-7
 delete mode 100644 provisioning/roles/geerlingguy.security/tests/Dockerfile.ubuntu-12.04
 delete mode 100644 provisioning/roles/geerlingguy.security/tests/Dockerfile.ubuntu-14.04

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index d5182390b..14067a63c 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -4,7 +4,7 @@
 - src: thom8.php-upload-progress
   version: 1.0.1
 - src: franklinkim.newrelic
-  version: 1.4.0
+  version: 1.6.0
 - src: geerlingguy.adminer
   version: 1.1.0
 - src: geerlingguy.apache
@@ -22,13 +22,13 @@
 - src: geerlingguy.drush
   version: 1.2.0
 - src: geerlingguy.elasticsearch
-  version: 2.1.1
+  version: 2.1.2
 - src: geerlingguy.firewall
   version: 2.0.1
 - src: geerlingguy.git
   version: 1.2.1
 - src: geerlingguy.java
-  version: 1.7.1
+  version: 1.7.2
 - src: geerlingguy.mailhog
   version: 2.1.1
 - src: geerlingguy.memcached
@@ -38,7 +38,7 @@
 - src: geerlingguy.nginx
   version: 1.9.6
 - src: geerlingguy.nodejs
-  version: 3.3.0
+  version: 3.3.1
 - src: geerlingguy.php
   version: 3.4.4
 - src: geerlingguy.php-memcached
@@ -62,13 +62,13 @@
 - src: geerlingguy.postgresql
   version: 1.0.2
 - src: geerlingguy.redis
-  version: 1.2.0
+  version: 1.4.1
 - src: geerlingguy.repo-remi
   version: 1.2.0
 - src: geerlingguy.ruby
   version: 2.4.2
 - src: geerlingguy.security
-  version: 1.4.0
+  version: 1.5.0
 - src: geerlingguy.solr
   version: 3.4.1
 - src: geerlingguy.varnish
diff --git a/provisioning/roles/franklinkim.newrelic/CHANGELOG.md b/provisioning/roles/franklinkim.newrelic/CHANGELOG.md
index eded3d13a..6831e5541 100644
--- a/provisioning/roles/franklinkim.newrelic/CHANGELOG.md
+++ b/provisioning/roles/franklinkim.newrelic/CHANGELOG.md
@@ -1,3 +1,49 @@
+<a name="1.6.0"></a>
+## 1.6.0 (2016-11-11)
+
+
+#### Features
+
+*   add `cgroup_style` option to config ([fd806272](https://github.com/weareinteractive/ansible-newrelic/commit/fd80627235dca4c6dad2b4edaa13e3d5ab64174d))
+
+
+
+<a name="1.5.0"></a>
+## 1.5.0 (2016-11-10)
+
+
+#### Features
+
+*   add proxy options ([d8c80eaa](https://github.com/weareinteractive/ansible-newrelic/commit/d8c80eaac222078c918be6ff80ce94f4d444510b))
+
+
+
+<a name="1.4.3"></a>
+### 1.4.3 (2016-11-03)
+
+
+#### Bug Fixes
+
+*   fix readme badge url ([a143bf3e](https://github.com/weareinteractive/ansible-newrelic/commit/a143bf3ee48ee07fa3657186763d857d00083b56))
+
+
+
+<a name="1.4.2"></a>
+### 1.4.2 (2016-09-30)
+
+
+
+
+<a name="1.4.1"></a>
+### 1.4.1 (2016-09-20)
+
+
+#### Bug Fixes
+
+*   remove duplicate newrelic_license_key ([036d2777](https://github.com/weareinteractive/ansible-newrelic/commit/036d27779b7db47b9fb06b9a983d759d2ad196bf))
+
+
+
 <a name="1.4.0"></a>
 ## 1.4.0 (2016-08-05)
 
diff --git a/provisioning/roles/franklinkim.newrelic/README.md b/provisioning/roles/franklinkim.newrelic/README.md
index 5b4902f72..80fdc1388 100644
--- a/provisioning/roles/franklinkim.newrelic/README.md
+++ b/provisioning/roles/franklinkim.newrelic/README.md
@@ -1,7 +1,7 @@
 # Ansible franklinkim.newrelic role
 
 [![Build Status](https://img.shields.io/travis/weareinteractive/ansible-newrelic.svg)](https://travis-ci.org/weareinteractive/ansible-newrelic)
-[![Galaxy](http://img.shields.io/badge/galaxy-franklinkim.apt-blue.svg)](https://galaxy.ansible.com/list#/roles/3917)
+[![Galaxy](http://img.shields.io/badge/galaxy-franklinkim.newrelic-blue.svg)](https://galaxy.ansible.com/franklinkim/newrelic/)
 [![GitHub Tags](https://img.shields.io/github/tag/weareinteractive/ansible-newrelic.svg)](https://github.com/weareinteractive/ansible-newrelic)
 [![GitHub Stars](https://img.shields.io/github/stars/weareinteractive/ansible-newrelic.svg)](https://github.com/weareinteractive/ansible-newrelic)
 
@@ -65,7 +65,11 @@ newrelic_service_state: started
 # use default hostname, set a value to override the default hostname
 newrelic_override_hostname: ~
 # A series of label_type/label_value pairings: label_type:label_value
-newrelic_labels: ~
+newrelic_labels:
+# proxy server to use (i.e. proxy-host:8080)
+newrelic_proxy:
+# Option to fix Docker memory (see: https://discuss.newrelic.com/t/wrong-path-to-cpu-and-memoy-data/36177)
+newrelic_cgroup_style:
 
 ```
 
@@ -93,11 +97,10 @@ This is an example playbook:
 ---
 
 - hosts: all
-  sudo: yes
+  become: yes
   roles:
     - franklinkim.newrelic
   vars:
-    newrelic_license_key: yes
     newrelic_service_state: started
     newrelic_license_key: ab2fa361cd4d0d373833cad619d7bcc424d27c16
 
diff --git a/provisioning/roles/franklinkim.newrelic/defaults/main.yml b/provisioning/roles/franklinkim.newrelic/defaults/main.yml
index 6ce045658..722d2e729 100644
--- a/provisioning/roles/franklinkim.newrelic/defaults/main.yml
+++ b/provisioning/roles/franklinkim.newrelic/defaults/main.yml
@@ -23,4 +23,8 @@ newrelic_service_state: started
 # use default hostname, set a value to override the default hostname
 newrelic_override_hostname: ~
 # A series of label_type/label_value pairings: label_type:label_value
-newrelic_labels: ~
+newrelic_labels:
+# proxy server to use (i.e. proxy-host:8080)
+newrelic_proxy:
+# Option to fix Docker memory (see: https://discuss.newrelic.com/t/wrong-path-to-cpu-and-memoy-data/36177)
+newrelic_cgroup_style:
diff --git a/provisioning/roles/franklinkim.newrelic/meta/readme.yml b/provisioning/roles/franklinkim.newrelic/meta/readme.yml
index db694e9c7..56aa1551c 100644
--- a/provisioning/roles/franklinkim.newrelic/meta/readme.yml
+++ b/provisioning/roles/franklinkim.newrelic/meta/readme.yml
@@ -5,7 +5,7 @@ github_user: weareinteractive
 github_name: ansible-newrelic
 badges: |
   [![Build Status](https://img.shields.io/travis/weareinteractive/ansible-newrelic.svg)](https://travis-ci.org/weareinteractive/ansible-newrelic)
-  [![Galaxy](http://img.shields.io/badge/galaxy-franklinkim.apt-blue.svg)](https://galaxy.ansible.com/list#/roles/3917)
+  [![Galaxy](http://img.shields.io/badge/galaxy-franklinkim.newrelic-blue.svg)](https://galaxy.ansible.com/franklinkim/newrelic/)
   [![GitHub Tags](https://img.shields.io/github/tag/weareinteractive/ansible-newrelic.svg)](https://github.com/weareinteractive/ansible-newrelic)
   [![GitHub Stars](https://img.shields.io/github/stars/weareinteractive/ansible-newrelic.svg)](https://github.com/weareinteractive/ansible-newrelic)
 description: |
diff --git a/provisioning/roles/franklinkim.newrelic/templates/etc/newrelic/nrsysmond.cfg.j2 b/provisioning/roles/franklinkim.newrelic/templates/etc/newrelic/nrsysmond.cfg.j2
index 37a8eac3a..a7c188522 100644
--- a/provisioning/roles/franklinkim.newrelic/templates/etc/newrelic/nrsysmond.cfg.j2
+++ b/provisioning/roles/franklinkim.newrelic/templates/etc/newrelic/nrsysmond.cfg.j2
@@ -8,6 +8,19 @@
 # in this file.
 #
 
+#
+# Option : cgroup_style
+# Value  : 0
+# Note   : Setting `cgroup_style=0` fixes issue with docker memory reporting
+#          Workaround for an issue where new relic cannot get container memory stats.
+#          http://stackoverflow.com/questions/36788770/newrelic-does-not-display-cpu-memory-usage-for-dockers-container
+# Default: none
+#
+#cgroup_style=
+{% if newrelic_cgroup_style|default(None) != None %}
+cgroup_style={{ newrelic_cgroup_style }}
+{% endif %}
+
 #
 # Option : license_key
 # Value  : 40-character hexadecimal string provided by New Relic. This is
@@ -53,6 +66,9 @@ logfile={{ newrelic_logfile }}
 # Default: none (use a direct connection)
 #
 #proxy=
+{% if newrelic_proxy|default(None) != None %}
+proxy={{ newrelic_proxy }}
+{% endif %}
 
 #
 # Setting: ssl
@@ -187,7 +203,7 @@ logfile={{ newrelic_logfile }}
 # Default: none
 #
 #labels=label_type:label_value
-{% if newrelic_labels %}
+{% if newrelic_labels|default(None) != None %}
 labels={{ newrelic_labels }}
 {% endif %}
 
@@ -214,6 +230,6 @@ disable_docker={{ newrelic_disable_docker | to_nice_json }}
 # Default: none
 #
 #hostname=newrelic.com
-{% if newrelic_override_hostname %}
+{% if newrelic_override_hostname|default(None) != None %}
 hostname={{ newrelic_override_hostname }}
 {% endif %}
diff --git a/provisioning/roles/franklinkim.newrelic/tests/main.yml b/provisioning/roles/franklinkim.newrelic/tests/main.yml
index 0b30d6d30..60404e597 100644
--- a/provisioning/roles/franklinkim.newrelic/tests/main.yml
+++ b/provisioning/roles/franklinkim.newrelic/tests/main.yml
@@ -1,10 +1,9 @@
 ---
 
 - hosts: all
-  sudo: yes
+  become: yes
   roles:
     - franklinkim.newrelic
   vars:
-    newrelic_license_key: yes
     newrelic_service_state: started
     newrelic_license_key: ab2fa361cd4d0d373833cad619d7bcc424d27c16
diff --git a/provisioning/roles/geerlingguy.elasticsearch/.travis.yml b/provisioning/roles/geerlingguy.elasticsearch/.travis.yml
index dcd413c48..20f0f0b59 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/.travis.yml
+++ b/provisioning/roles/geerlingguy.elasticsearch/.travis.yml
@@ -2,20 +2,16 @@
 sudo: required
 
 env:
-  - distribution: centos
-    version: 6
-    init: /sbin/init
-    run_opts: ""
-  - distribution: centos
-    version: 7
+  - distro: centos7
     init: /usr/lib/systemd/systemd
     run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-  - distribution: ubuntu
-    version: 14.04
+  - distro: ubuntu1604
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distro: ubuntu1404
     init: /sbin/init
     run_opts: ""
-  - distribution: ubuntu
-    version: 12.04
+  - distro: ubuntu1204
     init: /sbin/init
     run_opts: ""
 
@@ -23,18 +19,16 @@ services:
   - docker
 
 before_install:
-  # Pull container
-  - 'sudo docker pull ${distribution}:${version}'
-  # Customize container
-  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+  # Pull container.
+  - 'sudo docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
   - container_id=$(mktemp)
-  # Run container in detached state
-  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+  # Run container in detached state.
+  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
 
-  # Install required Galaxy roles.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-galaxy install geerlingguy.java'
+  # Install dependencies.
+  - 'sudo docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
 
   # Ansible syntax check.
   - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
@@ -42,16 +36,18 @@ script:
   # Test role.
   - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
 
-  # TODO: Test if elasticsearch is working.
-
   # Test role idempotence.
+  - idempotence=$(mktemp)
+  - sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
   - >
-    sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml
+    tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
     && (echo 'Idempotence test: pass' && exit 0)
     || (echo 'Idempotence test: fail' && exit 1)
 
-  # Clean up
+  # TODO: Test if elasticsearch is working.
+
+  # Clean up.
   - 'sudo docker stop "$(cat ${container_id})"'
 
 notifications:
diff --git a/provisioning/roles/geerlingguy.elasticsearch/README.md b/provisioning/roles/geerlingguy.elasticsearch/README.md
index 31c741162..7a3494f36 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/README.md
+++ b/provisioning/roles/geerlingguy.elasticsearch/README.md
@@ -6,7 +6,7 @@ An Ansible Role that installs Elasticsearch on RedHat/CentOS or Debian/Ubuntu.
 
 ## Requirements
 
-None.
+Requires at least Java 7 (Java 8+ preferred). See [`geerlingguy.java`](https://github.com/geerlingguy/ansible-role-java#example-playbook-install-openjdk-8) role instructions for installing OpenJDK 8.
 
 ## Role Variables
 Available variables are listed below, along with default values (see `defaults/main.yml`):
diff --git a/provisioning/roles/geerlingguy.elasticsearch/tasks/main.yml b/provisioning/roles/geerlingguy.elasticsearch/tasks/main.yml
index a4ce2d04a..3208a0d59 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.elasticsearch/tasks/main.yml
@@ -16,3 +16,6 @@
 
 - name: Start Elasticsearch.
   service: name=elasticsearch state=started enabled=yes
+
+- name: Make sure Elasticsearch is running before proceeding.
+  wait_for: port={{ elasticsearch_http_port }} delay=3 timeout=300
diff --git a/provisioning/roles/geerlingguy.elasticsearch/tests/Dockerfile.centos-6 b/provisioning/roles/geerlingguy.elasticsearch/tests/Dockerfile.centos-6
deleted file mode 100644
index 4a4e7b8d6..000000000
--- a/provisioning/roles/geerlingguy.elasticsearch/tests/Dockerfile.centos-6
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM centos:6
-
-# Install Ansible
-RUN yum -y update; yum clean all;
-RUN yum -y install epel-release
-RUN yum -y install git ansible sudo
-RUN yum clean all
-
-# Disable requiretty
-RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
-
-# Install Ansible inventory file
-RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
-
-CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.elasticsearch/tests/Dockerfile.centos-7 b/provisioning/roles/geerlingguy.elasticsearch/tests/Dockerfile.centos-7
deleted file mode 100644
index 8aa065497..000000000
--- a/provisioning/roles/geerlingguy.elasticsearch/tests/Dockerfile.centos-7
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM centos:7
-
-# Install systemd -- See https://hub.docker.com/_/centos/
-RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
-RUN yum -y update; yum clean all; \
-(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
-rm -f /lib/systemd/system/multi-user.target.wants/*; \
-rm -f /etc/systemd/system/*.wants/*; \
-rm -f /lib/systemd/system/local-fs.target.wants/*; \
-rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
-rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
-rm -f /lib/systemd/system/basic.target.wants/*; \
-rm -f /lib/systemd/system/anaconda.target.wants/*;
-
-# Install Ansible
-RUN yum -y install epel-release
-RUN yum -y install git ansible sudo
-RUN yum clean all
-
-# Disable requiretty
-RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
-
-# Install Ansible inventory file
-RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
-
-VOLUME ["/sys/fs/cgroup"]
-CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.elasticsearch/tests/Dockerfile.ubuntu-12.04 b/provisioning/roles/geerlingguy.elasticsearch/tests/Dockerfile.ubuntu-12.04
deleted file mode 100644
index d0c130cdf..000000000
--- a/provisioning/roles/geerlingguy.elasticsearch/tests/Dockerfile.ubuntu-12.04
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM ubuntu:12.04
-RUN apt-get update
-
-# Install Ansible
-RUN apt-get install -y software-properties-common python-software-properties git
-RUN apt-add-repository -y ppa:ansible/ansible
-RUN apt-get update
-RUN apt-get install -y ansible
-
-# Install Ansible inventory file
-RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.elasticsearch/tests/Dockerfile.ubuntu-14.04 b/provisioning/roles/geerlingguy.elasticsearch/tests/Dockerfile.ubuntu-14.04
deleted file mode 100644
index ca332871f..000000000
--- a/provisioning/roles/geerlingguy.elasticsearch/tests/Dockerfile.ubuntu-14.04
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM ubuntu:14.04
-RUN apt-get update
-
-# Install Ansible
-RUN apt-get install -y software-properties-common git
-RUN apt-add-repository -y ppa:ansible/ansible
-RUN apt-get update
-RUN apt-get install -y ansible
-
-# Install Ansible inventory file
-RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.elasticsearch/tests/requirements.yml b/provisioning/roles/geerlingguy.elasticsearch/tests/requirements.yml
new file mode 100644
index 000000000..8fbe7cb66
--- /dev/null
+++ b/provisioning/roles/geerlingguy.elasticsearch/tests/requirements.yml
@@ -0,0 +1,2 @@
+---
+- src: geerlingguy.java
diff --git a/provisioning/roles/geerlingguy.elasticsearch/tests/test.yml b/provisioning/roles/geerlingguy.elasticsearch/tests/test.yml
index a289f8d1d..ef6c5abeb 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/tests/test.yml
+++ b/provisioning/roles/geerlingguy.elasticsearch/tests/test.yml
@@ -6,6 +6,10 @@
       yum: name=which state=present
       when: ansible_os_family == 'RedHat'
 
+    - name: Update apt cache.
+      apt: update_cache=yes
+      when: ansible_os_family == 'Debian'
+
   roles:
     - geerlingguy.java
     - role_under_test
diff --git a/provisioning/roles/geerlingguy.java/templates/java_home.sh.j2 b/provisioning/roles/geerlingguy.java/templates/java_home.sh.j2
index 994e8b706..4859c4aab 100644
--- a/provisioning/roles/geerlingguy.java/templates/java_home.sh.j2
+++ b/provisioning/roles/geerlingguy.java/templates/java_home.sh.j2
@@ -1 +1 @@
-export JAVA_HOME=$JAVA_HOME:{{ java_home }}
+export JAVA_HOME={{ java_home }}
diff --git a/provisioning/roles/geerlingguy.java/tests/test.yml b/provisioning/roles/geerlingguy.java/tests/test.yml
index 7744b497a..8801ef8a8 100644
--- a/provisioning/roles/geerlingguy.java/tests/test.yml
+++ b/provisioning/roles/geerlingguy.java/tests/test.yml
@@ -3,8 +3,9 @@
 
   pre_tasks:
     - name: Update apt cache.
-      apt: update_cache=yes
+      apt: update_cache=yes cache_valid_time=600
       when: ansible_os_family == 'Debian'
+      changed_when: false
 
   roles:
     - role_under_test
diff --git a/provisioning/roles/geerlingguy.nodejs/.travis.yml b/provisioning/roles/geerlingguy.nodejs/.travis.yml
index 85e7e06b5..12247fc93 100644
--- a/provisioning/roles/geerlingguy.nodejs/.travis.yml
+++ b/provisioning/roles/geerlingguy.nodejs/.travis.yml
@@ -1,5 +1,5 @@
 ---
-sudo: required
+services: docker
 
 env:
   - distro: centos7
@@ -18,30 +18,27 @@ env:
     init: /sbin/init
     run_opts: ""
 
-services:
-  - docker
-
 before_install:
   # Pull container.
-  - 'sudo docker pull geerlingguy/docker-${distro}-ansible:latest'
+  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
   - container_id=$(mktemp)
   # Run container in detached state.
-  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
+  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
 
   # Install dependencies.
-  - 'sudo docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
+  - 'docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
 
   # Ansible syntax check.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
 
   # Test role.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
 
   # Test role idempotence.
   - idempotence=$(mktemp)
-  - sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
+  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
   - >
     tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
@@ -49,17 +46,13 @@ script:
     || (echo 'Idempotence test: fail' && exit 1)
 
   # Ensure Node.js is installed.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm which node'
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm node -v'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm which node'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm node -v'
 
   # Ensure npm packages are installed globally.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm bash --login -c "npm list -g --depth=0 jslint"'
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm bash --login -c "npm list -g --depth=0 node-sass"'
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm bash --login -c "npm list -g --depth=0 yo"'
-
-after_success:
-  # Clean up.
-  - 'sudo docker stop "$(cat ${container_id})"'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm bash --login -c "npm list -g --depth=0 jslint"'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm bash --login -c "npm list -g --depth=0 node-sass"'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm bash --login -c "npm list -g --depth=0 yo"'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.nodejs/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.nodejs/tasks/setup-RedHat.yml
index 40eabc0c9..bccd7059b 100644
--- a/provisioning/roles/geerlingguy.nodejs/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.nodejs/tasks/setup-RedHat.yml
@@ -20,4 +20,4 @@
     state: present
 
 - name: Ensure Node.js and npm are installed.
-  yum: "name=nodejs state=present enablerepo='epel,nodesource'"
+  yum: "name=nodejs-{{ nodejs_version[0] }}.* state=present enablerepo='epel,nodesource'"
diff --git a/provisioning/roles/geerlingguy.nodejs/tests/test.yml b/provisioning/roles/geerlingguy.nodejs/tests/test.yml
index 45c9f415e..516962cf9 100644
--- a/provisioning/roles/geerlingguy.nodejs/tests/test.yml
+++ b/provisioning/roles/geerlingguy.nodejs/tests/test.yml
@@ -13,21 +13,9 @@
       - name: yo
 
   pre_tasks:
-    - name: Ensure build dependencies are installed (RedHat).
-      yum: 'name="{{ item }}" state=present'
-      with_items:
-        - which
-      when: ansible_os_family == 'RedHat'
-
     - name: Update apt cache.
       apt: update_cache=yes
       when: ansible_os_family == 'Debian'
 
-    - name: Ensure build dependencies are installed (Debian).
-      apt: 'name="{{ item }}" state=installed'
-      with_items:
-        - sudo
-      when: ansible_os_family == 'Debian'
-
   roles:
     - role_under_test
diff --git a/provisioning/roles/geerlingguy.redis/.travis.yml b/provisioning/roles/geerlingguy.redis/.travis.yml
index 70111384e..de27baf24 100644
--- a/provisioning/roles/geerlingguy.redis/.travis.yml
+++ b/provisioning/roles/geerlingguy.redis/.travis.yml
@@ -1,47 +1,58 @@
 ---
 sudo: required
-language: python
-python: "2.7"
 
 env:
-  - SITE=test.yml
+  - distro: centos7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    redis_daemon: redis
+  # - distro: fedora24
+  #   init: /usr/lib/systemd/systemd
+  #   run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  #   redis_daemon: redis
+  - distro: ubuntu1604
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    redis_daemon: redis-server
+
+services:
+  - docker
 
 before_install:
-  - sudo apt-get update -qq
-
-  # Remove pre-existing Redis installation.
-  - sudo apt-get remove -y --purge redis-server
-  - sudo rm -rf /etc/redis
-
-install:
-  # Install Ansible.
-  - pip install ansible
-
-  # Add ansible.cfg to pick up roles path.
-  - "{ echo '[defaults]'; echo 'roles_path = ../'; } >> ansible.cfg"
+  # Pull container.
+  - 'sudo docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
-  # Check the role/playbook's syntax.
-  - "ansible-playbook -i tests/inventory tests/$SITE --syntax-check"
+  - container_id=$(mktemp)
+  # Run container in detached state.
+  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
 
-  # Run the role/playbook with ansible-playbook.
-  - "ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo"
+  # Ansible syntax check.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
 
-  # Run the role/playbook again, checking to make sure it's idempotent.
+  # Test role.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+
+  # Test role idempotence.
+  - idempotence=$(mktemp)
+  - sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
   - >
-    ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo
+    tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
     && (echo 'Idempotence test: pass' && exit 0)
     || (echo 'Idempotence test: fail' && exit 1)
 
   # Make sure Redis is running, and can be stopped and started cleanly.
-  - sudo service redis-server status
-  - sudo service redis-server stop
-  - sudo service redis-server start
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm systemctl --no-pager status ${redis_daemon}'
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm systemctl --no-pager stop ${redis_daemon}'
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm systemctl --no-pager start ${redis_daemon}'
 
 after_failure:
-  - sudo cat /var/log/redis/redis-server.log
-  - sudo cat /etc/redis/redis.conf
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm cat /var/log/redis/redis-server.log'
+
+after_success:
+  # Clean up.
+  - 'sudo docker stop "$(cat ${container_id})"'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.redis/README.md b/provisioning/roles/geerlingguy.redis/README.md
index 4f746790a..acb58aa20 100644
--- a/provisioning/roles/geerlingguy.redis/README.md
+++ b/provisioning/roles/geerlingguy.redis/README.md
@@ -10,6 +10,10 @@ On RedHat-based distributions, requires the EPEL repository (you can simply add
 
 ## Role Variables
 
+    redis_enablerepo: epel
+
+(Used only on RHEL/CentOS) The repository to use for Redis installation.
+
 Available variables are listed below, along with default values (see `defaults/main.yml`):
 
     redis_port: 6379
@@ -49,11 +53,11 @@ Snapshotting configuration; setting values in this list will save the database t
 Database compression and location configuration.
 
     redis_maxmemory: 0
-    
+
 Limit memory usage to the specified amount of bytes. Leave at 0 for unlimited.
 
     redis_maxmemory_policy: "noeviction"
-    
+
 The method to use to keep memory usage below the limit, if specified. See [Using Redis as an LRU cache](http://redis.io/topics/lru-cache).
 
     redis_maxmemory_samples: 5
@@ -73,6 +77,10 @@ Valid values are `always` (slower, safest), `everysec` (happy medium), or `no` (
 
 Add extra include file paths to this list to include more/localized Redis configuration.
 
+The redis package name for installation via the system package manager. Defaults to `redis-server` on Debian and `redis` on RHEL.
+
+    redis_package_name: "redis28u"
+
 ## Dependencies
 
 None.
@@ -89,4 +97,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.redis/defaults/main.yml b/provisioning/roles/geerlingguy.redis/defaults/main.yml
index 15e94a2f4..c7a05773b 100644
--- a/provisioning/roles/geerlingguy.redis/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.redis/defaults/main.yml
@@ -1,4 +1,7 @@
 ---
+# Used for RHEL/CentOS/Fedora only. Allows the use of different repos.
+redis_enablerepo: epel
+
 redis_port: 6379
 redis_bind_interface: 127.0.0.1
 redis_unixsocket: ''
diff --git a/provisioning/roles/geerlingguy.redis/meta/main.yml b/provisioning/roles/geerlingguy.redis/meta/main.yml
index 109a5d752..4f527bcfd 100644
--- a/provisioning/roles/geerlingguy.redis/meta/main.yml
+++ b/provisioning/roles/geerlingguy.redis/meta/main.yml
@@ -6,12 +6,15 @@ galaxy_info:
   description: Redis for Linux
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 1.8
+  min_ansible_version: 2.0
   platforms:
     - name: EL
       versions:
       - 6
       - 7
+    - name: Fedora
+      versions:
+      - all
     - name: Debian
       versions:
       - all
diff --git a/provisioning/roles/geerlingguy.redis/tasks/main.yml b/provisioning/roles/geerlingguy.redis/tasks/main.yml
index ec8de5132..22805260b 100644
--- a/provisioning/roles/geerlingguy.redis/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.redis/tasks/main.yml
@@ -3,6 +3,11 @@
 - name: Include OS-specific variables.
   include_vars: "{{ ansible_os_family }}.yml"
 
+- name: Define redis_package.
+  set_fact:
+    redis_package: "{{ __redis_package }}"
+  when: redis_package is not defined
+
 # Setup/install tasks.
 - include: setup-RedHat.yml
   when: ansible_os_family == 'RedHat'
@@ -17,5 +22,5 @@
     mode: 0644
   notify: restart redis
 
-- name: Ensure redis is running and enabled on boot.
+- name: Ensure Redis is running and enabled on boot.
   service: "name={{ redis_daemon }} state=started enabled=yes"
diff --git a/provisioning/roles/geerlingguy.redis/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.redis/tasks/setup-Debian.yml
index c105caf18..41f17f907 100644
--- a/provisioning/roles/geerlingguy.redis/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.redis/tasks/setup-Debian.yml
@@ -1,3 +1,5 @@
 ---
-- name: Ensure redis is installed.
-  apt: name=redis-server state=installed
+- name: Ensure Redis is installed.
+  apt:
+    name: "{{ redis_package }}"
+    state: present
diff --git a/provisioning/roles/geerlingguy.redis/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.redis/tasks/setup-RedHat.yml
index 85ed9091d..69f56685d 100644
--- a/provisioning/roles/geerlingguy.redis/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.redis/tasks/setup-RedHat.yml
@@ -1,3 +1,6 @@
 ---
-- name: Ensure redis is installed.
-  yum: name=redis state=installed enablerepo=epel
+- name: Ensure Redis is installed.
+  package:
+    name: "{{ redis_package }}"
+    state: present
+    enablerepo: "{{ redis_enablerepo }}"
diff --git a/provisioning/roles/geerlingguy.redis/tests/inventory b/provisioning/roles/geerlingguy.redis/tests/inventory
deleted file mode 100644
index 2fbb50c4a..000000000
--- a/provisioning/roles/geerlingguy.redis/tests/inventory
+++ /dev/null
@@ -1 +0,0 @@
-localhost
diff --git a/provisioning/roles/geerlingguy.redis/tests/test.yml b/provisioning/roles/geerlingguy.redis/tests/test.yml
index d24c0a9cc..0b03377b8 100644
--- a/provisioning/roles/geerlingguy.redis/tests/test.yml
+++ b/provisioning/roles/geerlingguy.redis/tests/test.yml
@@ -1,6 +1,15 @@
 ---
-- hosts: localhost
-  remote_user: root
+- hosts: all
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=yes
+      when: ansible_os_family == 'Debian'
+
+    - name: Clear out repo for Fedora.
+      set_fact:
+        redis_enablerepo: ""
+      when: ansible_distribution == 'Fedora'
 
   roles:
-    - ansible-role-redis
+    - role_under_test
diff --git a/provisioning/roles/geerlingguy.redis/vars/Debian.yml b/provisioning/roles/geerlingguy.redis/vars/Debian.yml
index 517d91a1f..7863ccd74 100644
--- a/provisioning/roles/geerlingguy.redis/vars/Debian.yml
+++ b/provisioning/roles/geerlingguy.redis/vars/Debian.yml
@@ -1,3 +1,4 @@
 ---
+__redis_package: redis-server
 redis_daemon: redis-server
 redis_conf_path: /etc/redis/redis.conf
diff --git a/provisioning/roles/geerlingguy.redis/vars/RedHat.yml b/provisioning/roles/geerlingguy.redis/vars/RedHat.yml
index d4f603ce3..4aba21366 100644
--- a/provisioning/roles/geerlingguy.redis/vars/RedHat.yml
+++ b/provisioning/roles/geerlingguy.redis/vars/RedHat.yml
@@ -1,3 +1,4 @@
 ---
+__redis_package: redis
 redis_daemon: redis
 redis_conf_path: /etc/redis.conf
diff --git a/provisioning/roles/geerlingguy.security/.travis.yml b/provisioning/roles/geerlingguy.security/.travis.yml
index 8928886b2..f91967112 100644
--- a/provisioning/roles/geerlingguy.security/.travis.yml
+++ b/provisioning/roles/geerlingguy.security/.travis.yml
@@ -1,45 +1,43 @@
 ---
-sudo: required
+services: docker
 
 env:
-  - distribution: centos
-    version: 6
-    init: /sbin/init
-    run_opts: ""
-  - distribution: centos
-    version: 7
+  - distro: centos7
     init: /usr/lib/systemd/systemd
     run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-  - distribution: ubuntu # phusion/baseimage
-    version: 14.04
-    init: /sbin/my_init
+  - distro: centos6
+    init: /sbin/init
     run_opts: ""
-  - distribution: ubuntu
-    version: 12.04
+  - distro: ubuntu1604
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distro: ubuntu1404
     init: /sbin/init
     run_opts: ""
-
-services:
-  - docker
+  - distro: debian8
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
 
 before_install:
-  # Customize container
-  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+  # Pull container.
+  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
   - container_id=$(mktemp)
-  # Run container in detached state
-  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+  # Run container in detached state.
+  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
 
   # Ansible syntax check.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
 
   # Test role.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
 
   # Test role idempotence.
+  - idempotence=$(mktemp)
+  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
   - >
-    sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml
+    tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
     && (echo 'Idempotence test: pass' && exit 0)
     || (echo 'Idempotence test: fail' && exit 1)
@@ -50,8 +48,5 @@ script:
     && (echo 'fail2ban is on: pass' && exit 0)
     || (echo 'fail2ban is on: fail' && exit 1)
 
-  # Clean up
-  - 'sudo docker stop "$(cat ${container_id})"'
-
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.security/README.md b/provisioning/roles/geerlingguy.security/README.md
index 0c8974b5c..26062b653 100644
--- a/provisioning/roles/geerlingguy.security/README.md
+++ b/provisioning/roles/geerlingguy.security/README.md
@@ -49,6 +49,10 @@ A list of users who should be added to the sudoers file so they can run any comm
 
 Whether to install/enable `yum-cron` (RedHat-based systems) or `unattended-upgrades` (Debian-based systems). System restarts will not happen automatically in any case, and automatic upgrades are no excuse for sloppy patch and package management, but automatic updates can be helpful as yet another security measure.
 
+    security_autoupdate_blacklist: []
+
+(Debian/Ubuntu only) A listing of packages that should not be automatically updated.
+
     security_autoupdate_mail_to: ""
     security_autoupdate_mail_on_error: true
 
@@ -82,4 +86,4 @@ MIT (Expat) / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.security/defaults/main.yml b/provisioning/roles/geerlingguy.security/defaults/main.yml
index 6caf48817..fade66770 100644
--- a/provisioning/roles/geerlingguy.security/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.security/defaults/main.yml
@@ -12,6 +12,7 @@ security_sudoers_passwordless: []
 security_sudoers_passworded: []
 
 security_autoupdate_enabled: true
+security_autoupdate_blacklist: []
 
 # Autoupdate mail settings used on Debian/Ubuntu only.
 security_autoupdate_mail_to: ""
diff --git a/provisioning/roles/geerlingguy.security/templates/50unattended-upgrades.j2 b/provisioning/roles/geerlingguy.security/templates/50unattended-upgrades.j2
index 59e01cdbb..7f217fb0a 100644
--- a/provisioning/roles/geerlingguy.security/templates/50unattended-upgrades.j2
+++ b/provisioning/roles/geerlingguy.security/templates/50unattended-upgrades.j2
@@ -11,3 +11,9 @@ Unattended-Upgrade::Allowed-Origins {
         "${distro_id} ${distro_codename}-security";
 //      "${distro_id} ${distro_codename}-updates";
 };
+
+Unattended-Upgrade::Package-Blacklist{
+{% for package in security_autoupdate_blacklist %}
+      "{{package}}";
+{% endfor %}
+}
diff --git a/provisioning/roles/geerlingguy.security/tests/Dockerfile.centos-6 b/provisioning/roles/geerlingguy.security/tests/Dockerfile.centos-6
deleted file mode 100644
index 4a4e7b8d6..000000000
--- a/provisioning/roles/geerlingguy.security/tests/Dockerfile.centos-6
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM centos:6
-
-# Install Ansible
-RUN yum -y update; yum clean all;
-RUN yum -y install epel-release
-RUN yum -y install git ansible sudo
-RUN yum clean all
-
-# Disable requiretty
-RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
-
-# Install Ansible inventory file
-RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
-
-CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.security/tests/Dockerfile.centos-7 b/provisioning/roles/geerlingguy.security/tests/Dockerfile.centos-7
deleted file mode 100644
index 8aa065497..000000000
--- a/provisioning/roles/geerlingguy.security/tests/Dockerfile.centos-7
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM centos:7
-
-# Install systemd -- See https://hub.docker.com/_/centos/
-RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
-RUN yum -y update; yum clean all; \
-(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
-rm -f /lib/systemd/system/multi-user.target.wants/*; \
-rm -f /etc/systemd/system/*.wants/*; \
-rm -f /lib/systemd/system/local-fs.target.wants/*; \
-rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
-rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
-rm -f /lib/systemd/system/basic.target.wants/*; \
-rm -f /lib/systemd/system/anaconda.target.wants/*;
-
-# Install Ansible
-RUN yum -y install epel-release
-RUN yum -y install git ansible sudo
-RUN yum clean all
-
-# Disable requiretty
-RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
-
-# Install Ansible inventory file
-RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
-
-VOLUME ["/sys/fs/cgroup"]
-CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.security/tests/Dockerfile.ubuntu-12.04 b/provisioning/roles/geerlingguy.security/tests/Dockerfile.ubuntu-12.04
deleted file mode 100644
index d0c130cdf..000000000
--- a/provisioning/roles/geerlingguy.security/tests/Dockerfile.ubuntu-12.04
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM ubuntu:12.04
-RUN apt-get update
-
-# Install Ansible
-RUN apt-get install -y software-properties-common python-software-properties git
-RUN apt-add-repository -y ppa:ansible/ansible
-RUN apt-get update
-RUN apt-get install -y ansible
-
-# Install Ansible inventory file
-RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.security/tests/Dockerfile.ubuntu-14.04 b/provisioning/roles/geerlingguy.security/tests/Dockerfile.ubuntu-14.04
deleted file mode 100644
index 949fd976a..000000000
--- a/provisioning/roles/geerlingguy.security/tests/Dockerfile.ubuntu-14.04
+++ /dev/null
@@ -1,17 +0,0 @@
-FROM phusion/baseimage:0.9.18
-RUN apt-get update
-
-# Enable SSH
-RUN rm -f /etc/service/sshd/down
-
-# Create auth.log required by fail2ban.
-RUN touch /var/log/auth.log
-
-# Install Ansible
-RUN apt-get install -y software-properties-common git
-RUN apt-add-repository -y ppa:ansible/ansible
-RUN apt-get update
-RUN apt-get install -y ansible
-
-# Install Ansible inventory file
-RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.security/tests/test.yml b/provisioning/roles/geerlingguy.security/tests/test.yml
index f7ab17e98..17bfdbad6 100644
--- a/provisioning/roles/geerlingguy.security/tests/test.yml
+++ b/provisioning/roles/geerlingguy.security/tests/test.yml
@@ -1,6 +1,10 @@
 - hosts: all
 
   pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=yes cache_valid_time=600
+      when: ansible_os_family == 'Debian'
+
     - name: Ensure build dependencies are installed (RedHat).
       yum: 'name="{{ item }}" state=present'
       with_items:
@@ -9,11 +13,20 @@
       when: ansible_os_family == 'RedHat'
 
     - name: Ensure build dependencies are installed (Debian).
-      apt: 'name="{{ item }}" state=installed'
+      apt: 'name="{{ item }}" state=present'
       with_items:
         - openssh-server
         - openssh-client
       when: ansible_os_family == 'Debian'
 
+    - name: Ensure auth.log file is present.
+      copy:
+        dest: /var/log/auth.log
+        content: ""
+        force: no
+      when: >
+        (ansible_distribution == 'Ubuntu' and ansible_distribution_version == '14.04') or
+        (ansible_distribution == 'Debian' and ansible_distribution_release == 'jessie')
+
   roles:
     - role_under_test
diff --git a/provisioning/roles/thom8.php-upload-progress/tests/Dockerfile.centos-7 b/provisioning/roles/thom8.php-upload-progress/tests/Dockerfile.centos-7
index 10c2684ce..804acdafe 100644
--- a/provisioning/roles/thom8.php-upload-progress/tests/Dockerfile.centos-7
+++ b/provisioning/roles/thom8.php-upload-progress/tests/Dockerfile.centos-7
@@ -27,4 +27,4 @@ RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
 RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
 
 VOLUME ["/sys/fs/cgroup"]
-CMD ["/usr/sbin/init"]
+CMD ["/usr/sbin/init"]
\ No newline at end of file
diff --git a/provisioning/roles/thom8.php-upload-progress/vars/Debian.yml b/provisioning/roles/thom8.php-upload-progress/vars/Debian.yml
index 4240c7dab..9ff5ac245 100644
--- a/provisioning/roles/thom8.php-upload-progress/vars/Debian.yml
+++ b/provisioning/roles/thom8.php-upload-progress/vars/Debian.yml
@@ -1,3 +1,3 @@
 ---
 __php_uploadprogress_module_path: /usr/lib/php5/modules
-__php_uploadprogress_config_filename: 20-uploadprogress.ini
+__php_uploadprogress_config_filename: 20-uploadprogress.ini
\ No newline at end of file

From 085e7e734cce192bd81e1efb0e04a80651bb2311 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 10 Jan 2017 14:33:51 -0600
Subject: [PATCH 0577/1273] Update Firewall role to latest version.

---
 provisioning/requirements.yml                          | 2 +-
 provisioning/roles/geerlingguy.firewall/tasks/main.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 14067a63c..e570a9d4d 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -24,7 +24,7 @@
 - src: geerlingguy.elasticsearch
   version: 2.1.2
 - src: geerlingguy.firewall
-  version: 2.0.1
+  version: 2.0.2
 - src: geerlingguy.git
   version: 1.2.1
 - src: geerlingguy.java
diff --git a/provisioning/roles/geerlingguy.firewall/tasks/main.yml b/provisioning/roles/geerlingguy.firewall/tasks/main.yml
index ee54ea13c..b548b7180 100644
--- a/provisioning/roles/geerlingguy.firewall/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.firewall/tasks/main.yml
@@ -34,7 +34,7 @@
   when: >
     (ansible_distribution == 'Ubuntu' and ansible_distribution_version.split(".")[0]|int >= 16) or
     (ansible_distribution == 'Debian' and ansible_distribution_version.split(".")[0]|int >= 8) or
-    (ansible_distribution == 'CentOS' and ansible_distribution_version.split(".")[0]|int >= 7) or
+    (ansible_os_family == 'RedHat' and ansible_distribution_version.split(".")[0]|int >= 7) or
     (ansible_distribution == 'Fedora')
 
 - name: Ensure the firewall is enabled and will start on boot.

From e9a88554d5f81616f802d03ba7c7c11b7771e206 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 12 Jan 2017 09:47:39 -0600
Subject: [PATCH 0578/1273] Update to latest Elasticsearch role version.

---
 provisioning/requirements.yml                 |  2 +-
 .../geerlingguy.elasticsearch/.travis.yml     | 23 ++++++++-----------
 .../geerlingguy.elasticsearch/tasks/main.yml  |  2 +-
 .../geerlingguy.elasticsearch/tests/test.yml  | 10 ++++----
 4 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index e570a9d4d..dbd034c2b 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -22,7 +22,7 @@
 - src: geerlingguy.drush
   version: 1.2.0
 - src: geerlingguy.elasticsearch
-  version: 2.1.2
+  version: 2.1.3
 - src: geerlingguy.firewall
   version: 2.0.2
 - src: geerlingguy.git
diff --git a/provisioning/roles/geerlingguy.elasticsearch/.travis.yml b/provisioning/roles/geerlingguy.elasticsearch/.travis.yml
index 20f0f0b59..03ce07776 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/.travis.yml
+++ b/provisioning/roles/geerlingguy.elasticsearch/.travis.yml
@@ -1,5 +1,5 @@
 ---
-sudo: required
+services: docker
 
 env:
   - distro: centos7
@@ -15,40 +15,35 @@ env:
     init: /sbin/init
     run_opts: ""
 
-services:
-  - docker
-
 before_install:
   # Pull container.
-  - 'sudo docker pull geerlingguy/docker-${distro}-ansible:latest'
+  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
   - container_id=$(mktemp)
   # Run container in detached state.
-  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
+  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
 
   # Install dependencies.
-  - 'sudo docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
+  - 'docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
 
   # Ansible syntax check.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
 
   # Test role.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
 
   # Test role idempotence.
   - idempotence=$(mktemp)
-  - sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
+  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
   - >
     tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
     && (echo 'Idempotence test: pass' && exit 0)
     || (echo 'Idempotence test: fail' && exit 1)
 
-  # TODO: Test if elasticsearch is working.
-
-  # Clean up.
-  - 'sudo docker stop "$(cat ${container_id})"'
+  # Test if Elasticsearch is working.
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm curl -XGET localhost:9200'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.elasticsearch/tasks/main.yml b/provisioning/roles/geerlingguy.elasticsearch/tasks/main.yml
index 3208a0d59..a564983ae 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.elasticsearch/tasks/main.yml
@@ -18,4 +18,4 @@
   service: name=elasticsearch state=started enabled=yes
 
 - name: Make sure Elasticsearch is running before proceeding.
-  wait_for: port={{ elasticsearch_http_port }} delay=3 timeout=300
+  wait_for: host={{ elasticsearch_network_host }} port={{ elasticsearch_http_port }} delay=3 timeout=300
diff --git a/provisioning/roles/geerlingguy.elasticsearch/tests/test.yml b/provisioning/roles/geerlingguy.elasticsearch/tests/test.yml
index ef6c5abeb..7e775aea9 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/tests/test.yml
+++ b/provisioning/roles/geerlingguy.elasticsearch/tests/test.yml
@@ -2,13 +2,13 @@
 - hosts: all
 
   pre_tasks:
-    - name: Ensure build dependencies are installed (RedHat).
-      yum: name=which state=present
-      when: ansible_os_family == 'RedHat'
-
     - name: Update apt cache.
-      apt: update_cache=yes
+      apt: update_cache=yes cache_valid_time=600
       when: ansible_os_family == 'Debian'
+      changed_when: false
+
+    - name: Ensure build dependencies are installed.
+      package: name=curl state=present
 
   roles:
     - geerlingguy.java

From 551405a93e2e3a5fb4f308f1223d27b3c62ccbe3 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 13 Jan 2017 23:31:36 -0600
Subject: [PATCH 0579/1273] Fixes #1123: Add Tideways (PHP Profiler Extension)
 support.

---
 docs/extras/profile-code.md                   |  6 ++
 provisioning/playbook.yml                     |  3 +
 provisioning/requirements.yml                 |  2 +
 .../roles/geerlingguy.php-tideways/.gitignore |  1 +
 .../geerlingguy.php-tideways/.travis.yml      | 46 ++++++++++++++
 .../roles/geerlingguy.php-tideways/README.md  | 44 +++++++++++++
 .../defaults/main.yml                         |  9 +++
 .../geerlingguy.php-tideways/meta/main.yml    | 44 +++++++++++++
 .../tasks/configure.yml                       | 18 ++++++
 .../geerlingguy.php-tideways/tasks/main.yml   | 61 +++++++++++++++++++
 .../templates/tideways.ini.j2                 |  7 +++
 .../tests/requirements.yml                    |  4 ++
 .../geerlingguy.php-tideways/tests/test.yml   | 31 ++++++++++
 .../tests/tideways-test.php                   | 27 ++++++++
 .../geerlingguy.php-tideways/vars/Debian.yml  |  3 +
 .../geerlingguy.php-tideways/vars/RedHat.yml  |  3 +
 16 files changed, 309 insertions(+)
 create mode 100644 provisioning/roles/geerlingguy.php-tideways/.gitignore
 create mode 100644 provisioning/roles/geerlingguy.php-tideways/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.php-tideways/README.md
 create mode 100644 provisioning/roles/geerlingguy.php-tideways/defaults/main.yml
 create mode 100644 provisioning/roles/geerlingguy.php-tideways/meta/main.yml
 create mode 100644 provisioning/roles/geerlingguy.php-tideways/tasks/configure.yml
 create mode 100644 provisioning/roles/geerlingguy.php-tideways/tasks/main.yml
 create mode 100644 provisioning/roles/geerlingguy.php-tideways/templates/tideways.ini.j2
 create mode 100644 provisioning/roles/geerlingguy.php-tideways/tests/requirements.yml
 create mode 100644 provisioning/roles/geerlingguy.php-tideways/tests/test.yml
 create mode 100644 provisioning/roles/geerlingguy.php-tideways/tests/tideways-test.php
 create mode 100644 provisioning/roles/geerlingguy.php-tideways/vars/Debian.yml
 create mode 100644 provisioning/roles/geerlingguy.php-tideways/vars/RedHat.yml

diff --git a/docs/extras/profile-code.md b/docs/extras/profile-code.md
index b2d2899c3..d0ebe8ba0 100644
--- a/docs/extras/profile-code.md
+++ b/docs/extras/profile-code.md
@@ -47,6 +47,12 @@ The Devel module also *used* to provide XHProf configuration, and setting the op
   - **xhprof directory**: `/usr/share/php`
   - **XHProf URL**: `http://xhprof.drupalvm.dev` (assuming this domain is configured in `apache_vhosts` inside `config.yml`)
 
+## Tideways
+
+The XHProf PHP extension has barely been maintained since Facebook abandoned the project around 2015, so it's difficult to get it running under newer versions of PHP. Instead, you can use the Tideways PHP Extension along with either the Tideways module or the XHProf module to profile page views.
+
+TODO: Describe how to use.
+
 ## XDebug
 
 [XDebug](https://xdebug.org/) is a debugger and profiler for PHP. While most people use it only for debugging purposes, you can also use it for profiling. It's not as commonly used for profiling as either Blackfire or XHProf, but it works!
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 4da164c0d..eec2108dc 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -82,6 +82,9 @@
     - { role: geerlingguy.drush, when: '"drush" in installed_extras' }
     - { role: geerlingguy.memcached, when: '"memcached" in installed_extras' }
     - { role: geerlingguy.php-memcached, when: '"memcached" in installed_extras' }
+    - role: geerlingguy.php-tideways
+      workspace: "/root/php{{ php_version }}"
+      when: '"tideways" in installed_extras'
     - role: geerlingguy.php-xdebug
       workspace: "/root/php{{ php_version }}"
       when: '"xdebug" in installed_extras'
diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index dbd034c2b..544758f9a 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -51,6 +51,8 @@
   version: 1.0.0
 - src: geerlingguy.php-redis
   version: 3.1.0
+- src: geerlingguy.php-tideways
+  version: 1.0.0
 - src: geerlingguy.php-xdebug
   version: 2.3.1
 - src: geerlingguy.php-xhprof
diff --git a/provisioning/roles/geerlingguy.php-tideways/.gitignore b/provisioning/roles/geerlingguy.php-tideways/.gitignore
new file mode 100644
index 000000000..e43b0f988
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-tideways/.gitignore
@@ -0,0 +1 @@
+.DS_Store
diff --git a/provisioning/roles/geerlingguy.php-tideways/.travis.yml b/provisioning/roles/geerlingguy.php-tideways/.travis.yml
new file mode 100644
index 000000000..73d695fbc
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-tideways/.travis.yml
@@ -0,0 +1,46 @@
+---
+services: docker
+
+env:
+  - distro: centos7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distro: ubuntu1604
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distro: debian8
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+
+before_install:
+  # Pull container.
+  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
+
+script:
+  - container_id=$(mktemp)
+  # Run container in detached state.
+  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
+
+  # Install dependencies.
+  - 'docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
+
+  # Ansible syntax check.
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+
+  # Test role.
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+
+  # Test role idempotence.
+  - idempotence=$(mktemp)
+  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
+  - >
+    tail ${idempotence}
+    | grep -q 'changed=0.*failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)
+
+  # Run script to test if Tideways is available and working.
+  - 'docker exec "$(cat ${container_id})" env TERM=xterm php /etc/ansible/roles/role_under_test/tests/tideways-test.php'
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.php-tideways/README.md b/provisioning/roles/geerlingguy.php-tideways/README.md
new file mode 100644
index 000000000..bde319ce4
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-tideways/README.md
@@ -0,0 +1,44 @@
+# Ansible Role: PHP-Tideways
+
+[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-php-tideways.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-php-tideways)
+
+Installs the [Tideways PHP Profile Extension](https://github.com/tideways/php-profiler-extension) on Linux servers.
+
+## Requirements
+
+None.
+
+## Role Variables
+
+Available variables are listed below, along with default values (see `defaults/main.yml`):
+
+    workspace: /root
+
+Where Tideways setup files will be downloaded and built.
+
+    tideways_download_url: https://github.com/tideways/php-profiler-extension/archive/master.zip
+    tideways_download_folder_name: php-profiler-extension-master
+
+The URL from which Tideways will be downloaded.
+
+    tideways_api_key: ''
+
+If you use the Tideways UI, set this variable to your API key. Otherwise the extension can be used along with the XHProf UI to view profiles.
+
+## Dependencies
+
+  - geerlingguy.php
+
+## Example Playbook
+
+    - hosts: webservers
+      roles:
+        - geerlingguy.php-tideways
+
+## License
+
+MIT / BSD
+
+## Author Information
+
+This role was created in 2017 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.php-tideways/defaults/main.yml b/provisioning/roles/geerlingguy.php-tideways/defaults/main.yml
new file mode 100644
index 000000000..15d8730a4
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-tideways/defaults/main.yml
@@ -0,0 +1,9 @@
+---
+workspace: /root
+
+tideways_download_url: https://github.com/tideways/php-profiler-extension/archive/master.zip
+tideways_download_folder_name: php-profiler-extension-master
+
+# If you use the Tideways UI, set this variable to your API key. Otherwise the
+# extension can be used along with the XHProf UI to view profiles.
+tideways_api_key: ''
diff --git a/provisioning/roles/geerlingguy.php-tideways/meta/main.yml b/provisioning/roles/geerlingguy.php-tideways/meta/main.yml
new file mode 100644
index 000000000..4975eb3b6
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-tideways/meta/main.yml
@@ -0,0 +1,44 @@
+---
+dependencies:
+  - geerlingguy.php
+
+galaxy_info:
+  author: geerlingguy
+  description: Tideways PHP Profiler Extension for Linux
+  company: "Midwestern Mac, LLC"
+  license: "license (BSD, MIT)"
+  min_ansible_version: 2.0
+  platforms:
+    - name: EL
+      versions:
+      - all
+    - name: GenericUNIX
+      versions:
+      - all
+    - name: Fedora
+      versions:
+      - all
+    - name: opensuse
+      versions:
+      - all
+    - name: GenericBSD
+      versions:
+      - all
+    - name: FreeBSD
+      versions:
+      - all
+    - name: Ubuntu
+      versions:
+      - all
+    - name: SLES
+      versions:
+      - all
+    - name: GenericLinux
+      versions:
+      - all
+    - name: Debian
+      versions:
+      - all
+  galaxy_tags:
+    - development
+    - web
diff --git a/provisioning/roles/geerlingguy.php-tideways/tasks/configure.yml b/provisioning/roles/geerlingguy.php-tideways/tasks/configure.yml
new file mode 100644
index 000000000..2b8700efb
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-tideways/tasks/configure.yml
@@ -0,0 +1,18 @@
+---
+- name: Ensure PHP configuration directories exist.
+  file:
+    path: "{{ item }}"
+    state: directory
+    mode: 0755
+    follow: true
+  with_items: "{{ php_extension_conf_paths }}"
+
+- name: Copy Tideways INI into various other conf folders.
+  template:
+    src: tideways.ini.j2
+    dest: "{{ item }}/{{ php_tideways_config_filename }}"
+    owner: root
+    group: root
+    mode: 0644
+  with_items: "{{ php_extension_conf_paths }}"
+  notify: restart webserver
diff --git a/provisioning/roles/geerlingguy.php-tideways/tasks/main.yml b/provisioning/roles/geerlingguy.php-tideways/tasks/main.yml
new file mode 100644
index 000000000..47fed98d0
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-tideways/tasks/main.yml
@@ -0,0 +1,61 @@
+---
+- name: Include OS-specific variables.
+  include_vars: "{{ ansible_os_family }}.yml"
+
+- name: Define php_tideways_module_path.
+  set_fact:
+    php_tideways_module_path: "{{ __php_tideways_module_path }}"
+  when: php_tideways_module_path is not defined
+
+- name: Define php_tideways_config_filename.
+  set_fact:
+    php_tideways_config_filename: "{{ __php_tideways_config_filename }}"
+  when: php_tideways_config_filename is not defined
+
+# Setup/install tasks.
+- name: Ensure dependencies for installing Tideways are present.
+  package: "name={{ item }} state=installed"
+  with_items:
+    - make
+    - gcc
+    - unzip
+    - graphviz
+
+- name: Download and untar Tideways.
+  unarchive:
+    src: "{{ tideways_download_url }}"
+    dest: "{{ workspace }}"
+    copy: no
+    creates: "{{ workspace }}/{{ tideways_download_folder_name }}"
+
+- name: Build Tideways.
+  shell: >
+    {{ item }}
+    chdir={{ workspace }}/{{ tideways_download_folder_name }}
+    creates={{ workspace }}/{{ tideways_download_folder_name }}/modules/tideways.so
+  with_items:
+    - phpize
+    - ./configure
+    - make
+    - make install
+  notify: restart webserver
+
+- name: Ensure Tideways module path exists.
+  file:
+    path: "{{ php_tideways_module_path }}"
+    state: directory
+    owner: root
+    group: root
+    mode: 0755
+
+- name: Move Tideways module into place.
+  shell: >
+    cp {{ workspace }}/{{ tideways_download_folder_name }}/modules/tideways.so {{ php_tideways_module_path }}/tideways.so
+    creates={{ php_tideways_module_path }}/tideways.so
+  notify: restart webserver
+
+# TODO - Install the Tideways.php file for UI?
+# $ php -r 'echo ini_get("extension_dir")."\n";'
+# $ cp Tideways.php /path/to/php/lib
+
+- include: configure.yml
diff --git a/provisioning/roles/geerlingguy.php-tideways/templates/tideways.ini.j2 b/provisioning/roles/geerlingguy.php-tideways/templates/tideways.ini.j2
new file mode 100644
index 000000000..53d30391e
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-tideways/templates/tideways.ini.j2
@@ -0,0 +1,7 @@
+[tideways]
+extension="{{ php_tideways_module_path }}/tideways.so"
+{% if tideways_api_key %}
+tideways.api_key={{ tideways_api_key }}
+{% else %}
+tideways.auto_prepend_library=0
+{% endif %}
diff --git a/provisioning/roles/geerlingguy.php-tideways/tests/requirements.yml b/provisioning/roles/geerlingguy.php-tideways/tests/requirements.yml
new file mode 100644
index 000000000..51eedd6a9
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-tideways/tests/requirements.yml
@@ -0,0 +1,4 @@
+---
+- src: geerlingguy.repo-remi
+- src: geerlingguy.repo-dotdeb
+- src: geerlingguy.php
diff --git a/provisioning/roles/geerlingguy.php-tideways/tests/test.yml b/provisioning/roles/geerlingguy.php-tideways/tests/test.yml
new file mode 100644
index 000000000..942f6d7e6
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-tideways/tests/test.yml
@@ -0,0 +1,31 @@
+---
+- hosts: all
+
+  vars:
+    php_enable_webserver: false
+    php_enablerepo: "remi,remi-php70"
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=yes cache_valid_time=600
+      when: ansible_os_family == 'Debian'
+
+    - name: Set php_packages for PHP 7.0 Debian 8 install.
+      set_fact:
+        php_packages:
+          - php7.0-common
+          - php7.0-cli
+          - php7.0-dev
+          - php7.0-fpm
+          - libpcre3-dev
+          - php7.0-opcache
+          - php7.0-apcu
+      when: ansible_distribution == 'Debian'
+
+  roles:
+    - role: geerlingguy.repo-remi
+      when: ansible_os_family == 'RedHat'
+    - role: geerlingguy.repo-dotdeb
+      when: ansible_distribution == 'Debian'
+    - geerlingguy.php
+    - role_under_test
diff --git a/provisioning/roles/geerlingguy.php-tideways/tests/tideways-test.php b/provisioning/roles/geerlingguy.php-tideways/tests/tideways-test.php
new file mode 100644
index 000000000..e544d5f94
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-tideways/tests/tideways-test.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * @file
+ * Test if Tideways is available and working.
+ */
+
+$tideways_root_dir = '/usr/share/php';
+$success = TRUE;
+
+tideways_enable();
+$data = tideways_disable();
+
+if (isset($data['main()==>tideways_disable'])) {
+  print "Tideways profiling working.\r\n";
+}
+else {
+  print "Tideways profiling not working.\r\n";
+  $success = FALSE;
+}
+
+include $xhprof_root_dir . '/xhprof_lib/utils/xhprof_lib.php';
+include $xhprof_root_dir . '/xhprof_lib/utils/xhprof_runs.php';
+
+if (!$success) {
+  exit(1);
+}
diff --git a/provisioning/roles/geerlingguy.php-tideways/vars/Debian.yml b/provisioning/roles/geerlingguy.php-tideways/vars/Debian.yml
new file mode 100644
index 000000000..ce91a6ebb
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-tideways/vars/Debian.yml
@@ -0,0 +1,3 @@
+---
+__php_tideways_module_path: /usr/lib/php7.0/modules
+__php_tideways_config_filename: 20-tideways.ini
diff --git a/provisioning/roles/geerlingguy.php-tideways/vars/RedHat.yml b/provisioning/roles/geerlingguy.php-tideways/vars/RedHat.yml
new file mode 100644
index 000000000..8952e984c
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-tideways/vars/RedHat.yml
@@ -0,0 +1,3 @@
+---
+__php_tideways_module_path: /usr/lib64/php/modules
+__php_tideways_config_filename: tideways.ini

From f7955c155defcd0f87c9c1c0ddf773c6de2e0242 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 14 Jan 2017 00:14:21 -0600
Subject: [PATCH 0580/1273] Add documentation on use of Tideways with the
 XHProf module.

---
 docs/extras/profile-code.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/docs/extras/profile-code.md b/docs/extras/profile-code.md
index d0ebe8ba0..23f1c686d 100644
--- a/docs/extras/profile-code.md
+++ b/docs/extras/profile-code.md
@@ -49,9 +49,15 @@ The Devel module also *used* to provide XHProf configuration, and setting the op
 
 ## Tideways
 
-The XHProf PHP extension has barely been maintained since Facebook abandoned the project around 2015, so it's difficult to get it running under newer versions of PHP. Instead, you can use the Tideways PHP Extension along with either the Tideways module or the XHProf module to profile page views.
+The XHProf PHP extension has barely been maintained since Facebook abandoned the project around 2015, so it's difficult to get it running under newer versions of PHP. Instead, you can use the Tideways PHP Extension along with either the [Tideways](https://www.drupal.org/project/tideways) or [XHProf](https://www.drupal.org/project/xhprof) module to profile page views.
 
-TODO: Describe how to use.
+### Profiling with the Tideways module
+
+TODO.
+
+### Profiling with the XHProf Module
+
+To enable profiling of Drupal pages using the Tideways PHP Extension, follow the directions listed earlier for configuring the XHProf module, but choose the 'Tideways' extension under in the 'Profiling settings' section.
 
 ## XDebug
 

From 87fa7000813e69e252b4131b35f0ff2cf6852b1b Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 14 Jan 2017 00:21:14 -0600
Subject: [PATCH 0581/1273] Add note about Tideways module installation [ci
 skip]

---
 docs/extras/profile-code.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/extras/profile-code.md b/docs/extras/profile-code.md
index 23f1c686d..71b4b4fec 100644
--- a/docs/extras/profile-code.md
+++ b/docs/extras/profile-code.md
@@ -53,7 +53,7 @@ The XHProf PHP extension has barely been maintained since Facebook abandoned the
 
 ### Profiling with the Tideways module
 
-TODO.
+Instructions for profiling with the Tideways module will be added after the following issue is resolved: [Can't install latest dev release on 8.x](https://www.drupal.org/node/2843481).
 
 ### Profiling with the XHProf Module
 

From aca044a8133020df6f2d06590b4fd19759b4e0a0 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 14 Jan 2017 10:46:19 -0600
Subject: [PATCH 0582/1273] Upgrade Node.js role to latest version.

---
 provisioning/requirements.yml                  |  2 +-
 .../roles/geerlingguy.nodejs/.travis.yml       |  6 +++---
 .../roles/geerlingguy.nodejs/defaults/main.yml |  2 +-
 .../geerlingguy.nodejs/tasks/setup-RedHat.yml  | 18 ++++++++++++++++--
 .../roles/geerlingguy.nodejs/tests/test.yml    |  2 +-
 5 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 544758f9a..254f04566 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -38,7 +38,7 @@
 - src: geerlingguy.nginx
   version: 1.9.6
 - src: geerlingguy.nodejs
-  version: 3.3.1
+  version: 4.0.0
 - src: geerlingguy.php
   version: 3.4.4
 - src: geerlingguy.php-memcached
diff --git a/provisioning/roles/geerlingguy.nodejs/.travis.yml b/provisioning/roles/geerlingguy.nodejs/.travis.yml
index 12247fc93..07b5abaea 100644
--- a/provisioning/roles/geerlingguy.nodejs/.travis.yml
+++ b/provisioning/roles/geerlingguy.nodejs/.travis.yml
@@ -5,9 +5,9 @@ env:
   - distro: centos7
     init: /usr/lib/systemd/systemd
     run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-  # - distro: centos6
-  #   init: /sbin/init
-  #   run_opts: ""
+  - distro: centos6
+    init: /sbin/init
+    run_opts: ""
   - distro: ubuntu1604
     init: /lib/systemd/systemd
     run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
diff --git a/provisioning/roles/geerlingguy.nodejs/defaults/main.yml b/provisioning/roles/geerlingguy.nodejs/defaults/main.yml
index 9a2b39227..e792afef0 100644
--- a/provisioning/roles/geerlingguy.nodejs/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.nodejs/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
 # Set the version of Node.js to install ("0.10", "0.12", "4.x", "5.x", "6.x").
 # Version numbers from Nodesource: https://github.com/nodesource/distributions
-nodejs_version: "0.12"
+nodejs_version: "6.x"
 
 # The user for whom the npm packages will be installed.
 # nodejs_install_npm_user: username
diff --git a/provisioning/roles/geerlingguy.nodejs/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.nodejs/tasks/setup-RedHat.yml
index bccd7059b..ea6292b18 100644
--- a/provisioning/roles/geerlingguy.nodejs/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.nodejs/tasks/setup-RedHat.yml
@@ -9,15 +9,29 @@
     nodejs_rhel_rpm_dir: "pub"
   when: nodejs_version == '0.10'
 
-- name: Import Nodesource RPM key.
+- name: Import Nodesource RPM key (CentOS < 7).
+  rpm_key:
+    key: http://rpm.nodesource.com/pub/el/NODESOURCE-GPG-SIGNING-KEY-EL
+    state: present
+  when: ansible_distribution_major_version|int < 7
+
+- name: Import Nodesource RPM key (CentOS 7+)..
   rpm_key:
     key: https://rpm.nodesource.com/pub/el/NODESOURCE-GPG-SIGNING-KEY-EL
     state: present
+  when: ansible_distribution_major_version|int >= 7
+
+- name: Add Nodesource repositories for Node.js (CentOS < 7).
+  yum:
+    name: "http://rpm.nodesource.com/{{ nodejs_rhel_rpm_dir }}/el/{{ ansible_distribution_major_version }}/{{ ansible_architecture }}/nodesource-release-el{{ ansible_distribution_major_version }}-1.noarch.rpm"
+    state: present
+  when: ansible_distribution_major_version|int < 7
 
-- name: Add Nodesource repositories for Node.js.
+- name: Add Nodesource repositories for Node.js (CentOS 7+).
   yum:
     name: "https://rpm.nodesource.com/{{ nodejs_rhel_rpm_dir }}/el/{{ ansible_distribution_major_version }}/{{ ansible_architecture }}/nodesource-release-el{{ ansible_distribution_major_version }}-1.noarch.rpm"
     state: present
+  when: ansible_distribution_major_version|int >= 7
 
 - name: Ensure Node.js and npm are installed.
   yum: "name=nodejs-{{ nodejs_version[0] }}.* state=present enablerepo='epel,nodesource'"
diff --git a/provisioning/roles/geerlingguy.nodejs/tests/test.yml b/provisioning/roles/geerlingguy.nodejs/tests/test.yml
index 516962cf9..6e0a90942 100644
--- a/provisioning/roles/geerlingguy.nodejs/tests/test.yml
+++ b/provisioning/roles/geerlingguy.nodejs/tests/test.yml
@@ -14,7 +14,7 @@
 
   pre_tasks:
     - name: Update apt cache.
-      apt: update_cache=yes
+      apt: update_cache=yes cache_valid_time=600
       when: ansible_os_family == 'Debian'
 
   roles:

From 2d8cf7c659ae5eb52d609ecf14cd43873f01a2ea Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 14 Jan 2017 20:38:22 -0600
Subject: [PATCH 0583/1273] Update Tideways role to 1.1.0 with XHProf UI.

---
 README.md                                     |  3 +-
 docs/extras/profile-code.md                   | 10 +++--
 provisioning/requirements.yml                 |  4 +-
 .../roles/geerlingguy.php-tideways/README.md  | 17 ++++++++
 .../defaults/main.yml                         |  9 ++++
 .../geerlingguy.php-tideways/tasks/main.yml   |  3 +-
 .../geerlingguy.php-tideways/tasks/xhprof.yml | 42 +++++++++++++++++++
 .../tests/tideways-test.php                   | 23 ++++++++++
 .../roles/geerlingguy.php-xhprof/README.md    |  2 +
 9 files changed, 104 insertions(+), 9 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.php-tideways/tasks/xhprof.yml

diff --git a/README.md b/README.md
index 3a6b86f30..0a8035064 100644
--- a/README.md
+++ b/README.md
@@ -24,8 +24,7 @@ It will install the following on an Ubuntu 16.04 (by default) linux VM:
     - Memcached
     - Redis
     - SQLite
-    - XHProf, for profiling your code
-    - Blackfire, for profiling your code
+    - Blackfire, XHProf, or Tideways for profiling your code
     - XDebug, for debugging your code
     - Adminer, for accessing databases directly
     - Pimp my Log, for easy viewing of log files
diff --git a/docs/extras/profile-code.md b/docs/extras/profile-code.md
index 71b4b4fec..321ce95b3 100644
--- a/docs/extras/profile-code.md
+++ b/docs/extras/profile-code.md
@@ -49,16 +49,18 @@ The Devel module also *used* to provide XHProf configuration, and setting the op
 
 ## Tideways
 
-The XHProf PHP extension has barely been maintained since Facebook abandoned the project around 2015, so it's difficult to get it running under newer versions of PHP. Instead, you can use the Tideways PHP Extension along with either the [Tideways](https://www.drupal.org/project/tideways) or [XHProf](https://www.drupal.org/project/xhprof) module to profile page views.
+The XHProf PHP extension has barely been maintained since Facebook abandoned the project around 2015, so it's difficult to get it running under newer versions of PHP.
 
-### Profiling with the Tideways module
-
-Instructions for profiling with the Tideways module will be added after the following issue is resolved: [Can't install latest dev release on 8.x](https://www.drupal.org/node/2843481).
+The Tideways PHP Extension is a well-maintained fork of the XHProf code and works with either the [XHProf](https://www.drupal.org/project/xhprof) or [Tideways](https://www.drupal.org/project/tideways) module to profile page views.
 
 ### Profiling with the XHProf Module
 
 To enable profiling of Drupal pages using the Tideways PHP Extension, follow the directions listed earlier for configuring the XHProf module, but choose the 'Tideways' extension under in the 'Profiling settings' section.
 
+### Profiling with the Tideways module
+
+Instructions for profiling with the Tideways module through the [tideways.io](https://tideways.io) service will be added after the following issue is resolved: [Can't install latest dev release on 8.x](https://www.drupal.org/node/2843481).
+
 ## XDebug
 
 [XDebug](https://xdebug.org/) is a debugger and profiler for PHP. While most people use it only for debugging purposes, you can also use it for profiling. It's not as commonly used for profiling as either Blackfire or XHProf, but it works!
diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 254f04566..3806ce062 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -52,11 +52,11 @@
 - src: geerlingguy.php-redis
   version: 3.1.0
 - src: geerlingguy.php-tideways
-  version: 1.0.0
+  version: 1.1.0
 - src: geerlingguy.php-xdebug
   version: 2.3.1
 - src: geerlingguy.php-xhprof
-  version: 2.2.1
+  version: 2.2.2
 - src: geerlingguy.pimpmylog
   version: 1.0.2
 - src: geerlingguy.postfix
diff --git a/provisioning/roles/geerlingguy.php-tideways/README.md b/provisioning/roles/geerlingguy.php-tideways/README.md
index bde319ce4..fb1cc5432 100644
--- a/provisioning/roles/geerlingguy.php-tideways/README.md
+++ b/provisioning/roles/geerlingguy.php-tideways/README.md
@@ -25,6 +25,23 @@ The URL from which Tideways will be downloaded.
 
 If you use the Tideways UI, set this variable to your API key. Otherwise the extension can be used along with the XHProf UI to view profiles.
 
+    tideways_install_xhprof_ui: yes
+
+Tideways data-format is 100% compatible with XHProf so you can use the XHProf UI to browse profiles reports and the `XHProfRuns_Default` class to write the profile data to disk. If you use the Tideways UI, set this variable to `no`.
+
+    xhprof_download_url: https://github.com/phacility/xhprof/archive/master.tar.gz
+    xhprof_download_folder_name: xhprof-master
+
+The URL from which XHProf will be downloaded.
+
+    php_xhprof_lib_dir: /usr/share/php/xhprof_lib
+
+Directory where the XHProf PHP library is stored.
+
+    php_xhprof_html_dir: /usr/share/php/xhprof_html
+
+Directory where the XHProf UI is stored.
+
 ## Dependencies
 
   - geerlingguy.php
diff --git a/provisioning/roles/geerlingguy.php-tideways/defaults/main.yml b/provisioning/roles/geerlingguy.php-tideways/defaults/main.yml
index 15d8730a4..e9c945b39 100644
--- a/provisioning/roles/geerlingguy.php-tideways/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.php-tideways/defaults/main.yml
@@ -7,3 +7,12 @@ tideways_download_folder_name: php-profiler-extension-master
 # If you use the Tideways UI, set this variable to your API key. Otherwise the
 # extension can be used along with the XHProf UI to view profiles.
 tideways_api_key: ''
+
+# XHProf UI
+tideways_install_xhprof_ui: yes
+
+__tideways_xhprof_download_url: https://github.com/phacility/xhprof/archive/master.tar.gz
+__tideways_xhprof_download_folder_name: xhprof-master
+
+__php_xhprof_lib_dir: /usr/share/php/xhprof_lib
+__php_xhprof_html_dir: /usr/share/php/xhprof_html
diff --git a/provisioning/roles/geerlingguy.php-tideways/tasks/main.yml b/provisioning/roles/geerlingguy.php-tideways/tasks/main.yml
index 47fed98d0..c353f9806 100644
--- a/provisioning/roles/geerlingguy.php-tideways/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php-tideways/tasks/main.yml
@@ -19,7 +19,6 @@
     - make
     - gcc
     - unzip
-    - graphviz
 
 - name: Download and untar Tideways.
   unarchive:
@@ -59,3 +58,5 @@
 # $ cp Tideways.php /path/to/php/lib
 
 - include: configure.yml
+- include: xhprof.yml
+  when: tideways_install_xhprof_ui
diff --git a/provisioning/roles/geerlingguy.php-tideways/tasks/xhprof.yml b/provisioning/roles/geerlingguy.php-tideways/tasks/xhprof.yml
new file mode 100644
index 000000000..919b3d5d6
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-tideways/tasks/xhprof.yml
@@ -0,0 +1,42 @@
+- name: Define xhprof_download_url.
+  set_fact:
+    xhprof_download_url: "{{ __tideways_xhprof_download_url }}"
+  when: xhprof_download_url is not defined
+
+- name: Define xhprof_download_folder_name.
+  set_fact:
+    xhprof_download_folder_name: "{{ __tideways_xhprof_download_folder_name }}"
+  when: xhprof_download_folder_name is not defined
+
+- name: Define php_xhprof_lib_dir.
+  set_fact:
+    php_xhprof_lib_dir: "{{ __php_xhprof_lib_dir }}"
+  when: php_xhprof_lib_dir is not defined
+
+- name: Define php_xhprof_html_dir.
+  set_fact:
+    php_xhprof_html_dir: "{{ __php_xhprof_html_dir }}"
+  when: php_xhprof_html_dir is not defined
+
+- name: Ensure dependencies for the XHProf UI are present.
+  package: "name={{ item }} state=installed"
+  with_items:
+    - graphviz
+
+- name: Download and untar XHProf.
+  unarchive:
+    src: "{{ xhprof_download_url }}"
+    dest: "{{ workspace }}"
+    copy: no
+    creates: "{{ workspace }}/{{ xhprof_download_folder_name }}"
+
+- name: Move XHProf PHP library into place.
+  shell: >
+    cp -r {{ workspace }}/{{ xhprof_download_folder_name }}/xhprof_lib {{ php_xhprof_lib_dir }}
+    creates={{ php_xhprof_lib_dir }}/utils/xhprof_lib.php
+
+- name: Move XHProf UI into place.
+  shell: >
+    cp -r {{ workspace }}/{{ xhprof_download_folder_name }}/xhprof_html {{ php_xhprof_html_dir }}
+    creates={{ php_xhprof_html_dir }}/index.php
+- include: configure.yml
diff --git a/provisioning/roles/geerlingguy.php-tideways/tests/tideways-test.php b/provisioning/roles/geerlingguy.php-tideways/tests/tideways-test.php
index e544d5f94..712cce3ff 100644
--- a/provisioning/roles/geerlingguy.php-tideways/tests/tideways-test.php
+++ b/provisioning/roles/geerlingguy.php-tideways/tests/tideways-test.php
@@ -6,6 +6,7 @@
  */
 
 $tideways_root_dir = '/usr/share/php';
+$xhprof_root_dir = '/usr/share/php';
 $success = TRUE;
 
 tideways_enable();
@@ -22,6 +23,28 @@
 include $xhprof_root_dir . '/xhprof_lib/utils/xhprof_lib.php';
 include $xhprof_root_dir . '/xhprof_lib/utils/xhprof_runs.php';
 
+$output_dir = sys_get_temp_dir();
+$xhprof_runs = new XHProfRuns_Default($output_dir);
+$run_id = $xhprof_runs->save_run($data, 'xhprof_testing');
+$filename = "$output_dir/$run_id.xhprof_testing.xhprof";
+if (file_exists($filename)) {
+  print "XHProf PHP library writing to output directory.\r\n";
+}
+else {
+  print "XHProf PHP library not working.\r\n";
+  $success = FALSE;
+}
+ob_start();
+include $xhprof_root_dir . '/xhprof_html/index.php';
+$html = ob_get_clean();
+if (strpos($html, "?run=$run_id") !== FALSE) {
+  print "XHProf UI working.\r\n";
+}
+else {
+  print "XHProf UI not working.\r\n";
+  $success = FALSE;
+}
+
 if (!$success) {
   exit(1);
 }
diff --git a/provisioning/roles/geerlingguy.php-xhprof/README.md b/provisioning/roles/geerlingguy.php-xhprof/README.md
index 242aedeef..72a79e100 100644
--- a/provisioning/roles/geerlingguy.php-xhprof/README.md
+++ b/provisioning/roles/geerlingguy.php-xhprof/README.md
@@ -4,6 +4,8 @@
 
 Installs PHP [XHProf](http://php.net/manual/en/book.xhprof.php) on Linux servers.
 
+> **Note**: The XHProf extension has been on life support since Facebook abandoned active development around 2015. There is a better-maintained fork that works on the latest PHP versions called Tideways, and there's an Ansible role for it—please check out [`geerlingguy.php-tideways`](https://github.com/geerlingguy/ansible-role-php-tideways) if you need to support PHP versions later than 7.0.
+
 ## Requirements
 
 None.

From 5f094b7867a5a11d5ba0158d3cc7d992568adda6 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 19 Jan 2017 10:07:49 -0600
Subject: [PATCH 0584/1273] Fixes #1131: Fixes solr < 5 on Ubuntu 16, CentOS 7
 with Ansible 2.2.

---
 provisioning/requirements.yml                      |  2 +-
 .../roles/geerlingguy.solr/tasks/install-pre5.yml  | 13 +++++++++++++
 .../roles/geerlingguy.solr/templates/solr.unit.j2  | 14 ++++++++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 provisioning/roles/geerlingguy.solr/templates/solr.unit.j2

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 3806ce062..5e3954cbf 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -72,6 +72,6 @@
 - src: geerlingguy.security
   version: 1.5.0
 - src: geerlingguy.solr
-  version: 3.4.1
+  version: 3.4.2
 - src: geerlingguy.varnish
   version: 1.8.1
diff --git a/provisioning/roles/geerlingguy.solr/tasks/install-pre5.yml b/provisioning/roles/geerlingguy.solr/tasks/install-pre5.yml
index 623133b50..27e9b447a 100644
--- a/provisioning/roles/geerlingguy.solr/tasks/install-pre5.yml
+++ b/provisioning/roles/geerlingguy.solr/tasks/install-pre5.yml
@@ -68,3 +68,16 @@
 - name: Ensure daemon is installed (Debian).
   apt: name=daemon state=installed
   when: ansible_os_family == "Debian"
+
+- name: Copy solr systemd unit file into place (for systemd systems).
+  template:
+    src: solr.unit.j2
+    dest: /etc/systemd/system/solr.service
+    owner: root
+    group: root
+    mode: 0755
+  when: >
+    (ansible_distribution == 'Ubuntu' and ansible_distribution_version == '16.04') or
+    (ansible_distribution == 'Debian' and ansible_distribution_version|int >= 8) or
+    (ansible_distribution == 'CentOS' and ansible_distribution_version|int >= 7) or
+    (ansible_distribution == 'Fedora')
diff --git a/provisioning/roles/geerlingguy.solr/templates/solr.unit.j2 b/provisioning/roles/geerlingguy.solr/templates/solr.unit.j2
new file mode 100644
index 000000000..40ca34ab1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.solr/templates/solr.unit.j2
@@ -0,0 +1,14 @@
+[Unit]
+Description=Apache SOLR
+After=syslog.target network.target remote-fs.target nss-lookup.target
+
+[Service]
+PIDFile={{ solr_install_path }}/bin/solr-{{ solr_port }}.pid
+ExecStart={{ solr_install_path }}/bin/solr -e cloud -noprompt
+User=solr
+ExecReload=/bin/kill -s HUP $MAINPID
+ExecStop=/bin/kill -s QUIT $MAINPID
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target

From 8816614be8b41c67a6e628d15701cb9ef22e9298 Mon Sep 17 00:00:00 2001
From: Jimmy Ko <egkcyaaa@gmail.com>
Date: Fri, 20 Jan 2017 16:09:09 +0000
Subject: [PATCH 0585/1273] Create new solr collection instead of using the
 default one.

---
 examples/scripts/configure-solr.sh | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/examples/scripts/configure-solr.sh b/examples/scripts/configure-solr.sh
index df659e8b2..b5c6069e8 100755
--- a/examples/scripts/configure-solr.sh
+++ b/examples/scripts/configure-solr.sh
@@ -7,14 +7,15 @@
 # `solr` in the `installed_extras`, and is currently set up for the D7 versions
 # of Apache Solr Search or Search API Solr.
 
-SOLR_SETUP_COMPLETE_FILE=/etc/drupal_vm_solr_config_complete
+NAME="drupalvm"
+SOLR_SETUP_COMPLETE_FILE="/etc/drupal_vm_solr_config_complete_"$NAME
 
 # Search API Solr module.
 SOLR_DOWNLOAD="http://ftp.drupal.org/files/projects/search_api_solr-8.x-1.x-dev.tar.gz"
 SOLR_DOWNLOAD_DIR="/tmp"
 SOLR_MODULE_NAME="search_api_solr"
 SOLR_VERSION="5.x"
-SOLR_CORE_PATH="/var/solr/data/collection1"
+SOLR_CORE_PATH="/var/solr/data/"$NAME
 
 # Check to see if we've already performed this setup.
 if [ ! -e "$SOLR_SETUP_COMPLETE_FILE" ]; then
@@ -22,14 +23,11 @@ if [ ! -e "$SOLR_SETUP_COMPLETE_FILE" ]; then
   wget -qO- $SOLR_DOWNLOAD | tar xvz -C $SOLR_DOWNLOAD_DIR
 
   # Copy the Solr configuration into place over the default `collection1` core.
-  sudo cp -a $SOLR_DOWNLOAD_DIR/$SOLR_MODULE_NAME/solr-conf/$SOLR_VERSION/. $SOLR_CORE_PATH/conf/
+  sudo su - solr -c "/opt/solr/bin/solr create -c $NAME -d $SOLR_DOWNLOAD_DIR/$SOLR_MODULE_NAME/solr-conf/$SOLR_VERSION/"
 
   # Adjust the autoCommit time so index changes are committed in 1s.
   sudo sed -i 's/\(<maxTime>\)\([^<]*\)\(<[^>]*\)/\11000\3/g' $SOLR_CORE_PATH/conf/solrconfig.xml
 
-  # Fix file permissions.
-  sudo chown -R solr:solr $SOLR_CORE_PATH/conf
-
   # Restart Apache Solr.
   sudo service solr restart
 

From b048ef8ed39742f206a2f70faadfd5194d364ef5 Mon Sep 17 00:00:00 2001
From: Jimmy Ko <egkcyaaa@gmail.com>
Date: Sat, 21 Jan 2017 01:00:48 +0000
Subject: [PATCH 0586/1273] Change the default name to d8.

d8 is the default of apache_api_solr module.
---
 examples/scripts/configure-solr.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/scripts/configure-solr.sh b/examples/scripts/configure-solr.sh
index b5c6069e8..c554ad324 100755
--- a/examples/scripts/configure-solr.sh
+++ b/examples/scripts/configure-solr.sh
@@ -7,7 +7,7 @@
 # `solr` in the `installed_extras`, and is currently set up for the D7 versions
 # of Apache Solr Search or Search API Solr.
 
-NAME="drupalvm"
+NAME="d8"
 SOLR_SETUP_COMPLETE_FILE="/etc/drupal_vm_solr_config_complete_"$NAME
 
 # Search API Solr module.

From 824fd62d19ba93ed373c14847c88b4ec2c584654 Mon Sep 17 00:00:00 2001
From: Jimmy Ko <egkcyaaa@gmail.com>
Date: Sat, 21 Jan 2017 01:03:49 +0000
Subject: [PATCH 0587/1273] Update comment for new code.

---
 examples/scripts/configure-solr.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/scripts/configure-solr.sh b/examples/scripts/configure-solr.sh
index c554ad324..12dd408d0 100755
--- a/examples/scripts/configure-solr.sh
+++ b/examples/scripts/configure-solr.sh
@@ -22,7 +22,7 @@ if [ ! -e "$SOLR_SETUP_COMPLETE_FILE" ]; then
   # Download and expand the Solr module.
   wget -qO- $SOLR_DOWNLOAD | tar xvz -C $SOLR_DOWNLOAD_DIR
 
-  # Copy the Solr configuration into place over the default `collection1` core.
+  # Copy new Solr collection core with the Solr configuration provided by module.
   sudo su - solr -c "/opt/solr/bin/solr create -c $NAME -d $SOLR_DOWNLOAD_DIR/$SOLR_MODULE_NAME/solr-conf/$SOLR_VERSION/"
 
   # Adjust the autoCommit time so index changes are committed in 1s.

From 7c4d1c0e57121b5de5d38055cb3c91b5845fea9e Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 22 Jan 2017 14:55:38 -0600
Subject: [PATCH 0588/1273] Fixes #1138: Use geerlingguy.firewall role's
 UFW/Firewalld disabling capability.

---
 default.config.yml                                 |  2 ++
 provisioning/requirements.yml                      |  2 +-
 provisioning/roles/geerlingguy.firewall/README.md  |  2 +-
 .../roles/geerlingguy.firewall/defaults/main.yml   |  4 ++++
 .../tasks/disable-other-firewalls.yml              | 14 ++++++++++++++
 .../roles/geerlingguy.firewall/tasks/main.yml      |  3 +++
 provisioning/tasks/init-debian.yml                 |  4 ----
 tests/config.yml                                   |  5 +++--
 8 files changed, 28 insertions(+), 8 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.firewall/tasks/disable-other-firewalls.yml

diff --git a/default.config.yml b/default.config.yml
index 1125a333e..ef61c425b 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -236,6 +236,8 @@ firewall_allowed_tcp_ports:
   - "8983"
   - "9200"
 firewall_log_dropped_packets: false
+firewall_disable_firewalld: true
+firewall_disable_ufw: true
 
 # PHP Configuration. Currently-supported versions: 5.6, 7.0, 7.1.
 # See version-specific notes: http://docs.drupalvm.com/en/latest/other/php/
diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 5e3954cbf..7346e87e4 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -24,7 +24,7 @@
 - src: geerlingguy.elasticsearch
   version: 2.1.3
 - src: geerlingguy.firewall
-  version: 2.0.2
+  version: 2.1.0
 - src: geerlingguy.git
   version: 1.2.1
 - src: geerlingguy.java
diff --git a/provisioning/roles/geerlingguy.firewall/README.md b/provisioning/roles/geerlingguy.firewall/README.md
index 80c86b57b..d6668c950 100644
--- a/provisioning/roles/geerlingguy.firewall/README.md
+++ b/provisioning/roles/geerlingguy.firewall/README.md
@@ -80,4 +80,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.firewall/defaults/main.yml b/provisioning/roles/geerlingguy.firewall/defaults/main.yml
index 103dacd0f..e7bad1982 100644
--- a/provisioning/roles/geerlingguy.firewall/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.firewall/defaults/main.yml
@@ -10,3 +10,7 @@ firewall_forwarded_udp_ports: []
 firewall_additional_rules: []
 firewall_ip6_additional_rules: []
 firewall_log_dropped_packets: true
+
+# Set to true to ensure other firewall management software is disabled.
+firewall_disable_firewalld: false
+firewall_disable_ufw: false
diff --git a/provisioning/roles/geerlingguy.firewall/tasks/disable-other-firewalls.yml b/provisioning/roles/geerlingguy.firewall/tasks/disable-other-firewalls.yml
new file mode 100644
index 000000000..3c4f5cabd
--- /dev/null
+++ b/provisioning/roles/geerlingguy.firewall/tasks/disable-other-firewalls.yml
@@ -0,0 +1,14 @@
+---
+- name: Disable the firewalld service (on RHEL, if configured).
+  service:
+    name: firewalld
+    state: stopped
+    enabled: no
+  when: ansible_os_family == "RedHat" and firewall_disable_firewalld
+
+- name: Disable the ufw firewall (on Ubuntu, if configured).
+  service:
+    name: ufw
+    state: stopped
+    enabled: no
+  when: ansible_distribution == "Ubuntu" and firewall_disable_ufw
diff --git a/provisioning/roles/geerlingguy.firewall/tasks/main.yml b/provisioning/roles/geerlingguy.firewall/tasks/main.yml
index b548b7180..04f3d4f71 100644
--- a/provisioning/roles/geerlingguy.firewall/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.firewall/tasks/main.yml
@@ -39,3 +39,6 @@
 
 - name: Ensure the firewall is enabled and will start on boot.
   service: name=firewall state=started enabled=yes
+
+- include: disable-other-firewalls.yml
+  when: firewall_disable_firewalld or firewall_disable_ufw
diff --git a/provisioning/tasks/init-debian.yml b/provisioning/tasks/init-debian.yml
index 43f02bb1b..0fc4bae7f 100644
--- a/provisioning/tasks/init-debian.yml
+++ b/provisioning/tasks/init-debian.yml
@@ -17,10 +17,6 @@
     content: "{{ hostname_fqdn }}\n"
     dest: /etc/mailname
 
-- name: Disable the ufw firewall (since we use a simple iptables firewall).
-  service: name=ufw state=stopped
-  when: ansible_distribution == "Ubuntu" and {{ drupalvm_disable_ufw_firewall | default(true) }}
-
 - name: Add repository for Apache 2.4.9+ on Ubuntu 12 and 14.
   apt_repository: repo='ppa:ondrej/apache2'
   when: >
diff --git a/tests/config.yml b/tests/config.yml
index 754649ee5..30a1a1ff5 100644
--- a/tests/config.yml
+++ b/tests/config.yml
@@ -2,5 +2,6 @@
 # Update the composer_home_path for global installs.
 composer_home_path: "/{{ drupalvm_user }}/.composer"
 
-# Don't run the 'disable ufw firewall' task in tests.
-drupalvm_disable_ufw_firewall: false
+# Don't run the 'disable firewall' tasks in tests.
+firewall_disable_firewalld: false
+firewall_disable_ufw: false

From 79af0f42b34fcd6d2580731bcd4c83854d084250 Mon Sep 17 00:00:00 2001
From: Jimmy Ko <egkcyaaa@gmail.com>
Date: Mon, 23 Jan 2017 01:53:48 +0000
Subject: [PATCH 0589/1273] Move $NAME inside the double quotes.

---
 examples/scripts/configure-solr.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/scripts/configure-solr.sh b/examples/scripts/configure-solr.sh
index 12dd408d0..f3956964e 100755
--- a/examples/scripts/configure-solr.sh
+++ b/examples/scripts/configure-solr.sh
@@ -8,14 +8,14 @@
 # of Apache Solr Search or Search API Solr.
 
 NAME="d8"
-SOLR_SETUP_COMPLETE_FILE="/etc/drupal_vm_solr_config_complete_"$NAME
+SOLR_SETUP_COMPLETE_FILE="/etc/drupal_vm_solr_config_complete_$NAME"
 
 # Search API Solr module.
 SOLR_DOWNLOAD="http://ftp.drupal.org/files/projects/search_api_solr-8.x-1.x-dev.tar.gz"
 SOLR_DOWNLOAD_DIR="/tmp"
 SOLR_MODULE_NAME="search_api_solr"
 SOLR_VERSION="5.x"
-SOLR_CORE_PATH="/var/solr/data/"$NAME
+SOLR_CORE_PATH="/var/solr/data/$NAME"
 
 # Check to see if we've already performed this setup.
 if [ ! -e "$SOLR_SETUP_COMPLETE_FILE" ]; then

From ece083bda47ce99f502517c72bac6fa162251aa5 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 22 Jan 2017 20:12:32 -0600
Subject: [PATCH 0590/1273] PR #1134 follow-up: Use  instead of .

---
 examples/scripts/configure-solr.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/scripts/configure-solr.sh b/examples/scripts/configure-solr.sh
index f3956964e..5c65b8d10 100755
--- a/examples/scripts/configure-solr.sh
+++ b/examples/scripts/configure-solr.sh
@@ -7,15 +7,15 @@
 # `solr` in the `installed_extras`, and is currently set up for the D7 versions
 # of Apache Solr Search or Search API Solr.
 
-NAME="d8"
-SOLR_SETUP_COMPLETE_FILE="/etc/drupal_vm_solr_config_complete_$NAME"
+SOLR_CORE_NAME="d8"
+SOLR_SETUP_COMPLETE_FILE="/etc/drupal_vm_solr_config_complete_$SOLR_CORE_NAME"
 
 # Search API Solr module.
 SOLR_DOWNLOAD="http://ftp.drupal.org/files/projects/search_api_solr-8.x-1.x-dev.tar.gz"
 SOLR_DOWNLOAD_DIR="/tmp"
 SOLR_MODULE_NAME="search_api_solr"
 SOLR_VERSION="5.x"
-SOLR_CORE_PATH="/var/solr/data/$NAME"
+SOLR_CORE_PATH="/var/solr/data/$SOLR_CORE_NAME"
 
 # Check to see if we've already performed this setup.
 if [ ! -e "$SOLR_SETUP_COMPLETE_FILE" ]; then
@@ -23,7 +23,7 @@ if [ ! -e "$SOLR_SETUP_COMPLETE_FILE" ]; then
   wget -qO- $SOLR_DOWNLOAD | tar xvz -C $SOLR_DOWNLOAD_DIR
 
   # Copy new Solr collection core with the Solr configuration provided by module.
-  sudo su - solr -c "/opt/solr/bin/solr create -c $NAME -d $SOLR_DOWNLOAD_DIR/$SOLR_MODULE_NAME/solr-conf/$SOLR_VERSION/"
+  sudo su - solr -c "/opt/solr/bin/solr create -c $SOLR_CORE_NAME -d $SOLR_DOWNLOAD_DIR/$SOLR_MODULE_NAME/solr-conf/$SOLR_VERSION/"
 
   # Adjust the autoCommit time so index changes are committed in 1s.
   sudo sed -i 's/\(<maxTime>\)\([^<]*\)\(<[^>]*\)/\11000\3/g' $SOLR_CORE_PATH/conf/solrconfig.xml

From 5906155c997db7417cada259a99457d5166f98ca Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 25 Jan 2017 14:45:51 -0600
Subject: [PATCH 0591/1273] Update Nginx role to latest version.

---
 provisioning/requirements.yml                               | 2 +-
 provisioning/roles/geerlingguy.nginx/README.md              | 6 +++++-
 provisioning/roles/geerlingguy.nginx/defaults/main.yml      | 3 +++
 provisioning/roles/geerlingguy.nginx/tasks/setup-RedHat.yml | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 7346e87e4..974d33fc1 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -36,7 +36,7 @@
 - src: geerlingguy.mysql
   version: 2.5.0
 - src: geerlingguy.nginx
-  version: 1.9.6
+  version: 1.9.7
 - src: geerlingguy.nodejs
   version: 4.0.0
 - src: geerlingguy.php
diff --git a/provisioning/roles/geerlingguy.nginx/README.md b/provisioning/roles/geerlingguy.nginx/README.md
index 9bfcfeb4d..ff8707bda 100644
--- a/provisioning/roles/geerlingguy.nginx/README.md
+++ b/provisioning/roles/geerlingguy.nginx/README.md
@@ -109,6 +109,10 @@ Extra lines to be inserted in the top-level `http` block in `nginx.conf`. The va
 
 (For Ubuntu only) Allows you to use the official Nginx PPA instead of the system's package. You can set the version to `stable` or `development`.
 
+    nginx_yum_repo_enabled: true
+
+(For RedHat/CentOS only) Set this to `false` to disable the installation of the `nginx` yum repository. This could be necessary if you want the default OS stable packages, or if you use Satellite.
+
 ## Dependencies
 
 None.
@@ -125,4 +129,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.nginx/defaults/main.yml b/provisioning/roles/geerlingguy.nginx/defaults/main.yml
index 34c43ef98..f5b602ac0 100644
--- a/provisioning/roles/geerlingguy.nginx/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.nginx/defaults/main.yml
@@ -2,6 +2,9 @@
 # Used only for Debian/Ubuntu installation, as the -t option for apt.
 nginx_default_release: ""
 
+# Used only for Redhat installation, enables source Nginx repo.
+nginx_yum_repo_enabled: true
+
 # Use the official Nginx PPA for Ubuntu, and the version to use if so.
 nginx_ppa_use: false
 nginx_ppa_version: stable
diff --git a/provisioning/roles/geerlingguy.nginx/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.nginx/tasks/setup-RedHat.yml
index a1563b79c..21f3c73f2 100644
--- a/provisioning/roles/geerlingguy.nginx/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.nginx/tasks/setup-RedHat.yml
@@ -6,9 +6,9 @@
     owner: root
     group: root
     mode: 0644
+  when: nginx_yum_repo_enabled
 
 - name: Ensure nginx is installed.
   yum:
     name: "{{ nginx_package_name }}"
     state: installed
-    enablerepo: nginx

From 4e17569c705a8735690de1b9a4f1d23d4277a3d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 29 Dec 2016 14:12:52 -0500
Subject: [PATCH 0592/1273] Change all the docs!

---
 docs/{other => configurations}/base-os.md     |  0
 .../databases-mariadb.md}                     |  2 +-
 .../databases-mysql.md}                       |  2 +-
 .../databases-postgresql.md}                  |  2 +-
 docs/{other => configurations}/php.md         |  0
 docs/configurations/webservers-apache.md      | 37 ++++++++
 docs/configurations/webservers-nginx.md       | 41 +++++++++
 .../composer-dependency.md}                   | 12 +--
 docs/deployment/composer-package.md           | 18 ++++
 docs/deployment/composer.md                   | 39 +--------
 docs/deployment/drush-make.md                 |  4 +-
 docs/deployment/local-codebase.md             | 10 ++-
 docs/extending/ansible-args.md                | 23 +++++
 docs/{extras => extending}/scripts.md         |  4 +-
 .../vagrantfile.md}                           | 59 +------------
 docs/extras/adminer.md                        |  3 +
 docs/extras/blackfire.md                      | 23 +++++
 docs/extras/drupal-console.md                 |  2 +
 docs/extras/drush.md                          |  4 +-
 docs/extras/elasticsearch.md                  |  6 +-
 docs/extras/java.md                           |  4 +
 docs/extras/mailhog.md                        |  6 +-
 docs/extras/memcached.md                      | 17 ++++
 docs/extras/newrelic.md                       |  4 +-
 docs/extras/nodejs.md                         |  2 +
 docs/extras/pimpmylog.md                      |  6 +-
 docs/extras/profile-code.md                   | 66 --------------
 docs/extras/redis.md                          |  5 ++
 docs/extras/ruby.md                           | 15 ++++
 docs/extras/{behat.md => selenium.md}         |  2 +
 docs/extras/solr.md                           |  4 +-
 docs/extras/ssl.md                            | 82 -----------------
 docs/extras/tideways.md                       | 15 ++++
 docs/extras/upload-progress.md                |  3 +
 docs/extras/varnish.md                        |  4 +-
 docs/extras/xdebug.md                         | 16 +++-
 docs/extras/xhprof.md                         | 20 +++++
 docs/getting-started/configure-drupalvm.md    | 48 ++++++++++
 .../installation-linux.md}                    |  8 +-
 docs/getting-started/installation-macos.md    |  5 ++
 .../installation-windows.md}                  |  8 +-
 .../syncing-folders.md                        |  0
 docs/other/performance.md                     | 11 +++
 docs/other/production.md                      | 11 +--
 docs/other/webservers.md                      | 19 ----
 mkdocs.yml                                    | 87 ++++++++++++-------
 46 files changed, 421 insertions(+), 338 deletions(-)
 rename docs/{other => configurations}/base-os.md (100%)
 rename docs/{extras/mariadb.md => configurations/databases-mariadb.md} (99%)
 rename docs/{extras/mysql.md => configurations/databases-mysql.md} (81%)
 rename docs/{extras/postgresql.md => configurations/databases-postgresql.md} (68%)
 rename docs/{other => configurations}/php.md (100%)
 create mode 100644 docs/configurations/webservers-apache.md
 create mode 100644 docs/configurations/webservers-nginx.md
 rename docs/{other/drupalvm-composer-dependency.md => deployment/composer-dependency.md} (92%)
 create mode 100644 docs/deployment/composer-package.md
 create mode 100644 docs/extending/ansible-args.md
 rename docs/{extras => extending}/scripts.md (90%)
 rename docs/{other/overriding-configurations.md => extending/vagrantfile.md} (52%)
 create mode 100644 docs/extras/adminer.md
 create mode 100644 docs/extras/blackfire.md
 create mode 100644 docs/extras/java.md
 create mode 100644 docs/extras/memcached.md
 delete mode 100644 docs/extras/profile-code.md
 create mode 100644 docs/extras/redis.md
 create mode 100644 docs/extras/ruby.md
 rename docs/extras/{behat.md => selenium.md} (97%)
 delete mode 100644 docs/extras/ssl.md
 create mode 100644 docs/extras/tideways.md
 create mode 100644 docs/extras/upload-progress.md
 create mode 100644 docs/extras/xhprof.md
 create mode 100644 docs/getting-started/configure-drupalvm.md
 rename docs/{other/linux.md => getting-started/installation-linux.md} (93%)
 create mode 100644 docs/getting-started/installation-macos.md
 rename docs/{other/windows.md => getting-started/installation-windows.md} (95%)
 rename docs/{extras => getting-started}/syncing-folders.md (100%)
 create mode 100644 docs/other/performance.md
 delete mode 100644 docs/other/webservers.md

diff --git a/docs/other/base-os.md b/docs/configurations/base-os.md
similarity index 100%
rename from docs/other/base-os.md
rename to docs/configurations/base-os.md
diff --git a/docs/extras/mariadb.md b/docs/configurations/databases-mariadb.md
similarity index 99%
rename from docs/extras/mariadb.md
rename to docs/configurations/databases-mariadb.md
index 44ab0a268..b24a475be 100644
--- a/docs/extras/mariadb.md
+++ b/docs/configurations/databases-mariadb.md
@@ -25,4 +25,4 @@ mysql_socket: /var/lib/mysql/mysql.sock
 mysql_log_error: /var/log/mariadb/mariadb.log
 mysql_syslog_tag: mariadb
 mysql_pid_file: /var/run/mariadb/mariadb.pid
-```
\ No newline at end of file
+```
diff --git a/docs/extras/mysql.md b/docs/configurations/databases-mysql.md
similarity index 81%
rename from docs/extras/mysql.md
rename to docs/configurations/databases-mysql.md
index 73668dd9b..6b9cc3642 100644
--- a/docs/extras/mysql.md
+++ b/docs/configurations/databases-mysql.md
@@ -2,7 +2,7 @@ By default, this VM is set up so you can manage MySQL databases on your own. The
 
 ## Connect using Adminer
 
-If you have `adminer` listed as one of the `installed_extras` inside `config.yml`, you can use Adminer's web-based interface to interact with databases. With Drupal VM running, visit `http://adminer.drupalvm.dev/`, and log in with `drupal` as the username and the password you set in `config.yml` (`drupal_db_password`). Leave the "Server" field blank. The "Database" field is optional.
+If you have `adminer` listed as one of the `installed_extras` inside `config.yml`, you can use Adminer's web-based interface to interact with databases. With Drupal VM running, visit [http://adminer.drupalvm.dev/](http://adminer.drupalvm.dev/), and log in with `drupal` as the username and the password you set in `config.yml` (`drupal_db_password`). Leave the "Server" field blank. The "Database" field is optional.
 
 More about how to use Adminer: [Adminer website](http://www.adminer.org/).
 
diff --git a/docs/extras/postgresql.md b/docs/configurations/databases-postgresql.md
similarity index 68%
rename from docs/extras/postgresql.md
rename to docs/configurations/databases-postgresql.md
index 68786bc93..823bda1d8 100644
--- a/docs/extras/postgresql.md
+++ b/docs/configurations/databases-postgresql.md
@@ -6,4 +6,4 @@ To switch from MySQL to PostgreSQL, switch the `drupalvm_database` setting in yo
 drupalvm_database: pgsql
 ```
 
-For more PostgreSQL configuration options, see the README included with the [`geerlingguy.postgresql`](https://galaxy.ansible.com/geerlingguy/postgresql/) Ansible role.
+For more PostgreSQL configuration options, see the [`geerlingguy.postgresql` Ansible role's README](https://github.com/geerlingguy/ansible-role-postgresql#readme).
diff --git a/docs/other/php.md b/docs/configurations/php.md
similarity index 100%
rename from docs/other/php.md
rename to docs/configurations/php.md
diff --git a/docs/configurations/webservers-apache.md b/docs/configurations/webservers-apache.md
new file mode 100644
index 000000000..fe59d72dc
--- /dev/null
+++ b/docs/configurations/webservers-apache.md
@@ -0,0 +1,37 @@
+Drupal VM's configuration works with multiple operating systems _and_ with multiple webservers. You can switch between Apache and Nginx (depending on which server you prefer) with ease. Apache is the webserver used out of the box.
+
+You have complete control over all aspects of Apache VirtualHosts using the `apache_vhosts` configuration. A few simple examples are shown in `default.config.yml`, but this configuration can be much more complex.
+
+See the examples included in the [`geerlingguy.apache` Ansible role's README](https://github.com/geerlingguy/ansible-role-apache#readme) for more info, as well as many other variables you can override to configure Apache exactly how you like it.
+
+## Enable SSH Support with Apache
+
+To enable SSL support for you virtual hosts you first need a certificate file. You can generate a self-signed certificate with a command like
+
+    openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout example.key -out example.crt
+
+_If you're using an actual production certificate you should of course **NOT** track it in git but transfer it to the VM before running `vagrant provision`_
+
+Add the following to your `config.yml`:
+
+```yaml
+apache_vhosts_ssl:
+  - servername: "{{ drupal_domain }}"
+    documentroot: "{{ drupal_core_path }}"
+    certificate_file: "/vagrant/example.crt"
+    certificate_key_file: "/vagrant/example.key"
+    extra_parameters: "{{ apache_vhost_php_fpm_parameters }}"
+```
+
+### Using Ubuntu's snakeoil certificate
+
+If you are using Ubuntu as your base OS and you want to get started quickly with a local development environment you can use the snakeoil certificate that is already generated.
+
+```yaml
+apache_vhosts_ssl:
+  - servername: "{{ drupal_domain }}"
+    documentroot: "{{ drupal_core_path }}"
+    certificate_file: "/etc/ssl/certs/ssl-cert-snakeoil.pem"
+    certificate_key_file: "/etc/ssl/private/ssl-cert-snakeoil.key"
+    extra_parameters: "{{ apache_vhost_php_fpm_parameters }}"
+```
diff --git a/docs/configurations/webservers-nginx.md b/docs/configurations/webservers-nginx.md
new file mode 100644
index 000000000..a4f98b42c
--- /dev/null
+++ b/docs/configurations/webservers-nginx.md
@@ -0,0 +1,41 @@
+To use Nginx instead of Apache, change the `drupalvm_webserver` variable inside your customized `config.yml`, from `apache` to `nginx`.
+
+Because Nginx server directives behave a little differently than Apache's VirtualHosts, Drupal VM includes a custom Drupal-optimized Nginx server block configuration, and you can control all the servers ('virtual hosts') Nginx will run using the `nginx_hosts` configuration. A few simple examples are shown in `default.config.yml`, but you have some extra flexibility if you need it. See the `nginx-vhost.conf.j2` template for more information.
+
+Also, see the examples included in the [`geerlingguy.nginx` Ansible role's README](https://github.com/geerlingguy/ansible-role-nginx#readme) for more info, as well as many other variables you can override to configure Nginx exactly how you like it.
+
+_Note: if you're using php-fpm, you may want to reflect your use of nginx by setting `php_fpm_pool_user` and `php_fpm_pool_group` in your `config.yml`._
+
+## Enable SSH Support with Nginx
+
+To enable SSL support for you virtual hosts you first need a certificate file. See the same section under the [Apache documentation](webservers-apache.md#enable-ssh-support-with-apache) for how to generate a self-signed certficiate.
+
+Modify your nginx host configuration by adding the following `extra_parameters` to the first entry in `nginx_hosts`:
+
+```yaml
+- server_name: "{{ drupal_domain }} www.{{ drupal_domain }}"
+  root: "{{ drupal_core_path }}"
+  is_php: true
+  extra_parameters: |
+        listen 443 ssl;
+        ssl_certificate     /vagrant/example.crt;
+        ssl_certificate_key /vagrant/example.key;
+        ssl_protocols       TLSv1.1 TLSv1.2;
+        ssl_ciphers         HIGH:!aNULL:!MD5;
+```
+
+### Using Ubuntu's snakeoil certificate
+
+If you are using Ubuntu as your base OS and you want to get started quickly with a local development environment you can use the snakeoil certificate that is already generated.
+
+```yaml
+- server_name: "{{ drupal_domain }} www.{{ drupal_domain }}"
+  root: "{{ drupal_core_path }}"
+  is_php: true
+  extra_parameters: |
+        listen 443 ssl;
+        ssl_certificate     /etc/ssl/certs/ssl-cert-snakeoil.pem;
+        ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key;
+        ssl_protocols       TLSv1.1 TLSv1.2;
+        ssl_ciphers         HIGH:!aNULL:!MD5;
+```
diff --git a/docs/other/drupalvm-composer-dependency.md b/docs/deployment/composer-dependency.md
similarity index 92%
rename from docs/other/drupalvm-composer-dependency.md
rename to docs/deployment/composer-dependency.md
index 02113678f..9e0f30e9e 100644
--- a/docs/other/drupalvm-composer-dependency.md
+++ b/docs/deployment/composer-dependency.md
@@ -10,9 +10,9 @@ composer require --dev geerlingguy/drupal-vm
 
 ### Setup your configuration files
 
-Add and configure the `config.yml` anywhere you like, in this example we place it in a `config/` directory. If you're using `build_makefile` this will be the default location Drupal VM looks for the `drupal.make.yml` file.
+Add and configure the `config.yml` anywhere you like, in this example we place it in a `config/` directory.
 
-_Note: This will be the directory where Drupal VM looks for other local configuration files as well. Such as [`local.config.yml` and `Vagrantfile.local`](overriding-configurations.md)._
+_Note: This will be the directory where Drupal VM looks for other local configuration files as well. Such as `build_makefile`, `local.config.yml` and `Vagrantfile.local`._
 
 ```
 ├── composer.json
@@ -29,7 +29,7 @@ _Note: This will be the directory where Drupal VM looks for other local configur
         └── drupal-vm/
 ```
 
-Change the build strategy to use your `composer.json` file by setting:
+Change the [build strategy to use your `composer.json`](composer.md#using-composer-when-drupal-vm-is-a-composer-dependency-itself) file by setting:
 
 ```yaml
 build_composer_project: false
@@ -41,7 +41,9 @@ drupal_core_path: "{{ drupal_composer_install_dir }}/docroot"
 
 If you intened to use the devel module, it must be added as a requirement to your `composer.json` file. Alternatively, if you do not intend to use it remove it from `drupal_enabled_modules` in your `config.yml` file:
 
-`drupal_enabled_modules: []`
+```yaml
+drupal_enabled_modules: []
+```
 
 If you're using `pre_provision_scripts` or `post_provision_scripts` you also need to adjust their paths to take into account the new directory structure. The examples used in `default.config.yml` assume the files are located in the Drupal VM directory. If you use relative paths you need to the ascend the directory tree as far as the project root, but using the `config_dir` variable you get the absolute path of where you `config.yml` is located.
 
@@ -101,7 +103,7 @@ vagrant up
 
 _Important: you should never issue `vagrant` commands through Drupal VM's own `Vagrantfile` from now on. If you do, it will create a secondary VM in that directory._
 
-## Drupal VM without composer
+## Drupal VM in a subdirectory without composer
 
 If you don't use `composer` in your project you can still download  Drupal VM (or add it as a git submodule) to any subdirectory in your project. As an example let's name that directory `box/`.
 
diff --git a/docs/deployment/composer-package.md b/docs/deployment/composer-package.md
new file mode 100644
index 000000000..6ec329d0a
--- /dev/null
+++ b/docs/deployment/composer-package.md
@@ -0,0 +1,18 @@
+Out of the box Drupal VM is configured to use `composer create-project` to build a Drupal 8 codebase.
+
+This is set up by the following settings in `config.yml`:
+
+  - Composer will build the project if `build_composer_project` is `true`, and `build_makefile` and `build_composer` are both `false`.
+  - The Composer package is defined by `drupal_composer_project_package`.
+  - Adjust the create-project CLI options in `drupal_composer_project_options` as well as add additional dependencies in `drupal_composer_dependencies`.
+  - Ensure that the webroot configured in the Composer package matches the one set in `drupal_core_path`. The default is set to `web/`.
+
+With [acquia/lightning-project](https://github.com/acquia/lightning-project) as an example your `config.yml` settings would be:
+
+```yaml
+drupal_composer_project_package: "acquia/lightning-project:^8.1.0"
+drupal_composer_project_options: "--prefer-dist --stability rc --no-interaction"
+drupal_core_path: "{{ drupal_composer_install_dir }}/docroot"
+```
+
+_Opting for composer based installs will most likely increase your VM's time to provision considerably. See the section on how to [improve composer build performance](../other/performance.md#improving-composer-build-performance) in the docs for how to improve it._
diff --git a/docs/deployment/composer.md b/docs/deployment/composer.md
index 3a53d1d43..cf9f38c0a 100644
--- a/docs/deployment/composer.md
+++ b/docs/deployment/composer.md
@@ -1,6 +1,4 @@
-Drupal VM is configured to use `composer create-project` to build a Drupal 8 codebase by default but supports building Drupal from a custom composer.json or [Drush make file](drush-make.md).
-
-## Using composer.json
+Drupal VM is configured to use `composer create-project` to build a Drupal 8 codebase by default but supports building Drupal from a custom composer.json as well.
 
 1. Copy `example.drupal.composer.json` to `drupal.composer.json` and modify it to your liking.
 2. Use the Composer build system by setting `build_composer: true` in your `config.yml` (make sure `build_makefile` and `build_composer_project` are set to `false`).
@@ -12,11 +10,9 @@ build_composer: true
 drupal_core_path: "{{ drupal_composer_install_dir }}/docroot"
 ```
 
-_The file set in `drupal_composer_path` (which defaults to `drupal.composer.json`) will be copied from your host computer into the VM's `drupal_composer_install_dir` and renamed `composer.json`. If you already have a composer.json within that directory, set `drupal_composer_path: false`._
-
-## Using Composer when [Drupal VM is a composer dependency itself](../other/drupalvm-composer-dependency.md)
+## Using Composer when [Drupal VM is a composer dependency itself](composer-dependency.md)
 
-In the scenario where you already have an existing `composer.json` in the root of your project, follow the usual steps for installing with a composer.json but instead of creating a `drupal.composer.json` file, disable the transfering of the file by setting `drupal_composer_path: false`, and change `drupal_composer_install_dir` to point to the the directory where it will be located. If `drupal_composer_path` is not truthy, Drupal VM assumes it already exists.
+In the scenario where you have an existing `composer.json` in the root of your project, follow the usual steps for installing with a composer.json but instead of creating a `drupal.composer.json` file, disable the transfering of the file by setting `drupal_composer_path: false`, and change `drupal_composer_install_dir` to point to the the directory where it will be located. If `drupal_composer_path` is not truthy, Drupal VM assumes it already exists.
 
 ```yaml
 build_composer_project: false
@@ -26,31 +22,4 @@ drupal_composer_install_dir: "/var/www/drupalvm"
 drupal_core_path: "{{ drupal_composer_install_dir }}/docroot"
 ```
 
-## Creating a project from a composer package: `composer create-project`
-
-This is the default Drupal VM build configuration, set up by the following settings in `config.yml`:
-
-  - Composer will build the project if `build_composer_project` is `true`, and `build_makefile` and `build_composer` are both `false`.
-  - The Composer package is defined by `drupal_composer_project_package`.
-  - Adjust the create-project CLI options in `drupal_composer_project_options` as well as add additional dependencies in `drupal_composer_dependencies`.
-  - Ensure that the webroot configured in the Composer package matches the one set in `drupal_core_path`. The default is set to `web/`.
-
-With [acquia/lightning-project](https://github.com/acquia/lightning-project) as an example your `config.yml` settings would be:
-
-```yaml
-drupal_composer_project_package: "acquia/lightning-project:^8.1.0"
-drupal_composer_project_options: "--prefer-dist --stability rc --no-interaction"
-drupal_core_path: "{{ drupal_composer_install_dir }}/docroot"
-```
-
-## Improving composer build performance
-
-Opting for composer based installs will most likely increase your VM's time to provision considerably.
-
-If you manage multiple VM's own your computer, you can use the [`vagrant-cachier` plugin](http://fgrehm.viewdocs.io/vagrant-cachier/) to share Composer's package cache across all VM's. The first build will be as slow as before but subsequent builds with the same `vagrant_box` (eg `geerlingguy/ubuntu1604`) will be much faster.
-
-Install the plugin on your host computer: `vagrant plugin install vagrant-cachier`.
-
-Drupal VM's `Vagrantfile` includes the appropriate `vagrant-cachier` configuration to cache Composer and apt dependencies.
-
-_You can also use this plugin to share other package manager caches. For more information read the [documentation](http://fgrehm.viewdocs.io/vagrant-cachier/usage/)._
+_Opting for composer based installs will most likely increase your VM's time to provision considerably. See the section on how to [improve composer build performance](../other/performance.md#improving-composer-build-performance) in the docs for how to improve it._
diff --git a/docs/deployment/drush-make.md b/docs/deployment/drush-make.md
index 7a167c17f..f7fce8a9c 100644
--- a/docs/deployment/drush-make.md
+++ b/docs/deployment/drush-make.md
@@ -1,6 +1,4 @@
-Drupal VM is configured to use Composer by default to build a Drupal site on the VM inside `/var/www/drupalvm/drupal/web` (in a folder that's synced to your local machine, so you can work with the Drupal codebase either locally or inside the VM).
-
-If you want to build a Drupal site using a [Drush make file](http://www.drush.org/en/master/make/) instead, set `build_composer_project: false`, `build_makefile: true` and either use the `example.drupal.make.yml` file as a base, or use your own Drush make file: just place it or symlink it into the root of the Drupal VM folder with the filename `drupal.make.yml`. You can also set a separate path to the makefile using the `drush_makefile_path` variable.
+If you want to build a Drupal site using a [Drush make file](http://www.drush.org/en/master/make/) instead of composer, set `build_composer_project: false`, `build_makefile: true` and either use the `example.drupal.make.yml` file as a base, or use your own Drush make file: just place it or symlink it into the root of the Drupal VM folder with the filename `drupal.make.yml`. You can also set a separate path to the makefile using the `drush_makefile_path` variable.
 
 ```yaml
 build_composer_project: false
diff --git a/docs/deployment/local-codebase.md b/docs/deployment/local-codebase.md
index 4f0e82f6f..607da6152 100644
--- a/docs/deployment/local-codebase.md
+++ b/docs/deployment/local-codebase.md
@@ -11,9 +11,11 @@ vagrant_synced_folders:
     type: nfs
 ```
 
+_If you have Drupal VM installed within your codebase, you can also set the `local_path` to a location relative to the `Vagrantfile`. This is the default setup in `default.config.yml`._
+
 ## Disable the Composer project build and site install
 
-Set all the `build_` variables and `install_site` to `false`:
+Set all the `build_*` variables and `install_site` to `false`:
 
 ```yaml
 build_makefile: false
@@ -39,13 +41,13 @@ This variable will be used for the document root of the webserver.
 
 By default the domain of your site will be `drupalvm.dev` but you can change it by setting `drupal_domain` to the domain of your choice:
 
-```
+```yaml
 drupal_domain: "local.my-drupal-site.com"
 ```
 
 If you prefer using your domain as the root of all extra packages installed, ie. `adminer`, `xhprof` and `pimpmylog`, set it as the value of `vagrant_hostname` instead.
 
-```
+```yaml
 vagrant_hostname: "my-drupal-site.com"
 drupal_domain: "{{ vagrant_hostname }}"
 ```
@@ -56,4 +58,4 @@ If you have your Drupal site configured to use a special database and/or user/pa
 
 ## Build the VM, import your database
 
-Run `vagrant up` to build the VM with your codebase synced into the proper location. Once the VM is created, you can [connect to the MySQL database](../extras/mysql.md) and import your site's database to the Drupal VM, or use a [command like `drush sql-sync`](../extras/drush.md#using-sql-sync) to copy a database from another server.
+Run `vagrant up` to build the VM with your codebase synced into the proper location. Once the VM is created, you can [connect to the MySQL database](../configurations/databases-mysql.md) and import your site's database to the Drupal VM, or use a [command like `drush sql-sync`](../extras/drush.md#using-sql-sync) to copy a database from another server.
diff --git a/docs/extending/ansible-args.md b/docs/extending/ansible-args.md
new file mode 100644
index 000000000..4d524aabe
--- /dev/null
+++ b/docs/extending/ansible-args.md
@@ -0,0 +1,23 @@
+## Passing arguments to ansible during a provision
+
+You can specify an additional argument to the `ansible-playbook` command by using the `DRUPALVM_ANSIBLE_ARGS` environment variable. This can be useful when debugging a task failure.
+
+_Currently this feature has two quirks. It's only possible to pass on a single argument. You should not quote a flag's value as you would normally do in the shell._
+
+Display verbose ansible output:
+
+```sh
+DRUPALVM_ANSIBLE_ARGS='--verbose' vagrant provision
+```
+
+Begin the provisioning at a particular task:
+
+```sh
+DRUPALVM_ANSIBLE_ARGS='--start-at-task=*post-provision shell*' vagrant provision
+```
+
+Override a config variable:
+
+```sh
+DRUPALVM_ANSIBLE_ARGS='--extra-vars=drupalvm_database=pgsql' vagrant provision
+```
diff --git a/docs/extras/scripts.md b/docs/extending/scripts.md
similarity index 90%
rename from docs/extras/scripts.md
rename to docs/extending/scripts.md
index c3c71cc45..af42cf40d 100644
--- a/docs/extras/scripts.md
+++ b/docs/extending/scripts.md
@@ -21,7 +21,7 @@ Place your pre and post provision scripts inside a `scripts` directory in the ro
 
 ## Ansible task files
 
-To use an extra ansible task file, configure the path to the file (relative to `provisioning/files/`) in `config.yml`:
+To use an extra ansible task file, configure the path to the file (relative to `provisioning/playbook.yml`) in `config.yml`:
 
 ```yaml
 pre_provision_tasks_dir: "../scripts/pre/*"
@@ -34,7 +34,7 @@ The files matched will run in alphabetical order, and as with shell scripts, pre
 
 ## Ansible playbooks
 
-Out of the box Drupal VM does not support running additional playbooks or adding your own roles but using [`Vagrantfile.local`](../other/overriding-configurations.md#extending-the-vagrantfile-with-vagrantfilelocal) you can add any number of additional provisioners to vagrant.
+Out of the box Drupal VM does not support running additional playbooks or adding your own roles but using [`Vagrantfile.local` you can add any number of additional provisioners to vagrant](vagrantfile.md).
 
 As an example you might have a `local.playbook.yml` with it's own dependencies defined in `local.requirements.yml`. Place both of these next to your `config.yml` and add the following `Vagrantfile.local`.
 
diff --git a/docs/other/overriding-configurations.md b/docs/extending/vagrantfile.md
similarity index 52%
rename from docs/other/overriding-configurations.md
rename to docs/extending/vagrantfile.md
index ac430a1d7..c7b96db7e 100644
--- a/docs/other/overriding-configurations.md
+++ b/docs/extending/vagrantfile.md
@@ -1,37 +1,4 @@
-## Overriding Drupal VM's `default.config.yml` with `config.yml`
-
-If available, Drupal VM will load a `config.yml` where you can override any of the defaults set in `default.config.yml`. Commonly this is a copy of `default.config.yml` with the values tweaked to your own project. For an easier upgrade path you would only set the values you are actually overriding.
-
-```yaml
-vagrant_box: geerlingguy/centos7
-vagrant_hostname: my-custom-site.dev
-vagrant_machine_name: my_custom_site
-```
-
-## Overriding variables with a `local.config.yml`
-
-If available, Drupal VM will also load a `local.config.yml` after having loaded the main `config.yml`. Using this file you can override variables previously defined in `config.yml`. For teams who are sharing a VM configuration, this is a good place to configure anything that's specific to your own environment.
-
-```yaml
-# Increase the memory available to your Drupal site.
-vagrant_memory: 1536
-php_memory_limit: "512M"
-
-# Override the synced folders to use rsync instead of NFS.
-vagrant_synced_folders:
-  - local_path: .
-    destination: /var/www/drupalvm
-    type: rsync
-    create: true
-```
-
-_Note: The merge of the variables in these two files is shallow, so if you want to override a single item in a list, you will need to re-define all items in that list._
-
-## Extending the `Vagrantfile` with `Vagrantfile.local`
-
-Out of the box Drupal VM supports having VirtualBox, Parallels as well as VMware as a provider. Besides these there are multitude of others available (for example `vagrant-aws`, `vagrant-digitalocean`).
-
-If you want to use an unsupported provider, or otherwise modify the vagrant configuration in a way that is not exposed by Drupal VM, you can create a `Vagrantfile.local` in the root directory of this project.
+Out of the box Drupal VM supports having VirtualBox, Parallels as well as VMware as a provider. Besides these there are multitude of others available (for example `vagrant-aws`, `vagrant-digitalocean`).  If you want to use an unsupported provider, or otherwise modify the vagrant configuration in a way that is not exposed by Drupal VM, you can create a `Vagrantfile.local` next to your `config.yml`.
 
 The file will be sourced at the end of the `Vagrant.configure` block so you will have access to Vagrant's `config.vm` object as well as the contents of the `config.yml` file within the `vconfig` hash.
 
@@ -106,27 +73,3 @@ end
 ```
 
 _For additional configuration options read [Vagrant Proxyconf's README](https://github.com/tmatilai/vagrant-proxyconf#readme)._
-
-## Passing arguments to ansible during a provision
-
-You can specify an additional argument to the `ansible-playbook` command by using the `DRUPALVM_ANSIBLE_ARGS` environment variable. This can be useful when debugging a task failure.
-
-_Currently this feature has two quirks. It's only possible to pass on a single argument. You should not quote a flag's value as you would normally do in the shell._
-
-Display verbose ansible output:
-
-```sh
-DRUPALVM_ANSIBLE_ARGS='--verbose' vagrant provision
-```
-
-Begin the provisioning at a particular task:
-
-```sh
-DRUPALVM_ANSIBLE_ARGS='--start-at-task=*post-provision shell*' vagrant provision
-```
-
-Override a config variable:
-
-```sh
-DRUPALVM_ANSIBLE_ARGS='--extra-vars=drupalvm_database=pgsql' vagrant provision
-```
diff --git a/docs/extras/adminer.md b/docs/extras/adminer.md
new file mode 100644
index 000000000..54392c568
--- /dev/null
+++ b/docs/extras/adminer.md
@@ -0,0 +1,3 @@
+If you have `adminer` listed as one of the `installed_extras` inside `config.yml`, you can use Adminer's web-based interface to interact with databases. With Drupal VM running, visit [http://adminer.drupalvm.dev/](http://adminer.drupalvm.dev/), and log in with `drupal` as the username and the password you set in `config.yml` (`drupal_db_password`). Leave the "Server" field blank. The "Database" field is optional.
+
+For a list of available role variables, see the [`geerlingguy.adminer` Ansible role's README](https://github.com/geerlingguy/ansible-role-adminer#readme).
diff --git a/docs/extras/blackfire.md b/docs/extras/blackfire.md
new file mode 100644
index 000000000..7f911959b
--- /dev/null
+++ b/docs/extras/blackfire.md
@@ -0,0 +1,23 @@
+[Blackfire.io](https://blackfire.io/) is a service that allows code profiling to be stored and analyzed via an online profile on the Blackfire.io website.
+
+It doesn't require any additional Drupal modules to use, but once you've made sure `blackfire` is in the list of `installed_extras` in `config.yml` (and Drupal VM has been provisioned), you need to log into Drupal VM and [run the setup steps outlined on the Blackfire Ansible role's README](https://github.com/geerlingguy/ansible-role-blackfire#requirements).
+
+**Note**: You should only enable one code profiler at a time—e.g. when using [Blackfire](blackfire.md), disable [XHProf](xhprof.md), [Tideways](tideways.md) and [XDebug](xdebug.md).
+
+Once you've configured your environment for your own Blackfire account, you can profile a request with Blackfire by running something like the following example (within Drupal VM, after logging in with `vagrant ssh`):
+
+```
+$ blackfire curl http://drupalvm.dev/
+Profiling: [########################################] 10/10
+Blackfire cURL completed
+Graph URL https://blackfire.io/profiles/[UUID]/graph
+
+Wall Time     151ms
+CPU Time      130ms
+I/O Time     20.9ms
+Memory        1.5MB
+Network         n/a     n/a       -
+SQL             n/a       -
+```
+
+For a list of available role variables, see the [`geerlingguy.blackfire` Ansible role's README](https://github.com/geerlingguy/ansible-role-blackfire#readme).
diff --git a/docs/extras/drupal-console.md b/docs/extras/drupal-console.md
index 82c24452f..98f75e3d5 100644
--- a/docs/extras/drupal-console.md
+++ b/docs/extras/drupal-console.md
@@ -36,3 +36,5 @@ Execute from host machine using the `--target` option.
     drupal --target=drupalvm.dev site:status
 
 For more details, see [Drupal Console's documentation](https://hechoendrupal.gitbooks.io/drupal-console/content/en/using/how-to-use-drupal-console-in-a-remote-installation.html)
+
+For a list of available role variables, see the [`geerlingguy.drupal-console` Ansible role's README](https://github.com/geerlingguy/ansible-role-drupal-console#readme).
diff --git a/docs/extras/drush.md b/docs/extras/drush.md
index c0b6ab96c..5794c20bc 100644
--- a/docs/extras/drush.md
+++ b/docs/extras/drush.md
@@ -1,4 +1,4 @@
-If you have Drush and Ansible installed on your host workstation, and would like to interact with a Drupal site running inside Drupal VM, there are drush aliases automatically created by Drupal VM for each of the virtual hosts you have configured.
+If you have [Drush](http://www.drush.org) and Ansible installed on your host workstation, and would like to interact with a Drupal site running inside Drupal VM, there are drush aliases automatically created by Drupal VM for each of the virtual hosts you have configured.
 
 With the example configuration, you can manage the example Drupal site using the Drush alias `@drupalvm.dev`. For example, to check if Drush can connect to the site in Drupal VM, run:
 
@@ -48,3 +48,5 @@ If you're still having issues, you can avoid `sql-sync` entirely and pipe the my
 ```
 drush @remote sql-dump | drush @drupalvm.drupalvm.dev sql-cli
 ```
+
+For a list of available role variables, see the [`geerlingguy.drush` Ansible role's README](https://github.com/geerlingguy/ansible-role-drush#readme).
diff --git a/docs/extras/elasticsearch.md b/docs/extras/elasticsearch.md
index 8a7d98cb5..e57453e9d 100644
--- a/docs/extras/elasticsearch.md
+++ b/docs/extras/elasticsearch.md
@@ -1,11 +1,11 @@
 [Elasticsearch](https://www.elastic.co/products/elasticsearch) is a search engine based on Lucene. It provides a distributed, multitenant-capable full-text search engine with an HTTP web interface and schema-free JSON documents.
 
- To enable Elasticsearch in Drupal VM just make sure `elasticsearch` is in the list of `installed_extras` in your `config.yml`, and when you build Drupal VM, the latest version of Elasticsearch will be installed.
+To enable Elasticsearch in Drupal VM just make sure `elasticsearch` is in the list of `installed_extras` in your `config.yml`, and when you build Drupal VM, the latest version of Elasticsearch will be installed.
 
 The URL to connect to the local elasticsearch server (assuming you're using the default `elasticsearch_http_port` of 9200) from Drupal is:
 
     http://localhost:9200
-    
+
 To access Elasticsearch from the host computer requires changing the IP address to listen on a specific interface, or 0.0.0.0 to listen on all interfaces.
 
     elasticsearch_network_host: 0.0.0.0
@@ -21,4 +21,4 @@ You can add configuration for Elasticsearch by setting the appropriate variables
     elasticsearch_network_host: localhost
     elasticsearch_http_port: 9200
 
-Consult the [geerlingguy.elasticsearch](https://github.com/geerlingguy/ansible-role-elasticsearch) role for additional variables available for configuration.
+For a list of available role variables, see the [`geerlingguy.elasticsearch` Ansible role's README](https://github.com/geerlingguy/ansible-role-elasticsearch#readme).
diff --git a/docs/extras/java.md b/docs/extras/java.md
new file mode 100644
index 000000000..31b2fb26f
--- /dev/null
+++ b/docs/extras/java.md
@@ -0,0 +1,4 @@
+Java will automatically be installed if you enabled any of the `installed_extras` that depend on it.
+If you have any other use case for installing it, just make sure `java` is in the list of `installed_extras` in your `config.yml`.
+
+For a list of available role variables, see the [`geerlingguy.java` Ansible role's README](https://github.com/geerlingguy/ansible-role-java#readme).
diff --git a/docs/extras/mailhog.md b/docs/extras/mailhog.md
index 91e03d6a0..42f0c4f7f 100644
--- a/docs/extras/mailhog.md
+++ b/docs/extras/mailhog.md
@@ -1,11 +1,13 @@
-By default, Drupal VM redirects all PHP emails to [MailHog](https://github.com/mailhog/MailHog) (instead of sending them to the outside world). You can access the MailHog UI at `http://drupalvm.dev:8025/` (or whatever domain you have configured in `config.yml`).
+By default, Drupal VM redirects all PHP emails to [MailHog](https://github.com/mailhog/MailHog) (instead of sending them to the outside world). You can access the MailHog UI at [http://drupalvm.dev:8025/](http://drupalvm.dev:8025) (or whatever domain you have configured in `config.yml`).
 
 ## Disable MailHog
 
 If you don't want to use MailHog, you can set the following override (back to PHP's default, as defined in the [`geerlingguy.php`](https://github.com/geerlingguy/ansible-role-php#role-variables) role) in your `config.yml` file:
 
-```
+```yaml
 php_sendmail_path: "/usr/sbin/sendmail -t -i"
 ```
 
 After doing this, you can also prevent MailHog's installation by removing `mailhog` from the `installed_extras` list.
+
+For a list of available role variables, see the [`geerlingguy.mailhog` Ansible role's README](https://github.com/geerlingguy/ansible-role-mailhog#readme).
diff --git a/docs/extras/memcached.md b/docs/extras/memcached.md
new file mode 100644
index 000000000..409c94170
--- /dev/null
+++ b/docs/extras/memcached.md
@@ -0,0 +1,17 @@
+[Memcached](https://memcached.org/) is an in-memory caching system, much like [Redis](redis.md). While [Varnish](varnish.md) is generally used to improve performance for anonymous users, `memcached` is used to improve the performance for logged in users.
+
+To enable Memcached in Drupal VM:
+
+1. Make sure `memcached` is in the list of `installed_extras` in your `config.yml`.
+2. Install the [Memcache API](https://www.drupal.org/project/memcache) module.
+3. Enable the module before you configure it in the next step.
+4. Add the following to your `settings.php`
+
+```php
+// Make memcache the default cache class.
+$settings['cache']['default'] = 'cache.backend.memcache';
+```
+
+There's a lot more configuration available and the best resource is generally the [Memcache API module's README](http://cgit.drupalcode.org/memcache/tree/README.txt?h=8.x-2.x).
+
+For a list of available role variables, see the [`geerlingguy.memcached` Ansible role's README](https://github.com/geerlingguy/ansible-role-memcached#readme).
diff --git a/docs/extras/newrelic.md b/docs/extras/newrelic.md
index 8d8ec1c1c..01a45b596 100644
--- a/docs/extras/newrelic.md
+++ b/docs/extras/newrelic.md
@@ -1,4 +1,4 @@
-The New Relic PHP agent monitors your application to help you identify and solve performance issues.
+The [New Relic PHP agent](https://docs.newrelic.com/docs/agents/php-agent/getting-started/new-relic-php) monitors your application to help you identify and solve performance issues.
 
 ## Getting Started - Installing Prerequisites
 
@@ -19,3 +19,5 @@ newrelic_license_key: yourkey
 ```
 
 See [New Relic for PHP](https://docs.newrelic.com/docs/agents/php-agent/getting-started/new-relic-php) for help getting started.
+
+For a list of available role variables, see the [`franklinkim.newrelic` Ansible role's README](https://github.com/weareinteractive/ansible-newrelic#readme).
diff --git a/docs/extras/nodejs.md b/docs/extras/nodejs.md
index 0f5ece5a9..e6499eeb1 100644
--- a/docs/extras/nodejs.md
+++ b/docs/extras/nodejs.md
@@ -18,3 +18,5 @@ To install packages globally, you can add them to the list of `nodejs_npm_global
 nodejs_npm_global_packages:
   - name: phantomjs
 ```
+
+For a list of available role variables, see the [`geerlingguy.nodejs` Ansible role's README](https://github.com/geerlingguy/ansible-role-nodejs#readme).
diff --git a/docs/extras/pimpmylog.md b/docs/extras/pimpmylog.md
index 46b0b69bc..93a17f08b 100644
--- a/docs/extras/pimpmylog.md
+++ b/docs/extras/pimpmylog.md
@@ -1,8 +1,8 @@
-[Pimp my Log](http://pimpmylog.com/) is a PHP-based web GUI for viewing log files on a given server. By default, it is installed on Drupal VM, and you can access it at the URL `http://pimpmylog.drupalvm.dev/` (as long as you have a hosts entry for that URL pointing at Drupal VM's IP address!).
+[Pimp my Log](http://pimpmylog.com/) is a PHP-based web GUI for viewing log files on a given server. By default, it is installed on Drupal VM, and you can access it at the URL [http://pimpmylog.drupalvm.dev/](http://pimpmylog.drupalvm.dev) (as long as you have a hosts entry for that URL pointing at Drupal VM's IP address!).
 
 By default, it will find the default Apache 2 `access.log` and `error.log` files, but it will not find other logs, like MySQL or extra Apache virtualhost logs.
 
-When configuring Pimp my Log (on the first visit to the `pimpmylog.drupalvm.dev` URL), you can add extra paths in the UI, or you can add them after the fact by manually editing the configuration file, which by default is stored at `/usr/share/php/pimpmylog/config.user.php`. You can also delete that file and re-configure Pimp my Log via the web UI.
+When configuring Pimp my Log (on the first visit to [pimpmylog.drupalvm.dev](http://pimpmylog.drupalvm.dev)), you can add extra paths in the UI, or you can add them after the fact by manually editing the configuration file, which by default is stored at `/usr/share/php/pimpmylog/config.user.php`. You can also delete that file and re-configure Pimp my Log via the web UI.
 
 Some log files you may be interested in monitoring:
 
@@ -16,3 +16,5 @@ Some log files you may be interested in monitoring:
 For MySQL logs, you might want to read through the PML docs on [MySQL](http://support.pimpmylog.com/kb/softwares/mysql).
 
 It might be necessary to grant read permissions to the other group (e.g. `chmod o+r /var/log/mysql.err`) on some log files in order for Pimp My Log to be able to parse them.
+
+For a list of available role variables, see the [`geerlingguy.pimpmylog` Ansible role's README](https://github.com/geerlingguy/ansible-role-pimpmylog#readme).
diff --git a/docs/extras/profile-code.md b/docs/extras/profile-code.md
deleted file mode 100644
index 321ce95b3..000000000
--- a/docs/extras/profile-code.md
+++ /dev/null
@@ -1,66 +0,0 @@
-You can profile your code using one of the supported profiling tools included in Drupal VM.
-
-As a prerequisite, you need to make sure the profiler you'd like to use is listed (and not commented out) in `installed_extras` inside `config.yml` (So the appropriate software is installed on Drupal VM).
-
-**Note**: You should only enable one code profiler at a time—e.g. when using Blackfire, disable XHProf and XDebug.
-
-## Blackfire
-
-[Blackfire.io](https://blackfire.io/) is a service that allows code profiling to be stored and analyzed via an online profile on the Blackfire.io website.
-
-It doesn't require any additional Drupal modules to use, but once you've made sure `blackfire` is in the list of `installed_extras` in `config.yml` (and Drupal VM has been provisioned), you need to log into Drupal VM and [run the setup steps outlined on the Blackfire Ansible role's README](https://github.com/geerlingguy/ansible-role-blackfire#requirements).
-
-Once you've configured your environment for your own Blackfire account, you can profile a request with Blackfire by running something like the following example (within Drupal VM, after logging in with `vagrant ssh`):
-
-```
-$ blackfire curl http://drupalvm.dev/
-Profiling: [########################################] 10/10
-Blackfire cURL completed
-Graph URL https://blackfire.io/profiles/[UUID]/graph
-
-Wall Time     151ms
-CPU Time      130ms
-I/O Time     20.9ms
-Memory        1.5MB
-Network         n/a     n/a       -
-SQL             n/a       -
-```
-
-## XHProf
-
-[XHProf](http://xhprof.io/) allows easy code profiling and can be used in many different ways. Ensure `xhprof` is in the list of `installed_extras` inside `config.yml`.
-
-_Note: XHProf does currently not work with PHP 7.1._
-
-### XHProf module
-
-The easiest way to use XHProf to profile your PHP code on a Drupal site is to install the [XHProf](https://www.drupal.org/project/xhprof) module, then in XHProf's configuration (at `/admin/config/development/xhprof`), check the 'Enable profiling of page views and drush requests' checkbox.
-
-The XHProf module doesn't include built-in support for callgraphs, but there's an issue to [add callgraph support](https://www.drupal.org/node/1470740).
-
-You can view callgraphs (and a listing of all stored runs) using Drupal VM's own XHProf installation by visiting `http://xhprof.drupalvm.dev/` and clicking on the relevant run, then clicking the "[View Full Callgraph]" link.
-
-### Devel module (deprecated)
-
-The Devel module also *used* to provide XHProf configuration, and setting the options below would allow Devel's XHProf integration to work correctly with Drupal VM's XHProf installation:
-
-  - **xhprof directory**: `/usr/share/php`
-  - **XHProf URL**: `http://xhprof.drupalvm.dev` (assuming this domain is configured in `apache_vhosts` inside `config.yml`)
-
-## Tideways
-
-The XHProf PHP extension has barely been maintained since Facebook abandoned the project around 2015, so it's difficult to get it running under newer versions of PHP.
-
-The Tideways PHP Extension is a well-maintained fork of the XHProf code and works with either the [XHProf](https://www.drupal.org/project/xhprof) or [Tideways](https://www.drupal.org/project/tideways) module to profile page views.
-
-### Profiling with the XHProf Module
-
-To enable profiling of Drupal pages using the Tideways PHP Extension, follow the directions listed earlier for configuring the XHProf module, but choose the 'Tideways' extension under in the 'Profiling settings' section.
-
-### Profiling with the Tideways module
-
-Instructions for profiling with the Tideways module through the [tideways.io](https://tideways.io) service will be added after the following issue is resolved: [Can't install latest dev release on 8.x](https://www.drupal.org/node/2843481).
-
-## XDebug
-
-[XDebug](https://xdebug.org/) is a debugger and profiler for PHP. While most people use it only for debugging purposes, you can also use it for profiling. It's not as commonly used for profiling as either Blackfire or XHProf, but it works!
diff --git a/docs/extras/redis.md b/docs/extras/redis.md
new file mode 100644
index 000000000..78410bcb6
--- /dev/null
+++ b/docs/extras/redis.md
@@ -0,0 +1,5 @@
+[Redis](https://redis.io/) is an in-memory caching system, much like [Memcached](memcached.md). While [Varnish](varnish.md) is generally used to improve performance for anonymous users, `redis` is used to improve the performance for logged in users.
+
+To enable Redis in Drupal VM, first make sure `redis` is in the list of `installed_extras` in your `config.yml`. Install the [Redis](https://www.drupal.org/project/redis) module and configure it as described in the [module's README](http://cgit.drupalcode.org/redis/tree/README.md).
+
+For a list of available role variables, see the [`geerlingguy.redis` Ansible role's README](https://github.com/geerlingguy/ansible-role-redis#readme).
diff --git a/docs/extras/ruby.md b/docs/extras/ruby.md
new file mode 100644
index 000000000..c4522b185
--- /dev/null
+++ b/docs/extras/ruby.md
@@ -0,0 +1,15 @@
+Ruby is used for many different purposes, but with Drupal, it is most often used as part of a toolset for Front End development or certain CI tasks.
+
+Drupal VM includes built-in support for Ruby—all you need to do is make sure `ruby` is listed in the list of `installed_extras` inside `config.yml` before your provision Drupal VM.
+
+## Installing gems
+
+To install ruby gems, you can add them to the list of `ruby_install_gems` in `config.yml`.
+
+```yaml
+ruby_install_gems:
+  - sass
+  - compass
+```
+
+For a list of available role variables, see the [`geerlingguy.ruby` Ansible role's README](https://github.com/geerlingguy/ansible-role-ruby#readme).
diff --git a/docs/extras/behat.md b/docs/extras/selenium.md
similarity index 97%
rename from docs/extras/behat.md
rename to docs/extras/selenium.md
index 7d5e6b767..4b19228b5 100644
--- a/docs/extras/behat.md
+++ b/docs/extras/selenium.md
@@ -101,3 +101,5 @@ There are many different ways you can run Behat tests via PhantomJS and other dr
   - [Trying to achieve a Visual Regression Testing Strategy](https://github.com/geerlingguy/drupal-vm/issues/421)
 
 Also, see Acquia's [BLT](https://github.com/acquia/blt) project for a good example of Behat test integration with Drupal VM.
+
+For a list of available role variables, see the [`arknoll.selenium` Ansible role's README](https://github.com/arknoll/ansible-role-selenium#readme).
diff --git a/docs/extras/solr.md b/docs/extras/solr.md
index 75dbce641..ebc7a1e8d 100644
--- a/docs/extras/solr.md
+++ b/docs/extras/solr.md
@@ -25,4 +25,6 @@ post_provision_scripts:
 
 ## Extra Solr configuration
 
-You can add extra configuration for Solr, like the minimum and maximum memory allocation for the JVM (`solr_xms` and `solr_xmx`), and even the `solr_version`, by setting the appropriate variables inside `config.yml` before you build Drupal VM.
\ No newline at end of file
+You can add extra configuration for Solr, like the minimum and maximum memory allocation for the JVM (`solr_xms` and `solr_xmx`), and even the `solr_version`, by setting the appropriate variables inside `config.yml` before you build Drupal VM.
+
+For a list of available role variables, see the [`geerlingguy.solr` Ansible role's README](https://github.com/geerlingguy/ansible-role-solr#readme).
diff --git a/docs/extras/ssl.md b/docs/extras/ssl.md
deleted file mode 100644
index 8feb0039f..000000000
--- a/docs/extras/ssl.md
+++ /dev/null
@@ -1,82 +0,0 @@
-To enable SSL support for you virtual hosts you first need a certificate file. You can generate a self-signed certificate with a command like
-
-    openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout example.key -out example.crt
-
-Place the files in your project directory and edit your `config.yml`.
-
-_If you're using an actual production certificate you should of course **NOT** track it in git but transfer it to the VM before running `vagrant provision`_
-
-### Apache
-
-Add the following to your `config.yml`:
-
-```yaml
-apache_vhosts_ssl:
-  - servername: "{{ drupal_domain }}"
-    documentroot: "{{ drupal_core_path }}"
-    certificate_file: "/vagrant/example.crt"
-    certificate_key_file: "/vagrant/example.key"
-    extra_parameters: "{{ apache_vhost_php_fpm_parameters }}"
-```
-
-For a list of all configuration options see the [`geerlingguy.apache` Ansible role's README](https://github.com/geerlingguy/ansible-role-apache#readme).
-
-### Nginx
-
-Modify your nginx host configuration by adding the following `extra_parameters` to the first entry in `nginx_hosts`:
-
-```yaml
-- server_name: "{{ drupal_domain }} www.{{ drupal_domain }}"
-  root: "{{ drupal_core_path }}"
-  is_php: true
-  extra_parameters: |
-        listen 443 ssl;
-        ssl_certificate     /vagrant/example.crt;
-        ssl_certificate_key /vagrant/example.key;
-        ssl_protocols       TLSv1.1 TLSv1.2;
-        ssl_ciphers         HIGH:!aNULL:!MD5;
-```
-
-For a list of all configuration options see the [`geerlingguy.nginx` Ansible role's README](https://github.com/geerlingguy/ansible-role-nginx#readme).
-
-## Using Ubuntu's snakeoil certificate
-
-If you are using Ubuntu as your base OS and you want to get started quickly with a local development environment you can use the snakeoil certificate that is already generated.
-
-#### Apache
-
-```yaml
-apache_vhosts_ssl:
-  - servername: "{{ drupal_domain }}"
-    documentroot: "{{ drupal_core_path }}"
-    certificate_file: "/etc/ssl/certs/ssl-cert-snakeoil.pem"
-    certificate_key_file: "/etc/ssl/private/ssl-cert-snakeoil.key"
-    extra_parameters: "{{ apache_vhost_php_fpm_parameters }}"
-```
-
-#### Nginx
-
-```yaml
-- server_name: "{{ drupal_domain }} www.{{ drupal_domain }}"
-  root: "{{ drupal_core_path }}"
-  is_php: true
-  extra_parameters: |
-        listen 443 ssl;
-        ssl_certificate     /etc/ssl/certs/ssl-cert-snakeoil.pem;
-        ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key;
-        ssl_protocols       TLSv1.1 TLSv1.2;
-        ssl_ciphers         HIGH:!aNULL:!MD5;
-```
-
-## Tips & Tricks
-
-To automatically add a SSL virtual host for every Apache host defined in `apache_vhosts` you can add the following to your `config.yml`:
-
-```yaml
-apache_vhost_ssl_parameters:
-  certificate_file: "/etc/ssl/certs/ssl-cert-snakeoil.pem"
-  certificate_key_file: "/etc/ssl/private/ssl-cert-snakeoil.key"
-
-# Generate a SSL virtual host for every regular vhost.
-apache_vhosts_ssl: "{% set vhosts = [] %}{% for vhost in apache_vhosts %}{% if vhosts.append(vhost|combine(apache_vhost_ssl_parameters)) %}{% endif %}{% endfor %}{{ vhosts }}"
-```
diff --git a/docs/extras/tideways.md b/docs/extras/tideways.md
new file mode 100644
index 000000000..8953c0fa4
--- /dev/null
+++ b/docs/extras/tideways.md
@@ -0,0 +1,15 @@
+The Tideways PHP Extension is a well-maintained fork of the XHProf code and works with either the [XHProf](https://www.drupal.org/project/xhprof) or [Tideways](https://www.drupal.org/project/tideways) module to profile page views.
+
+**Note**: You should only enable one code profiler at a time—e.g. when using [Blackfire](blackfire.md), disable [XHProf](xhprof.md), [Tideways](tideways.md) and [XDebug](xdebug.md).
+
+### Profiling with the XHProf Module
+
+To enable profiling of Drupal pages using the Tideways PHP Extension, follow the directions for [configuring the XHProf and the XHProf module](xhprof.md#xhprof-module), but choose the _Tideways_ extension under in the _Profiling settings_ section.
+
+As with the XHProf extension, you can view callgraphs (and a listing of all stored runs) using Drupal VM's own XHProf UI installation by visiting [http://xhprof.drupalvm.dev/](http://xhprof.drupalvm.dev) and clicking on the relevant run, then clicking the _[View Full Callgraph]_ link.
+
+### Profiling with the Tideways module
+
+Instructions for profiling with the Tideways module through the [tideways.io](https://tideways.io) service will be added after the following issue is resolved: [Can't install latest dev release on 8.x](https://www.drupal.org/node/2843481).
+
+For a list of available role variables, see the [`geerlingguy.tideways` Ansible role's README](https://github.com/geerlingguy/ansible-role-tideways#readme).
diff --git a/docs/extras/upload-progress.md b/docs/extras/upload-progress.md
new file mode 100644
index 000000000..da364b98d
--- /dev/null
+++ b/docs/extras/upload-progress.md
@@ -0,0 +1,3 @@
+To enable the Upload progress PHP extension make sure `upload-progress` is listed in the list of `installed_extras` inside `config.yml` before your provision Drupal VM.
+
+For a list of available role variables, see the [`thom8.php-upload-progress` Ansible role's README](https://github.com/thom8/ansible-role-php-upload-progress#readme).
diff --git a/docs/extras/varnish.md b/docs/extras/varnish.md
index 38b0cf677..b39f6e817 100644
--- a/docs/extras/varnish.md
+++ b/docs/extras/varnish.md
@@ -29,4 +29,6 @@ $settings['reverse_proxy'] = TRUE;
 $settings['reverse_proxy_addresses'] = array('127.0.0.1');
 ```
 
-If you don't set these values, Drupal will think all requests are coming from `127.0.0.1`. There are other settings you can change to make Drupal not store copies of cached pages in the Database (since Varnish is caching everything, this is redundant), but those other settings are not covered here.
\ No newline at end of file
+If you don't set these values, Drupal will think all requests are coming from `127.0.0.1`. There are other settings you can change to make Drupal not store copies of cached pages in the Database (since Varnish is caching everything, this is redundant), but those other settings are not covered here.
+
+For a list of available role variables, see the [`geerlingguy.varnish` Ansible role's README](https://github.com/geerlingguy/ansible-role-varnish#readme).
diff --git a/docs/extras/xdebug.md b/docs/extras/xdebug.md
index 51a419010..b0e85d344 100644
--- a/docs/extras/xdebug.md
+++ b/docs/extras/xdebug.md
@@ -1,4 +1,4 @@
-XDebug is a useful tool for debugging PHP applications, but it uses extra memory and CPU for every request, so is disabled by default.
+[XDebug](https://xdebug.org/) is a useful tool for debugging PHP applications, but it uses extra memory and CPU for every request, so is disabled by default.
 
 To enable XDebug, do the following in `config.yml`:
 
@@ -7,7 +7,7 @@ To enable XDebug, do the following in `config.yml`:
 
 If you don't need to use XDebug, you can comment it out or remove it from `installed_extras` before you `vagrant up` Drupal VM.
 
-## PHPStorm and XDebug with Drupal VM
+### PHPStorm and XDebug with Drupal VM
 
 To use XDebug with PHPStorm, change the `php_xdebug_idekey` variable as shown below in `config.yml`, and then run `vagrant provision` to reconfigure the VM:
 
@@ -15,7 +15,7 @@ To use XDebug with PHPStorm, change the `php_xdebug_idekey` variable as shown be
 php_xdebug_idekey: PHPSTORM
 ```
 
-## Sublime Text and XDebug with Drupal VM
+### Sublime Text and XDebug with Drupal VM
 
 To use XDebug with Sublime Text, change the `php_xdebug_idekey` variable as shown below in `config.yml`, and then run `vagrant provision` to reconfigure the VM:
 
@@ -23,10 +23,18 @@ To use XDebug with Sublime Text, change the `php_xdebug_idekey` variable as show
 php_xdebug_idekey: sublime.xdebug
 ```
 
-## NetBeans and XDebug with Drupal VM
+### NetBeans and XDebug with Drupal VM
 
 To use XDebug with NetBeans, change the `php_xdebug_idekey` variable as shown below in `config.yml`, and then run `vagrant provision` to reconfigure the VM.
 
 ```yaml
 php_xdebug_idekey: netbeans-xdebug
 ```
+
+## Profiling code with XDebug
+
+While most people use XDebug only for debugging purposes, you can also use it for profiling. It's not as commonly used for profiling as either Blackfire or XHProf, but it works!
+
+**Note**: You should only enable one code profiler at a time—e.g. when using [Blackfire](blackfire.md), disable [XHProf](xhprof.md), [Tideways](tideways.md) and [XDebug](xdebug.md).
+
+For a list of available role variables, see the [`geerlingguy.php-xdebug` Ansible role's README](https://github.com/geerlingguy/ansible-role-php-xdebug#readme).
diff --git a/docs/extras/xhprof.md b/docs/extras/xhprof.md
new file mode 100644
index 000000000..af0dc6b00
--- /dev/null
+++ b/docs/extras/xhprof.md
@@ -0,0 +1,20 @@
+[XHProf](http://xhprof.io/) allows easy code profiling and can be used in many different ways. Ensure `xhprof` is in the list of `installed_extras` inside `config.yml`.
+
+_Note: XHProf does currently not work with PHP 7.1. The PHP extension has barely been maintained since Facebook abandoned the project around 2015, so it's difficult to get it running under newer versions of PHP. If you require support for PHP 7.1 you should use [Tideways](tideways.md) instead._
+
+### XHProf module
+
+The easiest way to use XHProf to profile your PHP code on a Drupal site is to install the [XHProf](https://www.drupal.org/project/xhprof) module, then in XHProf's configuration (at `/admin/config/development/xhprof`), check the 'Enable profiling of page views and drush requests' checkbox.
+
+The XHProf module doesn't include built-in support for callgraphs, but there's an issue to [add callgraph support](https://www.drupal.org/node/1470740).
+
+You can view callgraphs (and a listing of all stored runs) using Drupal VM's own XHProf installation by visiting [http://xhprof.drupalvm.dev/](http://xhprof.drupalvm.dev) and clicking on the relevant run, then clicking the _[View Full Callgraph]_ link.
+
+### Devel module (deprecated)
+
+The Devel module also *used* to provide XHProf configuration, and setting the options below would allow Devel's XHProf integration to work correctly with Drupal VM's XHProf installation:
+
+  - **xhprof directory**: `/usr/share/php`
+  - **XHProf URL**: `http://xhprof.drupalvm.dev` (assuming this domain is configured in `apache_vhosts` inside `config.yml`)
+
+**Note**: You should only enable one code profiler at a time—e.g. when using [Blackfire](blackfire.md), disable [XHProf](xhprof.md), [Tideways](tideways.md) and [XDebug](xdebug.md).
diff --git a/docs/getting-started/configure-drupalvm.md b/docs/getting-started/configure-drupalvm.md
new file mode 100644
index 000000000..cada825e9
--- /dev/null
+++ b/docs/getting-started/configure-drupalvm.md
@@ -0,0 +1,48 @@
+If you only need a simple Drupal VM environment up and running there are no required configurations. The [configurations used by defualt are listed in `default.config.yml`](https://github.com/geerlingguy/drupal-vm/blob/master/default.config.yml) and you can override them with a number of optional configuration files.
+
+_Note: The merge of variables in these files is shallow, if you want to override a single item in a list, you will need to re-define all items in that list._
+
+Configurations files are read in the following order:
+
+#### 1. default.config.yml
+
+Drupal VM's default configurations which you should not edit directly.
+
+#### 2. config.yml
+
+The main configuration file of a project. Commonly this is a copy of `default.config.yml` with the values tweaked to your own project. For an easier upgrade path you would only set the values you are actually overriding.
+
+```yaml
+vagrant_box: geerlingguy/centos7
+vagrant_hostname: my-custom-site.dev
+vagrant_machine_name: my_custom_site
+
+php_version: "5.6"
+```
+
+#### 3. local.config.yml
+
+Local development overrides. Commonly this file is ignored from VCS so that each team member can make local customizations.
+
+```yaml
+# Increase the memory available to your Drupal site.
+vagrant_memory: 1536
+php_memory_limit: "512M"
+
+# Override the synced folders to use rsync instead of NFS.
+vagrant_synced_folders:
+  - local_path: .
+    destination: /var/www/drupalvm
+    type: rsync
+    create: true
+```
+
+### 4. vagrant.config.yml
+
+Environment specific overrides. When you run Drupal VM through _Vagrant_, the environment will be set to `vagrant` and thus this file is loaded when available. If you're doing something more advanced, such as running Drupal VM on a [production environment](../other/production.md), you can use a different environment configuration file, eg `prod.config.yml`.
+
+_Note: In addition to the variables listed in `default.config.yml`, you can also override the default variables set by the ansible roles included. In the "Installed extras" section of this documentation, each role has a link to the available variables._
+
+## Additional resources:
+
+- Jeff Geerling's DrupalDC talk "[Drupal VM Tips and Tricks for Drupal 8 development](https://www.youtube.com/watch?v=_wV6MDsT42Y)"
diff --git a/docs/other/linux.md b/docs/getting-started/installation-linux.md
similarity index 93%
rename from docs/other/linux.md
rename to docs/getting-started/installation-linux.md
index 9ab7fd61d..ec9ff0a5f 100644
--- a/docs/other/linux.md
+++ b/docs/getting-started/installation-linux.md
@@ -1,9 +1,11 @@
+Please read through the [Quick Start Guiden the README](https://github.com/geerlingguy/drupal-vm#quick-start-guide) to get started.
+
+For a quick introduction to setting up Drupal VM, the [macOS video tutorial](installation-macos.md) applies somwhat to Linux as well.
+
 There are a few caveats when using Drupal VM on Linux, and this page will try to identify the main gotchas or optimization tips for those wishing to use Drupal VM on a Linux host.
 
 ## Platform-specific Install Instructions
 
-### All Linux flavors
-
 Always make sure your workstation is up to date (e.g. `apt-get update && apt-get upgrade` on Debian-like systems, or `dnf upgrade` or `yum upgrade` on Fedora/RedHat-like systems). There are sometimes bugs in the base OS packages (e.g. [this NFS-related bug](https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1508510)) that can be resolved by a simple upgrade.
 
 ### Ubuntu
@@ -37,7 +39,7 @@ Arch Linux uses Python 3 as the default while Ansible requires Python 2. To get
 ansible_python_interpreter: "/usr/bin/env python2"
 ```
 
-## Synced Folders
+## Troubleshooting Vagrant Synced Folders
 
 Most issues have to do synced folders. These are the most common ones:
 
diff --git a/docs/getting-started/installation-macos.md b/docs/getting-started/installation-macos.md
new file mode 100644
index 000000000..e08561e32
--- /dev/null
+++ b/docs/getting-started/installation-macos.md
@@ -0,0 +1,5 @@
+Please read through the [Quick Start Guiden the README](https://github.com/geerlingguy/drupal-vm#quick-start-guide) to get started.
+
+<iframe width="560" height="315" src="https://www.youtube.com/embed/PR9uh_GGZhI" frameborder="0" allowfullscreen></iframe>
+
+_In this quick overview, Jeff Geerling will show you where you can learn more about Drupal VM, then show you a simple Drupal VM setup._
diff --git a/docs/other/windows.md b/docs/getting-started/installation-windows.md
similarity index 95%
rename from docs/other/windows.md
rename to docs/getting-started/installation-windows.md
index c0e72acc0..db513578f 100644
--- a/docs/other/windows.md
+++ b/docs/getting-started/installation-windows.md
@@ -1,3 +1,9 @@
+Please read through the [Quick Start Guiden the README](https://github.com/geerlingguy/drupal-vm#quick-start-guide) to get started.
+
+<iframe width="560" height="315" src="https://www.youtube.com/embed/mNio_aXMLos" frameborder="0" allowfullscreen></iframe>
+
+_In this video, Jeff Geerling walk you through getting a Drupal 8 website built on your Windows 10 laptop using Drupal VM 3._
+
 There are a few caveats when using Drupal VM on Windows, and this page will try to identify the main gotchas or optimization tips for those wishing to use Drupal VM on a Windows host.
 
 ## Windows Subsystem for Linux / Ubuntu bash
@@ -22,7 +28,7 @@ If you're not on Windows 10, or if you don't want to install the WSL, you can us
   - [Cmder](http://cmder.net/) includes built-in git and SSH support, so you can do most things that you need without any additional plugins.
   - [Cygwin](https://www.cygwin.com/) allows you to install a large variety of linux packages inside its bash environment, though it can be a little more tricky to manage and is less integrated into the Windows environment.
 
-## Synced Folders
+## Troubleshooting Vagrant Synced Folders
 
 Most issues have to do synced folders. These are the most common ones:
 
diff --git a/docs/extras/syncing-folders.md b/docs/getting-started/syncing-folders.md
similarity index 100%
rename from docs/extras/syncing-folders.md
rename to docs/getting-started/syncing-folders.md
diff --git a/docs/other/performance.md b/docs/other/performance.md
new file mode 100644
index 000000000..f965be7e2
--- /dev/null
+++ b/docs/other/performance.md
@@ -0,0 +1,11 @@
+## Improving composer build performance
+
+Opting for composer based installs will most likely increase your VM's time to provision considerably.
+
+If you manage multiple VM's own your computer, you can use the [`vagrant-cachier` plugin](http://fgrehm.viewdocs.io/vagrant-cachier/) to share Composer's package cache across all VM's. The first build will be as slow as before but subsequent builds with the same `vagrant_box` (eg `geerlingguy/ubuntu1604`) will be much faster.
+
+Install the plugin on your host computer: `vagrant plugin install vagrant-cachier`.
+
+Drupal VM's `Vagrantfile` includes the appropriate `vagrant-cachier` configuration to cache Composer and apt dependencies.
+
+_You can also use this plugin to share other package manager caches. For more information read the [documentation](http://fgrehm.viewdocs.io/vagrant-cachier/usage/)._
diff --git a/docs/other/production.md b/docs/other/production.md
index 94aee40d6..c9eea4a25 100644
--- a/docs/other/production.md
+++ b/docs/other/production.md
@@ -74,14 +74,7 @@ You now have Drupal VM configured for production by default. This is the recomme
 
 ### Customize `vagrant.config.yml` for local development
 
-To re-use the same setup for local development, copy `default.config.yml` to `vagrant.config.yml` and configure it so that you override the security hardening configurations that were added in `config.yml`.
-
-When you run `vagrant up` or `vagrant provision` the order of the configuration files read will be:
-
-- `default.config.yml`
-- `config.yml`
-- `local.config.yml`
-- `vagrant.config.yml`
+To re-use the same setup for local development, copy `default.config.yml` to `vagrant.config.yml` and configure it so that you override the security hardening configurations that were added in `config.yml`. Read about how configuration files are read under [Configuring Drupal VM](../getting-started/configure-drupalvm.md)
 
 ### Customize `inventory` for production
 
@@ -112,7 +105,7 @@ Run the following command within Drupal VM's root directory (the folder containi
 
     ansible-playbook -i examples/prod/inventory provisioning/playbook.yml --sudo --ask-sudo-pass
 
-_Note: If you have installed [Drupal VM as a Composer dependency](drupalvm-composer-dependency.md) you also need to specify the path of the config directory where you have your `config.yml` located._
+_Note: If you have installed [Drupal VM as a Composer dependency](../deployment/composer-dependency.md) you also need to specify the path of the config directory where you have your `config.yml` located._
 
     ansible-playbook -i config/prod/inventory vendor/geerlingguy/drupal-vm/provisioning/playbook.yml -e "config_dir=$(pwd)/config" --sudo --ask-sudo-pass
 
diff --git a/docs/other/webservers.md b/docs/other/webservers.md
deleted file mode 100644
index b78744e28..000000000
--- a/docs/other/webservers.md
+++ /dev/null
@@ -1,19 +0,0 @@
-Drupal VM's configuration works with multiple operating systems _and_ with multiple webservers. You can switch between Apache and Nginx (depending on which server you prefer) with ease.
-
-All you need to do is change the `drupalvm_webserver` variable inside your customized `config.yml`, choosing either `apache` or `nginx`.
-
-Because the webservers are configured somewhat differently, there are a few things you should configure depending on which webserver you use.
-
-## Using Apache
-
-You have complete control over all aspects of Apache VirtualHosts using the `apache_vhosts` configuration. A few simple examples are shown in `default.config.yml`, but this configuration can be much more complex.
-
-See the examples included in the [`geerlingguy.apache` Ansible role's README](https://github.com/geerlingguy/ansible-role-apache#readme) for more info, as well as many other variables you can override to configure Apache exactly how you like it.
-
-## Using Nginx
-
-Because Nginx server directives behave a little differently than Apache's VirtualHosts, Drupal VM includes a custom Drupal-optimized Nginx server block configuration, and you can control all the servers ('virtual hosts') Nginx will run using the `nginx_hosts` configuration. A few simple examples are shown in `default.config.yml`, but you have some extra flexibility if you need it. See the `nginx-vhost.conf.j2` template for more information.
-
-Also, see the examples included in the [`geerlingguy.nginx` Ansible role's README](https://github.com/geerlingguy/ansible-role-nginx#readme) for more info, as well as many other variables you can override to configure Nginx exactly how you like it. 
-
-Note: if you're using php-fpm, you may want to reflect your use of nginx by setting `php_fpm_pool_user` and `php_fpm_pool_group` in your `config.yml`. 
diff --git a/mkdocs.yml b/mkdocs.yml
index 7bc403bb7..2169c2271 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -13,39 +13,60 @@ markdown_extensions:
 
 pages:
   - Home: 'index.md'
-  - Drupal Deployment Strategies:
-    - 'Drush Make file': 'deployment/drush-make.md'
-    - 'Composer': 'deployment/composer.md'
-    - 'Local Drupal codebase': 'deployment/local-codebase.md'
-    - 'Drupal multisite': 'deployment/multisite.md'
-  - Extra Software and Setup:
-    - 'Syncing Folders': 'extras/syncing-folders.md'
-    - 'Connect to the MySQL Database': 'extras/mysql.md'
-    - 'Use Apache Solr for Search': 'extras/solr.md'
-    - 'Use Drush with Drupal VM': 'extras/drush.md'
-    - 'Use Drupal Console with Drupal VM': 'extras/drupal-console.md'
-    - 'Use Varnish with Drupal VM': 'extras/varnish.md'
-    - 'Use MariaDB instead of MySQL': 'extras/mariadb.md'
-    - 'Use PostgreSQL instead of MySQL': 'extras/postgresql.md'
-    - 'Use Node.js and NPM': 'extras/nodejs.md'
-    - 'Use SSL vhosts with Apache/Nginx': 'extras/ssl.md'
-    - 'View Logs with Pimp my Log': 'extras/pimpmylog.md'
-    - 'Profile Code - XHProf, Blackfire, Xdebug': 'extras/profile-code.md'
-    - 'Debug Code with XDebug': 'extras/xdebug.md'
-    - 'Catch Emails with MailHog': 'extras/mailhog.md'
-    - 'Test with Behat and Selenium': 'extras/behat.md'
-    - 'Add Pre- and Post-Provision Scripts': 'extras/scripts.md'
+  - Getting Started:
+    - Installation:
+      - 'macOS': 'getting-started/installation-macos.md'
+      - 'Windows': 'getting-started/installation-windows.md'
+      - 'Linux': 'getting-started/installation-linux.md'
+    - 'Configuring Drupal VM': 'getting-started/configure-drupalvm.md'
+    - 'Syncing Folders': 'getting-started/syncing-folders.md'
+  - Building your codebase:
+    - 'Using a local Drupal codebase': 'deployment/local-codebase.md'
+    - 'Using a composer package': 'deployment/composer-package.md'
+    - 'Using composer.json': 'deployment/composer.md'
+    - 'Using a Drush Make file': 'deployment/drush-make.md'
+    - 'Drupal VM as a Composer Dependency': 'deployment/composer-dependency.md'
+  - Basic configurations:
+    - 'Using different base OSes': 'configurations/base-os.md'
+    - 'Using a different PHP version': 'configurations/php.md'
+    - Webservers:
+      - 'Apache': 'configurations/webservers-apache.md'
+      - 'Nginx': 'configurations/webservers-nginx.md'
+    - Databases:
+      - 'Connect to the MySQL Database': 'configurations/databases-mysql.md'
+      - 'Use MariaDB instead of MySQL': 'configurations/databases-mariadb.md'
+      - 'Use PostgreSQL instead of MySQL': 'configurations/databases-postgresql.md'
+  - Installed extras:
+    - 'adminer <small>(Database UI)</small>': 'extras/adminer.md'
+    - 'blackfire <small>(Profiling tool)</small>': 'extras/blackfire.md'
+    - 'drupalconsole <small>(Drupal CLI)</small>': 'extras/drupal-console.md'
+    - 'drush <small>(Drupal CLI)</small>': 'extras/drush.md'
+    - 'elasticsearch <small>(Search engine)</small>': 'extras/elasticsearch.md'
+    - 'java': 'extras/java.md'
+    - 'mailhog <small>(Mail catcher)</small>': 'extras/mailhog.md'
+    - 'memcached <small>(In-memory cache)</small>': 'extras/memcached.md'
+    - 'newrelic <small>(Performance monitoring)</small>': 'extras/newrelic.md'
+    - 'nodejs': 'extras/nodejs.md'
+    - 'pimpmylog <small>(Log viewer)</small>': 'extras/pimpmylog.md'
+    - 'redis <small>(In-memory database)</small>': 'extras/redis.md'
+    - 'ruby': 'extras/ruby.md'
+    - 'selenium <small>(BDD with Behat)</small>': 'extras/selenium.md'
+    - 'solr <small>(Search engine)</small>': 'extras/solr.md'
+    - 'tidways <small>(Profiling tool)</small>': 'extras/tideways.md'
+    - 'upload-progress': 'extras/upload-progress.md'
+    - 'varnish <small>(Caching reverse proxy)</small>': 'extras/varnish.md'
+    - 'xdebug <small>(Debugging tool)</small>': 'extras/xdebug.md'
+    - 'xhprof <small>(Profiling tool)</small>': 'extras/xhprof.md'
+  - Extending Drupal VM:
+    - 'Adding Vagrant plugins Vagrantfile.local': 'extending/vagrantfile.md'
+    - 'Passing on CLI arguments to ansible': 'extending/ansible-args.md'
+    - 'Pre- and Post-Provision Scripts': 'extending/scripts.md'
   - Other Information:
-    - 'Using Different Base OSes': 'other/base-os.md'
-    - 'Using Different Webservers': 'other/webservers.md'
-    - 'Overriding configurations': 'other/overriding-configurations.md'
-    - 'Installing Drupal VM as a Composer Dependency': 'other/drupalvm-composer-dependency.md'
-    - 'Using other versions of PHP': 'other/php.md'
-    - 'BigPipe with Drupal VM': 'other/bigpipe.md'
-    - 'Drupal VM Management Tools': 'other/management-tools.md'
-    - 'Deploying Drupal VM to a production environment': 'other/production.md'
     - 'Networking Notes': 'other/networking.md'
+    - 'Vagrant and VirtualBox': 'other/vagrant-virtualbox.md'
+    - 'Improving Performance': 'other/performance.md'
+    - 'BigPipe with Drupal VM': 'other/bigpipe.md'
+    - 'Drupal multisite': 'deployment/multisite.md'
     - 'Drupal 6 Notes': 'other/drupal-6.md'
-    - 'Linux Notes': 'other/linux.md'
-    - 'Windows Notes': 'other/windows.md'
-    - 'Vagrant and VirtualBox Tips': 'other/vagrant-virtualbox.md'
+    - 'Drupal VM Management Tools': 'other/management-tools.md'
+    - 'Deploying to a production environment': 'other/production.md'

From d04f7672dedb06f661fd3b69ff18d626676c3fba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Tue, 17 Jan 2017 22:04:38 -0500
Subject: [PATCH 0593/1273] cleanup [ci skip]

---
 docs/deployment/composer-package.md | 2 +-
 docs/deployment/composer.md         | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/deployment/composer-package.md b/docs/deployment/composer-package.md
index 6ec329d0a..5e9d6e70e 100644
--- a/docs/deployment/composer-package.md
+++ b/docs/deployment/composer-package.md
@@ -15,4 +15,4 @@ drupal_composer_project_options: "--prefer-dist --stability rc --no-interaction"
 drupal_core_path: "{{ drupal_composer_install_dir }}/docroot"
 ```
 
-_Opting for composer based installs will most likely increase your VM's time to provision considerably. See the section on how to [improve composer build performance](../other/performance.md#improving-composer-build-performance) in the docs for how to improve it._
+_Opting for composer based installs will most likely increase your VM's time to provision considerably. Find out how you can [improve composer build performance](../other/performance.md#improving-composer-build-performance)._
diff --git a/docs/deployment/composer.md b/docs/deployment/composer.md
index cf9f38c0a..2515fd0db 100644
--- a/docs/deployment/composer.md
+++ b/docs/deployment/composer.md
@@ -10,6 +10,8 @@ build_composer: true
 drupal_core_path: "{{ drupal_composer_install_dir }}/docroot"
 ```
 
+_The file set in `drupal_composer_path` (which defaults to `drupal.composer.json`) will be copied from your host computer into the VM's `drupal_composer_install_dir` and renamed `composer.json`._
+
 ## Using Composer when [Drupal VM is a composer dependency itself](composer-dependency.md)
 
 In the scenario where you have an existing `composer.json` in the root of your project, follow the usual steps for installing with a composer.json but instead of creating a `drupal.composer.json` file, disable the transfering of the file by setting `drupal_composer_path: false`, and change `drupal_composer_install_dir` to point to the the directory where it will be located. If `drupal_composer_path` is not truthy, Drupal VM assumes it already exists.
@@ -22,4 +24,4 @@ drupal_composer_install_dir: "/var/www/drupalvm"
 drupal_core_path: "{{ drupal_composer_install_dir }}/docroot"
 ```
 
-_Opting for composer based installs will most likely increase your VM's time to provision considerably. See the section on how to [improve composer build performance](../other/performance.md#improving-composer-build-performance) in the docs for how to improve it._
+_Opting for composer based installs will most likely increase your VM's time to provision considerably. Find out how you can [improve composer build performance](../other/performance.md#improving-composer-build-performance)._

From a4f9706a9874df2b2ae361945fe8e7bdd141d7fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 26 Jan 2017 08:51:08 -0500
Subject: [PATCH 0594/1273] Move windows synced folder options to performance
 section [ci skip]

---
 docs/getting-started/installation-windows.md | 30 +-------------------
 docs/other/performance.md                    | 30 ++++++++++++++++++++
 2 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/docs/getting-started/installation-windows.md b/docs/getting-started/installation-windows.md
index db513578f..1cca0f7f1 100644
--- a/docs/getting-started/installation-windows.md
+++ b/docs/getting-started/installation-windows.md
@@ -32,13 +32,7 @@ If you're not on Windows 10, or if you don't want to install the WSL, you can us
 
 Most issues have to do synced folders. These are the most common ones:
 
-### Performance
-
-By default, if you use the 'NFS' synced folder type, Vagrant will ignore this directive and use the native (usually slow) VirtualBox shared folder system instead. You can get higher performance by doing one of the following (all of these steps require a full VM reload (`vagrant reload`) to take effect):
-
-  1. **Install the `vagrant-winnfsd` plugin**. See the 'NFS' section later for more details and caveats.
-  2. **Use `smb` for the synced folder's type.**
-  2. **Use `rsync` for the synced folder's type.** This requires that you have `rsync` available on your Windows workstation, which you can get if you install a substitute CLI like [Cygwin](https://www.cygwin.com/) or [Cmder](http://cmder.net/).
+_Read the following to [improve the performance of synced folders by using NFS, samba or rsync](../other/performance.md#improving-performance-on-windows)._
 
 ### Symbolic Links
 
@@ -59,28 +53,6 @@ You should probably disable Git's `fileMode` option inside the VM and on your ho
 
     git config core.fileMode false
 
-### NFS
-
-You can use the [vagrant-winnfsd](https://github.com/GM-Alex/vagrant-winnfsd) plugin to get NFS support on windows. Be aware that there are multiple issues logged against both the plugin and the winnfsd project, so no guarantees.
-
-#### Using WinNFSD without `vagrant-winnfsd`
-
-Another option for the more adventurous is to manually install and configure WinNFSD, and manually mount the shares within your VM. This requires a bit more work, but could be more stable on Windows; see this blog post for more details: [Windows + Vagrant + WinNFSD without file update problems](https://hollyit.net/blog/windowsvagrantwinnfsd-without-file-update-problems).
-
-GuyPaddock's [fork of `vagrant-winnfsd`](https://github.com/GuyPaddock/vagrant-winnfsd) adds logging and debug messages. You can replace the vagrant-winnfsd gem inside `.vagrant.d\gems\gems` to use it instead. For further caveats, please read through [vagrant-winnfsd issue #12](https://github.com/winnfsd/vagrant-winnfsd/issues/12#issuecomment-78195957), and make the following changes to `config.yml`:
-
-    vagrant_synced_folder_default_type: ""
-
-Add `mount_options` to your synced folder to avoid an error:
-
-    type: nfs
-    mount_options: ["rw","vers=3","udp","nolock"]
-
-In a custom `Vagrantfile.local`, add user access to Vagrant:
-
-    config.winnfsd.uid=900
-    config.winnfsd.gid=900
-
 ### "Authentication failure" on vagrant up
 
 Some Windows users have reported running into an issue where an authentication failure is reported once the VM is booted (e.g. `drupalvm: Warning: Authentication failure. Retrying...` — see [#170](https://github.com/geerlingguy/drupal-vm/issues/170)). To fix this, do the following:
diff --git a/docs/other/performance.md b/docs/other/performance.md
index f965be7e2..4e598f42f 100644
--- a/docs/other/performance.md
+++ b/docs/other/performance.md
@@ -9,3 +9,33 @@ Install the plugin on your host computer: `vagrant plugin install vagrant-cachie
 Drupal VM's `Vagrantfile` includes the appropriate `vagrant-cachier` configuration to cache Composer and apt dependencies.
 
 _You can also use this plugin to share other package manager caches. For more information read the [documentation](http://fgrehm.viewdocs.io/vagrant-cachier/usage/)._
+
+## Improving performance on Windows
+
+By default, if you use the _NFS_ synced folder type, Vagrant will ignore this directive and use the native (usually slow) VirtualBox shared folder system instead. You can get higher performance by doing one of the following (all of these steps require a full VM reload (`vagrant reload`) to take effect):
+
+  1. **Install the `vagrant-winnfsd` plugin**. See the 'NFS' section later for more details and caveats.
+  2. **Use `smb` for the synced folder's type.**
+  2. **Use `rsync` for the synced folder's type.** This requires that you have `rsync` available on your Windows workstation, which you can get if you install a substitute CLI like [Cygwin](https://www.cygwin.com/) or [Cmder](http://cmder.net/).
+
+### NFS
+
+You can use the [vagrant-winnfsd](https://github.com/GM-Alex/vagrant-winnfsd) plugin to get NFS support on windows. Be aware that there are multiple issues logged against both the plugin and the winnfsd project, so no guarantees.
+
+#### Using WinNFSD without `vagrant-winnfsd`
+
+Another option for the more adventurous is to manually install and configure WinNFSD, and manually mount the shares within your VM. This requires a bit more work, but could be more stable on Windows; see this blog post for more details: [Windows + Vagrant + WinNFSD without file update problems](https://hollyit.net/blog/windowsvagrantwinnfsd-without-file-update-problems).
+
+GuyPaddock's [fork of `vagrant-winnfsd`](https://github.com/GuyPaddock/vagrant-winnfsd) adds logging and debug messages. You can replace the vagrant-winnfsd gem inside `.vagrant.d\gems\gems` to use it instead. For further caveats, please read through [vagrant-winnfsd issue #12](https://github.com/winnfsd/vagrant-winnfsd/issues/12#issuecomment-78195957), and make the following changes to `config.yml`:
+
+    vagrant_synced_folder_default_type: ""
+
+Add `mount_options` to your synced folder to avoid an error:
+
+    type: nfs
+    mount_options: ["rw","vers=3","udp","nolock"]
+
+In a custom `Vagrantfile.local`, add user access to Vagrant:
+
+    config.winnfsd.uid=900
+    config.winnfsd.gid=900

From c37b740c7f91f7a6a5e831018989d2a95ffccae8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 26 Jan 2017 08:51:57 -0500
Subject: [PATCH 0595/1273] Update index.md with new getting started pages [ci
 skip]

---
 docs/index.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/index.md b/docs/index.md
index a10ae6c37..0206d5da2 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -2,7 +2,11 @@
 
 [Drupal VM](https://www.drupalvm.com/) is A VM for local Drupal development, built with Vagrant + Ansible.
 
-Welcome to Drupal VM's documentation site! Please read through the [Quick Start Guide](https://github.com/geerlingguy/drupal-vm#quick-start-guide) to get started, and then browse the rest of this project's documentation in the sidebar.
+Welcome to Drupal VM's documentation site! Get started by reading the installation instructions for you platform:
+
+- [macOS](getting-started/installation-macos.md)
+- [Windows](getting-started/installation-windows.md)
+- [Linux](getting-started/installation-linux.md)
 
 ## Contributing to Drupal VM
 

From 742b7632322b5fcc4dcdc909fbb5c877cb25c7b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 26 Jan 2017 09:03:55 -0500
Subject: [PATCH 0596/1273] Fix typos etc [ci skip]

---
 docs/configurations/webservers-apache.md   | 2 +-
 docs/configurations/webservers-nginx.md    | 4 ++--
 docs/deployment/composer-dependency.md     | 4 ++--
 docs/deployment/composer-package.md        | 2 +-
 docs/deployment/composer.md                | 2 +-
 docs/extras/drush.md                       | 2 +-
 docs/getting-started/configure-drupalvm.md | 8 ++++----
 docs/getting-started/syncing-folders.md    | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/docs/configurations/webservers-apache.md b/docs/configurations/webservers-apache.md
index fe59d72dc..2edce6b34 100644
--- a/docs/configurations/webservers-apache.md
+++ b/docs/configurations/webservers-apache.md
@@ -4,7 +4,7 @@ You have complete control over all aspects of Apache VirtualHosts using the `apa
 
 See the examples included in the [`geerlingguy.apache` Ansible role's README](https://github.com/geerlingguy/ansible-role-apache#readme) for more info, as well as many other variables you can override to configure Apache exactly how you like it.
 
-## Enable SSH Support with Apache
+## Enable SSL Support with Apache
 
 To enable SSL support for you virtual hosts you first need a certificate file. You can generate a self-signed certificate with a command like
 
diff --git a/docs/configurations/webservers-nginx.md b/docs/configurations/webservers-nginx.md
index a4f98b42c..e2065229b 100644
--- a/docs/configurations/webservers-nginx.md
+++ b/docs/configurations/webservers-nginx.md
@@ -6,9 +6,9 @@ Also, see the examples included in the [`geerlingguy.nginx` Ansible role's READM
 
 _Note: if you're using php-fpm, you may want to reflect your use of nginx by setting `php_fpm_pool_user` and `php_fpm_pool_group` in your `config.yml`._
 
-## Enable SSH Support with Nginx
+## Enable SSL Support with Nginx
 
-To enable SSL support for you virtual hosts you first need a certificate file. See the same section under the [Apache documentation](webservers-apache.md#enable-ssh-support-with-apache) for how to generate a self-signed certficiate.
+To enable SSL support for you virtual hosts you first need a certificate file. See the same section under the [Apache documentation](webservers-apache.md#enable-ssl-support-with-apache) for how to generate a self-signed certficiate.
 
 Modify your nginx host configuration by adding the following `extra_parameters` to the first entry in `nginx_hosts`:
 
diff --git a/docs/deployment/composer-dependency.md b/docs/deployment/composer-dependency.md
index 9e0f30e9e..7209dcae7 100644
--- a/docs/deployment/composer-dependency.md
+++ b/docs/deployment/composer-dependency.md
@@ -45,7 +45,7 @@ If you intened to use the devel module, it must be added as a requirement to you
 drupal_enabled_modules: []
 ```
 
-If you're using `pre_provision_scripts` or `post_provision_scripts` you also need to adjust their paths to take into account the new directory structure. The examples used in `default.config.yml` assume the files are located in the Drupal VM directory. If you use relative paths you need to the ascend the directory tree as far as the project root, but using the `config_dir` variable you get the absolute path of where you `config.yml` is located.
+If you're using `pre_provision_scripts` or `post_provision_scripts` you also need to adjust their paths to take into account the new directory structure. The examples used in `default.config.yml` assume the files are located in the Drupal VM directory. You can use the `config_dir` variable which is the absolute path of the directory where your `config.yml` is located.
 
 ```yaml
 post_provision_scripts:
@@ -105,7 +105,7 @@ _Important: you should never issue `vagrant` commands through Drupal VM's own `V
 
 ## Drupal VM in a subdirectory without composer
 
-If you don't use `composer` in your project you can still download  Drupal VM (or add it as a git submodule) to any subdirectory in your project. As an example let's name that directory `box/`.
+If you're not using `composer` in your project you can still download  Drupal VM (or add it as a git submodule) to any subdirectory in your project. As an example let's name that directory `box/`.
 
 ```
 ├── docroot/
diff --git a/docs/deployment/composer-package.md b/docs/deployment/composer-package.md
index 5e9d6e70e..816d56f31 100644
--- a/docs/deployment/composer-package.md
+++ b/docs/deployment/composer-package.md
@@ -1,6 +1,6 @@
 Out of the box Drupal VM is configured to use `composer create-project` to build a Drupal 8 codebase.
 
-This is set up by the following settings in `config.yml`:
+This is set up with the following variables in `config.yml`:
 
   - Composer will build the project if `build_composer_project` is `true`, and `build_makefile` and `build_composer` are both `false`.
   - The Composer package is defined by `drupal_composer_project_package`.
diff --git a/docs/deployment/composer.md b/docs/deployment/composer.md
index 2515fd0db..d64f2ecf1 100644
--- a/docs/deployment/composer.md
+++ b/docs/deployment/composer.md
@@ -1,4 +1,4 @@
-Drupal VM is configured to use `composer create-project` to build a Drupal 8 codebase by default but supports building Drupal from a custom composer.json as well.
+Drupal VM is configured to use `composer create-project` to build a Drupal 8 codebase by default but supports building Drupal from a custom `composer.json` file as well.
 
 1. Copy `example.drupal.composer.json` to `drupal.composer.json` and modify it to your liking.
 2. Use the Composer build system by setting `build_composer: true` in your `config.yml` (make sure `build_makefile` and `build_composer_project` are set to `false`).
diff --git a/docs/extras/drush.md b/docs/extras/drush.md
index 5794c20bc..6e21fdb03 100644
--- a/docs/extras/drush.md
+++ b/docs/extras/drush.md
@@ -39,7 +39,7 @@ You can disable Drupal VM's automatic Drush alias file management if you want to
 
 ## Using sql-sync
 
-For sql-sync to work between two remotes make sure you are running Drush 8.0.3 or later on your host and your guest machine, as well as 7.1.0 or later on the remote.
+_For sql-sync to work between two remotes make sure you are running Drush 8.0.3 or later on your host and your guest machine, as well as 7.1.0 or later on the remote._
 
 If you're locked to an older version of Drush, it is likely that Drush will try to run the command from the `@destination` instead of from your host computer, which means you need to move your `@remote` alias to Drupal VM as well. You can place the file in any of the [directories Drush searches](https://github.com/drush-ops/drush/blob/5a1328d6e9cb919a286e70360df159d1b4b15d3e/examples/example.aliases.drushrc.php#L43:L51), for example `/home/vagrant/.drush/<remote-alias>.aliases.drushrc.php`.
 
diff --git a/docs/getting-started/configure-drupalvm.md b/docs/getting-started/configure-drupalvm.md
index cada825e9..a4d4c6190 100644
--- a/docs/getting-started/configure-drupalvm.md
+++ b/docs/getting-started/configure-drupalvm.md
@@ -1,4 +1,4 @@
-If you only need a simple Drupal VM environment up and running there are no required configurations. The [configurations used by defualt are listed in `default.config.yml`](https://github.com/geerlingguy/drupal-vm/blob/master/default.config.yml) and you can override them with a number of optional configuration files.
+If you only need a simple Drupal VM environment up and running there are no required configurations. The [configurations used by default are listed in `default.config.yml`](https://github.com/geerlingguy/drupal-vm/blob/master/default.config.yml) and you can override them with a number of optional configuration files.
 
 _Note: The merge of variables in these files is shallow, if you want to override a single item in a list, you will need to re-define all items in that list._
 
@@ -39,10 +39,10 @@ vagrant_synced_folders:
 
 ### 4. vagrant.config.yml
 
-Environment specific overrides. When you run Drupal VM through _Vagrant_, the environment will be set to `vagrant` and thus this file is loaded when available. If you're doing something more advanced, such as running Drupal VM on a [production environment](../other/production.md), you can use a different environment configuration file, eg `prod.config.yml`.
+Environment specific overrides. When you run Drupal VM through _Vagrant_, the environment will be set to `vagrant` and this file is loaded when available. If you're doing something more advanced, such as running Drupal VM on a [production environment](../other/production.md), you can use a different environment configuration file, eg `prod.config.yml`.
 
-_Note: In addition to the variables listed in `default.config.yml`, you can also override the default variables set by the ansible roles included. In the "Installed extras" section of this documentation, each role has a link to the available variables._
+_Note: In addition to the variables listed in `default.config.yml`, you can also override the variables set by any of the ansible roles. In the "Installed extras" section of this documentation, each role has a link to the available variables._
 
-## Additional resources:
+## Additional resources
 
 - Jeff Geerling's DrupalDC talk "[Drupal VM Tips and Tricks for Drupal 8 development](https://www.youtube.com/watch?v=_wV6MDsT42Y)"
diff --git a/docs/getting-started/syncing-folders.md b/docs/getting-started/syncing-folders.md
index 824fb4410..10715d267 100644
--- a/docs/getting-started/syncing-folders.md
+++ b/docs/getting-started/syncing-folders.md
@@ -1,6 +1,6 @@
 You can share folders between your host computer and the VM in a variety of ways; the most commonly-used method is an NFS share. If you use Windows and encounter any problems with NFS, try switching to `smb`. The `default.config.yml` file contains an example `nfs` share that would sync the entire drupal-vm directory (configured as the relative path `.`) on your host into the `/var/www/drupalvm` folder on Virtual Machine.
 
-If you want to use a different synced folder method (e.g. `smb`), you can change `type` to:
+If you want to use a different synced folder method (e.g. `smb`), you can change `type`:
 
 ```yaml
 vagrant_synced_folders:

From 89a1e69e97aabbae2289338da79795b396c3796a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 26 Jan 2017 09:04:10 -0500
Subject: [PATCH 0597/1273] Move synced folder performance to performance
 section [ci skip]

---
 docs/getting-started/syncing-folders.md | 32 ++-----------------------
 docs/other/performance.md               | 32 +++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/docs/getting-started/syncing-folders.md b/docs/getting-started/syncing-folders.md
index 10715d267..3f121fe7b 100644
--- a/docs/getting-started/syncing-folders.md
+++ b/docs/getting-started/syncing-folders.md
@@ -36,38 +36,10 @@ options_override:
   ]
 ```
 
-## Synced Folder Performance
-
-Using different synced folder mechanisms can have a dramatic impact on your Drupal site's performance. Please read through the following blog posts for a thorough overview of synced folder performance:
-
-  - [Comparing filesystem performance in Virtual Machines](http://mitchellh.com/comparing-filesystem-performance-in-virtual-machines)
-  - [NFS, rsync, and shared folder performance in Vagrant VMs](http://www.jeffgeerling.com/blogs/jeff-geerling/nfs-rsync-and-shared-folder)
-
-Generally speaking:
-
-  - NFS offers a decent tradeoff between performance and ease of use
-  - SMB offers a similar tradeoff, but is a bit slower than NFS
-  - Rsync offers the best performance inside the VM, but sync is currently one-way-only (from host to VM), which can make certain development workflows burdensome
-  - Native shared folders offer abysmal performance; only use this mechanism as a last resort!
-
-If you are using rsync, it is advised to exclude certain directories so that they aren't synced. These include version control directories, database exports and Drupal's files directory.
-
-```yaml
-vagrant_synced_folders:
-  - local_path: .
-    destination: /var/www/drupalvm
-    type: rsync
-    create: true
-    excluded_paths:
-      - drupal/private
-      - drupal/public/.git
-      - drupal/public/sites/default/files
-      - drupal/tmp
-```
+## Synced Folder Troubleshooting
 
-This example assumes that you have Drupal in a directory called `drupal/public`.
+_Read the following [overview on the performance of the different synced folder mechanisms](../other/performance.md#synced-folder-performance)._
 
-## Synced Folder Troubleshooting
 
 There are a number of issues people encounter with synced folders from time to time. The most frequent issues are listed below with possible solutions:
 
diff --git a/docs/other/performance.md b/docs/other/performance.md
index 4e598f42f..ca6afd58d 100644
--- a/docs/other/performance.md
+++ b/docs/other/performance.md
@@ -10,6 +10,38 @@ Drupal VM's `Vagrantfile` includes the appropriate `vagrant-cachier` configurati
 
 _You can also use this plugin to share other package manager caches. For more information read the [documentation](http://fgrehm.viewdocs.io/vagrant-cachier/usage/)._
 
+## Synced Folder Performance
+
+Using different synced folder mechanisms can have a dramatic impact on your Drupal site's performance. Please read through the following blog posts for a thorough overview of synced folder performance:
+
+  - [Comparing filesystem performance in Virtual Machines](http://mitchellh.com/comparing-filesystem-performance-in-virtual-machines)
+  - [NFS, rsync, and shared folder performance in Vagrant VMs](http://www.jeffgeerling.com/blogs/jeff-geerling/nfs-rsync-and-shared-folder)
+
+Generally speaking:
+
+  - NFS offers a decent tradeoff between performance and ease of use
+  - SMB offers a similar tradeoff, but is a bit slower than NFS
+  - Rsync offers the best performance inside the VM, but sync is currently one-way-only (from host to VM), which can make certain development workflows burdensome
+  - Native shared folders offer abysmal performance; only use this mechanism as a last resort!
+
+If you are using rsync, it is advised to exclude certain directories so that they aren't synced. These include version control directories, database exports and Drupal's files directory.
+
+```yaml
+vagrant_synced_folders:
+  - local_path: .
+    destination: /var/www/drupalvm
+    type: rsync
+    create: true
+    excluded_paths:
+      - drupal/private
+      - drupal/public/.git
+      - drupal/public/sites/default/files
+      - drupal/tmp
+```
+
+_This example assumes that you have Drupal in a directory called `drupal/public`._
+
+
 ## Improving performance on Windows
 
 By default, if you use the _NFS_ synced folder type, Vagrant will ignore this directive and use the native (usually slow) VirtualBox shared folder system instead. You can get higher performance by doing one of the following (all of these steps require a full VM reload (`vagrant reload`) to take effect):

From 0856af0d7d5c93b36d1005b89bb28162e02fe428 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 26 Jan 2017 09:41:15 -0500
Subject: [PATCH 0598/1273] update redis docs with instructions [ci skip]

---
 docs/extras/redis.md | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/docs/extras/redis.md b/docs/extras/redis.md
index 78410bcb6..2550860fa 100644
--- a/docs/extras/redis.md
+++ b/docs/extras/redis.md
@@ -1,5 +1,17 @@
 [Redis](https://redis.io/) is an in-memory caching system, much like [Memcached](memcached.md). While [Varnish](varnish.md) is generally used to improve performance for anonymous users, `redis` is used to improve the performance for logged in users.
 
-To enable Redis in Drupal VM, first make sure `redis` is in the list of `installed_extras` in your `config.yml`. Install the [Redis](https://www.drupal.org/project/redis) module and configure it as described in the [module's README](http://cgit.drupalcode.org/redis/tree/README.md).
+To enable Redis in Drupal VM:
+
+1. Make sure `redis` is in the list of `installed_extras` in your `config.yml`.
+2. Install the [Redis](https://www.drupal.org/project/redis) module.
+3. Enable the module before you configure it in the next step.
+4. Add the following to your `settings.php`
+
+```php
+// Make redis the default cache class.
+$settings['cache']['default'] = 'cache.backend.redis'
+```
+
+There's a lot more configuration available and the best resource is generally the [Redis module's README](http://cgit.drupalcode.org/redis/tree/README.md).
 
 For a list of available role variables, see the [`geerlingguy.redis` Ansible role's README](https://github.com/geerlingguy/ansible-role-redis#readme).

From 25acaf5f82284ea1fa1ec3fe552e6b2d3d8966c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 26 Jan 2017 10:06:27 -0500
Subject: [PATCH 0599/1273] Issue #1110: Move cron example to docs [ci skip]

---
 default.config.yml   |  3 ---
 docs/extras/drush.md | 13 +++++++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/default.config.yml b/default.config.yml
index ef61c425b..167c59797 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -90,9 +90,6 @@ drupal_site_install_extra_args: []
 # Cron jobs are added to the vagrant user's crontab. Keys include name
 # (required), minute, hour, day, weekday, month, job (required), and state.
 drupalvm_cron_jobs: []
-  # - name: "Drupal Cron"
-  #   minute: "*/30"
-  #   job: "drush -r {{ drupal_core_path }} core-cron"
 
 # Drupal VM automatically creates a drush alias file in your ~/.drush folder if
 # this variable is 'true'.
diff --git a/docs/extras/drush.md b/docs/extras/drush.md
index 6e21fdb03..29fb98365 100644
--- a/docs/extras/drush.md
+++ b/docs/extras/drush.md
@@ -49,4 +49,17 @@ If you're still having issues, you can avoid `sql-sync` entirely and pipe the my
 drush @remote sql-dump | drush @drupalvm.drupalvm.dev sql-cli
 ```
 
+## Running `drush core-cron` as a cron job.
+
+Using the `drupalvm_cron_jobs` list in `config.yml` you can configure your VM to automatically run cron tasks eg. every 30 minutes.
+
+```yaml
+drupalvm_cron_jobs:
+  - name: "Drupal Cron"
+    minute: "*/30"
+    job: "{{ drush_path }} -r {{ drupal_core_path }} core-cron"
+```
+
+_Cron jobs are added to the vagrant user's crontab. Keys include name (required), minute, hour, day, weekday, month, job (required), and state._
+
 For a list of available role variables, see the [`geerlingguy.drush` Ansible role's README](https://github.com/geerlingguy/ansible-role-drush#readme).

From b48609ab839e92db476927ea4649b9f6061af03b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Fri, 30 Dec 2016 23:44:14 -0500
Subject: [PATCH 0600/1273] Issue #649: Add docs on how to use vagrant-lxc [ci
 skip]

---
 docs/other/vagrant-lxc.md | 41 +++++++++++++++++++++++++++++++++++++++
 mkdocs.yml                |  1 +
 2 files changed, 42 insertions(+)
 create mode 100644 docs/other/vagrant-lxc.md

diff --git a/docs/other/vagrant-lxc.md b/docs/other/vagrant-lxc.md
new file mode 100644
index 000000000..79279ad21
--- /dev/null
+++ b/docs/other/vagrant-lxc.md
@@ -0,0 +1,41 @@
+[`vagrant-lxc` is a Vagrant plugin](https://github.com/fgrehm/vagrant-lxc) that provisions Linux Containers (LXC) rather than VM's such as VirtualBox or VMWare. Although LXC has much better performance, it only works on Linux hosts, and it isn't as well supported or tested by Drupal VM.
+
+### Install dependencies
+
+    sudo apt-get install lxc bridge-utils
+    vagrant plugin install vagrant-lxc
+
+### Load required kernel modules
+
+As containers can't load modules, but inherit them from the host, you need to load these on your host machine.
+
+    sudo modprobe iptable_filter
+    sudo modprobe ip6table_filter
+
+To load these automatically when you boot up your system, you should check the guidelines of your specific distribution. Usually you add them to `/etc/modules` or `/etc/modules-load.d/*`
+
+### Create a [`Vagrantfile.local`](overriding-configurations.md#extending-the-vagrantfile-with-vagrantfilelocal)
+
+    config.vm.networks[0][1][:lxc__bridge_name] = 'vlxcbr1'
+    config.vm.provider :lxc do |lxc|
+      lxc.customize 'cgroup.memory.limit_in_bytes', "#{vconfig['vagrant_memory']}M"
+    end
+
+Read more about how to configure the container in [`vagrant-lxc`'s README.md](https://github.com/fgrehm/vagrant-lxc#readme).
+
+### Modify your `config.yml`
+
+The following boxes have been tested only minimally, choose which one you want.
+
+    # Centos 7
+    vagrant_box: frensjan/centos-7-64-lxc
+
+    # Ubuntu 16.04
+    vagrant_box: nhinds/xenial64
+
+    # Do not interact with the UFW service on Ubuntu.
+    drupalvm_disable_ufw_firewall: false
+
+### Provision the Container
+
+    vagrant up --provider=lxc
diff --git a/mkdocs.yml b/mkdocs.yml
index 2169c2271..88488048c 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -64,6 +64,7 @@ pages:
   - Other Information:
     - 'Networking Notes': 'other/networking.md'
     - 'Vagrant and VirtualBox': 'other/vagrant-virtualbox.md'
+    - 'Vagrant LXC provider': 'other/vagrant-lxc.md'
     - 'Improving Performance': 'other/performance.md'
     - 'BigPipe with Drupal VM': 'other/bigpipe.md'
     - 'Drupal multisite': 'deployment/multisite.md'

From 31b099361b5f4c8a24a3fa8ab4778af87a84ae29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 26 Jan 2017 16:51:50 -0500
Subject: [PATCH 0601/1273] PR #1094 follow-up: Fix old link [ci skip]

---
 docs/other/vagrant-lxc.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/other/vagrant-lxc.md b/docs/other/vagrant-lxc.md
index 79279ad21..d1422b88b 100644
--- a/docs/other/vagrant-lxc.md
+++ b/docs/other/vagrant-lxc.md
@@ -14,7 +14,7 @@ As containers can't load modules, but inherit them from the host, you need to lo
 
 To load these automatically when you boot up your system, you should check the guidelines of your specific distribution. Usually you add them to `/etc/modules` or `/etc/modules-load.d/*`
 
-### Create a [`Vagrantfile.local`](overriding-configurations.md#extending-the-vagrantfile-with-vagrantfilelocal)
+### Create a [`Vagrantfile.local`](../extending/vagrantfile.md)
 
     config.vm.networks[0][1][:lxc__bridge_name] = 'vlxcbr1'
     config.vm.provider :lxc do |lxc|

From 5000f1965356bff217719ccc8dc9ff7488bbd557 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 30 Jan 2017 15:36:01 -0600
Subject: [PATCH 0602/1273] Issue #1149: Update CHANGELOG.md with changes for
 4.2.0.

---
 CHANGELOG.md | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4363918e5..57d6372cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,34 @@
 # Drupal VM Changelog
 
+## 4.2.0 "Theme From Tron" (2017-01-30)
+
+### Breaking Changes
+
+  * N/A
+
+### New/changed variables in default.config.yml
+
+  * `apache_packages_state: latest` added to ensure latest Apache version is installed.
+  * `firewall_disable_firewalld: true` and `firewall_disable_ufw: true` to ensure the system default firewalls are disabled on CentOS and Ubuntu, respectively (we set up our own rules, so this prevents weird problems).
+
+### Improvements
+
+  * #1123: Add Tideways support and updated documentation for use.
+  * #1107: Allow additions to PHP packages via php_packages_extra.
+  * #1092: Docs makeover.
+  * #1134: Make Solr core work out of the box with Drupal 8 Search API Solr more easily.
+  * #1110: Move `cron` example to the Docs.
+  * #649: Document how to use `vagrant-lxc` with Drupal VM.
+  * Update roles to latest versions: firewall, elasticsearch, nodejs, solr, nginx.
+
+### Bugfixes
+
+  * #1093: Upgrade Apache packages on provision so latest release is installed.
+  * #1101: Update Selenium role so it works on systemd systems (e.g. Ubuntu 16.04, CentOS 7).
+  * #1102: Update ruby role to add gem bin directory to `$PATH`.
+  * #1131: Fixes solr < 5 on Ubuntu 16, CentOS 7 with Ansible 2.2.
+
+
 ## 4.1.1 (2016-12-30)
 
 ### Bugfixes

From c91c478cf06b472ae008d45f717d74c9bc5187ab Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 30 Jan 2017 22:31:10 -0600
Subject: [PATCH 0603/1273] Upgrade Nginx role to latest version.

---
 provisioning/requirements.yml                         |  2 +-
 provisioning/roles/geerlingguy.nginx/README.md        | 11 +++++++++++
 .../roles/geerlingguy.nginx/defaults/main.yml         |  7 +++++++
 .../roles/geerlingguy.nginx/templates/nginx.conf.j2   |  5 ++---
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 974d33fc1..679a9610d 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -36,7 +36,7 @@
 - src: geerlingguy.mysql
   version: 2.5.0
 - src: geerlingguy.nginx
-  version: 1.9.7
+  version: 2.0.0
 - src: geerlingguy.nodejs
   version: 4.0.0
 - src: geerlingguy.php
diff --git a/provisioning/roles/geerlingguy.nginx/README.md b/provisioning/roles/geerlingguy.nginx/README.md
index ff8707bda..12549b40b 100644
--- a/provisioning/roles/geerlingguy.nginx/README.md
+++ b/provisioning/roles/geerlingguy.nginx/README.md
@@ -77,6 +77,10 @@ TCP connection options. See [this blog post](https://t37.net/nginx-optimization-
 
 Nginx keepalive settings. Timeout should be set higher (10s+) if you have more polling-style traffic (AJAX-powered sites especially), or lower (<10s) if you have a site where most users visit a few pages and don't send any further requests.
 
+    nginx_server_tokens: "on"
+
+Nginx server_tokens settings. Controls whether nginx responds with it's version in HTTP headers. Set to `"off"` to disable.
+
     nginx_client_max_body_size: "64m"
 
 This value determines the largest file upload possible, as uploads are passed through Nginx before hitting a backend like `php-fpm`. If you get an error like `client intended to send too large body`, it means this value is set too low.
@@ -100,6 +104,13 @@ Extra lines to be inserted in the top-level `http` block in `nginx.conf`. The va
       proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
       proxy_set_header   Host $http_host;
 
+    nginx_log_format: |
+      '$remote_addr - $remote_user [$time_local] "$request" '
+      '$status $body_bytes_sent "$http_referer" '
+      '"$http_user_agent" "$http_x_forwarded_for"'
+
+Configures Nginx's [`log_format`](http://nginx.org/en/docs/http/ngx_http_log_module.html#log_format). options.
+
     nginx_default_release: ""
 
 (For Debian/Ubuntu only) Allows you to set a different repository for the installation of Nginx. As an example, if you are running Debian's wheezy release, and want to get a newer version of Nginx, you can install the `wheezy-backports` repository and set that value here, and Ansible will use that as the `-t` option while installing Nginx.
diff --git a/provisioning/roles/geerlingguy.nginx/defaults/main.yml b/provisioning/roles/geerlingguy.nginx/defaults/main.yml
index f5b602ac0..cd139d982 100644
--- a/provisioning/roles/geerlingguy.nginx/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.nginx/defaults/main.yml
@@ -26,6 +26,8 @@ nginx_tcp_nodelay: "on"
 nginx_keepalive_timeout: "65"
 nginx_keepalive_requests: "100"
 
+nginx_server_tokens: "on"
+
 nginx_client_max_body_size: "64m"
 
 nginx_server_names_hash_bucket_size: "64"
@@ -71,3 +73,8 @@ nginx_upstreams: []
 #     "srv2.example.com weight=3",
 #     "srv3.example.com"
 #   }
+
+nginx_log_format: |
+  '$remote_addr - $remote_user [$time_local] "$request" '
+  '$status $body_bytes_sent "$http_referer" '
+  '"$http_user_agent" "$http_x_forwarded_for"'
diff --git a/provisioning/roles/geerlingguy.nginx/templates/nginx.conf.j2 b/provisioning/roles/geerlingguy.nginx/templates/nginx.conf.j2
index cedfd72fc..262e54a52 100644
--- a/provisioning/roles/geerlingguy.nginx/templates/nginx.conf.j2
+++ b/provisioning/roles/geerlingguy.nginx/templates/nginx.conf.j2
@@ -22,9 +22,7 @@ http {
 
     client_max_body_size {{ nginx_client_max_body_size }};
 
-    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-                      '$status $body_bytes_sent "$http_referer" '
-                      '"$http_user_agent" "$http_x_forwarded_for"';
+    log_format  main  {{ nginx_log_format|indent(23) }};
 
     access_log  {{ nginx_access_log }};
 
@@ -35,6 +33,7 @@ http {
     keepalive_timeout  {{ nginx_keepalive_timeout }};
     keepalive_requests {{ nginx_keepalive_requests }};
 
+    server_tokens {{ nginx_server_tokens }};
     #gzip  on;
 
 {% if nginx_proxy_cache_path %}

From 886af660a01d7c56eb4d93ad474be625942d3361 Mon Sep 17 00:00:00 2001
From: Joe Stewart <joe.stewart@mediacurrent.com>
Date: Thu, 2 Feb 2017 11:14:17 -0600
Subject: [PATCH 0604/1273] Link to new page for php version documentation.

---
 default.config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.config.yml b/default.config.yml
index 167c59797..af6afe892 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -237,7 +237,7 @@ firewall_disable_firewalld: true
 firewall_disable_ufw: true
 
 # PHP Configuration. Currently-supported versions: 5.6, 7.0, 7.1.
-# See version-specific notes: http://docs.drupalvm.com/en/latest/other/php/
+# See version-specific notes: http://docs.drupalvm.com/en/latest/configurations/php/
 php_version: "7.0"
 php_install_recommends: no
 php_memory_limit: "192M"

From 3b6e1d0249449312cf03e62254fc48ef9557fcfa Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 6 Feb 2017 22:37:27 -0600
Subject: [PATCH 0605/1273] Fixes #1155: Fix failure installing Chrome on
 Ubuntu 14.04.

---
 provisioning/requirements.yml                      | 2 +-
 provisioning/roles/arknoll.selenium/tasks/main.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 679a9610d..8236b5890 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -1,6 +1,6 @@
 ---
 - src: arknoll.selenium
-  version: 2.1.0
+  version: 2.1.1
 - src: thom8.php-upload-progress
   version: 1.0.1
 - src: franklinkim.newrelic
diff --git a/provisioning/roles/arknoll.selenium/tasks/main.yml b/provisioning/roles/arknoll.selenium/tasks/main.yml
index f9dc23e1e..a430a739f 100644
--- a/provisioning/roles/arknoll.selenium/tasks/main.yml
+++ b/provisioning/roles/arknoll.selenium/tasks/main.yml
@@ -32,7 +32,7 @@
 
 - name: Add Chrome repo (if configured, Debian)
   apt_repository:
-    repo: "deb http://dl.google.com/linux/chrome/deb/ stable main"
+    repo: "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main"
     state: present
     update_cache: yes
   when: ansible_os_family == 'Debian' and selenium_install_chrome

From 4a0a3bf2e57eaa5c015ab9a1f7af9f01e490e989 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 7 Feb 2017 11:12:42 -0600
Subject: [PATCH 0606/1273] Update to latest version of Java role.

---
 provisioning/requirements.yml                              | 2 +-
 provisioning/roles/geerlingguy.java/README.md              | 2 +-
 provisioning/roles/geerlingguy.java/tasks/setup-Debian.yml | 3 ---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 8236b5890..6920d9ae0 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -28,7 +28,7 @@
 - src: geerlingguy.git
   version: 1.2.1
 - src: geerlingguy.java
-  version: 1.7.2
+  version: 1.7.3
 - src: geerlingguy.mailhog
   version: 2.1.1
 - src: geerlingguy.memcached
diff --git a/provisioning/roles/geerlingguy.java/README.md b/provisioning/roles/geerlingguy.java/README.md
index a18015790..f970ea796 100644
--- a/provisioning/roles/geerlingguy.java/README.md
+++ b/provisioning/roles/geerlingguy.java/README.md
@@ -63,4 +63,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.java/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.java/tasks/setup-Debian.yml
index 9ea60f7b7..dd9cc09d6 100644
--- a/provisioning/roles/geerlingguy.java/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.java/tasks/setup-Debian.yml
@@ -1,7 +1,4 @@
 ---
-- name: Update apt cache.
-  apt: update_cache=yes cache_valid_time=600
-
 - name: Ensure Java is installed.
   apt: "name={{ item }} state=present"
   with_items: "{{ java_packages }}"

From eddff37b86d65731aa611a0e2e77786d942941d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 8 Feb 2017 22:27:12 -0500
Subject: [PATCH 0607/1273] Fixes #1158, Follow-up #1086: Fix Drupal 7 and
 nginx breaking install.php access

---
 provisioning/templates/nginx-vhost.conf.j2 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/provisioning/templates/nginx-vhost.conf.j2 b/provisioning/templates/nginx-vhost.conf.j2
index 7469dc8eb..d62ca7a2a 100644
--- a/provisioning/templates/nginx-vhost.conf.j2
+++ b/provisioning/templates/nginx-vhost.conf.j2
@@ -26,10 +26,12 @@ server {
         return 404;
     }
 
+{% if drupal_major_version == 8 %}
     # Redirect common PHP files to their new locations.
     location ~ ^((?!.*(?:core)).*)/(install.php|rebuild.php) {
          return 301 $scheme://$host$1/core/$2$is_args$args;
     }
+{% endif %}
 
     # Use fastcgi for all php files.
     location ~ \.php$|^/update.php {

From 14f6a3b03f7d5c1a9cc2541176f33fa93a8bc05c Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 8 Feb 2017 21:45:42 -0600
Subject: [PATCH 0608/1273] Update Composer role to latest version.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.composer/.travis.yml    | 25 ++++++++-----------
 .../roles/geerlingguy.composer/README.md      | 10 +++++++-
 .../geerlingguy.composer/defaults/main.yml    |  4 +++
 .../tasks/global-require.yml                  |  9 ++++---
 .../roles/geerlingguy.composer/tasks/main.yml |  5 ++++
 .../tasks/project-bin.yml                     |  6 +++++
 .../templates/composer-project.sh.j2          |  1 +
 .../tests/requirements.yml                    |  1 +
 .../roles/geerlingguy.composer/tests/test.yml | 17 ++++++++++++-
 10 files changed, 59 insertions(+), 21 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.composer/tasks/project-bin.yml
 create mode 100644 provisioning/roles/geerlingguy.composer/templates/composer-project.sh.j2

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 6920d9ae0..22f6c17d9 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -14,7 +14,7 @@
 - src: geerlingguy.blackfire
   version: 1.0.0
 - src: geerlingguy.composer
-  version: 1.5.0
+  version: 1.6.0
 - src: geerlingguy.daemonize
   version: 1.1.1
 - src: geerlingguy.drupal-console
diff --git a/provisioning/roles/geerlingguy.composer/.travis.yml b/provisioning/roles/geerlingguy.composer/.travis.yml
index 04be4ceaf..a31937acd 100644
--- a/provisioning/roles/geerlingguy.composer/.travis.yml
+++ b/provisioning/roles/geerlingguy.composer/.travis.yml
@@ -1,5 +1,5 @@
 ---
-sudo: required
+services: docker
 
 env:
   - distro: centos7
@@ -11,31 +11,31 @@ env:
   - distro: ubuntu1604
     init: /lib/systemd/systemd
     run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-
-services:
-  - docker
+  - distro: debian8
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
 
 before_install:
   # Pull container.
-  - 'sudo docker pull geerlingguy/docker-${distro}-ansible:latest'
+  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
   - container_id=$(mktemp)
   # Run container in detached state.
-  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
+  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
 
   # Install dependencies.
-  - 'sudo docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
+  - 'docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
 
   # Ansible syntax check.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
 
   # Test role.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
 
   # Test role idempotence.
   - idempotence=$(mktemp)
-  - sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
+  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
   - >
     tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
@@ -43,10 +43,7 @@ script:
     || (echo 'Idempotence test: fail' && exit 1)
 
   # Ensure Composer is installed and working.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm composer || true'
-
-  # Clean up.
-  - 'sudo docker stop "$(cat ${container_id})"'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm composer || true'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.composer/README.md b/provisioning/roles/geerlingguy.composer/README.md
index 0994cbb79..c0cb88fe5 100644
--- a/provisioning/roles/geerlingguy.composer/README.md
+++ b/provisioning/roles/geerlingguy.composer/README.md
@@ -39,6 +39,14 @@ A list of packages to install globally (using `composer global require`). If you
 
 If `true`, and if there are any configured `composer_global_packages`, the `vendor/bin` directory inside `composer_home_path` will be added to the system's default `$PATH` (for all users).
 
+    composer_project_path: /path/to/project
+
+Path to a composer project.
+
+    composer_add_project_to_path: false
+
+If `true`, and if you have configured a `composer_project_path`, the `vendor/bin` directory inside `composer_project_path` will be added to the system's default `$PATH` (for all users).
+
     composer_github_oauth_token: ''
 
 GitHub OAuth token, used to avoid GitHub API rate limiting errors when building and rebuilding applications using Composer. Follow GitHub's directions to [Create a personal access token](https://help.github.com/articles/creating-an-access-token-for-command-line-use/) if you run into these rate limit errors.
@@ -65,4 +73,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.composer/defaults/main.yml b/provisioning/roles/geerlingguy.composer/defaults/main.yml
index a6313ea6b..cf89087e0 100644
--- a/provisioning/roles/geerlingguy.composer/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.composer/defaults/main.yml
@@ -16,5 +16,9 @@ composer_global_packages: []
 
 composer_add_to_path: true
 
+# Add a project vendor/bin directory to the PATH
+composer_add_project_to_path: false
+#composer_project_path: /path/to/project/vendor/bin
+
 # GitHub OAuth token (used to help overcome API rate limits).
 composer_github_oauth_token: ''
diff --git a/provisioning/roles/geerlingguy.composer/tasks/global-require.yml b/provisioning/roles/geerlingguy.composer/tasks/global-require.yml
index 6f20b4c93..d3f2753f3 100644
--- a/provisioning/roles/geerlingguy.composer/tasks/global-require.yml
+++ b/provisioning/roles/geerlingguy.composer/tasks/global-require.yml
@@ -1,11 +1,12 @@
 ---
 - name: Install configured globally-required packages.
-  become: yes
-  become_user: "{{ composer_home_owner }}"
-  shell: >
-    COMPOSER_HOME={{ composer_home_path }}
+  command: >
     {{ composer_path }} global require {{ item.name }}:{{ item.release | default('@stable') }} --no-progress
     creates={{ composer_home_path }}/vendor/{{ item.name }}
+  environment:
+    COMPOSER_HOME: "{{ composer_home_path }}"
+  become: yes
+  become_user: "{{ composer_home_owner }}"
   register: composer_global_require_result
   with_items: "{{ composer_global_packages }}"
 
diff --git a/provisioning/roles/geerlingguy.composer/tasks/main.yml b/provisioning/roles/geerlingguy.composer/tasks/main.yml
index 6a65e991f..0a19deb3a 100644
--- a/provisioning/roles/geerlingguy.composer/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.composer/tasks/main.yml
@@ -42,6 +42,8 @@
     state: directory
 
 - name: Add GitHub OAuth token for Composer (if configured).
+  become: yes
+  become_user: "{{ composer_home_owner }}"
   template:
     src: "auth.json.j2"
     dest: "{{ composer_home_path }}/auth.json"
@@ -51,3 +53,6 @@
 
 - include: global-require.yml
   when: composer_global_packages|length > 0
+
+- include: project-bin.yml
+  when: composer_add_project_to_path
diff --git a/provisioning/roles/geerlingguy.composer/tasks/project-bin.yml b/provisioning/roles/geerlingguy.composer/tasks/project-bin.yml
new file mode 100644
index 000000000..3f9112e36
--- /dev/null
+++ b/provisioning/roles/geerlingguy.composer/tasks/project-bin.yml
@@ -0,0 +1,6 @@
+---
+- name: Add composer_project_path bin directory to global $PATH.
+  template:
+    src: composer-project.sh.j2
+    dest: /etc/profile.d/composer-project.sh
+    mode: 0644
diff --git a/provisioning/roles/geerlingguy.composer/templates/composer-project.sh.j2 b/provisioning/roles/geerlingguy.composer/templates/composer-project.sh.j2
new file mode 100644
index 000000000..1ca9be7de
--- /dev/null
+++ b/provisioning/roles/geerlingguy.composer/templates/composer-project.sh.j2
@@ -0,0 +1 @@
+export PATH={{ composer_project_path }}/vendor/bin:$PATH
diff --git a/provisioning/roles/geerlingguy.composer/tests/requirements.yml b/provisioning/roles/geerlingguy.composer/tests/requirements.yml
index 86d9ed78e..8263a0c90 100644
--- a/provisioning/roles/geerlingguy.composer/tests/requirements.yml
+++ b/provisioning/roles/geerlingguy.composer/tests/requirements.yml
@@ -1,4 +1,5 @@
 ---
 - src: geerlingguy.repo-remi
+- src: geerlingguy.repo-dotdeb
 - src: geerlingguy.git
 - src: geerlingguy.php
diff --git a/provisioning/roles/geerlingguy.composer/tests/test.yml b/provisioning/roles/geerlingguy.composer/tests/test.yml
index 95b5fa7a4..19e8995cc 100644
--- a/provisioning/roles/geerlingguy.composer/tests/test.yml
+++ b/provisioning/roles/geerlingguy.composer/tests/test.yml
@@ -13,12 +13,27 @@
 
   pre_tasks:
     - name: Update apt cache.
-      apt: update_cache=yes
+      apt: update_cache=yes cache_valid_time=600
       when: ansible_distribution == 'Ubuntu'
 
+    - name: Set php_packages for PHP 7.0 Debian 8 install.
+      set_fact:
+        php_packages:
+          - php7.0-common
+          - php7.0-cli
+          - php7.0-dev
+          - php7.0-fpm
+          - libpcre3-dev
+          - php7.0-opcache
+          - php7.0-apcu
+          - php7.0-xml
+      when: ansible_distribution == 'Debian'
+
   roles:
     - role: geerlingguy.repo-remi
       when: ansible_os_family == 'RedHat' and ansible_distribution != 'Fedora'
+    - role: geerlingguy.repo-dotdeb
+      when: ansible_distribution == 'Debian'
     - geerlingguy.git
     - geerlingguy.php
     - role_under_test

From efefdb497ac5ecf4e375bdd1e5d8982f98a0b0ce Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 8 Feb 2017 21:50:18 -0600
Subject: [PATCH 0609/1273] Issue #1160: Update CHANGELOG for 4.2.1.

---
 CHANGELOG.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 57d6372cd..88bdfa0a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Drupal VM Changelog
 
+## 4.2.1 (2017-02-08)
+
+### Improvements
+
+  * Update Nginx, Java, Composer, and Selenium roles to latest version.
+
+### Bugfixes
+
+  * #1158: Fix Drupal 7 and Nginx breaking install.php access.
+  * #1155: Fix failure installing Chrome on Ubuntu 14.04 (Selenium role).
+  * #1151: PHP docs fix.
+
+
 ## 4.2.0 "Theme From Tron" (2017-01-30)
 
 ### Breaking Changes

From d54a7aa9c197b11e890513b68c03a50b3fa448ab Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 9 Feb 2017 17:13:47 -0600
Subject: [PATCH 0610/1273] Update Composer role to latest version.

---
 provisioning/requirements.yml                                   | 2 +-
 .../roles/geerlingguy.composer/templates/composer-project.sh.j2 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 22f6c17d9..18970ddde 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -14,7 +14,7 @@
 - src: geerlingguy.blackfire
   version: 1.0.0
 - src: geerlingguy.composer
-  version: 1.6.0
+  version: 1.6.1
 - src: geerlingguy.daemonize
   version: 1.1.1
 - src: geerlingguy.drupal-console
diff --git a/provisioning/roles/geerlingguy.composer/templates/composer-project.sh.j2 b/provisioning/roles/geerlingguy.composer/templates/composer-project.sh.j2
index 1ca9be7de..9c77dbeec 100644
--- a/provisioning/roles/geerlingguy.composer/templates/composer-project.sh.j2
+++ b/provisioning/roles/geerlingguy.composer/templates/composer-project.sh.j2
@@ -1 +1 @@
-export PATH={{ composer_project_path }}/vendor/bin:$PATH
+export PATH={{ composer_project_path }}:$PATH

From 2893cdf95b65adc8be83c015d9f49a70a076cb32 Mon Sep 17 00:00:00 2001
From: Moshe Weitzman <weitzman@tejasa.com>
Date: Sun, 12 Feb 2017 07:19:05 -0500
Subject: [PATCH 0611/1273] Fix copy paste snafu

---
 docs/getting-started/installation-macos.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/getting-started/installation-macos.md b/docs/getting-started/installation-macos.md
index e08561e32..66f103ce9 100644
--- a/docs/getting-started/installation-macos.md
+++ b/docs/getting-started/installation-macos.md
@@ -1,4 +1,4 @@
-Please read through the [Quick Start Guiden the README](https://github.com/geerlingguy/drupal-vm#quick-start-guide) to get started.
+Please read through the [Quick Start Guide](https://github.com/geerlingguy/drupal-vm#quick-start-guide) to get started.
 
 <iframe width="560" height="315" src="https://www.youtube.com/embed/PR9uh_GGZhI" frameborder="0" allowfullscreen></iframe>
 

From 13f2dfe99369ac2dd3eeb7c686711d43b135c25f Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 14 Feb 2017 23:29:16 -0600
Subject: [PATCH 0612/1273] Update Solr role to latest version.

---
 provisioning/requirements.yml                   |  2 +-
 provisioning/roles/geerlingguy.solr/README.md   |  2 +-
 .../roles/geerlingguy.solr/tasks/main.yml       | 17 ++++++++++++++++-
 .../geerlingguy.solr/tests/test-solr-6.yml      | 12 +++++++++++-
 4 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 18970ddde..3abf0dbbf 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -72,6 +72,6 @@
 - src: geerlingguy.security
   version: 1.5.0
 - src: geerlingguy.solr
-  version: 3.4.2
+  version: 3.5.0
 - src: geerlingguy.varnish
   version: 1.8.1
diff --git a/provisioning/roles/geerlingguy.solr/README.md b/provisioning/roles/geerlingguy.solr/README.md
index 2a241d40e..0443fdf91 100644
--- a/provisioning/roles/geerlingguy.solr/README.md
+++ b/provisioning/roles/geerlingguy.solr/README.md
@@ -87,4 +87,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.solr/tasks/main.yml b/provisioning/roles/geerlingguy.solr/tasks/main.yml
index b9085fa38..8891a7f7e 100644
--- a/provisioning/roles/geerlingguy.solr/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.solr/tasks/main.yml
@@ -12,18 +12,25 @@
     solr_filename: "apache-solr-{{ solr_version }}"
   when: "solr_version.split('.')[0] == '3'"
 
+- name: Check if Solr has been installed already.
+  stat:
+    path: "{{ solr_install_path }}"
+  register: solr_install_path_status
+
 - name: Download Solr.
   get_url:
     url: "{{ solr_mirror }}/lucene/solr/{{ solr_version }}/{{ solr_filename }}.tgz"
     dest: "{{ solr_workspace }}/{{ solr_filename }}.tgz"
     force: no
+  when: solr_install_path_status.stat.isdir is not defined
+  register: solr_download_status
 
 - name: Expand Solr.
   unarchive:
     src: "{{ solr_workspace }}/{{ solr_filename }}.tgz"
     dest: "{{ solr_workspace }}"
-    creates: "{{ solr_workspace }}/{{ solr_filename }}/CHANGES.txt"
     copy: no
+  when: solr_download_status.changed
 
 # Install Solr < 5.
 - include: install-pre5.yml
@@ -46,3 +53,11 @@
 # Configure solr.
 - include: configure.yml
   when: "solr_version.split('.')[0] >= '5'"
+
+- name: Remove the downloaded Solr archive.
+  file:
+    path: "{{ item }}"
+    state: absent
+  with_items:
+    - "{{ solr_workspace }}/{{ solr_filename }}.tgz"
+    - "{{ solr_workspace }}/{{ solr_filename }}"
diff --git a/provisioning/roles/geerlingguy.solr/tests/test-solr-6.yml b/provisioning/roles/geerlingguy.solr/tests/test-solr-6.yml
index 2bd2b6c89..e45dec076 100644
--- a/provisioning/roles/geerlingguy.solr/tests/test-solr-6.yml
+++ b/provisioning/roles/geerlingguy.solr/tests/test-solr-6.yml
@@ -30,7 +30,17 @@
 
     - name: Update apt cache.
       apt: update_cache=yes cache_valid_time=600
-      when: ansible_distribution == "Debian" and debian_backports.changed
+      when: ansible_os_family == "Debian"
+
+    # See: http://unix.stackexchange.com/a/342469
+    - name: Install dependencies (Debian).
+      apt:
+        default_release: "{{ ansible_distribution_release }}-backports"
+        name:
+          - openjdk-8-jre-headless
+          - ca-certificates-java
+        state: present
+      when: ansible_distribution == "Debian"
 
   roles:
     - geerlingguy.java

From 6bf1c390feb0bbe152b3b36e3ca022af09dfc419 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 15 Feb 2017 22:40:57 -0600
Subject: [PATCH 0613/1273] Update Solr role to latest version. This time so
 everything works.

---
 provisioning/requirements.yml                   |  2 +-
 .../roles/geerlingguy.solr/defaults/main.yml    |  1 +
 .../roles/geerlingguy.solr/tasks/main.yml       |  9 ++-------
 .../roles/geerlingguy.solr/tasks/trim-fat.yml   | 17 +++++++++++++++++
 .../geerlingguy.solr/tests/test-solr-5.yml      |  1 +
 5 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.solr/tasks/trim-fat.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 3abf0dbbf..a4d61db3f 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -72,6 +72,6 @@
 - src: geerlingguy.security
   version: 1.5.0
 - src: geerlingguy.solr
-  version: 3.5.0
+  version: 3.5.1
 - src: geerlingguy.varnish
   version: 1.8.1
diff --git a/provisioning/roles/geerlingguy.solr/defaults/main.yml b/provisioning/roles/geerlingguy.solr/defaults/main.yml
index 152d29342..b1c5838f0 100644
--- a/provisioning/roles/geerlingguy.solr/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.solr/defaults/main.yml
@@ -6,6 +6,7 @@ solr_user: solr
 
 solr_version: "6.3.0"
 solr_mirror: "https://archive.apache.org/dist"
+solr_remove_cruft: false
 
 solr_service_name: solr
 solr_install_dir: /opt
diff --git a/provisioning/roles/geerlingguy.solr/tasks/main.yml b/provisioning/roles/geerlingguy.solr/tasks/main.yml
index 8891a7f7e..32ae55f12 100644
--- a/provisioning/roles/geerlingguy.solr/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.solr/tasks/main.yml
@@ -54,10 +54,5 @@
 - include: configure.yml
   when: "solr_version.split('.')[0] >= '5'"
 
-- name: Remove the downloaded Solr archive.
-  file:
-    path: "{{ item }}"
-    state: absent
-  with_items:
-    - "{{ solr_workspace }}/{{ solr_filename }}.tgz"
-    - "{{ solr_workspace }}/{{ solr_filename }}"
+- include: trim-fat.yml
+  static: no
diff --git a/provisioning/roles/geerlingguy.solr/tasks/trim-fat.yml b/provisioning/roles/geerlingguy.solr/tasks/trim-fat.yml
new file mode 100644
index 000000000..506fde443
--- /dev/null
+++ b/provisioning/roles/geerlingguy.solr/tasks/trim-fat.yml
@@ -0,0 +1,17 @@
+---
+- name: Remove the downloaded Solr archive.
+  file:
+    path: "{{ item }}"
+    state: absent
+  with_items:
+    - "{{ solr_workspace }}/{{ solr_filename }}.tgz"
+    - "{{ solr_workspace }}/{{ solr_filename }}"
+
+- name: Remove extra cruft, if configured.
+  file:
+    path: "{{ item }}"
+    state: absent
+  with_items:
+    - "{{ solr_install_path }}/docs"
+    - "{{ solr_install_path }}/example"
+  when: solr_remove_cruft
diff --git a/provisioning/roles/geerlingguy.solr/tests/test-solr-5.yml b/provisioning/roles/geerlingguy.solr/tests/test-solr-5.yml
index 5acedc20f..364830978 100644
--- a/provisioning/roles/geerlingguy.solr/tests/test-solr-5.yml
+++ b/provisioning/roles/geerlingguy.solr/tests/test-solr-5.yml
@@ -3,6 +3,7 @@
 
   vars:
     solr_version: "5.5.3"
+    solr_remove_cruft: true
     java_packages:
       - openjdk-7-jdk
 

From cb0315721161b33927615932a175914cbf733025 Mon Sep 17 00:00:00 2001
From: Finn <finn@agilecollective.com>
Date: Tue, 21 Feb 2017 00:13:52 +0000
Subject: [PATCH 0614/1273] Adding an option to enable the gui in the vagrant
 box, for times when developers might not want a headless box.

---
 Vagrantfile        | 3 ++-
 default.config.yml | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Vagrantfile b/Vagrantfile
index 95babcf45..6f48ee221 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -160,7 +160,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     # HGFS kernel module currently doesn't load correctly for native shares.
     override.vm.synced_folder host_project_dir, '/vagrant', type: 'nfs'
 
-    v.gui = false
+    v.gui = vconfig['vagrant_gui']
     v.vmx['memsize'] = vconfig['vagrant_memory']
     v.vmx['numvcpus'] = vconfig['vagrant_cpus']
   end
@@ -173,6 +173,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     v.cpus = vconfig['vagrant_cpus']
     v.customize ['modifyvm', :id, '--natdnshostresolver1', 'on']
     v.customize ['modifyvm', :id, '--ioapic', 'on']
+    v.gui = vconfig['vagrant_gui']
   end
 
   # Parallels.
diff --git a/default.config.yml b/default.config.yml
index af6afe892..60878b890 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -4,6 +4,7 @@
 vagrant_box: geerlingguy/ubuntu1604
 vagrant_user: vagrant
 vagrant_synced_folder_default_type: nfs
+vagrant_gui: false
 
 # If you need to run multiple instances of Drupal VM, set a unique hostname,
 # machine name, and IP address for each instance.

From 66f5e44be40e38831a882992c46101daad79b605 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 21 Feb 2017 17:03:38 -0600
Subject: [PATCH 0615/1273] Update Java role to latest version.

---
 provisioning/requirements.yml                      | 2 +-
 provisioning/roles/geerlingguy.java/tasks/main.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index a4d61db3f..51b28d4ed 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -28,7 +28,7 @@
 - src: geerlingguy.git
   version: 1.2.1
 - src: geerlingguy.java
-  version: 1.7.3
+  version: 1.7.4
 - src: geerlingguy.mailhog
   version: 2.1.1
 - src: geerlingguy.memcached
diff --git a/provisioning/roles/geerlingguy.java/tasks/main.yml b/provisioning/roles/geerlingguy.java/tasks/main.yml
index c6719cbfd..5fa557855 100644
--- a/provisioning/roles/geerlingguy.java/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.java/tasks/main.yml
@@ -35,4 +35,4 @@
     src: java_home.sh.j2
     dest: /etc/profile.d/java_home.sh
     mode: 0644
-  when: java_home
+  when: java_home is defined and java_home != ''

From f5c1aa52a42658e3f98c4ed26b6133991d9d421f Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 23 Feb 2017 15:56:58 -0600
Subject: [PATCH 0616/1273] Update to latest Selenium role version.

---
 provisioning/requirements.yml                            | 2 +-
 provisioning/roles/arknoll.selenium/defaults/main.yml    | 3 +++
 .../arknoll.selenium/templates/selenium-init-Debian.j2   | 6 +++---
 .../arknoll.selenium/templates/selenium-init-RedHat.j2   | 9 ++++-----
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 51b28d4ed..245ce07dc 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -1,6 +1,6 @@
 ---
 - src: arknoll.selenium
-  version: 2.1.1
+  version: 2.2.0
 - src: thom8.php-upload-progress
   version: 1.0.1
 - src: franklinkim.newrelic
diff --git a/provisioning/roles/arknoll.selenium/defaults/main.yml b/provisioning/roles/arknoll.selenium/defaults/main.yml
index 9cd8d1c74..025722c37 100644
--- a/provisioning/roles/arknoll.selenium/defaults/main.yml
+++ b/provisioning/roles/arknoll.selenium/defaults/main.yml
@@ -4,3 +4,6 @@ selenium_install_dir: /opt
 selenium_version: "2.53.0"
 selenium_install_firefox: no
 selenium_install_chrome: yes
+selenium_display_id: "1"
+selenium_port: 4444
+selenium_xvfb_args: "--server-args='-screen 0, 1920x1080x24'"
diff --git a/provisioning/roles/arknoll.selenium/templates/selenium-init-Debian.j2 b/provisioning/roles/arknoll.selenium/templates/selenium-init-Debian.j2
index f8cbc6827..33f2ab7ff 100644
--- a/provisioning/roles/arknoll.selenium/templates/selenium-init-Debian.j2
+++ b/provisioning/roles/arknoll.selenium/templates/selenium-init-Debian.j2
@@ -11,7 +11,7 @@
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 
-DISPLAY_ID=":1"
+DISPLAY_ID="{{ selenium_display_id }}"
 RUN_AS=root
 
 JAVA_BIN=/usr/bin/java
@@ -22,7 +22,7 @@ SELENIUM_DIR={{ selenium_install_dir }}/selenium
 SELENIUM_JAR_FILE="$SELENIUM_DIR/selenium-server-standalone-{{ selenium_version }}.jar"
 DAEMON_PID_FILE="$SELENIUM_DIR/selenium.pid"
 SELENIUM_LOG_FILE="$SELENIUM_DIR/selenium.log"
-SELENIUM_DAEMON_OPTS=" -client -jar $SELENIUM_JAR_FILE -log $SELENIUM_LOG_FILE"
+SELENIUM_DAEMON_OPTS=" -client -jar $SELENIUM_JAR_FILE -log $SELENIUM_LOG_FILE -port {{ selenium_port }}"
 
 export DISPLAY="$DISPLAY_ID"
 
@@ -37,7 +37,7 @@ case "$1" in
         else
             log_daemon_msg "Starting Selenium server"
             log_progress_msg "selenium"
-            start-stop-daemon -c $RUN_AS --start --quiet --background --pidfile $DAEMON_PID_FILE --make-pidfile --exec $XVFB_BIN $JAVA_BIN -- $SELENIUM_DAEMON_OPTS
+            start-stop-daemon -c $RUN_AS --start --quiet --background --pidfile $DAEMON_PID_FILE --make-pidfile --exec $XVFB_BIN {{ selenium_xvfb_args }} $JAVA_BIN -- $SELENIUM_DAEMON_OPTS
         fi
         ;;
 
diff --git a/provisioning/roles/arknoll.selenium/templates/selenium-init-RedHat.j2 b/provisioning/roles/arknoll.selenium/templates/selenium-init-RedHat.j2
index bce943de0..d186e6ac9 100644
--- a/provisioning/roles/arknoll.selenium/templates/selenium-init-RedHat.j2
+++ b/provisioning/roles/arknoll.selenium/templates/selenium-init-RedHat.j2
@@ -15,14 +15,13 @@ xvfb_bin=/usr/bin/xvfb-run
 selenium_dir={{ selenium_install_dir }}/selenium
 selenium_jar_file="$selenium_dir/selenium-server-standalone-{{ selenium_version }}.jar"
 user=root
-exec="$xvfb_bin $java_bin"
-args=" -client -jar $selenium_jar_file"
+display="{{ selenium_display_id }}"
+exec="$xvfb_bin {{ selenium_xvfb_args }} --server-num=$display $java_bin"
+args=" -client -jar $selenium_jar_file -p {{ selenium_port }}"
 lockfile="/var/lock/subsys/selenium"
 pidfile="$selenium_dir/selenium.pid"
 logfile="$selenium_dir/selenium.log"
 prog="selenium"
-display=":1"
-port="4444"
 
 RETVAL=0
 
@@ -35,7 +34,7 @@ start() {
   touch $logfile
   chown $user $logfile
 
-  /bin/su - $user -c "DISPLAY=\"$display\" $exec $args >> $logfile 2>&1 & echo \$! > $pidfile"
+  /bin/su - $user -c "DISPLAY=\":$display\" $exec $args >> $logfile 2>&1 & echo \$! > $pidfile"
 
   sleep 2
 

From 23a8eced43f712f6f379a33340bef4c385008ac0 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 25 Feb 2017 14:09:08 -0600
Subject: [PATCH 0617/1273] Issue #420: Update Drush role to latest version.

---
 provisioning/requirements.yml                          | 2 +-
 provisioning/roles/geerlingguy.drush/README.md         | 6 +++++-
 provisioning/roles/geerlingguy.drush/defaults/main.yml | 1 +
 provisioning/roles/geerlingguy.drush/tasks/main.yml    | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 245ce07dc..426c8b9ea 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -20,7 +20,7 @@
 - src: geerlingguy.drupal-console
   version: 1.0.7
 - src: geerlingguy.drush
-  version: 1.2.0
+  version: 1.2.1
 - src: geerlingguy.elasticsearch
   version: 2.1.3
 - src: geerlingguy.firewall
diff --git a/provisioning/roles/geerlingguy.drush/README.md b/provisioning/roles/geerlingguy.drush/README.md
index f024bb4a8..6d4917bfe 100644
--- a/provisioning/roles/geerlingguy.drush/README.md
+++ b/provisioning/roles/geerlingguy.drush/README.md
@@ -29,6 +29,10 @@ The version of Drush to install (examples: `"master"` for the bleeding edge, `"7
 
 Whether to keep Drush up-to-date with the latest revision of the branch specified by `drush_version`, and whether to force the update (e.g. overwrite local modifications to the drush repository).
 
+    drush_force_composer_install: no
+
+Use this if you get an error message when provisioning like `Unable to load autoload.php. Run composer install to fetch dependencies and write this file`. It will force a `composer install` inside the Drush directory.
+
     drush_composer_cli_options: "--prefer-source --no-interaction"
 
 These options are the safest for avoiding GitHub API rate limits when installing Drush, and can be very helpful when working on dependencies/installation, but builds can be sped up substantially by changing the first option to --prefer-dist.
@@ -57,4 +61,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.drush/defaults/main.yml b/provisioning/roles/geerlingguy.drush/defaults/main.yml
index 77f4583c3..8873d30db 100644
--- a/provisioning/roles/geerlingguy.drush/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.drush/defaults/main.yml
@@ -4,6 +4,7 @@ drush_path: /usr/local/bin/drush
 drush_version: "master"
 drush_keep_updated: no
 drush_force_update: no
+drush_force_composer_install: no
 
 drush_composer_cli_options: "--prefer-dist --no-interaction"
 drush_clone_depth: 1
diff --git a/provisioning/roles/geerlingguy.drush/tasks/main.yml b/provisioning/roles/geerlingguy.drush/tasks/main.yml
index 203312cf6..091a958b4 100644
--- a/provisioning/roles/geerlingguy.drush/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.drush/tasks/main.yml
@@ -24,7 +24,7 @@
   shell: >
     {{ composer_path }} install {{ drush_composer_cli_options }}
     chdir={{ drush_install_path }}
-  when: drush_clone.changed and drush_composer.stat.exists
+  when: (drush_clone.changed and drush_composer.stat.exists) or drush_force_composer_install
 
 - name: Create drush symlink.
   file:

From fe9298483177ff2562ef1df04b9e9d4334f3f304 Mon Sep 17 00:00:00 2001
From: Subhojit Paul <subhojit777@users.noreply.github.com>
Date: Mon, 27 Feb 2017 16:39:21 +0530
Subject: [PATCH 0618/1273] No need to add XHProf vhost manually

---
 docs/extras/xhprof.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/extras/xhprof.md b/docs/extras/xhprof.md
index af0dc6b00..44681ac53 100644
--- a/docs/extras/xhprof.md
+++ b/docs/extras/xhprof.md
@@ -15,6 +15,6 @@ You can view callgraphs (and a listing of all stored runs) using Drupal VM's own
 The Devel module also *used* to provide XHProf configuration, and setting the options below would allow Devel's XHProf integration to work correctly with Drupal VM's XHProf installation:
 
   - **xhprof directory**: `/usr/share/php`
-  - **XHProf URL**: `http://xhprof.drupalvm.dev` (assuming this domain is configured in `apache_vhosts` inside `config.yml`)
+  - **XHProf URL**: `http://xhprof.drupalvm.dev`
 
 **Note**: You should only enable one code profiler at a time—e.g. when using [Blackfire](blackfire.md), disable [XHProf](xhprof.md), [Tideways](tideways.md) and [XDebug](xdebug.md).

From ed6bd90709130e021eb9e8d7679d7edec68b7153 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Tue, 28 Feb 2017 15:00:59 -0500
Subject: [PATCH 0619/1273] Issue #1182: Fix various issues with tideways docs

---
 docs/extras/tideways.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/extras/tideways.md b/docs/extras/tideways.md
index 8953c0fa4..e7d5fe463 100644
--- a/docs/extras/tideways.md
+++ b/docs/extras/tideways.md
@@ -1,10 +1,12 @@
 The Tideways PHP Extension is a well-maintained fork of the XHProf code and works with either the [XHProf](https://www.drupal.org/project/xhprof) or [Tideways](https://www.drupal.org/project/tideways) module to profile page views.
 
+To use Tideways make sure `tideways` is in the list of `installed_extras`.
+
 **Note**: You should only enable one code profiler at a time—e.g. when using [Blackfire](blackfire.md), disable [XHProf](xhprof.md), [Tideways](tideways.md) and [XDebug](xdebug.md).
 
 ### Profiling with the XHProf Module
 
-To enable profiling of Drupal pages using the Tideways PHP Extension, follow the directions for [configuring the XHProf and the XHProf module](xhprof.md#xhprof-module), but choose the _Tideways_ extension under in the _Profiling settings_ section.
+To enable profiling of Drupal pages using the Tideways PHP Extension, follow the directions for [configuring the XHProf and the XHProf module](xhprof.md#xhprof-module), but choose the _Tideways_ extension under the _Profiling settings_ section.
 
 As with the XHProf extension, you can view callgraphs (and a listing of all stored runs) using Drupal VM's own XHProf UI installation by visiting [http://xhprof.drupalvm.dev/](http://xhprof.drupalvm.dev) and clicking on the relevant run, then clicking the _[View Full Callgraph]_ link.
 
@@ -12,4 +14,4 @@ As with the XHProf extension, you can view callgraphs (and a listing of all stor
 
 Instructions for profiling with the Tideways module through the [tideways.io](https://tideways.io) service will be added after the following issue is resolved: [Can't install latest dev release on 8.x](https://www.drupal.org/node/2843481).
 
-For a list of available role variables, see the [`geerlingguy.tideways` Ansible role's README](https://github.com/geerlingguy/ansible-role-tideways#readme).
+For a list of available role variables, see the [`geerlingguy.php-tideways` Ansible role's README](https://github.com/geerlingguy/ansible-role-php-tideways#readme).

From a4c26baa8e24cfe53bb464d838fb5dfff141b96e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Tue, 28 Feb 2017 15:02:40 -0500
Subject: [PATCH 0620/1273] Issue #1182, Follow-up #1123: Add commented
 tideways entry to installed_extras

---
 README.md          | 2 ++
 default.config.yml | 1 +
 2 files changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 0a8035064..47a1a40af 100644
--- a/README.md
+++ b/README.md
@@ -115,6 +115,8 @@ By default, this VM includes the extras listed in the `config.yml` option `insta
       # - ruby
       # - selenium
       # - solr
+      # - tideways
+      # - upload-progress
       - varnish
       # - xdebug
       # - xhprof
diff --git a/default.config.yml b/default.config.yml
index 60878b890..a83a8271e 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -205,6 +205,7 @@ installed_extras:
   # - ruby
   # - selenium
   # - solr
+  # - tideways
   # - upload-progress
   - varnish
   # - xdebug

From eb4def251b50edc57a4b3cf915e00b0455ea3acc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Tue, 28 Feb 2017 15:17:58 -0500
Subject: [PATCH 0621/1273] Closes #1168: Remove HTML from mkdocs titles fixing
 escaped tags in docs

---
 mkdocs.yml | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 88488048c..b010c0539 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -37,26 +37,26 @@ pages:
       - 'Use MariaDB instead of MySQL': 'configurations/databases-mariadb.md'
       - 'Use PostgreSQL instead of MySQL': 'configurations/databases-postgresql.md'
   - Installed extras:
-    - 'adminer <small>(Database UI)</small>': 'extras/adminer.md'
-    - 'blackfire <small>(Profiling tool)</small>': 'extras/blackfire.md'
-    - 'drupalconsole <small>(Drupal CLI)</small>': 'extras/drupal-console.md'
-    - 'drush <small>(Drupal CLI)</small>': 'extras/drush.md'
-    - 'elasticsearch <small>(Search engine)</small>': 'extras/elasticsearch.md'
+    - 'adminer (Database UI)': 'extras/adminer.md'
+    - 'blackfire (Profiling tool)': 'extras/blackfire.md'
+    - 'drupalconsole (Drupal CLI)': 'extras/drupal-console.md'
+    - 'drush (Drupal CLI)': 'extras/drush.md'
+    - 'elasticsearch (Search engine)': 'extras/elasticsearch.md'
     - 'java': 'extras/java.md'
-    - 'mailhog <small>(Mail catcher)</small>': 'extras/mailhog.md'
-    - 'memcached <small>(In-memory cache)</small>': 'extras/memcached.md'
-    - 'newrelic <small>(Performance monitoring)</small>': 'extras/newrelic.md'
+    - 'mailhog (Mail catcher)': 'extras/mailhog.md'
+    - 'memcached (In-memory cache)': 'extras/memcached.md'
+    - 'newrelic (Performance monitoring)': 'extras/newrelic.md'
     - 'nodejs': 'extras/nodejs.md'
-    - 'pimpmylog <small>(Log viewer)</small>': 'extras/pimpmylog.md'
-    - 'redis <small>(In-memory database)</small>': 'extras/redis.md'
+    - 'pimpmylog (Log viewer)': 'extras/pimpmylog.md'
+    - 'redis (In-memory database)': 'extras/redis.md'
     - 'ruby': 'extras/ruby.md'
-    - 'selenium <small>(BDD with Behat)</small>': 'extras/selenium.md'
-    - 'solr <small>(Search engine)</small>': 'extras/solr.md'
-    - 'tidways <small>(Profiling tool)</small>': 'extras/tideways.md'
+    - 'selenium (BDD with Behat)': 'extras/selenium.md'
+    - 'solr (Search engine)': 'extras/solr.md'
+    - 'tidways (Profiling tool)': 'extras/tideways.md'
     - 'upload-progress': 'extras/upload-progress.md'
-    - 'varnish <small>(Caching reverse proxy)</small>': 'extras/varnish.md'
-    - 'xdebug <small>(Debugging tool)</small>': 'extras/xdebug.md'
-    - 'xhprof <small>(Profiling tool)</small>': 'extras/xhprof.md'
+    - 'varnish (Caching reverse proxy)': 'extras/varnish.md'
+    - 'xdebug (Debugging tool)': 'extras/xdebug.md'
+    - 'xhprof (Profiling tool)': 'extras/xhprof.md'
   - Extending Drupal VM:
     - 'Adding Vagrant plugins Vagrantfile.local': 'extending/vagrantfile.md'
     - 'Passing on CLI arguments to ansible': 'extending/ansible-args.md'

From 29c680d825fd950c46ed303b28f658037bf9ccaa Mon Sep 17 00:00:00 2001
From: Derek DeRaps <derekderaps@users.noreply.github.com>
Date: Tue, 28 Feb 2017 20:47:46 +0000
Subject: [PATCH 0622/1273] Add note about firewalld on CentOS 6

Since firewalld does not exist for CentOS 6, the Drupal VM `firewall_disable_firewalld` setting, which defaults to `true`, must be overridden in `config.yml` and set to `false`.
---
 docs/configurations/base-os.md | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/docs/configurations/base-os.md b/docs/configurations/base-os.md
index af8ff68bd..cb197e257 100644
--- a/docs/configurations/base-os.md
+++ b/docs/configurations/base-os.md
@@ -30,10 +30,15 @@ Everything should work out of the box with RHEL 7.
 
 ## RedHat Enterprise Linux / CentOS 6
 
-**Apache without FastCGI**: If you want to use Apache with CentOS 6 on Drupal VM, you will need to modify the syntax of your `apache_vhosts` and remove the `extra_parameters: "{{ apache_vhost_php_fpm_parameters }}"` line from each one. Alternatively, you can use Nginx with the default configuration by setting `drupalvm_webserver: nginx` inside `config.yml`.
+- **Apache without FastCGI**: If you want to use Apache with CentOS 6 on Drupal VM, you will need to modify the syntax of your `apache_vhosts` and remove the `extra_parameters: "{{ apache_vhost_php_fpm_parameters }}"` line from each one. Alternatively, you can use Nginx with the default configuration by setting `drupalvm_webserver: nginx` inside `config.yml`.
 
-**PHP OpCache**: PHP's OpCache (if you're using PHP > 5.5) requires the following setting to be configured in `config.yml` (see upstream bug: [CentOS (6) needs additional php-opcache package](https://github.com/geerlingguy/ansible-role-php/issues/39)):
+- **PHP OpCache**: PHP's OpCache (if you're using PHP > 5.5) requires the following setting to be configured in `config.yml` (see upstream bug: [CentOS (6) needs additional php-opcache package](https://github.com/geerlingguy/ansible-role-php/issues/39)):
 
-```yaml
-php_opcache_enabled_in_ini: false
-```
+  ```yaml
+  php_opcache_enabled_in_ini: false
+  ```
+
+- **Firewalld**: [Firewalld](http://www.firewalld.org/) is not available on CentOS 6, so the Drupal VM setting `firewall_disable_firewalld`, which defaults to `true`, must be overridden in `config.yml` and set to `false`:
+  ```yaml
+  firewall_disable_firewalld: false
+  ```

From 2171611fc060035e95341a87313eb69184ffab28 Mon Sep 17 00:00:00 2001
From: Derek DeRaps <derekderaps@users.noreply.github.com>
Date: Tue, 28 Feb 2017 22:21:07 +0000
Subject: [PATCH 0623/1273] Remove codeblock indents and add newline for Mkdoc

Python markdown is not as fancy as GFM!
---
 docs/configurations/base-os.md | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/docs/configurations/base-os.md b/docs/configurations/base-os.md
index cb197e257..bc55c33c2 100644
--- a/docs/configurations/base-os.md
+++ b/docs/configurations/base-os.md
@@ -34,11 +34,12 @@ Everything should work out of the box with RHEL 7.
 
 - **PHP OpCache**: PHP's OpCache (if you're using PHP > 5.5) requires the following setting to be configured in `config.yml` (see upstream bug: [CentOS (6) needs additional php-opcache package](https://github.com/geerlingguy/ansible-role-php/issues/39)):
 
-  ```yaml
-  php_opcache_enabled_in_ini: false
-  ```
+```yaml
+php_opcache_enabled_in_ini: false
+```
 
 - **Firewalld**: [Firewalld](http://www.firewalld.org/) is not available on CentOS 6, so the Drupal VM setting `firewall_disable_firewalld`, which defaults to `true`, must be overridden in `config.yml` and set to `false`:
-  ```yaml
-  firewall_disable_firewalld: false
-  ```
+
+```yaml
+firewall_disable_firewalld: false
+```

From b1242400f58e85b1f9cefe3faf3402ecf029edd4 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 1 Mar 2017 22:53:50 -0600
Subject: [PATCH 0624/1273] Issue #1192: Remove Drupal build and install code
 for move to geerlingguy.drupal.

---
 default.config.yml                            | 11 +++--
 docs/configurations/databases-postgresql.md   |  4 +-
 docs/extending/ansible-args.md                |  2 +-
 provisioning/playbook.yml                     | 47 ++++---------------
 provisioning/requirements.yml                 |  2 +
 provisioning/tasks/build-composer-project.yml | 27 -----------
 provisioning/tasks/build-composer.yml         | 36 --------------
 provisioning/tasks/build-makefile.yml         | 34 --------------
 provisioning/tasks/install-site.yml           | 39 ---------------
 tests/ubuntu-16-postgresql.config.yml         |  2 +-
 10 files changed, 20 insertions(+), 184 deletions(-)
 delete mode 100644 provisioning/tasks/build-composer-project.yml
 delete mode 100644 provisioning/tasks/build-composer.yml
 delete mode 100644 provisioning/tasks/build-makefile.yml
 delete mode 100644 provisioning/tasks/install-site.yml

diff --git a/default.config.yml b/default.config.yml
index a83a8271e..f18f8e34c 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -44,17 +44,17 @@ force_ansible_local: false
 drupalvm_webserver: apache
 
 # The database system to use. Can be either 'mysql' or 'pgsql'.
-drupalvm_database: mysql
+drupal_db_backend: mysql
 
 # Set this to 'false' if you are using a different site deployment strategy and
 # would like to configure 'vagrant_synced_folders' and 'apache_vhosts' manually.
-build_makefile: false
+drupal_build_makefile: false
 drush_makefile_path: "{{ config_dir }}/drupal.make.yml"
 drush_make_options: "--no-gitinfofile"
 
 # Set 'build_makefile' to 'false' and this to 'true' if you are using a
 # composer based site deployment strategy.
-build_composer: false
+drupal_build_composer: false
 drupal_composer_path: "{{ config_dir }}/drupal.composer.json"
 drupal_composer_install_dir: "/var/www/drupalvm/drupal"
 drupal_composer_dependencies:
@@ -62,16 +62,17 @@ drupal_composer_dependencies:
 
 # Set this to 'true' and 'build_makefile', 'build_composer' to 'false' if you
 # are using Composer's create-project as a site deployment strategy.
-build_composer_project: true
+drupal_build_composer_project: true
 drupal_composer_project_package: "drupal-composer/drupal-project:8.x-dev"
 drupal_composer_project_options: "--prefer-dist --stability dev --no-interaction"
 
 # Set this to 'false' if you don't need to install drupal (using the drupal_*
 # settings below), but instead copy down a database (e.g. using drush sql-sync).
-install_site: true
+drupal_install_site: true
 
 # Required Drupal settings.
 drupal_core_path: "{{ drupal_composer_install_dir }}/web"
+drupal_core_owner: "{{ drupalvm_user }}"
 drupal_db_user: drupal
 drupal_db_password: drupal
 drupal_db_name: drupal
diff --git a/docs/configurations/databases-postgresql.md b/docs/configurations/databases-postgresql.md
index 823bda1d8..8d7a390a1 100644
--- a/docs/configurations/databases-postgresql.md
+++ b/docs/configurations/databases-postgresql.md
@@ -1,9 +1,9 @@
 Since Drupal VM is built in a modular fashion, you can swap out the database engine and use [PostgreSQL](https://www.postgresql.org/) instead of MySQL (as long as the version of Drupal you're using supports it!).
 
-To switch from MySQL to PostgreSQL, switch the `drupalvm_database` setting in your local `config.yml` to `pgsql`:
+To switch from MySQL to PostgreSQL, switch the `drupal_db_backend` setting in your local `config.yml` to `pgsql`:
 
 ```yaml
-drupalvm_database: pgsql
+drupal_db_backend: pgsql
 ```
 
 For more PostgreSQL configuration options, see the [`geerlingguy.postgresql` Ansible role's README](https://github.com/geerlingguy/ansible-role-postgresql#readme).
diff --git a/docs/extending/ansible-args.md b/docs/extending/ansible-args.md
index 4d524aabe..051aa36ca 100644
--- a/docs/extending/ansible-args.md
+++ b/docs/extending/ansible-args.md
@@ -19,5 +19,5 @@ DRUPALVM_ANSIBLE_ARGS='--start-at-task=*post-provision shell*' vagrant provision
 Override a config variable:
 
 ```sh
-DRUPALVM_ANSIBLE_ARGS='--extra-vars=drupalvm_database=pgsql' vagrant provision
+DRUPALVM_ANSIBLE_ARGS='--extra-vars=drupal_db_backend=pgsql' vagrant provision
 ```
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index eec2108dc..7d7f360c1 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -72,10 +72,10 @@
     - geerlingguy.php
     - geerlingguy.php-pecl
     - geerlingguy.composer
-    - { role: geerlingguy.mysql, when: drupalvm_database == 'mysql' }
-    - { role: geerlingguy.php-mysql, when: drupalvm_database == 'mysql' }
-    - { role: geerlingguy.postgresql, when: drupalvm_database == 'pgsql' }
-    - { role: geerlingguy.php-pgsql, when: drupalvm_database == 'pgsql' }
+    - { role: geerlingguy.mysql, when: drupal_db_backend == 'mysql' }
+    - { role: geerlingguy.php-mysql, when: drupal_db_backend == 'mysql' }
+    - { role: geerlingguy.postgresql, when: drupal_db_backend == 'pgsql' }
+    - { role: geerlingguy.php-pgsql, when: drupal_db_backend == 'pgsql' }
 
     # Conditionally-installed roles.
     - { role: geerlingguy.drupal-console, when: 'drupal_major_version > 7 and "drupalconsole" in installed_extras' }
@@ -119,46 +119,15 @@
     - { role: geerlingguy.security, when: extra_security_enabled }
 
   tasks:
-    - name: Check if Drupal is already set up.
-      stat: "path={{ drupal_core_path }}/index.php"
-      register: drupal_site
-      ignore_errors: true
-
-    - name: Define drupal_site_exists
-      set_fact:
-        drupal_site_exists: "{{ drupal_site.stat.exists|default(false) }}"
-
     - include: tasks/sshd.yml
     - include: tasks/extras.yml
     - include: tasks/www.yml
     - include: tasks/apparmor.yml
-      when: ansible_os_family == 'Debian' and drupalvm_database == 'mysql'
-
-    # Build makefile if configured.
-    - include: tasks/build-makefile.yml
-      when: build_makefile
-
-    # Build with composer if configured.
-    - include: tasks/build-composer.yml
-      when: build_composer
+      when: ansible_os_family == 'Debian' and drupal_db_backend == 'mysql'
 
-    # Build a composer project if configured.
-    - include: tasks/build-composer-project.yml
-      when: build_composer_project
-
-    - name: Check if a project specific Drush binary exists.
-      stat: "path={{ drupal_composer_install_dir }}/vendor/drush/drush/drush"
-      register: drush_vendor_bin
-      ignore_errors: true
-
-    - name: Use project specific Drush if available.
-      set_fact:
-        drush_path: "{{ drupal_composer_install_dir }}/vendor/drush/drush/drush"
-      when: drush_vendor_bin.stat.exists
-
-    # Install site if configured.
-    - include: tasks/install-site.yml
-      when: install_site
+    # Build and configure the Drupal site.
+    - include_role: name=geerlingguy.drupal
+      static: no
 
     - include: tasks/drush-aliases.yml
     - include: tasks/cron.yml
diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 426c8b9ea..36ea3b22a 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -17,6 +17,8 @@
   version: 1.6.1
 - src: geerlingguy.daemonize
   version: 1.1.1
+- src: geerlingguy.drupal
+  version: 2.0.0
 - src: geerlingguy.drupal-console
   version: 1.0.7
 - src: geerlingguy.drush
diff --git a/provisioning/tasks/build-composer-project.yml b/provisioning/tasks/build-composer-project.yml
deleted file mode 100644
index fedb49013..000000000
--- a/provisioning/tasks/build-composer-project.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-- name: Ensure drupal_composer_install_dir directory has proper permissions.
-  file:
-    path: "{{ drupal_composer_install_dir }}"
-    state: directory
-    owner: "{{ drupalvm_user }}"
-    group: "{{ drupalvm_user }}"
-    mode: 0775
-  when: not drupal_site_exists
-  failed_when: false
-
-- name: Generate Drupal project with composer package.
-  command: >
-    {{ composer_path }} create-project
-    {{ drupal_composer_project_package }} {{ drupal_composer_install_dir }}
-    {{ drupal_composer_project_options|default('--prefer-dist --no-interaction') }}
-  when: not drupal_site_exists
-  become: no
-  environment:
-      COMPOSER_PROCESS_TIMEOUT: 1200
-
-- name: Install dependencies with composer require.
-  command: >
-    {{ composer_path }} require {{ item }}
-    chdir={{ drupal_composer_install_dir }}
-  with_items: "{{ drupal_composer_dependencies|default([]) }}"
-  become: no
diff --git a/provisioning/tasks/build-composer.yml b/provisioning/tasks/build-composer.yml
deleted file mode 100644
index b99b7a679..000000000
--- a/provisioning/tasks/build-composer.yml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-- name: Ensure drupal_composer_install_dir directory exists.
-  file:
-    path: "{{ drupal_composer_install_dir }}"
-    state: directory
-    mode: 0775
-  become: no
-  when: drupal_composer_path and not drupal_site_exists
-
-# Use copy-and-move to prevent issues in Windows with VirtualBox. See:
-# https://github.com/ansible/ansible/issues/9526#issuecomment-62336962
-- name: Copy composer.json into temporary location.
-  copy:
-    src: "{{ drupal_composer_path }}"
-    dest: "/tmp/drupalvm-composer.json"
-  when: drupal_composer_path and not drupal_site_exists
-  become: no
-
-- name: Move composer.json into place.
-  command: "mv /tmp/drupalvm-composer.json {{ drupal_composer_install_dir }}/composer.json"
-  when: drupal_composer_path and not drupal_site_exists
-  become: no
-
-- name: Run composer install.
-  command: >
-    composer install
-    chdir={{ drupal_composer_install_dir }}
-  when: not drupal_site_exists
-  become: no
-
-- name: Install dependencies with composer require.
-  command: >
-    {{ composer_path }} require {{ item }}
-    chdir={{ drupal_composer_install_dir }}
-  with_items: "{{ drupal_composer_dependencies|default([]) }}"
-  become: no
diff --git a/provisioning/tasks/build-makefile.yml b/provisioning/tasks/build-makefile.yml
deleted file mode 100644
index 2dc994c4a..000000000
--- a/provisioning/tasks/build-makefile.yml
+++ /dev/null
@@ -1,34 +0,0 @@
----
-- name: Copy drush makefile into place.
-  copy:
-    src: "{{ drush_makefile_path }}"
-    dest: /tmp/drupal.make.yml
-  when: not drupal_site_exists
-
-- name: Ensure drupal_core_path directory exists.
-  file:
-    path: "{{ drupal_core_path }}"
-    state: directory
-    recurse: yes
-    mode: 0775
-  become: no
-  when: not drupal_site_exists
-
-- name: Generate Drupal site with drush makefile.
-  command: >
-    {{ drush_path }} make -y /tmp/drupal.make.yml {{ drush_make_options }}
-    chdir={{ drupal_core_path }}
-  when: not drupal_site_exists
-  become: no
-
-- name: Check if a composer.json file is present.
-  stat: "path={{ drupal_core_path }}/composer.json"
-  register: drupal_core_composer_file
-  when: not drupal_site_exists
-
-- name: Run composer install if composer.json is present.
-  command: >
-    composer install
-    chdir={{ drupal_core_path }}
-  when: not drupal_site_exists and drupal_core_composer_file.stat.exists
-  become: no
diff --git a/provisioning/tasks/install-site.yml b/provisioning/tasks/install-site.yml
deleted file mode 100644
index 35c55c2ad..000000000
--- a/provisioning/tasks/install-site.yml
+++ /dev/null
@@ -1,39 +0,0 @@
----
-- name: Check if site is already installed.
-  command: >
-    {{ drush_path }} status bootstrap
-    chdir={{ drupal_core_path }}
-  register: drupal_site_installed
-  failed_when: "drupal_site_installed.stdout is undefined"
-  changed_when: false
-  become: no
-
-# See: https://www.drupal.org/node/2569365#comment-11680807
-- name: Configure database correctly if using PostgreSQL.
-  command: psql -c "ALTER DATABASE {{ drupal_db_name }} SET bytea_output = 'escape';"
-  when: "('Successful' not in drupal_site_installed.stdout) and (drupalvm_database == 'pgsql')"
-  become: yes
-  become_user: "{{ postgresql_user }}"
-  # See: https://github.com/ansible/ansible/issues/16048#issuecomment-229012509
-  vars:
-    ansible_ssh_pipelining: true
-
-- name: Install Drupal with drush.
-  command: >
-    {{ drush_path }} site-install {{ drupal_install_profile | default('standard') }} -y
-    --site-name="{{ drupal_site_name }}"
-    --account-name={{ drupal_account_name }}
-    --account-pass={{ drupal_account_pass }}
-    --db-url={{ drupalvm_database }}://{{ drupal_db_user }}:{{ drupal_db_password }}@localhost/{{ drupal_db_name }}
-    {{ drupal_site_install_extra_args | default([]) | join(" ") }}
-    chdir={{ drupal_core_path }}
-  notify: restart webserver
-  when: "'Successful' not in drupal_site_installed.stdout"
-  become: no
-
-- name: Install configured modules with drush.
-  command: >
-    {{ drush_path }} pm-enable -y {{ drupal_enable_modules | join(" ") }}
-    chdir={{ drupal_core_path }}
-  when: "'Successful' not in drupal_site_installed.stdout"
-  become: no
diff --git a/tests/ubuntu-16-postgresql.config.yml b/tests/ubuntu-16-postgresql.config.yml
index 327733428..7dc6042f5 100644
--- a/tests/ubuntu-16-postgresql.config.yml
+++ b/tests/ubuntu-16-postgresql.config.yml
@@ -1,3 +1,3 @@
 ---
-drupalvm_database: pgsql
+drupal_db_backend: pgsql
 installed_extras: []

From bd74d56e346e6292f8542f4a85875d1bba5e9cf3 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 2 Mar 2017 09:20:58 -0600
Subject: [PATCH 0625/1273] Fixes #1192: Add geerlingguy.drupal role to Drupal
 VM.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.drupal/.travis.yml      | 49 +++++++++
 .../roles/geerlingguy.drupal/README.md        | 99 +++++++++++++++++++
 .../geerlingguy.drupal/defaults/main.yml      | 41 ++++++++
 .../roles/geerlingguy.drupal/meta/main.yml    | 25 +++++
 .../tasks/backwards-compatibility.yml         | 26 +++++
 .../tasks/build-composer-project.yml          | 28 ++++++
 .../tasks/build-composer.yml                  | 37 +++++++
 .../tasks/build-makefile.yml                  | 34 +++++++
 .../geerlingguy.drupal/tasks/install-site.yml | 39 ++++++++
 .../roles/geerlingguy.drupal/tasks/main.yml   | 40 ++++++++
 .../geerlingguy.drupal/tests/initctl_faker    | 23 +++++
 .../geerlingguy.drupal/tests/requirements.yml | 13 +++
 .../roles/geerlingguy.drupal/tests/test.yml   | 85 ++++++++++++++++
 14 files changed, 540 insertions(+), 1 deletion(-)
 create mode 100644 provisioning/roles/geerlingguy.drupal/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.drupal/README.md
 create mode 100644 provisioning/roles/geerlingguy.drupal/defaults/main.yml
 create mode 100644 provisioning/roles/geerlingguy.drupal/meta/main.yml
 create mode 100644 provisioning/roles/geerlingguy.drupal/tasks/backwards-compatibility.yml
 create mode 100644 provisioning/roles/geerlingguy.drupal/tasks/build-composer-project.yml
 create mode 100644 provisioning/roles/geerlingguy.drupal/tasks/build-composer.yml
 create mode 100644 provisioning/roles/geerlingguy.drupal/tasks/build-makefile.yml
 create mode 100644 provisioning/roles/geerlingguy.drupal/tasks/install-site.yml
 create mode 100644 provisioning/roles/geerlingguy.drupal/tasks/main.yml
 create mode 100644 provisioning/roles/geerlingguy.drupal/tests/initctl_faker
 create mode 100644 provisioning/roles/geerlingguy.drupal/tests/requirements.yml
 create mode 100644 provisioning/roles/geerlingguy.drupal/tests/test.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 36ea3b22a..b403b85e8 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -18,7 +18,7 @@
 - src: geerlingguy.daemonize
   version: 1.1.1
 - src: geerlingguy.drupal
-  version: 2.0.0
+  version: 2.0.1
 - src: geerlingguy.drupal-console
   version: 1.0.7
 - src: geerlingguy.drush
diff --git a/provisioning/roles/geerlingguy.drupal/.travis.yml b/provisioning/roles/geerlingguy.drupal/.travis.yml
new file mode 100644
index 000000000..dbfa14338
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal/.travis.yml
@@ -0,0 +1,49 @@
+---
+services: docker
+
+env:
+  - distro: centos7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distro: debian8
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distro: ubuntu1604
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distro: ubuntu1404
+    init: /sbin/init
+    run_opts: ""
+
+before_install:
+  # Pull container.
+  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
+
+script:
+  - container_id=$(mktemp)
+  # Run container in detached state.
+  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
+
+  # Install dependencies.
+  - 'docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
+
+  # Ansible syntax check.
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+
+  # Test role.
+  - 'docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+
+  # Test role idempotence.
+  - idempotence=$(mktemp)
+  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
+  - >
+    tail ${idempotence}
+    | grep -q 'changed=0.*failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)
+
+  # Make sure Drupal is running.
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm curl http://drupaltest.dev/'
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.drupal/README.md b/provisioning/roles/geerlingguy.drupal/README.md
new file mode 100644
index 000000000..122bb9b65
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal/README.md
@@ -0,0 +1,99 @@
+# Ansible Role: Drupal
+
+[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-drupal.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-drupal)
+
+Builds and installs [Drupal](https://drupal.org/), an open source content management platform.
+
+## Requirements
+
+Drupal is a PHP-based application that is meant to run behind a typical LAMP/LEMP/LEPP/etc. stack, so you'll need at least the following:
+
+  - Apache or Nginx (Recommended: `geerlingguy.apache` or `geerlingguy.nginx`)
+  - MySQL or similar Database server (Recommended: `geerlingguy.mysql` or `geerlingguy.postgresql`)
+  - PHP (Recommended: `geerlingguy.php` along with other PHP-related roles like `php-mysql`).
+
+Drush is not an absolute requirement, but it's handy to have, and also required if you use this role to Install a Drupal site (`drupal_install_site: true`). You can use `geerlingguy.drush` to install Drush.
+
+## Role Variables
+
+Available variables are listed below, along with default values (see `defaults/main.yml`):
+
+    drupal_install_site: true
+
+Set this to `false` if you don't need to install Drupal (using the `drupal_*` settings below), but instead copy down a database (e.g. using `drush sql-sync`).
+
+    drupal_build_makefile: false
+    drush_makefile_path: "/path/to/drupal.make.yml"
+    drush_make_options: "--no-gitinfofile"
+
+Set this to `true` and `drupal_build_composer*` to `false` if you would like to build a Drupal make file with Drush.
+
+    drupal_build_composer: false
+    drupal_composer_path: "/path/to/drupal.composer.json"
+    drupal_composer_install_dir: "/var/www/drupal"
+    drupal_composer_dependencies:
+      - "drupal/devel:1.x-dev"
+
+Set `drupal_build_makefile` to `false` and this to `true` if you are using a Composer-based site deployment strategy.
+
+    drupal_build_composer_project: true
+    drupal_composer_project_package: "drupal-composer/drupal-project:8.x-dev"
+    drupal_composer_project_options: "--prefer-dist --stability dev --no-interaction"
+
+Set this to `true` and `drupal_build_makefile`, `drupal_build_composer` to `false` if you are using Composer's `create-project` as a site deployment strategy.
+
+    drupal_core_path: "{{ drupal_composer_install_dir }}/web"
+    drupal_core_owner: "{{ ansible_ssh_user | default(ansible_env.SUDO_USER, true) | default(ansible_env.USER, true) | default(ansible_user_id) }}"
+    drupal_db_user: drupal
+    drupal_db_password: drupal
+    drupal_db_name: drupal
+    drupal_db_backend: mysql
+
+Required Drupal settings.
+
+    drupal_domain: "drupaltest.dev"
+    drupal_site_name: "Drupal"
+    drupal_install_profile: standard
+    drupal_enable_modules: [ 'devel' ]
+    drupal_account_name: admin
+    drupal_account_pass: admin
+
+Settings for installing a Drupal site if `drupal_install_site` is `true`.
+
+## Dependencies
+
+N/A
+
+## Example Playbook
+
+See the example playbook used for Travis CI tests (in `tests/test.yml`) for a simple example. See also: [Drupal VM](https://www.drupalvm.com), which uses this role to set up Drupal.
+
+Currently, this role assumes you've either already cloned an existing Drupal codebase into the `drupal_core_path`, you have a Drush make file or `composer.json` already configured to build your site, or you are building a brand new Drupal site (this is the default) using the [Composer template for Drupal projects](https://github.com/drupal-composer/drupal-project).
+
+    - hosts: webserver
+      vars_files:
+        - vars/main.yml
+      roles:
+        - geerlingguy.apache
+        - geerlingguy.mysql
+        - geerlingguy.php
+        - geerlingguy.php-mysql
+        - geerlingguy.composer
+        - geerlingguy.drush
+        - geerlingguy.drupal
+
+*Inside `vars/main.yml`*:
+
+    drupal_install_site: true
+    drupal_build_composer_project: true
+    drupal_composer_install_dir: "/var/www/drupal"
+    drupal_core_path: "{{ drupal_composer_install_dir }}/web"
+    drupal_domain: "example.com"
+
+## License
+
+MIT / BSD
+
+## Author Information
+
+This role was created in 2014 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.drupal/defaults/main.yml b/provisioning/roles/geerlingguy.drupal/defaults/main.yml
new file mode 100644
index 000000000..d0f84c740
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal/defaults/main.yml
@@ -0,0 +1,41 @@
+---
+# Set this to 'false' if you don't need to install Drupal (using the drupal_*
+# settings below), but instead copy down a database (e.g. using drush sql-sync).
+drupal_install_site: true
+
+# Set this to 'true' and 'drupal_build_composer*' to 'false' if you would like
+# to build a Drupal make file with Drush.
+drupal_build_makefile: false
+drush_makefile_path: "/path/to/drupal.make.yml"
+drush_make_options: "--no-gitinfofile"
+
+# Set 'drupal_build_makefile' to 'false' and this to 'true' if you are using a
+# Composer-based site deployment strategy.
+drupal_build_composer: false
+drupal_composer_path: "/path/to/drupal.composer.json"
+drupal_composer_install_dir: "/var/www/drupal"
+drupal_composer_dependencies:
+  - "drupal/devel:1.x-dev"
+
+# Set this to 'true' and 'drupal_build_makefile', 'drupal_build_composer' to
+# 'false' if you are using Composer's create-project as a site deployment
+# strategy.
+drupal_build_composer_project: true
+drupal_composer_project_package: "drupal-composer/drupal-project:8.x-dev"
+drupal_composer_project_options: "--prefer-dist --stability dev --no-interaction"
+
+# Required Drupal settings.
+drupal_core_path: "{{ drupal_composer_install_dir }}/web"
+drupal_core_owner: "{{ ansible_ssh_user | default(ansible_env.SUDO_USER, true) | default(ansible_env.USER, true) | default(ansible_user_id) }}"
+drupal_db_user: drupal
+drupal_db_password: drupal
+drupal_db_name: drupal
+drupal_db_backend: mysql
+
+# Settings for installing a Drupal site if 'drupal_install_site:' is 'true'.
+drupal_domain: "drupaltest.dev"
+drupal_site_name: "Drupal"
+drupal_install_profile: standard
+drupal_enable_modules: [ 'devel' ]
+drupal_account_name: admin
+drupal_account_pass: admin
diff --git a/provisioning/roles/geerlingguy.drupal/meta/main.yml b/provisioning/roles/geerlingguy.drupal/meta/main.yml
new file mode 100644
index 000000000..7e47a30d9
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal/meta/main.yml
@@ -0,0 +1,25 @@
+---
+dependencies: []
+
+galaxy_info:
+  author: geerlingguy
+  description: Install Drupal - a world class CMS
+  company: "Midwestern Mac, LLC"
+  license: "license (BSD, MIT)"
+  min_ansible_version: 2.0
+  platforms:
+    - name: EL
+      versions:
+      - all
+    - name: Ubuntu
+      versions:
+      - all
+    - name: Debian
+      versions:
+      - all
+  galaxy_tags:
+    - development
+    - web
+    - drupal
+    - cms
+    - php
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/backwards-compatibility.yml b/provisioning/roles/geerlingguy.drupal/tasks/backwards-compatibility.yml
new file mode 100644
index 000000000..f6732fd56
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal/tasks/backwards-compatibility.yml
@@ -0,0 +1,26 @@
+---
+# Shims for Drupal VM backwards compatibility. To be removed by 2018.
+- name: build_makefile shim
+  set_fact:
+    drupal_build_makefile: "{{ build_makefile }}"
+  when: build_makefile|default('')
+
+- name: build_composer shim
+  set_fact:
+    drupal_build_composer: "{{ build_composer }}"
+  when: build_composer|default('')
+
+- name: build_composer_project shim
+  set_fact:
+    drupal_build_composer_project: "{{ build_composer_project }}"
+  when: build_composer_project|default('')
+
+- name: install_site shim
+  set_fact:
+    drupal_install_site: "{{ install_site }}"
+  when: install_site|default('')
+
+- name: drupalvm_database shim
+  set_fact:
+    drupal_db_backend: "{{ drupalvm_database }}"
+  when: drupalvm_database|default('')
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/build-composer-project.yml b/provisioning/roles/geerlingguy.drupal/tasks/build-composer-project.yml
new file mode 100644
index 000000000..8d10099f4
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal/tasks/build-composer-project.yml
@@ -0,0 +1,28 @@
+---
+- name: Ensure drupal_composer_install_dir directory has proper permissions.
+  file:
+    path: "{{ drupal_composer_install_dir }}"
+    state: directory
+    owner: "{{ drupal_core_owner }}"
+    group: "{{ drupal_core_owner }}"
+    mode: 0775
+  when: not drupal_site_exists
+  failed_when: false
+
+- name: Generate Drupal project with composer package.
+  command: >
+    {{ composer_path }} create-project
+    {{ drupal_composer_project_package }} {{ drupal_composer_install_dir }}
+    {{ drupal_composer_project_options|default('--prefer-dist --no-interaction') }}
+  when: not drupal_site_exists
+  become: no
+  environment:
+      COMPOSER_PROCESS_TIMEOUT: 1200
+
+- name: Install dependencies with composer require.
+  composer:
+    command: require
+    arguments: "{{ item }}"
+    working_dir: "{{ drupal_composer_install_dir }}"
+  with_items: "{{ drupal_composer_dependencies|default([]) }}"
+  become: no
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/build-composer.yml b/provisioning/roles/geerlingguy.drupal/tasks/build-composer.yml
new file mode 100644
index 000000000..1aeee2124
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal/tasks/build-composer.yml
@@ -0,0 +1,37 @@
+---
+- name: Ensure drupal_composer_install_dir directory exists.
+  file:
+    path: "{{ drupal_composer_install_dir }}"
+    state: directory
+    mode: 0775
+  become: no
+  when: drupal_composer_path and not drupal_site_exists
+
+# Use copy-and-move to prevent issues in Windows with VirtualBox. See:
+# https://github.com/ansible/ansible/issues/9526#issuecomment-62336962
+- name: Copy composer.json into temporary location.
+  copy:
+    src: "{{ drupal_composer_path }}"
+    dest: "/tmp/drupalvm-composer.json"
+  when: drupal_composer_path and not drupal_site_exists
+  become: no
+
+- name: Move composer.json into place.
+  command: "mv /tmp/drupalvm-composer.json {{ drupal_composer_install_dir }}/composer.json"
+  when: drupal_composer_path and not drupal_site_exists
+  become: no
+
+- name: Run composer install.
+  composer:
+    command: install
+    working_dir: "{{ drupal_composer_install_dir }}"
+  when: not drupal_site_exists
+  become: no
+
+- name: Install dependencies with composer require.
+  composer:
+    command: require
+    arguments: "{{ item }}"
+    working_dir: "{{ drupal_composer_install_dir }}"
+  with_items: "{{ drupal_composer_dependencies|default([]) }}"
+  become: no
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/build-makefile.yml b/provisioning/roles/geerlingguy.drupal/tasks/build-makefile.yml
new file mode 100644
index 000000000..2dc994c4a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal/tasks/build-makefile.yml
@@ -0,0 +1,34 @@
+---
+- name: Copy drush makefile into place.
+  copy:
+    src: "{{ drush_makefile_path }}"
+    dest: /tmp/drupal.make.yml
+  when: not drupal_site_exists
+
+- name: Ensure drupal_core_path directory exists.
+  file:
+    path: "{{ drupal_core_path }}"
+    state: directory
+    recurse: yes
+    mode: 0775
+  become: no
+  when: not drupal_site_exists
+
+- name: Generate Drupal site with drush makefile.
+  command: >
+    {{ drush_path }} make -y /tmp/drupal.make.yml {{ drush_make_options }}
+    chdir={{ drupal_core_path }}
+  when: not drupal_site_exists
+  become: no
+
+- name: Check if a composer.json file is present.
+  stat: "path={{ drupal_core_path }}/composer.json"
+  register: drupal_core_composer_file
+  when: not drupal_site_exists
+
+- name: Run composer install if composer.json is present.
+  command: >
+    composer install
+    chdir={{ drupal_core_path }}
+  when: not drupal_site_exists and drupal_core_composer_file.stat.exists
+  become: no
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/install-site.yml b/provisioning/roles/geerlingguy.drupal/tasks/install-site.yml
new file mode 100644
index 000000000..c3ccba030
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal/tasks/install-site.yml
@@ -0,0 +1,39 @@
+---
+- name: Check if site is already installed.
+  command: >
+    {{ drush_path }} status bootstrap
+    chdir={{ drupal_core_path }}
+  register: drupal_site_installed
+  failed_when: "drupal_site_installed.stdout is undefined"
+  changed_when: false
+  become: no
+
+# See: https://www.drupal.org/node/2569365#comment-11680807
+- name: Configure database correctly if using PostgreSQL.
+  command: psql -c "ALTER DATABASE {{ drupal_db_name }} SET bytea_output = 'escape';"
+  when: "('Successful' not in drupal_site_installed.stdout) and (drupal_db_backend == 'pgsql')"
+  become: yes
+  become_user: "{{ postgresql_user }}"
+  # See: https://github.com/ansible/ansible/issues/16048#issuecomment-229012509
+  vars:
+    ansible_ssh_pipelining: true
+
+- name: Install Drupal with drush.
+  command: >
+    {{ drush_path }} site-install {{ drupal_install_profile | default('standard') }} -y
+    --site-name="{{ drupal_site_name }}"
+    --account-name={{ drupal_account_name }}
+    --account-pass={{ drupal_account_pass }}
+    --db-url={{ drupal_db_backend }}://{{ drupal_db_user }}:{{ drupal_db_password }}@localhost/{{ drupal_db_name }}
+    {{ drupal_site_install_extra_args | default([]) | join(" ") }}
+    chdir={{ drupal_core_path }}
+  notify: restart webserver
+  when: "'Successful' not in drupal_site_installed.stdout"
+  become: no
+
+- name: Install configured modules with drush.
+  command: >
+    {{ drush_path }} pm-enable -y {{ drupal_enable_modules | join(" ") }}
+    chdir={{ drupal_core_path }}
+  when: "'Successful' not in drupal_site_installed.stdout"
+  become: no
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/main.yml b/provisioning/roles/geerlingguy.drupal/tasks/main.yml
new file mode 100644
index 000000000..887fa6383
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal/tasks/main.yml
@@ -0,0 +1,40 @@
+---
+- name: Add backwards-compatibility shims.
+  include: backwards-compatibility.yml
+  static: no
+
+- name: Check if Drupal is already set up.
+  stat: "path={{ drupal_core_path }}/index.php"
+  register: drupal_site
+  ignore_errors: true
+
+- name: Define drupal_site_exists
+  set_fact:
+    drupal_site_exists: "{{ drupal_site.stat.exists|default(false) }}"
+
+# Build makefile if configured.
+- include: tasks/build-makefile.yml
+  when: drupal_build_makefile
+
+# Build with composer if configured.
+- include: tasks/build-composer.yml
+  when: drupal_build_composer
+
+# Build a composer project if configured.
+- include: tasks/build-composer-project.yml
+  when: drupal_build_composer_project
+
+# Set Drush variables.
+- name: Check if a project specific Drush binary exists.
+  stat: "path={{ drupal_composer_install_dir }}/vendor/drush/drush/drush"
+  register: drush_vendor_bin
+  ignore_errors: true
+
+- name: Use project specific Drush if available.
+  set_fact:
+    drush_path: "{{ drupal_composer_install_dir }}/vendor/drush/drush/drush"
+  when: drush_vendor_bin.stat.exists
+
+# Install site if configured.
+- include: tasks/install-site.yml
+  when: drupal_install_site
diff --git a/provisioning/roles/geerlingguy.drupal/tests/initctl_faker b/provisioning/roles/geerlingguy.drupal/tests/initctl_faker
new file mode 100644
index 000000000..a2267f30d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal/tests/initctl_faker
@@ -0,0 +1,23 @@
+#!/bin/sh
+ALIAS_CMD="$(echo ""$0"" | sed -e 's?/sbin/??')"
+
+case "$ALIAS_CMD" in
+    start|stop|restart|reload|status)
+        exec service $1 $ALIAS_CMD
+        ;;
+esac
+
+case "$1" in
+    list )
+        exec service --status-all
+        ;;
+    reload-configuration )
+        exec service $2 restart
+        ;;
+    start|stop|restart|reload|status)
+        exec service $2 $1
+        ;;
+    \?)
+        exit 0
+        ;;
+esac
diff --git a/provisioning/roles/geerlingguy.drupal/tests/requirements.yml b/provisioning/roles/geerlingguy.drupal/tests/requirements.yml
new file mode 100644
index 000000000..0775aadb7
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal/tests/requirements.yml
@@ -0,0 +1,13 @@
+---
+- src: geerlingguy.repo-remi
+- src: geerlingguy.repo-dotdeb
+- src: geerlingguy.apache
+- src: geerlingguy.apache-php-fpm
+- src: geerlingguy.nginx
+- src: geerlingguy.mysql
+- src: geerlingguy.postgresql
+- src: geerlingguy.php
+- src: geerlingguy.php-mysql
+- src: geerlingguy.php-pgsql
+- src: geerlingguy.composer
+- src: geerlingguy.drush
diff --git a/provisioning/roles/geerlingguy.drupal/tests/test.yml b/provisioning/roles/geerlingguy.drupal/tests/test.yml
new file mode 100644
index 000000000..b38e0b8df
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal/tests/test.yml
@@ -0,0 +1,85 @@
+---
+- hosts: all
+
+  vars:
+    php_enable_webserver: false
+    php_enablerepo: "remi,remi-php71"
+
+    apache_remove_default_vhost: true
+    apache_vhosts:
+      - servername: "{{ drupal_domain }}"
+        serveralias: "www.{{ drupal_domain }}"
+        documentroot: "{{ drupal_core_path }}"
+        extra_parameters: |
+              <FilesMatch \.php$>
+                SetHandler "proxy:fcgi://{{ php_fpm_listen }}"
+              </FilesMatch>
+
+    mysql_enablerepo: "remi"
+    mysql_databases:
+      - name: "{{ drupal_db_name }}"
+        encoding: utf8mb4
+        collation: utf8mb4_general_ci
+    mysql_users:
+      - name: "{{ drupal_db_user }}"
+        host: "%"
+        password: "{{ drupal_db_password }}"
+        priv: "{{ drupal_db_name }}.*:ALL"
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=yes cache_valid_time=86400
+      when: ansible_os_family == 'Debian'
+
+    - name: Install dependencies.
+      package: name={{ item }}
+      with_items:
+        - curl
+        - unzip
+
+    - name: Add repository for Apache 2.4.9+ (Ubuntu 14).
+      apt_repository: repo='ppa:ondrej/apache2'
+      when: ansible_distribution == "Ubuntu" and ansible_distribution_release == "trusty"
+
+    - name: Add repository for PHP 7.0 (Ubuntu).
+      apt_repository: repo='ppa:ondrej/php'
+      when: ansible_distribution == "Ubuntu" and ansible_distribution_version != "16.04"
+
+    - name: Set php_packages for PHP 7.0 Debian 8 install.
+      set_fact:
+        php_packages:
+          - php7.0-common
+          - php7.0-cli
+          - php7.0-dev
+          - php7.0-fpm
+          - libpcre3-dev
+          - php7.0-opcache
+          - php7.0-apcu
+          - php7.0-xml
+          - php7.0-zip
+          - php7.0-mbstring
+          - php7.0-json
+          - php7.0-gd
+      when: ansible_distribution == 'Debian'
+
+    - name: Copy initctl_faker into place for Ubuntu 14.04.
+      copy:
+        src: initctl_faker
+        dest: /sbin/initctl
+        mode: 0755
+        force: yes
+      when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '14.04'
+      changed_when: false
+
+  roles:
+    - name: geerlingguy.repo-remi
+      when: ansible_os_family == "RedHat"
+    - role: geerlingguy.repo-dotdeb
+      when: ansible_distribution == 'Debian'
+    - geerlingguy.apache
+    - geerlingguy.mysql
+    - geerlingguy.php
+    - geerlingguy.php-mysql
+    - geerlingguy.composer
+    - geerlingguy.drush
+    - role_under_test

From 9ec2b68adb61882b5cf1afc0b1f33be7ac034b41 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 2 Mar 2017 12:38:29 -0600
Subject: [PATCH 0626/1273] Issue #1192: Fix broken test with Drush make file
 build.

---
 tests/ubuntu-16-nginx.config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/ubuntu-16-nginx.config.yml b/tests/ubuntu-16-nginx.config.yml
index c3c8833c5..917a585f1 100644
--- a/tests/ubuntu-16-nginx.config.yml
+++ b/tests/ubuntu-16-nginx.config.yml
@@ -2,6 +2,6 @@
 drupalvm_webserver: nginx
 
 # Test makefile based installation.
-build_makefile: true
-build_composer_project: false
+drupal_build_makefile: true
+drupal_build_composer_project: false
 drupal_core_path: "/var/www/drupalvm/drupal"

From 972a86b0ec72fb11f48f8b21ce06a0bd1e0cd341 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 6 Mar 2017 15:39:11 -0600
Subject: [PATCH 0627/1273] Update Firewall role to latest version.

---
 provisioning/requirements.yml                    |  2 +-
 .../roles/geerlingguy.firewall/README.md         |  5 +++++
 .../tasks/disable-other-firewalls.yml            | 16 ++++++++++++++--
 .../roles/geerlingguy.firewall/tasks/main.yml    |  2 +-
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index b403b85e8..e922bfdf5 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -26,7 +26,7 @@
 - src: geerlingguy.elasticsearch
   version: 2.1.3
 - src: geerlingguy.firewall
-  version: 2.1.0
+  version: 2.1.1
 - src: geerlingguy.git
   version: 1.2.1
 - src: geerlingguy.java
diff --git a/provisioning/roles/geerlingguy.firewall/README.md b/provisioning/roles/geerlingguy.firewall/README.md
index d6668c950..3f26149e7 100644
--- a/provisioning/roles/geerlingguy.firewall/README.md
+++ b/provisioning/roles/geerlingguy.firewall/README.md
@@ -50,6 +50,11 @@ See [Iptables Essentials: Common Firewall Rules and Commands](https://www.digita
 
 Whether to log dropped packets to syslog (messages will be prefixed with "Dropped by firewall: ").
 
+    firewall_disable_firewalld: false
+    firewall_disable_ufw: false
+
+Set to `true` to disable firewalld (installed by default on RHEL/CentOS) or ufw (installed by default on Ubuntu), respectively.
+
 ## Dependencies
 
 None.
diff --git a/provisioning/roles/geerlingguy.firewall/tasks/disable-other-firewalls.yml b/provisioning/roles/geerlingguy.firewall/tasks/disable-other-firewalls.yml
index 3c4f5cabd..1abf27ebd 100644
--- a/provisioning/roles/geerlingguy.firewall/tasks/disable-other-firewalls.yml
+++ b/provisioning/roles/geerlingguy.firewall/tasks/disable-other-firewalls.yml
@@ -1,14 +1,26 @@
 ---
+- name: Check firewalld package is installed (on RHEL).
+  shell: yum list installed firewalld
+  register: firewalld_installed
+  ignore_errors: true
+  when: ansible_os_family == "RedHat" and firewall_disable_firewalld
+
 - name: Disable the firewalld service (on RHEL, if configured).
   service:
     name: firewalld
     state: stopped
     enabled: no
-  when: ansible_os_family == "RedHat" and firewall_disable_firewalld
+  when: ansible_os_family == "RedHat" and firewall_disable_firewalld and firewalld_installed.rc == 0
+
+- name: Check ufw package is installed (on Ubuntu).
+  shell: dpkg -l ufw
+  register: ufw_installed
+  ignore_errors: true
+  when: ansible_distribution == "Ubuntu" and firewall_disable_ufw
 
 - name: Disable the ufw firewall (on Ubuntu, if configured).
   service:
     name: ufw
     state: stopped
     enabled: no
-  when: ansible_distribution == "Ubuntu" and firewall_disable_ufw
+  when: ansible_distribution == "Ubuntu" and firewall_disable_ufw and ufw_installed.rc == 0
diff --git a/provisioning/roles/geerlingguy.firewall/tasks/main.yml b/provisioning/roles/geerlingguy.firewall/tasks/main.yml
index 04f3d4f71..98e5107ec 100644
--- a/provisioning/roles/geerlingguy.firewall/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.firewall/tasks/main.yml
@@ -30,7 +30,7 @@
     dest: /etc/systemd/system/firewall.service
     owner: root
     group: root
-    mode: 0755
+    mode: 0644
   when: >
     (ansible_distribution == 'Ubuntu' and ansible_distribution_version.split(".")[0]|int >= 16) or
     (ansible_distribution == 'Debian' and ansible_distribution_version.split(".")[0]|int >= 8) or

From f4e0b1121c345cef4ba6e8b3b2e97d6915b8f8ab Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 9 Mar 2017 16:34:54 -0600
Subject: [PATCH 0628/1273] Issue #1200: Remove development package
 installation from default setup.

---
 provisioning/tasks/init-debian.yml | 1 -
 provisioning/tasks/init-redhat.yml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/provisioning/tasks/init-debian.yml b/provisioning/tasks/init-debian.yml
index 0fc4bae7f..12d817f17 100644
--- a/provisioning/tasks/init-debian.yml
+++ b/provisioning/tasks/init-debian.yml
@@ -8,7 +8,6 @@
     - curl
     - python-apt
     - python-pycurl
-    - build-essential
     - sudo
     - unzip
 
diff --git a/provisioning/tasks/init-redhat.yml b/provisioning/tasks/init-redhat.yml
index 599223eea..e0431e9e1 100644
--- a/provisioning/tasks/init-redhat.yml
+++ b/provisioning/tasks/init-redhat.yml
@@ -4,7 +4,6 @@
   with_items:
     - "curl"
     - "python-pycurl"
-    - "@development"
     - "unzip"
 
 - name: Enable remi repo for MySQL.

From afb8a17112dd33aa2ca5bbb4d7f4e7fe9b34e756 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 9 Mar 2017 16:43:22 -0600
Subject: [PATCH 0629/1273] Issue #1200: Add back make.

---
 provisioning/tasks/init-debian.yml | 3 ++-
 provisioning/tasks/init-redhat.yml | 9 +++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/provisioning/tasks/init-debian.yml b/provisioning/tasks/init-debian.yml
index 12d817f17..6ee4c214b 100644
--- a/provisioning/tasks/init-debian.yml
+++ b/provisioning/tasks/init-debian.yml
@@ -2,7 +2,7 @@
 - name: Update apt cache if needed.
   apt: update_cache=yes cache_valid_time=86400
 
-- name: Get software for Python-based control.
+- name: Install required dependencies.
   apt: "name={{ item }} state=installed"
   with_items:
     - curl
@@ -10,6 +10,7 @@
     - python-pycurl
     - sudo
     - unzip
+    - make
 
 - name: Configure /etc/mailname.
   copy:
diff --git a/provisioning/tasks/init-redhat.yml b/provisioning/tasks/init-redhat.yml
index e0431e9e1..6e7f5d62b 100644
--- a/provisioning/tasks/init-redhat.yml
+++ b/provisioning/tasks/init-redhat.yml
@@ -1,10 +1,11 @@
 ---
-- name: Get software for Python-based control.
+- name: Install required dependencies.
   yum: "name={{ item }} state=installed"
   with_items:
-    - "curl"
-    - "python-pycurl"
-    - "unzip"
+    - curl
+    - python-pycurl
+    - unzip
+    - make
 
 - name: Enable remi repo for MySQL.
   set_fact: mysql_enablerepo="remi"

From dfeb45074c431ef0d43d0f9e537e355a509f9565 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 9 Mar 2017 18:53:43 -0600
Subject: [PATCH 0630/1273] Issue #1200: Install gcc on RedHat as well.

---
 provisioning/tasks/init-redhat.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/provisioning/tasks/init-redhat.yml b/provisioning/tasks/init-redhat.yml
index 6e7f5d62b..564e1679d 100644
--- a/provisioning/tasks/init-redhat.yml
+++ b/provisioning/tasks/init-redhat.yml
@@ -6,6 +6,7 @@
     - python-pycurl
     - unzip
     - make
+    - gcc
 
 - name: Enable remi repo for MySQL.
   set_fact: mysql_enablerepo="remi"

From b963d2ca710560a5ab500332d17fb072ea0143b1 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 9 Mar 2017 20:23:55 -0600
Subject: [PATCH 0631/1273] Issue #1200: Fix varnish role install on CentOS -
 latest role version.

---
 provisioning/requirements.yml                                 | 2 +-
 provisioning/roles/geerlingguy.varnish/README.md              | 4 ++--
 provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index e922bfdf5..fc1235c00 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -76,4 +76,4 @@
 - src: geerlingguy.solr
   version: 3.5.1
 - src: geerlingguy.varnish
-  version: 1.8.1
+  version: 1.8.3
diff --git a/provisioning/roles/geerlingguy.varnish/README.md b/provisioning/roles/geerlingguy.varnish/README.md
index bd3cbf07e..8b41ef674 100644
--- a/provisioning/roles/geerlingguy.varnish/README.md
+++ b/provisioning/roles/geerlingguy.varnish/README.md
@@ -82,7 +82,7 @@ None.
 *Inside `vars/main.yml`*:
 
     varnish_secret: "[secret generated by uuidgen]"
-    varnish_default_backend_host: 81
+    varnish_default_backend_port: 81
     ... etc ...
 
 ## License
@@ -91,4 +91,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml
index 913f0aa7f..a495ef447 100644
--- a/provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml
@@ -5,6 +5,7 @@
     - gcc
     - libedit-devel
     - initscripts
+    - redhat-rpm-config
 
 - name: Add Varnish repository.
   yum:

From 88017134bbdf402725fac8b789ae44b80333e668 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 9 Mar 2017 21:40:18 -0600
Subject: [PATCH 0632/1273] Issue #1200: Update CHANGELOG with latest changes.

---
 CHANGELOG.md | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 88bdfa0a4..3db42afb1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,37 @@
 # Drupal VM Changelog
 
+## 4.3.0 "Ring Game and Escape" (2017-03-09)
+
+### Breaking Changes
+
+  * No _explicit_ breaking changes; however, you should update any of the changed variables in the 'Updated Drupal-specific variable names' section below.
+
+### New/changed variables in default.config.yml
+
+  * `vagrant_gui: false` added (allows UI to appear after running `vagrant up` - Issue #1175).
+  * Updated Drupal-specific variable names (Issue #1192):
+    * `drupalvm_database` changed to `drupal_db_backend`
+    * `build_makefile` changed to `drupal_build_makefile`
+    * `build_composer` changed to `drupal_build_composer`
+    * `build_composer_project` changed to `drupal_build_composer_project`
+    * `install_site` changed to `drupal_install_site`
+  * `drupal_core_owner` added (defaults to `drupalvm_user` - Issue #1192)
+  * `tideways` added (commented out) to `installed_extras` (Issue #1181)
+
+### Improvements
+
+  * #1192: Move Drupal build and install code into revamped `geerlingguy.drupal` role.
+  * #1175: Add `vagrant_gui` option to allow GUI to show when running `vagrant up`.
+  * #1200: Only install necessary development packages (for faster, lighter builds).
+  * Roles updated to latest version: Composer, Solr, Java, Selenium, Drush, Firewall, and Varnish.
+
+### Bugfixes
+
+  * #1167, #1181, #1168, #1188: Documentation tweaks.
+  * #420: Update Drush role so 'run drush to set it up' doesn't fail.
+  * #1182: Clean up Tideways documentation.
+
+
 ## 4.2.1 (2017-02-08)
 
 ### Improvements

From ba70fd9dc4aa3e2f6fe980e7f36801d8f71dab7d Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 10 Mar 2017 22:47:03 -0600
Subject: [PATCH 0633/1273] Fixes #1211: Add mcrypt PHP extension on
 RedHat-based installs.

---
 provisioning/vars/RedHat.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/provisioning/vars/RedHat.yml b/provisioning/vars/RedHat.yml
index ab3c1a715..29b087584 100644
--- a/provisioning/vars/RedHat.yml
+++ b/provisioning/vars/RedHat.yml
@@ -10,6 +10,7 @@ php_packages:
   - php-imap
   - php-ldap
   - php-mbstring
+  - php-mcrypt
   - php-opcache
   - php-pdo
   - php-pear

From 8845c849dd197fbea350e20da264e195cc15fdcc Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 10 Mar 2017 23:38:24 -0600
Subject: [PATCH 0634/1273] Update Drush role to latest version. Much snappier
 install.

---
 default.config.yml                            |  4 +-
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.drush/.travis.yml       | 14 +++++--
 .../roles/geerlingguy.drush/README.md         | 22 +++++++---
 .../roles/geerlingguy.drush/defaults/main.yml | 10 ++++-
 .../roles/geerlingguy.drush/meta/main.yml     | 10 ++---
 .../roles/geerlingguy.drush/tasks/install.yml | 10 +++++
 .../roles/geerlingguy.drush/tasks/main.yml    | 41 ++-----------------
 .../tasks/source-install.yml                  | 39 ++++++++++++++++++
 .../tests/test-source-install.yml             | 24 +++++++++++
 .../roles/geerlingguy.drush/tests/test.yml    |  2 -
 11 files changed, 119 insertions(+), 59 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.drush/tasks/install.yml
 create mode 100644 provisioning/roles/geerlingguy.drush/tasks/source-install.yml
 create mode 100644 provisioning/roles/geerlingguy.drush/tests/test-source-install.yml

diff --git a/default.config.yml b/default.config.yml
index f18f8e34c..c95c453b7 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -219,9 +219,7 @@ extra_packages:
 # You can configure almost anything else on the server in the rest of this file.
 extra_security_enabled: false
 
-drush_version: "8.x"
-drush_keep_updated: true
-drush_composer_cli_options: "--prefer-dist --no-interaction"
+drush_version: "8.1.10"
 
 firewall_allowed_tcp_ports:
   - "22"
diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index fc1235c00..b321f97be 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -22,7 +22,7 @@
 - src: geerlingguy.drupal-console
   version: 1.0.7
 - src: geerlingguy.drush
-  version: 1.2.1
+  version: 2.0.0
 - src: geerlingguy.elasticsearch
   version: 2.1.3
 - src: geerlingguy.firewall
diff --git a/provisioning/roles/geerlingguy.drush/.travis.yml b/provisioning/roles/geerlingguy.drush/.travis.yml
index 54494a6bf..2a02913f0 100644
--- a/provisioning/roles/geerlingguy.drush/.travis.yml
+++ b/provisioning/roles/geerlingguy.drush/.travis.yml
@@ -2,12 +2,20 @@
 services: docker
 
 env:
+  # Normal installation.
   - distro: centos7
     init: /usr/lib/systemd/systemd
     run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    playbook: test.yml
   - distro: ubuntu1604
     init: /lib/systemd/systemd
     run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    playbook: test.yml
+  # Install from source.
+  - distro: centos7
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    playbook: test-source-install.yml
 
 before_install:
   # Pull container.
@@ -22,14 +30,14 @@ script:
   - 'docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
 
   # Ansible syntax check.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} --syntax-check'
 
   # Test role.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook}'
 
   # Test role idempotence.
   - idempotence=$(mktemp)
-  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
+  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} | tee -a ${idempotence}
   - >
     tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
diff --git a/provisioning/roles/geerlingguy.drush/README.md b/provisioning/roles/geerlingguy.drush/README.md
index 6d4917bfe..6bb830eb8 100644
--- a/provisioning/roles/geerlingguy.drush/README.md
+++ b/provisioning/roles/geerlingguy.drush/README.md
@@ -6,20 +6,32 @@ Installs [Drush](http://www.drush.org/en/master/), a command line shell and scri
 
 ## Requirements
 
-None.
+PHP must be installed on the system prior to running this role (suggested role: `geerlingguy.php`).
+
+Source installation additionally requires Git and Composer to also be installed on the system (suggested roles: `geerlingguy.git` and `geerlingguy.composer`).
 
 ## Role Variables
 
 Available variables are listed below, along with default values (see `defaults/main.yml`):
 
-    drush_install_path: /usr/local/share/drush
+    drush_phar_url: https://github.com/drush-ops/drush/releases/download/8.1.10/drush.phar
 
-The location of the entire drush installation (includes all the supporting files, as well as the `drush` executable file.
+The URL from which the Drush phar file will be downloaded.
 
     drush_path: /usr/local/bin/drush
 
 The path where drush will be installed and available to your system. Should be in your user's `$PATH` so you can run commands simply with `drush` instead of the full path.
 
+    drush_config: ~/.drush
+
+Path to the directory where Drush will store its generated config.
+
+### Variables used for source install (Git).
+
+    drush_install_path: /usr/local/share/drush
+
+The location of the entire drush installation (includes all the supporting files, as well as the `drush` executable file.
+
     drush_version: "master"
 
 The version of Drush to install (examples: `"master"` for the bleeding edge, `"7.x"`, `"6.x"`, `"6.2.0"`). This should be a string as it refers to a git branch, tag, or commit hash.
@@ -43,9 +55,7 @@ Whether to clone the entire repo (by default), or specify the number of previous
 
 ## Dependencies
 
-  - geerlingguy.git (Installs Git).
-  - geerlingguy.php (Installs PHP).
-  - geerlingguy.composer (Installs Composer).
+None.
 
 ## Example Playbook
 
diff --git a/provisioning/roles/geerlingguy.drush/defaults/main.yml b/provisioning/roles/geerlingguy.drush/defaults/main.yml
index 8873d30db..704fb3f7c 100644
--- a/provisioning/roles/geerlingguy.drush/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.drush/defaults/main.yml
@@ -1,7 +1,13 @@
 ---
-drush_install_path: /usr/local/share/drush
+# Install from phar (faster, but less flexible).
+drush_version: "8.1.10"
+drush_phar_url: https://github.com/drush-ops/drush/releases/download/{{ drush_version }}/drush.phar
 drush_path: /usr/local/bin/drush
-drush_version: "master"
+
+# Install from source (git clone + composer-based install).
+drush_install_from_source: no
+drush_install_path: /usr/local/share/drush
+# drush_version: "master"
 drush_keep_updated: no
 drush_force_update: no
 drush_force_composer_install: no
diff --git a/provisioning/roles/geerlingguy.drush/meta/main.yml b/provisioning/roles/geerlingguy.drush/meta/main.yml
index a57ca5311..8f188fac9 100644
--- a/provisioning/roles/geerlingguy.drush/meta/main.yml
+++ b/provisioning/roles/geerlingguy.drush/meta/main.yml
@@ -1,15 +1,12 @@
 ---
-dependencies:
-  - geerlingguy.git
-  - geerlingguy.php
-  - geerlingguy.composer
+dependencies: []
 
 galaxy_info:
   author: geerlingguy
   description: Drush - command line shell for Drupal
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 1.8
+  min_ansible_version: 2.0
   platforms:
     - name: EL
       versions:
@@ -44,3 +41,6 @@ galaxy_info:
   galaxy_tags:
     - development
     - web
+    - drush
+    - drupal
+    - command
diff --git a/provisioning/roles/geerlingguy.drush/tasks/install.yml b/provisioning/roles/geerlingguy.drush/tasks/install.yml
new file mode 100644
index 000000000..386c0cddb
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drush/tasks/install.yml
@@ -0,0 +1,10 @@
+---
+- name: Install Drush.
+  get_url:
+    url: "{{ drush_phar_url }}"
+    dest: "{{ drush_path }}"
+
+- name: Ensure Drush is executable.
+  file:
+    path: "{{ drush_path }}"
+    mode: 0755
diff --git a/provisioning/roles/geerlingguy.drush/tasks/main.yml b/provisioning/roles/geerlingguy.drush/tasks/main.yml
index 091a958b4..37f9d36cf 100644
--- a/provisioning/roles/geerlingguy.drush/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.drush/tasks/main.yml
@@ -1,39 +1,6 @@
 ---
-- name: Clone Drush from GitHub.
-  git:
-    repo: https://github.com/drush-ops/drush.git
-    dest: "{{ drush_install_path }}"
-    version: "{{ drush_version }}"
-    update: "{{ drush_keep_updated }}"
-    force: "{{ drush_force_update }}"
-    depth: "{{ drush_clone_depth }}"
-  register: drush_clone
+- include: install.yml
+  when: not drush_install_from_source
 
-- name: Check for composer.json
-  stat: path={{ drush_install_path }}/composer.json
-  register: drush_composer
-
-# See: https://github.com/geerlingguy/ansible-role-drush/issues/6
-- name: Ensure Drush can be installed on Debian Wheezy.
-  shell: >
-    {{ composer_path }} update {{ drush_composer_cli_options }}
-    chdir={{ drush_install_path }}
-  when: drush_clone.changed and ansible_distribution == "Debian" and ansible_distribution_release == "wheezy" and drush_composer.stat.exists
-
-- name: Install Drush dependencies with Composer.
-  shell: >
-    {{ composer_path }} install {{ drush_composer_cli_options }}
-    chdir={{ drush_install_path }}
-  when: (drush_clone.changed and drush_composer.stat.exists) or drush_force_composer_install
-
-- name: Create drush symlink.
-  file:
-    src: "{{ drush_install_path }}/drush"
-    dest: "{{ drush_path }}"
-    state: link
-
-- name: Run drush to finish setting it up.
-  command: "{{ drush_path }}"
-  register: drush_result
-  changed_when: "'Execute a drush command' not in drush_result.stdout"
-  become: no
+- include: source-install.yml
+  when: drush_install_from_source
diff --git a/provisioning/roles/geerlingguy.drush/tasks/source-install.yml b/provisioning/roles/geerlingguy.drush/tasks/source-install.yml
new file mode 100644
index 000000000..091a958b4
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drush/tasks/source-install.yml
@@ -0,0 +1,39 @@
+---
+- name: Clone Drush from GitHub.
+  git:
+    repo: https://github.com/drush-ops/drush.git
+    dest: "{{ drush_install_path }}"
+    version: "{{ drush_version }}"
+    update: "{{ drush_keep_updated }}"
+    force: "{{ drush_force_update }}"
+    depth: "{{ drush_clone_depth }}"
+  register: drush_clone
+
+- name: Check for composer.json
+  stat: path={{ drush_install_path }}/composer.json
+  register: drush_composer
+
+# See: https://github.com/geerlingguy/ansible-role-drush/issues/6
+- name: Ensure Drush can be installed on Debian Wheezy.
+  shell: >
+    {{ composer_path }} update {{ drush_composer_cli_options }}
+    chdir={{ drush_install_path }}
+  when: drush_clone.changed and ansible_distribution == "Debian" and ansible_distribution_release == "wheezy" and drush_composer.stat.exists
+
+- name: Install Drush dependencies with Composer.
+  shell: >
+    {{ composer_path }} install {{ drush_composer_cli_options }}
+    chdir={{ drush_install_path }}
+  when: (drush_clone.changed and drush_composer.stat.exists) or drush_force_composer_install
+
+- name: Create drush symlink.
+  file:
+    src: "{{ drush_install_path }}/drush"
+    dest: "{{ drush_path }}"
+    state: link
+
+- name: Run drush to finish setting it up.
+  command: "{{ drush_path }}"
+  register: drush_result
+  changed_when: "'Execute a drush command' not in drush_result.stdout"
+  become: no
diff --git a/provisioning/roles/geerlingguy.drush/tests/test-source-install.yml b/provisioning/roles/geerlingguy.drush/tests/test-source-install.yml
new file mode 100644
index 000000000..f72b0bf89
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drush/tests/test-source-install.yml
@@ -0,0 +1,24 @@
+---
+- hosts: all
+
+  vars:
+    php_enable_webserver: false
+    php_opcache_enable: "0"
+    drush_install_from_source: yes
+
+  pre_tasks:
+    - name: Enable remi repo for PHP 7.0 (RedHat).
+      set_fact: php_enablerepo="remi,remi-php70"
+      when: ansible_os_family == 'RedHat'
+
+    - name: Update apt cache.
+      apt: update_cache=yes cache_valid_time=600
+      when: ansible_os_family == 'Debian'
+
+  roles:
+    - role: geerlingguy.repo-remi
+      when: ansible_os_family == 'RedHat'
+    - geerlingguy.php
+    - geerlingguy.composer
+    - geerlingguy.git
+    - role_under_test
diff --git a/provisioning/roles/geerlingguy.drush/tests/test.yml b/provisioning/roles/geerlingguy.drush/tests/test.yml
index 6a8360a01..9b6efdeb9 100644
--- a/provisioning/roles/geerlingguy.drush/tests/test.yml
+++ b/provisioning/roles/geerlingguy.drush/tests/test.yml
@@ -18,6 +18,4 @@
     - role: geerlingguy.repo-remi
       when: ansible_os_family == 'RedHat'
     - geerlingguy.php
-    - geerlingguy.composer
-    - geerlingguy.git
     - role_under_test

From d96c37776dcbd10e4d57534d900d8a0b8942fc24 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 11 Mar 2017 11:59:44 -0600
Subject: [PATCH 0635/1273] Bump default Drush make Core version to 8.2.6, fix
 build docs.

---
 docs/deployment/composer-dependency.md |  6 +++---
 docs/deployment/composer-package.md    |  2 +-
 docs/deployment/composer.md            | 10 +++++-----
 docs/deployment/drush-make.md          | 10 +++++-----
 docs/deployment/local-codebase.md      | 12 ++++++------
 example.drupal.make.yml                |  4 ++--
 6 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/docs/deployment/composer-dependency.md b/docs/deployment/composer-dependency.md
index 7209dcae7..8487fe1f3 100644
--- a/docs/deployment/composer-dependency.md
+++ b/docs/deployment/composer-dependency.md
@@ -12,7 +12,7 @@ composer require --dev geerlingguy/drupal-vm
 
 Add and configure the `config.yml` anywhere you like, in this example we place it in a `config/` directory.
 
-_Note: This will be the directory where Drupal VM looks for other local configuration files as well. Such as `build_makefile`, `local.config.yml` and `Vagrantfile.local`._
+_Note: This will be the directory where Drupal VM looks for other local configuration files as well. Such as `drupal_build_makefile`, `local.config.yml` and `Vagrantfile.local`._
 
 ```
 ├── composer.json
@@ -32,8 +32,8 @@ _Note: This will be the directory where Drupal VM looks for other local configur
 Change the [build strategy to use your `composer.json`](composer.md#using-composer-when-drupal-vm-is-a-composer-dependency-itself) file by setting:
 
 ```yaml
-build_composer_project: false
-build_composer: true
+drupal_build_composer_project: false
+drupal_build_composer: true
 drupal_composer_path: false
 drupal_composer_install_dir: "/var/www/drupalvm"
 drupal_core_path: "{{ drupal_composer_install_dir }}/docroot"
diff --git a/docs/deployment/composer-package.md b/docs/deployment/composer-package.md
index 816d56f31..382f37f65 100644
--- a/docs/deployment/composer-package.md
+++ b/docs/deployment/composer-package.md
@@ -2,7 +2,7 @@ Out of the box Drupal VM is configured to use `composer create-project` to build
 
 This is set up with the following variables in `config.yml`:
 
-  - Composer will build the project if `build_composer_project` is `true`, and `build_makefile` and `build_composer` are both `false`.
+  - Composer will build the project if `drupal_build_composer_project` is `true`, and `drupal_build_makefile` and `drupal_build_composer` are both `false`.
   - The Composer package is defined by `drupal_composer_project_package`.
   - Adjust the create-project CLI options in `drupal_composer_project_options` as well as add additional dependencies in `drupal_composer_dependencies`.
   - Ensure that the webroot configured in the Composer package matches the one set in `drupal_core_path`. The default is set to `web/`.
diff --git a/docs/deployment/composer.md b/docs/deployment/composer.md
index d64f2ecf1..6d04b94de 100644
--- a/docs/deployment/composer.md
+++ b/docs/deployment/composer.md
@@ -1,12 +1,12 @@
 Drupal VM is configured to use `composer create-project` to build a Drupal 8 codebase by default but supports building Drupal from a custom `composer.json` file as well.
 
 1. Copy `example.drupal.composer.json` to `drupal.composer.json` and modify it to your liking.
-2. Use the Composer build system by setting `build_composer: true` in your `config.yml` (make sure `build_makefile` and `build_composer_project` are set to `false`).
+2. Use the Composer build system by setting `drupal_build_composer: true` in your `config.yml` (make sure `drupal_build_makefile` and `build_composer_project` are set to `false`).
 3. Configure `drupal_core_path` to point to the webroot directory: `drupal_core_path: {{ drupal_composer_install_dir }}/docroot`
 
 ```yaml
-build_composer_project: false
-build_composer: true
+drupal_build_composer_project: false
+drupal_build_composer: true
 drupal_core_path: "{{ drupal_composer_install_dir }}/docroot"
 ```
 
@@ -17,8 +17,8 @@ _The file set in `drupal_composer_path` (which defaults to `drupal.composer.json
 In the scenario where you have an existing `composer.json` in the root of your project, follow the usual steps for installing with a composer.json but instead of creating a `drupal.composer.json` file, disable the transfering of the file by setting `drupal_composer_path: false`, and change `drupal_composer_install_dir` to point to the the directory where it will be located. If `drupal_composer_path` is not truthy, Drupal VM assumes it already exists.
 
 ```yaml
-build_composer_project: false
-build_composer: true
+drupal_build_composer_project: false
+drupal_build_composer: true
 drupal_composer_path: false
 drupal_composer_install_dir: "/var/www/drupalvm"
 drupal_core_path: "{{ drupal_composer_install_dir }}/docroot"
diff --git a/docs/deployment/drush-make.md b/docs/deployment/drush-make.md
index f7fce8a9c..26b39b458 100644
--- a/docs/deployment/drush-make.md
+++ b/docs/deployment/drush-make.md
@@ -1,8 +1,8 @@
-If you want to build a Drupal site using a [Drush make file](http://www.drush.org/en/master/make/) instead of composer, set `build_composer_project: false`, `build_makefile: true` and either use the `example.drupal.make.yml` file as a base, or use your own Drush make file: just place it or symlink it into the root of the Drupal VM folder with the filename `drupal.make.yml`. You can also set a separate path to the makefile using the `drush_makefile_path` variable.
+If you want to build a Drupal site using a [Drush make file](http://www.drush.org/en/master/make/) instead of composer, set `drupal_build_composer_project: false`, `drupal_build_makefile: true` and either use the `example.drupal.make.yml` file as a base, or use your own Drush make file: just place it or symlink it into the root of the Drupal VM folder with the filename `drupal.make.yml`. You can also set a separate path to the makefile using the `drush_makefile_path` variable.
 
 ```yaml
-build_composer_project: false
-build_makefile: true
+drupal_build_composer_project: false
+drupal_build_makefile: true
 ```
 
 Have a look at the defaults in `default.config.yml` and tweak the settings as you'd like in your `config.yml`, then run `vagrant up` as in the Quick Start Guide. Within a few minutes, you should have your site running and available at the `drupal_domain` configured in `config.yml`, falling back to the default `http://drupalvm.dev` set in `default.config.yml`.
@@ -10,7 +10,7 @@ Have a look at the defaults in `default.config.yml` and tweak the settings as yo
 With the default settings the Drupal site will be built on the VM inside `/var/www/drupalvm/drupal/web` but the `web/` subdirectory is only required for `composer` based projects and you can simplify this directory structure by setting `drupal_core_path` to `/var/www/drupalvm/drupal`.
 
 ```yaml
-build_composer_project: false
-build_makefile: true
+drupal_build_composer_project: false
+drupal_build_makefile: true
 drupal_core_path: "/var/www/drupalvm/drupal"
 ```
diff --git a/docs/deployment/local-codebase.md b/docs/deployment/local-codebase.md
index 607da6152..1ad452458 100644
--- a/docs/deployment/local-codebase.md
+++ b/docs/deployment/local-codebase.md
@@ -15,17 +15,17 @@ _If you have Drupal VM installed within your codebase, you can also set the `loc
 
 ## Disable the Composer project build and site install
 
-Set all the `build_*` variables and `install_site` to `false`:
+Set all the `drupal_build_*` variables and `install_site` to `false`:
 
 ```yaml
-build_makefile: false
-build_composer: false
-build_composer_project: false
+drupal_build_makefile: false
+drupal_build_composer: false
+drupal_build_composer_project: false
 ...
-install_site: false
+drupal_install_site: false
 ```
 
-If you aren't copying back a database, and want to have Drupal VM run `drush si` for your Drupal site, you can leave `install_site` set to `true` and it will run a site install on your Drupal codebase using the `drupal_*` config variables.
+If you aren't copying back a database, and want to have Drupal VM run `drush si` for your Drupal site, you can leave `drupal_install_site` set to `true` and it will run a site install on your Drupal codebase using the `drupal_*` config variables.
 
 ## Update `drupal_core_path`
 
diff --git a/example.drupal.make.yml b/example.drupal.make.yml
index 0fba08d49..04b70e99a 100644
--- a/example.drupal.make.yml
+++ b/example.drupal.make.yml
@@ -11,12 +11,12 @@ projects:
 
   # Core.
   drupal:
-    version: "8.1.8"
+    version: "8.2.6"
     # Use this if you need a working git repository of Drupal core instead of
     # the latest stable.
     # type: "core"
     # download:
-    #   # Drupal core branch (e.g. "6.x", "7.x", "8.0.x").
+    #   # Drupal core branch (e.g. "6.x", "7.x", "8.2.x", "8.3.x").
     #   branch: "8.1.x"
     #   working-copy: true
 

From a60d3aff8ac53e66e9fc3438220140692d8199ca Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 11 Mar 2017 20:53:13 -0600
Subject: [PATCH 0636/1273] Fixes #1212: Update Drupal role so Drush Make b
 uild succeeds.

---
 provisioning/requirements.yml                                | 2 +-
 provisioning/roles/geerlingguy.drupal/README.md              | 1 +
 provisioning/roles/geerlingguy.drupal/defaults/main.yml      | 1 +
 provisioning/roles/geerlingguy.drupal/tasks/install-site.yml | 2 +-
 provisioning/roles/geerlingguy.drupal/tests/requirements.yml | 1 +
 provisioning/roles/geerlingguy.drupal/tests/test.yml         | 1 +
 6 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index b321f97be..5188a8406 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -18,7 +18,7 @@
 - src: geerlingguy.daemonize
   version: 1.1.1
 - src: geerlingguy.drupal
-  version: 2.0.1
+  version: 2.0.2
 - src: geerlingguy.drupal-console
   version: 1.0.7
 - src: geerlingguy.drush
diff --git a/provisioning/roles/geerlingguy.drupal/README.md b/provisioning/roles/geerlingguy.drupal/README.md
index 122bb9b65..636bf92fb 100644
--- a/provisioning/roles/geerlingguy.drupal/README.md
+++ b/provisioning/roles/geerlingguy.drupal/README.md
@@ -48,6 +48,7 @@ Set this to `true` and `drupal_build_makefile`, `drupal_build_composer` to `fals
     drupal_db_password: drupal
     drupal_db_name: drupal
     drupal_db_backend: mysql
+    drupal_db_host: "127.0.0.1"
 
 Required Drupal settings.
 
diff --git a/provisioning/roles/geerlingguy.drupal/defaults/main.yml b/provisioning/roles/geerlingguy.drupal/defaults/main.yml
index d0f84c740..ae11f9c13 100644
--- a/provisioning/roles/geerlingguy.drupal/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.drupal/defaults/main.yml
@@ -31,6 +31,7 @@ drupal_db_user: drupal
 drupal_db_password: drupal
 drupal_db_name: drupal
 drupal_db_backend: mysql
+drupal_db_host: "127.0.0.1"
 
 # Settings for installing a Drupal site if 'drupal_install_site:' is 'true'.
 drupal_domain: "drupaltest.dev"
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/install-site.yml b/provisioning/roles/geerlingguy.drupal/tasks/install-site.yml
index c3ccba030..210128814 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/install-site.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/install-site.yml
@@ -24,7 +24,7 @@
     --site-name="{{ drupal_site_name }}"
     --account-name={{ drupal_account_name }}
     --account-pass={{ drupal_account_pass }}
-    --db-url={{ drupal_db_backend }}://{{ drupal_db_user }}:{{ drupal_db_password }}@localhost/{{ drupal_db_name }}
+    --db-url={{ drupal_db_backend }}://{{ drupal_db_user }}:{{ drupal_db_password }}@{{ drupal_db_host }}/{{ drupal_db_name }}
     {{ drupal_site_install_extra_args | default([]) | join(" ") }}
     chdir={{ drupal_core_path }}
   notify: restart webserver
diff --git a/provisioning/roles/geerlingguy.drupal/tests/requirements.yml b/provisioning/roles/geerlingguy.drupal/tests/requirements.yml
index 0775aadb7..7b6b56cd2 100644
--- a/provisioning/roles/geerlingguy.drupal/tests/requirements.yml
+++ b/provisioning/roles/geerlingguy.drupal/tests/requirements.yml
@@ -9,5 +9,6 @@
 - src: geerlingguy.php
 - src: geerlingguy.php-mysql
 - src: geerlingguy.php-pgsql
+- src: geerlingguy.git
 - src: geerlingguy.composer
 - src: geerlingguy.drush
diff --git a/provisioning/roles/geerlingguy.drupal/tests/test.yml b/provisioning/roles/geerlingguy.drupal/tests/test.yml
index b38e0b8df..98652d922 100644
--- a/provisioning/roles/geerlingguy.drupal/tests/test.yml
+++ b/provisioning/roles/geerlingguy.drupal/tests/test.yml
@@ -80,6 +80,7 @@
     - geerlingguy.mysql
     - geerlingguy.php
     - geerlingguy.php-mysql
+    - geerlingguy.git
     - geerlingguy.composer
     - geerlingguy.drush
     - role_under_test

From e4793d8e293dda7313ccc00653dbbc1d1ea19845 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 11 Mar 2017 21:44:31 -0600
Subject: [PATCH 0637/1273] Issue #1212: Try using an older Drush release.

---
 default.config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.config.yml b/default.config.yml
index c95c453b7..b1277ab71 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -219,7 +219,7 @@ extra_packages:
 # You can configure almost anything else on the server in the rest of this file.
 extra_security_enabled: false
 
-drush_version: "8.1.10"
+drush_version: "8.1.8"
 
 firewall_allowed_tcp_ports:
   - "22"

From 1ca1c9f9638181d8ffb8cab59d75e95f0dcd7894 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 11 Mar 2017 22:22:57 -0600
Subject: [PATCH 0638/1273] Issue #1212: Update Drush role so --root is
 explicit.

---
 default.config.yml                                  |  2 +-
 provisioning/requirements.yml                       |  2 +-
 .../roles/geerlingguy.drupal/tasks/install-site.yml | 13 ++++++++-----
 .../roles/geerlingguy.drupal/tasks/main.yml         |  4 ++++
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/default.config.yml b/default.config.yml
index b1277ab71..c95c453b7 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -219,7 +219,7 @@ extra_packages:
 # You can configure almost anything else on the server in the rest of this file.
 extra_security_enabled: false
 
-drush_version: "8.1.8"
+drush_version: "8.1.10"
 
 firewall_allowed_tcp_ports:
   - "22"
diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 5188a8406..408529853 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -18,7 +18,7 @@
 - src: geerlingguy.daemonize
   version: 1.1.1
 - src: geerlingguy.drupal
-  version: 2.0.2
+  version: 2.0.3
 - src: geerlingguy.drupal-console
   version: 1.0.7
 - src: geerlingguy.drush
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/install-site.yml b/provisioning/roles/geerlingguy.drupal/tasks/install-site.yml
index 210128814..84afc4a6f 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/install-site.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/install-site.yml
@@ -1,8 +1,8 @@
 ---
 - name: Check if site is already installed.
-  command: >
-    {{ drush_path }} status bootstrap
-    chdir={{ drupal_core_path }}
+  command: "{{ drush_path }} --root={{ drupal_core_path }} status bootstrap"
+  args:
+    chdir: "{{ drupal_core_path }}"
   register: drupal_site_installed
   failed_when: "drupal_site_installed.stdout is undefined"
   changed_when: false
@@ -21,12 +21,14 @@
 - name: Install Drupal with drush.
   command: >
     {{ drush_path }} site-install {{ drupal_install_profile | default('standard') }} -y
+    --root={{ drupal_core_path }}
     --site-name="{{ drupal_site_name }}"
     --account-name={{ drupal_account_name }}
     --account-pass={{ drupal_account_pass }}
     --db-url={{ drupal_db_backend }}://{{ drupal_db_user }}:{{ drupal_db_password }}@{{ drupal_db_host }}/{{ drupal_db_name }}
     {{ drupal_site_install_extra_args | default([]) | join(" ") }}
-    chdir={{ drupal_core_path }}
+  args:
+    chdir: "{{ drupal_core_path }}"
   notify: restart webserver
   when: "'Successful' not in drupal_site_installed.stdout"
   become: no
@@ -34,6 +36,7 @@
 - name: Install configured modules with drush.
   command: >
     {{ drush_path }} pm-enable -y {{ drupal_enable_modules | join(" ") }}
-    chdir={{ drupal_core_path }}
+  args:
+    chdir: "{{ drupal_core_path }}"
   when: "'Successful' not in drupal_site_installed.stdout"
   become: no
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/main.yml b/provisioning/roles/geerlingguy.drupal/tasks/main.yml
index 887fa6383..d691fe347 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/main.yml
@@ -15,14 +15,17 @@
 # Build makefile if configured.
 - include: tasks/build-makefile.yml
   when: drupal_build_makefile
+  static: no
 
 # Build with composer if configured.
 - include: tasks/build-composer.yml
   when: drupal_build_composer
+  static: no
 
 # Build a composer project if configured.
 - include: tasks/build-composer-project.yml
   when: drupal_build_composer_project
+  static: no
 
 # Set Drush variables.
 - name: Check if a project specific Drush binary exists.
@@ -38,3 +41,4 @@
 # Install site if configured.
 - include: tasks/install-site.yml
   when: drupal_install_site
+  static: no

From d69464e9148567721ec7bfdbcfc2493c7f8368bd Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 11 Mar 2017 23:26:06 -0600
Subject: [PATCH 0639/1273] Issue #1212: Update Drupal role to take away some
 quotes.

---
 provisioning/requirements.yml                                | 2 +-
 provisioning/roles/geerlingguy.drupal/tasks/install-site.yml | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 408529853..b4ba924c3 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -18,7 +18,7 @@
 - src: geerlingguy.daemonize
   version: 1.1.1
 - src: geerlingguy.drupal
-  version: 2.0.3
+  version: 2.0.4
 - src: geerlingguy.drupal-console
   version: 1.0.7
 - src: geerlingguy.drush
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/install-site.yml b/provisioning/roles/geerlingguy.drupal/tasks/install-site.yml
index 84afc4a6f..02592553e 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/install-site.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/install-site.yml
@@ -36,7 +36,8 @@
 - name: Install configured modules with drush.
   command: >
     {{ drush_path }} pm-enable -y {{ drupal_enable_modules | join(" ") }}
+    --root={{ drupal_core_path }}
   args:
     chdir: "{{ drupal_core_path }}"
-  when: "'Successful' not in drupal_site_installed.stdout"
+  when: ('Successful' not in drupal_site_installed.stdout) and drupal_enable_modules
   become: no

From 5a86ff7276066d5d99bddfc1061c4e376946bc9d Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 13 Mar 2017 10:27:15 -0500
Subject: [PATCH 0640/1273] Fixes #1215: Document alternative method of running
 Drupal Console commands.

---
 docs/extras/drupal-console.md | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/docs/extras/drupal-console.md b/docs/extras/drupal-console.md
index 98f75e3d5..367c81320 100644
--- a/docs/extras/drupal-console.md
+++ b/docs/extras/drupal-console.md
@@ -19,7 +19,7 @@ vagrant@drupalvm:/var/www/drupalvm/drupal/web$ drupal cache:rebuild all
  The command was executed successfully!
 ```
 
-## Remote command execution
+## Remote command execution using `--target`
 
 To run commands on your host computer but execute them on the VM, add a new sites file `~/.console/sites/drupalvm.yml` on your host computer:
 
@@ -38,3 +38,23 @@ Execute from host machine using the `--target` option.
 For more details, see [Drupal Console's documentation](https://hechoendrupal.gitbooks.io/drupal-console/content/en/using/how-to-use-drupal-console-in-a-remote-installation.html)
 
 For a list of available role variables, see the [`geerlingguy.drupal-console` Ansible role's README](https://github.com/geerlingguy/ansible-role-drupal-console#readme).
+
+## Remote command execution using `vagrant-exec`
+
+You can use [`vagrant-exec`](https://github.com/p0deje/vagrant-exec) to execute commands remotely through Vagrant, and if you can't get Console to work with `--target`, you might want to try doing this (it's more convenient than logging into the VM just to run a Drupal VM command!).
+
+First, install the plugin:
+
+    vagrant plugin install vagrant-exec
+
+Add the following to a `Vagrantfile.local` in your project (set `directory` to your drupal docroot):
+
+```ruby
+if Vagrant.has_plugin?('vagrant-exec')
+  config.exec.commands '*', directory: '/var/www/drupal'
+end
+```
+
+Now you can execute any Drupal Console command—even interactive ones!—from the host:
+
+    vagrant exec bin/drupal generate:module

From 1a981762840072121c4c1b102e6ff242ce6cfede Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 13 Mar 2017 13:57:36 -0500
Subject: [PATCH 0641/1273] Fixes #1213: Add task-specific tags for
 supercharged reprovisioning.

---
 docs/extending/ansible-args.md | 15 ++++++++++-
 provisioning/playbook.yml      | 48 +++++++++++++++++++++++-----------
 2 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/docs/extending/ansible-args.md b/docs/extending/ansible-args.md
index 051aa36ca..20f18f245 100644
--- a/docs/extending/ansible-args.md
+++ b/docs/extending/ansible-args.md
@@ -2,7 +2,20 @@
 
 You can specify an additional argument to the `ansible-playbook` command by using the `DRUPALVM_ANSIBLE_ARGS` environment variable. This can be useful when debugging a task failure.
 
-_Currently this feature has two quirks. It's only possible to pass on a single argument. You should not quote a flag's value as you would normally do in the shell._
+> Note the following caveats:
+>
+>   - Passing more than one argument may require special formatting. Read the [Ansible provisioner's `raw_arguments` docs](https://www.vagrantup.com/docs/provisioning/ansible_common.html#raw_arguments) for more info.
+>   - You should not quote a flag's value as you would normally do in the shell.
+
+Run a specific set of tagged tasks:
+
+```sh
+# E.g. xdebug, drupal, webserver, database, cron...
+DRUPALVM_ANSIBLE_ARGS='--tags=xdebug' vagrant provision
+
+# Or combine them (e.g. if adding new databases and virtualhosts).
+DRUPALVM_ANSIBLE_ARGS='--tags=webserver,database' vagrant provision
+```
 
 Display verbose ansible output:
 
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 7d7f360c1..d1053106d 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -47,6 +47,7 @@
       set_fact:
         php_webserver_daemon: nginx
       when: drupalvm_webserver == 'nginx'
+      tags: ['webserver', 'database', 'php']
 
     - name: Set the correct XHProf package when PHP 5.5 or 5.6 is used.
       set_fact:
@@ -59,43 +60,50 @@
         path: "/root/php{{ php_version }}"
         state: directory
         mode: 0775
+      tags: ['php']
 
   roles:
     # Essential roles.
-    - { role: geerlingguy.repo-remi, when: ansible_os_family == 'RedHat' }
-    - geerlingguy.firewall
-    - geerlingguy.git
-    - geerlingguy.postfix
-    - { role: geerlingguy.apache, when: drupalvm_webserver == 'apache' }
-    - { role: geerlingguy.apache-php-fpm, when: drupalvm_webserver == 'apache' }
-    - { role: geerlingguy.nginx, when: drupalvm_webserver == 'nginx' }
-    - geerlingguy.php
-    - geerlingguy.php-pecl
-    - geerlingguy.composer
-    - { role: geerlingguy.mysql, when: drupal_db_backend == 'mysql' }
-    - { role: geerlingguy.php-mysql, when: drupal_db_backend == 'mysql' }
-    - { role: geerlingguy.postgresql, when: drupal_db_backend == 'pgsql' }
-    - { role: geerlingguy.php-pgsql, when: drupal_db_backend == 'pgsql' }
+    - { role: geerlingguy.repo-remi, when: ansible_os_family == 'RedHat', tags: ['webserver, php'] }
+    - { role: geerlingguy.firewall }
+    - { role: geerlingguy.git }
+    - { role: geerlingguy.postfix }
+    - { role: geerlingguy.apache, when: drupalvm_webserver == 'apache', tags: ['webserver']}
+    - { role: geerlingguy.apache-php-fpm, when: drupalvm_webserver == 'apache', tags: ['webserver'] }
+    - { role: geerlingguy.nginx, when: drupalvm_webserver == 'nginx', tags: ['webserver'] }
+    - { role: geerlingguy.php, tags: ['php'] }
+    - { role: geerlingguy.php-pecl, tags: ['php'] }
+    - { role: geerlingguy.composer }
+    - { role: geerlingguy.mysql, when: drupal_db_backend == 'mysql', tags: ['database'] }
+    - { role: geerlingguy.php-mysql, when: drupal_db_backend == 'mysql', tags: ['php', 'database'] }
+    - { role: geerlingguy.postgresql, when: drupal_db_backend == 'pgsql', tags: ['database'] }
+    - { role: geerlingguy.php-pgsql, when: drupal_db_backend == 'pgsql', tags: ['php', 'database'] }
 
     # Conditionally-installed roles.
     - { role: geerlingguy.drupal-console, when: 'drupal_major_version > 7 and "drupalconsole" in installed_extras' }
     - { role: geerlingguy.drush, when: '"drush" in installed_extras' }
     - { role: geerlingguy.memcached, when: '"memcached" in installed_extras' }
     - { role: geerlingguy.php-memcached, when: '"memcached" in installed_extras' }
+
     - role: geerlingguy.php-tideways
       workspace: "/root/php{{ php_version }}"
       when: '"tideways" in installed_extras'
+
     - role: geerlingguy.php-xdebug
       workspace: "/root/php{{ php_version }}"
       when: '"xdebug" in installed_extras'
+      tags: ['xdebug']
+
     - role: geerlingguy.php-xhprof
       workspace: "/root/php{{ php_version }}"
       when: '"xhprof" in installed_extras'
+
     - role: thom8.php-upload-progress
       workspace: "/root/php{{ php_version }}"
       when: '"upload-progress" in installed_extras'
+
     - { role: geerlingguy.blackfire, when: '"blackfire" in installed_extras' }
-    - { role: geerlingguy.adminer, when: '"adminer" in installed_extras' }
+    - { role: geerlingguy.adminer, when: '"adminer" in installed_extras', tags: ['database'] }
     - { role: geerlingguy.pimpmylog, when: '"pimpmylog" in installed_extras' }
     - { role: geerlingguy.daemonize, when: '"mailhog" in installed_extras' }
     - { role: geerlingguy.mailhog, when: '"mailhog" in installed_extras' }
@@ -104,12 +112,14 @@
     - { role: geerlingguy.redis, when: '"redis" in installed_extras' }
     - { role: geerlingguy.php-redis, when: '"redis" in installed_extras' }
     - { role: geerlingguy.ruby, when: '"ruby" in installed_extras' }
+
     - role: geerlingguy.java
       when: >
         "java" in installed_extras or
         "solr" in installed_extras or
         "selenium" in installed_extras or
         "elasticsearch" in installed_extras
+
     - { role: arknoll.selenium, when: '"selenium" in installed_extras' }
     - { role: geerlingguy.solr, when: '"solr" in installed_extras' }
     - { role: geerlingguy.elasticsearch, when: '"elasticsearch" in installed_extras' }
@@ -121,19 +131,27 @@
   tasks:
     - include: tasks/sshd.yml
     - include: tasks/extras.yml
+
     - include: tasks/www.yml
+      tags: ['webserver']
+
     - include: tasks/apparmor.yml
       when: ansible_os_family == 'Debian' and drupal_db_backend == 'mysql'
+      tags: ['database']
 
     # Build and configure the Drupal site.
     - include_role: name=geerlingguy.drupal
       static: no
+      tags: ['drupal']
 
     - include: tasks/drush-aliases.yml
+
     - include: tasks/cron.yml
+      tags: ['cron']
 
     - include: tasks/dashboard.yml
       when: dashboard_install_dir is defined and dashboard_install_dir != ''
+      tags: ['webserver', 'database']
 
     - name: Run configured post-provision shell scripts.
       script: "{{ item }}"

From c583688403fd770299aa1516e8bd416243b6cc52 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 13 Mar 2017 17:18:19 -0500
Subject: [PATCH 0642/1273] Fixes #1197: Add PAReview.sh script setup to Drupal
 VM.

---
 examples/scripts/pareview.sh | 55 ++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100755 examples/scripts/pareview.sh

diff --git a/examples/scripts/pareview.sh b/examples/scripts/pareview.sh
new file mode 100755
index 000000000..17f180e11
--- /dev/null
+++ b/examples/scripts/pareview.sh
@@ -0,0 +1,55 @@
+#!/bin/bash
+#
+# Example shell script to set up PAReview.sh.
+#
+# You also need to adjust your `config.yml` to add in some other dependencies.
+#
+#     ```
+#     post_provision_scripts:
+#       - "../examples/scripts/pareview.sh"
+#    
+#     composer_global_packages:
+#       - { name: hirak/prestissimo, release: '^0.3' }
+#       - { name: drupal/coder, release: '^' }
+#    
+#     nodejs_version: "6.x"
+#     nodejs_npm_global_packages:
+#       eslint
+#     ```
+#
+# After running `vagrant provision`, `pareview.sh` should be available anywhere
+# in your Vagrant user's $PATH, so you can run commands like:
+#
+#     $ pareview.sh /path/to/my/module
+#     $ pareview.sh http://git.drupal.org/project/rules.git 8.x-1.x
+#
+# See: https://github.com/klausi/pareviewsh
+
+PAREVIEW_SETUP_COMPLETE_FILE="/etc/drupal_vm_pareview_config_complete"
+HOME_PATH="/home/vagrant"
+
+# Check to see if we've already performed this setup.
+if [ ! -e "$PAREVIEW_SETUP_COMPLETE_FILE" ]; then
+  # Register the `Drupal` and `DrupalPractice` Standard with PHPCS.
+  $HOME_PATH/.composer/vendor/bin/phpcs --config-set installed_paths $HOME_PATH/.composer/vendor/drupal/coder/coder_sniffer
+
+  # Download DrupalSecure.
+  git clone --branch master https://git.drupal.org/sandbox/coltrane/1921926.git /opt/drupalsecure_code_sniffs
+
+  # Move the DrupalSecure directory into the PHPCS Standards.
+  sudo ln -sv /opt/drupalsecure_code_sniffs/DrupalSecure $HOME_PATH/.composer/vendor/squizlabs/php_codesniffer/CodeSniffer/Standards
+
+  # Install Codespell.
+  sudo apt-get install -y python-pip
+  pip install codespell
+
+  # Install PAReview script.
+  sudo wget -O /opt/pareview.sh https://raw.githubusercontent.com/klausi/pareviewsh/7.x-1.x/pareview.sh
+  sudo chmod +x /opt/pareview.sh
+  sudo ln -s /opt/pareview.sh /usr/local/bin
+
+  # Create a file to indicate this script has already run.
+  sudo touch $PAREVIEW_SETUP_COMPLETE_FILE
+else
+  exit 0
+fi

From c670f819f3458c0131fe1128495dcb3b45e024c5 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 14 Mar 2017 16:54:27 -0500
Subject: [PATCH 0643/1273] Issue #1217: Update CHANGELOG.md for 4.3.1 release.

---
 CHANGELOG.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3db42afb1..7499d5245 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Drupal VM Changelog
 
+## 4.3.1 (2017-03-14)
+
+### Improvements
+
+  * #1197: Add PAReview.sh script setup to Drupal VM.
+  * #1213: Add task-specific tags for supercharged reprovisioning.
+  * #1212: Update Drush role and shave a minute or so off every build, ever!
+  * #1215: Add docs on using Drupal Console with `vagrant exec`.
+  * Update roles with bugfixes and improvements: Drush, Drupal.
+
+### Bugfixes
+
+  * #1211: Add mcrypt PHP extension on RedHat-based installs.
+
+
 ## 4.3.0 "Ring Game and Escape" (2017-03-09)
 
 ### Breaking Changes

From 858f1eb79b3a0d78bce5b587465eb0f01eea05a5 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 14 Mar 2017 16:57:19 -0500
Subject: [PATCH 0644/1273] Issue #1217: Update CHANGELOG.md for 4.3.1 release
 - new vars.

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7499d5245..782d093ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ## 4.3.1 (2017-03-14)
 
+### New/changed variables in default.config.yml
+
+  * Removed now-unneccessary `drush_keep_updated` and `drush_composer_cli_options` vars.
+  * Default to Drush version `8.1.10` (since we use the Phar-based install by default now).
+
 ### Improvements
 
   * #1197: Add PAReview.sh script setup to Drupal VM.

From 47710cf24ad6640e9730379e088174ee270015a3 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 9 Mar 2017 20:13:43 -0600
Subject: [PATCH 0645/1273] Issue #1177: At least run some tests on Debian 8.

---
 .travis.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 8a2d4099e..03c21228d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -53,6 +53,11 @@ env:
       distro: centos7
       init: /usr/lib/systemd/systemd
       run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    # Defaults - Debian 8.
+    - type: debian
+      distro: debian8
+      init: /lib/systemd/systemd
+      run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
 
 before_install:
   # Pull container.

From d4d2f0c74c23ff76b850f6fdb0edf0a8897cf494 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 9 Mar 2017 20:48:44 -0600
Subject: [PATCH 0646/1273] Issue #1177: Add DotDeb repo for later PHP version
 support.

---
 provisioning/playbook.yml                     |  1 +
 provisioning/requirements.yml                 |  2 +
 .../roles/geerlingguy.repo-dotdeb/.travis.yml | 44 +++++++++++++++++++
 .../roles/geerlingguy.repo-dotdeb/README.md   | 38 ++++++++++++++++
 .../geerlingguy.repo-dotdeb/defaults/main.yml |  5 +++
 .../geerlingguy.repo-dotdeb/meta/main.yml     | 15 +++++++
 .../geerlingguy.repo-dotdeb/tasks/main.yml    | 15 +++++++
 .../geerlingguy.repo-dotdeb/tests/test.yml    |  5 +++
 8 files changed, 125 insertions(+)
 create mode 100644 provisioning/roles/geerlingguy.repo-dotdeb/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.repo-dotdeb/README.md
 create mode 100644 provisioning/roles/geerlingguy.repo-dotdeb/defaults/main.yml
 create mode 100644 provisioning/roles/geerlingguy.repo-dotdeb/meta/main.yml
 create mode 100644 provisioning/roles/geerlingguy.repo-dotdeb/tasks/main.yml
 create mode 100644 provisioning/roles/geerlingguy.repo-dotdeb/tests/test.yml

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index d1053106d..b4bbb3ebe 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -65,6 +65,7 @@
   roles:
     # Essential roles.
     - { role: geerlingguy.repo-remi, when: ansible_os_family == 'RedHat', tags: ['webserver, php'] }
+    - { role: geerlingguy.repo-dotdeb, when: ansible_distribution == 'Debian' }
     - { role: geerlingguy.firewall }
     - { role: geerlingguy.git }
     - { role: geerlingguy.postfix }
diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index b4ba924c3..401db74ac 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -67,6 +67,8 @@
   version: 1.0.2
 - src: geerlingguy.redis
   version: 1.4.1
+- src: geerlingguy.repo-dotdeb
+  version: 1.0.2
 - src: geerlingguy.repo-remi
   version: 1.2.0
 - src: geerlingguy.ruby
diff --git a/provisioning/roles/geerlingguy.repo-dotdeb/.travis.yml b/provisioning/roles/geerlingguy.repo-dotdeb/.travis.yml
new file mode 100644
index 000000000..590ce0c36
--- /dev/null
+++ b/provisioning/roles/geerlingguy.repo-dotdeb/.travis.yml
@@ -0,0 +1,44 @@
+---
+sudo: required
+
+env:
+  - distro: debian8
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+
+services:
+  - docker
+
+before_install:
+  # Pull container.
+  - 'sudo docker pull geerlingguy/docker-${distro}-ansible:latest'
+
+script:
+  - container_id=$(mktemp)
+  # Run container in detached state.
+  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
+
+  # Install dependencies.
+  - 'sudo docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
+
+  # Ansible syntax check.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+
+  # Test role.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+
+  # Test role idempotence.
+  - idempotence=$(mktemp)
+  - sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
+  - >
+    tail ${idempotence}
+    | grep -q 'changed=0.*failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)
+
+after_success:
+  # Clean up.
+  - 'sudo docker stop "$(cat ${container_id})"'
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.repo-dotdeb/README.md b/provisioning/roles/geerlingguy.repo-dotdeb/README.md
new file mode 100644
index 000000000..09398001d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.repo-dotdeb/README.md
@@ -0,0 +1,38 @@
+# Ansible Role: DotDeb Repository
+
+[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-repo-dotdeb.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-repo-dotdeb)
+
+Installs the [DotDeb repository](https://www.dotdeb.org/) for Debian.
+
+## Requirements
+
+This role only is needed/runs on Debian and its derivatives.
+
+## Role Variables
+
+Available variables are listed below, along with default values (see `defaults/main.yml`):
+
+    dotdeb_sources:
+      - "deb http://packages.dotdeb.org {{ ansible_distribution_release }} all"
+      - "deb-src http://packages.dotdeb.org {{ ansible_distribution_release }} all"
+    dotdeb_repo_gpg_key_url: https://www.dotdeb.org/dotdeb.gpg
+
+The DotDeb repos and GPG key URL. Generally, these should not be changed, but if this role is out of date, or if you need a very specific version, these can both be overridden.
+
+## Dependencies
+
+None.
+
+## Example Playbook
+
+    - hosts: servers
+      roles:
+        - geerlingguy.repo-dotdeb
+
+## License
+
+MIT / BSD
+
+## Author Information
+
+This role was created in 2016 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.repo-dotdeb/defaults/main.yml b/provisioning/roles/geerlingguy.repo-dotdeb/defaults/main.yml
new file mode 100644
index 000000000..79c1c5854
--- /dev/null
+++ b/provisioning/roles/geerlingguy.repo-dotdeb/defaults/main.yml
@@ -0,0 +1,5 @@
+---
+dotdeb_sources:
+  - "deb http://packages.dotdeb.org {{ ansible_distribution_release }} all"
+  - "deb-src http://packages.dotdeb.org {{ ansible_distribution_release }} all"
+dotdeb_repo_gpg_key_url: https://www.dotdeb.org/dotdeb.gpg
diff --git a/provisioning/roles/geerlingguy.repo-dotdeb/meta/main.yml b/provisioning/roles/geerlingguy.repo-dotdeb/meta/main.yml
new file mode 100644
index 000000000..81267f676
--- /dev/null
+++ b/provisioning/roles/geerlingguy.repo-dotdeb/meta/main.yml
@@ -0,0 +1,15 @@
+---
+dependencies: []
+
+galaxy_info:
+  author: geerlingguy
+  description: DotDeb repository for Debian.
+  company: "Midwestern Mac, LLC"
+  license: "license (BSD, MIT)"
+  min_ansible_version: 2.0
+  platforms:
+    - name: Debian
+      versions:
+      - all
+  galaxy_tags:
+    - packaging
diff --git a/provisioning/roles/geerlingguy.repo-dotdeb/tasks/main.yml b/provisioning/roles/geerlingguy.repo-dotdeb/tasks/main.yml
new file mode 100644
index 000000000..d56468425
--- /dev/null
+++ b/provisioning/roles/geerlingguy.repo-dotdeb/tasks/main.yml
@@ -0,0 +1,15 @@
+---
+- name: Install DotDeb repo.
+  apt_repository:
+    repo: "{{ item }}"
+  with_items: "{{ dotdeb_sources }}"
+  register: dotdeb_apt_repo_result
+
+- name: Import DotDeb GPG key.
+  apt_key:
+    url: "{{ dotdeb_repo_gpg_key_url }}"
+  register: dotdeb_apt_key_result
+
+- name: Update apt cache if repo or key added.
+  apt: update_cache=yes
+  when: dotdeb_apt_repo_result.changed or dotdeb_apt_key_result.changed
diff --git a/provisioning/roles/geerlingguy.repo-dotdeb/tests/test.yml b/provisioning/roles/geerlingguy.repo-dotdeb/tests/test.yml
new file mode 100644
index 000000000..3646ff420
--- /dev/null
+++ b/provisioning/roles/geerlingguy.repo-dotdeb/tests/test.yml
@@ -0,0 +1,5 @@
+---
+- hosts: all
+
+  roles:
+    - role_under_test

From 27b6a857db507a0d31b797fdfb7adb1f2106fa40 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 15 Mar 2017 09:58:09 -0500
Subject: [PATCH 0647/1273] Fixes #1219: Use Ondrej Sury's apt repo for Debian,
 too.

---
 provisioning/playbook.yml          |  1 -
 provisioning/requirements.yml      |  2 --
 provisioning/tasks/init-debian.yml | 34 +++++++++++++++++++++++++++---
 3 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index b4bbb3ebe..d1053106d 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -65,7 +65,6 @@
   roles:
     # Essential roles.
     - { role: geerlingguy.repo-remi, when: ansible_os_family == 'RedHat', tags: ['webserver, php'] }
-    - { role: geerlingguy.repo-dotdeb, when: ansible_distribution == 'Debian' }
     - { role: geerlingguy.firewall }
     - { role: geerlingguy.git }
     - { role: geerlingguy.postfix }
diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 401db74ac..b4ba924c3 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -67,8 +67,6 @@
   version: 1.0.2
 - src: geerlingguy.redis
   version: 1.4.1
-- src: geerlingguy.repo-dotdeb
-  version: 1.0.2
 - src: geerlingguy.repo-remi
   version: 1.2.0
 - src: geerlingguy.ruby
diff --git a/provisioning/tasks/init-debian.yml b/provisioning/tasks/init-debian.yml
index 6ee4c214b..ea09df3be 100644
--- a/provisioning/tasks/init-debian.yml
+++ b/provisioning/tasks/init-debian.yml
@@ -17,23 +17,51 @@
     content: "{{ hostname_fqdn }}\n"
     dest: /etc/mailname
 
-- name: Add repository for Apache 2.4.9+ on Ubuntu 12 and 14.
+# Ubuntu-specific tasks.
+- name: Add repository for Apache 2.4.9+ (Ubuntu 12/14).
   apt_repository: repo='ppa:ondrej/apache2'
   when: >
     (ansible_distribution_release == "precise" or ansible_distribution_release == "trusty") and
     ansible_distribution == "Ubuntu"
 
-- name: Add repository for PHP 5.5, 5.6, 7.0 or 7.1.
+- name: Add repository for PHP versions (Ubuntu).
   apt_repository: repo='ppa:ondrej/php'
   when: ansible_distribution == "Ubuntu"
   register: php_ondrej_repo
 
-- name: Add repository for PHP 5 compatibility packages.
+- name: Add repository for PHP 5 compatibility packages (Ubuntu).
   apt_repository: repo='ppa:ondrej/php5-compat'
   when: >
     (php_version == "5.5" or php_version == "5.6") and
     ansible_distribution == "Ubuntu"
 
+# Debian-specific tasks.
+- name: Add dependencies for PHP versions (Debian).
+  apt:
+    name: "{{ item }}"
+  with_items:
+    - apt-transport-https
+    - ca-certificates
+  when: ansible_distribution == "Debian"
+
+- name: Add Ondrej Sury's apt key (Debian).
+  apt_key:
+    url: https://packages.sury.org/php/apt.gpg
+    state: present
+  when: ansible_distribution == "Debian"
+
+- name: Add Ondrej Sury's repo (Debian).
+  apt_repository:
+    repo: "deb https://packages.sury.org/php/ {{ ansible_distribution_release }} main"
+    state: present
+  register: debian_repos
+  when: ansible_distribution == "Debian"
+
+- name: Update apt caches after repo is added (Debian).
+  apt: update_cache=yes
+  when: debian_repos.changed and (ansible_distribution == "Debian")
+
+# PHP package purges.
 - name: Purge PHP version packages.
   apt:
     name: "{{ item }}"

From 33b6a79a90813a7182337b5b1c1e00b53159bd1e Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 15 Mar 2017 10:24:48 -0500
Subject: [PATCH 0648/1273] Issue #1177 follow-up: Clean up init-debian.yml.

---
 provisioning/tasks/init-debian.yml | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/provisioning/tasks/init-debian.yml b/provisioning/tasks/init-debian.yml
index ea09df3be..bb17bbb81 100644
--- a/provisioning/tasks/init-debian.yml
+++ b/provisioning/tasks/init-debian.yml
@@ -17,6 +17,11 @@
     content: "{{ hostname_fqdn }}\n"
     dest: /etc/mailname
 
+- name: Define php_xhprof_html_dir.
+  set_fact:
+    php_xhprof_html_dir: "/usr/share/php/xhprof_html"
+  when: php_xhprof_html_dir is not defined
+
 # Ubuntu-specific tasks.
 - name: Add repository for Apache 2.4.9+ (Ubuntu 12/14).
   apt_repository: repo='ppa:ondrej/apache2'
@@ -27,7 +32,7 @@
 - name: Add repository for PHP versions (Ubuntu).
   apt_repository: repo='ppa:ondrej/php'
   when: ansible_distribution == "Ubuntu"
-  register: php_ondrej_repo
+  register: php_ondrej_ubuntu_repo
 
 - name: Add repository for PHP 5 compatibility packages (Ubuntu).
   apt_repository: repo='ppa:ondrej/php5-compat'
@@ -54,12 +59,12 @@
   apt_repository:
     repo: "deb https://packages.sury.org/php/ {{ ansible_distribution_release }} main"
     state: present
-  register: debian_repos
+  register: php_ondrej_debian_repo
   when: ansible_distribution == "Debian"
 
 - name: Update apt caches after repo is added (Debian).
   apt: update_cache=yes
-  when: debian_repos.changed and (ansible_distribution == "Debian")
+  when: php_ondrej_debian_repo.changed and (ansible_distribution == "Debian")
 
 # PHP package purges.
 - name: Purge PHP version packages.
@@ -76,13 +81,16 @@
     - "{{ php_packages|regex_replace('php' + php_version, 'php7.1') }}"
   register: php_purge
 
-- name: Purge PHP packages installed by default on Ubuntu.
+- name: Purge PHP packages installed by default.
   apt:
     name: "{{ item }}"
     state: absent
     purge: yes
     force: yes
-  when: php_purge.changed or php_ondrej_repo.changed
+  when: >
+    php_purge.changed or
+    php_ondrej_ubuntu_repo.changed or
+    php_ondrej_debian_repo.changed
   with_items:
     - php-common
 
@@ -94,8 +102,3 @@
   with_items:
     - "/usr/lib/php5/modules"
     - "/usr/lib/php/modules"
-
-- name: Define php_xhprof_html_dir.
-  set_fact:
-    php_xhprof_html_dir: "/usr/share/php/xhprof_html"
-  when: php_xhprof_html_dir is not defined

From 8c615a0540fa8cf851968afd116ed3293a56cd24 Mon Sep 17 00:00:00 2001
From: Lucas Hedding <heddn@users.noreply.github.com>
Date: Wed, 15 Mar 2017 13:05:34 -0600
Subject: [PATCH 0649/1273] Switch to set PHP's default to 7.1

---
 default.config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.config.yml b/default.config.yml
index c95c453b7..cfec082f9 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -239,7 +239,7 @@ firewall_disable_ufw: true
 
 # PHP Configuration. Currently-supported versions: 5.6, 7.0, 7.1.
 # See version-specific notes: http://docs.drupalvm.com/en/latest/configurations/php/
-php_version: "7.0"
+php_version: "7.1"
 php_install_recommends: no
 php_memory_limit: "192M"
 php_display_errors: "On"

From 42ff1bd32062d3ea927ea10e9e34bb161e6bedc1 Mon Sep 17 00:00:00 2001
From: Lucas Hedding <heddn@users.noreply.github.com>
Date: Wed, 15 Mar 2017 13:11:05 -0600
Subject: [PATCH 0650/1273] Update the docs

---
 docs/configurations/php.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/configurations/php.md b/docs/configurations/php.md
index 25823a389..4bbe9d7e8 100644
--- a/docs/configurations/php.md
+++ b/docs/configurations/php.md
@@ -1,16 +1,16 @@
-Drupal VM defaults to PHP 7.0, but you can also install and use 5.6 or 7.1.
+Drupal VM defaults to PHP 7.1, but you can also install and use 5.6 or 7.1.
 
 ## Ubuntu
 
-Ondřej Surý's PPA for PHP is used to install PHP 7.0, but you can switch to using 5.6 or 7.1 packages by changing `php_version` inside `config.yml` to `"5.6"` or `"7.1"`.
+Ondřej Surý's PPA for PHP is used to install PHP 7.1, but you can switch to using 5.6 or 7.0 packages by changing `php_version` inside `config.yml` to `"5.6"` or `"7.0"`.
 
-If you're using Apache with `mod_php` you should also add `libapache2-mod-php5.6` or `libapache2-mod-php7.1` to the `extra_packages` list.
+If you're using Apache with `mod_php` you should also add `libapache2-mod-php5.6` or `libapache2-mod-php7.0` to the `extra_packages` list.
 
 _Note: XHProf does currently not work with PHP 7.1, make sure you don't have it listed in `installed_extras`._
 
 ## RedHat/CentOS 7
 
-Remi's RPM repository is included with Drupal VM, and you can make the following changes to use it to install PHP 7.1 or PHP 5.6 instead of 7.0:
+Remi's RPM repository is included with Drupal VM, and you can make the following changes to use it to install PHP 7.0 or PHP 5.6 instead of 7.1:
 
   1. Make sure you've followed the directions for switching to CentOS 7 in the [use a different base OS](base-os.md) guide.
-  2. Change `php_version` inside `config.yml` to `"5.6"` or `"7.1"`.
+  2. Change `php_version` inside `config.yml` to `"5.6"` or `"7.0"`.

From b8977ffda7fa13846c888f831b78fbfb2c3e3bc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 15 Mar 2017 15:27:56 -0500
Subject: [PATCH 0651/1273] Issue #1220: Fix to ensure www-data is in the same
 group as NFS synced directories

---
 provisioning/tasks/www.yml | 38 ++++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/provisioning/tasks/www.yml b/provisioning/tasks/www.yml
index 9e410c1cc..15900a453 100644
--- a/provisioning/tasks/www.yml
+++ b/provisioning/tasks/www.yml
@@ -1,20 +1,34 @@
 ---
-# Originally I tried adding to the www group, but because Ansible uses one SSH
-# connection, that broke the initial provisioning, since groups aren't refreshed
-# without a new session or log off/log on.
-- name: Ensure necessary groups exist.
-  group: "name={{ item }} state=present"
-  with_items:
-    - admin
-    - dialout
+- name: Register information about the /vagrant directory.
+  stat:
+    path: /vagrant
+  register: vagrant_directory
+
+- name: Detect if group used to sync directories already exist.
+  shell: "getent group {{ vagrant_directory.stat.gid }} | cut -d':' -f1"
+  register: vagrant_directory_groupname
+  when: vagrant_directory.stat.exists
+
+- name: Ensure a group with the same GID as used to sync directories exist.
+  group:
+    gid: "{{ vagrant_directory.stat.gid }}"
+    name: vagrant_group
+    state: present
+  when: vagrant_directory.stat.exists and vagrant_directory_groupname.stdout == ''
+
+- name: Ensure www-data user is in the same group as the owner of synced directories.
+  user:
+    name: www-data
+    append: yes
+    groups: "{{ vagrant_directory_groupname.stdout|default('vagrant_group') }}"
+  when: vagrant_directory.stat.exists
+
+- name: Ensure admin group exist.
+  group: "name=admin state=present"
 
 - name: Ensure vagrant user is in admin group.
   user: "name={{ vagrant_user }} append=yes groups=admin"
 
-- name: Ensure www-data user is in dialout group (Debian).
-  user: "name=www-data append=yes groups=dialout"
-  when: ansible_os_family == 'Debian'
-
 - name: Set nicer permissions on Apache log directory.
   file:
     path: "/var/log/{{ apache_daemon }}"

From 4285377645607ed9f0e55bb7f1f7563293b480b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 15 Mar 2017 17:56:46 -0500
Subject: [PATCH 0652/1273] Refactor provisioner declaration to be more DRY

---
 Vagrantfile | 42 ++++++++++++++++++++----------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 6f48ee221..2995ea396 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -64,6 +64,19 @@ ansible_bin = which('ansible-playbook')
 ansible_version = Gem::Version.new(get_ansible_version(ansible_bin)) if ansible_bin
 ansible_version_min = Gem::Version.new(vconfig['drupalvm_ansible_version_min'])
 
+if ansible_bin && ansible_version < ansible_version_min
+  raise "You must update Ansible to at least #{ansible_version_min} to use this version of Drupal VM."
+end
+
+provisioner = ansible_bin && !vconfig['force_ansible_local'] ? :ansible : :ansible_local
+if provisioner == :ansible
+  playbook = "#{host_drupalvm_dir}/provisioning/playbook.yml"
+  config_dir = host_config_dir
+else
+  playbook = "#{guest_drupalvm_dir}/provisioning/playbook.yml"
+  config_dir = guest_config_dir
+end
+
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # Networking configuration.
   config.vm.hostname = vconfig['vagrant_hostname']
@@ -131,28 +144,13 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # Allow override of the default synced folder type.
   config.vm.synced_folder host_project_dir, '/vagrant', type: vconfig.include?('vagrant_synced_folder_default_type') ? vconfig['vagrant_synced_folder_default_type'] : 'nfs'
 
-  # Provisioning. Use ansible if it's installed, ansible_local if not or if forced.
-  if ansible_bin && !vconfig['force_ansible_local']
-    if ansible_version < ansible_version_min
-      raise "You must update Ansible to at least #{ansible_version_min} to use this version of Drupal VM."
-    end
-    config.vm.provision 'ansible' do |ansible|
-      ansible.playbook = "#{host_drupalvm_dir}/provisioning/playbook.yml"
-      ansible.extra_vars = {
-        config_dir: host_config_dir,
-        drupalvm_env: drupalvm_env
-      }
-      ansible.raw_arguments = ENV['DRUPALVM_ANSIBLE_ARGS']
-    end
-  else
-    config.vm.provision 'ansible_local' do |ansible|
-      ansible.playbook = "#{guest_drupalvm_dir}/provisioning/playbook.yml"
-      ansible.extra_vars = {
-        config_dir: guest_config_dir,
-        drupalvm_env: drupalvm_env
-      }
-      ansible.raw_arguments = ENV['DRUPALVM_ANSIBLE_ARGS']
-    end
+  config.vm.provision provisioner do |ansible|
+    ansible.playbook = playbook
+    ansible.extra_vars = {
+      config_dir: config_dir,
+      drupalvm_env: drupalvm_env
+    }
+    ansible.raw_arguments = ENV['DRUPALVM_ANSIBLE_ARGS']
   end
 
   # VMware Fusion.

From 468f017fba0a2a112def3059919e386c11b64516 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 15 Mar 2017 17:57:03 -0500
Subject: [PATCH 0653/1273] Follow-up #1213: Add support for
 DRUPALVM_ANSIBLE_TAGS env variable

---
 Vagrantfile                    |  1 +
 docs/extending/ansible-args.md | 22 ++++++++++++----------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 2995ea396..045611117 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -151,6 +151,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       drupalvm_env: drupalvm_env
     }
     ansible.raw_arguments = ENV['DRUPALVM_ANSIBLE_ARGS']
+    ansible.tags = ENV['DRUPALVM_ANSIBLE_TAGS']
   end
 
   # VMware Fusion.
diff --git a/docs/extending/ansible-args.md b/docs/extending/ansible-args.md
index 20f18f245..0da086146 100644
--- a/docs/extending/ansible-args.md
+++ b/docs/extending/ansible-args.md
@@ -1,3 +1,15 @@
+## Run a specific set of tagged tasks
+
+You can filter which part of the provisioning process to run by specifying a set of tags using the `DRUPALVM_ANSIBLE_TAGS` environment variable.
+
+```sh
+# E.g. xdebug, drupal, webserver, database, cron...
+DRUPALVM_ANSIBLE_TAGS=xdebug vagrant provision
+
+# Or combine them (e.g. if adding new databases and virtualhosts).
+DRUPALVM_ANSIBLE_TAGS=webserver,database vagrant provision
+```
+
 ## Passing arguments to ansible during a provision
 
 You can specify an additional argument to the `ansible-playbook` command by using the `DRUPALVM_ANSIBLE_ARGS` environment variable. This can be useful when debugging a task failure.
@@ -7,16 +19,6 @@ You can specify an additional argument to the `ansible-playbook` command by usin
 >   - Passing more than one argument may require special formatting. Read the [Ansible provisioner's `raw_arguments` docs](https://www.vagrantup.com/docs/provisioning/ansible_common.html#raw_arguments) for more info.
 >   - You should not quote a flag's value as you would normally do in the shell.
 
-Run a specific set of tagged tasks:
-
-```sh
-# E.g. xdebug, drupal, webserver, database, cron...
-DRUPALVM_ANSIBLE_ARGS='--tags=xdebug' vagrant provision
-
-# Or combine them (e.g. if adding new databases and virtualhosts).
-DRUPALVM_ANSIBLE_ARGS='--tags=webserver,database' vagrant provision
-```
-
 Display verbose ansible output:
 
 ```sh

From 5f9d093b30e53017f4dfdc05673782a106f5361d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 15 Mar 2017 19:26:35 -0500
Subject: [PATCH 0654/1273] Only enforce ansible version when running ansible
 from the host

---
 Vagrantfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 045611117..e12d11dfd 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -64,10 +64,6 @@ ansible_bin = which('ansible-playbook')
 ansible_version = Gem::Version.new(get_ansible_version(ansible_bin)) if ansible_bin
 ansible_version_min = Gem::Version.new(vconfig['drupalvm_ansible_version_min'])
 
-if ansible_bin && ansible_version < ansible_version_min
-  raise "You must update Ansible to at least #{ansible_version_min} to use this version of Drupal VM."
-end
-
 provisioner = ansible_bin && !vconfig['force_ansible_local'] ? :ansible : :ansible_local
 if provisioner == :ansible
   playbook = "#{host_drupalvm_dir}/provisioning/playbook.yml"
@@ -77,6 +73,10 @@ else
   config_dir = guest_config_dir
 end
 
+if provisioner == :ansible && ansible_version < ansible_version_min
+  raise "You must update Ansible to at least #{ansible_version_min} to use this version of Drupal VM."
+end
+
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # Networking configuration.
   config.vm.hostname = vconfig['vagrant_hostname']

From 748674724169b3ad5b1f790b1f8bcc94cdb166e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 16 Mar 2017 08:57:21 -0500
Subject: [PATCH 0655/1273] Issue #1199: Fix docs rsync example to use a
 simpler setup that also works with older rsync [ci skip]

---
 docs/getting-started/syncing-folders.md | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/docs/getting-started/syncing-folders.md b/docs/getting-started/syncing-folders.md
index 3f121fe7b..24bc4b12e 100644
--- a/docs/getting-started/syncing-folders.md
+++ b/docs/getting-started/syncing-folders.md
@@ -26,13 +26,11 @@ One scenario where this might be useful is when you are moving generated code fr
 
 ```yaml
 options_override:
-  # Disable the default recursive chown so that the files/ folder won't be affected
-  rsync__chown: false
+  rsync__owner: vagrant
+  rsync__group: www-data
   rsync__args: [
     "--verbose", "--archive", "--delete",
     "--chmod=gu=rwX,o=rX", # 664 for files, 775 for directories
-    "--owner", "--group", # required for the following command
-    "--usermap=*:vagrant", "--groupmap=*:www-data"
   ]
 ```
 

From ede5888a7c8b409515b49122899270a78eb17ffa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 16 Mar 2017 08:59:00 -0500
Subject: [PATCH 0656/1273] Fix synced folder example incorrectly showing
 options that are not available for nfs [ci skip]

---
 docs/getting-started/syncing-folders.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/getting-started/syncing-folders.md b/docs/getting-started/syncing-folders.md
index 24bc4b12e..ead73f818 100644
--- a/docs/getting-started/syncing-folders.md
+++ b/docs/getting-started/syncing-folders.md
@@ -69,9 +69,9 @@ If you're encountering errors where Drupal or some other software inside the VM
 vagrant_synced_folders:
   - local_path: .
     destination: /var/www/drupalvm
-    type: nfs
+    type: ""
     create: true
-    mount_options: ["dmode=775,fmode=664"]
+    mount_options: ["dmode=775", "fmode=664"]
     options_override:
       owner: "vagrant"
       group: "www-data"

From 26ad805a5a6f559ef840119ccab0f8710354101c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 16 Mar 2017 09:44:28 -0500
Subject: [PATCH 0657/1273] Follow-up #1222: Update PHP 7.0 references to 7.1
 [ci skip]

---
 README.md             | 2 +-
 docs/other/bigpipe.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 47a1a40af..e578863da 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ This project aims to make spinning up a simple local Drupal test/development env
 It will install the following on an Ubuntu 16.04 (by default) linux VM:
 
   - Apache 2.4.x (or Nginx)
-  - PHP 7.0.x (configurable)
+  - PHP 7.1.x (configurable)
   - MySQL 5.7.x (or MariaDB, or PostgreSQL)
   - Drupal 7 or 8
   - Optional:
diff --git a/docs/other/bigpipe.md b/docs/other/bigpipe.md
index 5ead7b530..fa3d89989 100644
--- a/docs/other/bigpipe.md
+++ b/docs/other/bigpipe.md
@@ -37,7 +37,7 @@ This will disable the `mod_deflate` module for any requests inside that director
 
 If you want to switch Apache to use `mod_php` instead of proxying requests through PHP-FPM, you can make the following changes in `config.yml`:
 
-  1. Add `libapache2-mod-php7.0` to `extra_packages` in `config.yml`.
+  1. Add `libapache2-mod-php7.1` to `extra_packages` in `config.yml`.
   2. Delete the `extra_parameters` under any Drupal site in the list of `apache_vhosts` (so there is no `SetHandler` rule).
 
 You can also disable PHP-FPM and remove the two `proxy` entries from `apache_mods_enabled` if you don't want to use PHP-FPM with Apache at all, but that's optional; it won't break anything to run Apache with `mod_php` and `mod_proxy_fastcgi` at the same time.

From 6292dc23e77f3c63a117bc790b00c74d5c765456 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 16 Mar 2017 09:50:43 -0500
Subject: [PATCH 0658/1273] Remove configure_local_drush_aliases shim

---
 provisioning/tasks/drush-aliases.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/provisioning/tasks/drush-aliases.yml b/provisioning/tasks/drush-aliases.yml
index 3021f9180..ccb6d0ec6 100644
--- a/provisioning/tasks/drush-aliases.yml
+++ b/provisioning/tasks/drush-aliases.yml
@@ -1,10 +1,4 @@
 ---
-# TODO: Deprecate legacy variable & remove shim in next major release.
-- name: Shim for legacy configure_local_drush_aliases variable.
-  set_fact:
-    configure_drush_aliases: "{{ configure_local_drush_aliases }}"
-  when: configure_local_drush_aliases is defined and configure_drush_aliases is undefined
-
 - name: Check if local Drush configuration folder exists.
   stat:
     path: ~/.drush

From 34346a86fdd08fc945906d6fd14d86653bedd4b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 16 Mar 2017 09:56:50 -0500
Subject: [PATCH 0659/1273] Remove PHP 5.5 logic as it's not supported anymore

---
 provisioning/playbook.yml          | 4 ++--
 provisioning/tasks/init-debian.yml | 5 +----
 provisioning/tasks/init-redhat.yml | 4 ----
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index d1053106d..ee0e9581d 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -49,11 +49,11 @@
       when: drupalvm_webserver == 'nginx'
       tags: ['webserver', 'database', 'php']
 
-    - name: Set the correct XHProf package when PHP 5.5 or 5.6 is used.
+    - name: Set the correct XHProf package when PHP 5.6 is used.
       set_fact:
         xhprof_download_url: https://github.com/phacility/xhprof/archive/master.tar.gz
         xhprof_download_folder_name: xhprof-master
-      when: php_version == '5.5' or php_version == '5.6'
+      when: php_version == '5.6'
 
     - name: Ensure PHP version -specific workspace directory exists.
       file:
diff --git a/provisioning/tasks/init-debian.yml b/provisioning/tasks/init-debian.yml
index bb17bbb81..989875d0a 100644
--- a/provisioning/tasks/init-debian.yml
+++ b/provisioning/tasks/init-debian.yml
@@ -36,9 +36,7 @@
 
 - name: Add repository for PHP 5 compatibility packages (Ubuntu).
   apt_repository: repo='ppa:ondrej/php5-compat'
-  when: >
-    (php_version == "5.5" or php_version == "5.6") and
-    ansible_distribution == "Ubuntu"
+  when: php_version == "5.6" and ansible_distribution == "Ubuntu"
 
 # Debian-specific tasks.
 - name: Add dependencies for PHP versions (Debian).
@@ -75,7 +73,6 @@
     force: yes
   when: "'php{{ php_version }}' not in item"
   with_flattened:
-    - "{{ php_packages|regex_replace('php' + php_version, 'php5.5') }}"
     - "{{ php_packages|regex_replace('php' + php_version, 'php5.6') }}"
     - "{{ php_packages|regex_replace('php' + php_version, 'php7.0') }}"
     - "{{ php_packages|regex_replace('php' + php_version, 'php7.1') }}"
diff --git a/provisioning/tasks/init-redhat.yml b/provisioning/tasks/init-redhat.yml
index 564e1679d..aac5caba5 100644
--- a/provisioning/tasks/init-redhat.yml
+++ b/provisioning/tasks/init-redhat.yml
@@ -12,10 +12,6 @@
   set_fact: mysql_enablerepo="remi"
   when: mysql_enablerepo is not defined or mysql_enablerepo == ""
 
-- name: Enable remi repo for PHP 5.5.
-  set_fact: php_enablerepo="remi,remi-php55"
-  when: php_version == "5.5"
-
 - name: Enable remi repo for PHP 5.6.
   set_fact: php_enablerepo="remi,remi-php56"
   when: php_version == "5.6"

From f69bdf88bd64ed0d27f081bd07a918a239fe5e76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 16 Mar 2017 12:16:20 -0500
Subject: [PATCH 0660/1273] Refactor php specific pre-tasks to a separate file

---
 provisioning/playbook.yml  | 19 +------------------
 provisioning/tasks/php.yml | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 18 deletions(-)
 create mode 100644 provisioning/tasks/php.yml

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index ee0e9581d..9caa0595d 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -43,24 +43,7 @@
       with_fileglob:
         - "{{ pre_provision_tasks_dir|default(omit) }}"
 
-    - name: Set the PHP webserver daemon correctly when nginx is in use.
-      set_fact:
-        php_webserver_daemon: nginx
-      when: drupalvm_webserver == 'nginx'
-      tags: ['webserver', 'database', 'php']
-
-    - name: Set the correct XHProf package when PHP 5.6 is used.
-      set_fact:
-        xhprof_download_url: https://github.com/phacility/xhprof/archive/master.tar.gz
-        xhprof_download_folder_name: xhprof-master
-      when: php_version == '5.6'
-
-    - name: Ensure PHP version -specific workspace directory exists.
-      file:
-        path: "/root/php{{ php_version }}"
-        state: directory
-        mode: 0775
-      tags: ['php']
+    - include: tasks/php.yml
 
   roles:
     # Essential roles.
diff --git a/provisioning/tasks/php.yml b/provisioning/tasks/php.yml
new file mode 100644
index 000000000..163ea31ac
--- /dev/null
+++ b/provisioning/tasks/php.yml
@@ -0,0 +1,19 @@
+---
+- name: Set the PHP webserver daemon correctly when nginx is in use.
+  set_fact:
+    php_webserver_daemon: nginx
+  when: drupalvm_webserver == 'nginx'
+  tags: ['webserver', 'database', 'php']
+
+- name: Set the correct XHProf package when PHP 5.6 is used.
+  set_fact:
+    xhprof_download_url: https://github.com/phacility/xhprof/archive/master.tar.gz
+    xhprof_download_folder_name: xhprof-master
+  when: php_version == '5.6'
+
+- name: Ensure PHP version -specific workspace directory exists.
+  file:
+    path: "/root/php{{ php_version }}"
+    state: directory
+    mode: 0775
+  tags: ['php']

From 4420d52cbd8675df6b5c9b3520c68778b01bdf30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 16 Mar 2017 12:39:38 -0500
Subject: [PATCH 0661/1273] Move simple include_vars statement to vars_files

---
 provisioning/playbook.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 9caa0595d..ae3b00e67 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -5,11 +5,9 @@
   vars_files:
     - vars/main.yml
     - ../default.config.yml
+    - "vars/{{ ansible_os_family }}.yml"
 
   pre_tasks:
-    - name: Include OS-specific variables.
-      include_vars: "{{ ansible_os_family }}.yml"
-
     - name: Define config_dir.
       set_fact:
         config_dir: "{{ playbook_dir }}/.."

From e2c24cddbbef102710dd6b5409f94e771a333124 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 16 Mar 2017 12:45:13 -0500
Subject: [PATCH 0662/1273] Minor nitpicks

---
 provisioning/playbook.yml          | 3 ++-
 provisioning/tasks/init-redhat.yml | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index ae3b00e67..59acf6462 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -14,7 +14,8 @@
       when: config_dir is not defined
       tags: ['always']
 
-    - include_vars: "{{ item }}"
+    - name: Include optional configuration files.
+      include_vars: "{{ item }}"
       with_fileglob:
         - "{{ config_dir }}/config.yml"
         - "{{ config_dir }}/local.config.yml"
diff --git a/provisioning/tasks/init-redhat.yml b/provisioning/tasks/init-redhat.yml
index aac5caba5..0bb94e3b4 100644
--- a/provisioning/tasks/init-redhat.yml
+++ b/provisioning/tasks/init-redhat.yml
@@ -20,7 +20,7 @@
   set_fact: php_enablerepo="remi,remi-php70"
   when: php_version == "7.0"
 
-- name: Enable remi repo for PHP 7.1
+- name: Enable remi repo for PHP 7.1.
   set_fact: php_enablerepo="remi,remi-php71"
   when: php_version == "7.1"
 

From ec27854b8880fbc3c3545105b57ac5a493eae7bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 16 Mar 2017 10:10:00 -0500
Subject: [PATCH 0663/1273] Look for Vagrantfile.local in both project_dir and
 config_dir

---
 Vagrantfile                            | 4 +++-
 docs/deployment/composer-dependency.md | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index e12d11dfd..82fae61ac 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -200,5 +200,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   end
 
   # Allow an untracked Vagrantfile to modify the configurations
-  eval File.read "#{host_config_dir}/Vagrantfile.local" if File.exist?("#{host_config_dir}/Vagrantfile.local")
+  [host_config_dir, host_project_dir].uniq.each do |dir|
+    eval File.read "#{dir}/Vagrantfile.local" if File.exist?("#{dir}/Vagrantfile.local")
+  end
 end
diff --git a/docs/deployment/composer-dependency.md b/docs/deployment/composer-dependency.md
index 8487fe1f3..8fd48d263 100644
--- a/docs/deployment/composer-dependency.md
+++ b/docs/deployment/composer-dependency.md
@@ -12,7 +12,7 @@ composer require --dev geerlingguy/drupal-vm
 
 Add and configure the `config.yml` anywhere you like, in this example we place it in a `config/` directory.
 
-_Note: This will be the directory where Drupal VM looks for other local configuration files as well. Such as `drupal_build_makefile`, `local.config.yml` and `Vagrantfile.local`._
+_Note: This will be the directory where Drupal VM looks for other local configuration files as well. Such as `drupal_build_makefile` and `local.config.yml`._
 
 ```
 ├── composer.json

From e30a3e32583f421729014f09abf39431a9e7eae8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 18 Mar 2017 08:46:49 -0500
Subject: [PATCH 0664/1273] Split tasks for both Ansible 2.2 and Ansible 2.3+
 scenarios

---
 provisioning/tasks/www.yml | 48 +++++++++++++++++++++++++++++++++-----
 1 file changed, 42 insertions(+), 6 deletions(-)

diff --git a/provisioning/tasks/www.yml b/provisioning/tasks/www.yml
index 15900a453..2ec9d3d56 100644
--- a/provisioning/tasks/www.yml
+++ b/provisioning/tasks/www.yml
@@ -4,24 +4,60 @@
     path: /vagrant
   register: vagrant_directory
 
-- name: Detect if group used to sync directories already exist.
+# When using NFS the group id of a folder will be identical to that of the host
+# machine, but the groupname will differ or not exist. For the latter case
+# we create a group called `vagrant_group`.
+#
+# In Ansible 2.3+ the gr_name will be set if the GID is mapped to an existing
+# group. If the GID doesn't exist, gr_name will be undefined.
+- name: Ensure a group with the same GID as used to sync directories exist (Ansible 2.3+).
+  group:
+    gid: "{{ vagrant_directory.stat.gid }}"
+    name: vagrant_group
+    state: present
+  when: >
+    ansible_version.full | version_compare('2.3', '>=') and
+    vagrant_directory.stat.exists and
+    vagrant_directory.stat.gr_name is undefined
+
+- name: Ensure the webserver user is in the same group as the owner of synced directories (Ansible 2.3+).
+  user:
+    name: www-data
+    append: yes
+    groups: "{{ vagrant_directory.stat.gr_name|default('vagrant_group') }}"
+  when: >
+    ansible_version.full | version_compare('2.3', '>=') and
+    vagrant_directory.stat.exists
+
+# With Ansible 2.2 or lower, the existance of gr_name is dependant on the
+# existance of UID as well, therefore we cannot rely on it.
+# TODO: Remove the version compares and the 2.2 tasks once we require Ansible
+# 2.3+
+- name: Detect if group used to sync directories already exist (Ansible 2.2).
   shell: "getent group {{ vagrant_directory.stat.gid }} | cut -d':' -f1"
   register: vagrant_directory_groupname
-  when: vagrant_directory.stat.exists
+  when: >
+    ansible_version.full | version_compare('2.3', '<') and
+    vagrant_directory.stat.exists
 
-- name: Ensure a group with the same GID as used to sync directories exist.
+- name: Ensure a group with the same GID as used to sync directories exist (Ansible 2.2).
   group:
     gid: "{{ vagrant_directory.stat.gid }}"
     name: vagrant_group
     state: present
-  when: vagrant_directory.stat.exists and vagrant_directory_groupname.stdout == ''
+  when: >
+    ansible_version.full | version_compare('2.3', '<') and
+    vagrant_directory.stat.exists and
+    vagrant_directory_groupname.stdout == ''
 
-- name: Ensure www-data user is in the same group as the owner of synced directories.
+- name: Ensure the webserver user is in the same group as the owner of synced directories (Ansible 2.2).
   user:
     name: www-data
     append: yes
     groups: "{{ vagrant_directory_groupname.stdout|default('vagrant_group') }}"
-  when: vagrant_directory.stat.exists
+  when: >
+    ansible_version.full | version_compare('2.3', '<') and
+    vagrant_directory.stat.exists
 
 - name: Ensure admin group exist.
   group: "name=admin state=present"

From f96a535f265bbbee96dbe8143902a43a99f52f73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 18 Mar 2017 08:55:12 -0500
Subject: [PATCH 0665/1273] Fix incorrect webserver user for RedHat

---
 provisioning/tasks/www.yml | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/provisioning/tasks/www.yml b/provisioning/tasks/www.yml
index 2ec9d3d56..bae29b49a 100644
--- a/provisioning/tasks/www.yml
+++ b/provisioning/tasks/www.yml
@@ -1,4 +1,14 @@
 ---
+- name: Define drupalvm_webserver_user (Debian).
+  set_fact:
+    drupalvm_webserver_user: www-data
+  when: ansible_os_family == 'Debian' and drupalvm_webserver_user is undefined
+
+- name: Define drupalvm_webserver_user (RedHat).
+  set_fact:
+    drupalvm_webserver_user: "{{ (drupalvm_webserver == 'apache') | ternary('httpd', 'nginx') }}"
+  when: ansible_os_family == 'RedHat' and drupalvm_webserver_user is undefined
+
 - name: Register information about the /vagrant directory.
   stat:
     path: /vagrant
@@ -22,7 +32,7 @@
 
 - name: Ensure the webserver user is in the same group as the owner of synced directories (Ansible 2.3+).
   user:
-    name: www-data
+    name: "{{ drupalvm_webserver_user }}"
     append: yes
     groups: "{{ vagrant_directory.stat.gr_name|default('vagrant_group') }}"
   when: >
@@ -52,7 +62,7 @@
 
 - name: Ensure the webserver user is in the same group as the owner of synced directories (Ansible 2.2).
   user:
-    name: www-data
+    name: "{{ drupalvm_webserver_user }}"
     append: yes
     groups: "{{ vagrant_directory_groupname.stdout|default('vagrant_group') }}"
   when: >

From 8ee79eb0848e0803be3d6862456982923b2b6c0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 18 Mar 2017 11:51:26 -0500
Subject: [PATCH 0666/1273] Ensure the group is not root before chowning

---
 provisioning/tasks/www.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/provisioning/tasks/www.yml b/provisioning/tasks/www.yml
index bae29b49a..ad689c73e 100644
--- a/provisioning/tasks/www.yml
+++ b/provisioning/tasks/www.yml
@@ -37,7 +37,8 @@
     groups: "{{ vagrant_directory.stat.gr_name|default('vagrant_group') }}"
   when: >
     ansible_version.full | version_compare('2.3', '>=') and
-    vagrant_directory.stat.exists
+    vagrant_directory.stat.exists and
+    not (vagrant_directory.stat.gr_name is defined and vagrant_directory.stat.gr_name == 'root')
 
 # With Ansible 2.2 or lower, the existance of gr_name is dependant on the
 # existance of UID as well, therefore we cannot rely on it.
@@ -67,7 +68,8 @@
     groups: "{{ vagrant_directory_groupname.stdout|default('vagrant_group') }}"
   when: >
     ansible_version.full | version_compare('2.3', '<') and
-    vagrant_directory.stat.exists
+    vagrant_directory.stat.exists and
+    vagrant_directory_groupname.stdout != 'root'
 
 - name: Ensure admin group exist.
   group: "name=admin state=present"

From 9a62b6d61700a08031efeb6b94390b07211f4863 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sun, 19 Mar 2017 08:41:40 -0500
Subject: [PATCH 0667/1273] Avoid changed status on task that only reads shell
 data

---
 provisioning/tasks/www.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/provisioning/tasks/www.yml b/provisioning/tasks/www.yml
index ad689c73e..901fa4666 100644
--- a/provisioning/tasks/www.yml
+++ b/provisioning/tasks/www.yml
@@ -47,6 +47,7 @@
 - name: Detect if group used to sync directories already exist (Ansible 2.2).
   shell: "getent group {{ vagrant_directory.stat.gid }} | cut -d':' -f1"
   register: vagrant_directory_groupname
+  changed_when: false
   when: >
     ansible_version.full | version_compare('2.3', '<') and
     vagrant_directory.stat.exists

From a6131ce5e4872eabafb2a3c94414a8c5992f4c62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sun, 19 Mar 2017 08:50:17 -0500
Subject: [PATCH 0668/1273] Raise a VagrantError rather than a RuntimeError for
 clearer message

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

diff --git a/Vagrantfile b/Vagrantfile
index e12d11dfd..23c914570 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -74,7 +74,7 @@ else
 end
 
 if provisioner == :ansible && ansible_version < ansible_version_min
-  raise "You must update Ansible to at least #{ansible_version_min} to use this version of Drupal VM."
+  raise Vagrant::Errors::VagrantError.new, "You must update Ansible to at least #{ansible_version_min} to use this version of Drupal VM."
 end
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|

From b21569a1642d4c802fdd4075d13c3d85b6198cbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sun, 19 Mar 2017 10:24:15 -0500
Subject: [PATCH 0669/1273] Add an intro message for vagrant up/reload

---
 Vagrantfile | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Vagrantfile b/Vagrantfile
index e12d11dfd..06ebac62c 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -99,6 +99,13 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # Vagrant box.
   config.vm.box = vconfig['vagrant_box']
 
+  unless vconfig['vagrant_skip_post_up_message']
+    config.vm.post_up_message = 'Your Drupal VM Vagrant box is ready to use!'\
+      "\n* Visit the dashboard for an overview of your site: http://dashboard.#{vconfig['vagrant_hostname']} (or http://#{vconfig['vagrant_ip']})"\
+      "\n* You can SSH into your machine with `vagrant ssh`."\
+      "\n* Find out more in the Drupal VM documentation at http://docs.drupalvm.com"
+  end
+
   # If a hostsfile manager plugin is installed, add all server names as aliases.
   aliases = []
   if vconfig['drupalvm_webserver'] == 'apache'

From fed14552d6082e84f3b10e6c7d1c5597226c268e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sun, 19 Mar 2017 10:58:34 -0500
Subject: [PATCH 0670/1273] Allow teams to define custom post up messages

---
 Vagrantfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Vagrantfile b/Vagrantfile
index 06ebac62c..5b1675284 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -99,7 +99,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # Vagrant box.
   config.vm.box = vconfig['vagrant_box']
 
-  unless vconfig['vagrant_skip_post_up_message']
+  if vconfig.include?('vagrant_post_up_message')
+    config.vm.post_up_message = vconfig['vagrant_post_up_message']
+  else
     config.vm.post_up_message = 'Your Drupal VM Vagrant box is ready to use!'\
       "\n* Visit the dashboard for an overview of your site: http://dashboard.#{vconfig['vagrant_hostname']} (or http://#{vconfig['vagrant_ip']})"\
       "\n* You can SSH into your machine with `vagrant ssh`."\

From 0998f8faddff099be4e2e6b4a43c0a20376c3ca8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sun, 19 Mar 2017 12:45:58 -0500
Subject: [PATCH 0671/1273] Issue #1199: Fix options_override causing duplicate
 json entries by normalizing keys into symbols

---
 Vagrantfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Vagrantfile b/Vagrantfile
index 23c914570..386e9d03f 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -136,7 +136,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       mount_options: synced_folder.include?('mount_options') ? synced_folder['mount_options'] : []
     }
     if synced_folder.include?('options_override')
-      options = options.merge(synced_folder['options_override'])
+      synced_folder['options_override'].each do |key, value|
+        options[key.to_sym] = value
+      end
     end
     config.vm.synced_folder synced_folder['local_path'], synced_folder['destination'], options
   end

From 4c5851f819bf80cdc75ade446c454665fbe09a6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sun, 19 Mar 2017 13:03:16 -0500
Subject: [PATCH 0672/1273] Update rsync docs to be in line with vagrant docs
 [ci skip]

---
 docs/getting-started/syncing-folders.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/getting-started/syncing-folders.md b/docs/getting-started/syncing-folders.md
index ead73f818..a2f17bc9c 100644
--- a/docs/getting-started/syncing-folders.md
+++ b/docs/getting-started/syncing-folders.md
@@ -26,8 +26,8 @@ One scenario where this might be useful is when you are moving generated code fr
 
 ```yaml
 options_override:
-  rsync__owner: vagrant
-  rsync__group: www-data
+  owner: vagrant
+  group: www-data
   rsync__args: [
     "--verbose", "--archive", "--delete",
     "--chmod=gu=rwX,o=rX", # 664 for files, 775 for directories

From 2923fcf61c4c8b31eb0f9b7359e41cf990f30cd5 Mon Sep 17 00:00:00 2001
From: Dave Wikoff <dgsims@gmail.com>
Date: Sun, 5 Mar 2017 21:57:17 -0500
Subject: [PATCH 0673/1273] Use VAGRANT_HOME to get ssh key directory

---
 provisioning/templates/drupalvm.aliases.drushrc.php.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/templates/drupalvm.aliases.drushrc.php.j2 b/provisioning/templates/drupalvm.aliases.drushrc.php.j2
index 1fff6d7be..d782d30cf 100644
--- a/provisioning/templates/drupalvm.aliases.drushrc.php.j2
+++ b/provisioning/templates/drupalvm.aliases.drushrc.php.j2
@@ -13,7 +13,7 @@ $aliases['{{ host }}'] = array(
   'root' => '{{ root }}',
   'remote-host' => '{{ host }}',
   'remote-user' => '{{ vagrant_user }}',
-  'ssh-options' => '-o PasswordAuthentication=no -i ' . drush_server_home() . '/.vagrant.d/insecure_private_key',
+  'ssh-options' => '-o PasswordAuthentication=no -i "' . (getenv('VAGRANT_HOME') ?: drush_server_home() . '/.vagrant.d') . '/insecure_private_key"',
   'path-aliases' => array(
     '%drush-script' => '{{ drush_path }}',
   ),

From 65882d5ebf2ca39fcbc35f87eebc861719b93918 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 20 Mar 2017 11:42:48 -0500
Subject: [PATCH 0674/1273] Simple typo fix in Windows install guide.

---
 docs/getting-started/installation-windows.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/getting-started/installation-windows.md b/docs/getting-started/installation-windows.md
index 1cca0f7f1..550751ff0 100644
--- a/docs/getting-started/installation-windows.md
+++ b/docs/getting-started/installation-windows.md
@@ -1,4 +1,4 @@
-Please read through the [Quick Start Guiden the README](https://github.com/geerlingguy/drupal-vm#quick-start-guide) to get started.
+Please read through the [Quick Start Guide in the README](https://github.com/geerlingguy/drupal-vm#quick-start-guide) to get started.
 
 <iframe width="560" height="315" src="https://www.youtube.com/embed/mNio_aXMLos" frameborder="0" allowfullscreen></iframe>
 

From 6c5bc1f82f51e475e9af2cfbf4345459ea5abe6e Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 20 Mar 2017 12:05:58 -0500
Subject: [PATCH 0675/1273] Fix a 404 link in the default configuration
 comments.

---
 default.config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.config.yml b/default.config.yml
index cfec082f9..b1b183df9 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -19,7 +19,7 @@ vagrant_public_ip: ""
 
 # A list of synced folders, with the keys 'local_path', 'destination', and
 # a 'type' of [nfs|rsync|smb] (leave empty for slow native shares). See
-# http://docs.drupalvm.com/en/latest/extras/syncing-folders/ for more info.
+# http://docs.drupalvm.com/en/latest/getting-started/syncing-folders/ for more.
 vagrant_synced_folders:
   # The first synced folder will be used for the default Drupal installation, if
   # any of the build_* settings are 'true'. By default the folder is set to

From a096a56515b40f4f349482536bc2394a2a27a700 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 21 Mar 2017 23:31:23 -0500
Subject: [PATCH 0676/1273] Update Firewall role to latest version - fix
 idempotence.

---
 provisioning/requirements.yml                                   | 2 +-
 .../geerlingguy.firewall/tasks/disable-other-firewalls.yml      | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index b4ba924c3..57e888861 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -26,7 +26,7 @@
 - src: geerlingguy.elasticsearch
   version: 2.1.3
 - src: geerlingguy.firewall
-  version: 2.1.1
+  version: 2.1.2
 - src: geerlingguy.git
   version: 1.2.1
 - src: geerlingguy.java
diff --git a/provisioning/roles/geerlingguy.firewall/tasks/disable-other-firewalls.yml b/provisioning/roles/geerlingguy.firewall/tasks/disable-other-firewalls.yml
index 1abf27ebd..ad9636345 100644
--- a/provisioning/roles/geerlingguy.firewall/tasks/disable-other-firewalls.yml
+++ b/provisioning/roles/geerlingguy.firewall/tasks/disable-other-firewalls.yml
@@ -3,6 +3,7 @@
   shell: yum list installed firewalld
   register: firewalld_installed
   ignore_errors: true
+  changed_when: false
   when: ansible_os_family == "RedHat" and firewall_disable_firewalld
 
 - name: Disable the firewalld service (on RHEL, if configured).
@@ -16,6 +17,7 @@
   shell: dpkg -l ufw
   register: ufw_installed
   ignore_errors: true
+  changed_when: false
   when: ansible_distribution == "Ubuntu" and firewall_disable_ufw
 
 - name: Disable the ufw firewall (on Ubuntu, if configured).

From ac841e1c29a021e07e8d00005fe4f61a88a44b54 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 21 Mar 2017 23:16:58 -0500
Subject: [PATCH 0677/1273] Fixes #1244: Add support for a secrets.yml file
 with Ansible Vault.

---
 docs/other/production.md  | 20 ++++++++++++++++++++
 provisioning/playbook.yml |  1 +
 2 files changed, 21 insertions(+)

diff --git a/docs/other/production.md b/docs/other/production.md
index c9eea4a25..443383084 100644
--- a/docs/other/production.md
+++ b/docs/other/production.md
@@ -33,6 +33,26 @@ _Note: Having the variable set locally takes precedence over having it on the re
 
 As a precaution not to accidentally provision a production server with insecure configurations, you should set your security hardening configurations in `config.yml`, your local development overrides in `vagrant.config.yml` and finally any additional production specific overrides in `prod.config.yml`. This way, a production environment will never be provisioned with development tools, even if the `prod.config.yml` is not read.
 
+## Ansible Vault support
+
+Drupal VM will include a `secrets.yml` file included in your VM's configuration directory (alongside `config.yml`, `local.config.yml`, etc.) that you can use to store sensitive variables (e.g. MySQL's root password, Drupal's admin password). For extra security, you can encrypt this file, and require a password whenever the variable is used.
+
+First, you'd create an Ansible Vault encrypted file:
+
+    $ ansible-vault create secrets.yml
+
+Create the file inside your VM's configuration directory, add any plaintext passwords, and save it. Ansible Vault will encrypt the file, and you can edit the file using `ansible-vault edit`.
+
+When running `vagrant` commands, make sure you tell the Ansible provisioner to use `--ask-vault-pass`, e.g.:
+
+    DRUPALVM_ANSIBLE_ARGS='--ask-vault-pass' vagrant [command]
+
+And if you need to override one of the secrets stored in that file, you can do so through an environment-specific config file, for example:
+
+    vagrant.config.yml
+    prod.config.yml
+    [etc.]
+
 ## Example: Drupal VM on DigitalOcean
 
 The [`examples/prod` directory](https://github.com/geerlingguy/drupal-vm/tree/master/examples/prod) contains an example production configuration for Drupal VM which can be used to deploy Drupal VM to a production environment on a cloud provider like DigitalOcean, Linode, or AWS.
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 59acf6462..070fbe712 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -19,6 +19,7 @@
       with_fileglob:
         - "{{ config_dir }}/config.yml"
         - "{{ config_dir }}/local.config.yml"
+        - "{{ config_dir }}/secrets.yml"
         - "{{ config_dir }}/{{ lookup('env', 'DRUPALVM_ENV')|default(drupalvm_env, true)|default(ansible_env.DRUPALVM_ENV)|default(omit) }}.config.yml"
       tags: ['always']
 

From aeadedc3f4c923138e15a0ece71f80baec3e3104 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 22 Mar 2017 21:19:18 -0500
Subject: [PATCH 0678/1273] Fixes #1245: Ensure bootstrap works if Python 2
 isn't installed on Ubuntu 16.04.

---
 examples/prod/bootstrap/init.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/examples/prod/bootstrap/init.yml b/examples/prod/bootstrap/init.yml
index 793664000..071d91025 100644
--- a/examples/prod/bootstrap/init.yml
+++ b/examples/prod/bootstrap/init.yml
@@ -4,6 +4,14 @@
   vars_files:
     - vars.yml
 
+  pre_tasks:
+    # See: https://github.com/geerlingguy/drupal-vm/issues/1245
+    - name: Install Python if it's not available.
+      raw: test -e /usr/bin/python || (apt -y update && apt install -y python-minimal)
+      register: output
+      changed_when: output.stdout != ""
+    - action: setup
+
   tasks:
     - name: Create admin user account.
       user:

From aa9241ddb1794d9370dc6cc69d1547c7c70380ae Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 22 Mar 2017 21:28:29 -0500
Subject: [PATCH 0679/1273] Update default admin group for Ubuntu.

---
 examples/prod/bootstrap/example.vars.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/prod/bootstrap/example.vars.yml b/examples/prod/bootstrap/example.vars.yml
index ac61fef4e..d285c5dd7 100644
--- a/examples/prod/bootstrap/example.vars.yml
+++ b/examples/prod/bootstrap/example.vars.yml
@@ -1,8 +1,8 @@
 ---
 admin_user: my_admin_username
 
-# On RHEL/CentOS, 'wheel'; on Debian/Ubuntu, 'root'.
-admin_group: root
+# On RHEL/CentOS, 'wheel'; on Debian/Ubuntu, 'sudo'.
+admin_group: sudo
 
 # IMPORTANT: Configure your own password for the admin user account. To generate
 # a password hash, use either of the following commands:

From 85b9138b47b93af7646dcde9280d34196f241d06 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 23 Mar 2017 22:35:37 -0500
Subject: [PATCH 0680/1273] Fixes #1250: Production directions don't specify
 using DRUPALVM_ENV=prod.

---
 docs/other/production.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/other/production.md b/docs/other/production.md
index 443383084..3edb5faf2 100644
--- a/docs/other/production.md
+++ b/docs/other/production.md
@@ -123,11 +123,11 @@ Once the initialization is complete, you can test your new admin login with `ssh
 
 Run the following command within Drupal VM's root directory (the folder containing the `Vagrantfile`):
 
-    ansible-playbook -i examples/prod/inventory provisioning/playbook.yml --sudo --ask-sudo-pass
+    DRUPALVM_ENV=prod ansible-playbook -i examples/prod/inventory provisioning/playbook.yml --sudo --ask-sudo-pass
 
 _Note: If you have installed [Drupal VM as a Composer dependency](../deployment/composer-dependency.md) you also need to specify the path of the config directory where you have your `config.yml` located._
 
-    ansible-playbook -i config/prod/inventory vendor/geerlingguy/drupal-vm/provisioning/playbook.yml -e "config_dir=$(pwd)/config" --sudo --ask-sudo-pass
+    DRUPALVM_ENV=prod ansible-playbook -i config/prod/inventory vendor/geerlingguy/drupal-vm/provisioning/playbook.yml -e "config_dir=$(pwd)/config" --sudo --ask-sudo-pass
 
 Ansible will prompt you for your admin account's `sudo` password (the same as the password you encrypted and saved as `admin_password`). Enter it and press return.
 

From be585eecc9204a9425768cc599922ec0958f94b6 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 23 Mar 2017 23:18:08 -0500
Subject: [PATCH 0681/1273] Fixes #1253: Ensure PHP role is run when using
 'drupal' tag.

---
 provisioning/playbook.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 070fbe712..e4cb959a6 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -54,7 +54,7 @@
     - { role: geerlingguy.apache, when: drupalvm_webserver == 'apache', tags: ['webserver']}
     - { role: geerlingguy.apache-php-fpm, when: drupalvm_webserver == 'apache', tags: ['webserver'] }
     - { role: geerlingguy.nginx, when: drupalvm_webserver == 'nginx', tags: ['webserver'] }
-    - { role: geerlingguy.php, tags: ['php'] }
+    - { role: geerlingguy.php, tags: ['php', 'drupal'] }
     - { role: geerlingguy.php-pecl, tags: ['php'] }
     - { role: geerlingguy.composer }
     - { role: geerlingguy.mysql, when: drupal_db_backend == 'mysql', tags: ['database'] }

From 4623515dbd3428c8e009b82d818d367917a6c08b Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 23 Mar 2017 23:38:51 -0500
Subject: [PATCH 0682/1273] Issue #1253: Follow up to ensure PHP prerequisites
 are used for PHP and Drupal tags.

---
 provisioning/playbook.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index e4cb959a6..b8eaadf64 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -27,9 +27,11 @@
 
     - include: tasks/init-debian.yml
       when: ansible_os_family == 'Debian'
+      tags: ['php', 'drupal']
       static: no
     - include: tasks/init-redhat.yml
       when: ansible_os_family == 'RedHat'
+      tags: ['php', 'drupal']
       static: no
 
     - name: Run configured pre-provision shell scripts.
@@ -44,6 +46,7 @@
         - "{{ pre_provision_tasks_dir|default(omit) }}"
 
     - include: tasks/php.yml
+      tags: ['php', 'drupal']
 
   roles:
     # Essential roles.

From 1693e4e3f61223d7c550c2cbb9239acdcf8a0c00 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 24 Mar 2017 09:21:27 -0500
Subject: [PATCH 0683/1273] Update to latest Varnish role version for CentOS 6
 fix.

---
 provisioning/requirements.yml                               | 2 +-
 .../roles/geerlingguy.varnish/tasks/setup-RedHat.yml        | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 57e888861..4a202995d 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -76,4 +76,4 @@
 - src: geerlingguy.solr
   version: 3.5.1
 - src: geerlingguy.varnish
-  version: 1.8.3
+  version: 1.8.4
diff --git a/provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml
index a495ef447..e7b7d2098 100644
--- a/provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml
@@ -13,9 +13,13 @@
     state: present
   when: ansible_distribution_major_version|int < 7
 
+- name: Set a string for the varnish repository identifier.
+  set_fact:
+    varnish_yum_repo: "varnish-{{ varnish_version }},epel"
+
 - name: Set repo fact appropriately.
   set_fact:
-    varnish_yum_enablerepo: "{{ 'varnish-{{ varnish_version }},epel' if (ansible_distribution_major_version|int < 7) else 'epel' }}"
+    varnish_yum_enablerepo: "{{ varnish_yum_repo if (ansible_distribution_major_version|int < 7) else 'epel' }}"
 
 - name: Install Varnish.
   yum:

From 14ec17baf52f4abe117325d20965604a6b1206a4 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 24 Mar 2017 14:50:09 -0500
Subject: [PATCH 0684/1273] Fixes #1135: Improve Sublime Text XDebug
 documentation.

---
 docs/extras/xdebug.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/docs/extras/xdebug.md b/docs/extras/xdebug.md
index b0e85d344..19fc73cfe 100644
--- a/docs/extras/xdebug.md
+++ b/docs/extras/xdebug.md
@@ -23,6 +23,23 @@ To use XDebug with Sublime Text, change the `php_xdebug_idekey` variable as show
 php_xdebug_idekey: sublime.xdebug
 ```
 
+To configure a Sublime Text project to use XDebug when debugging, add the following `settings` key to your project's `.sublime-project` file:
+
+```json
+ "settings": {
+   "xdebug": {
+     "path_mapping": {
+       "/var/www/projectname/docroot" : "/Users/geerlingguy/Sites/projectname/docroot",
+     },
+     "url": "http://local.projectname.com/",
+     "super_globals": true,
+     "close_on_stop": true
+   }
+ }
+```
+
+This assumes you have already installed [SublimeTextXdebug](https://github.com/martomo/SublimeTextXdebug) via Package Control.
+
 ### NetBeans and XDebug with Drupal VM
 
 To use XDebug with NetBeans, change the `php_xdebug_idekey` variable as shown below in `config.yml`, and then run `vagrant provision` to reconfigure the VM.

From fd98e315aab129dd795a9bdd340b897b6f9584af Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 24 Mar 2017 14:42:40 -0500
Subject: [PATCH 0685/1273] Fixes #1252: Allow Drupal to be 'deployed' in the
 VM from Git repositories.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.drupal/.travis.yml      | 18 +++--
 .../roles/geerlingguy.drupal/README.md        | 38 +++++++---
 .../geerlingguy.drupal/defaults/main.yml      | 20 ++++--
 .../roles/geerlingguy.drupal/meta/main.yml    |  2 +-
 .../roles/geerlingguy.drupal/tasks/deploy.yml | 31 ++++++++
 .../roles/geerlingguy.drupal/tasks/main.yml   | 13 ++++
 .../roles/geerlingguy.drupal/tasks/update.yml | 13 ++++
 .../geerlingguy.drupal/tests/test-deploy.yml  | 34 +++++++++
 .../geerlingguy.drupal/tests/test-setup.yml   | 44 ++++++++++++
 .../geerlingguy.drupal/tests/test-vars.yml    | 32 +++++++++
 .../roles/geerlingguy.drupal/tests/test.yml   | 70 +------------------
 12 files changed, 230 insertions(+), 87 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.drupal/tasks/deploy.yml
 create mode 100644 provisioning/roles/geerlingguy.drupal/tasks/update.yml
 create mode 100644 provisioning/roles/geerlingguy.drupal/tests/test-deploy.yml
 create mode 100644 provisioning/roles/geerlingguy.drupal/tests/test-setup.yml
 create mode 100644 provisioning/roles/geerlingguy.drupal/tests/test-vars.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 4a202995d..75f9b9ef1 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -18,7 +18,7 @@
 - src: geerlingguy.daemonize
   version: 1.1.1
 - src: geerlingguy.drupal
-  version: 2.0.4
+  version: 2.1.0
 - src: geerlingguy.drupal-console
   version: 1.0.7
 - src: geerlingguy.drush
diff --git a/provisioning/roles/geerlingguy.drupal/.travis.yml b/provisioning/roles/geerlingguy.drupal/.travis.yml
index dbfa14338..55f6d2ccc 100644
--- a/provisioning/roles/geerlingguy.drupal/.travis.yml
+++ b/provisioning/roles/geerlingguy.drupal/.travis.yml
@@ -2,18 +2,28 @@
 services: docker
 
 env:
+  # Composer-project-based Drupal 8 site setup.
   - distro: centos7
+    playbook: test.yml
     init: /usr/lib/systemd/systemd
     run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
   - distro: debian8
+    playbook: test.yml
     init: /lib/systemd/systemd
     run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
   - distro: ubuntu1604
+    playbook: test.yml
     init: /lib/systemd/systemd
     run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
   - distro: ubuntu1404
+    playbook: test.yml
     init: /sbin/init
     run_opts: ""
+  # Git-based Drupal 8 site setup.
+  - distro: centos7
+    playbook: test-deploy.yml
+    init: /usr/lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
 
 before_install:
   # Pull container.
@@ -28,14 +38,14 @@ script:
   - 'docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
 
   # Ansible syntax check.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} --syntax-check'
 
   # Test role.
-  - 'docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+  - 'docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook}'
 
   # Test role idempotence.
   - idempotence=$(mktemp)
-  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
+  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} | tee -a ${idempotence}
   - >
     tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
@@ -43,7 +53,7 @@ script:
     || (echo 'Idempotence test: fail' && exit 1)
 
   # Make sure Drupal is running.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm curl http://drupaltest.dev/'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm curl http://drupaltest.dev/ | grep "Welcome to Drupal"'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.drupal/README.md b/provisioning/roles/geerlingguy.drupal/README.md
index 636bf92fb..01da92532 100644
--- a/provisioning/roles/geerlingguy.drupal/README.md
+++ b/provisioning/roles/geerlingguy.drupal/README.md
@@ -14,13 +14,25 @@ Drupal is a PHP-based application that is meant to run behind a typical LAMP/LEM
 
 Drush is not an absolute requirement, but it's handy to have, and also required if you use this role to Install a Drupal site (`drupal_install_site: true`). You can use `geerlingguy.drush` to install Drush.
 
+Git is not an absolute requirement, but is required if you're deploying from a Git repository (e.g. `drupal_deploy: true`). You can use `geerlingguy.git` to install Git.
+
 ## Role Variables
 
 Available variables are listed below, along with default values (see `defaults/main.yml`):
 
-    drupal_install_site: true
+### Deploy an existing project with Git
 
-Set this to `false` if you don't need to install Drupal (using the `drupal_*` settings below), but instead copy down a database (e.g. using `drush sql-sync`).
+    # Set this to 'true' and specify a Git repository if you want to deploy Drupal
+    # to your server from an existing repository.
+    drupal_deploy: false
+    drupal_deploy_repo: ""
+    drupal_deploy_version: master
+    drupal_deploy_update: true
+    drupal_deploy_dir: "/var/www/drupal"
+
+Set this to `true` and `drupal_build_composer*` to `false` if you would like to deploy Drupal to your server from an existing Git repository.
+
+### Build a project from a Drush Make file
 
     drupal_build_makefile: false
     drush_makefile_path: "/path/to/drupal.make.yml"
@@ -28,6 +40,8 @@ Set this to `false` if you don't need to install Drupal (using the `drupal_*` se
 
 Set this to `true` and `drupal_build_composer*` to `false` if you would like to build a Drupal make file with Drush.
 
+### Build a project from a Composer file
+
     drupal_build_composer: false
     drupal_composer_path: "/path/to/drupal.composer.json"
     drupal_composer_install_dir: "/var/www/drupal"
@@ -36,13 +50,17 @@ Set this to `true` and `drupal_build_composer*` to `false` if you would like to
 
 Set `drupal_build_makefile` to `false` and this to `true` if you are using a Composer-based site deployment strategy.
 
+### Create a new project using `drupal-project` (Composer)
+
     drupal_build_composer_project: true
     drupal_composer_project_package: "drupal-composer/drupal-project:8.x-dev"
     drupal_composer_project_options: "--prefer-dist --stability dev --no-interaction"
 
 Set this to `true` and `drupal_build_makefile`, `drupal_build_composer` to `false` if you are using Composer's `create-project` as a site deployment strategy.
 
-    drupal_core_path: "{{ drupal_composer_install_dir }}/web"
+### Required Drupal site settings
+
+    drupal_core_path: "{{ drupal_deploy_dir }}/web"
     drupal_core_owner: "{{ ansible_ssh_user | default(ansible_env.SUDO_USER, true) | default(ansible_env.USER, true) | default(ansible_user_id) }}"
     drupal_db_user: drupal
     drupal_db_password: drupal
@@ -50,12 +68,18 @@ Set this to `true` and `drupal_build_makefile`, `drupal_build_composer` to `fals
     drupal_db_backend: mysql
     drupal_db_host: "127.0.0.1"
 
-Required Drupal settings.
+Required Drupal settings. When used in a production or shared environment, you should update at least the `drupal_db_password` and use a secure password.
+
+### Drupal site installation options
+
+    drupal_install_site: true
+
+Set this to `false` if you don't need to install Drupal (using the `drupal_*` settings below), but instead copy down a database (e.g. using `drush sql-sync`).
 
     drupal_domain: "drupaltest.dev"
     drupal_site_name: "Drupal"
     drupal_install_profile: standard
-    drupal_enable_modules: [ 'devel' ]
+    drupal_enable_modules: []
     drupal_account_name: admin
     drupal_account_pass: admin
 
@@ -67,9 +91,7 @@ N/A
 
 ## Example Playbook
 
-See the example playbook used for Travis CI tests (in `tests/test.yml`) for a simple example. See also: [Drupal VM](https://www.drupalvm.com), which uses this role to set up Drupal.
-
-Currently, this role assumes you've either already cloned an existing Drupal codebase into the `drupal_core_path`, you have a Drush make file or `composer.json` already configured to build your site, or you are building a brand new Drupal site (this is the default) using the [Composer template for Drupal projects](https://github.com/drupal-composer/drupal-project).
+See the example playbooks used for Travis CI tests (`tests/test.yml` and `tests/test-deploy.yml`) for simple examples. See also: [Drupal VM](https://www.drupalvm.com), which uses this role to set up Drupal.
 
     - hosts: webserver
       vars_files:
diff --git a/provisioning/roles/geerlingguy.drupal/defaults/main.yml b/provisioning/roles/geerlingguy.drupal/defaults/main.yml
index ae11f9c13..937d28b4e 100644
--- a/provisioning/roles/geerlingguy.drupal/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.drupal/defaults/main.yml
@@ -1,7 +1,11 @@
 ---
-# Set this to 'false' if you don't need to install Drupal (using the drupal_*
-# settings below), but instead copy down a database (e.g. using drush sql-sync).
-drupal_install_site: true
+# Set this to 'true' and specify a Git repository if you want to deploy Drupal
+# to your server from an existing repository.
+drupal_deploy: false
+drupal_deploy_repo: ""
+drupal_deploy_version: master
+drupal_deploy_update: true
+drupal_deploy_dir: "/var/www/drupal"
 
 # Set this to 'true' and 'drupal_build_composer*' to 'false' if you would like
 # to build a Drupal make file with Drush.
@@ -13,7 +17,7 @@ drush_make_options: "--no-gitinfofile"
 # Composer-based site deployment strategy.
 drupal_build_composer: false
 drupal_composer_path: "/path/to/drupal.composer.json"
-drupal_composer_install_dir: "/var/www/drupal"
+drupal_composer_install_dir: "{{ drupal_deploy_dir }}"
 drupal_composer_dependencies:
   - "drupal/devel:1.x-dev"
 
@@ -25,7 +29,7 @@ drupal_composer_project_package: "drupal-composer/drupal-project:8.x-dev"
 drupal_composer_project_options: "--prefer-dist --stability dev --no-interaction"
 
 # Required Drupal settings.
-drupal_core_path: "{{ drupal_composer_install_dir }}/web"
+drupal_core_path: "{{ drupal_deploy_dir }}/web"
 drupal_core_owner: "{{ ansible_ssh_user | default(ansible_env.SUDO_USER, true) | default(ansible_env.USER, true) | default(ansible_user_id) }}"
 drupal_db_user: drupal
 drupal_db_password: drupal
@@ -33,10 +37,14 @@ drupal_db_name: drupal
 drupal_db_backend: mysql
 drupal_db_host: "127.0.0.1"
 
+# Set this to 'false' if you don't need to install Drupal (using the drupal_*
+# settings below), but instead copy down a database (e.g. using drush sql-sync).
+drupal_install_site: true
+
 # Settings for installing a Drupal site if 'drupal_install_site:' is 'true'.
 drupal_domain: "drupaltest.dev"
 drupal_site_name: "Drupal"
 drupal_install_profile: standard
-drupal_enable_modules: [ 'devel' ]
+drupal_enable_modules: []
 drupal_account_name: admin
 drupal_account_pass: admin
diff --git a/provisioning/roles/geerlingguy.drupal/meta/main.yml b/provisioning/roles/geerlingguy.drupal/meta/main.yml
index 7e47a30d9..4e4e6b27d 100644
--- a/provisioning/roles/geerlingguy.drupal/meta/main.yml
+++ b/provisioning/roles/geerlingguy.drupal/meta/main.yml
@@ -3,7 +3,7 @@ dependencies: []
 
 galaxy_info:
   author: geerlingguy
-  description: Install Drupal - a world class CMS
+  description: Deploy or install Drupal on your servers.
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
   min_ansible_version: 2.0
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/deploy.yml b/provisioning/roles/geerlingguy.drupal/tasks/deploy.yml
new file mode 100644
index 000000000..0a9af3f01
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal/tasks/deploy.yml
@@ -0,0 +1,31 @@
+---
+- name: Ensure drupal_deploy_dir directory exists.
+  file:
+    path: "{{ drupal_deploy_dir }}"
+    state: directory
+    mode: 0775
+    owner: "{{ drupal_core_owner }}"
+    group: "{{ drupal_core_owner }}"
+  when: drupal_composer_path and not drupal_site_exists
+
+- name: Check out Drupal to the docroot.
+  git:
+    repo: "{{ drupal_deploy_repo }}"
+    version: "{{ drupal_deploy_version }}"
+    update: "{{ drupal_deploy_update }}"
+    force: yes
+    dest: "{{ drupal_deploy_dir }}"
+  register: drupal_deploy_repo_updated
+  notify: restart webserver
+  become: no
+
+- name: Check if a composer.json file is present.
+  stat: "path={{ drupal_deploy_dir }}/composer.json"
+  register: drupal_deploy_composer_file
+
+- name: Run composer install if composer.json is present.
+  composer:
+    command: install
+    working_dir: "{{ drupal_deploy_dir }}"
+  when: drupal_deploy_composer_file.stat.exists == true
+  become: no
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/main.yml b/provisioning/roles/geerlingguy.drupal/tasks/main.yml
index d691fe347..0e5728140 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/main.yml
@@ -12,6 +12,19 @@
   set_fact:
     drupal_site_exists: "{{ drupal_site.stat.exists|default(false) }}"
 
+# Deploy Drupal if configured.
+- include: tasks/deploy.yml
+  when: drupal_deploy
+
+- name: Define drupal_deploy_updated
+  set_fact:
+    drupal_deploy_updated: "{{ drupal_deploy_repo_updated.changed|default(false) }}"
+
+# Run update tasks if Drupal was updated.
+- include: tasks/update.yml
+  when: drupal_deploy_updated and drupal_site_exists
+  static: no
+
 # Build makefile if configured.
 - include: tasks/build-makefile.yml
   when: drupal_build_makefile
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/update.yml b/provisioning/roles/geerlingguy.drupal/tasks/update.yml
new file mode 100644
index 000000000..b36ea0c6c
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal/tasks/update.yml
@@ -0,0 +1,13 @@
+---
+- name: Run database updates.
+  command: drush updatedb -y
+  args:
+    chdir: "{{ drupal_core_path }}"
+
+# TODO: Import configuration if configured?
+# TODO: Other commands if configured?
+
+- name: Rebuild Drupal caches.
+  command: drush cache-rebuild --quiet
+  args:
+    chdir: "{{ drupal_core_path }}"
diff --git a/provisioning/roles/geerlingguy.drupal/tests/test-deploy.yml b/provisioning/roles/geerlingguy.drupal/tests/test-deploy.yml
new file mode 100644
index 000000000..ac4fe7fe4
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal/tests/test-deploy.yml
@@ -0,0 +1,34 @@
+---
+- hosts: all
+
+  vars_files:
+    - test-vars.yml
+
+  vars:
+    # Deploy from the Drupal VM Prod example project.
+    drupal_deploy: true
+    drupal_deploy_repo: "https://github.com/geerlingguy/drupalvm-live.git"
+    drupal_deploy_dir: /var/www/drupal
+    drupal_domain: "prod.drupalvm.com"
+
+    # Disable Composer-based codebase setup.
+    drupal_build_composer_project: false
+    drupal_build_composer: false
+    drupal_composer_dependencies: []
+
+  pre_tasks:
+    - include: test-setup.yml
+
+  roles:
+    - name: geerlingguy.repo-remi
+      when: ansible_os_family == "RedHat"
+    - role: geerlingguy.repo-dotdeb
+      when: ansible_distribution == 'Debian'
+    - geerlingguy.apache
+    - geerlingguy.mysql
+    - geerlingguy.php
+    - geerlingguy.php-mysql
+    - geerlingguy.git
+    - geerlingguy.composer
+    - geerlingguy.drush
+    - role_under_test
diff --git a/provisioning/roles/geerlingguy.drupal/tests/test-setup.yml b/provisioning/roles/geerlingguy.drupal/tests/test-setup.yml
new file mode 100644
index 000000000..b555958ff
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal/tests/test-setup.yml
@@ -0,0 +1,44 @@
+---
+- name: Update apt cache.
+  apt: update_cache=yes cache_valid_time=86400
+  when: ansible_os_family == 'Debian'
+
+- name: Install dependencies.
+  package: name={{ item }}
+  with_items:
+    - curl
+    - unzip
+
+- name: Add repository for Apache 2.4.9+ (Ubuntu 14).
+  apt_repository: repo='ppa:ondrej/apache2'
+  when: ansible_distribution == "Ubuntu" and ansible_distribution_release == "trusty"
+
+- name: Add repository for PHP 7.0 (Ubuntu).
+  apt_repository: repo='ppa:ondrej/php'
+  when: ansible_distribution == "Ubuntu" and ansible_distribution_version != "16.04"
+
+- name: Set php_packages for PHP 7.0 Debian 8 install.
+  set_fact:
+    php_packages:
+      - php7.0-common
+      - php7.0-cli
+      - php7.0-dev
+      - php7.0-fpm
+      - libpcre3-dev
+      - php7.0-opcache
+      - php7.0-apcu
+      - php7.0-xml
+      - php7.0-zip
+      - php7.0-mbstring
+      - php7.0-json
+      - php7.0-gd
+  when: ansible_distribution == 'Debian'
+
+- name: Copy initctl_faker into place for Ubuntu 14.04.
+  copy:
+    src: initctl_faker
+    dest: /sbin/initctl
+    mode: 0755
+    force: yes
+  when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '14.04'
+  changed_when: false
diff --git a/provisioning/roles/geerlingguy.drupal/tests/test-vars.yml b/provisioning/roles/geerlingguy.drupal/tests/test-vars.yml
new file mode 100644
index 000000000..bdfcd52b9
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal/tests/test-vars.yml
@@ -0,0 +1,32 @@
+---
+php_enable_webserver: false
+php_enablerepo: "remi,remi-php71"
+php_enable_php_fpm: true
+php_fpm_listen: "127.0.0.1:9000"
+
+apache_mods_enabled:
+  - expires.load
+  - ssl.load
+  - rewrite.load
+  - proxy.load
+  - proxy_fcgi.load
+apache_remove_default_vhost: true
+apache_vhosts:
+  - servername: "{{ drupal_domain }}"
+    serveralias: "www.{{ drupal_domain }}"
+    documentroot: "{{ drupal_core_path }}"
+    extra_parameters: |
+          <FilesMatch \.php$>
+            SetHandler "proxy:fcgi://{{ php_fpm_listen }}"
+          </FilesMatch>
+
+mysql_enablerepo: "remi"
+mysql_databases:
+  - name: "{{ drupal_db_name }}"
+    encoding: utf8mb4
+    collation: utf8mb4_general_ci
+mysql_users:
+  - name: "{{ drupal_db_user }}"
+    host: "%"
+    password: "{{ drupal_db_password }}"
+    priv: "{{ drupal_db_name }}.*:ALL"
diff --git a/provisioning/roles/geerlingguy.drupal/tests/test.yml b/provisioning/roles/geerlingguy.drupal/tests/test.yml
index 98652d922..6e24554ad 100644
--- a/provisioning/roles/geerlingguy.drupal/tests/test.yml
+++ b/provisioning/roles/geerlingguy.drupal/tests/test.yml
@@ -1,75 +1,11 @@
 ---
 - hosts: all
 
-  vars:
-    php_enable_webserver: false
-    php_enablerepo: "remi,remi-php71"
-
-    apache_remove_default_vhost: true
-    apache_vhosts:
-      - servername: "{{ drupal_domain }}"
-        serveralias: "www.{{ drupal_domain }}"
-        documentroot: "{{ drupal_core_path }}"
-        extra_parameters: |
-              <FilesMatch \.php$>
-                SetHandler "proxy:fcgi://{{ php_fpm_listen }}"
-              </FilesMatch>
-
-    mysql_enablerepo: "remi"
-    mysql_databases:
-      - name: "{{ drupal_db_name }}"
-        encoding: utf8mb4
-        collation: utf8mb4_general_ci
-    mysql_users:
-      - name: "{{ drupal_db_user }}"
-        host: "%"
-        password: "{{ drupal_db_password }}"
-        priv: "{{ drupal_db_name }}.*:ALL"
+  vars_files:
+    - test-vars.yml
 
   pre_tasks:
-    - name: Update apt cache.
-      apt: update_cache=yes cache_valid_time=86400
-      when: ansible_os_family == 'Debian'
-
-    - name: Install dependencies.
-      package: name={{ item }}
-      with_items:
-        - curl
-        - unzip
-
-    - name: Add repository for Apache 2.4.9+ (Ubuntu 14).
-      apt_repository: repo='ppa:ondrej/apache2'
-      when: ansible_distribution == "Ubuntu" and ansible_distribution_release == "trusty"
-
-    - name: Add repository for PHP 7.0 (Ubuntu).
-      apt_repository: repo='ppa:ondrej/php'
-      when: ansible_distribution == "Ubuntu" and ansible_distribution_version != "16.04"
-
-    - name: Set php_packages for PHP 7.0 Debian 8 install.
-      set_fact:
-        php_packages:
-          - php7.0-common
-          - php7.0-cli
-          - php7.0-dev
-          - php7.0-fpm
-          - libpcre3-dev
-          - php7.0-opcache
-          - php7.0-apcu
-          - php7.0-xml
-          - php7.0-zip
-          - php7.0-mbstring
-          - php7.0-json
-          - php7.0-gd
-      when: ansible_distribution == 'Debian'
-
-    - name: Copy initctl_faker into place for Ubuntu 14.04.
-      copy:
-        src: initctl_faker
-        dest: /sbin/initctl
-        mode: 0755
-        force: yes
-      when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '14.04'
-      changed_when: false
+    - include: test-setup.yml
 
   roles:
     - name: geerlingguy.repo-remi

From 281c318d0f8958d91e745fda36820d9567c0f837 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 24 Mar 2017 22:18:11 -0500
Subject: [PATCH 0686/1273] Issue #1257: Update CHANGELOG.md in preparation for
 4.4.0 release.

---
 CHANGELOG.md | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 782d093ba..513f120d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,43 @@
 # Drupal VM Changelog
 
+## 4.4.0 "Sea of Simulation" (2017-03-24)
+
+### Breaking Changes
+
+  * No breaking changes.
+
+### New/changed variables in default.config.yml
+
+  * `php_version` now defaults to `"7.1"` (was `"7.0"`).
+
+### Improvements
+
+  * #1252: Allow Drupal to be deployed into Drupal VM from a Git repository.
+  * #1177: Add full and CI-tested support for Debian 8.
+  * #1213: Add `DRUPALVM_ANSIBLE_TAGS` environment variable to specify tags to run.
+  * #1031: Switch default PHP version to `7.1`.
+  * #1211: Add mcrypt PHP extension on RedHat-based installs.
+  * #1215: Document alternative method of running Drupal Console commands.
+  * Removed logic supporting PHP 5.5, as it's no longer supported.
+  * #1233: Tidy up the main Drupal VM playbook.
+  * #1198: Use VAGRANT_HOME to get the SSH `insecure_private_key` directory for Drush.
+  * #1238: Add a configurable intro message for `vagrant up` and `vagrant reload`.
+  * #1230: Allow `Vagrantfile.local` to be either in project _or_ config directory.
+  * #1244: Add support for a `secrets.yml` file for use with Ansible Vault.
+  * #1135: Improve Sublime Text XDebug documentation.
+  * Updated roles: Drush, Drupal, Firewall, Varnish.
+
+### Bugfixes
+
+  * #1199: Make sure `rsync` synced folders' `owner` and `group` are applied correctly.
+  * #1212: Fixes Drush make builds after Drush role installation technique changed.
+  * #1237: Raise a `VagrantError` for clearer error messaging.
+  * #1220: Ensure `www-data` is in the group of the NFS synced directory (file permissions).
+  * #1245: Ensure production `init.yml` playbook works on Ubuntu 16.04.
+  * #1250: Document use of `DRUPALVM_ENV` variable in production docs.
+  * #1253: Ensure `geerlingguy.php` role is run when `drupal` tag is used.
+
+
 ## 4.3.1 (2017-03-14)
 
 ### New/changed variables in default.config.yml

From 658c5abd1d3c55103d48da3d179c7ee72f91bafc Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 24 Mar 2017 22:54:05 -0500
Subject: [PATCH 0687/1273] Issue #1245 follow-up: disable gather_facts on
 first connection.

---
 examples/prod/bootstrap/init.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/examples/prod/bootstrap/init.yml b/examples/prod/bootstrap/init.yml
index 071d91025..1fd49cc48 100644
--- a/examples/prod/bootstrap/init.yml
+++ b/examples/prod/bootstrap/init.yml
@@ -1,5 +1,6 @@
 ---
 - hosts: drupalvm
+  gather_facts: no
 
   vars_files:
     - vars.yml

From 44c8650fb267c2388d9a6bcfc6af128e312de186 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 25 Mar 2017 21:47:16 -0500
Subject: [PATCH 0688/1273] Fixes #1261: Run hostname.yml tasks for php and
 drupal tags.

---
 provisioning/playbook.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index b8eaadf64..fb51e0e53 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -24,6 +24,7 @@
       tags: ['always']
 
     - include: tasks/hostname.yml
+      tags: ['php', 'drupal']
 
     - include: tasks/init-debian.yml
       when: ansible_os_family == 'Debian'

From c41bb43511e060a4eb552dd982c591cd673feb70 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 27 Mar 2017 15:12:28 -0500
Subject: [PATCH 0689/1273] Allow Drupal deployment accept_hostkey to be
 settable.

---
 provisioning/requirements.yml                         |  2 +-
 provisioning/roles/geerlingguy.drupal/README.md       | 11 ++++++++---
 .../roles/geerlingguy.drupal/defaults/main.yml        |  1 +
 .../roles/geerlingguy.drupal/tasks/deploy.yml         |  1 +
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 75f9b9ef1..ffa0b43f1 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -18,7 +18,7 @@
 - src: geerlingguy.daemonize
   version: 1.1.1
 - src: geerlingguy.drupal
-  version: 2.1.0
+  version: 2.1.1
 - src: geerlingguy.drupal-console
   version: 1.0.7
 - src: geerlingguy.drush
diff --git a/provisioning/roles/geerlingguy.drupal/README.md b/provisioning/roles/geerlingguy.drupal/README.md
index 01da92532..6086d45df 100644
--- a/provisioning/roles/geerlingguy.drupal/README.md
+++ b/provisioning/roles/geerlingguy.drupal/README.md
@@ -22,15 +22,20 @@ Available variables are listed below, along with default values (see `defaults/m
 
 ### Deploy an existing project with Git
 
-    # Set this to 'true' and specify a Git repository if you want to deploy Drupal
-    # to your server from an existing repository.
     drupal_deploy: false
     drupal_deploy_repo: ""
     drupal_deploy_version: master
     drupal_deploy_update: true
     drupal_deploy_dir: "/var/www/drupal"
+    drupal_deploy_accept_hostkey: no
 
-Set this to `true` and `drupal_build_composer*` to `false` if you would like to deploy Drupal to your server from an existing Git repository.
+Set `drupal_deploy` to `true` and `drupal_build_composer*` to `false` if you would like to deploy Drupal to your server from an existing Git repository. The other options all apply to the Git checkout operation:
+
+  - `repo`: Git repository address
+  - `version`: can be a branch, tag, or commit hash
+  - `update`: whether the repository should be updated to the latest commit, if `version` is a branch
+  - `dir`: The directory into which the repository will be checked out
+  - `accept_hostkey`: Whether to automatically accept the Git server's hostkey on the first connection.
 
 ### Build a project from a Drush Make file
 
diff --git a/provisioning/roles/geerlingguy.drupal/defaults/main.yml b/provisioning/roles/geerlingguy.drupal/defaults/main.yml
index 937d28b4e..b3d28015b 100644
--- a/provisioning/roles/geerlingguy.drupal/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.drupal/defaults/main.yml
@@ -6,6 +6,7 @@ drupal_deploy_repo: ""
 drupal_deploy_version: master
 drupal_deploy_update: true
 drupal_deploy_dir: "/var/www/drupal"
+drupal_deploy_accept_hostkey: no
 
 # Set this to 'true' and 'drupal_build_composer*' to 'false' if you would like
 # to build a Drupal make file with Drush.
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/deploy.yml b/provisioning/roles/geerlingguy.drupal/tasks/deploy.yml
index 0a9af3f01..c29ec3503 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/deploy.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/deploy.yml
@@ -15,6 +15,7 @@
     update: "{{ drupal_deploy_update }}"
     force: yes
     dest: "{{ drupal_deploy_dir }}"
+    accept_hostkey: "{{ drupal_deploy_accept_hostkey }}"
   register: drupal_deploy_repo_updated
   notify: restart webserver
   become: no

From 2261acda3653cf828b0d060442b7a167e9a8c1ea Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 28 Mar 2017 10:43:34 -0500
Subject: [PATCH 0690/1273] Remove comment markers inside comments making
 issues look funny.

---
 .github/ISSUE_TEMPLATE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE b/.github/ISSUE_TEMPLATE
index ca026daad..6ebda693f 100644
--- a/.github/ISSUE_TEMPLATE
+++ b/.github/ISSUE_TEMPLATE
@@ -1,5 +1,5 @@
 
-<!--- Drupal VM is used by developers in a wide variety of circumstances. Please use this template when reporting issues or suggesting features so we can help you more efficiently. **Delete this section** and fill in the rest of the template below, deleting the commented sections marked by `<!--- -->`: -->
+<!--- Drupal VM is used by developers in a wide variety of circumstances. Please use this template when reporting issues or suggesting features so we can help you more efficiently. **Delete this section** and fill in the rest of the template below, deleting the commented sections -->
 
 ### Issue Type
 

From d5d2b13b9ea22fc9604051fcc936713a32564108 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 29 Mar 2017 08:30:33 -0500
Subject: [PATCH 0691/1273] Update pareview.sh script example config.

---
 examples/scripts/pareview.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/scripts/pareview.sh b/examples/scripts/pareview.sh
index 17f180e11..be9e3c95b 100755
--- a/examples/scripts/pareview.sh
+++ b/examples/scripts/pareview.sh
@@ -14,7 +14,7 @@
 #    
 #     nodejs_version: "6.x"
 #     nodejs_npm_global_packages:
-#       eslint
+#       - name: eslint
 #     ```
 #
 # After running `vagrant provision`, `pareview.sh` should be available anywhere

From 2b1020c81816b57705d0bcfbf92afa9b0e860949 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 29 Mar 2017 09:53:07 -0500
Subject: [PATCH 0692/1273] Update Drush role to prevent upgrade errors.

---
 provisioning/requirements.yml                         |  2 +-
 .../roles/geerlingguy.drush/tasks/install.yml         | 11 +++++++++++
 .../roles/geerlingguy.drush/tasks/source-install.yml  |  1 +
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index ffa0b43f1..11ff13471 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -22,7 +22,7 @@
 - src: geerlingguy.drupal-console
   version: 1.0.7
 - src: geerlingguy.drush
-  version: 2.0.0
+  version: 2.0.1
 - src: geerlingguy.elasticsearch
   version: 2.1.3
 - src: geerlingguy.firewall
diff --git a/provisioning/roles/geerlingguy.drush/tasks/install.yml b/provisioning/roles/geerlingguy.drush/tasks/install.yml
index 386c0cddb..fb8b3eae5 100644
--- a/provisioning/roles/geerlingguy.drush/tasks/install.yml
+++ b/provisioning/roles/geerlingguy.drush/tasks/install.yml
@@ -1,4 +1,15 @@
 ---
+- name: Check current state.
+  stat:
+    path: "{{ drush_path }}"
+  register: drush_path_state
+
+- name: Perform cleanup of old symlink.
+  file:
+    path: "{{ drush_path }}"
+    state: absent
+  when: drush_path_state.stat.islnk is defined and drush_path_state.stat.islnk
+
 - name: Install Drush.
   get_url:
     url: "{{ drush_phar_url }}"
diff --git a/provisioning/roles/geerlingguy.drush/tasks/source-install.yml b/provisioning/roles/geerlingguy.drush/tasks/source-install.yml
index 091a958b4..edcf3adfd 100644
--- a/provisioning/roles/geerlingguy.drush/tasks/source-install.yml
+++ b/provisioning/roles/geerlingguy.drush/tasks/source-install.yml
@@ -31,6 +31,7 @@
     src: "{{ drush_install_path }}/drush"
     dest: "{{ drush_path }}"
     state: link
+    force: yes
 
 - name: Run drush to finish setting it up.
   command: "{{ drush_path }}"

From 41e08cda1d1c33034f1644d13ac24c8fb35c3418 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 30 Mar 2017 08:53:13 -0500
Subject: [PATCH 0693/1273] Small docs fix for Selenium/Behat [ci skip].

---
 docs/extras/selenium.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/extras/selenium.md b/docs/extras/selenium.md
index 4b19228b5..809cd3652 100644
--- a/docs/extras/selenium.md
+++ b/docs/extras/selenium.md
@@ -11,7 +11,7 @@ installed_extras:
   - selenium
   [...]
 
-# Make sure the following four packages are in composer_global_packages:
+# Add the following package to composer_global_packages or your Drupal project:
 composer_global_packages:
   - { name: drupal/drupal-extension, release: '*' }
 ```

From 092fed0254a137e4d57d9e10c49e1a13245d489a Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 30 Mar 2017 16:05:38 -0500
Subject: [PATCH 0694/1273] Update Solr role to latest version.

---
 provisioning/requirements.yml                       | 2 +-
 provisioning/roles/geerlingguy.solr/tasks/cores.yml | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 11ff13471..1589d1b04 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -74,6 +74,6 @@
 - src: geerlingguy.security
   version: 1.5.0
 - src: geerlingguy.solr
-  version: 3.5.1
+  version: 3.5.2
 - src: geerlingguy.varnish
   version: 1.8.4
diff --git a/provisioning/roles/geerlingguy.solr/tasks/cores.yml b/provisioning/roles/geerlingguy.solr/tasks/cores.yml
index 1d50a2c4f..65f2ca9b0 100644
--- a/provisioning/roles/geerlingguy.solr/tasks/cores.yml
+++ b/provisioning/roles/geerlingguy.solr/tasks/cores.yml
@@ -19,6 +19,8 @@
   shell: "cp -r {{ solr_install_path }}/example/files/conf/ {{ solr_home }}/data/{{ item }}/"
   when: "'{{ item }}' not in '{{ solr_cores_current.content }}'"
   with_items: "{{ solr_cores }}"
+  become: yes
+  become_user: "{{ solr_user }}"
 
 - name: Create configured cores.
   shell: "{{ solr_install_path }}/bin/solr create -c {{ item }}"

From d1c072f706e3c6bfd6d056dbf293b7694d2edc9c Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 30 Mar 2017 23:45:20 -0500
Subject: [PATCH 0695/1273] Switch docs for production Ansible commands from
 sudo to become. [ci skip]

---
 docs/other/production.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/other/production.md b/docs/other/production.md
index 3edb5faf2..e7ac57a7c 100644
--- a/docs/other/production.md
+++ b/docs/other/production.md
@@ -16,17 +16,17 @@ If you're issuing a provision directly through `ansible-playbook` as you would d
 
 ```sh
 # By default it doesn't try to load any other config file.
-ansible-playbook -i examples/prod/inventory provisioning/playbook.yml --sudo --ask-sudo-pass
+ansible-playbook -i examples/prod/inventory provisioning/playbook.yml --become --ask-become-pass
 
 # Loads prod.config.yml if available.
-DRUPALVM_ENV=prod ansible-playbook -i examples/prod/inventory provisioning/playbook.yml --sudo --ask-sudo-pass
+DRUPALVM_ENV=prod ansible-playbook -i examples/prod/inventory provisioning/playbook.yml --become --ask-become-pass
 ```
 
 If you add `DRUPALVM_ENV=prod` to the `/etc/environment` file on your production environment:
 
 ```sh
 # Loads prod.config.yml if available.
-ansible-playbook -i examples/prod/inventory provisioning/playbook.yml --sudo --ask-sudo-pass
+ansible-playbook -i examples/prod/inventory provisioning/playbook.yml --become --ask-become-pass
 ```
 
 _Note: Having the variable set locally takes precedence over having it on the remote machine._
@@ -123,11 +123,11 @@ Once the initialization is complete, you can test your new admin login with `ssh
 
 Run the following command within Drupal VM's root directory (the folder containing the `Vagrantfile`):
 
-    DRUPALVM_ENV=prod ansible-playbook -i examples/prod/inventory provisioning/playbook.yml --sudo --ask-sudo-pass
+    DRUPALVM_ENV=prod ansible-playbook -i examples/prod/inventory provisioning/playbook.yml --become --ask-become-pass
 
 _Note: If you have installed [Drupal VM as a Composer dependency](../deployment/composer-dependency.md) you also need to specify the path of the config directory where you have your `config.yml` located._
 
-    DRUPALVM_ENV=prod ansible-playbook -i config/prod/inventory vendor/geerlingguy/drupal-vm/provisioning/playbook.yml -e "config_dir=$(pwd)/config" --sudo --ask-sudo-pass
+    DRUPALVM_ENV=prod ansible-playbook -i config/prod/inventory vendor/geerlingguy/drupal-vm/provisioning/playbook.yml -e "config_dir=$(pwd)/config" --become --ask-become-pass
 
 Ansible will prompt you for your admin account's `sudo` password (the same as the password you encrypted and saved as `admin_password`). Enter it and press return.
 

From 728bb572db38428f754a506a9fc7b0b061998c47 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 31 Mar 2017 21:43:33 -0500
Subject: [PATCH 0696/1273] Updated verbiage.

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index e578863da..29e5f4967 100644
--- a/README.md
+++ b/README.md
@@ -2,9 +2,9 @@
 
 [![Build Status](https://travis-ci.org/geerlingguy/drupal-vm.svg?branch=master)](https://travis-ci.org/geerlingguy/drupal-vm) [![Documentation Status](https://readthedocs.org/projects/drupal-vm/badge/?version=latest)](http://docs.drupalvm.com) [![Packagist](https://img.shields.io/packagist/v/geerlingguy/drupal-vm.svg)](https://packagist.org/packages/geerlingguy/drupal-vm)
 
-[Drupal VM](https://www.drupalvm.com/) is A VM for local Drupal development, built with Vagrant + Ansible.
+[Drupal VM](https://www.drupalvm.com/) is A VM for Drupal development, built with Vagrant + Ansible.
 
-This project aims to make spinning up a simple local Drupal test/development environment incredibly quick and easy, and to introduce new developers to the wonderful world of Drupal development on local virtual machines (instead of crufty old MAMP/WAMP-based development).
+Drupal VM makes building local Drupal development environments quick and easy, and introduces developers to the wonderful world of Drupal development on local virtual machines (instead of crufty old MAMP/WAMP-based development).
 
 It will install the following on an Ubuntu 16.04 (by default) linux VM:
 

From 1d3932feb232fa177796b690ac854e2933bfa2a1 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 31 Mar 2017 22:46:39 -0500
Subject: [PATCH 0697/1273] Fix Behat feature file example verbiage. [ci skip]

---
 docs/extras/selenium.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/extras/selenium.md b/docs/extras/selenium.md
index 809cd3652..d931eb59f 100644
--- a/docs/extras/selenium.md
+++ b/docs/extras/selenium.md
@@ -60,7 +60,7 @@ Using the default Drupal site as an example (it's installed in `/var/www/drupalv
   3. From either inside the VM or on the host machine, open up the new `features/web` folder Behat just created. Inside _that_ folder, create `HomeContent.feature` with the following contents:
 
         Feature: Test DrupalContext
-          In order to prove the Behat is working correctly in Drupal VM
+          In order to prove Behat is working correctly in Drupal VM
           As a developer
           I need to run a simple interface test
 
@@ -75,7 +75,7 @@ If everything was done correctly, you should see:
 ```console
 $ behat
 Feature: Test DrupalContext
-  In order to prove the Behat is working correctly in Drupal VM
+  In order to prove Behat is working correctly in Drupal VM
   As a developer
   I need to run a simple interface test
 

From cb5ef2d9182b53c97dba57c5d926b46425adc3a3 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 1 Apr 2017 07:22:15 -0500
Subject: [PATCH 0698/1273] Issue #1274: Update CHANGELOG for 4.4.1 release.

---
 CHANGELOG.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 513f120d0..e1db2e661 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Drupal VM Changelog
 
+## 4.4.1 (2017-04-01)
+
+### New/changed variables in default.config.yml
+
+  * N/A
+
+### Improvements
+
+  * Updated Ansible roles: `drupal`, `drush`, and `solr`.
+
+### Bugfixes
+
+  * #1245: Follow-up to make sure VM initial provisioning works as expected.
+  * #1261: Run hostname.yml tasks for `drupal` tag to prevent errors.
+  * Fixed pareview.sh script configuration example.
+  * Tweaked docs for Selenium and Production for clarity.
+
+
 ## 4.4.0 "Sea of Simulation" (2017-03-24)
 
 ### Breaking Changes

From 9dcd36549b9219facf644d355572b806cb471c71 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 2 Apr 2017 10:56:22 -0500
Subject: [PATCH 0699/1273] Update Firewall role to latest version.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.firewall/.gitignore     |  2 +
 .../roles/geerlingguy.firewall/.travis.yml    | 38 +++----------------
 .../roles/geerlingguy.firewall/LICENSE        | 20 ++++++++++
 .../roles/geerlingguy.firewall/README.md      |  2 +-
 .../tasks/disable-other-firewalls.yml         | 14 +++++++
 .../roles/geerlingguy.firewall/tasks/main.yml |  9 ++---
 .../geerlingguy.firewall/tests/README.md      | 11 ++++++
 8 files changed, 57 insertions(+), 41 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.firewall/.gitignore
 create mode 100644 provisioning/roles/geerlingguy.firewall/LICENSE
 create mode 100644 provisioning/roles/geerlingguy.firewall/tests/README.md

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 1589d1b04..d0faface9 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -26,7 +26,7 @@
 - src: geerlingguy.elasticsearch
   version: 2.1.3
 - src: geerlingguy.firewall
-  version: 2.1.2
+  version: 2.2.0
 - src: geerlingguy.git
   version: 1.2.1
 - src: geerlingguy.java
diff --git a/provisioning/roles/geerlingguy.firewall/.gitignore b/provisioning/roles/geerlingguy.firewall/.gitignore
new file mode 100644
index 000000000..c9b2377e3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.firewall/.gitignore
@@ -0,0 +1,2 @@
+*.retry
+tests/test.sh
diff --git a/provisioning/roles/geerlingguy.firewall/.travis.yml b/provisioning/roles/geerlingguy.firewall/.travis.yml
index 5306881f5..cab34e1fd 100644
--- a/provisioning/roles/geerlingguy.firewall/.travis.yml
+++ b/provisioning/roles/geerlingguy.firewall/.travis.yml
@@ -3,47 +3,19 @@ services: docker
 
 env:
   - distro: centos7
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
   - distro: centos6
-    init: /sbin/init
-    run_opts: "--privileged"
   - distro: ubuntu1604
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
   - distro: ubuntu1404
-    init: /sbin/init
-    run_opts: "--privileged"
   - distro: ubuntu1204
-    init: /sbin/init
-    run_opts: "--privileged"
   - distro: debian8
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-
-before_install:
-  # Pull container.
-  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
-  - container_id=$(mktemp)
-  # Run container in detached state.
-  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
-
-  # Ansible syntax check.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
-
-  # Test role.
-  - 'docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+  # Download test shim.
+  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
+  - chmod +x ${PWD}/tests/test.sh
 
-  # Test role idempotence.
-  - idempotence=$(mktemp)
-  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
-  - >
-    tail ${idempotence}
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
+  # Run tests.
+  - ${PWD}/tests/test.sh
 
   # # Check if TCP port 9123 is open.
   # - >
diff --git a/provisioning/roles/geerlingguy.firewall/LICENSE b/provisioning/roles/geerlingguy.firewall/LICENSE
new file mode 100644
index 000000000..4275cf3c1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.firewall/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Jeff Geerling
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/provisioning/roles/geerlingguy.firewall/README.md b/provisioning/roles/geerlingguy.firewall/README.md
index 3f26149e7..059e2501b 100644
--- a/provisioning/roles/geerlingguy.firewall/README.md
+++ b/provisioning/roles/geerlingguy.firewall/README.md
@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/geerlingguy/ansible-role-firewall.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-firewall)
 
-Installs a simple iptables-based firewall for RHEL/CentOS or Debian/Ubuntu systems. Supports both IPv4 (`iptables`) and IPv6 (`ip6tables`).
+Installs an iptables-based firewall for Linux. Supports both IPv4 (`iptables`) and IPv6 (`ip6tables`).
 
 This firewall aims for simplicity over complexity, and only opens a few specific ports for incoming traffic (configurable through Ansible variables). If you have a rudimentary knowledge of `iptables` and/or firewalls in general, this role should be a good starting point for a secure system firewall.
 
diff --git a/provisioning/roles/geerlingguy.firewall/tasks/disable-other-firewalls.yml b/provisioning/roles/geerlingguy.firewall/tasks/disable-other-firewalls.yml
index ad9636345..1ce768293 100644
--- a/provisioning/roles/geerlingguy.firewall/tasks/disable-other-firewalls.yml
+++ b/provisioning/roles/geerlingguy.firewall/tasks/disable-other-firewalls.yml
@@ -26,3 +26,17 @@
     state: stopped
     enabled: no
   when: ansible_distribution == "Ubuntu" and firewall_disable_ufw and ufw_installed.rc == 0
+
+- name: Check ufw package is installed (on Archlinux).
+  command: pacman -Q ufw
+  register: ufw_installed
+  ignore_errors: true
+  changed_when: false
+  when: ansible_distribution == "Archlinux" and firewall_disable_ufw
+
+- name: Disable the ufw firewall (on Archlinux, if configured).
+  service:
+    name: ufw
+    state: stopped
+    enabled: no
+  when: ansible_distribution == "Archlinux" and firewall_disable_ufw and ufw_installed.rc == 0
diff --git a/provisioning/roles/geerlingguy.firewall/tasks/main.yml b/provisioning/roles/geerlingguy.firewall/tasks/main.yml
index 98e5107ec..a08783db6 100644
--- a/provisioning/roles/geerlingguy.firewall/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.firewall/tasks/main.yml
@@ -5,7 +5,7 @@
 - name: Flush iptables the first time playbook runs.
   command: >
     iptables -F
-    creates=/etc/init.d/firewall
+    creates=/etc/firewall.bash
 
 - name: Copy firewall script into place.
   template:
@@ -23,6 +23,7 @@
     owner: root
     group: root
     mode: 0755
+  when: "ansible_service_mgr != 'systemd'"
 
 - name: Copy firewall systemd unit file into place (for systemd systems).
   template:
@@ -31,11 +32,7 @@
     owner: root
     group: root
     mode: 0644
-  when: >
-    (ansible_distribution == 'Ubuntu' and ansible_distribution_version.split(".")[0]|int >= 16) or
-    (ansible_distribution == 'Debian' and ansible_distribution_version.split(".")[0]|int >= 8) or
-    (ansible_os_family == 'RedHat' and ansible_distribution_version.split(".")[0]|int >= 7) or
-    (ansible_distribution == 'Fedora')
+  when: "ansible_service_mgr == 'systemd'"
 
 - name: Ensure the firewall is enabled and will start on boot.
   service: name=firewall state=started enabled=yes
diff --git a/provisioning/roles/geerlingguy.firewall/tests/README.md b/provisioning/roles/geerlingguy.firewall/tests/README.md
new file mode 100644
index 000000000..6fb211721
--- /dev/null
+++ b/provisioning/roles/geerlingguy.firewall/tests/README.md
@@ -0,0 +1,11 @@
+# Ansible Role tests
+
+To run the test playbook(s) in this directory:
+
+  1. Install and start Docker.
+  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
+    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
+  1. Make the test shim executable: `chmod +x tests/test.sh`.
+  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
+
+If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`

From 5b5192ed8cd7098cb6d381c2e9665cdadeb68a1d Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 2 Apr 2017 11:47:41 -0500
Subject: [PATCH 0700/1273] Update Mailhog role to latest version.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.mailhog/.gitignore      |  2 +
 .../roles/geerlingguy.mailhog/.travis.yml     | 43 +++++--------------
 .../roles/geerlingguy.mailhog/LICENSE         | 20 +++++++++
 .../roles/geerlingguy.mailhog/README.md       |  4 +-
 .../geerlingguy.mailhog/defaults/main.yml     |  2 +-
 .../roles/geerlingguy.mailhog/tasks/main.yml  |  7 +--
 .../roles/geerlingguy.mailhog/tests/README.md | 11 +++++
 .../roles/geerlingguy.mailhog/tests/test.yml  |  2 +-
 9 files changed, 50 insertions(+), 43 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.mailhog/.gitignore
 create mode 100644 provisioning/roles/geerlingguy.mailhog/LICENSE
 create mode 100644 provisioning/roles/geerlingguy.mailhog/tests/README.md

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index d0faface9..e39ca3889 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -32,7 +32,7 @@
 - src: geerlingguy.java
   version: 1.7.4
 - src: geerlingguy.mailhog
-  version: 2.1.1
+  version: 2.1.3
 - src: geerlingguy.memcached
   version: 1.0.7
 - src: geerlingguy.mysql
diff --git a/provisioning/roles/geerlingguy.mailhog/.gitignore b/provisioning/roles/geerlingguy.mailhog/.gitignore
new file mode 100644
index 000000000..c9b2377e3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mailhog/.gitignore
@@ -0,0 +1,2 @@
+*.retry
+tests/test.sh
diff --git a/provisioning/roles/geerlingguy.mailhog/.travis.yml b/provisioning/roles/geerlingguy.mailhog/.travis.yml
index 60c6ae06e..8fd97815c 100644
--- a/provisioning/roles/geerlingguy.mailhog/.travis.yml
+++ b/provisioning/roles/geerlingguy.mailhog/.travis.yml
@@ -3,50 +3,27 @@ services: docker
 
 env:
   - distro: centos7
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
   - distro: centos6
-    init: /sbin/init
-    run_opts: ""
   - distro: ubuntu1604
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
   - distro: ubuntu1404
-    init: /sbin/init
-    run_opts: ""
-
-before_install:
-  # Pull container.
-  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
-  - container_id=$(mktemp)
-  # Run container in detached state.
-  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
-
-  # Install dependencies.
-  - 'docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
-
-  # Ansible syntax check.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+  # Configure test script so we can run extra tests after playbook is run.
+  - export container_id=$(date +%s)
+  - export cleanup=false
 
-  # Test role.
-  - 'docker exec "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+  # Download test shim.
+  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
+  - chmod +x ${PWD}/tests/test.sh
 
-  # Test role idempotence.
-  - idempotence=$(mktemp)
-  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
-  - >
-    tail ${idempotence}
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
+  # Run tests.
+  - ${PWD}/tests/test.sh
 
   # Send an email via mhsendmail.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm sh -c "cat /etc/ansible/roles/role_under_test/tests/message | /opt/mailhog/mhsendmail johndoe@example.com"'
+  - 'docker exec --tty ${container_id} env TERM=xterm sh -c "cat /etc/ansible/roles/role_under_test/tests/message | /opt/mailhog/mhsendmail johndoe@example.com"'
 
   # Test retrieving messages via MailHog API.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm sh -c "curl http://localhost:8025/api/v2/messages | grep id"'
+  - 'docker exec --tty ${container_id} env TERM=xterm sh -c "curl http://localhost:8025/api/v2/messages | grep id"'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.mailhog/LICENSE b/provisioning/roles/geerlingguy.mailhog/LICENSE
new file mode 100644
index 000000000..4275cf3c1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mailhog/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Jeff Geerling
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/provisioning/roles/geerlingguy.mailhog/README.md b/provisioning/roles/geerlingguy.mailhog/README.md
index 521ad3527..21a59b460 100644
--- a/provisioning/roles/geerlingguy.mailhog/README.md
+++ b/provisioning/roles/geerlingguy.mailhog/README.md
@@ -24,7 +24,7 @@ Available variables are listed below, along with default values (see `defaults/m
 
 The directory into which the MailHog binary will be installed.
 
-    mailhog_binary_url: https://github.com/mailhog/MailHog/releases/download/v0.2.0/MailHog_linux_amd64
+    mailhog_binary_url: https://github.com/mailhog/MailHog/releases/download/v0.2.1/MailHog_linux_amd64
 
 The MailHog binary that will be installed. You can find the latest version or a 32-bit version by visiting the [MailHog project releases page](https://github.com/mailhog/MailHog/releases).
 
@@ -52,4 +52,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.mailhog/defaults/main.yml b/provisioning/roles/geerlingguy.mailhog/defaults/main.yml
index 73d66df85..91cf42e05 100644
--- a/provisioning/roles/geerlingguy.mailhog/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.mailhog/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
 mailhog_install_dir: /opt/mailhog
-mailhog_binary_url: https://github.com/mailhog/MailHog/releases/download/v0.2.0/MailHog_linux_amd64
+mailhog_binary_url: https://github.com/mailhog/MailHog/releases/download/v0.2.1/MailHog_linux_amd64
 mhsendmail_binary_url: https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64
 
 # Path to daemonize, which is used to launch MailHog via init script.
diff --git a/provisioning/roles/geerlingguy.mailhog/tasks/main.yml b/provisioning/roles/geerlingguy.mailhog/tasks/main.yml
index 68689f64c..d21b8c9c7 100644
--- a/provisioning/roles/geerlingguy.mailhog/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.mailhog/tasks/main.yml
@@ -28,6 +28,7 @@
     owner: root
     group: root
     mode: 0755
+  when: "ansible_service_mgr != 'systemd'"
 
 - name: Copy mailhog systemd unit file into place (for systemd systems).
   template:
@@ -36,11 +37,7 @@
     owner: root
     group: root
     mode: 0755
-  when: >
-    (ansible_distribution == 'Ubuntu' and ansible_distribution_version.split(".")[0]|int >= 16) or
-    (ansible_distribution == 'Debian' and ansible_distribution_version.split(".")[0]|int >= 8) or
-    (ansible_distribution == 'CentOS' and ansible_distribution_version.split(".")[0]|int >= 7) or
-    (ansible_distribution == 'Fedora')
+  when: "ansible_service_mgr == 'systemd'"
 
 - name: Ensure mailhog is enabled and will start on boot.
   service: name=mailhog state=started enabled=yes
diff --git a/provisioning/roles/geerlingguy.mailhog/tests/README.md b/provisioning/roles/geerlingguy.mailhog/tests/README.md
new file mode 100644
index 000000000..6fb211721
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mailhog/tests/README.md
@@ -0,0 +1,11 @@
+# Ansible Role tests
+
+To run the test playbook(s) in this directory:
+
+  1. Install and start Docker.
+  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
+    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
+  1. Make the test shim executable: `chmod +x tests/test.sh`.
+  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
+
+If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.mailhog/tests/test.yml b/provisioning/roles/geerlingguy.mailhog/tests/test.yml
index 1d0fda341..b4626b0c1 100644
--- a/provisioning/roles/geerlingguy.mailhog/tests/test.yml
+++ b/provisioning/roles/geerlingguy.mailhog/tests/test.yml
@@ -2,7 +2,7 @@
 
   pre_tasks:
     - name: Update apt cache.
-      apt: update_cache=yes
+      apt: update_cache=yes cache_valid_time=600
       when: ansible_os_family == 'Debian'
 
     - name: Ensure build dependencies are installed (RedHat).

From f0d15a47e23dca72e94726eed1732de50ae92c55 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 3 Apr 2017 10:15:56 -0500
Subject: [PATCH 0701/1273] Update Apache role to latest version.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.apache/.gitignore       |  2 +
 .../roles/geerlingguy.apache/.travis.yml      | 37 +++----------------
 provisioning/roles/geerlingguy.apache/LICENSE | 20 ++++++++++
 .../roles/geerlingguy.apache/README.md        |  2 +-
 .../roles/geerlingguy.apache/meta/main.yml    | 26 ++++++++-----
 .../roles/geerlingguy.apache/tasks/main.yml   |  4 ++
 .../roles/geerlingguy.apache/tests/README.md  | 11 ++++++
 .../geerlingguy.apache/vars/AmazonLinux.yml   | 18 +++++++++
 9 files changed, 79 insertions(+), 43 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.apache/.gitignore
 create mode 100644 provisioning/roles/geerlingguy.apache/LICENSE
 create mode 100644 provisioning/roles/geerlingguy.apache/tests/README.md
 create mode 100644 provisioning/roles/geerlingguy.apache/vars/AmazonLinux.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index e39ca3889..1e91adf7e 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -8,7 +8,7 @@
 - src: geerlingguy.adminer
   version: 1.1.0
 - src: geerlingguy.apache
-  version: 2.0.1
+  version: 2.0.2
 - src: geerlingguy.apache-php-fpm
   version: 1.0.2
 - src: geerlingguy.blackfire
diff --git a/provisioning/roles/geerlingguy.apache/.gitignore b/provisioning/roles/geerlingguy.apache/.gitignore
new file mode 100644
index 000000000..c9b2377e3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache/.gitignore
@@ -0,0 +1,2 @@
+*.retry
+tests/test.sh
diff --git a/provisioning/roles/geerlingguy.apache/.travis.yml b/provisioning/roles/geerlingguy.apache/.travis.yml
index eea0fbae7..4fd8d652d 100644
--- a/provisioning/roles/geerlingguy.apache/.travis.yml
+++ b/provisioning/roles/geerlingguy.apache/.travis.yml
@@ -3,44 +3,19 @@ services: docker
 
 env:
   - distro: centos7
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
   - distro: centos6
-    init: /sbin/init
-    run_opts: ""
   - distro: ubuntu1604
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
   - distro: ubuntu1404
-    init: /sbin/init
-    run_opts: ""
   - distro: ubuntu1204
-    init: /sbin/init
-    run_opts: ""
-
-before_install:
-  # Pull container.
-  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
+  - distro: debian8
 
 script:
-  - container_id=$(mktemp)
-  # Run container in detached state.
-  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
-
-  # Ansible syntax check.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
-
-  # Test role.
-  - 'docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+  # Download test shim.
+  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
+  - chmod +x ${PWD}/tests/test.sh
 
-  # Test role idempotence.
-  - idempotence=$(mktemp)
-  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
-  - >
-    tail ${idempotence}
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
+  # Run tests.
+  - ${PWD}/tests/test.sh
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.apache/LICENSE b/provisioning/roles/geerlingguy.apache/LICENSE
new file mode 100644
index 000000000..4275cf3c1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Jeff Geerling
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/provisioning/roles/geerlingguy.apache/README.md b/provisioning/roles/geerlingguy.apache/README.md
index c9187ff76..b0c0ca159 100644
--- a/provisioning/roles/geerlingguy.apache/README.md
+++ b/provisioning/roles/geerlingguy.apache/README.md
@@ -152,4 +152,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.apache/meta/main.yml b/provisioning/roles/geerlingguy.apache/meta/main.yml
index 3765e63c5..5893a1737 100644
--- a/provisioning/roles/geerlingguy.apache/meta/main.yml
+++ b/provisioning/roles/geerlingguy.apache/meta/main.yml
@@ -3,31 +3,37 @@ dependencies: []
 
 galaxy_info:
   author: geerlingguy
-  description: Apache 2.x for RedHat/CentOS/Debian/Ubuntu/Solaris/Suse.
+  description: Apache 2.x for Linux.
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
   min_ansible_version: 1.9
   platforms:
     - name: EL
       versions:
-      - all
+        - all
+    - name: Amazon
+      versions:
+        - all
     - name: Debian
       versions:
-      - all
+        - all
     - name: Ubuntu
       versions:
-      - precise
-      - raring
-      - saucy
-      - trusty
-      - xenial
+        - precise
+        - raring
+        - saucy
+        - trusty
+        - xenial
     - name: Suse
       versions:
-      - all
+        - all
     - name: Solaris
       versions:
-      - 11.3
+        - 11.3
   galaxy_tags:
     - web
+    - apache
+    - webserver
+    - html
 
 allow_duplicates: yes
diff --git a/provisioning/roles/geerlingguy.apache/tasks/main.yml b/provisioning/roles/geerlingguy.apache/tasks/main.yml
index e013f392c..fb47a38d1 100644
--- a/provisioning/roles/geerlingguy.apache/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.apache/tasks/main.yml
@@ -3,6 +3,10 @@
 - name: Include OS-specific variables.
   include_vars: "{{ ansible_os_family }}.yml"
 
+- name: Include variables for Amazon Linux.
+  include_vars: "AmazonLinux.yml"
+  when: ansible_distribution == "Amazon" and ansible_distribution_major_version == "NA"
+
 - name: Define apache_packages.
   set_fact:
     apache_packages: "{{ __apache_packages | list }}"
diff --git a/provisioning/roles/geerlingguy.apache/tests/README.md b/provisioning/roles/geerlingguy.apache/tests/README.md
new file mode 100644
index 000000000..6fb211721
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache/tests/README.md
@@ -0,0 +1,11 @@
+# Ansible Role tests
+
+To run the test playbook(s) in this directory:
+
+  1. Install and start Docker.
+  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
+    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
+  1. Make the test shim executable: `chmod +x tests/test.sh`.
+  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
+
+If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.apache/vars/AmazonLinux.yml b/provisioning/roles/geerlingguy.apache/vars/AmazonLinux.yml
new file mode 100644
index 000000000..165f65d88
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache/vars/AmazonLinux.yml
@@ -0,0 +1,18 @@
+---
+apache_service: httpd
+apache_daemon: httpd
+apache_daemon_path: /usr/sbin/
+apache_server_root: /etc/httpd
+apache_conf_path: /etc/httpd/conf.d
+
+apache_vhosts_version: "2.4"
+
+__apache_packages:
+  - httpd24
+  - httpd24-devel
+  - mod24_ssl
+  - openssh
+
+apache_ports_configuration_items:
+  - regexp: "^Listen "
+    line: "Listen {{ apache_listen_port }}"

From 6620b42efc7447870bcc2a741da11abdc6a120cc Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 3 Apr 2017 16:42:37 -0500
Subject: [PATCH 0702/1273] Fixes #1280: Update link to configuring Drupal VM
 in the README. [ci skip]

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

diff --git a/README.md b/README.md
index 29e5f4967..8b1e15ab4 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ Full Drupal VM documentation is available at http://docs.drupalvm.com/
 
 There are a couple places where you can customize the VM for your needs:
 
-  - `config.yml`: Override any of the default VM configuration from `default.config.yml`; customize almost any aspect of any software installed in the VM (more about [overriding configurations](http://docs.drupalvm.com/en/latest/other/overriding-configurations/).
+  - `config.yml`: Override any of the default VM configuration from `default.config.yml`; customize almost any aspect of any software installed in the VM (more about [configuring Drupal VM](http://docs.drupalvm.com/en/latest/getting-started/configure-drupalvm/).
   - `drupal.composer.json` or `drupal.make.yml`: Contains configuration for the Drupal core version, modules, and patches that will be downloaded on Drupal's initial installation (you can build using Composer, Drush make, or your own codebase).
 
 If you want to switch from Drupal 8 (default) to Drupal 7 on the initial install, do the following:

From 866c1dbeb7100eb65d2ee608d5e97c10bf8870b3 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 4 Apr 2017 09:58:59 -0500
Subject: [PATCH 0703/1273] Update Solr role to latest version to fix core
 issue.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.solr/.gitignore         |  2 +
 .../roles/geerlingguy.solr/.travis.yml        | 61 +++++--------------
 provisioning/roles/geerlingguy.solr/LICENSE   | 20 ++++++
 provisioning/roles/geerlingguy.solr/README.md |  4 ++
 .../roles/geerlingguy.solr/defaults/main.yml  |  1 +
 .../roles/geerlingguy.solr/tasks/cores.yml    |  8 +--
 .../roles/geerlingguy.solr/tests/README.md    | 11 ++++
 8 files changed, 59 insertions(+), 50 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.solr/.gitignore
 create mode 100644 provisioning/roles/geerlingguy.solr/LICENSE
 create mode 100644 provisioning/roles/geerlingguy.solr/tests/README.md

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 1e91adf7e..b32f0e5d1 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -74,6 +74,6 @@
 - src: geerlingguy.security
   version: 1.5.0
 - src: geerlingguy.solr
-  version: 3.5.2
+  version: 3.5.3
 - src: geerlingguy.varnish
   version: 1.8.4
diff --git a/provisioning/roles/geerlingguy.solr/.gitignore b/provisioning/roles/geerlingguy.solr/.gitignore
new file mode 100644
index 000000000..c9b2377e3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.solr/.gitignore
@@ -0,0 +1,2 @@
+*.retry
+tests/test.sh
diff --git a/provisioning/roles/geerlingguy.solr/.travis.yml b/provisioning/roles/geerlingguy.solr/.travis.yml
index 2f9504246..0bdfdba88 100644
--- a/provisioning/roles/geerlingguy.solr/.travis.yml
+++ b/provisioning/roles/geerlingguy.solr/.travis.yml
@@ -4,66 +4,37 @@ services: docker
 env:
   # Test current version of Solr on latest supported OSes.
   - distro: centos7
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-    solr_major_version: 6
+    playbook: test-solr-6.yml
   - distro: ubuntu1604
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-    solr_major_version: 6
+    playbook: test-solr-6.yml
   - distro: debian8
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-    solr_major_version: 6
+    playbook: test-solr-6.yml
 
   # Test older versions of Solr / OSes.
   - distro: ubuntu1404
-    init: /sbin/init
-    run_opts: ""
-    solr_major_version: 5
+    playbook: test-solr-5.yml
   - distro: ubuntu1204
-    init: /sbin/init
-    run_opts: ""
-    solr_major_version: 5
+    playbook: test-solr-5.yml
   - distro: ubuntu1404
-    init: /sbin/init
-    run_opts: ""
-    solr_major_version: 4
+    playbook: test-solr-4.yml
   - distro: ubuntu1404
-    init: /sbin/init
-    run_opts: ""
-    solr_major_version: 3
-
-before_install:
-  # Pull container.
-  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
+    playbook: test-solr-3.yml
 
 script:
-  - container_id=$(mktemp)
-  # Run container in detached state.
-  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
-
-  # Install dependencies.
-  - 'docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
+  # Configure test script so we can run extra tests after playbook is run.
+  - export container_id=$(date +%s)
+  - export cleanup=false
 
-  # Ansible syntax check.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test-solr-${solr_major_version}.yml --syntax-check'
+  # Download test shim.
+  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
+  - chmod +x ${PWD}/tests/test.sh
 
-  # Test role.
-  - 'docker exec "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test-solr-${solr_major_version}.yml'
-
-  # Test role idempotence.
-  - idempotence=$(mktemp)
-  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test-solr-${solr_major_version}.yml | tee -a ${idempotence}
-  - >
-    tail ${idempotence}
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
+  # Run tests.
+  - ${PWD}/tests/test.sh
 
   # Make sure Solr is running.
   - >
-    sudo docker exec "$(cat ${container_id})" ps -ax | grep -q 'solr'
+    sudo docker exec ${container_id} ps -ax | grep -q 'solr'
     && (echo 'solr is running: pass' && exit 0)
     || (echo 'solr is running: fail' && exit 1)
 
diff --git a/provisioning/roles/geerlingguy.solr/LICENSE b/provisioning/roles/geerlingguy.solr/LICENSE
new file mode 100644
index 000000000..4275cf3c1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.solr/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Jeff Geerling
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/provisioning/roles/geerlingguy.solr/README.md b/provisioning/roles/geerlingguy.solr/README.md
index 0443fdf91..b1af9cfd9 100644
--- a/provisioning/roles/geerlingguy.solr/README.md
+++ b/provisioning/roles/geerlingguy.solr/README.md
@@ -58,6 +58,10 @@ Default timezone of JVM running solr. You can override this if needed when using
 
 A list of cores / collections which should exist on the server. Each one will be created (if it doesn't exist already) using the default example configuration that ships with Solr. Note that this variable only applies when using Solr 5+.
 
+    solr_connect_host: localhost
+
+The hostname or IP address on which Solr will be reachable. `localhost` should work in most circumstances, but there are special cases where you may only be able to access the local Solr instance via another IP or hostname.
+
 ### Variables used only for Solr < 5.
 
 The following variables are currently only applied to installations of Solr 4 and below:
diff --git a/provisioning/roles/geerlingguy.solr/defaults/main.yml b/provisioning/roles/geerlingguy.solr/defaults/main.yml
index b1c5838f0..60b50e501 100644
--- a/provisioning/roles/geerlingguy.solr/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.solr/defaults/main.yml
@@ -12,6 +12,7 @@ solr_service_name: solr
 solr_install_dir: /opt
 solr_install_path: "/opt/{{ solr_service_name }}"
 solr_home: /var/solr
+solr_connect_host: localhost
 solr_port: "8983"
 
 solr_xms: "256M"
diff --git a/provisioning/roles/geerlingguy.solr/tasks/cores.yml b/provisioning/roles/geerlingguy.solr/tasks/cores.yml
index 65f2ca9b0..d7a052109 100644
--- a/provisioning/roles/geerlingguy.solr/tasks/cores.yml
+++ b/provisioning/roles/geerlingguy.solr/tasks/cores.yml
@@ -1,7 +1,7 @@
 ---
 - name: Check current list of Solr cores.
   uri:
-    url: http://localhost:{{ solr_port }}/solr/admin/cores
+    url: http://{{ solr_connect_host }}:{{ solr_port }}/solr/admin/cores
     return_content: yes
   register: solr_cores_current
 
@@ -12,19 +12,19 @@
     owner: "{{ solr_user }}"
     group: "{{ solr_user }}"
     recurse: yes
-  when: "'{{ item }}' not in '{{ solr_cores_current.content }}'"
+  when: "item not in solr_cores_current.content"
   with_items: "{{ solr_cores }}"
 
 - name: Ensure core configuration directories exist.
   shell: "cp -r {{ solr_install_path }}/example/files/conf/ {{ solr_home }}/data/{{ item }}/"
-  when: "'{{ item }}' not in '{{ solr_cores_current.content }}'"
+  when: "item not in solr_cores_current.content"
   with_items: "{{ solr_cores }}"
   become: yes
   become_user: "{{ solr_user }}"
 
 - name: Create configured cores.
   shell: "{{ solr_install_path }}/bin/solr create -c {{ item }}"
-  when: "'{{ item }}' not in '{{ solr_cores_current.content }}'"
+  when: "item not in solr_cores_current.content"
   with_items: "{{ solr_cores }}"
   become: yes
   become_user: "{{ solr_user }}"
diff --git a/provisioning/roles/geerlingguy.solr/tests/README.md b/provisioning/roles/geerlingguy.solr/tests/README.md
new file mode 100644
index 000000000..6fb211721
--- /dev/null
+++ b/provisioning/roles/geerlingguy.solr/tests/README.md
@@ -0,0 +1,11 @@
+# Ansible Role tests
+
+To run the test playbook(s) in this directory:
+
+  1. Install and start Docker.
+  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
+    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
+  1. Make the test shim executable: `chmod +x tests/test.sh`.
+  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
+
+If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`

From 2c978154236570f8d5eabc575f934e3daf36f9e6 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 5 Apr 2017 09:53:07 -0500
Subject: [PATCH 0704/1273] Fixes #1275: Adminer download timeout fix.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.adminer/.gitignore      |  2 +
 .../roles/geerlingguy.adminer/.travis.yml     | 75 +++++--------------
 .../roles/geerlingguy.adminer/LICENSE         | 20 +++++
 .../roles/geerlingguy.adminer/README.md       |  2 +-
 .../roles/geerlingguy.adminer/tasks/main.yml  |  1 +
 .../tests/Dockerfile.centos-6                 | 15 ----
 .../tests/Dockerfile.centos-7                 | 27 -------
 .../tests/Dockerfile.ubuntu-12.04             | 11 ---
 .../tests/Dockerfile.ubuntu-14.04             | 11 ---
 .../roles/geerlingguy.adminer/tests/README.md | 11 +++
 .../tests/requirements.yml                    |  2 +
 12 files changed, 56 insertions(+), 123 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.adminer/.gitignore
 create mode 100644 provisioning/roles/geerlingguy.adminer/LICENSE
 delete mode 100644 provisioning/roles/geerlingguy.adminer/tests/Dockerfile.centos-6
 delete mode 100644 provisioning/roles/geerlingguy.adminer/tests/Dockerfile.centos-7
 delete mode 100644 provisioning/roles/geerlingguy.adminer/tests/Dockerfile.ubuntu-12.04
 delete mode 100644 provisioning/roles/geerlingguy.adminer/tests/Dockerfile.ubuntu-14.04
 create mode 100644 provisioning/roles/geerlingguy.adminer/tests/README.md
 create mode 100644 provisioning/roles/geerlingguy.adminer/tests/requirements.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index b32f0e5d1..c51e3e86d 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -6,7 +6,7 @@
 - src: franklinkim.newrelic
   version: 1.6.0
 - src: geerlingguy.adminer
-  version: 1.1.0
+  version: 1.1.1
 - src: geerlingguy.apache
   version: 2.0.2
 - src: geerlingguy.apache-php-fpm
diff --git a/provisioning/roles/geerlingguy.adminer/.gitignore b/provisioning/roles/geerlingguy.adminer/.gitignore
new file mode 100644
index 000000000..c9b2377e3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.adminer/.gitignore
@@ -0,0 +1,2 @@
+*.retry
+tests/test.sh
diff --git a/provisioning/roles/geerlingguy.adminer/.travis.yml b/provisioning/roles/geerlingguy.adminer/.travis.yml
index 45c461ac7..b3c2a4c34 100644
--- a/provisioning/roles/geerlingguy.adminer/.travis.yml
+++ b/provisioning/roles/geerlingguy.adminer/.travis.yml
@@ -1,66 +1,27 @@
 ---
-sudo: required
+services: docker
 
 env:
-  - distribution: centos
-    version: 6
-    init: /sbin/init
-    run_opts: ""
-    test_file: test-apache.yml
-  - distribution: centos
-    version: 7
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-    test_file: test-apache.yml
-  - distribution: ubuntu
-    version: 14.04
-    init: /sbin/init
-    run_opts: ""
-    test_file: test-apache.yml
-  - distribution: ubuntu
-    version: 12.04
-    init: /sbin/init
-    run_opts: ""
-    test_file: test-apache.yml
-  - distribution: ubuntu
-    version: 14.04
-    init: /sbin/init
-    run_opts: ""
-    test_file: test-standalone.yml
-
-services:
-  - docker
-
-before_install:
-  # - sudo apt-get update
-  # Pull container
-  - 'sudo docker pull ${distribution}:${version}'
-  # Customize container
-  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+  - distro: centos7
+    playbook: test-apache.yml
+  - distro: centos6
+    playbook: test-apache.yml
+  - distro: ubuntu1604
+    playbook: test-apache.yml
+  - distro: ubuntu1404
+    playbook: test-apache.yml
+  - distro: debian8
+    playbook: test-apache.yml
+  - distro: ubuntu1604
+    playbook: test-standalone.yml
 
 script:
-  - container_id=$(mktemp)
-  # Run container in detached state
-  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
-
-  # Install required Galaxy roles.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-galaxy install geerlingguy.apache'
-
-  # Ansible syntax check.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${test_file} --syntax-check'
-
-  # Test role.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${test_file}'
-
-  # Test role idempotence.
-  - >
-    sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/${test_file}
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
+  # Download test shim.
+  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
+  - chmod +x ${PWD}/tests/test.sh
 
-  # Clean up
-  - 'sudo docker stop "$(cat ${container_id})"'
+  # Run tests.
+  - ${PWD}/tests/test.sh
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.adminer/LICENSE b/provisioning/roles/geerlingguy.adminer/LICENSE
new file mode 100644
index 000000000..4275cf3c1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.adminer/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Jeff Geerling
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/provisioning/roles/geerlingguy.adminer/README.md b/provisioning/roles/geerlingguy.adminer/README.md
index 4693bd86a..41b7fd5b6 100644
--- a/provisioning/roles/geerlingguy.adminer/README.md
+++ b/provisioning/roles/geerlingguy.adminer/README.md
@@ -44,4 +44,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2015 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/). It is originally a fork of [Oefenweb/ansible-adminer](https://github.com/Oefenweb/ansible-adminer).
+This role was created in 2015 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/). It is originally a fork of [Oefenweb/ansible-adminer](https://github.com/Oefenweb/ansible-adminer).
diff --git a/provisioning/roles/geerlingguy.adminer/tasks/main.yml b/provisioning/roles/geerlingguy.adminer/tasks/main.yml
index 377725513..3ad51e0c0 100644
--- a/provisioning/roles/geerlingguy.adminer/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.adminer/tasks/main.yml
@@ -11,6 +11,7 @@
     url: http://www.adminer.org/latest.php
     dest: "{{ adminer_install_dir }}/{{ adminer_install_filename }}"
     mode: 0644
+    timeout: 60
 
 - name: Symlink Adminer into configured directories.
   file:
diff --git a/provisioning/roles/geerlingguy.adminer/tests/Dockerfile.centos-6 b/provisioning/roles/geerlingguy.adminer/tests/Dockerfile.centos-6
deleted file mode 100644
index 4a4e7b8d6..000000000
--- a/provisioning/roles/geerlingguy.adminer/tests/Dockerfile.centos-6
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM centos:6
-
-# Install Ansible
-RUN yum -y update; yum clean all;
-RUN yum -y install epel-release
-RUN yum -y install git ansible sudo
-RUN yum clean all
-
-# Disable requiretty
-RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
-
-# Install Ansible inventory file
-RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
-
-CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.adminer/tests/Dockerfile.centos-7 b/provisioning/roles/geerlingguy.adminer/tests/Dockerfile.centos-7
deleted file mode 100644
index 8aa065497..000000000
--- a/provisioning/roles/geerlingguy.adminer/tests/Dockerfile.centos-7
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM centos:7
-
-# Install systemd -- See https://hub.docker.com/_/centos/
-RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
-RUN yum -y update; yum clean all; \
-(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
-rm -f /lib/systemd/system/multi-user.target.wants/*; \
-rm -f /etc/systemd/system/*.wants/*; \
-rm -f /lib/systemd/system/local-fs.target.wants/*; \
-rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
-rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
-rm -f /lib/systemd/system/basic.target.wants/*; \
-rm -f /lib/systemd/system/anaconda.target.wants/*;
-
-# Install Ansible
-RUN yum -y install epel-release
-RUN yum -y install git ansible sudo
-RUN yum clean all
-
-# Disable requiretty
-RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
-
-# Install Ansible inventory file
-RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
-
-VOLUME ["/sys/fs/cgroup"]
-CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.adminer/tests/Dockerfile.ubuntu-12.04 b/provisioning/roles/geerlingguy.adminer/tests/Dockerfile.ubuntu-12.04
deleted file mode 100644
index d0c130cdf..000000000
--- a/provisioning/roles/geerlingguy.adminer/tests/Dockerfile.ubuntu-12.04
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM ubuntu:12.04
-RUN apt-get update
-
-# Install Ansible
-RUN apt-get install -y software-properties-common python-software-properties git
-RUN apt-add-repository -y ppa:ansible/ansible
-RUN apt-get update
-RUN apt-get install -y ansible
-
-# Install Ansible inventory file
-RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.adminer/tests/Dockerfile.ubuntu-14.04 b/provisioning/roles/geerlingguy.adminer/tests/Dockerfile.ubuntu-14.04
deleted file mode 100644
index ca332871f..000000000
--- a/provisioning/roles/geerlingguy.adminer/tests/Dockerfile.ubuntu-14.04
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM ubuntu:14.04
-RUN apt-get update
-
-# Install Ansible
-RUN apt-get install -y software-properties-common git
-RUN apt-add-repository -y ppa:ansible/ansible
-RUN apt-get update
-RUN apt-get install -y ansible
-
-# Install Ansible inventory file
-RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.adminer/tests/README.md b/provisioning/roles/geerlingguy.adminer/tests/README.md
new file mode 100644
index 000000000..6fb211721
--- /dev/null
+++ b/provisioning/roles/geerlingguy.adminer/tests/README.md
@@ -0,0 +1,11 @@
+# Ansible Role tests
+
+To run the test playbook(s) in this directory:
+
+  1. Install and start Docker.
+  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
+    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
+  1. Make the test shim executable: `chmod +x tests/test.sh`.
+  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
+
+If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.adminer/tests/requirements.yml b/provisioning/roles/geerlingguy.adminer/tests/requirements.yml
new file mode 100644
index 000000000..25c230cfb
--- /dev/null
+++ b/provisioning/roles/geerlingguy.adminer/tests/requirements.yml
@@ -0,0 +1,2 @@
+---
+- src: geerlingguy.apache

From af50f11b461921b768ecb7d137b9daab194d8809 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 5 Apr 2017 11:49:09 -0500
Subject: [PATCH 0705/1273] Update Varnish role to latest version - pidfile
 fix.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.varnish/.gitignore      |  3 +-
 .../roles/geerlingguy.varnish/.travis.yml     | 40 +++++--------------
 .../roles/geerlingguy.varnish/LICENSE         | 20 ++++++++++
 .../geerlingguy.varnish/templates/varnish.j2  |  8 ++--
 .../roles/geerlingguy.varnish/tests/README.md | 11 +++++
 6 files changed, 48 insertions(+), 36 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.varnish/LICENSE
 create mode 100644 provisioning/roles/geerlingguy.varnish/tests/README.md

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index c51e3e86d..8d53b4d8a 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -76,4 +76,4 @@
 - src: geerlingguy.solr
   version: 3.5.3
 - src: geerlingguy.varnish
-  version: 1.8.4
+  version: 1.8.5
diff --git a/provisioning/roles/geerlingguy.varnish/.gitignore b/provisioning/roles/geerlingguy.varnish/.gitignore
index 496ee2ca6..c9b2377e3 100644
--- a/provisioning/roles/geerlingguy.varnish/.gitignore
+++ b/provisioning/roles/geerlingguy.varnish/.gitignore
@@ -1 +1,2 @@
-.DS_Store
\ No newline at end of file
+*.retry
+tests/test.sh
diff --git a/provisioning/roles/geerlingguy.varnish/.travis.yml b/provisioning/roles/geerlingguy.varnish/.travis.yml
index 874c63d5e..febc41820 100644
--- a/provisioning/roles/geerlingguy.varnish/.travis.yml
+++ b/provisioning/roles/geerlingguy.varnish/.travis.yml
@@ -3,47 +3,25 @@ services: docker
 
 env:
   - distro: centos7
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
   - distro: centos6
-    init: /sbin/init
-    run_opts: ""
   - distro: ubuntu1604
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
   - distro: ubuntu1404
-    init: /sbin/init
-    run_opts: ""
   - distro: debian8
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-
-before_install:
-  # Pull container.
-  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
-  - container_id=$(mktemp)
-  # Run container in detached state.
-  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
-
-  # Ansible syntax check.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+  # Configure test script so we can run extra tests after playbook is run.
+  - export container_id=$(date +%s)
+  - export cleanup=false
 
-  # Test role.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+  # Download test shim.
+  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
+  - chmod +x ${PWD}/tests/test.sh
 
-  # Test role idempotence.
-  - idempotence=$(mktemp)
-  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
-  - >
-    tail ${idempotence}
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
+  # Run tests.
+  - ${PWD}/tests/test.sh
 
   # Make sure Varnish is running.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm varnishd -V'
+  - 'docker exec --tty ${container_id} env TERM=xterm varnishd -V'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.varnish/LICENSE b/provisioning/roles/geerlingguy.varnish/LICENSE
new file mode 100644
index 000000000..4275cf3c1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.varnish/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Jeff Geerling
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/provisioning/roles/geerlingguy.varnish/templates/varnish.j2 b/provisioning/roles/geerlingguy.varnish/templates/varnish.j2
index 87a309465..0e5b97902 100644
--- a/provisioning/roles/geerlingguy.varnish/templates/varnish.j2
+++ b/provisioning/roles/geerlingguy.varnish/templates/varnish.j2
@@ -27,6 +27,11 @@ NPROCS="unlimited"
 # use Alternative 3, Advanced configuration, below
 RELOAD_VCL=1
 
+{% if varnish_pidfile %}
+# Varnish PID file
+PIDFILE="{{ varnish_pidfile }}"
+{% endif %}
+
 # This file contains 4 alternatives, please use only one.
 
 ## Alternative 1, Minimal configuration, no VCL
@@ -96,9 +101,6 @@ DAEMON_OPTS="-a ${VARNISH_LISTEN_ADDRESS}:${VARNISH_LISTEN_PORT} \
              -f ${VARNISH_VCL_CONF} \
              -T ${VARNISH_ADMIN_LISTEN_ADDRESS}:${VARNISH_ADMIN_LISTEN_PORT} \
              -t ${VARNISH_TTL} \
-{% if varnish_pidfile %}
-             -P {{ varnish_pidfile }} \
-{% endif %}
              -p thread_pool_min=${VARNISH_MIN_THREADS} \
              -p thread_pool_max=${VARNISH_MAX_THREADS} \
              -p thread_pool_timeout=${VARNISH_THREAD_TIMEOUT} \
diff --git a/provisioning/roles/geerlingguy.varnish/tests/README.md b/provisioning/roles/geerlingguy.varnish/tests/README.md
new file mode 100644
index 000000000..6fb211721
--- /dev/null
+++ b/provisioning/roles/geerlingguy.varnish/tests/README.md
@@ -0,0 +1,11 @@
+# Ansible Role tests
+
+To run the test playbook(s) in this directory:
+
+  1. Install and start Docker.
+  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
+    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
+  1. Make the test shim executable: `chmod +x tests/test.sh`.
+  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
+
+If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`

From 1c41101164e9582fdf947d582a7916d8080953e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 5 Apr 2017 17:30:46 -0500
Subject: [PATCH 0706/1273] Issue #1281: Avoid TypeError by only merging
 optional config content when present

---
 Vagrantfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Vagrantfile b/Vagrantfile
index 4c7dc038d..1b2f3d0d3 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -46,7 +46,8 @@ vconfig = YAML.load_file("#{host_drupalvm_dir}/default.config.yml")
 # Use optional config.yml and local.config.yml for configuration overrides.
 ['config.yml', 'local.config.yml', "#{drupalvm_env}.config.yml"].each do |config_file|
   if File.exist?("#{host_config_dir}/#{config_file}")
-    vconfig.merge!(YAML.load_file("#{host_config_dir}/#{config_file}"))
+    optional_config = YAML.load_file("#{host_config_dir}/#{config_file}")
+    vconfig.merge!(optional_config) if optional_config
   end
 end
 

From ffa2749a77704b0d21ed99abab8c15d344b78b11 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 6 Apr 2017 08:50:08 -0500
Subject: [PATCH 0707/1273] Update Solr role with latest changes.

---
 provisioning/requirements.yml                         | 2 +-
 provisioning/roles/geerlingguy.solr/README.md         | 4 ++++
 provisioning/roles/geerlingguy.solr/defaults/main.yml | 7 +++++--
 provisioning/roles/geerlingguy.solr/handlers/main.yml | 1 +
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 8d53b4d8a..f3ba14b5e 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -74,6 +74,6 @@
 - src: geerlingguy.security
   version: 1.5.0
 - src: geerlingguy.solr
-  version: 3.5.3
+  version: 3.5.4
 - src: geerlingguy.varnish
   version: 1.8.5
diff --git a/provisioning/roles/geerlingguy.solr/README.md b/provisioning/roles/geerlingguy.solr/README.md
index b1af9cfd9..7db4ce7fe 100644
--- a/provisioning/roles/geerlingguy.solr/README.md
+++ b/provisioning/roles/geerlingguy.solr/README.md
@@ -62,6 +62,10 @@ A list of cores / collections which should exist on the server. Each one will be
 
 The hostname or IP address on which Solr will be reachable. `localhost` should work in most circumstances, but there are special cases where you may only be able to access the local Solr instance via another IP or hostname.
 
+    solr_restart_handler_enabled: true
+
+Whether the `restart solr` handler should be used or not. If you're building containers or AMIs, you might need to disable the restart handler for a provisioning run.
+
 ### Variables used only for Solr < 5.
 
 The following variables are currently only applied to installations of Solr 4 and below:
diff --git a/provisioning/roles/geerlingguy.solr/defaults/main.yml b/provisioning/roles/geerlingguy.solr/defaults/main.yml
index 60b50e501..91b78a12a 100644
--- a/provisioning/roles/geerlingguy.solr/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.solr/defaults/main.yml
@@ -11,7 +11,7 @@ solr_remove_cruft: false
 solr_service_name: solr
 solr_install_dir: /opt
 solr_install_path: "/opt/{{ solr_service_name }}"
-solr_home: /var/solr
+solr_home: "/var/{{ solr_service_name }}"
 solr_connect_host: localhost
 solr_port: "8983"
 
@@ -23,7 +23,10 @@ solr_timezone: "UTC"
 solr_cores:
   - collection1
 
-solr_config_file: /etc/default/solr.in.sh
+solr_config_file: /etc/default/{{ solr_service_name }}.in.sh
+
+# Enable restart solr handler
+solr_restart_handler_enabled: true
 
 # Used only for Solr < 5.
 solr_log_file_path: /var/log/solr.log
diff --git a/provisioning/roles/geerlingguy.solr/handlers/main.yml b/provisioning/roles/geerlingguy.solr/handlers/main.yml
index 44404e0b3..e2f1c9e1c 100644
--- a/provisioning/roles/geerlingguy.solr/handlers/main.yml
+++ b/provisioning/roles/geerlingguy.solr/handlers/main.yml
@@ -4,3 +4,4 @@
     name: "{{ solr_service_name }}"
     state: restarted
     sleep: 5
+  when: solr_restart_handler_enabled

From f48da5b727b05d83c784b7a032ec9bd3234bcef1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Tue, 11 Apr 2017 22:03:24 -0500
Subject: [PATCH 0708/1273] Issue #1289: Add encryption as a possible cause for
 NFS issues on linux [ci skip]

---
 docs/getting-started/installation-linux.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/getting-started/installation-linux.md b/docs/getting-started/installation-linux.md
index ec9ff0a5f..63234c882 100644
--- a/docs/getting-started/installation-linux.md
+++ b/docs/getting-started/installation-linux.md
@@ -63,7 +63,9 @@ stdin: is not a tty
 mount.nfs: Connection timed out
 ```
 
-If you get this message, then it's likely that either NFS isn't running correctly on your host, certain ports are protocols are being blocked by the system firewall, or you need to add additional mount options to your `vagrant_synced_folders` configuration. Try the following fixes:
+If the directory you are trying to mount is within an encrypted folder or volume, NFS will very often fail with the above message as well as `exportfs: /home/myusername/Sites/drupalvm does not support NFS export`. There is no workaround other than sharing a directory that is not encrypted.
+
+If encryption is not the issue then it's likely that either NFS isn't running correctly on your host, certain ports are protocols are being blocked by the system firewall, or you need to add additional mount options to your `vagrant_synced_folders` configuration. Try the following fixes:
 
   1. On Ubuntu, if you get a message like `It appears your machine doesn't support NFS`, run `sudo apt-get install -y nfs-server`.
   2. Install the `vagrant-vbguest` plugin, which will make sure you are running the latest version of the VirualBox Guest Additions inside the VM (this can solve many different problems!).

From 4795148db5691939a491347f31803dcf42cf84b9 Mon Sep 17 00:00:00 2001
From: Benjamin Arntzen <Zorlin@users.noreply.github.com>
Date: Wed, 12 Apr 2017 11:43:50 +0800
Subject: [PATCH 0709/1273] Minor grammar fix

Changed "certain ports are protocols" to "certain ports or protocols" for clarity.
---
 docs/getting-started/installation-linux.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/getting-started/installation-linux.md b/docs/getting-started/installation-linux.md
index 63234c882..8de69ced1 100644
--- a/docs/getting-started/installation-linux.md
+++ b/docs/getting-started/installation-linux.md
@@ -65,7 +65,7 @@ mount.nfs: Connection timed out
 
 If the directory you are trying to mount is within an encrypted folder or volume, NFS will very often fail with the above message as well as `exportfs: /home/myusername/Sites/drupalvm does not support NFS export`. There is no workaround other than sharing a directory that is not encrypted.
 
-If encryption is not the issue then it's likely that either NFS isn't running correctly on your host, certain ports are protocols are being blocked by the system firewall, or you need to add additional mount options to your `vagrant_synced_folders` configuration. Try the following fixes:
+If encryption is not the issue then it's likely that either NFS isn't running correctly on your host, certain ports or protocols are being blocked by the system firewall, or you need to add additional mount options to your `vagrant_synced_folders` configuration. Try the following fixes:
 
   1. On Ubuntu, if you get a message like `It appears your machine doesn't support NFS`, run `sudo apt-get install -y nfs-server`.
   2. Install the `vagrant-vbguest` plugin, which will make sure you are running the latest version of the VirualBox Guest Additions inside the VM (this can solve many different problems!).

From 3d432b4fe2b5b724b138c6ae6f7fc021ac45d818 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 12 Apr 2017 17:18:35 -0500
Subject: [PATCH 0710/1273] Update Apache, Git, and MySQL roles.

---
 provisioning/requirements.yml                 |  6 +-
 .../roles/geerlingguy.apache/meta/main.yml    |  2 +-
 .../roles/geerlingguy.apache/tasks/main.yml   |  2 +-
 provisioning/roles/geerlingguy.git/.gitignore |  3 +-
 .../roles/geerlingguy.git/.travis.yml         | 54 ++++--------------
 provisioning/roles/geerlingguy.git/LICENSE    | 20 +++++++
 provisioning/roles/geerlingguy.git/README.md  |  2 +-
 .../roles/geerlingguy.git/meta/main.yml       |  2 +-
 .../tasks/install-from-source.yml             |  2 +-
 .../roles/geerlingguy.git/tests/README.md     | 11 ++++
 .../roles/geerlingguy.mysql/.gitignore        |  2 +
 .../roles/geerlingguy.mysql/.travis.yml       | 55 ++++++-------------
 provisioning/roles/geerlingguy.mysql/LICENSE  | 20 +++++++
 .../roles/geerlingguy.mysql/README.md         | 25 ++++++++-
 .../roles/geerlingguy.mysql/defaults/main.yml |  1 +
 .../roles/geerlingguy.mysql/meta/main.yml     |  2 +-
 .../tasks/secure-installation.yml             |  4 +-
 .../geerlingguy.mysql/templates/my.cnf.j2     |  3 +
 .../roles/geerlingguy.mysql/tests/README.md   | 11 ++++
 19 files changed, 133 insertions(+), 94 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.git/LICENSE
 create mode 100644 provisioning/roles/geerlingguy.git/tests/README.md
 create mode 100644 provisioning/roles/geerlingguy.mysql/.gitignore
 create mode 100644 provisioning/roles/geerlingguy.mysql/LICENSE
 create mode 100644 provisioning/roles/geerlingguy.mysql/tests/README.md

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index f3ba14b5e..702bf44aa 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -8,7 +8,7 @@
 - src: geerlingguy.adminer
   version: 1.1.1
 - src: geerlingguy.apache
-  version: 2.0.2
+  version: 2.1.0
 - src: geerlingguy.apache-php-fpm
   version: 1.0.2
 - src: geerlingguy.blackfire
@@ -28,7 +28,7 @@
 - src: geerlingguy.firewall
   version: 2.2.0
 - src: geerlingguy.git
-  version: 1.2.1
+  version: 1.3.0
 - src: geerlingguy.java
   version: 1.7.4
 - src: geerlingguy.mailhog
@@ -36,7 +36,7 @@
 - src: geerlingguy.memcached
   version: 1.0.7
 - src: geerlingguy.mysql
-  version: 2.5.0
+  version: 2.6.0
 - src: geerlingguy.nginx
   version: 2.0.0
 - src: geerlingguy.nodejs
diff --git a/provisioning/roles/geerlingguy.apache/meta/main.yml b/provisioning/roles/geerlingguy.apache/meta/main.yml
index 5893a1737..2936b4bf1 100644
--- a/provisioning/roles/geerlingguy.apache/meta/main.yml
+++ b/provisioning/roles/geerlingguy.apache/meta/main.yml
@@ -6,7 +6,7 @@ galaxy_info:
   description: Apache 2.x for Linux.
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 1.9
+  min_ansible_version: 2.2
   platforms:
     - name: EL
       versions:
diff --git a/provisioning/roles/geerlingguy.apache/tasks/main.yml b/provisioning/roles/geerlingguy.apache/tasks/main.yml
index fb47a38d1..0a6006408 100644
--- a/provisioning/roles/geerlingguy.apache/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.apache/tasks/main.yml
@@ -20,7 +20,7 @@
 - name: Get installed version of Apache.
   shell: "{{ apache_daemon_path }}{{ apache_daemon }} -v"
   changed_when: false
-  always_run: yes
+  check_mode: no
   register: _apache_version
 
 - name: Create apache_version variable.
diff --git a/provisioning/roles/geerlingguy.git/.gitignore b/provisioning/roles/geerlingguy.git/.gitignore
index b066709e0..c9b2377e3 100644
--- a/provisioning/roles/geerlingguy.git/.gitignore
+++ b/provisioning/roles/geerlingguy.git/.gitignore
@@ -1 +1,2 @@
-.LSOverride
+*.retry
+tests/test.sh
diff --git a/provisioning/roles/geerlingguy.git/.travis.yml b/provisioning/roles/geerlingguy.git/.travis.yml
index 68cc3cecd..bebd98101 100644
--- a/provisioning/roles/geerlingguy.git/.travis.yml
+++ b/provisioning/roles/geerlingguy.git/.travis.yml
@@ -4,83 +4,53 @@ services: docker
 env:
   # Test source install on latest supported OSes.
   - distro: centos7
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     playbook: test-source.yml
     GIT_VERSION: 2.9.3
   - distro: ubuntu1604
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     playbook: test-source.yml
     GIT_VERSION: 2.9.3
 
   # Test package install on all supported OSes.
   - distro: centos7
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     playbook: test.yml
     GIT_VERSION: 1.8.3.1
   - distro: centos6
-    init: /sbin/init
-    run_opts: "--privileged"
     playbook: test.yml
     GIT_VERSION: 1.7.1
   - distro: fedora24
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     playbook: test.yml
     GIT_VERSION: 2.7.4
   - distro: ubuntu1604
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     playbook: test.yml
     GIT_VERSION: 2.7.4
   - distro: ubuntu1404
-    init: /sbin/init
-    run_opts: "--privileged"
     playbook: test.yml
     GIT_VERSION: 1.9.1
   - distro: ubuntu1204
-    init: /sbin/init
-    run_opts: "--privileged"
     playbook: test.yml
     GIT_VERSION: 1.7.9.5
   - distro: debian8
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     playbook: test.yml
     GIT_VERSION: 2.1.4
 
-before_install:
-  # Pull container.
-  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
-
 script:
-  - container_id=$(mktemp)
-  # Run container in detached state.
-  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
-
-  # Ansible syntax check.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} --syntax-check'
+  # Configure test script so we can run extra tests after playbook is run.
+  - export container_id=$(date +%s)
+  - export cleanup=false
 
-  # Test role.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook}'
+  # Download test shim.
+  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
+  - chmod +x ${PWD}/tests/test.sh
 
-  # Test role idempotence.
-  - idempotence=$(mktemp)
-  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} | tee -a ${idempotence}
-  - >
-    tail ${idempotence}
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
+  # Run tests.
+  - ${PWD}/tests/test.sh
 
   # Ensure Git is installed and at the right version.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm which git'
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm test -x /usr/bin/git'
+  - 'docker exec --tty ${container_id} env TERM=xterm which git'
+  - 'docker exec --tty ${container_id} env TERM=xterm test -x /usr/bin/git'
 
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm git --version'
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm /usr/bin/git --version | grep -qF "$GIT_VERSION"'
+  - 'docker exec --tty ${container_id} env TERM=xterm git --version'
+  - 'docker exec --tty ${container_id} env TERM=xterm /usr/bin/git --version | grep -qF "$GIT_VERSION"'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.git/LICENSE b/provisioning/roles/geerlingguy.git/LICENSE
new file mode 100644
index 000000000..4275cf3c1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.git/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Jeff Geerling
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/provisioning/roles/geerlingguy.git/README.md b/provisioning/roles/geerlingguy.git/README.md
index 0e7174610..02733dd32 100644
--- a/provisioning/roles/geerlingguy.git/README.md
+++ b/provisioning/roles/geerlingguy.git/README.md
@@ -52,4 +52,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.git/meta/main.yml b/provisioning/roles/geerlingguy.git/meta/main.yml
index fcfd140fa..0c0174032 100644
--- a/provisioning/roles/geerlingguy.git/meta/main.yml
+++ b/provisioning/roles/geerlingguy.git/meta/main.yml
@@ -6,7 +6,7 @@ galaxy_info:
   description: Git version control software
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 2.0
+  min_ansible_version: 2.2
   platforms:
   - name: EL
     versions:
diff --git a/provisioning/roles/geerlingguy.git/tasks/install-from-source.yml b/provisioning/roles/geerlingguy.git/tasks/install-from-source.yml
index d634652e6..829e70c25 100644
--- a/provisioning/roles/geerlingguy.git/tasks/install-from-source.yml
+++ b/provisioning/roles/geerlingguy.git/tasks/install-from-source.yml
@@ -30,7 +30,7 @@
     warn=no
   changed_when: false
   failed_when: false
-  always_run: yes
+  check_mode: no
   register: git_installed_version
 
 - name: Force git install if the version numbers do not match
diff --git a/provisioning/roles/geerlingguy.git/tests/README.md b/provisioning/roles/geerlingguy.git/tests/README.md
new file mode 100644
index 000000000..6fb211721
--- /dev/null
+++ b/provisioning/roles/geerlingguy.git/tests/README.md
@@ -0,0 +1,11 @@
+# Ansible Role tests
+
+To run the test playbook(s) in this directory:
+
+  1. Install and start Docker.
+  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
+    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
+  1. Make the test shim executable: `chmod +x tests/test.sh`.
+  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
+
+If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.mysql/.gitignore b/provisioning/roles/geerlingguy.mysql/.gitignore
new file mode 100644
index 000000000..c9b2377e3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/.gitignore
@@ -0,0 +1,2 @@
+*.retry
+tests/test.sh
diff --git a/provisioning/roles/geerlingguy.mysql/.travis.yml b/provisioning/roles/geerlingguy.mysql/.travis.yml
index b8b941645..6e3528df3 100644
--- a/provisioning/roles/geerlingguy.mysql/.travis.yml
+++ b/provisioning/roles/geerlingguy.mysql/.travis.yml
@@ -3,73 +3,50 @@ services: docker
 
 env:
   - distro: centos7
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     playbook: centos-7-test.yml
   - distro: centos6
-    init: /sbin/init
-    run_opts: ""
     playbook: test.yml
   - distro: ubuntu1604
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     playbook: test.yml
   - distro: ubuntu1404
-    init: /sbin/init
-    run_opts: ""
     playbook: test.yml
 
-services:
-  - docker
-
-before_install:
-  # Pull container
-  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
-
 script:
-  - container_id=$(mktemp)
-  # Run container in detached state.
-  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
+  # Configure test script so we can run extra tests after playbook is run.
+  - export container_id=$(date +%s)
+  - export cleanup=false
 
-  # Ansible syntax check.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} --syntax-check'
+  # Download test shim.
+  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
+  - chmod +x ${PWD}/tests/test.sh
 
-  # Test role.
-  - 'docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook}'
-
-  # Test role idempotence.
-  - idempotence=$(mktemp)
-  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} | tee -a ${idempotence}
-  - >
-    tail ${idempotence}
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
+  # Run tests.
+  - ${PWD}/tests/test.sh
 
   # Some MySQL debugging (show all the logs).
-  - docker exec --tty "$(cat ${container_id})" env TERM=xterm ls -lah /var/log
-  - docker exec --tty "$(cat ${container_id})" env TERM=xterm cat /var/log/mysql/error.log || true
-  - docker exec --tty "$(cat ${container_id})" env TERM=xterm cat /var/log/mysql.err || true
+  - docker exec --tty ${container_id} env TERM=xterm ls -lah /var/log
+  - docker exec --tty ${container_id} env TERM=xterm cat /var/log/mysql/error.log || true
+  - docker exec --tty ${container_id} env TERM=xterm cat /var/log/mysql.err || true
 
   # Check to make sure we can connect to MySQL via Unix socket.
   - >
-    sudo docker exec "$(cat ${container_id})" mysql -u root -proot -e 'show databases;'
+    sudo docker exec ${container_id} mysql -u root -proot -e 'show databases;'
     | grep -q 'information_schema'
     && (echo 'MySQL running normally' && exit 0)
     || (echo 'MySQL not running' && exit 1)
 
   # Check to make sure we can connect to MySQL via TCP.
   - >
-    sudo docker exec "$(cat ${container_id})" mysql -u root -proot -h 127.0.0.1 -e 'show databases;'
+    sudo docker exec ${container_id} mysql -u root -proot -h 127.0.0.1 -e 'show databases;'
     | grep -q 'information_schema'
     && (echo 'MySQL running normally' && exit 0)
     || (echo 'MySQL not running' && exit 1)
 
 after_failure:
   # Check MySQL settings.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm cat /var/log/mysql/error.log'
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm cat /var/log/mysql.err'
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm cat /var/log/mysql.log'
+  - 'docker exec --tty ${container_id} env TERM=xterm cat /var/log/mysql/error.log'
+  - 'docker exec --tty ${container_id} env TERM=xterm cat /var/log/mysql.err'
+  - 'docker exec --tty ${container_id} env TERM=xterm cat /var/log/mysql.log'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.mysql/LICENSE b/provisioning/roles/geerlingguy.mysql/LICENSE
new file mode 100644
index 000000000..4275cf3c1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Jeff Geerling
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/provisioning/roles/geerlingguy.mysql/README.md b/provisioning/roles/geerlingguy.mysql/README.md
index 975f0d730..9dcef82eb 100644
--- a/provisioning/roles/geerlingguy.mysql/README.md
+++ b/provisioning/roles/geerlingguy.mysql/README.md
@@ -107,6 +107,29 @@ The rest of the settings in `defaults/main.yml` control MySQL's memory usage and
 
 Replication settings. Set `mysql_server_id` and `mysql_replication_role` by server (e.g. the master would be ID `1`, with the `mysql_replication_role` of `master`, and the slave would be ID `2`, with the `mysql_replication_role` of `slave`). The `mysql_replication_user` uses the same keys as `mysql_users`, and is created on master servers, and used to replicate on all the slaves.
 
+### Later versions of MySQL on CentOS 7
+
+If you want to install MySQL from the official repository instead of installing the system default MariaDB equivalents, you can add the following `pre_tasks` task in your playbook:
+
+```yaml
+  pre_tasks:
+    - name: Install the MySQL repo.
+      yum:
+        name: http://repo.mysql.com/mysql-community-release-el7-5.noarch.rpm
+        state: present
+      when: ansible_os_family == "RedHat"
+  
+    - name: Override variables for MySQL (RedHat).
+      set_fact:
+        mysql_daemon: mysqld
+        mysql_packages: ['mysql-server']
+        mysql_log_error: /var/log/mysqld.err
+        mysql_syslog_tag: mysqld
+        mysql_pid_file: /var/run/mysqld/mysqld.pid
+        mysql_socket: /var/lib/mysql/mysql.sock
+      when: ansible_os_family == "RedHat"
+```
+
 ### MariaDB usage
 
 This role works with either MySQL or a compatible version of MariaDB. On RHEL/CentOS 7+, the mariadb database engine was substituted as the default MySQL replacement package. No modifications are necessary though all of the variables still reference 'mysql' instead of mariadb.
@@ -152,4 +175,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.mysql/defaults/main.yml b/provisioning/roles/geerlingguy.mysql/defaults/main.yml
index 33c5405a6..ac7dc9838 100644
--- a/provisioning/roles/geerlingguy.mysql/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.mysql/defaults/main.yml
@@ -39,6 +39,7 @@ mysql_port: "3306"
 mysql_bind_address: '0.0.0.0'
 mysql_skip_name_resolve: no
 mysql_datadir: /var/lib/mysql
+mysql_sql_mode: ''
 # The following variables have a default value depending on operating system.
 # mysql_pid_file: /var/run/mysqld/mysqld.pid
 # mysql_socket: /var/lib/mysql/mysql.sock
diff --git a/provisioning/roles/geerlingguy.mysql/meta/main.yml b/provisioning/roles/geerlingguy.mysql/meta/main.yml
index 0432274a6..bc2d46b29 100644
--- a/provisioning/roles/geerlingguy.mysql/meta/main.yml
+++ b/provisioning/roles/geerlingguy.mysql/meta/main.yml
@@ -6,7 +6,7 @@ galaxy_info:
   description: MySQL server for RHEL/CentOS and Debian/Ubuntu.
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 1.9
+  min_ansible_version: 2.2
   platforms:
     - name: EL
       versions:
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/secure-installation.yml b/provisioning/roles/geerlingguy.mysql/tasks/secure-installation.yml
index 3e386c5e0..fc1e4eecf 100644
--- a/provisioning/roles/geerlingguy.mysql/tasks/secure-installation.yml
+++ b/provisioning/roles/geerlingguy.mysql/tasks/secure-installation.yml
@@ -32,7 +32,7 @@
   command: mysql -NBe "SELECT Host FROM mysql.user WHERE User = '{{ mysql_root_username }}' ORDER BY (Host='localhost') ASC"
   register: mysql_root_hosts
   changed_when: false
-  always_run: true
+  check_mode: no
   when: mysql_install_packages | bool or mysql_root_password_update
 
 # Note: We do not use mysql_user for this operation, as it doesn't always update
@@ -67,7 +67,7 @@
   command: mysql -NBe 'SELECT Host FROM mysql.user WHERE User = ""'
   register: mysql_anonymous_hosts
   changed_when: false
-  always_run: true
+  check_mode: no
 
 - name: Remove anonymous MySQL users.
   mysql_user:
diff --git a/provisioning/roles/geerlingguy.mysql/templates/my.cnf.j2 b/provisioning/roles/geerlingguy.mysql/templates/my.cnf.j2
index e3a3c0ca9..eb5381e3b 100644
--- a/provisioning/roles/geerlingguy.mysql/templates/my.cnf.j2
+++ b/provisioning/roles/geerlingguy.mysql/templates/my.cnf.j2
@@ -12,6 +12,9 @@ pid-file = {{ mysql_pid_file }}
 {% if mysql_skip_name_resolve %}
 skip-name-resolve
 {% endif %}
+{% if mysql_sql_mode %}
+sql_mode = {{ mysql_sql_mode }}
+{% endif %}
 
 # Logging configuration.
 {% if mysql_log_error == 'syslog' or mysql_log == 'syslog' %}
diff --git a/provisioning/roles/geerlingguy.mysql/tests/README.md b/provisioning/roles/geerlingguy.mysql/tests/README.md
new file mode 100644
index 000000000..6fb211721
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/tests/README.md
@@ -0,0 +1,11 @@
+# Ansible Role tests
+
+To run the test playbook(s) in this directory:
+
+  1. Install and start Docker.
+  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
+    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
+  1. Make the test shim executable: `chmod +x tests/test.sh`.
+  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
+
+If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`

From bdf6a3cd003e6f4652ce8e8839fa7cc1d6674a89 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 12 Apr 2017 17:30:08 -0500
Subject: [PATCH 0711/1273] Issue #1292: Update CHANGELOG in preparation for
 4.4.2 release.

---
 CHANGELOG.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e1db2e661..a372c8658 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,24 @@
 # Drupal VM Changelog
 
+## 4.4.2 (2017-04-12)
+
+### New/changed variables in default.config.yml
+
+  * N/A
+
+### Improvements
+
+  * Updated Ansible roles: `firewall`, `mailhog`, `apache`, `git`, `mysql`, `solr`, `adminer`, and `varnish`.
+  * #1289: Update Linux host docs to mention encryption as primary reason for NFS issues.
+
+### Bugfixes
+
+  * #1280: Documentation bugfix for a Quick Start Guide link.
+  * #1275: Update Adminer role to prevent download timeouts.
+  * #1281: Avoid TypeError when a configuration file is empty.
+  * #1291: Teensy tiny docs grammar fix.
+
+
 ## 4.4.1 (2017-04-01)
 
 ### New/changed variables in default.config.yml

From eed506ae82c14d30f535ca2cc0bbca6967954e43 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 13 Apr 2017 11:23:20 -0500
Subject: [PATCH 0712/1273] Fixes #1294: Fix 'Cannot load Zend OPcache' notice.

---
 provisioning/tasks/init-debian.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/provisioning/tasks/init-debian.yml b/provisioning/tasks/init-debian.yml
index 989875d0a..ab855fb45 100644
--- a/provisioning/tasks/init-debian.yml
+++ b/provisioning/tasks/init-debian.yml
@@ -38,6 +38,11 @@
   apt_repository: repo='ppa:ondrej/php5-compat'
   when: php_version == "5.6" and ansible_distribution == "Ubuntu"
 
+- name: Set the correct opcache filename (Ubuntu).
+  set_fact:
+    php_opcache_conf_filename: "10-opcache.ini"
+  when: ansible_distribution == "Ubuntu"
+
 # Debian-specific tasks.
 - name: Add dependencies for PHP versions (Debian).
   apt:

From 7c7ef8722bce8a2b17d4cb6669648d96d02f88fa Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 13 Apr 2017 22:12:52 -0500
Subject: [PATCH 0713/1273] Issue #1177: Mention the availability of the
 geerlingguy/debian8 base box.

---
 default.config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.config.yml b/default.config.yml
index b1b183df9..5dda3057a 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -1,6 +1,6 @@
 ---
 # `vagrant_box` can also be set to geerlingguy/centos6, geerlingguy/centos7,
-# geerlingguy/ubuntu1404, geerlingguy/ubuntu1204, parallels/ubuntu-14.04, etc.
+# geerlingguy/debian8, geerlingguy/ubuntu1404, geerlingguy/ubuntu1204, etc.
 vagrant_box: geerlingguy/ubuntu1604
 vagrant_user: vagrant
 vagrant_synced_folder_default_type: nfs

From a1ca780ea5485eb0089a03341d26697af640750d Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 13 Apr 2017 23:10:10 -0500
Subject: [PATCH 0714/1273] Fixes #1265: Document reverse-mount shares. Also
 scaffolds Issue #1258.

---
 docs/deployment/git.md    |  7 +++++++
 docs/other/performance.md | 23 +++++++++++++++++++++++
 mkdocs.yml                |  1 +
 3 files changed, 31 insertions(+)
 create mode 100644 docs/deployment/git.md

diff --git a/docs/deployment/git.md b/docs/deployment/git.md
new file mode 100644
index 000000000..1dcaeed45
--- /dev/null
+++ b/docs/deployment/git.md
@@ -0,0 +1,7 @@
+You can deploy a codebase directly inside Drupal VM via Git. You can deploy a Git-based Drupal site directly into a shared folder, or you can even deploy inside Drupal VM's own filesystem. The latter option offers better performance than any of the other deployment methods, since Drupal VM can use native filesystem caches and disk access.
+
+This is also the recommended method for deploying Drupal sites to Drupal VM when used [in production](../other/production.md)
+
+## Deploying Drupal via Git
+
+TODO: See https://github.com/geerlingguy/drupal-vm/issues/1258.
diff --git a/docs/other/performance.md b/docs/other/performance.md
index ca6afd58d..132c299b2 100644
--- a/docs/other/performance.md
+++ b/docs/other/performance.md
@@ -71,3 +71,26 @@ In a custom `Vagrantfile.local`, add user access to Vagrant:
 
     config.winnfsd.uid=900
     config.winnfsd.gid=900
+
+### Better performance: Sharing from Drupal VM to your PC
+
+The fastest option for Drupal VM is to install the Drupal codebase entirely inside Drupal VM, without using a Vagrant shared folder. This method ensures the code runs as fast as it would if it were natively running on your PC, but it requires some other form of codebase synchronization, and means there is at least a tiny bit of lag between saving files in your editor and seeing the changes inside Drupal VM.
+
+If you use one of these techniques, it's recommended you use the [Git deployment technique](../deployment/git.md) to clone your Drupal codebase into Drupal VM from a Git repository.
+
+#### Syncing files via rsync or SSH
+
+If you use an IDE like PhpStorm, you can configure it to synchronize a local codebase with the code inside Drupal VM using SSH (SFTP). There are also tools that mount directories into Windows Explorer using plain SSH and SFTP, though configuring these tools can be difficult.
+
+If at all possible, make sure your IDE is configured to automatically synchronize changes.
+
+#### Share files using Samba inside Drupal VM
+
+Though it's not supported natively by Vagrant, you can mount a Samba share _from the VM guest_ to your host PC. To do this, you have to:
+
+  1. Install Samba inside the VM.
+  2. Configure Samba (through `smb.conf`) to share a directory inside the VM.
+  3. Open firewall ports `137`, `138`, `139`, and `445`.
+  4. Mount the Samba shared folder within Windows Explorer (e.g. visit `\\drupalvm.dev\share_name`)
+
+Read this blog post for further detail in creating a Samba share: [Configure a reverse-mounted Samba shared folder](https://www.jeffgeerling.com/blog/2017/drupal-vm-on-windows-fast-container-blt-project-development#reverse-share).
diff --git a/mkdocs.yml b/mkdocs.yml
index b010c0539..701241eee 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -26,6 +26,7 @@ pages:
     - 'Using composer.json': 'deployment/composer.md'
     - 'Using a Drush Make file': 'deployment/drush-make.md'
     - 'Drupal VM as a Composer Dependency': 'deployment/composer-dependency.md'
+    - 'Deploying Drupal via Git': 'deployment/git.md'
   - Basic configurations:
     - 'Using different base OSes': 'configurations/base-os.md'
     - 'Using a different PHP version': 'configurations/php.md'

From 5932045da43f1f9d91e6b11ff11a52b4433c99ef Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 13 Apr 2017 23:11:58 -0500
Subject: [PATCH 0715/1273] Fixes #1272: Set ssh_home by default since it's
 really helpful.

---
 default.config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.config.yml b/default.config.yml
index 5dda3057a..15f319f6c 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -319,4 +319,4 @@ selenium_version: 2.53.0
 # Other configuration.
 dashboard_install_dir: /var/www/dashboard
 known_hosts_path: ~/.ssh/known_hosts
-#ssh_home: "{{ drupal_core_path }}"
+ssh_home: "{{ drupal_core_path }}"

From 280ba96819889b0a8c75e21af2200fbdeec9284f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Fri, 24 Mar 2017 16:47:23 -0500
Subject: [PATCH 0716/1273] Add docs on how to improve performance by mixing
 synced folder types [ci skip]

---
 docs/other/performance.md | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/docs/other/performance.md b/docs/other/performance.md
index 132c299b2..36a47054a 100644
--- a/docs/other/performance.md
+++ b/docs/other/performance.md
@@ -41,6 +41,30 @@ vagrant_synced_folders:
 
 _This example assumes that you have Drupal in a directory called `drupal/public`._
 
+### Mixing synced folder types
+
+You can also mix the synced folder types and use a fast one-way rsync for your primary codebase and then a slower but two-way sync for Drupal's configuration sync directory.
+
+```yaml
+vagrant_synced_folders:
+  - local_path: .
+    destination: /var/www/drupal
+    id: drupal
+    type: rsync
+    create: true
+    excluded_paths:
+      - drupal/private
+      - drupal/public/.git
+      - drupal/public/sites/default/files
+      - drupal/tmp
+      # Exclude the second synced folder (this option is rsync specific).
+      - drupal/config/drupal
+  # Use a slower but two-way sync for configuration sync directory.
+  - local_path: config/drupal
+    destination: /var/www/drupal/config/drupal
+    type: "" # Or smb/nfs if available
+    create: true
+```
 
 ## Improving performance on Windows
 

From e0fde5dc07702d76e8d9319faac1dada9d1006e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 25 Mar 2017 13:57:46 -0500
Subject: [PATCH 0717/1273] Fix excluded_paths examples for rsync since we
 switched to local_path: . [ci skip]

---
 docs/other/performance.md | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/docs/other/performance.md b/docs/other/performance.md
index 36a47054a..65d6fd020 100644
--- a/docs/other/performance.md
+++ b/docs/other/performance.md
@@ -33,14 +33,12 @@ vagrant_synced_folders:
     type: rsync
     create: true
     excluded_paths:
-      - drupal/private
-      - drupal/public/.git
-      - drupal/public/sites/default/files
-      - drupal/tmp
+      - private
+      - .git
+      - web/sites/default/files
+      - tmp
 ```
 
-_This example assumes that you have Drupal in a directory called `drupal/public`._
-
 ### Mixing synced folder types
 
 You can also mix the synced folder types and use a fast one-way rsync for your primary codebase and then a slower but two-way sync for Drupal's configuration sync directory.
@@ -49,16 +47,15 @@ You can also mix the synced folder types and use a fast one-way rsync for your p
 vagrant_synced_folders:
   - local_path: .
     destination: /var/www/drupal
-    id: drupal
     type: rsync
     create: true
     excluded_paths:
-      - drupal/private
-      - drupal/public/.git
-      - drupal/public/sites/default/files
-      - drupal/tmp
-      # Exclude the second synced folder (this option is rsync specific).
-      - drupal/config/drupal
+      - private
+      - .git
+      - web/sites/default/files
+      - tmp
+      # Exclude the second synced folder.
+      - config/drupal
   # Use a slower but two-way sync for configuration sync directory.
   - local_path: config/drupal
     destination: /var/www/drupal/config/drupal

From 02eafc7c19b8dd7c9182298384be111299475314 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Fri, 14 Apr 2017 13:22:36 -0500
Subject: [PATCH 0718/1273] Add docs link on how to work from inside the VM for
 performance gain [ci skip]

---
 docs/other/performance.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/other/performance.md b/docs/other/performance.md
index 65d6fd020..8b067256e 100644
--- a/docs/other/performance.md
+++ b/docs/other/performance.md
@@ -67,9 +67,10 @@ vagrant_synced_folders:
 
 By default, if you use the _NFS_ synced folder type, Vagrant will ignore this directive and use the native (usually slow) VirtualBox shared folder system instead. You can get higher performance by doing one of the following (all of these steps require a full VM reload (`vagrant reload`) to take effect):
 
+  1. **Use PhpStorm or a reverse-mounted synced folder for working from inside the VM.** Read [Drupal VM on Windows - a fast container for BLT project development](https://www.jeffgeerling.com/blog/2017/drupal-vm-on-windows-fast-container-blt-project-development) for instructions and recommendations.
   1. **Install the `vagrant-winnfsd` plugin**. See the 'NFS' section later for more details and caveats.
-  2. **Use `smb` for the synced folder's type.**
-  2. **Use `rsync` for the synced folder's type.** This requires that you have `rsync` available on your Windows workstation, which you can get if you install a substitute CLI like [Cygwin](https://www.cygwin.com/) or [Cmder](http://cmder.net/).
+  1. **Use `smb` for the synced folder's type.**
+  1. **Use `rsync` for the synced folder's type.** This requires that you have `rsync` available on your Windows workstation, which you can get if you install a substitute CLI like [Cygwin](https://www.cygwin.com/) or [Cmder](http://cmder.net/).
 
 ### NFS
 

From 4b50d17440fcaab4fa9318f8e512587ac7198d53 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 14 Apr 2017 15:22:56 -0500
Subject: [PATCH 0719/1273] Update MySQL and Solr roles to latest versions.

---
 provisioning/requirements.yml                        |  4 ++--
 provisioning/roles/geerlingguy.mysql/.travis.yml     |  2 ++
 provisioning/roles/geerlingguy.mysql/README.md       |  2 ++
 .../roles/geerlingguy.mysql/defaults/main.yml        |  4 ++++
 provisioning/roles/geerlingguy.mysql/meta/main.yml   |  3 +++
 .../roles/geerlingguy.mysql/tasks/configure.yml      | 10 ++++++++--
 provisioning/roles/geerlingguy.mysql/tasks/main.yml  |  8 +++++++-
 .../geerlingguy.mysql/tasks/setup-Archlinux.yml      | 12 ++++++++++++
 .../roles/geerlingguy.mysql/tasks/variables.yml      |  6 +++++-
 .../roles/geerlingguy.mysql/templates/my.cnf.j2      |  4 ++++
 .../roles/geerlingguy.mysql/templates/root-my.cnf.j2 |  4 ++--
 .../roles/geerlingguy.mysql/templates/user-my.cnf.j2 |  4 ++--
 .../roles/geerlingguy.mysql/vars/Archlinux.yml       | 12 ++++++++++++
 provisioning/roles/geerlingguy.solr/tasks/main.yml   |  8 ++++----
 14 files changed, 69 insertions(+), 14 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.mysql/tasks/setup-Archlinux.yml
 create mode 100644 provisioning/roles/geerlingguy.mysql/vars/Archlinux.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 702bf44aa..4f8728c6b 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -36,7 +36,7 @@
 - src: geerlingguy.memcached
   version: 1.0.7
 - src: geerlingguy.mysql
-  version: 2.6.0
+  version: 2.7.0
 - src: geerlingguy.nginx
   version: 2.0.0
 - src: geerlingguy.nodejs
@@ -74,6 +74,6 @@
 - src: geerlingguy.security
   version: 1.5.0
 - src: geerlingguy.solr
-  version: 3.5.4
+  version: 3.5.5
 - src: geerlingguy.varnish
   version: 1.8.5
diff --git a/provisioning/roles/geerlingguy.mysql/.travis.yml b/provisioning/roles/geerlingguy.mysql/.travis.yml
index 6e3528df3..04f1df2cb 100644
--- a/provisioning/roles/geerlingguy.mysql/.travis.yml
+++ b/provisioning/roles/geerlingguy.mysql/.travis.yml
@@ -6,6 +6,8 @@ env:
     playbook: centos-7-test.yml
   - distro: centos6
     playbook: test.yml
+  - distro: debian8
+    playbook: test.yml
   - distro: ubuntu1604
     playbook: test.yml
   - distro: ubuntu1404
diff --git a/provisioning/roles/geerlingguy.mysql/README.md b/provisioning/roles/geerlingguy.mysql/README.md
index 9dcef82eb..8a194898b 100644
--- a/provisioning/roles/geerlingguy.mysql/README.md
+++ b/provisioning/roles/geerlingguy.mysql/README.md
@@ -35,6 +35,8 @@ Whether to force update the MySQL root user's password. By default, this role wi
 
 > Note: If you get an error like `ERROR 1045 (28000): Access denied for user 'root'@'localhost' (using password: YES)` after a failed or interrupted playbook run, this usually means the root password wasn't originally updated to begin with. Try either removing  the `.my.cnf` file inside the configured `mysql_user_home` or updating it and setting `password=''` (the insecure default password). Run the playbook again, with `mysql_root_password_update` set to `yes`, and the setup should complete.
 
+> Note: If you get an error like `ERROR 1698 (28000): Access denied for user 'root'@'localhost' (using password: YES)` when trying to log in from the CLI you might need to run as root or sudoer.
+
     mysql_enabled_on_startup: yes
 
 Whether MySQL should be enabled on startup.
diff --git a/provisioning/roles/geerlingguy.mysql/defaults/main.yml b/provisioning/roles/geerlingguy.mysql/defaults/main.yml
index ac7dc9838..2b0a8dfae 100644
--- a/provisioning/roles/geerlingguy.mysql/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.mysql/defaults/main.yml
@@ -59,15 +59,19 @@ mysql_read_buffer_size: "1M"
 mysql_read_rnd_buffer_size: "4M"
 mysql_myisam_sort_buffer_size: "64M"
 mysql_thread_cache_size: "8"
+mysql_query_cache_type: "1"
 mysql_query_cache_size: "16M"
 mysql_query_cache_limit: "1M"
 mysql_max_connections: "151"
 mysql_tmp_table_size: "16M"
 mysql_max_heap_table_size: "16M"
+mysql_group_concat_max_len: "1024"
+mysql_join_buffer_size: "262144"
 
 # Other settings.
 mysql_lower_case_table_names: "0"
 mysql_wait_timeout: "28800"
+mysql_event_scheduler_state: "OFF"
 
 # InnoDB settings.
 mysql_innodb_file_per_table: "1"
diff --git a/provisioning/roles/geerlingguy.mysql/meta/main.yml b/provisioning/roles/geerlingguy.mysql/meta/main.yml
index bc2d46b29..d87d8d2f2 100644
--- a/provisioning/roles/geerlingguy.mysql/meta/main.yml
+++ b/provisioning/roles/geerlingguy.mysql/meta/main.yml
@@ -18,5 +18,8 @@ galaxy_info:
     - name: Debian
       versions:
       - all
+    - name: Archlinux
+      versions:
+      - all
   galaxy_tags:
     - database
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/configure.yml b/provisioning/roles/geerlingguy.mysql/tasks/configure.yml
index d8a458574..506c06c48 100644
--- a/provisioning/roles/geerlingguy.mysql/tasks/configure.yml
+++ b/provisioning/roles/geerlingguy.mysql/tasks/configure.yml
@@ -30,7 +30,10 @@
   notify: restart mysql
 
 - name: Create slow query log file (if configured).
-  shell: "touch {{ mysql_slow_query_log_file }} creates={{ mysql_slow_query_log_file }}"
+  command: "touch {{ mysql_slow_query_log_file }}"
+  args:
+    creates: "{{ mysql_slow_query_log_file }}"
+    warn: no
   when: mysql_slow_query_log_enabled
 
 - name: Create datadir if it does not exist
@@ -52,7 +55,10 @@
   when: mysql_slow_query_log_enabled
 
 - name: Create error log file (if configured).
-  shell: "touch {{ mysql_log_error }} creates={{ mysql_log_error }}"
+  command: "touch {{ mysql_log_error }}"
+  args:
+    creates: "{{ mysql_log_error }}"
+    warn: no
   when: mysql_log == "" and mysql_log_error != ""
 
 - name: Set ownership on error log file (if configured).
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/main.yml b/provisioning/roles/geerlingguy.mysql/tasks/main.yml
index f7d8ead1e..125e9318e 100644
--- a/provisioning/roles/geerlingguy.mysql/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.mysql/tasks/main.yml
@@ -11,9 +11,15 @@
   when: ansible_os_family == 'Debian'
   static: no
 
+- include: setup-Archlinux.yml
+  when: ansible_os_family == 'Archlinux'
+  static: no
+
 - name: Check if MySQL packages were installed.
   set_fact:
-    mysql_install_packages: "{{ (rh_mysql_install_packages is defined and rh_mysql_install_packages.changed) or (deb_mysql_install_packages is defined and deb_mysql_install_packages.changed) }}"
+    mysql_install_packages: "{{ (rh_mysql_install_packages is defined and rh_mysql_install_packages.changed)
+      or (deb_mysql_install_packages is defined and deb_mysql_install_packages.changed)
+      or (arch_mysql_install_packages is defined and arch_mysql_install_packages.changed) }}"
 
 # Configure MySQL.
 - include: configure.yml
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/setup-Archlinux.yml b/provisioning/roles/geerlingguy.mysql/tasks/setup-Archlinux.yml
new file mode 100644
index 000000000..e24377b9c
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/tasks/setup-Archlinux.yml
@@ -0,0 +1,12 @@
+---
+- name: Ensure MySQL Python libraries are installed.
+  pacman: "name=mysql-python state=present"
+
+- name: Ensure MySQL packages are installed.
+  pacman: "name={{ item }} state=present"
+  with_items: "{{ mysql_packages }}"
+  register: arch_mysql_install_packages
+
+# Init the database if mysql is newly installed
+- command: mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
+  when: arch_mysql_install_packages.changed
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/variables.yml b/provisioning/roles/geerlingguy.mysql/tasks/variables.yml
index f03ee8c62..00c5964e1 100644
--- a/provisioning/roles/geerlingguy.mysql/tasks/variables.yml
+++ b/provisioning/roles/geerlingguy.mysql/tasks/variables.yml
@@ -1,7 +1,11 @@
 ---
 # Variable configuration.
 - name: Include OS-specific variables.
-  include_vars: "{{ ansible_os_family }}.yml"
+  include_vars: "{{ item }}"
+  with_first_found:
+    - files:
+      - "vars/{{ ansible_os_family }}.yml"
+      skip: true
   when: ansible_os_family != "RedHat"
 
 - name: Include OS-specific variables (RedHat).
diff --git a/provisioning/roles/geerlingguy.mysql/templates/my.cnf.j2 b/provisioning/roles/geerlingguy.mysql/templates/my.cnf.j2
index eb5381e3b..2066dc5cb 100644
--- a/provisioning/roles/geerlingguy.mysql/templates/my.cnf.j2
+++ b/provisioning/roles/geerlingguy.mysql/templates/my.cnf.j2
@@ -79,15 +79,19 @@ read_buffer_size = {{ mysql_read_buffer_size }}
 read_rnd_buffer_size = {{ mysql_read_rnd_buffer_size }}
 myisam_sort_buffer_size = {{ mysql_myisam_sort_buffer_size }}
 thread_cache_size = {{ mysql_thread_cache_size }}
+query_cache_type = {{ mysql_query_cache_type }}
 query_cache_size = {{ mysql_query_cache_size }}
 query_cache_limit = {{ mysql_query_cache_limit }}
 max_connections = {{ mysql_max_connections }}
 tmp_table_size = {{ mysql_tmp_table_size }}
 max_heap_table_size = {{ mysql_max_heap_table_size }}
+group_concat_max_len = {{ mysql_group_concat_max_len }}
+join_buffer_size = {{ mysql_join_buffer_size }}
 
 # Other settings.
 wait_timeout = {{ mysql_wait_timeout }}
 lower_case_table_names = {{ mysql_lower_case_table_names }}
+event_scheduler = {{ mysql_event_scheduler_state }}
 
 # InnoDB settings.
 {% if mysql_supports_innodb_large_prefix %}
diff --git a/provisioning/roles/geerlingguy.mysql/templates/root-my.cnf.j2 b/provisioning/roles/geerlingguy.mysql/templates/root-my.cnf.j2
index 43de06aae..b0d27b8c8 100644
--- a/provisioning/roles/geerlingguy.mysql/templates/root-my.cnf.j2
+++ b/provisioning/roles/geerlingguy.mysql/templates/root-my.cnf.j2
@@ -1,3 +1,3 @@
 [client]
-user={{ mysql_root_username }}
-password={{ mysql_root_password }}
+user="{{ mysql_root_username }}"
+password="{{ mysql_root_password }}"
diff --git a/provisioning/roles/geerlingguy.mysql/templates/user-my.cnf.j2 b/provisioning/roles/geerlingguy.mysql/templates/user-my.cnf.j2
index d6d9259cf..f8a8f6526 100644
--- a/provisioning/roles/geerlingguy.mysql/templates/user-my.cnf.j2
+++ b/provisioning/roles/geerlingguy.mysql/templates/user-my.cnf.j2
@@ -1,3 +1,3 @@
 [client]
-user={{ mysql_user_name }}
-password={{ mysql_user_password }}
+user="{{ mysql_user_name }}"
+password="{{ mysql_user_password }}"
diff --git a/provisioning/roles/geerlingguy.mysql/vars/Archlinux.yml b/provisioning/roles/geerlingguy.mysql/vars/Archlinux.yml
new file mode 100644
index 000000000..2dd3c4750
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/vars/Archlinux.yml
@@ -0,0 +1,12 @@
+---
+__mysql_daemon: mariadb
+__mysql_packages:
+  - mariadb
+__mysql_slow_query_log_file: /var/log/mysql/mysql-slow.log
+__mysql_log_error: /var/log/mysql.err
+__mysql_syslog_tag: mysql
+__mysql_pid_file: /run/mysqld/mysqld.pid
+__mysql_config_file: /etc/mysql/my.cnf
+__mysql_config_include_dir: /etc/mysql/conf.d
+__mysql_socket: /run/mysqld/mysqld.sock
+__mysql_supports_innodb_large_prefix: true
diff --git a/provisioning/roles/geerlingguy.solr/tasks/main.yml b/provisioning/roles/geerlingguy.solr/tasks/main.yml
index 32ae55f12..6c109e139 100644
--- a/provisioning/roles/geerlingguy.solr/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.solr/tasks/main.yml
@@ -46,13 +46,13 @@
     state: started
     enabled: yes
 
-# Create cores, if any are configured.
-- include: cores.yml
-  when: "solr_cores and solr_version.split('.')[0] >= '5'"
-
 # Configure solr.
 - include: configure.yml
   when: "solr_version.split('.')[0] >= '5'"
 
+# Create cores, if any are configured.
+- include: cores.yml
+  when: "solr_cores and solr_version.split('.')[0] >= '5'"
+
 - include: trim-fat.yml
   static: no

From 2d828a5a58c48507a017f9f2033b30e2ca785ecf Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 18 Apr 2017 13:32:40 -0500
Subject: [PATCH 0720/1273] Update MySQL and Node.js roles to latest releases.

---
 provisioning/requirements.yml                 |  4 +-
 .../roles/geerlingguy.mysql/defaults/main.yml |  4 +-
 .../geerlingguy.mysql/tasks/replication.yml   |  7 ++-
 .../roles/geerlingguy.mysql/vars/Debian.yml   |  2 +-
 .../roles/geerlingguy.nodejs/.gitignore       |  2 +
 .../roles/geerlingguy.nodejs/.travis.yml      | 51 +++++--------------
 provisioning/roles/geerlingguy.nodejs/LICENSE | 20 ++++++++
 .../roles/geerlingguy.nodejs/README.md        | 17 ++++---
 .../geerlingguy.nodejs/defaults/main.yml      |  3 ++
 .../roles/geerlingguy.nodejs/tasks/main.yml   | 19 ++-----
 .../roles/geerlingguy.nodejs/tests/README.md  | 11 ++++
 11 files changed, 75 insertions(+), 65 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.nodejs/.gitignore
 create mode 100644 provisioning/roles/geerlingguy.nodejs/LICENSE
 create mode 100644 provisioning/roles/geerlingguy.nodejs/tests/README.md

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 4f8728c6b..76df2653a 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -36,11 +36,11 @@
 - src: geerlingguy.memcached
   version: 1.0.7
 - src: geerlingguy.mysql
-  version: 2.7.0
+  version: 2.7.2
 - src: geerlingguy.nginx
   version: 2.0.0
 - src: geerlingguy.nodejs
-  version: 4.0.0
+  version: 4.1.0
 - src: geerlingguy.php
   version: 3.4.4
 - src: geerlingguy.php-memcached
diff --git a/provisioning/roles/geerlingguy.mysql/defaults/main.yml b/provisioning/roles/geerlingguy.mysql/defaults/main.yml
index 2b0a8dfae..213253c38 100644
--- a/provisioning/roles/geerlingguy.mysql/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.mysql/defaults/main.yml
@@ -59,7 +59,7 @@ mysql_read_buffer_size: "1M"
 mysql_read_rnd_buffer_size: "4M"
 mysql_myisam_sort_buffer_size: "64M"
 mysql_thread_cache_size: "8"
-mysql_query_cache_type: "1"
+mysql_query_cache_type: "0"
 mysql_query_cache_size: "16M"
 mysql_query_cache_limit: "1M"
 mysql_max_connections: "151"
@@ -93,7 +93,7 @@ mysql_mysqldump_max_allowed_packet: "64M"
 # Logging settings.
 mysql_log: ""
 # The following variables have a default value depending on operating system.
-# mysql_log_error: /var/log/mysql.err
+# mysql_log_error: /var/log/mysql/mysql.err
 # mysql_syslog_tag: mysql
 
 mysql_config_include_files: []
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/replication.yml b/provisioning/roles/geerlingguy.mysql/tasks/replication.yml
index 2a163cc0e..94894b1f8 100644
--- a/provisioning/roles/geerlingguy.mysql/tasks/replication.yml
+++ b/provisioning/roles/geerlingguy.mysql/tasks/replication.yml
@@ -4,7 +4,7 @@
     name: "{{ mysql_replication_user.name }}"
     host: "{{ mysql_replication_user.host | default('%') }}"
     password: "{{ mysql_replication_user.password }}"
-    priv: "{{ mysql_replication_user.priv | default('*.*:REPLICATION SLAVE') }}"
+    priv: "{{ mysql_replication_user.priv | default('*.*:REPLICATION SLAVE,REPLICATION CLIENT') }}"
     state: present
   when: >
     (mysql_replication_role == 'master')
@@ -12,7 +12,10 @@
     and (mysql_replication_master != '')
 
 - name: Check slave replication status.
-  mysql_replication: mode=getslave
+  mysql_replication:
+    mode: getslave
+    login_user: "{{ mysql_replication_user.name }}"
+    login_password: "{{ mysql_replication_user.password }}"
   ignore_errors: true
   register: slave
   when: >
diff --git a/provisioning/roles/geerlingguy.mysql/vars/Debian.yml b/provisioning/roles/geerlingguy.mysql/vars/Debian.yml
index 2ddf1e743..fa7c48acf 100644
--- a/provisioning/roles/geerlingguy.mysql/vars/Debian.yml
+++ b/provisioning/roles/geerlingguy.mysql/vars/Debian.yml
@@ -4,7 +4,7 @@ __mysql_packages:
   - mysql-common
   - mysql-server
 __mysql_slow_query_log_file: /var/log/mysql/mysql-slow.log
-__mysql_log_error: /var/log/mysql.err
+__mysql_log_error: /var/log/mysql/mysql.err
 __mysql_syslog_tag: mysql
 __mysql_pid_file: /var/run/mysqld/mysqld.pid
 __mysql_config_file: /etc/mysql/my.cnf
diff --git a/provisioning/roles/geerlingguy.nodejs/.gitignore b/provisioning/roles/geerlingguy.nodejs/.gitignore
new file mode 100644
index 000000000..c9b2377e3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nodejs/.gitignore
@@ -0,0 +1,2 @@
+*.retry
+tests/test.sh
diff --git a/provisioning/roles/geerlingguy.nodejs/.travis.yml b/provisioning/roles/geerlingguy.nodejs/.travis.yml
index 07b5abaea..729908d52 100644
--- a/provisioning/roles/geerlingguy.nodejs/.travis.yml
+++ b/provisioning/roles/geerlingguy.nodejs/.travis.yml
@@ -3,56 +3,31 @@ services: docker
 
 env:
   - distro: centos7
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
   - distro: centos6
-    init: /sbin/init
-    run_opts: ""
   - distro: ubuntu1604
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
   - distro: ubuntu1404
-    init: /sbin/init
-    run_opts: ""
   - distro: ubuntu1204
-    init: /sbin/init
-    run_opts: ""
-
-before_install:
-  # Pull container.
-  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
-  - container_id=$(mktemp)
-  # Run container in detached state.
-  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
-
-  # Install dependencies.
-  - 'docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
-
-  # Ansible syntax check.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+  # Configure test script so we can run extra tests after playbook is run.
+  - export container_id=$(date +%s)
+  - export cleanup=false
 
-  # Test role.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+  # Download test shim.
+  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
+  - chmod +x ${PWD}/tests/test.sh
 
-  # Test role idempotence.
-  - idempotence=$(mktemp)
-  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
-  - >
-    tail ${idempotence}
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
+  # Run tests.
+  - ${PWD}/tests/test.sh
 
   # Ensure Node.js is installed.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm which node'
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm node -v'
+  - 'docker exec --tty ${container_id} env TERM=xterm which node'
+  - 'docker exec --tty ${container_id} env TERM=xterm node -v'
 
   # Ensure npm packages are installed globally.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm bash --login -c "npm list -g --depth=0 jslint"'
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm bash --login -c "npm list -g --depth=0 node-sass"'
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm bash --login -c "npm list -g --depth=0 yo"'
+  - 'docker exec --tty ${container_id} env TERM=xterm bash --login -c "npm list -g --depth=0 jslint"'
+  - 'docker exec --tty ${container_id} env TERM=xterm bash --login -c "npm list -g --depth=0 node-sass"'
+  - 'docker exec --tty ${container_id} env TERM=xterm bash --login -c "npm list -g --depth=0 yo"'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.nodejs/LICENSE b/provisioning/roles/geerlingguy.nodejs/LICENSE
new file mode 100644
index 000000000..4275cf3c1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nodejs/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Jeff Geerling
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/provisioning/roles/geerlingguy.nodejs/README.md b/provisioning/roles/geerlingguy.nodejs/README.md
index 12b89d7b3..ff14d4321 100644
--- a/provisioning/roles/geerlingguy.nodejs/README.md
+++ b/provisioning/roles/geerlingguy.nodejs/README.md
@@ -12,17 +12,17 @@ Requires the EPEL repository on RedHat/CentOS (you can install it by simply addi
 
 Available variables are listed below, along with default values (see `defaults/main.yml`):
 
-    nodejs_version: "0.12"
+    nodejs_version: "6.x"
 
-The Node.js version to install. "0.12" is the default and works on all supported OSes. Other versions such as "0.10", "4.x", "5.x", and "6.x" should work on the latest versions of Debian/Ubuntu and RHEL/CentOS.
+The Node.js version to install. "6.x" is the default and works on most supported OSes. Other versions such as "0.12", "4.x", "5.x", "6.x", etc. should work on the latest versions of Debian/Ubuntu and RHEL/CentOS.
 
     nodejs_install_npm_user: "{{ ansible_ssh_user }}"
 
-The user for whom the npm packages will be installed can be set here, this defaults to ansible_user
+The user for whom the npm packages will be installed can be set here, this defaults to `ansible_user`.
 
     npm_config_prefix: "~/.npm-global"
 
-The global installation directory. This should be writeable by the nodejs_install_npm_user.
+The global installation directory. This should be writeable by the `nodejs_install_npm_user`.
 
     npm_config_unsafe_perm: "false"
 
@@ -30,7 +30,7 @@ Set to true to suppress the UID/GID switching when running package scripts. If s
 
     nodejs_npm_global_packages: []
 
-Add a list of npm packages with a `name` and (optional) `version` to be installed globally. For example:
+A list of npm packages with a `name` and (optional) `version` to be installed globally. For example:
 
     nodejs_npm_global_packages:
       # Install a specific version of a package.
@@ -38,6 +38,11 @@ Add a list of npm packages with a `name` and (optional) `version` to be installe
         version: 0.9.3
       # Install the latest stable release of a package.
       - name: node-sass
+<!-- code block separator -->
+
+    nodejs_package_json_path: ""
+
+Set a path pointing to a particular `package.json` (e.g. `"/var/www/app/package.json"`). This will install all of the defined packages globally using Ansible's `npm` module.
 
 ## Dependencies
 
@@ -63,4 +68,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.nodejs/defaults/main.yml b/provisioning/roles/geerlingguy.nodejs/defaults/main.yml
index e792afef0..e318ba428 100644
--- a/provisioning/roles/geerlingguy.nodejs/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.nodejs/defaults/main.yml
@@ -19,3 +19,6 @@ nodejs_npm_global_packages: []
 #    version: 0.9.3
 #  # Install the latest stable release of a package.
 #  - name: node-sass
+
+# The path of a package.json file used to install packages globally.
+nodejs_package_json_path: ""
diff --git a/provisioning/roles/geerlingguy.nodejs/tasks/main.yml b/provisioning/roles/geerlingguy.nodejs/tasks/main.yml
index 70b650367..4e37ba77d 100644
--- a/provisioning/roles/geerlingguy.nodejs/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.nodejs/tasks/main.yml
@@ -7,7 +7,7 @@
 
 - name: Define nodejs_install_npm_user
   set_fact:
-    nodejs_install_npm_user: "{{ ansible_user }}"
+    nodejs_install_npm_user: "{{ ansible_user | default(lookup('env', 'USER')) }}"
   when: nodejs_install_npm_user is not defined
 
 - name: Create npm global directory
@@ -23,28 +23,19 @@
     dest: /etc/profile.d/npm.sh
     mode: 0644
 
-# TODO: Remove this task after Ansible 2.x npm module bug is fixed. See:
-# https://github.com/ansible/ansible-modules-extras/issues/1375
 - name: Ensure npm global packages are installed.
   npm:
     name: "{{ item.name }}"
     version: "{{ item.version | default('latest') }}"
     global: yes
-    state: present
+    state: latest
   environment:
     NPM_CONFIG_PREFIX: "{{ npm_config_prefix }}"
     NODE_PATH: "{{ npm_config_prefix }}/lib/node_modules"
     NPM_CONFIG_UNSAFE_PERM: "{{ npm_config_unsafe_perm }}"
   with_items: "{{ nodejs_npm_global_packages }}"
 
-- name: Ensure npm global packages are at the latest release.
+- name: Install packages defined in a given package.json.
   npm:
-    name: "{{ item.name }}"
-    version: "{{ item.version | default('latest') }}"
-    global: yes
-    state: latest
-  environment:
-    NPM_CONFIG_PREFIX: "{{ npm_config_prefix }}"
-    NODE_PATH: "{{ npm_config_prefix }}/lib/node_modules"
-    NPM_CONFIG_UNSAFE_PERM: "{{ npm_config_unsafe_perm }}"
-  with_items: "{{ nodejs_npm_global_packages }}"
+    path: "{{ nodejs_package_json_path }}"
+  when: nodejs_package_json_path is defined and nodejs_package_json_path
diff --git a/provisioning/roles/geerlingguy.nodejs/tests/README.md b/provisioning/roles/geerlingguy.nodejs/tests/README.md
new file mode 100644
index 000000000..6fb211721
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nodejs/tests/README.md
@@ -0,0 +1,11 @@
+# Ansible Role tests
+
+To run the test playbook(s) in this directory:
+
+  1. Install and start Docker.
+  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
+    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
+  1. Make the test shim executable: `chmod +x tests/test.sh`.
+  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
+
+If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`

From 31d5305681616021a85a656b59d21301e6312d73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 19 Apr 2017 00:13:38 -0500
Subject: [PATCH 0721/1273] Fix Ansible 2.3 not purging PHP packages because of
 jinja templating in when statement

---
 provisioning/tasks/init-debian.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/tasks/init-debian.yml b/provisioning/tasks/init-debian.yml
index ab855fb45..7a4481afe 100644
--- a/provisioning/tasks/init-debian.yml
+++ b/provisioning/tasks/init-debian.yml
@@ -76,7 +76,7 @@
     state: absent
     purge: yes
     force: yes
-  when: "'php{{ php_version }}' not in item"
+  when: "'php' + php_version not in item"
   with_flattened:
     - "{{ php_packages|regex_replace('php' + php_version, 'php5.6') }}"
     - "{{ php_packages|regex_replace('php' + php_version, 'php7.0') }}"

From 4037d87f687044b81c207a0c4937ff185cfa1fda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 20 Apr 2017 15:38:40 -0500
Subject: [PATCH 0722/1273] Issue #1302: Remove ansible_ssh_user variable to
 avoid upstream bugs

---
 provisioning/vars/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/vars/main.yml b/provisioning/vars/main.yml
index 6f2ea140e..691ad8d42 100644
--- a/provisioning/vars/main.yml
+++ b/provisioning/vars/main.yml
@@ -5,4 +5,4 @@ _devtool_docroots:
   - "{{ php_xhprof_html_dir }}"
   - "{{ dashboard_install_dir|default('') }}"
 
-drupalvm_user: "{{ ansible_ssh_user | default(ansible_env.SUDO_USER, true) | default(ansible_env.USER, true) | default(ansible_user_id) }}"
+drupalvm_user: "{{ ansible_env.SUDO_USER | default(ansible_env.USER, true) | default(ansible_user_id, true) }}"

From e631891b922afdca4f1d1c3f916ae14ee391e787 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 20 Apr 2017 16:44:35 -0500
Subject: [PATCH 0723/1273] Update Drupal role to 2.2.0.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.drupal/.gitignore       |  2 +
 .../roles/geerlingguy.drupal/.travis.yml      | 43 ++++---------------
 provisioning/roles/geerlingguy.drupal/LICENSE | 20 +++++++++
 .../geerlingguy.drupal/handlers/main.yml      | 12 ++++++
 .../roles/geerlingguy.drupal/tasks/deploy.yml |  2 +-
 .../geerlingguy.drupal/tasks/install-site.yml |  2 +-
 .../roles/geerlingguy.drupal/tasks/main.yml   |  7 ++-
 .../roles/geerlingguy.drupal/tasks/update.yml |  4 +-
 .../roles/geerlingguy.drupal/tests/README.md  | 11 +++++
 .../geerlingguy.drupal/tests/test-setup.yml   |  1 +
 11 files changed, 66 insertions(+), 40 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.drupal/.gitignore
 create mode 100644 provisioning/roles/geerlingguy.drupal/LICENSE
 create mode 100644 provisioning/roles/geerlingguy.drupal/handlers/main.yml
 create mode 100644 provisioning/roles/geerlingguy.drupal/tests/README.md

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 76df2653a..4d9d0d18c 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -18,7 +18,7 @@
 - src: geerlingguy.daemonize
   version: 1.1.1
 - src: geerlingguy.drupal
-  version: 2.1.1
+  version: 2.2.0
 - src: geerlingguy.drupal-console
   version: 1.0.7
 - src: geerlingguy.drush
diff --git a/provisioning/roles/geerlingguy.drupal/.gitignore b/provisioning/roles/geerlingguy.drupal/.gitignore
new file mode 100644
index 000000000..c9b2377e3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal/.gitignore
@@ -0,0 +1,2 @@
+*.retry
+tests/test.sh
diff --git a/provisioning/roles/geerlingguy.drupal/.travis.yml b/provisioning/roles/geerlingguy.drupal/.travis.yml
index 55f6d2ccc..a49f2bd52 100644
--- a/provisioning/roles/geerlingguy.drupal/.travis.yml
+++ b/provisioning/roles/geerlingguy.drupal/.travis.yml
@@ -5,55 +5,30 @@ env:
   # Composer-project-based Drupal 8 site setup.
   - distro: centos7
     playbook: test.yml
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
   - distro: debian8
     playbook: test.yml
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
   - distro: ubuntu1604
     playbook: test.yml
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
   - distro: ubuntu1404
     playbook: test.yml
-    init: /sbin/init
-    run_opts: ""
   # Git-based Drupal 8 site setup.
   - distro: centos7
     playbook: test-deploy.yml
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-
-before_install:
-  # Pull container.
-  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
-  - container_id=$(mktemp)
-  # Run container in detached state.
-  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
-
-  # Install dependencies.
-  - 'docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
-
-  # Ansible syntax check.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} --syntax-check'
+  # Configure test script so we can run extra tests after playbook is run.
+  - export container_id=$(date +%s)
+  - export cleanup=false
 
-  # Test role.
-  - 'docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook}'
+  # Download test shim.
+  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
+  - chmod +x ${PWD}/tests/test.sh
 
-  # Test role idempotence.
-  - idempotence=$(mktemp)
-  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} | tee -a ${idempotence}
-  - >
-    tail ${idempotence}
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
+  # Run tests.
+  - ${PWD}/tests/test.sh
 
   # Make sure Drupal is running.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm curl http://drupaltest.dev/ | grep "Welcome to Drupal"'
+  - 'docker exec --tty ${container_id} env TERM=xterm curl http://drupaltest.dev/ | grep "Welcome to Drupal"'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.drupal/LICENSE b/provisioning/roles/geerlingguy.drupal/LICENSE
new file mode 100644
index 000000000..4275cf3c1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Jeff Geerling
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/provisioning/roles/geerlingguy.drupal/handlers/main.yml b/provisioning/roles/geerlingguy.drupal/handlers/main.yml
new file mode 100644
index 000000000..a27a5f878
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal/handlers/main.yml
@@ -0,0 +1,12 @@
+---
+- name: clear opcache
+  command: >
+    {{ drush_path }} eval
+      "if (function_exists('apc_clear_cache')) {
+        apc_clear_cache();
+      }
+      if (function_exists('opcache_reset')) {
+        opcache_reset();
+      }"
+  args:
+    chdir: "{{ drupal_core_path }}"
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/deploy.yml b/provisioning/roles/geerlingguy.drupal/tasks/deploy.yml
index c29ec3503..4d29b73f9 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/deploy.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/deploy.yml
@@ -17,7 +17,7 @@
     dest: "{{ drupal_deploy_dir }}"
     accept_hostkey: "{{ drupal_deploy_accept_hostkey }}"
   register: drupal_deploy_repo_updated
-  notify: restart webserver
+  notify: clear opcache
   become: no
 
 - name: Check if a composer.json file is present.
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/install-site.yml b/provisioning/roles/geerlingguy.drupal/tasks/install-site.yml
index 02592553e..f695f8d17 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/install-site.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/install-site.yml
@@ -29,7 +29,7 @@
     {{ drupal_site_install_extra_args | default([]) | join(" ") }}
   args:
     chdir: "{{ drupal_core_path }}"
-  notify: restart webserver
+  notify: clear opcache
   when: "'Successful' not in drupal_site_installed.stdout"
   become: no
 
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/main.yml b/provisioning/roles/geerlingguy.drupal/tasks/main.yml
index 0e5728140..02697fdc8 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/main.yml
@@ -8,7 +8,12 @@
   register: drupal_site
   ignore_errors: true
 
-- name: Define drupal_site_exists
+- name: Define drush_path if it's not already defined.
+  set_fact:
+    drush_path: drush
+  when: drush_path is not defined
+
+- name: Define drupal_site_exists.
   set_fact:
     drupal_site_exists: "{{ drupal_site.stat.exists|default(false) }}"
 
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/update.yml b/provisioning/roles/geerlingguy.drupal/tasks/update.yml
index b36ea0c6c..6ebaa9638 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/update.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/update.yml
@@ -1,6 +1,6 @@
 ---
 - name: Run database updates.
-  command: drush updatedb -y
+  command: {{ drush_path }} updatedb -y
   args:
     chdir: "{{ drupal_core_path }}"
 
@@ -8,6 +8,6 @@
 # TODO: Other commands if configured?
 
 - name: Rebuild Drupal caches.
-  command: drush cache-rebuild --quiet
+  command: {{ drush_path }} cache-rebuild --quiet
   args:
     chdir: "{{ drupal_core_path }}"
diff --git a/provisioning/roles/geerlingguy.drupal/tests/README.md b/provisioning/roles/geerlingguy.drupal/tests/README.md
new file mode 100644
index 000000000..6fb211721
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal/tests/README.md
@@ -0,0 +1,11 @@
+# Ansible Role tests
+
+To run the test playbook(s) in this directory:
+
+  1. Install and start Docker.
+  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
+    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
+  1. Make the test shim executable: `chmod +x tests/test.sh`.
+  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
+
+If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.drupal/tests/test-setup.yml b/provisioning/roles/geerlingguy.drupal/tests/test-setup.yml
index b555958ff..a6bd7b4d4 100644
--- a/provisioning/roles/geerlingguy.drupal/tests/test-setup.yml
+++ b/provisioning/roles/geerlingguy.drupal/tests/test-setup.yml
@@ -8,6 +8,7 @@
   with_items:
     - curl
     - unzip
+    - sendmail
 
 - name: Add repository for Apache 2.4.9+ (Ubuntu 14).
   apt_repository: repo='ppa:ondrej/apache2'

From 397c696f31c68831a90f0362ddfd32f286f87fd1 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 20 Apr 2017 16:52:34 -0500
Subject: [PATCH 0724/1273] Update Varnish role to latest 1.9.0 version.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.varnish/README.md       | 16 ++++++++++++
 .../geerlingguy.varnish/defaults/main.yml     | 16 ++++++++++++
 .../templates/default.vcl.j2                  | 25 +++++++++++++++++++
 4 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 4d9d0d18c..3e93232c5 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -76,4 +76,4 @@
 - src: geerlingguy.solr
   version: 3.5.5
 - src: geerlingguy.varnish
-  version: 1.8.5
+  version: 1.9.0
diff --git a/provisioning/roles/geerlingguy.varnish/README.md b/provisioning/roles/geerlingguy.varnish/README.md
index 8b41ef674..784d0802b 100644
--- a/provisioning/roles/geerlingguy.varnish/README.md
+++ b/provisioning/roles/geerlingguy.varnish/README.md
@@ -67,6 +67,22 @@ Varnish PID file path. Set to an empty string if you don't want to use a PID fil
 
 Services that will be started at boot and should be running after this role is complete. You might need to add additional services if required, e.g. `varnishncsa` and `varnishlog`. If set to an empty array, no services will be enabled at startup.
 
+    varnish_backends:
+      apache:
+        host: 10.0.2.2
+        port: 80
+      nodejs:
+        host: 10.0.2.3
+        port: 80
+    
+    varnish_vhosts:
+      example.com:
+        backend: apache
+      nodejs.example.com:
+        backend: nodejs
+
+You can configure multiple backends (and direct traffic from multiple virtual hosts to different backends) using the `varnish_backends` and `varnish_vhosts` variables. If you only use one backend (defined via `varnish_default_backend_host` and `varnish_default_backend_port`), then you do not need to define these variables. Do not add a `www` to the `vhosts` keys; it is added automatically by the `default.vcl.j2` VCL template.
+
 ## Dependencies
 
 None.
diff --git a/provisioning/roles/geerlingguy.varnish/defaults/main.yml b/provisioning/roles/geerlingguy.varnish/defaults/main.yml
index 91e14e7fa..ea3609efb 100644
--- a/provisioning/roles/geerlingguy.varnish/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.varnish/defaults/main.yml
@@ -21,3 +21,19 @@ varnish_pidfile: /run/varnishd.pid
 
 varnish_enabled_services:
   - varnish
+
+# Optionally define additional backends.
+# varnish_backends:
+#   apache:
+#     host: 10.0.2.2
+#     port: 80
+#   nodejs:
+#     host: 10.0.2.3
+#     port: 80
+
+# Optionally define vhosts pointed at different backends.
+# varnish_vhosts:
+#   example.com:
+#     backend: apache
+#   nodejs.example.com:
+#     backend: nodejs
diff --git a/provisioning/roles/geerlingguy.varnish/templates/default.vcl.j2 b/provisioning/roles/geerlingguy.varnish/templates/default.vcl.j2
index 36a337620..b1173972c 100644
--- a/provisioning/roles/geerlingguy.varnish/templates/default.vcl.j2
+++ b/provisioning/roles/geerlingguy.varnish/templates/default.vcl.j2
@@ -9,3 +9,28 @@ backend default {
   .host = "{{ varnish_default_backend_host }}";
   .port = "{{ varnish_default_backend_port }}";
 }
+
+{% if varnish_backends is defined %}
+# Other backend servers.
+{% for backend, value in varnish_backends.iteritems() %}
+backend {{ backend }} {
+  .host = "{{ value.host }}";
+  .port = "{{ value.port }}";
+}
+{% endfor %}
+{% endif %}
+
+sub vcl_recv {
+{% if varnish_vhosts is defined %}
+  # Varnish vhosts.
+{% for vhost, value in varnish_vhosts.iteritems() if varnish_vhosts is defined %}
+  {% if loop.first %}
+  if (req.http.host == "{{ vhost }}" || req.http.host == "www.{{ vhost }}") {
+  {% else %}
+  elseif (req.http.host == "{{ vhost }}" || req.http.host == "www.{{ vhost }}") {
+  {% endif %}
+    set req.backend_hint = {{ value.backend }};
+  }
+{% endfor %}
+{% endif %}
+}

From a5a9238080a09ab333cb9fc8aff23656738d72d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 20 Apr 2017 18:24:43 -0500
Subject: [PATCH 0725/1273] Issue #1314: Revert "Move simple include_vars
 statement to vars_files"

This reverts commit 4420d52cbd8675df6b5c9b3520c68778b01bdf30.
---
 provisioning/playbook.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index fb51e0e53..1b2f5b9fa 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -5,9 +5,11 @@
   vars_files:
     - vars/main.yml
     - ../default.config.yml
-    - "vars/{{ ansible_os_family }}.yml"
 
   pre_tasks:
+    - name: Include OS-specific variables.
+      include_vars: "{{ ansible_os_family }}.yml"
+
     - name: Define config_dir.
       set_fact:
         config_dir: "{{ playbook_dir }}/.."

From 14b0c721ecd0f9af49c23b6ea0ab7f3f3e1828e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 20 Apr 2017 18:38:03 -0500
Subject: [PATCH 0726/1273] Issue #1313: Redefine geerlingguy.drupal handler
 due to ansible bug

---
 provisioning/playbook.yml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index fb51e0e53..60341e772 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -150,3 +150,18 @@
         loop_var: outer_item
       with_fileglob:
         - "{{ post_provision_tasks_dir|default(omit) }}"
+
+  # Re-define geerlingguy.drupal `clear opcache` handler because of Ansible
+  # bug https://github.com/ansible/ansible/issues/18411
+  handlers:
+    - name: clear opcache
+      command: >
+        {{ drush_path }} eval
+          "if (function_exists('apc_clear_cache')) {
+            apc_clear_cache();
+          }
+          if (function_exists('opcache_reset')) {
+            opcache_reset();
+          }"
+      args:
+        chdir: "{{ drupal_core_path }}"

From eb7b2fbd3b828491e1457819e6f5748626bf8eb5 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 20 Apr 2017 21:21:10 -0500
Subject: [PATCH 0727/1273] Fixes #1317: Remove duplicate handler and extract
 www tasks into new role.

---
 provisioning/playbook.yml                     | 25 +----
 provisioning/roles/drupalvm.www/README.md     | 31 ++++++
 .../roles/drupalvm.www/defaults/main.yml      |  3 +
 provisioning/roles/drupalvm.www/meta/main.yml | 31 ++++++
 .../roles/drupalvm.www/tasks/main.yml         | 99 +++++++++++++++++++
 5 files changed, 166 insertions(+), 23 deletions(-)
 create mode 100644 provisioning/roles/drupalvm.www/README.md
 create mode 100644 provisioning/roles/drupalvm.www/defaults/main.yml
 create mode 100644 provisioning/roles/drupalvm.www/meta/main.yml
 create mode 100644 provisioning/roles/drupalvm.www/tasks/main.yml

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index de4180fc9..b4e2e21d5 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -113,6 +113,8 @@
     - { role: geerlingguy.solr, when: '"solr" in installed_extras' }
     - { role: geerlingguy.elasticsearch, when: '"elasticsearch" in installed_extras' }
     - { role: geerlingguy.varnish, when: '"varnish" in installed_extras' }
+    - { role: drupalvm.www, tags: ['webserver'] }
+    - { role: geerlingguy.drupal, tags: ['drupal'] }
 
     # Roles for security and stability on production.
     - { role: geerlingguy.security, when: extra_security_enabled }
@@ -121,18 +123,10 @@
     - include: tasks/sshd.yml
     - include: tasks/extras.yml
 
-    - include: tasks/www.yml
-      tags: ['webserver']
-
     - include: tasks/apparmor.yml
       when: ansible_os_family == 'Debian' and drupal_db_backend == 'mysql'
       tags: ['database']
 
-    # Build and configure the Drupal site.
-    - include_role: name=geerlingguy.drupal
-      static: no
-      tags: ['drupal']
-
     - include: tasks/drush-aliases.yml
 
     - include: tasks/cron.yml
@@ -152,18 +146,3 @@
         loop_var: outer_item
       with_fileglob:
         - "{{ post_provision_tasks_dir|default(omit) }}"
-
-  # Re-define geerlingguy.drupal `clear opcache` handler because of Ansible
-  # bug https://github.com/ansible/ansible/issues/18411
-  handlers:
-    - name: clear opcache
-      command: >
-        {{ drush_path }} eval
-          "if (function_exists('apc_clear_cache')) {
-            apc_clear_cache();
-          }
-          if (function_exists('opcache_reset')) {
-            opcache_reset();
-          }"
-      args:
-        chdir: "{{ drupal_core_path }}"
diff --git a/provisioning/roles/drupalvm.www/README.md b/provisioning/roles/drupalvm.www/README.md
new file mode 100644
index 000000000..ef1effa04
--- /dev/null
+++ b/provisioning/roles/drupalvm.www/README.md
@@ -0,0 +1,31 @@
+# Drupal VM www Role
+
+This role is a shim to configure miscellaneous settings prior to installing a Drupal site inside Drupal VM.
+
+## Requirements
+
+This role is meant to be run in Drupal VM. Use outside of Drupal VM will likely result in weird things happening.
+
+## Role Variables
+
+There are a few defaults defined, but you shouldn't really need to worry about this role's variables. It's a really simple role.
+
+## Dependencies
+
+  - geerlingguy.nginx
+
+## Example Playbook
+
+Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
+
+    - hosts: drupalvm
+      roles:
+         - drupalvm.www
+
+## License
+
+MIT / BSD
+
+## Author Information
+
+This role was created in 2017 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/drupalvm.www/defaults/main.yml b/provisioning/roles/drupalvm.www/defaults/main.yml
new file mode 100644
index 000000000..a77ca68b0
--- /dev/null
+++ b/provisioning/roles/drupalvm.www/defaults/main.yml
@@ -0,0 +1,3 @@
+---
+drupalvm_webserver: apache
+vagrant_user: vagrant
diff --git a/provisioning/roles/drupalvm.www/meta/main.yml b/provisioning/roles/drupalvm.www/meta/main.yml
new file mode 100644
index 000000000..bbfccc488
--- /dev/null
+++ b/provisioning/roles/drupalvm.www/meta/main.yml
@@ -0,0 +1,31 @@
+galaxy_info:
+  author: Jeff Geerling
+  description: A role to configure various odds and ends in Drupal VM prior to installing Drupal.
+  company: Midwestern Mac, LLC
+  issue_tracker_url: https://github.com/geerlingguy/drupal-vm/issues
+  license: MIT
+  min_ansible_version: 2.2
+
+  platforms:
+    - name: EL
+      versions:
+        - all
+    - name: Debian
+      versions:
+        - all
+    - name: Ubuntu
+      versions:
+        - precise
+        - raring
+        - saucy
+        - trusty
+        - xenial
+
+  galaxy_tags:
+    - nginx
+    - drupal
+    - vm
+    - vagrant
+
+dependencies:
+  - geerlingguy.nginx
diff --git a/provisioning/roles/drupalvm.www/tasks/main.yml b/provisioning/roles/drupalvm.www/tasks/main.yml
new file mode 100644
index 000000000..901fa4666
--- /dev/null
+++ b/provisioning/roles/drupalvm.www/tasks/main.yml
@@ -0,0 +1,99 @@
+---
+- name: Define drupalvm_webserver_user (Debian).
+  set_fact:
+    drupalvm_webserver_user: www-data
+  when: ansible_os_family == 'Debian' and drupalvm_webserver_user is undefined
+
+- name: Define drupalvm_webserver_user (RedHat).
+  set_fact:
+    drupalvm_webserver_user: "{{ (drupalvm_webserver == 'apache') | ternary('httpd', 'nginx') }}"
+  when: ansible_os_family == 'RedHat' and drupalvm_webserver_user is undefined
+
+- name: Register information about the /vagrant directory.
+  stat:
+    path: /vagrant
+  register: vagrant_directory
+
+# When using NFS the group id of a folder will be identical to that of the host
+# machine, but the groupname will differ or not exist. For the latter case
+# we create a group called `vagrant_group`.
+#
+# In Ansible 2.3+ the gr_name will be set if the GID is mapped to an existing
+# group. If the GID doesn't exist, gr_name will be undefined.
+- name: Ensure a group with the same GID as used to sync directories exist (Ansible 2.3+).
+  group:
+    gid: "{{ vagrant_directory.stat.gid }}"
+    name: vagrant_group
+    state: present
+  when: >
+    ansible_version.full | version_compare('2.3', '>=') and
+    vagrant_directory.stat.exists and
+    vagrant_directory.stat.gr_name is undefined
+
+- name: Ensure the webserver user is in the same group as the owner of synced directories (Ansible 2.3+).
+  user:
+    name: "{{ drupalvm_webserver_user }}"
+    append: yes
+    groups: "{{ vagrant_directory.stat.gr_name|default('vagrant_group') }}"
+  when: >
+    ansible_version.full | version_compare('2.3', '>=') and
+    vagrant_directory.stat.exists and
+    not (vagrant_directory.stat.gr_name is defined and vagrant_directory.stat.gr_name == 'root')
+
+# With Ansible 2.2 or lower, the existance of gr_name is dependant on the
+# existance of UID as well, therefore we cannot rely on it.
+# TODO: Remove the version compares and the 2.2 tasks once we require Ansible
+# 2.3+
+- name: Detect if group used to sync directories already exist (Ansible 2.2).
+  shell: "getent group {{ vagrant_directory.stat.gid }} | cut -d':' -f1"
+  register: vagrant_directory_groupname
+  changed_when: false
+  when: >
+    ansible_version.full | version_compare('2.3', '<') and
+    vagrant_directory.stat.exists
+
+- name: Ensure a group with the same GID as used to sync directories exist (Ansible 2.2).
+  group:
+    gid: "{{ vagrant_directory.stat.gid }}"
+    name: vagrant_group
+    state: present
+  when: >
+    ansible_version.full | version_compare('2.3', '<') and
+    vagrant_directory.stat.exists and
+    vagrant_directory_groupname.stdout == ''
+
+- name: Ensure the webserver user is in the same group as the owner of synced directories (Ansible 2.2).
+  user:
+    name: "{{ drupalvm_webserver_user }}"
+    append: yes
+    groups: "{{ vagrant_directory_groupname.stdout|default('vagrant_group') }}"
+  when: >
+    ansible_version.full | version_compare('2.3', '<') and
+    vagrant_directory.stat.exists and
+    vagrant_directory_groupname.stdout != 'root'
+
+- name: Ensure admin group exist.
+  group: "name=admin state=present"
+
+- name: Ensure vagrant user is in admin group.
+  user: "name={{ vagrant_user }} append=yes groups=admin"
+
+- name: Set nicer permissions on Apache log directory.
+  file:
+    path: "/var/log/{{ apache_daemon }}"
+    state: directory
+    mode: 0755
+    recurse: true
+  when: drupalvm_webserver == 'apache'
+
+- name: Copy Nginx vhosts into place.
+  template:
+    src: ../templates/nginx-vhost.conf.j2
+    dest: "{{ nginx_vhost_path }}/{{ item.server_name.split(' ')[0] }}.conf"
+    force: yes
+    owner: root
+    group: root
+    mode: 0644
+  with_items: "{{ nginx_hosts }}"
+  notify: restart nginx
+  when: drupalvm_webserver == 'nginx'

From a651338b580a64899ae34edd3d657166f269be78 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 20 Apr 2017 22:24:53 -0500
Subject: [PATCH 0728/1273] Issue #1317: Clean up now-unused www.yml task file.

---
 provisioning/tasks/www.yml | 99 --------------------------------------
 1 file changed, 99 deletions(-)
 delete mode 100644 provisioning/tasks/www.yml

diff --git a/provisioning/tasks/www.yml b/provisioning/tasks/www.yml
deleted file mode 100644
index 901fa4666..000000000
--- a/provisioning/tasks/www.yml
+++ /dev/null
@@ -1,99 +0,0 @@
----
-- name: Define drupalvm_webserver_user (Debian).
-  set_fact:
-    drupalvm_webserver_user: www-data
-  when: ansible_os_family == 'Debian' and drupalvm_webserver_user is undefined
-
-- name: Define drupalvm_webserver_user (RedHat).
-  set_fact:
-    drupalvm_webserver_user: "{{ (drupalvm_webserver == 'apache') | ternary('httpd', 'nginx') }}"
-  when: ansible_os_family == 'RedHat' and drupalvm_webserver_user is undefined
-
-- name: Register information about the /vagrant directory.
-  stat:
-    path: /vagrant
-  register: vagrant_directory
-
-# When using NFS the group id of a folder will be identical to that of the host
-# machine, but the groupname will differ or not exist. For the latter case
-# we create a group called `vagrant_group`.
-#
-# In Ansible 2.3+ the gr_name will be set if the GID is mapped to an existing
-# group. If the GID doesn't exist, gr_name will be undefined.
-- name: Ensure a group with the same GID as used to sync directories exist (Ansible 2.3+).
-  group:
-    gid: "{{ vagrant_directory.stat.gid }}"
-    name: vagrant_group
-    state: present
-  when: >
-    ansible_version.full | version_compare('2.3', '>=') and
-    vagrant_directory.stat.exists and
-    vagrant_directory.stat.gr_name is undefined
-
-- name: Ensure the webserver user is in the same group as the owner of synced directories (Ansible 2.3+).
-  user:
-    name: "{{ drupalvm_webserver_user }}"
-    append: yes
-    groups: "{{ vagrant_directory.stat.gr_name|default('vagrant_group') }}"
-  when: >
-    ansible_version.full | version_compare('2.3', '>=') and
-    vagrant_directory.stat.exists and
-    not (vagrant_directory.stat.gr_name is defined and vagrant_directory.stat.gr_name == 'root')
-
-# With Ansible 2.2 or lower, the existance of gr_name is dependant on the
-# existance of UID as well, therefore we cannot rely on it.
-# TODO: Remove the version compares and the 2.2 tasks once we require Ansible
-# 2.3+
-- name: Detect if group used to sync directories already exist (Ansible 2.2).
-  shell: "getent group {{ vagrant_directory.stat.gid }} | cut -d':' -f1"
-  register: vagrant_directory_groupname
-  changed_when: false
-  when: >
-    ansible_version.full | version_compare('2.3', '<') and
-    vagrant_directory.stat.exists
-
-- name: Ensure a group with the same GID as used to sync directories exist (Ansible 2.2).
-  group:
-    gid: "{{ vagrant_directory.stat.gid }}"
-    name: vagrant_group
-    state: present
-  when: >
-    ansible_version.full | version_compare('2.3', '<') and
-    vagrant_directory.stat.exists and
-    vagrant_directory_groupname.stdout == ''
-
-- name: Ensure the webserver user is in the same group as the owner of synced directories (Ansible 2.2).
-  user:
-    name: "{{ drupalvm_webserver_user }}"
-    append: yes
-    groups: "{{ vagrant_directory_groupname.stdout|default('vagrant_group') }}"
-  when: >
-    ansible_version.full | version_compare('2.3', '<') and
-    vagrant_directory.stat.exists and
-    vagrant_directory_groupname.stdout != 'root'
-
-- name: Ensure admin group exist.
-  group: "name=admin state=present"
-
-- name: Ensure vagrant user is in admin group.
-  user: "name={{ vagrant_user }} append=yes groups=admin"
-
-- name: Set nicer permissions on Apache log directory.
-  file:
-    path: "/var/log/{{ apache_daemon }}"
-    state: directory
-    mode: 0755
-    recurse: true
-  when: drupalvm_webserver == 'apache'
-
-- name: Copy Nginx vhosts into place.
-  template:
-    src: ../templates/nginx-vhost.conf.j2
-    dest: "{{ nginx_vhost_path }}/{{ item.server_name.split(' ')[0] }}.conf"
-    force: yes
-    owner: root
-    group: root
-    mode: 0644
-  with_items: "{{ nginx_hosts }}"
-  notify: restart nginx
-  when: drupalvm_webserver == 'nginx'

From 585148d38d771920e9f7b708b1805b0e9d2fea43 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 20 Apr 2017 22:31:43 -0500
Subject: [PATCH 0729/1273] Issue #1318: Update CHANGELOG for 4.4.3 release.

---
 CHANGELOG.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a372c8658..917a728c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,28 @@
 # Drupal VM Changelog
 
+## 4.4.3 (2017-04-20)
+
+### New/changed variables in default.config.yml
+
+  * Added `ssh_home: "{{ drupal_core_path }}"` so `vagrant ssh` drops you directly into the core path by default.
+
+### Improvements
+
+  * Updated Ansible roles: `mysql`, `solr`, `nodejs`, `drupal`, `varnish`.
+  * #1177: Mention the availability of the `geerlingguy/debian8` base box.
+  * #1265: Document reverse-mount shares. Also scaffolds Issue #1258.
+  * #1272: Set ssh_home by default since it's really helpful.
+  * #1259: Update some performance-related docs.
+  * #1317: Remove duplicate handler and extract www tasks into new role.
+
+### Bugfixes
+
+  * #1294: Fix 'Cannot load Zend OPcache' notice.
+  * #1306: Fix Ansible 2.3-related bug with jinja2 inside when statement.
+  * #1302: Remove `ansible_ssh_user` variable to avoid upstream bugs.
+  * #1314: Revert "Move simple `include_vars` statement to `vars_files`"
+
+
 ## 4.4.2 (2017-04-12)
 
 ### New/changed variables in default.config.yml

From 0aba1932fb299b801109c656a42bb15a6dcce285 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 21 Apr 2017 09:09:53 -0500
Subject: [PATCH 0730/1273] Update Postgresql role to latest 1.0.3 version.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.postgresql/.gitignore   |  2 +
 .../roles/geerlingguy.postgresql/.travis.yml  | 47 +++++--------------
 .../roles/geerlingguy.postgresql/LICENSE      | 20 ++++++++
 .../roles/geerlingguy.postgresql/README.md    |  2 +-
 .../geerlingguy.postgresql/tests/README.md    | 11 +++++
 .../geerlingguy.postgresql/tests/test.yml     |  2 +-
 .../geerlingguy.postgresql/vars/Debian-7.yml  | 10 ++++
 8 files changed, 57 insertions(+), 39 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.postgresql/.gitignore
 create mode 100644 provisioning/roles/geerlingguy.postgresql/LICENSE
 create mode 100644 provisioning/roles/geerlingguy.postgresql/tests/README.md
 create mode 100644 provisioning/roles/geerlingguy.postgresql/vars/Debian-7.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 3e93232c5..582fb5cf1 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -64,7 +64,7 @@
 - src: geerlingguy.postfix
   version: 1.1.0
 - src: geerlingguy.postgresql
-  version: 1.0.2
+  version: 1.0.3
 - src: geerlingguy.redis
   version: 1.4.1
 - src: geerlingguy.repo-remi
diff --git a/provisioning/roles/geerlingguy.postgresql/.gitignore b/provisioning/roles/geerlingguy.postgresql/.gitignore
new file mode 100644
index 000000000..c9b2377e3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/.gitignore
@@ -0,0 +1,2 @@
+*.retry
+tests/test.sh
diff --git a/provisioning/roles/geerlingguy.postgresql/.travis.yml b/provisioning/roles/geerlingguy.postgresql/.travis.yml
index d7e22e201..d28e2cb97 100644
--- a/provisioning/roles/geerlingguy.postgresql/.travis.yml
+++ b/provisioning/roles/geerlingguy.postgresql/.travis.yml
@@ -3,65 +3,40 @@ services: docker
 
 env:
   - distro: centos7
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     postgresql_bin_dir: /usr/bin
     postgresql_data_dir: /var/lib/pgsql/data
   - distro: centos6
-    init: /sbin/init
-    run_opts: ""
     postgresql_bin_dir: /usr/bin
     postgresql_data_dir: /var/lib/pgsql/data
   - distro: ubuntu1604
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     postgresql_bin_dir: /usr/lib/postgresql/9.5/bin
     postgresql_data_dir: /var/lib/postgresql/9.5/main
   - distro: ubuntu1404
-    init: /sbin/init
-    run_opts: ""
     postgresql_bin_dir: /usr/lib/postgresql/9.3/bin
     postgresql_data_dir: /var/lib/postgresql/9.3/main
   - distro: debian8
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     postgresql_bin_dir: /usr/lib/postgresql/9.4/bin
     postgresql_data_dir: /var/lib/postgresql/9.4/main
 
-services:
-  - docker
-
-before_install:
-  # Pull container
-  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
-
 script:
-  - container_id=$(mktemp)
-  # Run container in detached state.
-  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
-
-  # Ansible syntax check.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+  # Configure test script so we can run extra tests after playbook is run.
+  - export container_id=$(date +%s)
+  - export cleanup=false
 
-  # Test role.
-  - 'docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+  # Download test shim.
+  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
+  - chmod +x ${PWD}/tests/test.sh
 
-  # Test role idempotence.
-  - idempotence=$(mktemp)
-  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
-  - >
-    tail ${idempotence}
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
+  # Run tests.
+  - ${PWD}/tests/test.sh
 
   # Check PostgreSQL status.
-  - 'docker exec -u postgres "$(cat ${container_id})" ${postgresql_bin_dir}/pg_ctl -D ${postgresql_data_dir} status'
+  - 'docker exec -u postgres ${container_id} ${postgresql_bin_dir}/pg_ctl -D ${postgresql_data_dir} status'
 
 after_failure:
   # Check what happened on systemd systems.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm systemctl -l status postgresql.service'
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm journalctl -xe --no-pager'
+  - 'docker exec --tty ${container_id} env TERM=xterm systemctl -l status postgresql.service'
+  - 'docker exec --tty ${container_id} env TERM=xterm journalctl -xe --no-pager'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.postgresql/LICENSE b/provisioning/roles/geerlingguy.postgresql/LICENSE
new file mode 100644
index 000000000..4275cf3c1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Jeff Geerling
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/provisioning/roles/geerlingguy.postgresql/README.md b/provisioning/roles/geerlingguy.postgresql/README.md
index e23baeb9e..906cdf8cf 100644
--- a/provisioning/roles/geerlingguy.postgresql/README.md
+++ b/provisioning/roles/geerlingguy.postgresql/README.md
@@ -108,4 +108,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2016 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
+This role was created in 2016 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.postgresql/tests/README.md b/provisioning/roles/geerlingguy.postgresql/tests/README.md
new file mode 100644
index 000000000..6fb211721
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/tests/README.md
@@ -0,0 +1,11 @@
+# Ansible Role tests
+
+To run the test playbook(s) in this directory:
+
+  1. Install and start Docker.
+  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
+    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
+  1. Make the test shim executable: `chmod +x tests/test.sh`.
+  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
+
+If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.postgresql/tests/test.yml b/provisioning/roles/geerlingguy.postgresql/tests/test.yml
index 731d75303..93c6ceff2 100644
--- a/provisioning/roles/geerlingguy.postgresql/tests/test.yml
+++ b/provisioning/roles/geerlingguy.postgresql/tests/test.yml
@@ -9,7 +9,7 @@
 
   pre_tasks:
     - name: Update apt cache.
-      apt: update_cache=yes
+      apt: update_cache=yes cache_valid_time=600
       when: ansible_os_family == 'Debian'
 
     - name: Set custom variable name for old CentOS 6 PostgreSQL install.
diff --git a/provisioning/roles/geerlingguy.postgresql/vars/Debian-7.yml b/provisioning/roles/geerlingguy.postgresql/vars/Debian-7.yml
new file mode 100644
index 000000000..4d3a8ead0
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/vars/Debian-7.yml
@@ -0,0 +1,10 @@
+---
+__postgresql_version: "9.1"
+__postgresql_data_dir: "/var/lib/postgresql/{{ __postgresql_version }}/main"
+__postgresql_bin_path: "/usr/lib/postgresql/{{ __postgresql_version }}/bin"
+__postgresql_config_path: "/etc/postgresql/{{ __postgresql_version }}/main"
+__postgresql_daemon: postgresql
+__postgresql_packages:
+  - postgresql
+  - postgresql-contrib
+  - libpq-dev
\ No newline at end of file

From 561e9b528a41014339e25544705e9138f1dd0928 Mon Sep 17 00:00:00 2001
From: Matt Glaman <nmd.matt@gmail.com>
Date: Fri, 21 Apr 2017 09:20:27 -0500
Subject: [PATCH 0731/1273] Always include OS specific variables

For issue #1319
---
 provisioning/playbook.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index b4e2e21d5..b627b7366 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -9,6 +9,7 @@
   pre_tasks:
     - name: Include OS-specific variables.
       include_vars: "{{ ansible_os_family }}.yml"
+      tags: ['always']
 
     - name: Define config_dir.
       set_fact:

From d055f16356785743ed4304225d2705faae55c746 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 21 Apr 2017 10:25:08 -0500
Subject: [PATCH 0732/1273] Fixes #1271: Don't run PHP role for 'drupal' tag.

---
 provisioning/playbook.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index b627b7366..82218937d 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -31,11 +31,11 @@
 
     - include: tasks/init-debian.yml
       when: ansible_os_family == 'Debian'
-      tags: ['php', 'drupal']
+      tags: ['php']
       static: no
     - include: tasks/init-redhat.yml
       when: ansible_os_family == 'RedHat'
-      tags: ['php', 'drupal']
+      tags: ['php']
       static: no
 
     - name: Run configured pre-provision shell scripts.
@@ -50,7 +50,7 @@
         - "{{ pre_provision_tasks_dir|default(omit) }}"
 
     - include: tasks/php.yml
-      tags: ['php', 'drupal']
+      tags: ['php']
 
   roles:
     # Essential roles.
@@ -61,7 +61,7 @@
     - { role: geerlingguy.apache, when: drupalvm_webserver == 'apache', tags: ['webserver']}
     - { role: geerlingguy.apache-php-fpm, when: drupalvm_webserver == 'apache', tags: ['webserver'] }
     - { role: geerlingguy.nginx, when: drupalvm_webserver == 'nginx', tags: ['webserver'] }
-    - { role: geerlingguy.php, tags: ['php', 'drupal'] }
+    - { role: geerlingguy.php, tags: ['php'] }
     - { role: geerlingguy.php-pecl, tags: ['php'] }
     - { role: geerlingguy.composer }
     - { role: geerlingguy.mysql, when: drupal_db_backend == 'mysql', tags: ['database'] }

From 3da370c1f2b00983541acaf95476e58d01dd53c0 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 21 Apr 2017 10:49:10 -0500
Subject: [PATCH 0733/1273] Update Drupal role to latest version 2.2.1.

---
 provisioning/requirements.yml                          | 2 +-
 provisioning/roles/geerlingguy.drupal/tasks/update.yml | 4 ++--
 provisioning/roles/geerlingguy.drupal/tests/test.yml   | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 582fb5cf1..c6ccbb570 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -18,7 +18,7 @@
 - src: geerlingguy.daemonize
   version: 1.1.1
 - src: geerlingguy.drupal
-  version: 2.2.0
+  version: 2.2.1
 - src: geerlingguy.drupal-console
   version: 1.0.7
 - src: geerlingguy.drush
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/update.yml b/provisioning/roles/geerlingguy.drupal/tasks/update.yml
index 6ebaa9638..8764028e7 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/update.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/update.yml
@@ -1,6 +1,6 @@
 ---
 - name: Run database updates.
-  command: {{ drush_path }} updatedb -y
+  command: "{{ drush_path }} updatedb -y"
   args:
     chdir: "{{ drupal_core_path }}"
 
@@ -8,6 +8,6 @@
 # TODO: Other commands if configured?
 
 - name: Rebuild Drupal caches.
-  command: {{ drush_path }} cache-rebuild --quiet
+  command: "{{ drush_path }} cache-rebuild --quiet"
   args:
     chdir: "{{ drupal_core_path }}"
diff --git a/provisioning/roles/geerlingguy.drupal/tests/test.yml b/provisioning/roles/geerlingguy.drupal/tests/test.yml
index 6e24554ad..a52b535a5 100644
--- a/provisioning/roles/geerlingguy.drupal/tests/test.yml
+++ b/provisioning/roles/geerlingguy.drupal/tests/test.yml
@@ -18,5 +18,4 @@
     - geerlingguy.php-mysql
     - geerlingguy.git
     - geerlingguy.composer
-    - geerlingguy.drush
     - role_under_test

From 0c8144283ce9722dfd78654bc4783cdecda1ea12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 22 Apr 2017 10:40:40 -0500
Subject: [PATCH 0734/1273] Refactor PHP tasks into drupalvm.php-versions shim
 role

---
 provisioning/playbook.yml                     |  2 +-
 .../roles/drupalvm.php-versions/README.md     | 36 ++++++++
 .../roles/drupalvm.php-versions/meta/main.yml | 28 +++++++
 .../drupalvm.php-versions/tasks/main.yml      | 13 +++
 .../tasks/setup-Debian.yml                    | 71 ++++++++++++++++
 .../tasks/setup-RedHat.yml                    | 12 +++
 .../drupalvm.php-versions/vars/Debian.yml     | 35 ++++++++
 .../drupalvm.php-versions/vars/RedHat.yml     |  1 +
 provisioning/tasks/init-debian.yml            | 82 +------------------
 provisioning/tasks/init-redhat.yml            | 12 ---
 provisioning/tasks/php.yml                    | 10 +--
 provisioning/vars/Debian.yml                  | 34 --------
 12 files changed, 205 insertions(+), 131 deletions(-)
 create mode 100644 provisioning/roles/drupalvm.php-versions/README.md
 create mode 100644 provisioning/roles/drupalvm.php-versions/meta/main.yml
 create mode 100644 provisioning/roles/drupalvm.php-versions/tasks/main.yml
 create mode 100644 provisioning/roles/drupalvm.php-versions/tasks/setup-Debian.yml
 create mode 100644 provisioning/roles/drupalvm.php-versions/tasks/setup-RedHat.yml
 create mode 100644 provisioning/roles/drupalvm.php-versions/vars/Debian.yml
 create mode 100644 provisioning/roles/drupalvm.php-versions/vars/RedHat.yml

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 82218937d..a3fba8b1a 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -50,7 +50,6 @@
         - "{{ pre_provision_tasks_dir|default(omit) }}"
 
     - include: tasks/php.yml
-      tags: ['php']
 
   roles:
     # Essential roles.
@@ -61,6 +60,7 @@
     - { role: geerlingguy.apache, when: drupalvm_webserver == 'apache', tags: ['webserver']}
     - { role: geerlingguy.apache-php-fpm, when: drupalvm_webserver == 'apache', tags: ['webserver'] }
     - { role: geerlingguy.nginx, when: drupalvm_webserver == 'nginx', tags: ['webserver'] }
+    - { role: drupalvm.php-versions, tags: ['php', 'xdebug'] }
     - { role: geerlingguy.php, tags: ['php'] }
     - { role: geerlingguy.php-pecl, tags: ['php'] }
     - { role: geerlingguy.composer }
diff --git a/provisioning/roles/drupalvm.php-versions/README.md b/provisioning/roles/drupalvm.php-versions/README.md
new file mode 100644
index 000000000..cc5cf0182
--- /dev/null
+++ b/provisioning/roles/drupalvm.php-versions/README.md
@@ -0,0 +1,36 @@
+# Drupal VM PHP Versions Role
+
+This role is a shim to configure miscellaneous settings prior to installing PHP inside Drupal VM.
+
+## Requirements
+
+This role is meant to be run in Drupal VM. Use outside of Drupal VM will likely result in weird things happening.
+
+## Role Variables
+
+The role has no default variables, but configures the `geerlingguy.php` role variables according to OS and PHP versions.
+
+```yaml
+php_version
+```
+
+The PHP version used. This variable does not have a default and thus needs to be set.
+
+## Dependencies
+
+- geerlingguy.php is a soft dependency as the `php_version` variable is required to be set.
+
+## Example Playbook
+
+    - hosts: drupalvm
+      roles:
+         - drupalvm.php-versions
+         - geerlingguy.php
+
+## License
+
+MIT / BSD
+
+## Author Information
+
+This role was created in 2017 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/drupalvm.php-versions/meta/main.yml b/provisioning/roles/drupalvm.php-versions/meta/main.yml
new file mode 100644
index 000000000..92ca395ac
--- /dev/null
+++ b/provisioning/roles/drupalvm.php-versions/meta/main.yml
@@ -0,0 +1,28 @@
+---
+galaxy_info:
+  author: Jeff Geerling
+  description: A role to configure various odds and ends prior to installing PHP in Drupal VM.
+  company: Midwestern Mac, LLC
+  issue_tracker_url: https://github.com/geerlingguy/drupal-vm/issues
+  license: MIT
+  min_ansible_version: 2.2
+
+  platforms:
+    - name: EL
+      versions:
+        - all
+    - name: Debian
+      versions:
+        - all
+    - name: Ubuntu
+      versions:
+        - precise
+        - raring
+        - saucy
+        - trusty
+        - xenial
+
+  galaxy_tags:
+    - drupal
+    - vm
+    - php
diff --git a/provisioning/roles/drupalvm.php-versions/tasks/main.yml b/provisioning/roles/drupalvm.php-versions/tasks/main.yml
new file mode 100644
index 000000000..006adbdc9
--- /dev/null
+++ b/provisioning/roles/drupalvm.php-versions/tasks/main.yml
@@ -0,0 +1,13 @@
+---
+- name: Include OS-specific variables.
+  include_vars: "{{ ansible_os_family }}.yml"
+
+# Setup tasks.
+- include: "setup-{{ ansible_os_family }}.yml"
+  static: no
+
+- name: Set the correct XHProf package when PHP 5.6 is used.
+  set_fact:
+    xhprof_download_url: https://github.com/phacility/xhprof/archive/master.tar.gz
+    xhprof_download_folder_name: xhprof-master
+  when: php_version == '5.6'
diff --git a/provisioning/roles/drupalvm.php-versions/tasks/setup-Debian.yml b/provisioning/roles/drupalvm.php-versions/tasks/setup-Debian.yml
new file mode 100644
index 000000000..49f32f0e3
--- /dev/null
+++ b/provisioning/roles/drupalvm.php-versions/tasks/setup-Debian.yml
@@ -0,0 +1,71 @@
+---
+- name: Add repository for PHP versions (Ubuntu).
+  apt_repository: repo='ppa:ondrej/php'
+  when: ansible_distribution == "Ubuntu"
+  register: php_ondrej_ubuntu_repo
+
+- name: Add repository for PHP 5 compatibility packages (Ubuntu).
+  apt_repository: repo='ppa:ondrej/php5-compat'
+  when: php_version == "5.6" and ansible_distribution == "Ubuntu"
+
+# Debian-specific tasks.
+- name: Add dependencies for PHP versions (Debian).
+  apt:
+    name: "{{ item }}"
+  with_items:
+    - apt-transport-https
+    - ca-certificates
+  when: ansible_distribution == "Debian"
+
+- name: Add Ondrej Sury's apt key (Debian).
+  apt_key:
+    url: https://packages.sury.org/php/apt.gpg
+    state: present
+  when: ansible_distribution == "Debian"
+
+- name: Add Ondrej Sury's repo (Debian).
+  apt_repository:
+    repo: "deb https://packages.sury.org/php/ {{ ansible_distribution_release }} main"
+    state: present
+  register: php_ondrej_debian_repo
+  when: ansible_distribution == "Debian"
+
+- name: Update apt caches after repo is added (Debian).
+  apt: update_cache=yes
+  when: php_ondrej_debian_repo.changed and (ansible_distribution == "Debian")
+
+# PHP package purges.
+- name: Purge PHP version packages.
+  apt:
+    name: "{{ item }}"
+    state: absent
+    purge: yes
+    force: yes
+  when: "'php' + php_version not in item"
+  with_flattened:
+    - "{{ php_packages|regex_replace('php' + php_version, 'php5.6') }}"
+    - "{{ php_packages|regex_replace('php' + php_version, 'php7.0') }}"
+    - "{{ php_packages|regex_replace('php' + php_version, 'php7.1') }}"
+  register: php_purge
+
+- name: Purge PHP packages installed by default.
+  apt:
+    name: "{{ item }}"
+    state: absent
+    purge: yes
+    force: yes
+  when: >
+    php_purge.changed or
+    php_ondrej_ubuntu_repo.changed or
+    php_ondrej_debian_repo.changed
+  with_items:
+    - php-common
+
+- name: Purge PHP modules directory.
+  file:
+    path: "{{ item }}"
+    state: absent
+  when: php_purge.changed
+  with_items:
+    - "/usr/lib/php5/modules"
+    - "/usr/lib/php/modules"
diff --git a/provisioning/roles/drupalvm.php-versions/tasks/setup-RedHat.yml b/provisioning/roles/drupalvm.php-versions/tasks/setup-RedHat.yml
new file mode 100644
index 000000000..773e53f25
--- /dev/null
+++ b/provisioning/roles/drupalvm.php-versions/tasks/setup-RedHat.yml
@@ -0,0 +1,12 @@
+---
+- name: Enable remi repo for PHP 5.6.
+  set_fact: php_enablerepo="remi,remi-php56"
+  when: php_version == "5.6"
+
+- name: Enable remi repo for PHP 7.0.
+  set_fact: php_enablerepo="remi,remi-php70"
+  when: php_version == "7.0"
+
+- name: Enable remi repo for PHP 7.1.
+  set_fact: php_enablerepo="remi,remi-php71"
+  when: php_version == "7.1"
diff --git a/provisioning/roles/drupalvm.php-versions/vars/Debian.yml b/provisioning/roles/drupalvm.php-versions/vars/Debian.yml
new file mode 100644
index 000000000..22383cfcd
--- /dev/null
+++ b/provisioning/roles/drupalvm.php-versions/vars/Debian.yml
@@ -0,0 +1,35 @@
+---
+# Configure PHP paths and packages for PHP 5.6 and PHP 7.0.
+php_conf_paths:
+  - "/etc/php/{{ php_version }}/fpm"
+  - "/etc/php/{{ php_version }}/apache2"
+  - "/etc/php/{{ php_version }}/cli"
+php_extension_conf_paths:
+  - "/etc/php/{{ php_version }}/fpm/conf.d"
+  - "/etc/php/{{ php_version }}/apache2/conf.d"
+  - "/etc/php/{{ php_version }}/cli/conf.d"
+php_fpm_daemon: "php{{ php_version }}-fpm"
+php_fpm_conf_path: "/etc/php/{{ php_version }}/fpm"
+php_fpm_pool_conf_path: "{{ php_fpm_conf_path }}/pool.d/www.conf"
+php_mysql_package: "php{{ php_version }}-mysql"
+php_redis_package: "php{{ php_version }}-redis"
+php_memcached_package: "php{{ php_version }}-memcached"
+php_pgsql_package: "php{{ php_version }}-pgsql"
+
+php_packages:
+  - "php{{ php_version }}"
+  - "php{{ php_version }}-apcu"
+  - "php{{ php_version }}-cli"
+  - "php{{ php_version }}-common"
+  - "php{{ php_version }}-curl"
+  - "php{{ php_version }}-dev"
+  - "php{{ php_version }}-fpm"
+  - "php{{ php_version }}-gd"
+  - "php{{ php_version }}-imap"
+  - "php{{ php_version }}-json"
+  - "php{{ php_version }}-mbstring"
+  - "php{{ php_version }}-mcrypt"
+  - "php{{ php_version }}-opcache"
+  - "php{{ php_version }}-sqlite3"
+  - "php{{ php_version }}-xml"
+  - "php{{ php_version }}-yaml"
diff --git a/provisioning/roles/drupalvm.php-versions/vars/RedHat.yml b/provisioning/roles/drupalvm.php-versions/vars/RedHat.yml
new file mode 100644
index 000000000..ed97d539c
--- /dev/null
+++ b/provisioning/roles/drupalvm.php-versions/vars/RedHat.yml
@@ -0,0 +1 @@
+---
diff --git a/provisioning/tasks/init-debian.yml b/provisioning/tasks/init-debian.yml
index 7a4481afe..d5e7a51c9 100644
--- a/provisioning/tasks/init-debian.yml
+++ b/provisioning/tasks/init-debian.yml
@@ -17,11 +17,6 @@
     content: "{{ hostname_fqdn }}\n"
     dest: /etc/mailname
 
-- name: Define php_xhprof_html_dir.
-  set_fact:
-    php_xhprof_html_dir: "/usr/share/php/xhprof_html"
-  when: php_xhprof_html_dir is not defined
-
 # Ubuntu-specific tasks.
 - name: Add repository for Apache 2.4.9+ (Ubuntu 12/14).
   apt_repository: repo='ppa:ondrej/apache2'
@@ -29,78 +24,7 @@
     (ansible_distribution_release == "precise" or ansible_distribution_release == "trusty") and
     ansible_distribution == "Ubuntu"
 
-- name: Add repository for PHP versions (Ubuntu).
-  apt_repository: repo='ppa:ondrej/php'
-  when: ansible_distribution == "Ubuntu"
-  register: php_ondrej_ubuntu_repo
-
-- name: Add repository for PHP 5 compatibility packages (Ubuntu).
-  apt_repository: repo='ppa:ondrej/php5-compat'
-  when: php_version == "5.6" and ansible_distribution == "Ubuntu"
-
-- name: Set the correct opcache filename (Ubuntu).
+- name: Define php_xhprof_html_dir.
   set_fact:
-    php_opcache_conf_filename: "10-opcache.ini"
-  when: ansible_distribution == "Ubuntu"
-
-# Debian-specific tasks.
-- name: Add dependencies for PHP versions (Debian).
-  apt:
-    name: "{{ item }}"
-  with_items:
-    - apt-transport-https
-    - ca-certificates
-  when: ansible_distribution == "Debian"
-
-- name: Add Ondrej Sury's apt key (Debian).
-  apt_key:
-    url: https://packages.sury.org/php/apt.gpg
-    state: present
-  when: ansible_distribution == "Debian"
-
-- name: Add Ondrej Sury's repo (Debian).
-  apt_repository:
-    repo: "deb https://packages.sury.org/php/ {{ ansible_distribution_release }} main"
-    state: present
-  register: php_ondrej_debian_repo
-  when: ansible_distribution == "Debian"
-
-- name: Update apt caches after repo is added (Debian).
-  apt: update_cache=yes
-  when: php_ondrej_debian_repo.changed and (ansible_distribution == "Debian")
-
-# PHP package purges.
-- name: Purge PHP version packages.
-  apt:
-    name: "{{ item }}"
-    state: absent
-    purge: yes
-    force: yes
-  when: "'php' + php_version not in item"
-  with_flattened:
-    - "{{ php_packages|regex_replace('php' + php_version, 'php5.6') }}"
-    - "{{ php_packages|regex_replace('php' + php_version, 'php7.0') }}"
-    - "{{ php_packages|regex_replace('php' + php_version, 'php7.1') }}"
-  register: php_purge
-
-- name: Purge PHP packages installed by default.
-  apt:
-    name: "{{ item }}"
-    state: absent
-    purge: yes
-    force: yes
-  when: >
-    php_purge.changed or
-    php_ondrej_ubuntu_repo.changed or
-    php_ondrej_debian_repo.changed
-  with_items:
-    - php-common
-
-- name: Purge PHP modules directory.
-  file:
-    path: "{{ item }}"
-    state: absent
-  when: php_purge.changed
-  with_items:
-    - "/usr/lib/php5/modules"
-    - "/usr/lib/php/modules"
+    php_xhprof_html_dir: "/usr/share/php/xhprof_html"
+  when: php_xhprof_html_dir is not defined
diff --git a/provisioning/tasks/init-redhat.yml b/provisioning/tasks/init-redhat.yml
index 0bb94e3b4..9c89fe3f7 100644
--- a/provisioning/tasks/init-redhat.yml
+++ b/provisioning/tasks/init-redhat.yml
@@ -12,18 +12,6 @@
   set_fact: mysql_enablerepo="remi"
   when: mysql_enablerepo is not defined or mysql_enablerepo == ""
 
-- name: Enable remi repo for PHP 5.6.
-  set_fact: php_enablerepo="remi,remi-php56"
-  when: php_version == "5.6"
-
-- name: Enable remi repo for PHP 7.0.
-  set_fact: php_enablerepo="remi,remi-php70"
-  when: php_version == "7.0"
-
-- name: Enable remi repo for PHP 7.1.
-  set_fact: php_enablerepo="remi,remi-php71"
-  when: php_version == "7.1"
-
 - name: Define php_xhprof_html_dir.
   set_fact:
     php_xhprof_html_dir: "/usr/share/pear/xhprof_html"
diff --git a/provisioning/tasks/php.yml b/provisioning/tasks/php.yml
index 163ea31ac..27282d134 100644
--- a/provisioning/tasks/php.yml
+++ b/provisioning/tasks/php.yml
@@ -5,15 +5,15 @@
   when: drupalvm_webserver == 'nginx'
   tags: ['webserver', 'database', 'php']
 
-- name: Set the correct XHProf package when PHP 5.6 is used.
+- name: Set the correct opcache filename (Ubuntu).
   set_fact:
-    xhprof_download_url: https://github.com/phacility/xhprof/archive/master.tar.gz
-    xhprof_download_folder_name: xhprof-master
-  when: php_version == '5.6'
+    php_opcache_conf_filename: "10-opcache.ini"
+  when: ansible_distribution == "Ubuntu"
+  tags: ['php']
 
 - name: Ensure PHP version -specific workspace directory exists.
   file:
     path: "/root/php{{ php_version }}"
     state: directory
     mode: 0775
-  tags: ['php']
+  tags: ['php', 'xdebug']
diff --git a/provisioning/vars/Debian.yml b/provisioning/vars/Debian.yml
index 22383cfcd..ed97d539c 100644
--- a/provisioning/vars/Debian.yml
+++ b/provisioning/vars/Debian.yml
@@ -1,35 +1 @@
 ---
-# Configure PHP paths and packages for PHP 5.6 and PHP 7.0.
-php_conf_paths:
-  - "/etc/php/{{ php_version }}/fpm"
-  - "/etc/php/{{ php_version }}/apache2"
-  - "/etc/php/{{ php_version }}/cli"
-php_extension_conf_paths:
-  - "/etc/php/{{ php_version }}/fpm/conf.d"
-  - "/etc/php/{{ php_version }}/apache2/conf.d"
-  - "/etc/php/{{ php_version }}/cli/conf.d"
-php_fpm_daemon: "php{{ php_version }}-fpm"
-php_fpm_conf_path: "/etc/php/{{ php_version }}/fpm"
-php_fpm_pool_conf_path: "{{ php_fpm_conf_path }}/pool.d/www.conf"
-php_mysql_package: "php{{ php_version }}-mysql"
-php_redis_package: "php{{ php_version }}-redis"
-php_memcached_package: "php{{ php_version }}-memcached"
-php_pgsql_package: "php{{ php_version }}-pgsql"
-
-php_packages:
-  - "php{{ php_version }}"
-  - "php{{ php_version }}-apcu"
-  - "php{{ php_version }}-cli"
-  - "php{{ php_version }}-common"
-  - "php{{ php_version }}-curl"
-  - "php{{ php_version }}-dev"
-  - "php{{ php_version }}-fpm"
-  - "php{{ php_version }}-gd"
-  - "php{{ php_version }}-imap"
-  - "php{{ php_version }}-json"
-  - "php{{ php_version }}-mbstring"
-  - "php{{ php_version }}-mcrypt"
-  - "php{{ php_version }}-opcache"
-  - "php{{ php_version }}-sqlite3"
-  - "php{{ php_version }}-xml"
-  - "php{{ php_version }}-yaml"

From 2df0e5d355748402e25787bcd0f61f45503bc3ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 22 Apr 2017 10:57:02 -0500
Subject: [PATCH 0735/1273] Refactor hostname tasks into drupalvm.hostname shim
 role

---
 provisioning/playbook.yml                     |  4 +-
 .../roles/drupalvm.hostname/README.md         | 47 +++++++++++++++++++
 .../roles/drupalvm.hostname/defaults/main.yml |  5 ++
 .../roles/drupalvm.hostname/meta/main.yml     | 28 +++++++++++
 .../drupalvm.hostname/tasks/main.yml}         | 19 ++++----
 provisioning/tasks/init-debian.yml            |  5 --
 provisioning/vars/main.yml                    |  1 +
 7 files changed, 90 insertions(+), 19 deletions(-)
 create mode 100644 provisioning/roles/drupalvm.hostname/README.md
 create mode 100644 provisioning/roles/drupalvm.hostname/defaults/main.yml
 create mode 100644 provisioning/roles/drupalvm.hostname/meta/main.yml
 rename provisioning/{tasks/hostname.yml => roles/drupalvm.hostname/tasks/main.yml} (50%)

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index a3fba8b1a..67978f9d0 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -26,9 +26,6 @@
         - "{{ config_dir }}/{{ lookup('env', 'DRUPALVM_ENV')|default(drupalvm_env, true)|default(ansible_env.DRUPALVM_ENV)|default(omit) }}.config.yml"
       tags: ['always']
 
-    - include: tasks/hostname.yml
-      tags: ['php', 'drupal']
-
     - include: tasks/init-debian.yml
       when: ansible_os_family == 'Debian'
       tags: ['php']
@@ -54,6 +51,7 @@
   roles:
     # Essential roles.
     - { role: geerlingguy.repo-remi, when: ansible_os_family == 'RedHat', tags: ['webserver, php'] }
+    - { role: drupalvm.hostname }
     - { role: geerlingguy.firewall }
     - { role: geerlingguy.git }
     - { role: geerlingguy.postfix }
diff --git a/provisioning/roles/drupalvm.hostname/README.md b/provisioning/roles/drupalvm.hostname/README.md
new file mode 100644
index 000000000..37f72b905
--- /dev/null
+++ b/provisioning/roles/drupalvm.hostname/README.md
@@ -0,0 +1,47 @@
+# Drupal VM hostname Role
+
+This role is a shim to set the hostname and FQDN of Drupal VM.
+
+## Requirements
+
+This role is meant to be run in Drupal VM. Use outside of Drupal VM will likely result in weird things happening.
+
+## Role Variables
+
+Available variables are listed below:
+
+```yaml
+hostname_fqdn: "{{ inventory_hostname }}"
+```
+
+The fully qualified domain name.
+
+```yaml
+hostname_short: "{{ hostname_fqdn|regex_replace('^([^.]+).*$', '\\1') }}"
+```
+
+The shortname defaulting to the part up to the first period of the FQDN, without the rest of the domain.
+
+```yaml
+hostname_unsafe_writes: "{{ (ansible_virtualization_type == 'docker')|ternary('yes', 'no')|bool }}"
+```
+
+Whether to use unsafe writes or atomic operations when updating system files. Defaults to atomic operations on all systems except for docker where mounted files cannot be updated atomically and can only be done in an unsafe manner.
+
+## Dependencies
+
+None.
+
+## Example Playbook
+
+    - hosts: drupalvm
+      roles:
+         - drupalvm.hostname
+
+## License
+
+MIT / BSD
+
+## Author Information
+
+This role was created in 2017 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/drupalvm.hostname/defaults/main.yml b/provisioning/roles/drupalvm.hostname/defaults/main.yml
new file mode 100644
index 000000000..62bc0a722
--- /dev/null
+++ b/provisioning/roles/drupalvm.hostname/defaults/main.yml
@@ -0,0 +1,5 @@
+---
+hostname_fqdn: "{{ inventory_hostname }}"
+hostname_short: "{{ hostname_fqdn|regex_replace('^([^.]+).*$', '\\1') }}"
+
+hostname_unsafe_writes: "{{ (ansible_virtualization_type == 'docker')|ternary('yes', 'no')|bool }}"
diff --git a/provisioning/roles/drupalvm.hostname/meta/main.yml b/provisioning/roles/drupalvm.hostname/meta/main.yml
new file mode 100644
index 000000000..2c249799e
--- /dev/null
+++ b/provisioning/roles/drupalvm.hostname/meta/main.yml
@@ -0,0 +1,28 @@
+---
+galaxy_info:
+  author: Jeff Geerling
+  description: A role to set the hostname and FQDN on Drupal VM.
+  company: Midwestern Mac, LLC
+  issue_tracker_url: https://github.com/geerlingguy/drupal-vm/issues
+  license: MIT
+  min_ansible_version: 2.2
+
+  platforms:
+    - name: EL
+      versions:
+        - all
+    - name: Debian
+      versions:
+        - all
+    - name: Ubuntu
+      versions:
+        - precise
+        - raring
+        - saucy
+        - trusty
+        - xenial
+
+  galaxy_tags:
+    - drupal
+    - vm
+    - hostname
diff --git a/provisioning/tasks/hostname.yml b/provisioning/roles/drupalvm.hostname/tasks/main.yml
similarity index 50%
rename from provisioning/tasks/hostname.yml
rename to provisioning/roles/drupalvm.hostname/tasks/main.yml
index 50cc4e79d..5dcebbb7c 100644
--- a/provisioning/tasks/hostname.yml
+++ b/provisioning/roles/drupalvm.hostname/tasks/main.yml
@@ -1,12 +1,9 @@
-- name: Define fully qualified domain name.
-  set_fact:
-    hostname_fqdn: "{{ vagrant_hostname }}"
-  when: hostname_fqdn is undefined
-
-- name: Define short hostname.
-  set_fact:
-    hostname_short: "{{ hostname_fqdn|regex_replace('^([^.]+).*$', '\\1') }}"
-  when: hostname_short is undefined
+---
+- name: Configure /etc/mailname (Debian).
+  copy:
+    content: "{{ hostname_fqdn }}\n"
+    dest: /etc/mailname
+  when: ansible_os_family == 'Debian'
 
 - name: Add hostname to /etc/hosts.
   lineinfile:
@@ -14,13 +11,13 @@
     regexp: '.*\t{{ hostname_short }}$'
     line: "127.0.0.1\t{{ hostname_fqdn }}\t{{ hostname_short }}"
     state: present
-    unsafe_writes: "{{ (ansible_virtualization_type == 'docker')|ternary('yes', 'no')|bool }}"
+    unsafe_writes: "{{ hostname_unsafe_writes }}"
 
 - name: Configure hostname.
   copy:
     content: "{{ (ansible_os_family == 'Debian') | ternary(hostname_short, hostname_fqdn) }}\n"
     dest: /etc/hostname
-    unsafe_writes: "{{ (ansible_virtualization_type == 'docker')|ternary('yes', 'no')|bool }}"
+    unsafe_writes: "{{ hostname_unsafe_writes }}"
   register: set_hostname
 
 - name: Set the hostname for current session.
diff --git a/provisioning/tasks/init-debian.yml b/provisioning/tasks/init-debian.yml
index d5e7a51c9..8857574af 100644
--- a/provisioning/tasks/init-debian.yml
+++ b/provisioning/tasks/init-debian.yml
@@ -12,11 +12,6 @@
     - unzip
     - make
 
-- name: Configure /etc/mailname.
-  copy:
-    content: "{{ hostname_fqdn }}\n"
-    dest: /etc/mailname
-
 # Ubuntu-specific tasks.
 - name: Add repository for Apache 2.4.9+ (Ubuntu 12/14).
   apt_repository: repo='ppa:ondrej/apache2'
diff --git a/provisioning/vars/main.yml b/provisioning/vars/main.yml
index 691ad8d42..409247528 100644
--- a/provisioning/vars/main.yml
+++ b/provisioning/vars/main.yml
@@ -5,4 +5,5 @@ _devtool_docroots:
   - "{{ php_xhprof_html_dir }}"
   - "{{ dashboard_install_dir|default('') }}"
 
+hostname_fqdn: "{{ vagrant_hostname }}"
 drupalvm_user: "{{ ansible_env.SUDO_USER | default(ansible_env.USER, true) | default(ansible_user_id, true) }}"

From 5ad6e14beb946e537638f2ca88a9ea919b8256a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 22 Apr 2017 11:09:58 -0500
Subject: [PATCH 0736/1273] Merge init includes to single statement

---
 provisioning/playbook.yml                               | 8 +-------
 provisioning/tasks/{init-debian.yml => init-Debian.yml} | 0
 provisioning/tasks/{init-redhat.yml => init-RedHat.yml} | 0
 3 files changed, 1 insertion(+), 7 deletions(-)
 rename provisioning/tasks/{init-debian.yml => init-Debian.yml} (100%)
 rename provisioning/tasks/{init-redhat.yml => init-RedHat.yml} (100%)

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 67978f9d0..93896a6c2 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -26,13 +26,7 @@
         - "{{ config_dir }}/{{ lookup('env', 'DRUPALVM_ENV')|default(drupalvm_env, true)|default(ansible_env.DRUPALVM_ENV)|default(omit) }}.config.yml"
       tags: ['always']
 
-    - include: tasks/init-debian.yml
-      when: ansible_os_family == 'Debian'
-      tags: ['php']
-      static: no
-    - include: tasks/init-redhat.yml
-      when: ansible_os_family == 'RedHat'
-      tags: ['php']
+    - include: "tasks/init-{{ ansible_os_family }}.yml"
       static: no
 
     - name: Run configured pre-provision shell scripts.
diff --git a/provisioning/tasks/init-debian.yml b/provisioning/tasks/init-Debian.yml
similarity index 100%
rename from provisioning/tasks/init-debian.yml
rename to provisioning/tasks/init-Debian.yml
diff --git a/provisioning/tasks/init-redhat.yml b/provisioning/tasks/init-RedHat.yml
similarity index 100%
rename from provisioning/tasks/init-redhat.yml
rename to provisioning/tasks/init-RedHat.yml

From 3810705c62e78c2415d58d3a17621d009c9abb26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 22 Apr 2017 11:10:50 -0500
Subject: [PATCH 0737/1273] Move config load tasks to separate task file

---
 provisioning/playbook.yml     | 18 +-----------------
 provisioning/tasks/config.yml | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 17 deletions(-)
 create mode 100644 provisioning/tasks/config.yml

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 93896a6c2..465391f6c 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -7,23 +7,7 @@
     - ../default.config.yml
 
   pre_tasks:
-    - name: Include OS-specific variables.
-      include_vars: "{{ ansible_os_family }}.yml"
-      tags: ['always']
-
-    - name: Define config_dir.
-      set_fact:
-        config_dir: "{{ playbook_dir }}/.."
-      when: config_dir is not defined
-      tags: ['always']
-
-    - name: Include optional configuration files.
-      include_vars: "{{ item }}"
-      with_fileglob:
-        - "{{ config_dir }}/config.yml"
-        - "{{ config_dir }}/local.config.yml"
-        - "{{ config_dir }}/secrets.yml"
-        - "{{ config_dir }}/{{ lookup('env', 'DRUPALVM_ENV')|default(drupalvm_env, true)|default(ansible_env.DRUPALVM_ENV)|default(omit) }}.config.yml"
+    - include: tasks/config.yml
       tags: ['always']
 
     - include: "tasks/init-{{ ansible_os_family }}.yml"
diff --git a/provisioning/tasks/config.yml b/provisioning/tasks/config.yml
new file mode 100644
index 000000000..c7cf99bbe
--- /dev/null
+++ b/provisioning/tasks/config.yml
@@ -0,0 +1,16 @@
+---
+- name: Include OS-specific variables.
+  include_vars: "{{ ansible_os_family }}.yml"
+
+- name: Define config_dir.
+  set_fact:
+    config_dir: "{{ playbook_dir }}/.."
+  when: config_dir is not defined
+
+- name: Include optional configuration files.
+  include_vars: "{{ item }}"
+  with_fileglob:
+    - "{{ config_dir }}/config.yml"
+    - "{{ config_dir }}/local.config.yml"
+    - "{{ config_dir }}/secrets.yml"
+    - "{{ config_dir }}/{{ lookup('env', 'DRUPALVM_ENV')|default(drupalvm_env, true)|default(ansible_env.DRUPALVM_ENV)|default(omit) }}.config.yml"

From a0569cc326a00e5ecbcf2c756c75085b43894746 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 22 Apr 2017 15:14:42 -0500
Subject: [PATCH 0738/1273] Remove unnecessary ternary operation.

Since we moved to `default.config.yml` the
`vagrant_synced_folder_default_type` will always be set.
---
 Vagrantfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 1b2f3d0d3..46c65a11a 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -154,7 +154,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   end
 
   # Allow override of the default synced folder type.
-  config.vm.synced_folder host_project_dir, '/vagrant', type: vconfig.include?('vagrant_synced_folder_default_type') ? vconfig['vagrant_synced_folder_default_type'] : 'nfs'
+  config.vm.synced_folder host_project_dir, '/vagrant', type: vconfig['vagrant_synced_folder_default_type']
 
   config.vm.provision provisioner do |ansible|
     ansible.playbook = playbook
@@ -207,7 +207,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     # Cache the composer directory.
     config.cache.enable :generic, cache_dir: '/home/vagrant/.composer/cache'
     config.cache.synced_folder_opts = {
-      type: vconfig.include?('vagrant_synced_folder_default_type') ? vconfig['vagrant_synced_folder_default_type'] : 'nfs'
+      type: vconfig['vagrant_synced_folder_default_type']
     }
   end
 

From c0438daf62471cea97f50ef96c9b3f5e802ee084 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 22 Apr 2017 15:16:19 -0500
Subject: [PATCH 0739/1273] Issue #1323: Default synced folder type to
 vagrant_synced_fodler_default_type if unset

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

diff --git a/Vagrantfile b/Vagrantfile
index 46c65a11a..6e3ac870f 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -137,7 +137,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # Synced folders.
   vconfig['vagrant_synced_folders'].each do |synced_folder|
     options = {
-      type: synced_folder['type'],
+      type: synced_folder.include?('type') ? synced_folder['type'] : vconfig['vagrant_synced_folder_default_type'],
       rsync__auto: 'true',
       rsync__exclude: synced_folder['excluded_paths'],
       rsync__args: ['--verbose', '--archive', '--delete', '-z', '--chmod=ugo=rwX'],

From c24ed0b46fabf443a206919de5759031fbb9fe2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 22 Apr 2017 11:30:13 -0500
Subject: [PATCH 0740/1273] Compile PHP modules in version specific directories

---
 .../tasks/setup-Debian.yml                    | 24 -------------------
 .../drupalvm.php-versions/vars/Debian.yml     |  5 ++++
 .../drupalvm.php-versions/vars/RedHat.yml     |  4 ++++
 provisioning/tasks/php.yml                    |  2 +-
 4 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/provisioning/roles/drupalvm.php-versions/tasks/setup-Debian.yml b/provisioning/roles/drupalvm.php-versions/tasks/setup-Debian.yml
index 49f32f0e3..3eff9d9df 100644
--- a/provisioning/roles/drupalvm.php-versions/tasks/setup-Debian.yml
+++ b/provisioning/roles/drupalvm.php-versions/tasks/setup-Debian.yml
@@ -2,7 +2,6 @@
 - name: Add repository for PHP versions (Ubuntu).
   apt_repository: repo='ppa:ondrej/php'
   when: ansible_distribution == "Ubuntu"
-  register: php_ondrej_ubuntu_repo
 
 - name: Add repository for PHP 5 compatibility packages (Ubuntu).
   apt_repository: repo='ppa:ondrej/php5-compat'
@@ -46,26 +45,3 @@
     - "{{ php_packages|regex_replace('php' + php_version, 'php5.6') }}"
     - "{{ php_packages|regex_replace('php' + php_version, 'php7.0') }}"
     - "{{ php_packages|regex_replace('php' + php_version, 'php7.1') }}"
-  register: php_purge
-
-- name: Purge PHP packages installed by default.
-  apt:
-    name: "{{ item }}"
-    state: absent
-    purge: yes
-    force: yes
-  when: >
-    php_purge.changed or
-    php_ondrej_ubuntu_repo.changed or
-    php_ondrej_debian_repo.changed
-  with_items:
-    - php-common
-
-- name: Purge PHP modules directory.
-  file:
-    path: "{{ item }}"
-    state: absent
-  when: php_purge.changed
-  with_items:
-    - "/usr/lib/php5/modules"
-    - "/usr/lib/php/modules"
diff --git a/provisioning/roles/drupalvm.php-versions/vars/Debian.yml b/provisioning/roles/drupalvm.php-versions/vars/Debian.yml
index 22383cfcd..424c8c6b1 100644
--- a/provisioning/roles/drupalvm.php-versions/vars/Debian.yml
+++ b/provisioning/roles/drupalvm.php-versions/vars/Debian.yml
@@ -16,6 +16,11 @@ php_redis_package: "php{{ php_version }}-redis"
 php_memcached_package: "php{{ php_version }}-memcached"
 php_pgsql_package: "php{{ php_version }}-pgsql"
 
+php_tideways_module_path: "/usr/lib/php/{{ php_version }}/modules"
+php_uploadprogress_module_path: "/usr/lib/php/{{ php_version }}/modules"
+php_xdebug_module_path: "/usr/lib/php/{{ php_version }}/modules"
+php_xhprof_module_path: "/usr/lib/php/{{ php_version }}/modules"
+
 php_packages:
   - "php{{ php_version }}"
   - "php{{ php_version }}-apcu"
diff --git a/provisioning/roles/drupalvm.php-versions/vars/RedHat.yml b/provisioning/roles/drupalvm.php-versions/vars/RedHat.yml
index ed97d539c..bca09b456 100644
--- a/provisioning/roles/drupalvm.php-versions/vars/RedHat.yml
+++ b/provisioning/roles/drupalvm.php-versions/vars/RedHat.yml
@@ -1 +1,5 @@
 ---
+php_tideways_module_path: "/usr/lib64/php{{ php_version }}/modules"
+php_uploadprogress_module_path: "/usr/lib64/php{{ php_version }}/modules"
+php_xdebug_module_path: "/usr/lib64/php{{ php_version }}/modules"
+php_xhprof_module_path: "/usr/lib64/php{{ php_version }}/modules"
diff --git a/provisioning/tasks/php.yml b/provisioning/tasks/php.yml
index 27282d134..277763522 100644
--- a/provisioning/tasks/php.yml
+++ b/provisioning/tasks/php.yml
@@ -16,4 +16,4 @@
     path: "/root/php{{ php_version }}"
     state: directory
     mode: 0775
-  tags: ['php', 'xdebug']
+  tags: ['xdebug']

From 9691184ae4160ae2374e3ecbcdf4c5de6c39516a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 22 Apr 2017 11:30:34 -0500
Subject: [PATCH 0741/1273] Document missing php_packages addition for RedHat

---
 provisioning/vars/RedHat.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/vars/RedHat.yml b/provisioning/vars/RedHat.yml
index 29b087584..c5cf1bf3c 100644
--- a/provisioning/vars/RedHat.yml
+++ b/provisioning/vars/RedHat.yml
@@ -1,5 +1,5 @@
 ---
-# Defaults set by `ansible-role-php` with the addition of `php-pecl-yaml`.
+# Defaults set by `ansible-role-php` with the addition of `php-pecl-yaml` and `php-mcrypt`.
 php_packages:
   - php
   - php-cli

From 9e74b79c2fb2005eb6637ebcda5f5ede97cb835e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 22 Apr 2017 11:33:08 -0500
Subject: [PATCH 0742/1273] Move hostname_fqdn to default.config.yml

---
 default.config.yml         | 1 +
 provisioning/vars/main.yml | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.config.yml b/default.config.yml
index 15f319f6c..3db75c73f 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -319,4 +319,5 @@ selenium_version: 2.53.0
 # Other configuration.
 dashboard_install_dir: /var/www/dashboard
 known_hosts_path: ~/.ssh/known_hosts
+hostname_fqdn: "{{ vagrant_hostname }}"
 ssh_home: "{{ drupal_core_path }}"
diff --git a/provisioning/vars/main.yml b/provisioning/vars/main.yml
index 409247528..691ad8d42 100644
--- a/provisioning/vars/main.yml
+++ b/provisioning/vars/main.yml
@@ -5,5 +5,4 @@ _devtool_docroots:
   - "{{ php_xhprof_html_dir }}"
   - "{{ dashboard_install_dir|default('') }}"
 
-hostname_fqdn: "{{ vagrant_hostname }}"
 drupalvm_user: "{{ ansible_env.SUDO_USER | default(ansible_env.USER, true) | default(ansible_user_id, true) }}"

From d6868322bad95f491fb5fc0b2adb3bfbaa63cfa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 22 Apr 2017 14:06:50 -0500
Subject: [PATCH 0743/1273] Move php_opcache_conf_filename override to
 drupalvm.php-versions

---
 .../roles/drupalvm.php-versions/tasks/setup-Debian.yml      | 5 +++++
 provisioning/tasks/php.yml                                  | 6 ------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/provisioning/roles/drupalvm.php-versions/tasks/setup-Debian.yml b/provisioning/roles/drupalvm.php-versions/tasks/setup-Debian.yml
index 3eff9d9df..4e6d73da7 100644
--- a/provisioning/roles/drupalvm.php-versions/tasks/setup-Debian.yml
+++ b/provisioning/roles/drupalvm.php-versions/tasks/setup-Debian.yml
@@ -1,4 +1,9 @@
 ---
+- name: Set the correct opcache filename (Ubuntu).
+  set_fact:
+    php_opcache_conf_filename: "10-opcache.ini"
+  when: ansible_distribution == "Ubuntu"
+
 - name: Add repository for PHP versions (Ubuntu).
   apt_repository: repo='ppa:ondrej/php'
   when: ansible_distribution == "Ubuntu"
diff --git a/provisioning/tasks/php.yml b/provisioning/tasks/php.yml
index 277763522..fc3f9dfa5 100644
--- a/provisioning/tasks/php.yml
+++ b/provisioning/tasks/php.yml
@@ -5,12 +5,6 @@
   when: drupalvm_webserver == 'nginx'
   tags: ['webserver', 'database', 'php']
 
-- name: Set the correct opcache filename (Ubuntu).
-  set_fact:
-    php_opcache_conf_filename: "10-opcache.ini"
-  when: ansible_distribution == "Ubuntu"
-  tags: ['php']
-
 - name: Ensure PHP version -specific workspace directory exists.
   file:
     path: "/root/php{{ php_version }}"

From e95a78c092939f1b389b9eebcc88fe55f971256e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 22 Apr 2017 14:20:32 -0500
Subject: [PATCH 0744/1273] Add webserver tag to define php_xhprof_html_dir
 task

In case xhprof isn not enabled but the default vhost is.
---
 provisioning/tasks/init-Debian.yml | 1 +
 provisioning/tasks/init-RedHat.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/provisioning/tasks/init-Debian.yml b/provisioning/tasks/init-Debian.yml
index 8857574af..cfaa159e2 100644
--- a/provisioning/tasks/init-Debian.yml
+++ b/provisioning/tasks/init-Debian.yml
@@ -23,3 +23,4 @@
   set_fact:
     php_xhprof_html_dir: "/usr/share/php/xhprof_html"
   when: php_xhprof_html_dir is not defined
+  tags: ['webserver']
diff --git a/provisioning/tasks/init-RedHat.yml b/provisioning/tasks/init-RedHat.yml
index 9c89fe3f7..50e1ce6d9 100644
--- a/provisioning/tasks/init-RedHat.yml
+++ b/provisioning/tasks/init-RedHat.yml
@@ -16,3 +16,4 @@
   set_fact:
     php_xhprof_html_dir: "/usr/share/pear/xhprof_html"
   when: php_xhprof_html_dir is not defined
+  tags: ['webserver']

From 4e962f0ebdaf0dd82e5d6f4b1e09e23a98ae57f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 22 Apr 2017 14:29:08 -0500
Subject: [PATCH 0745/1273] Fix tags definitino syntax for
 geerlingguy.repo-remi role

---
 provisioning/playbook.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 465391f6c..74cf9debf 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -28,7 +28,7 @@
 
   roles:
     # Essential roles.
-    - { role: geerlingguy.repo-remi, when: ansible_os_family == 'RedHat', tags: ['webserver, php'] }
+    - { role: geerlingguy.repo-remi, when: ansible_os_family == 'RedHat', tags: ['webserver', 'php'] }
     - { role: drupalvm.hostname }
     - { role: geerlingguy.firewall }
     - { role: geerlingguy.git }

From 9db433a2f368616843d40a48eb3b3c948b4acd44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 22 Apr 2017 14:41:37 -0500
Subject: [PATCH 0746/1273] Add database tag to drupalvm.php-versions for
 php_mysql_package.

---
 provisioning/playbook.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 74cf9debf..e3b6cd385 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -36,7 +36,7 @@
     - { role: geerlingguy.apache, when: drupalvm_webserver == 'apache', tags: ['webserver']}
     - { role: geerlingguy.apache-php-fpm, when: drupalvm_webserver == 'apache', tags: ['webserver'] }
     - { role: geerlingguy.nginx, when: drupalvm_webserver == 'nginx', tags: ['webserver'] }
-    - { role: drupalvm.php-versions, tags: ['php', 'xdebug'] }
+    - { role: drupalvm.php-versions, tags: ['php', 'xdebug', 'database'] }
     - { role: geerlingguy.php, tags: ['php'] }
     - { role: geerlingguy.php-pecl, tags: ['php'] }
     - { role: geerlingguy.composer }

From ee4034f83d76824047da59161ccfff2295f814e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 22 Apr 2017 15:58:13 -0500
Subject: [PATCH 0747/1273] Add php tags to all php modules to allow version
 changes

---
 provisioning/playbook.yml  | 11 +++++++----
 provisioning/tasks/php.yml |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index e3b6cd385..167d8a3e2 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -49,24 +49,27 @@
     - { role: geerlingguy.drupal-console, when: 'drupal_major_version > 7 and "drupalconsole" in installed_extras' }
     - { role: geerlingguy.drush, when: '"drush" in installed_extras' }
     - { role: geerlingguy.memcached, when: '"memcached" in installed_extras' }
-    - { role: geerlingguy.php-memcached, when: '"memcached" in installed_extras' }
+    - { role: geerlingguy.php-memcached, when: '"memcached" in installed_extras', tags: ['php'] }
 
     - role: geerlingguy.php-tideways
       workspace: "/root/php{{ php_version }}"
       when: '"tideways" in installed_extras'
+      tags: ['php']
 
     - role: geerlingguy.php-xdebug
       workspace: "/root/php{{ php_version }}"
       when: '"xdebug" in installed_extras'
-      tags: ['xdebug']
+      tags: ['php', 'xdebug']
 
     - role: geerlingguy.php-xhprof
       workspace: "/root/php{{ php_version }}"
       when: '"xhprof" in installed_extras'
+      tags: ['php']
 
     - role: thom8.php-upload-progress
       workspace: "/root/php{{ php_version }}"
       when: '"upload-progress" in installed_extras'
+      tags: ['php']
 
     - { role: geerlingguy.blackfire, when: '"blackfire" in installed_extras' }
     - { role: geerlingguy.adminer, when: '"adminer" in installed_extras', tags: ['database'] }
@@ -76,7 +79,7 @@
     - { role: franklinkim.newrelic, when: '"newrelic" in installed_extras' }
     - { role: geerlingguy.nodejs, when: '"nodejs" in installed_extras' }
     - { role: geerlingguy.redis, when: '"redis" in installed_extras' }
-    - { role: geerlingguy.php-redis, when: '"redis" in installed_extras' }
+    - { role: geerlingguy.php-redis, when: '"redis" in installed_extras', tags: ['php'] }
     - { role: geerlingguy.ruby, when: '"ruby" in installed_extras' }
 
     - role: geerlingguy.java
@@ -111,7 +114,7 @@
 
     - include: tasks/dashboard.yml
       when: dashboard_install_dir is defined and dashboard_install_dir != ''
-      tags: ['webserver', 'database']
+      tags: ['webserver', 'database', 'php']
 
     - name: Run configured post-provision shell scripts.
       script: "{{ item }}"
diff --git a/provisioning/tasks/php.yml b/provisioning/tasks/php.yml
index fc3f9dfa5..df572a567 100644
--- a/provisioning/tasks/php.yml
+++ b/provisioning/tasks/php.yml
@@ -10,4 +10,4 @@
     path: "/root/php{{ php_version }}"
     state: directory
     mode: 0775
-  tags: ['xdebug']
+  tags: ['php', 'xdebug']

From 177c678a8d5367aeabf0ad63c3222bb789266890 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 22 Apr 2017 12:13:03 -0500
Subject: [PATCH 0748/1273] Issue #1324: Only depend on geerlingguy.nginx when
 drupalvm_webserver is nginx

---
 provisioning/roles/drupalvm.www/README.md     | 2 +-
 provisioning/roles/drupalvm.www/meta/main.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/provisioning/roles/drupalvm.www/README.md b/provisioning/roles/drupalvm.www/README.md
index ef1effa04..e1a08d49f 100644
--- a/provisioning/roles/drupalvm.www/README.md
+++ b/provisioning/roles/drupalvm.www/README.md
@@ -12,7 +12,7 @@ There are a few defaults defined, but you shouldn't really need to worry about t
 
 ## Dependencies
 
-  - geerlingguy.nginx
+  - geerlingguy.nginx if `drupalvm_webserver` is set to `nginx`.
 
 ## Example Playbook
 
diff --git a/provisioning/roles/drupalvm.www/meta/main.yml b/provisioning/roles/drupalvm.www/meta/main.yml
index bbfccc488..cc51852a0 100644
--- a/provisioning/roles/drupalvm.www/meta/main.yml
+++ b/provisioning/roles/drupalvm.www/meta/main.yml
@@ -28,4 +28,4 @@ galaxy_info:
     - vagrant
 
 dependencies:
-  - geerlingguy.nginx
+  - { role: geerlingguy.nginx, when: drupalvm_webserver == 'nginx' }

From c75dd234082245c329de63fc94213eea11fa588a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 22 Apr 2017 16:43:08 -0500
Subject: [PATCH 0749/1273] Mention myself in author information of new roles
 [ci skip]

---
 provisioning/roles/drupalvm.hostname/README.md     | 2 +-
 provisioning/roles/drupalvm.php-versions/README.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/provisioning/roles/drupalvm.hostname/README.md b/provisioning/roles/drupalvm.hostname/README.md
index 37f72b905..914954384 100644
--- a/provisioning/roles/drupalvm.hostname/README.md
+++ b/provisioning/roles/drupalvm.hostname/README.md
@@ -44,4 +44,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2017 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
+This role was created in 2017 by [Oskar Schöldström](http://oxy.fi) and [Jeff Geerling](https://www.jeffgeerling.com/) (author of [Ansible for DevOps](https://www.ansiblefordevops.com/)).
diff --git a/provisioning/roles/drupalvm.php-versions/README.md b/provisioning/roles/drupalvm.php-versions/README.md
index cc5cf0182..df076623b 100644
--- a/provisioning/roles/drupalvm.php-versions/README.md
+++ b/provisioning/roles/drupalvm.php-versions/README.md
@@ -33,4 +33,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2017 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
+This role was created in 2017 by [Oskar Schöldström](http://oxy.fi) and [Jeff Geerling](https://www.jeffgeerling.com/) (author of [Ansible for DevOps](https://www.ansiblefordevops.com/)).

From b25caf70d400d054b382cc88f8ca8d516336c046 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 22 Apr 2017 21:54:51 -0500
Subject: [PATCH 0750/1273] Issue #1330: Update CHANGELOG for 4.4.4 release.

---
 CHANGELOG.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 917a728c5..d57467eaa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Drupal VM Changelog
 
+## 4.4.4 (2017-04-22)
+
+### New/changed variables in default.config.yml
+
+  * N/A
+
+### Improvements
+
+  * #1271: Don't run PHP role for 'drupal' tag.
+  * Updated Ansible roles: `postgresql`, `drupal`.
+  * #1323: Default synced folder type to `vagrant_synced_folder_default_type` if unset.
+
+### Bugfixes
+
+  * #1324: Only depend on `geerlingguy.nginx` when `drupalvm_webserver` is `nginx`.
+
+
 ## 4.4.3 (2017-04-20)
 
 ### New/changed variables in default.config.yml

From ae4c8031d7ff6f8e362595bbca2acdc7e2594167 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 22 Apr 2017 23:03:32 -0500
Subject: [PATCH 0751/1273] Split Vagrantfile logic into separate lib file

---
 Vagrantfile             | 93 +++++++--------------------------------
 lib/drupalvm/vagrant.rb | 97 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 112 insertions(+), 78 deletions(-)
 create mode 100644 lib/drupalvm/vagrant.rb

diff --git a/Vagrantfile b/Vagrantfile
index 6e3ac870f..f7b4d26d6 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -2,6 +2,8 @@
 # vi: set ft=ruby :
 VAGRANTFILE_API_VERSION = '2' unless defined? VAGRANTFILE_API_VERSION
 
+require './lib/drupalvm/vagrant'
+
 # Absolute paths on the host machine.
 host_drupalvm_dir = File.dirname(File.expand_path(__FILE__))
 host_project_dir = ENV['DRUPALVM_PROJECT_ROOT'] || host_drupalvm_dir
@@ -14,58 +16,14 @@ guest_config_dir = ENV['DRUPALVM_CONFIG_DIR'] ? "/vagrant/#{ENV['DRUPALVM_CONFIG
 
 drupalvm_env = ENV['DRUPALVM_ENV'] || 'vagrant'
 
-# Cross-platform way of finding an executable in the $PATH.
-def which(cmd)
-  exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
-  ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
-    exts.each do |ext|
-      exe = File.join(path, "#{cmd}#{ext}")
-      return exe if File.executable?(exe) && !File.directory?(exe)
-    end
-  end
-  nil
-end
-
-def get_ansible_version(exe)
-  /^[^\s]+ (.+)$/.match(`#{exe} --version`) { |match| return match[1] }
-end
-
-def walk(obj, &fn)
-  if obj.is_a?(Array)
-    obj.map { |value| walk(value, &fn) }
-  elsif obj.is_a?(Hash)
-    obj.each_pair { |key, value| obj[key] = walk(value, &fn) }
-  else
-    obj = yield(obj)
-  end
-end
-
-require 'yaml'
-# Load default VM configurations.
-vconfig = YAML.load_file("#{host_drupalvm_dir}/default.config.yml")
-# Use optional config.yml and local.config.yml for configuration overrides.
-['config.yml', 'local.config.yml', "#{drupalvm_env}.config.yml"].each do |config_file|
-  if File.exist?("#{host_config_dir}/#{config_file}")
-    optional_config = YAML.load_file("#{host_config_dir}/#{config_file}")
-    vconfig.merge!(optional_config) if optional_config
-  end
-end
-
-# Replace jinja variables in config.
-vconfig = walk(vconfig) do |value|
-  while value.is_a?(String) && value.match(/{{ .* }}/)
-    value = value.gsub(/{{ (.*?) }}/) { vconfig[Regexp.last_match(1)] }
-  end
-  value
-end
-
-Vagrant.require_version ">= #{vconfig['drupalvm_vagrant_version_min']}"
+vconfig = load_config([
+  "#{host_drupalvm_dir}/default.config.yml",
+  "#{host_config_dir}/config.yml",
+  "#{host_config_dir}/local.config.yml",
+  "#{host_config_dir}/#{drupalvm_env}.config.yml",
+])
 
-ansible_bin = which('ansible-playbook')
-ansible_version = Gem::Version.new(get_ansible_version(ansible_bin)) if ansible_bin
-ansible_version_min = Gem::Version.new(vconfig['drupalvm_ansible_version_min'])
-
-provisioner = ansible_bin && !vconfig['force_ansible_local'] ? :ansible : :ansible_local
+provisioner = vconfig['force_ansible_local'] ? :ansible_local : get_provisioner
 if provisioner == :ansible
   playbook = "#{host_drupalvm_dir}/provisioning/playbook.yml"
   config_dir = host_config_dir
@@ -74,9 +32,9 @@ else
   config_dir = guest_config_dir
 end
 
-if provisioner == :ansible && ansible_version < ansible_version_min
-  raise Vagrant::Errors::VagrantError.new, "You must update Ansible to at least #{ansible_version_min} to use this version of Drupal VM."
-end
+# Verify version requirements.
+require_ansible_version ">= #{vconfig['drupalvm_ansible_version_min']}"
+Vagrant.require_version ">= #{vconfig['drupalvm_vagrant_version_min']}"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # Networking configuration.
@@ -100,32 +58,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # Vagrant box.
   config.vm.box = vconfig['vagrant_box']
 
-  if vconfig.include?('vagrant_post_up_message')
-    config.vm.post_up_message = vconfig['vagrant_post_up_message']
-  else
-    config.vm.post_up_message = 'Your Drupal VM Vagrant box is ready to use!'\
-      "\n* Visit the dashboard for an overview of your site: http://dashboard.#{vconfig['vagrant_hostname']} (or http://#{vconfig['vagrant_ip']})"\
-      "\n* You can SSH into your machine with `vagrant ssh`."\
-      "\n* Find out more in the Drupal VM documentation at http://docs.drupalvm.com"
-  end
+  # Display an introduction message after `vagrant up` and `vagrant provision`.
+  config.vm.post_up_message = vconfig.fetch('vagrant_post_up_message', get_default_post_up_message(vconfig))
 
   # If a hostsfile manager plugin is installed, add all server names as aliases.
-  aliases = []
-  if vconfig['drupalvm_webserver'] == 'apache'
-    vconfig['apache_vhosts'].each do |host|
-      aliases.push(host['servername'])
-      aliases.concat(host['serveralias'].split) if host['serveralias']
-    end
-  else
-    vconfig['nginx_hosts'].each do |host|
-      aliases.concat(host['server_name'].split)
-      aliases.concat(host['server_name_redirect'].split) if host['server_name_redirect']
-    end
-  end
-  aliases = aliases.uniq - [config.vm.hostname, vconfig['vagrant_ip']]
-  # Remove wildcard subdomains.
-  aliases.delete_if { |vhost| vhost.include?('*') }
-
+  aliases = get_vhost_aliases(vconfig) - [config.vm.hostname]
   if Vagrant.has_plugin?('vagrant-hostsupdater')
     config.hostsupdater.aliases = aliases
   elsif Vagrant.has_plugin?('vagrant-hostmanager')
diff --git a/lib/drupalvm/vagrant.rb b/lib/drupalvm/vagrant.rb
new file mode 100644
index 000000000..7a48d2ff2
--- /dev/null
+++ b/lib/drupalvm/vagrant.rb
@@ -0,0 +1,97 @@
+require 'yaml'
+
+# Cross-platform way of finding an executable in the $PATH.
+def which(cmd)
+  exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+  ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+    exts.each do |ext|
+      exe = File.join(path, "#{cmd}#{ext}")
+      return exe if File.executable?(exe) && !File.directory?(exe)
+    end
+  end
+  nil
+end
+
+# Recursively walk an tree and run provided block on each value found.
+def walk(obj, &fn)
+  if obj.is_a?(Array)
+    obj.map { |value| walk(value, &fn) }
+  elsif obj.is_a?(Hash)
+    obj.each_pair { |key, value| obj[key] = walk(value, &fn) }
+  else
+    obj = yield(obj)
+  end
+end
+
+# Resolve jinja variables in hash.
+def resolve_jinja_variables(vconfig)
+  walk(vconfig) do |value|
+    while value.is_a?(String) && value.match(/{{ .* }}/)
+      value = value.gsub(/{{ (.*?) }}/) { vconfig[Regexp.last_match(1)] }
+    end
+    value
+  end
+end
+
+# Return the combined configuration content all files provided.
+def load_config(files)
+  vconfig = {}
+  files.each do |config_file|
+    if File.exist?(config_file)
+      optional_config = YAML.load_file(config_file)
+      vconfig.merge!(optional_config) if optional_config
+    end
+  end
+  resolve_jinja_variables(vconfig)
+end
+
+
+# Return the ansible version parsed from running the executable path provided.
+def get_ansible_version(exe)
+  /^[^\s]+ (.+)$/.match(`#{exe} --version`) { |match| return match[1] }
+end
+
+# Require that if installed, the ansible version meets the requirements.
+def require_ansible_version(requirement)
+  if !(ansible_bin = which('ansible-playbook'))
+    return
+  end
+  ansible_version = get_ansible_version(ansible_bin)
+  req = Gem::Requirement.new(requirement)
+  if req.satisfied_by?(Gem::Version.new(ansible_version))
+    return
+  end
+  raise Vagrant::Errors::VagrantError.new, "You must install an Ansible version #{requirement} to use this version of Drupal VM."
+end
+
+# Return which Vagrant provisioner to use.
+def get_provisioner
+  which('ansible-playbook') ? :ansible : :ansible_local
+end
+
+# Return a list of all virtualhost server names and aliases from a config hash.
+def get_vhost_aliases(vconfig)
+  aliases = []
+  if vconfig['drupalvm_webserver'] == 'apache'
+    vconfig['apache_vhosts'].each do |host|
+      aliases.push(host['servername'])
+      aliases.concat(host['serveralias'].split) if host['serveralias']
+    end
+  else
+    vconfig['nginx_hosts'].each do |host|
+      aliases.concat(host['server_name'].split)
+      aliases.concat(host['server_name_redirect'].split) if host['server_name_redirect']
+    end
+  end
+  aliases = aliases.uniq - [vconfig['vagrant_ip']]
+  # Remove wildcard subdomains.
+  aliases.delete_if { |vhost| vhost.include?('*') }
+end
+
+# Return a default post_up_message.
+def get_default_post_up_message(vconfig)
+  'Your Drupal VM Vagrant box is ready to use!'\
+    "\n* Visit the dashboard for an overview of your site: http://dashboard.#{vconfig['vagrant_hostname']} (or http://#{vconfig['vagrant_ip']})"\
+    "\n* You can SSH into your machine with `vagrant ssh`."\
+    "\n* Find out more in the Drupal VM documentation at http://docs.drupalvm.com"
+end

From ec3ffd9291b0064f38fd6182a3a14ecf4538b6ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 22 Apr 2017 23:04:36 -0500
Subject: [PATCH 0752/1273] Use Hash fetch() to simplify and/or require
 variables

---
 Vagrantfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index f7b4d26d6..59926e849 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -74,20 +74,20 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # Synced folders.
   vconfig['vagrant_synced_folders'].each do |synced_folder|
     options = {
-      type: synced_folder.include?('type') ? synced_folder['type'] : vconfig['vagrant_synced_folder_default_type'],
+      type: synced_folder.fetch('type', vconfig['vagrant_synced_folder_default_type']),
       rsync__auto: 'true',
       rsync__exclude: synced_folder['excluded_paths'],
       rsync__args: ['--verbose', '--archive', '--delete', '-z', '--chmod=ugo=rwX'],
       id: synced_folder['id'],
-      create: synced_folder.include?('create') ? synced_folder['create'] : false,
-      mount_options: synced_folder.include?('mount_options') ? synced_folder['mount_options'] : []
+      create: synced_folder.fetch('create', false),
+      mount_options: synced_folder.fetch('mount_options', [])
     }
     if synced_folder.include?('options_override')
       synced_folder['options_override'].each do |key, value|
         options[key.to_sym] = value
       end
     end
-    config.vm.synced_folder synced_folder['local_path'], synced_folder['destination'], options
+    config.vm.synced_folder synced_folder.fetch('local_path'), synced_folder.fetch('destination'), options
   end
 
   # Allow override of the default synced folder type.

From 0e609641d37b9cd2407aeb99e11a452565ea31ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 22 Apr 2017 23:05:01 -0500
Subject: [PATCH 0753/1273] More cleanup

---
 Vagrantfile | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 59926e849..4b6b52919 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,6 +1,5 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
-VAGRANTFILE_API_VERSION = '2' unless defined? VAGRANTFILE_API_VERSION
 
 require './lib/drupalvm/vagrant'
 
@@ -36,19 +35,19 @@ end
 require_ansible_version ">= #{vconfig['drupalvm_ansible_version_min']}"
 Vagrant.require_version ">= #{vconfig['drupalvm_vagrant_version_min']}"
 
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+Vagrant.configure('2') do |config|
+  # Set the name of the VM. See: http://stackoverflow.com/a/17864388/100134
+  config.vm.define vconfig['vagrant_machine_name']
+
   # Networking configuration.
   config.vm.hostname = vconfig['vagrant_hostname']
-  if vconfig['vagrant_ip'] == '0.0.0.0' && Vagrant.has_plugin?('vagrant-auto_network')
-    config.vm.network :private_network, ip: vconfig['vagrant_ip'], auto_network: true
-  else
-    config.vm.network :private_network, ip: vconfig['vagrant_ip']
-  end
+  config.vm.network :private_network,
+    ip: vconfig['vagrant_ip'],
+    auto_network: vconfig['vagrant_ip'] == '0.0.0.0' && Vagrant.has_plugin?('vagrant-auto_network')
 
-  if !vconfig['vagrant_public_ip'].empty? && vconfig['vagrant_public_ip'] == '0.0.0.0'
-    config.vm.network :public_network
-  elsif !vconfig['vagrant_public_ip'].empty?
-    config.vm.network :public_network, ip: vconfig['vagrant_public_ip']
+  if !vconfig['vagrant_public_ip'].empty?
+    config.vm.network :public_network,
+      ip: vconfig['vagrant_public_ip'] != '0.0.0.0' ? vconfig['vagrant_public_ip'] : nil
   end
 
   # SSH options.
@@ -133,9 +132,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     p.update_guest_tools = true
   end
 
-  # Set the name of the VM. See: http://stackoverflow.com/a/17864388/100134
-  config.vm.define vconfig['vagrant_machine_name']
-
   # Cache packages and dependencies if vagrant-cachier plugin is present.
   if Vagrant.has_plugin?('vagrant-cachier')
     config.cache.scope = :box

From 200978fbbce122c7cfc308769558f08c87a26a54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 22 Apr 2017 23:46:40 -0500
Subject: [PATCH 0754/1273] Fix rubocop warnings and add some exceptions.

ConditionalAssignment: No way
IndentArray: No way
AlignParameters: No way
---
 .travis.yml             |  2 +-
 Vagrantfile             | 13 +++++++---
 lib/drupalvm/vagrant.rb | 56 +++++++++++++++++++++++++----------------
 3 files changed, 45 insertions(+), 26 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 03c21228d..a6fc45160 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -89,7 +89,7 @@ script:
   - '[[ ! -z "${local_config}" ]] && docker exec ${container_id} bash -c "cp ${DRUPALVM_DIR}/${local_config} ${config_dir:-$DRUPALVM_DIR}/local.config.yml" || true'
 
   # Vagrantfile syntax check.
-  - 'rubocop ./Vagrantfile --except LineLength,Eval,MutableConstant,BlockLength'
+  - 'rubocop ./Vagrantfile ./lib/drupalvm --except LineLength,Eval,MutableConstant,BlockLength,ConditionalAssignment,IndentArray,AlignParameters'
 
   # Ansible syntax check.
   - 'docker exec --tty ${container_id} env TERM=xterm ansible-playbook ${DRUPALVM_DIR}/provisioning/playbook.yml --syntax-check'
diff --git a/Vagrantfile b/Vagrantfile
index 4b6b52919..273475ee0 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -15,14 +15,19 @@ guest_config_dir = ENV['DRUPALVM_CONFIG_DIR'] ? "/vagrant/#{ENV['DRUPALVM_CONFIG
 
 drupalvm_env = ENV['DRUPALVM_ENV'] || 'vagrant'
 
+default_config_file = "#{host_drupalvm_dir}/default.config.yml"
+unless File.exist?(default_config_file)
+  raise_message "Configuration file not found! Expected in #{default_config_file}"
+end
+
 vconfig = load_config([
-  "#{host_drupalvm_dir}/default.config.yml",
+  default_config_file,
   "#{host_config_dir}/config.yml",
   "#{host_config_dir}/local.config.yml",
-  "#{host_config_dir}/#{drupalvm_env}.config.yml",
+  "#{host_config_dir}/#{drupalvm_env}.config.yml"
 ])
 
-provisioner = vconfig['force_ansible_local'] ? :ansible_local : get_provisioner
+provisioner = vconfig['force_ansible_local'] ? :ansible_local : vagrant_provisioner
 if provisioner == :ansible
   playbook = "#{host_drupalvm_dir}/provisioning/playbook.yml"
   config_dir = host_config_dir
@@ -45,7 +50,7 @@ Vagrant.configure('2') do |config|
     ip: vconfig['vagrant_ip'],
     auto_network: vconfig['vagrant_ip'] == '0.0.0.0' && Vagrant.has_plugin?('vagrant-auto_network')
 
-  if !vconfig['vagrant_public_ip'].empty?
+  unless vconfig['vagrant_public_ip'].empty?
     config.vm.network :public_network,
       ip: vconfig['vagrant_public_ip'] != '0.0.0.0' ? vconfig['vagrant_public_ip'] : nil
   end
diff --git a/lib/drupalvm/vagrant.rb b/lib/drupalvm/vagrant.rb
index 7a48d2ff2..5048879f2 100644
--- a/lib/drupalvm/vagrant.rb
+++ b/lib/drupalvm/vagrant.rb
@@ -45,43 +45,57 @@ def load_config(files)
   resolve_jinja_variables(vconfig)
 end
 
+# Return the path to the ansible-playbook executable.
+def ansible_bin
+  @ansible_bin ||= which('ansible-playbook')
+end
 
 # Return the ansible version parsed from running the executable path provided.
-def get_ansible_version(exe)
-  /^[^\s]+ (.+)$/.match(`#{exe} --version`) { |match| return match[1] }
+def ansible_version
+  /^[^\s]+ (.+)$/.match(`#{ansible_bin} --version`) { |match| return match[1] }
 end
 
 # Require that if installed, the ansible version meets the requirements.
 def require_ansible_version(requirement)
-  if !(ansible_bin = which('ansible-playbook'))
-    return
-  end
-  ansible_version = get_ansible_version(ansible_bin)
+  return unless ansible_bin
   req = Gem::Requirement.new(requirement)
-  if req.satisfied_by?(Gem::Version.new(ansible_version))
-    return
-  end
-  raise Vagrant::Errors::VagrantError.new, "You must install an Ansible version #{requirement} to use this version of Drupal VM."
+  return if req.satisfied_by?(Gem::Version.new(ansible_version))
+  raise_message "You must install an Ansible version #{requirement} to use this version of Drupal VM."
+end
+
+def raise_message(msg)
+  raise Vagrant::Errors::VagrantError.new, msg
 end
 
 # Return which Vagrant provisioner to use.
-def get_provisioner
-  which('ansible-playbook') ? :ansible : :ansible_local
+def vagrant_provisioner
+  ansible_bin ? :ansible : :ansible_local
+end
+
+def get_apache_vhosts(vhosts)
+  aliases = []
+  vhosts.each do |host|
+    aliases.push(host['servername'])
+    aliases.concat(host['serveralias'].split) if host['serveralias']
+  end
+  aliases
+end
+
+def get_nginx_vhosts(vhosts)
+  aliases = []
+  vhosts.each do |host|
+    aliases.push(host['server_name'])
+    aliases.concat(host['server_name_redirect'].split) if host['server_name_redirect']
+  end
+  aliases
 end
 
 # Return a list of all virtualhost server names and aliases from a config hash.
 def get_vhost_aliases(vconfig)
-  aliases = []
   if vconfig['drupalvm_webserver'] == 'apache'
-    vconfig['apache_vhosts'].each do |host|
-      aliases.push(host['servername'])
-      aliases.concat(host['serveralias'].split) if host['serveralias']
-    end
+    aliases = get_apache_vhosts(vconfig['apache_vhosts'])
   else
-    vconfig['nginx_hosts'].each do |host|
-      aliases.concat(host['server_name'].split)
-      aliases.concat(host['server_name_redirect'].split) if host['server_name_redirect']
-    end
+    aliases = get_nginx_vhosts(vconfig['nginx_hosts'])
   end
   aliases = aliases.uniq - [vconfig['vagrant_ip']]
   # Remove wildcard subdomains.

From e3f57517f0c1d1240d1da9da56161f99c6211939 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sun, 23 Apr 2017 10:12:10 -0500
Subject: [PATCH 0755/1273] Update rsync options to be inline with Vagrant
 defaults

rsync__auto is true by default already.
rsync__args has --copy-links as a default.
---
 Vagrantfile | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 273475ee0..1d6de8a0c 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -79,17 +79,14 @@ Vagrant.configure('2') do |config|
   vconfig['vagrant_synced_folders'].each do |synced_folder|
     options = {
       type: synced_folder.fetch('type', vconfig['vagrant_synced_folder_default_type']),
-      rsync__auto: 'true',
       rsync__exclude: synced_folder['excluded_paths'],
-      rsync__args: ['--verbose', '--archive', '--delete', '-z', '--chmod=ugo=rwX'],
+      rsync__args: ['--verbose', '--archive', '--delete', '-z', '--copy-links', '--chmod=ugo=rwX'],
       id: synced_folder['id'],
       create: synced_folder.fetch('create', false),
       mount_options: synced_folder.fetch('mount_options', [])
     }
-    if synced_folder.include?('options_override')
-      synced_folder['options_override'].each do |key, value|
-        options[key.to_sym] = value
-      end
+    synced_folder.fetch('options_override', {}).each do |key, value|
+      options[key.to_sym] = value
     end
     config.vm.synced_folder synced_folder.fetch('local_path'), synced_folder.fetch('destination'), options
   end

From fe924a64987bb30d8d507d0a52a0f13c5446106b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sun, 23 Apr 2017 09:48:27 -0500
Subject: [PATCH 0756/1273] Add docs on using Drupal VM with other application
 eg Wordpress [ci skip]

---
 docs/other/wordpress-other-applications.md | 107 +++++++++++++++++++++
 mkdocs.yml                                 |   1 +
 2 files changed, 108 insertions(+)
 create mode 100644 docs/other/wordpress-other-applications.md

diff --git a/docs/other/wordpress-other-applications.md b/docs/other/wordpress-other-applications.md
new file mode 100644
index 000000000..5714db435
--- /dev/null
+++ b/docs/other/wordpress-other-applications.md
@@ -0,0 +1,107 @@
+While Drupal VM caters specifically to Drupal, and support for and compatibility with other PHP applications isn't guaranteed, Drupal VM is flexible enough to work with PHP applications besides Drupal.
+
+## Wordpress
+
+To integrate Drupal VM with an existing Wordpress project such as [bedrock](https://github.com/roots/bedrock), follow the documentation on using [Drupal VM as a Composer dependency](http://docs.drupalvm.com/en/latest/deployment/composer-dependency/).
+
+Begin by forking/cloning `bedrock` as a boilerplate for your application, and require Drupal VM as a development dependency.
+
+```yaml
+composer require --dev geerlingguy/drupal-vm
+```
+
+Configure the VM by creating a `config/config.yml`:
+
+```yaml
+vagrant_hostname: bedrock.dev
+vagrant_machine_name: bedrock
+
+vagrant_synced_folders:
+  - local_path: .
+    destination: /var/www/wordpress
+    type: nfs
+    create: true
+
+# Needs to match with what we have in .env and vagrant_synced_folders.
+drupal_core_path: "/var/www/wordpress/web"
+drupal_domain: "{{ vagrant_hostname }}"
+drupal_db_user: wordpress
+drupal_db_password: wordpress
+drupal_db_name: wordpress
+
+# Disable Drupal specific features.
+drupal_build_composer_project: false
+drupal_install_site: false
+configure_drush_aliases: false
+
+# Remove some Drupal extras such as `drupalconsole` and `drush`
+installed_extras:
+  - adminer
+  - mailhog
+  - pimpmylog
+
+# Add wp-cli
+composer_global_packages:
+  - { name: hirak/prestissimo, release: '^0.3' }
+  - { name: wp-cli/wp-cli, release: '^1.0.0' }
+```
+
+Create the delegating `Vagrantfile` in the root of the project:
+
+```rb
+# The absolute path to the root directory of the project. Both Drupal VM and
+# the config file need to be contained within this path.
+ENV['DRUPALVM_PROJECT_ROOT'] = "#{__dir__}"
+# The relative path from the project root to the config directory where you
+# placed your config.yml file.
+ENV['DRUPALVM_CONFIG_DIR'] = "config"
+# The relative path from the project root to the directory where Drupal VM is located.
+ENV['DRUPALVM_DIR'] = "vendor/geerlingguy/drupal-vm"
+
+# Load the real Vagrantfile
+load "#{__dir__}/#{ENV['DRUPALVM_DIR']}/Vagrantfile"
+```
+
+Edit your `.env` file to match the values you set in `config/config.yml`:
+
+```
+DB_NAME=wordpress
+DB_USER=wordpress
+DB_PASSWORD=wordpress
+DB_HOST=localhost
+
+WP_ENV=development
+WP_HOME=http://bedrock.dev
+WP_SITEURL=${WP_HOME}/wp
+```
+
+Ignore local Drupal VM configuration files by adding the following to your `.gitignore`:
+
+```
+Vagrantfile.local
+config/local.config.yml
+```
+
+Add a wp-cli `@dev` alias that points to the VM by editing the `wp-cli.yml` file:
+
+```yaml
+path: web/wp
+
+@dev:
+  ssh: vagrant@bedrock.dev/var/www/wordpress/web/wp
+  url: bedrock.dev
+```
+
+For passwordless login with `wp-cli` add the following to your SSH config `~/.ssh/config`:
+
+```
+Host bedrock.dev
+  StrictHostKeyChecking no
+  IdentityFile ~/.vagrant.d/insecure_private_key
+```
+
+Provision the VM and import your database.
+
+```sh
+vagrant up
+```
diff --git a/mkdocs.yml b/mkdocs.yml
index 701241eee..555a718ec 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -72,3 +72,4 @@ pages:
     - 'Drupal 6 Notes': 'other/drupal-6.md'
     - 'Drupal VM Management Tools': 'other/management-tools.md'
     - 'Deploying to a production environment': 'other/production.md'
+    - 'Wordpress or other applications': 'other/wordpress-other-applications.md'

From 6298a53bef579ca6fb9507a66c2e28fe506ff6df Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 24 Apr 2017 11:02:47 -0500
Subject: [PATCH 0757/1273] Fixes #1335: Update Drupal Console Role so it works
 correctly with rc17 and beyond.

---
 provisioning/requirements.yml                 |  2 +-
 .../geerlingguy.drupal-console/.gitignore     |  2 +
 .../geerlingguy.drupal-console/.travis.yml    | 45 +++++++------------
 .../roles/geerlingguy.drupal-console/LICENSE  | 20 +++++++++
 .../geerlingguy.drupal-console/README.md      |  6 +--
 .../geerlingguy.drupal-console/meta/main.yml  |  2 +-
 .../geerlingguy.drupal-console/tasks/main.yml |  5 ---
 .../tests/README.md                           | 11 +++++
 .../tests/inventory                           |  1 -
 .../tests/requirements.yml                    |  2 +
 .../tests/test-self-update.yml                | 11 ++---
 .../geerlingguy.drupal-console/tests/test.yml | 11 ++---
 12 files changed, 67 insertions(+), 51 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.drupal-console/.gitignore
 create mode 100644 provisioning/roles/geerlingguy.drupal-console/LICENSE
 create mode 100644 provisioning/roles/geerlingguy.drupal-console/tests/README.md
 delete mode 100644 provisioning/roles/geerlingguy.drupal-console/tests/inventory
 create mode 100644 provisioning/roles/geerlingguy.drupal-console/tests/requirements.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index c6ccbb570..7045b0cfd 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -20,7 +20,7 @@
 - src: geerlingguy.drupal
   version: 2.2.1
 - src: geerlingguy.drupal-console
-  version: 1.0.7
+  version: 1.1.0
 - src: geerlingguy.drush
   version: 2.0.1
 - src: geerlingguy.elasticsearch
diff --git a/provisioning/roles/geerlingguy.drupal-console/.gitignore b/provisioning/roles/geerlingguy.drupal-console/.gitignore
new file mode 100644
index 000000000..c9b2377e3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal-console/.gitignore
@@ -0,0 +1,2 @@
+*.retry
+tests/test.sh
diff --git a/provisioning/roles/geerlingguy.drupal-console/.travis.yml b/provisioning/roles/geerlingguy.drupal-console/.travis.yml
index 816fbddfa..76b7c4948 100644
--- a/provisioning/roles/geerlingguy.drupal-console/.travis.yml
+++ b/provisioning/roles/geerlingguy.drupal-console/.travis.yml
@@ -1,41 +1,26 @@
 ---
-sudo: required
-language: python
-python: "2.7"
+services: docker
 
 env:
-  - SITE=test.yml
-  - SITE=test-self-update.yml
-
-before_install:
-  - sudo apt-get update -qq
-
-install:
-  # Install Ansible.
-  - pip install ansible
-
-  # Add ansible.cfg to pick up roles path.
-  - "{ echo '[defaults]'; echo 'roles_path = ../'; } >> ansible.cfg"
-
-  # Install required dependencies.
-  - ansible-galaxy install geerlingguy.php
+  - distro: ubuntu1604
+    playbook: test.yml
+  - distro: ubuntu1604
+    playbook: test-self-update.yml
 
 script:
-  # Check the role/playbook's syntax.
-  - "ansible-playbook -i tests/inventory tests/$SITE --syntax-check"
+  # Configure test script so we can run extra tests after playbook is run.
+  - export container_id=$(date +%s)
+  - export cleanup=false
 
-  # Run the role/playbook with ansible-playbook.
-  - "ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo"
+  # Download test shim.
+  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
+  - chmod +x ${PWD}/tests/test.sh
 
-  # Run the role/playbook again, checking to make sure it's idempotent.
-  - >
-    ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
+  # Run tests.
+  - ${PWD}/tests/test.sh
 
-  # Check if Drupal Console is installed and working.
-  - drupal
+  # Ensure Drupal Console is installed and working.
+  - 'docker exec --tty ${container_id} env TERM=xterm drupal list || true'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.drupal-console/LICENSE b/provisioning/roles/geerlingguy.drupal-console/LICENSE
new file mode 100644
index 000000000..4275cf3c1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal-console/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Jeff Geerling
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/provisioning/roles/geerlingguy.drupal-console/README.md b/provisioning/roles/geerlingguy.drupal-console/README.md
index 83aa15b1d..0a46b09c7 100644
--- a/provisioning/roles/geerlingguy.drupal-console/README.md
+++ b/provisioning/roles/geerlingguy.drupal-console/README.md
@@ -6,7 +6,7 @@ Installs [Drupal Console](http://drupalconsole.com/) on any Linux or UNIX system
 
 ## Requirements
 
-`php` (version 5.4+) should be installed and working.
+`php` (version 5.6+) should be installed and working.
 
 ## Role Variables
 
@@ -32,7 +32,7 @@ The path to the Drupal Console configuration file.
 
     - hosts: servers
       roles:
-        - { role: geerlingguy.drupal-console }
+        - role: geerlingguy.drupal-console
 
 After the playbook runs, `drupal` will be placed in `/usr/local/bin/drupal` (this location is configurable), and will be accessible via normal system accounts.
 
@@ -42,4 +42,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2015 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
+This role was created in 2015 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.drupal-console/meta/main.yml b/provisioning/roles/geerlingguy.drupal-console/meta/main.yml
index b08456f77..9b13c630c 100644
--- a/provisioning/roles/geerlingguy.drupal-console/meta/main.yml
+++ b/provisioning/roles/geerlingguy.drupal-console/meta/main.yml
@@ -7,7 +7,7 @@ galaxy_info:
   description: Drupal Console
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 1.4
+  min_ansible_version: 1.8
   platforms:
   - name: EL
     versions:
diff --git a/provisioning/roles/geerlingguy.drupal-console/tasks/main.yml b/provisioning/roles/geerlingguy.drupal-console/tasks/main.yml
index 5be21946f..7f0801dcb 100644
--- a/provisioning/roles/geerlingguy.drupal-console/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.drupal-console/tasks/main.yml
@@ -9,11 +9,6 @@
     path: "{{ drupal_console_path }}"
     mode: 0755
 
-- name: Run Drupal Console init.
-  shell: >
-    php {{ drupal_console_path }} init
-    creates={{ drupal_console_config }}
-
 - name: Update Drupal Console to latest version (if configured).
   shell: >
     php {{ drupal_console_path }} self-update
diff --git a/provisioning/roles/geerlingguy.drupal-console/tests/README.md b/provisioning/roles/geerlingguy.drupal-console/tests/README.md
new file mode 100644
index 000000000..6fb211721
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal-console/tests/README.md
@@ -0,0 +1,11 @@
+# Ansible Role tests
+
+To run the test playbook(s) in this directory:
+
+  1. Install and start Docker.
+  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
+    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
+  1. Make the test shim executable: `chmod +x tests/test.sh`.
+  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
+
+If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.drupal-console/tests/inventory b/provisioning/roles/geerlingguy.drupal-console/tests/inventory
deleted file mode 100644
index 2fbb50c4a..000000000
--- a/provisioning/roles/geerlingguy.drupal-console/tests/inventory
+++ /dev/null
@@ -1 +0,0 @@
-localhost
diff --git a/provisioning/roles/geerlingguy.drupal-console/tests/requirements.yml b/provisioning/roles/geerlingguy.drupal-console/tests/requirements.yml
new file mode 100644
index 000000000..de297a054
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal-console/tests/requirements.yml
@@ -0,0 +1,2 @@
+---
+- src: geerlingguy.php
diff --git a/provisioning/roles/geerlingguy.drupal-console/tests/test-self-update.yml b/provisioning/roles/geerlingguy.drupal-console/tests/test-self-update.yml
index cb5934cc4..78b4fe2f7 100644
--- a/provisioning/roles/geerlingguy.drupal-console/tests/test-self-update.yml
+++ b/provisioning/roles/geerlingguy.drupal-console/tests/test-self-update.yml
@@ -1,15 +1,16 @@
 ---
-- hosts: localhost
-  remote_user: root
+- hosts: all
 
   vars:
     php_enable_webserver: false
     drupal_console_keep_updated: true
 
   pre_tasks:
-    - name: Add ondrej repository for PHP 5.6.
-      apt_repository: repo='ppa:ondrej/php5-5.6'
+    - name: Update apt cache.
+      apt: update_cache=yes cache_valid_time=600
+      when: ansible_os_family == 'Debian'
+      changed_when: false
 
   roles:
     - geerlingguy.php
-    - ansible-role-drupal-console
+    - role_under_test
diff --git a/provisioning/roles/geerlingguy.drupal-console/tests/test.yml b/provisioning/roles/geerlingguy.drupal-console/tests/test.yml
index cf4c49ce2..1896551a8 100644
--- a/provisioning/roles/geerlingguy.drupal-console/tests/test.yml
+++ b/provisioning/roles/geerlingguy.drupal-console/tests/test.yml
@@ -1,14 +1,15 @@
 ---
-- hosts: localhost
-  remote_user: root
+- hosts: all
 
   vars:
     php_enable_webserver: false
 
   pre_tasks:
-    - name: Add ondrej repository for PHP 5.6.
-      apt_repository: repo='ppa:ondrej/php5-5.6'
+    - name: Update apt cache.
+      apt: update_cache=yes cache_valid_time=600
+      when: ansible_os_family == 'Debian'
+      changed_when: false
 
   roles:
     - geerlingguy.php
-    - ansible-role-drupal-console
+    - role_under_test

From e671083ba41c165f13ff49851989ab87bc8fb1dc Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 24 Apr 2017 12:59:02 -0400
Subject: [PATCH 0758/1273] Issue #1338: Remove drupalconsole from default
 installed_extras list.

---
 default.config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.config.yml b/default.config.yml
index 15f319f6c..f91b3456b 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -193,7 +193,7 @@ postgresql_users:
 installed_extras:
   - adminer
   # - blackfire
-  - drupalconsole
+  # - drupalconsole
   - drush
   # - elasticsearch
   # - java

From 391a3262e21f7dc130262773a184fbf6b67fae9b Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 24 Apr 2017 13:00:34 -0400
Subject: [PATCH 0759/1273] Issue #1338: Remove drupalconsole from defaults in
 README.

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

diff --git a/README.md b/README.md
index 8b1e15ab4..a6b3b1d2b 100644
--- a/README.md
+++ b/README.md
@@ -102,7 +102,7 @@ By default, this VM includes the extras listed in the `config.yml` option `insta
     installed_extras:
       - adminer
       # - blackfire
-      - drupalconsole
+      # - drupalconsole
       - drush
       # - elasticsearch
       # - java

From 90c671d584c8d2e7196119b06e125946dd80ef3f Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 24 Apr 2017 13:57:19 -0400
Subject: [PATCH 0760/1273] Issue #1338: Update CHANGELOG for 4.4.5 release.

---
 CHANGELOG.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d57467eaa..fdb99bc70 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Drupal VM Changelog
 
+## 4.4.5 (2017-04-24)
+
+### New/changed variables in default.config.yml
+
+  * `drupalconsole` is no longer enabled globally by default (see #1335 and #1338).
+
+### Improvements
+
+  * #1333: Add docs on using Drupal VM with Wordpress and other PHP apps.
+
+### Bugfixes
+
+  * #1335: Update Drupal Console Role so it works correctly with rc17 and beyond.
+  * #1338: Remove drupalconsole from default installed_extras list.
+
+
 ## 4.4.4 (2017-04-22)
 
 ### New/changed variables in default.config.yml

From 576164d0e4f660633faa9717d15cc495b15100d0 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 25 Apr 2017 22:55:39 -0400
Subject: [PATCH 0761/1273] Fixes #1329: Update nginx role to latest version.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.nginx/.gitignore        |  2 +
 .../roles/geerlingguy.nginx/.travis.yml       | 42 ++++++-------------
 provisioning/roles/geerlingguy.nginx/LICENSE  | 20 +++++++++
 .../roles/geerlingguy.nginx/README.md         | 13 +++---
 .../roles/geerlingguy.nginx/defaults/main.yml |  2 +-
 .../roles/geerlingguy.nginx/meta/main.yml     |  6 ++-
 .../roles/geerlingguy.nginx/tasks/main.yml    |  3 ++
 .../geerlingguy.nginx/tasks/setup-OpenBSD.yml | 10 +++++
 .../roles/geerlingguy.nginx/tasks/vhosts.yml  | 25 +++++++----
 .../geerlingguy.nginx/templates/vhost.j2      | 31 ++++++++++++++
 .../geerlingguy.nginx/templates/vhosts.j2     | 33 ---------------
 .../roles/geerlingguy.nginx/tests/README.md   | 11 +++++
 .../roles/geerlingguy.nginx/tests/test.yml    | 12 ++++++
 .../roles/geerlingguy.nginx/vars/OpenBSD.yml  | 10 +++++
 15 files changed, 142 insertions(+), 80 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.nginx/.gitignore
 create mode 100644 provisioning/roles/geerlingguy.nginx/LICENSE
 create mode 100644 provisioning/roles/geerlingguy.nginx/tasks/setup-OpenBSD.yml
 create mode 100644 provisioning/roles/geerlingguy.nginx/templates/vhost.j2
 delete mode 100644 provisioning/roles/geerlingguy.nginx/templates/vhosts.j2
 create mode 100644 provisioning/roles/geerlingguy.nginx/tests/README.md
 create mode 100644 provisioning/roles/geerlingguy.nginx/vars/OpenBSD.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 7045b0cfd..2831dbe46 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -38,7 +38,7 @@
 - src: geerlingguy.mysql
   version: 2.7.2
 - src: geerlingguy.nginx
-  version: 2.0.0
+  version: 2.2.0
 - src: geerlingguy.nodejs
   version: 4.1.0
 - src: geerlingguy.php
diff --git a/provisioning/roles/geerlingguy.nginx/.gitignore b/provisioning/roles/geerlingguy.nginx/.gitignore
new file mode 100644
index 000000000..c9b2377e3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nginx/.gitignore
@@ -0,0 +1,2 @@
+*.retry
+tests/test.sh
diff --git a/provisioning/roles/geerlingguy.nginx/.travis.yml b/provisioning/roles/geerlingguy.nginx/.travis.yml
index c1f98605d..352227a9c 100644
--- a/provisioning/roles/geerlingguy.nginx/.travis.yml
+++ b/provisioning/roles/geerlingguy.nginx/.travis.yml
@@ -3,44 +3,28 @@ services: docker
 
 env:
   - distro: centos7
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
   - distro: ubuntu1604
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
   - distro: ubuntu1404
-    init: /sbin/init
-    run_opts: ""
   - distro: ubuntu1204
-    init: /sbin/init
-    run_opts: ""
-
-before_install:
-  # Pull container.
-  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
-  - container_id=$(mktemp)
-  # Run container in detached state.
-  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
+  # Configure test script so we can run extra tests after playbook is run.
+  - export container_id=$(date +%s)
+  - export cleanup=false
 
-  # Ansible syntax check.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+  # Download test shim.
+  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
+  - chmod +x ${PWD}/tests/test.sh
 
-  # Test role.
-  - 'docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+  # Run tests.
+  - ${PWD}/tests/test.sh
 
-  # Test role idempotence.
-  - idempotence=$(mktemp)
-  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
-  - >
-    tail ${idempotence}
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
+  # Setup test site.
+  - 'docker exec ${container_id} mkdir -p /var/www/test'
+  - 'docker exec ${container_id} bash -c "echo Success >| /var/www/test/index.html"'
 
-  # Check if nginx is running.
-  # TODO
+  # Make sure virtualhost exists.
+  - 'docker exec --tty ${container_id} env TERM=xterm curl http://test.dev/ | grep "Success"'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.nginx/LICENSE b/provisioning/roles/geerlingguy.nginx/LICENSE
new file mode 100644
index 000000000..4275cf3c1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nginx/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Jeff Geerling
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/provisioning/roles/geerlingguy.nginx/README.md b/provisioning/roles/geerlingguy.nginx/README.md
index 12549b40b..d76df5b25 100644
--- a/provisioning/roles/geerlingguy.nginx/README.md
+++ b/provisioning/roles/geerlingguy.nginx/README.md
@@ -2,9 +2,9 @@
 
 [![Build Status](https://travis-ci.org/geerlingguy/ansible-role-nginx.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-nginx)
 
-Installs Nginx on RedHat/CentOS or Debian/Ubuntu Linux, or FreeBSD servers.
+Installs Nginx on RedHat/CentOS or Debian/Ubuntu Linux, FreeBSD or OpenBSD servers.
 
-This role installs and configures the latest version of Nginx from the Nginx yum repository (on RedHat-based systems) or via apt (on Debian-based systems) or pkgng (on FreeBSD systems). You will likely need to do extra setup work after this role has installed Nginx, like adding your own [virtualhost].conf file inside `/etc/nginx/conf.d/`, describing the location and options to use for your particular website.
+This role installs and configures the latest version of Nginx from the Nginx yum repository (on RedHat-based systems) or via apt (on Debian-based systems) or pkgng (on FreeBSD systems) or pkg_add (on OpenBSD systems). You will likely need to do extra setup work after this role has installed Nginx, like adding your own [virtualhost].conf file inside `/etc/nginx/conf.d/`, describing the location and options to use for your particular website.
 
 ## Requirements
 
@@ -16,7 +16,7 @@ Available variables are listed below, along with default values (see `defaults/m
 
     nginx_vhosts: []
 
-A list of vhost definitions (server blocks) for Nginx virtual hosts. If left empty, you will need to supply your own virtual host configuration. See the commented example in `defaults/main.yml` for available server options. If you have a large number of customizations required for your server definition(s), you're likely better off managing the vhost configuration file yourself, leaving this variable set to `[]`.
+A list of vhost definitions (server blocks) for Nginx virtual hosts. Each entry will create a separate config file named by `server_name`. If left empty, you will need to supply your own virtual host configuration. See the commented example in `defaults/main.yml` for available server options. If you have a large number of customizations required for your server definition(s), you're likely better off managing the vhost configuration file yourself, leaving this variable set to `[]`.
 
     nginx_vhosts:
       - listen: "80 default_server"
@@ -26,6 +26,7 @@ A list of vhost definitions (server blocks) for Nginx virtual hosts. If left emp
         error_page: ""
         access_log: ""
         error_log: ""
+        state: "present"
         extra_parameters: |
           location ~ \.php$ {
               fastcgi_split_path_info ^(.+\.php)(/.+)$;
@@ -43,17 +44,13 @@ Please take note of the indentation in the above block. The first line should be
 
 Whether to remove the 'default' virtualhost configuration supplied by Nginx. Useful if you want the base `/` URL to be directed at one of your own virtual hosts configured in a separate .conf file.
 
-    nginx_vhosts_filename: "vhosts.conf"
-
-The filename to use to store vhosts configuration. If you run the role multiple times (e.g. include the role with `with_items`), you can change the name for each run, effectively creating a separate vhosts file per vhost configuration.
-
     nginx_upstreams: []
 
 If you are configuring Nginx as a load balancer, you can define one or more upstream sets using this variable. In addition to defining at least one upstream, you would need to configure one of your server blocks to proxy requests through the defined upstream (e.g. `proxy_pass http://myapp1;`). See the commented example in `defaults/main.yml` for more information.
 
     nginx_user: "nginx"
 
-The user under which Nginx will run. Defaults to `nginx` for RedHat, and `www-data` for Debian.
+The user under which Nginx will run. Defaults to `nginx` for RedHat, `www-data` for Debian and `www` on FreeBSD and OpenBSD.
 
     nginx_worker_processes: "{{ ansible_processor_vcpus|default(ansible_processor_count) }}"
     nginx_worker_connections: "1024"
diff --git a/provisioning/roles/geerlingguy.nginx/defaults/main.yml b/provisioning/roles/geerlingguy.nginx/defaults/main.yml
index cd139d982..eb0d3b5af 100644
--- a/provisioning/roles/geerlingguy.nginx/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.nginx/defaults/main.yml
@@ -50,7 +50,6 @@ nginx_extra_http_options: ""
 #      proxy_set_header   Host $http_host;
 
 nginx_remove_default_vhost: false
-nginx_vhosts_filename: "vhosts.conf"
 nginx_vhosts: []
 # Example vhost below, showing all available options:
 # - listen: "80 default_server" # default: "80 default_server"
@@ -63,6 +62,7 @@ nginx_vhosts: []
 #   access_log: ""
 #   error_log: ""
 #   extra_parameters: "" # Can be used to add extra config blocks (multiline).
+#   state: "absent" # To remove the vhost configuration.
 
 nginx_upstreams: []
 # - name: myapp1
diff --git a/provisioning/roles/geerlingguy.nginx/meta/main.yml b/provisioning/roles/geerlingguy.nginx/meta/main.yml
index fab65e4ea..a7f79fc95 100644
--- a/provisioning/roles/geerlingguy.nginx/meta/main.yml
+++ b/provisioning/roles/geerlingguy.nginx/meta/main.yml
@@ -3,7 +3,7 @@ dependencies: []
 
 galaxy_info:
   author: geerlingguy
-  description: Nginx installation for Linux and FreeBSD.
+  description: Nginx installation for Linux, FreeBSD and OpenBSD.
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
   min_ansible_version: 1.8
@@ -25,6 +25,10 @@ galaxy_info:
       - 10.1
       - 10.0
       - 9.3
+    - name: OpenBSD
+      versions:
+      - 5.9
+      - 6.0
   galaxy_tags:
     - development
     - web
diff --git a/provisioning/roles/geerlingguy.nginx/tasks/main.yml b/provisioning/roles/geerlingguy.nginx/tasks/main.yml
index 23638387f..6c420fe66 100644
--- a/provisioning/roles/geerlingguy.nginx/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.nginx/tasks/main.yml
@@ -21,6 +21,9 @@
 - include: setup-FreeBSD.yml
   when: ansible_os_family == 'FreeBSD'
 
+- include: setup-OpenBSD.yml
+  when: ansible_os_family == 'OpenBSD'
+
 # Vhost configuration.
 - include: vhosts.yml
 
diff --git a/provisioning/roles/geerlingguy.nginx/tasks/setup-OpenBSD.yml b/provisioning/roles/geerlingguy.nginx/tasks/setup-OpenBSD.yml
new file mode 100644
index 000000000..c660301ce
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nginx/tasks/setup-OpenBSD.yml
@@ -0,0 +1,10 @@
+---
+- name: Ensure nginx is installed.
+  openbsd_pkg:
+    name: "{{ nginx_package_name }}"
+    state: present
+
+- name: Create logs directory.
+  file:
+    path: /var/log/nginx
+    state: directory
diff --git a/provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml b/provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml
index cf27c146e..84485036f 100644
--- a/provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml
+++ b/provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml
@@ -12,17 +12,28 @@
     state: directory
   notify: reload nginx
 
-- name: Add managed vhost config file (if any vhosts are configured).
+- name: Add managed vhost config files.
   template:
-    src: vhosts.j2
-    dest: "{{ nginx_vhost_path }}/{{ nginx_vhosts_filename }}"
+    src: vhost.j2
+    dest: "{{ nginx_vhost_path }}/{{ item.server_name.split(' ')[0] }}.conf"
+    force: yes
+    owner: root
+    group: root
     mode: 0644
-  when: nginx_vhosts|length > 0
+  when: item.state|default('present') != 'absent'
+  with_items: "{{ nginx_vhosts }}"
   notify: reload nginx
 
-- name: Remove managed vhost config file (if no vhosts are configured).
+- name: Remove managed vhost config files.
   file:
-    path: "{{ nginx_vhost_path }}/{{ nginx_vhosts_filename }}"
+    path: "{{ nginx_vhost_path }}/{{ item.server_name.split(' ')[0] }}.conf"
+    state: absent
+  when: item.state|default('present') == 'absent'
+  with_items: "{{ nginx_vhosts }}"
+  notify: reload nginx
+
+- name: Remove legacy vhosts.conf file.
+  file:
+    path: "{{ nginx_vhost_path }}/vhosts.conf"
     state: absent
-  when: nginx_vhosts|length == 0
   notify: reload nginx
diff --git a/provisioning/roles/geerlingguy.nginx/templates/vhost.j2 b/provisioning/roles/geerlingguy.nginx/templates/vhost.j2
new file mode 100644
index 000000000..35e3de1b5
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nginx/templates/vhost.j2
@@ -0,0 +1,31 @@
+server {
+    listen {{ item.listen | default('80') }};
+
+{% if item.server_name is defined %}
+    server_name {{ item.server_name }};
+{% endif %}
+
+{% if item.root is defined %}
+    root {{ item.root }};
+{% endif %}
+
+    index {{ item.index | default('index.html index.htm') }};
+
+{% if item.error_page is defined %}
+    error_page {{ item.error_page }};
+{% endif %}
+{% if item.access_log is defined %}
+    access_log {{ item.access_log }};
+{% endif %}
+{% if item.error_log is defined %}
+    error_log {{ item.error_log }} error;
+{% endif %}
+
+{% if item.return is defined %}
+    return {{ item.return }};
+{% endif %}
+
+{% if item.extra_parameters is defined %}
+    {{ item.extra_parameters|indent(4) }}
+{% endif %}
+}
diff --git a/provisioning/roles/geerlingguy.nginx/templates/vhosts.j2 b/provisioning/roles/geerlingguy.nginx/templates/vhosts.j2
deleted file mode 100644
index e4e8c0517..000000000
--- a/provisioning/roles/geerlingguy.nginx/templates/vhosts.j2
+++ /dev/null
@@ -1,33 +0,0 @@
-{% for vhost in nginx_vhosts %}
-server {
-    listen {{ vhost.listen | default('80 default_server') }};
-
-{% if vhost.server_name is defined %}
-    server_name {{ vhost.server_name }};
-{% endif %}
-
-{% if vhost.root is defined %}
-    root {{ vhost.root }};
-{% endif %}
-
-    index {{ vhost.index | default('index.html index.htm') }};
-
-{% if vhost.error_page is defined %}
-    error_page {{ vhost.error_page }};
-{% endif %}
-{% if vhost.access_log is defined %}
-    access_log {{ vhost.access_log }};
-{% endif %}
-{% if vhost.error_log is defined %}
-    error_log {{ vhost.error_log }} error;
-{% endif %}
-
-{% if vhost.return is defined %}
-    return {{ vhost.return }};
-{% endif %}
-
-{% if vhost.extra_parameters is defined %}
-    {{ vhost.extra_parameters|indent(4) }}
-{% endif %}
-}
-{% endfor %}
diff --git a/provisioning/roles/geerlingguy.nginx/tests/README.md b/provisioning/roles/geerlingguy.nginx/tests/README.md
new file mode 100644
index 000000000..6fb211721
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nginx/tests/README.md
@@ -0,0 +1,11 @@
+# Ansible Role tests
+
+To run the test playbook(s) in this directory:
+
+  1. Install and start Docker.
+  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
+    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
+  1. Make the test shim executable: `chmod +x tests/test.sh`.
+  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
+
+If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.nginx/tests/test.yml b/provisioning/roles/geerlingguy.nginx/tests/test.yml
index 13426a9fa..32b4e09ac 100644
--- a/provisioning/roles/geerlingguy.nginx/tests/test.yml
+++ b/provisioning/roles/geerlingguy.nginx/tests/test.yml
@@ -3,6 +3,18 @@
 
   vars:
     nginx_use_ppa: true
+    nginx_remove_default_vhost: true
+    nginx_vhosts:
+      - server_name: "test.dev"
+        root: "/var/www/test"
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=yes cache_valid_time=86400
+      when: ansible_os_family == 'Debian'
+
+    - name: Install dependencies.
+      package: name=curl
 
   roles:
     - role_under_test
diff --git a/provisioning/roles/geerlingguy.nginx/vars/OpenBSD.yml b/provisioning/roles/geerlingguy.nginx/vars/OpenBSD.yml
new file mode 100644
index 000000000..a5a5c9dc2
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nginx/vars/OpenBSD.yml
@@ -0,0 +1,10 @@
+---
+root_group: wheel
+nginx_conf_path: /etc/nginx/conf.d
+nginx_conf_file_path: /etc/nginx/nginx.conf
+nginx_mime_file_path: /etc/nginx/mime.types
+nginx_pidfile: /var/run/nginx.pid
+nginx_vhost_path: /etc/nginx/sites-enabled
+nginx_default_vhost_path: /etc/nginx/sites-enabled/default
+nginx_package_name: "nginx--"
+__nginx_user: "www"

From c73c4625bf9b36b699512e8d24eb9c1fc32fec82 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 27 Apr 2017 00:59:24 -0400
Subject: [PATCH 0762/1273] Update to latest Nginx role version.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.nginx/README.md         | 68 +++++++++++++++++++
 .../roles/geerlingguy.nginx/defaults/main.yml |  4 ++
 .../roles/geerlingguy.nginx/tasks/main.yml    |  2 +-
 .../roles/geerlingguy.nginx/tasks/vhosts.yml  |  2 +-
 .../geerlingguy.nginx/templates/nginx.conf.j2 | 20 +++++-
 .../geerlingguy.nginx/templates/vhost.j2      | 15 ++++
 7 files changed, 108 insertions(+), 5 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 2831dbe46..fb8294585 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -38,7 +38,7 @@
 - src: geerlingguy.mysql
   version: 2.7.2
 - src: geerlingguy.nginx
-  version: 2.2.0
+  version: 2.2.1
 - src: geerlingguy.nodejs
   version: 4.1.0
 - src: geerlingguy.php
diff --git a/provisioning/roles/geerlingguy.nginx/README.md b/provisioning/roles/geerlingguy.nginx/README.md
index d76df5b25..2e4a2d67b 100644
--- a/provisioning/roles/geerlingguy.nginx/README.md
+++ b/provisioning/roles/geerlingguy.nginx/README.md
@@ -27,6 +27,7 @@ A list of vhost definitions (server blocks) for Nginx virtual hosts. Each entry
         access_log: ""
         error_log: ""
         state: "present"
+        template: "{{ nginx_vhost_template }}"
         extra_parameters: |
           location ~ \.php$ {
               fastcgi_split_path_info ^(.+\.php)(/.+)$;
@@ -121,6 +122,73 @@ Configures Nginx's [`log_format`](http://nginx.org/en/docs/http/ngx_http_log_mod
 
 (For RedHat/CentOS only) Set this to `false` to disable the installation of the `nginx` yum repository. This could be necessary if you want the default OS stable packages, or if you use Satellite.
 
+## Overriding configuration templates
+
+If you can't customize via variables because an option isn't exposed, you can override the template used to generate the virtualhost configuration files or the `nginx.conf` file.
+
+```yaml
+nginx_conf_template: "nginx.conf.j2"
+nginx_vhost_template: "vhost.j2"
+```
+
+If necessary you can also set the template on a per vhost basis.
+
+```yaml
+nginx_vhosts:
+  - listen: "80 default_server"
+    server_name: "site1.example.com"
+    root: "/var/www/site1.example.com"
+    index: "index.php index.html index.htm"
+    template: "{{ playbook_dir }}/templates/site1.example.com.vhost.j2"
+  - server_name: "site2.example.com"
+    root: "/var/www/site2.example.com"
+    index: "index.php index.html index.htm"
+    template: "{{ playbook_dir }}/templates/site2.example.com.vhost.j2"
+```
+
+You can either copy and modify the provided template, or extend it with [Jinja2 template inheritance](http://jinja.pocoo.org/docs/2.9/templates/#template-inheritance) and override the specific template block you need to change.
+
+### Example: Configure gzip in nginx configuration
+
+Set the `nginx_conf_template` to point to a template file in your playbook directory.
+
+```yaml
+nginx_conf_template: "{{ playbook_dir }}/templates/nginx.conf.j2"
+```
+
+Create the child template in the path you configured above and extend `geerlingguy.nginx` template file relative to your `playbook.yml`.
+
+```
+{% extends 'roles/geerlingguy.nginx/templates/nginx.conf.j2' %}
+
+{% block http_gzip %}
+    gzip on;
+    gzip_proxied any;
+    gzip_static on;
+    gzip_http_version 1.0;
+    gzip_disable "MSIE [1-6]\.";
+    gzip_vary on;
+    gzip_comp_level 6;
+    gzip_types
+        text/plain
+        text/css
+        text/xml
+        text/javascript
+        application/javascript
+        application/x-javascript
+        application/json
+        application/xml
+        application/xml+rss
+        application/xhtml+xml
+        application/x-font-ttf
+        application/x-font-opentype
+        image/svg+xml
+        image/x-icon;
+    gzip_buffers 16 8k;
+    gzip_min_length 512;
+{% endblock %}
+```
+
 ## Dependencies
 
 None.
diff --git a/provisioning/roles/geerlingguy.nginx/defaults/main.yml b/provisioning/roles/geerlingguy.nginx/defaults/main.yml
index eb0d3b5af..5161e8200 100644
--- a/provisioning/roles/geerlingguy.nginx/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.nginx/defaults/main.yml
@@ -12,6 +12,9 @@ nginx_ppa_version: stable
 # The name of the nginx apt/yum package to install.
 nginx_package_name: "nginx"
 
+nginx_conf_template: "nginx.conf.j2"
+nginx_vhost_template: "vhost.j2"
+
 nginx_worker_processes: "{{ ansible_processor_vcpus | default(ansible_processor_count) }}"
 nginx_worker_connections: "1024"
 nginx_multi_accept: "off"
@@ -62,6 +65,7 @@ nginx_vhosts: []
 #   access_log: ""
 #   error_log: ""
 #   extra_parameters: "" # Can be used to add extra config blocks (multiline).
+#   template: "" # Can be used to override the `nginx_vhost_template` per host.
 #   state: "absent" # To remove the vhost configuration.
 
 nginx_upstreams: []
diff --git a/provisioning/roles/geerlingguy.nginx/tasks/main.yml b/provisioning/roles/geerlingguy.nginx/tasks/main.yml
index 6c420fe66..74ca563e9 100644
--- a/provisioning/roles/geerlingguy.nginx/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.nginx/tasks/main.yml
@@ -30,7 +30,7 @@
 # Nginx setup.
 - name: Copy nginx configuration in place.
   template:
-    src: nginx.conf.j2
+    src: "{{ nginx_conf_template }}"
     dest: "{{ nginx_conf_file_path }}"
     owner: root
     group: "{{ root_group }}"
diff --git a/provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml b/provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml
index 84485036f..03c32d9c1 100644
--- a/provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml
+++ b/provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml
@@ -14,7 +14,7 @@
 
 - name: Add managed vhost config files.
   template:
-    src: vhost.j2
+    src: "{{ item.template|default(nginx_vhost_template) }}"
     dest: "{{ nginx_vhost_path }}/{{ item.server_name.split(' ')[0] }}.conf"
     force: yes
     owner: root
diff --git a/provisioning/roles/geerlingguy.nginx/templates/nginx.conf.j2 b/provisioning/roles/geerlingguy.nginx/templates/nginx.conf.j2
index 262e54a52..cb187d838 100644
--- a/provisioning/roles/geerlingguy.nginx/templates/nginx.conf.j2
+++ b/provisioning/roles/geerlingguy.nginx/templates/nginx.conf.j2
@@ -3,18 +3,25 @@ user  {{ nginx_user }};
 error_log  {{ nginx_error_log }};
 pid        {{ nginx_pidfile }};
 
+{% block worker %}
 worker_processes  {{ nginx_worker_processes }};
+{% endblock %}
 
+{% block events %}
 events {
     worker_connections  {{ nginx_worker_connections }};
     multi_accept {{ nginx_multi_accept }};
 }
+{% endblock %}
 
 {% if nginx_extra_conf_options %}
 {{ nginx_extra_conf_options }}
 {% endif %}
 
 http {
+    {% block http_begin %}{% endblock %}
+
+{% block http_basic %}
     include       {{ nginx_mime_file_path }};
     default_type  application/octet-stream;
 
@@ -34,16 +41,20 @@ http {
     keepalive_requests {{ nginx_keepalive_requests }};
 
     server_tokens {{ nginx_server_tokens }};
-    #gzip  on;
-
 {% if nginx_proxy_cache_path %}
     proxy_cache_path {{ nginx_proxy_cache_path }};
 {% endif %}
+{% endblock %}
+
+{% block http_gzip %}
+    # gzip on;
+{% endblock %}
 
 {% if nginx_extra_http_options %}
     {{ nginx_extra_http_options|indent(4, False) }}
 {% endif %}
 
+{% block http_upstream %}
 {% for upstream in nginx_upstreams %}
     upstream {{ upstream.name }} {
 {% if upstream.strategy is defined %}
@@ -57,9 +68,14 @@ http {
 {% endif %}
     }
 {% endfor %}
+{% endblock %}
 
+{% block http_includes %}
     include {{ nginx_conf_path }}/*.conf;
 {% if nginx_conf_path != nginx_vhost_path %}
     include {{ nginx_vhost_path }}/*;
 {% endif %}
+{% endblock %}
+
+    {% block http_end %}{% endblock %}
 }
diff --git a/provisioning/roles/geerlingguy.nginx/templates/vhost.j2 b/provisioning/roles/geerlingguy.nginx/templates/vhost.j2
index 35e3de1b5..40beceda2 100644
--- a/provisioning/roles/geerlingguy.nginx/templates/vhost.j2
+++ b/provisioning/roles/geerlingguy.nginx/templates/vhost.j2
@@ -1,4 +1,16 @@
+{% block server_redirect %}
+{% if item.server_name_redirect is defined %}
+    listen       {{ item.listen | default('80') }};
+    server_name  {{ item.server_name_redirect }};
+    return       301 $scheme://{{ item.server_name.split(' ')[0] }}$request_uri;
+}
+{% endif %}
+{% endblock %}
+
 server {
+    {% block server_begin %}{% endblock %}
+
+    {% block server_basic -%}
     listen {{ item.listen | default('80') }};
 
 {% if item.server_name is defined %}
@@ -24,6 +36,9 @@ server {
 {% if item.return is defined %}
     return {{ item.return }};
 {% endif %}
+    {% endblock %}
+
+    {% block server_end %}{% endblock %}
 
 {% if item.extra_parameters is defined %}
     {{ item.extra_parameters|indent(4) }}

From 5beece3b435699f006a5e3d8ff0b2b7bba132632 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Fri, 24 Mar 2017 10:13:24 -0500
Subject: [PATCH 0763/1273] Issue #1254: Allow nginx vhost template to be
 overridden through template inheritance

---
 default.config.yml                            |  1 +
 docs/configurations/webservers-nginx.md       | 40 ++++++++++++++++++
 .../roles/drupalvm.www/tasks/main.yml         |  2 +-
 provisioning/templates/nginx-vhost.conf.j2    | 42 +++++++++++++++----
 4 files changed, 77 insertions(+), 8 deletions(-)

diff --git a/default.config.yml b/default.config.yml
index 55aecac0b..9a709f7e8 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -165,6 +165,7 @@ nginx_hosts:
 
 nginx_remove_default_vhost: true
 nginx_ppa_use: true
+nginx_vhost_template: "templates/nginx-vhost.conf.j2"
 
 # MySQL databases and users.
 mysql_databases:
diff --git a/docs/configurations/webservers-nginx.md b/docs/configurations/webservers-nginx.md
index e2065229b..be38c1cfd 100644
--- a/docs/configurations/webservers-nginx.md
+++ b/docs/configurations/webservers-nginx.md
@@ -39,3 +39,43 @@ If you are using Ubuntu as your base OS and you want to get started quickly with
         ssl_protocols       TLSv1.1 TLSv1.2;
         ssl_ciphers         HIGH:!aNULL:!MD5;
 ```
+
+### Customizing server block configuration
+
+If you can't customize via variables because an option isn't exposed, you can override the template used to generate the the virtualhost configuration file.
+
+```yaml
+nginx_vhost_template: "{{ config_dir }}/nginx-vhost.conf.j2"
+```
+
+You can either copy and modify the provided `nginx-vhost.conf.j2` template, or extend it and and override the specific template block you need to change.
+
+_If you extend Drupal VM's provided base template, the path referenced should to be relative to the playbook.yml._
+
+```
+{% extends 'templates/nginx-vhost.conf.j2' %}
+
+{% block location_primary %}
+location / {
+    try_files $uri @rewrite; # For Drupal <= 6
+}
+{% endblock %}
+
+{% block location_image_styles %}
+location ~ ^/sites/.*/files/imagecache/ {
+    try_files $uri @rewrite; # For Drupal <= 6
+}
+{% endblock %}
+```
+
+If you need to append or prepend content to a block, you can use the `{{ super() }}` Jinja2 function to return the original block content from the base template.
+
+```
+{% block location_deny %}
+{{ super() }}
+location ~* \.(txt|log)$ {
+    allow 192.168.0.0/16;
+    deny all;
+}
+{% endblock %}
+```
diff --git a/provisioning/roles/drupalvm.www/tasks/main.yml b/provisioning/roles/drupalvm.www/tasks/main.yml
index 901fa4666..1860a1a18 100644
--- a/provisioning/roles/drupalvm.www/tasks/main.yml
+++ b/provisioning/roles/drupalvm.www/tasks/main.yml
@@ -88,7 +88,7 @@
 
 - name: Copy Nginx vhosts into place.
   template:
-    src: ../templates/nginx-vhost.conf.j2
+    src: "{{ nginx_vhost_template }}"
     dest: "{{ nginx_vhost_path }}/{{ item.server_name.split(' ')[0] }}.conf"
     force: yes
     owner: root
diff --git a/provisioning/templates/nginx-vhost.conf.j2 b/provisioning/templates/nginx-vhost.conf.j2
index d62ca7a2a..60be95114 100644
--- a/provisioning/templates/nginx-vhost.conf.j2
+++ b/provisioning/templates/nginx-vhost.conf.j2
@@ -1,3 +1,4 @@
+{% block redirect %}
 {% if item.server_name_redirect is defined %}
 server {
     listen       80;
@@ -5,34 +6,52 @@ server {
     return       301 http://{{ item.server_name.split(' ')[0] }}$request_uri;
 }
 {% endif %}
+{% endblock %}
 
 server {
+    {% block server_id -%}
     listen {{ item.listen | default("80") }};
-
     server_name {{ item.server_name }};
+    {% endblock %}
+
+    {% block server_logs -%}
     error_log /var/log/nginx/error.log info;
+    {% endblock %}
+
+    {% block server_basics -%}
     root {{ item.root }};
     index index.php index.html index.htm;
+    {% endblock %}
 
 {% if item.is_php is defined and item.is_php %}
+    {% block location_primary -%}
     location / {
         # Don't touch PHP for static content.
         try_files $uri $uri/ /index.php?$query_string;
     }
+    {% endblock %}
 
+    {% block location_deny -%}
     # Don't allow direct access to PHP files in the vendor directory.
     location ~ /vendor/.*\.php$ {
         deny all;
         return 404;
     }
+    location ~ (^|/)\. {
+        return 403;
+    }
+    {% endblock %}
 
-{% if drupal_major_version == 8 %}
+    {% block location_drupal_legacy -%}
+    {% if drupal_major_version == 8 %}
     # Redirect common PHP files to their new locations.
     location ~ ^((?!.*(?:core)).*)/(install.php|rebuild.php) {
          return 301 $scheme://$host$1/core/$2$is_args$args;
     }
-{% endif %}
+    {% endif %}
+    {% endblock %}
 
+    {% block location_php -%}
     # Use fastcgi for all php files.
     location ~ \.php$|^/update.php {
         fastcgi_split_path_info ^(.+?\.php)(|/.*)$;
@@ -43,36 +62,44 @@ server {
         include fastcgi_params;
         fastcgi_pass {{ php_fpm_listen }};
     }
+    {% endblock %}
 
+    {% block location_rewrite -%}
     location @rewrite {
         rewrite ^ /index.php;
     }
+    {% endblock %}
 
+    {% block location_image_styles -%}
     location ~ ^/sites/.*/files/styles/ {
         try_files $uri @rewrite;
     }
+    {% endblock %}
 
+    {% block location_favicon -%}
     location = /favicon.ico {
         log_not_found off;
         access_log off;
     }
+    {% endblock %}
 
+    {% block location_robots -%}
     location = /robots.txt {
         allow all;
         log_not_found off;
         access_log off;
     }
+    {% endblock %}
 
-    location ~ (^|/)\. {
-        return 403;
-    }
-
+    {% block location_assets -%}
     location ~* \.(js|css|png|jpg|jpeg|gif|ico)$ {
         expires max;
         log_not_found off;
     }
+    {% endblock %}
 {% endif %}
 
+    {% block compression -%}
     gzip on;
     gzip_proxied any;
     gzip_static on;
@@ -97,6 +124,7 @@ server {
         image/x-icon;
     gzip_buffers 16 8k;
     gzip_min_length 512;
+    {% endblock %}
 
 {% if item.extra_parameters is defined %}
     {{ item.extra_parameters }}

From 8f00a4c2ef284d6622f81a5de2faf0f94437d69f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Fri, 24 Mar 2017 10:14:04 -0500
Subject: [PATCH 0764/1273] Issue #1254: Allow varnish vcl template to be
 overridden through template inheritance

---
 docs/configurations/webservers-nginx.md |  2 +-
 docs/extras/varnish.md                  | 28 +++++++++++++++++++++++++
 provisioning/templates/drupalvm.vcl.j2  | 22 +++++++++++++++++++
 3 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/docs/configurations/webservers-nginx.md b/docs/configurations/webservers-nginx.md
index be38c1cfd..021654a6c 100644
--- a/docs/configurations/webservers-nginx.md
+++ b/docs/configurations/webservers-nginx.md
@@ -45,7 +45,7 @@ If you are using Ubuntu as your base OS and you want to get started quickly with
 If you can't customize via variables because an option isn't exposed, you can override the template used to generate the the virtualhost configuration file.
 
 ```yaml
-nginx_vhost_template: "{{ config_dir }}/nginx-vhost.conf.j2"
+nginx_vhost_template: "{{ config_dir }}/templates/nginx-vhost.conf.j2"
 ```
 
 You can either copy and modify the provided `nginx-vhost.conf.j2` template, or extend it and and override the specific template block you need to change.
diff --git a/docs/extras/varnish.md b/docs/extras/varnish.md
index b39f6e817..592cb11cf 100644
--- a/docs/extras/varnish.md
+++ b/docs/extras/varnish.md
@@ -31,4 +31,32 @@ $settings['reverse_proxy_addresses'] = array('127.0.0.1');
 
 If you don't set these values, Drupal will think all requests are coming from `127.0.0.1`. There are other settings you can change to make Drupal not store copies of cached pages in the Database (since Varnish is caching everything, this is redundant), but those other settings are not covered here.
 
+### Extending the base `drupalvm.vcl.j2` template
+
+If you can't customize via variables because an option isn't exposed, you can extend the base `drupalvm.vcl.j2` through Jinja2 template inheritance.
+
+```yaml
+varnish_default_vcl_template_path: "{{ config_dir }}/templates/drupalvm.vcl.j2"
+```
+
+_If you extend Drupal VM's provided base template, the path referenced should to be relative to the playbook.yml._
+
+```
+{% extends 'templates/drupalvm.vcl.j2' %}
+
+{% block backend -%}
+{{ super() }}
+.connect_timeout = 1s;
+{% endblock %}
+
+{% block vcl_deliver -%}
+unset resp.http.X-Url;
+unset resp.http.X-Host;
+unset resp.http.Purge-Cache-Tags;
+# Do not set X-Varnish-Cache headers.
+{% endblock %}
+```
+
+The `{{ super() }}` Jinja2 function returns the original block content from the base template.
+
 For a list of available role variables, see the [`geerlingguy.varnish` Ansible role's README](https://github.com/geerlingguy/ansible-role-varnish#readme).
diff --git a/provisioning/templates/drupalvm.vcl.j2 b/provisioning/templates/drupalvm.vcl.j2
index 2e7a2b00b..c4ecd5fdd 100644
--- a/provisioning/templates/drupalvm.vcl.j2
+++ b/provisioning/templates/drupalvm.vcl.j2
@@ -1,21 +1,28 @@
+{% block version -%}
 vcl 4.0;
+{% endblock %}
 
 # This Varnish VCL has been adapted from the Four Kitchens VCL for Varnish 3.
 
 # Default backend definition. Points to Apache, normally.
 backend default {
+    {% block backend -%}
     .host = "{{ varnish_default_backend_host }}";
     .port = "{{ varnish_default_backend_port }}";
     .first_byte_timeout = 300s;
+    {% endblock %}
 }
 
 # Access control list for PURGE requests.
 acl purge {
+    {% block acl_purge -%}
     "127.0.0.1";
+    {% endblock %}
 }
 
 # Respond to incoming requests.
 sub vcl_recv {
+    {% block http_header -%}
     # Add an X-Forwarded-For header with the client IP address.
     if (req.restarts == 0) {
         if (req.http.X-Forwarded-For) {
@@ -25,7 +32,9 @@ sub vcl_recv {
             set req.http.X-Forwarded-For = client.ip;
         }
     }
+    {% endblock %}
 
+    {% block method_purge -%}
     # Only allow PURGE requests from IP addresses in the 'purge' ACL.
     if (req.method == "PURGE") {
         if (!client.ip ~ purge) {
@@ -33,7 +42,9 @@ sub vcl_recv {
         }
         return (purge);
     }
+    {% endblock %}
 
+    {% block method_ban -%}
     # Only allow BAN requests from IP addresses in the 'purge' ACL.
     if (req.method == "BAN") {
         # Same ACL check as above:
@@ -53,12 +64,16 @@ sub vcl_recv {
         # Throw a synthetic page so the request won't go to the backend.
         return (synth(200, "Ban added."));
     }
+    {% endblock %}
 
+    {% block pass_post -%}
     # Only cache GET and HEAD requests (pass through POST requests).
     if (req.method != "GET" && req.method != "HEAD") {
         return (pass);
     }
+    {% endblock %}
 
+    {% block pass_admin -%}
     # Pass through any administrative or AJAX-related paths.
     if (req.url ~ "^/status\.php$" ||
         req.url ~ "^/update\.php$" ||
@@ -69,7 +84,9 @@ sub vcl_recv {
         req.url ~ "^.*/ahah/.*$") {
            return (pass);
     }
+    {% endblock %}
 
+    {% block cookies -%}
     # Removing cookies for static content so Varnish caches these files.
     if (req.url ~ "(?i)\.(pdf|asc|dat|txt|doc|xls|ppt|tgz|csv|png|gif|jpeg|jpg|ico|swf|css|js)(\?.*)?$") {
         unset req.http.Cookie;
@@ -106,10 +123,12 @@ sub vcl_recv {
             return (pass);
         }
     }
+    {% endblock %}
 }
 
 # Set a header to track a cache HITs and MISSes.
 sub vcl_deliver {
+    {% block vcl_deliver -%}
     # Remove ban-lurker friendly custom headers when delivering to client.
     unset resp.http.X-Url;
     unset resp.http.X-Host;
@@ -121,10 +140,12 @@ sub vcl_deliver {
     else {
         set resp.http.X-Varnish-Cache = "MISS";
     }
+    {% endblock %}
 }
 
 # Instruct Varnish what to do in the case of certain backend responses (beresp).
 sub vcl_backend_response {
+    {% block vcl_backend_response -%}
     # Set ban-lurker friendly custom headers.
     set beresp.http.X-Url = bereq.url;
     set beresp.http.X-Host = bereq.http.host;
@@ -150,4 +171,5 @@ sub vcl_backend_response {
 
     # Allow items to remain in cache up to 6 hours past their cache expiration.
     set beresp.grace = 6h;
+    {% endblock %}
 }

From f4015251d01c20d6065b4a8b9ab240224831aa56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Fri, 24 Mar 2017 10:52:32 -0500
Subject: [PATCH 0765/1273] Allow drush alias templates to be overridden

---
 default.config.yml                               |  2 ++
 docs/extras/drush.md                             | 16 ++++++++++++++++
 provisioning/tasks/drush-aliases.yml             |  6 +++---
 .../drupalvm-local.aliases.drushrc.php.j2        |  2 ++
 .../templates/drupalvm.aliases.drushrc.php.j2    |  2 ++
 5 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/default.config.yml b/default.config.yml
index 9a709f7e8..883175dc1 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -96,6 +96,8 @@ drupalvm_cron_jobs: []
 # Drupal VM automatically creates a drush alias file in your ~/.drush folder if
 # this variable is 'true'.
 configure_drush_aliases: true
+drush_aliases_host_template: "templates/drupalvm.aliases.drushrc.php.j2"
+drush_aliases_guest_template: "templates/drupalvm-local.aliases.drushrc.php.j2"
 
 # Helper variable to configure the PHP-FPM connection for each Apache
 # VirtualHost in the `apache_vhosts` list.
diff --git a/docs/extras/drush.md b/docs/extras/drush.md
index 29fb98365..203e3c4ef 100644
--- a/docs/extras/drush.md
+++ b/docs/extras/drush.md
@@ -35,6 +35,22 @@ $ drush @drupalvm.dev status
 
 Drupal VM automatically generates a drush alias file in `~/.drush/drupalvm.aliases.drushrc.php` with an alias for every site you have defined in the `apache_vhosts` variable.
 
+If you want to customize the generated alias file you can override the `drush_aliases_host_template` and `drush_aliases_guest_template` variables in your `config.yml`.
+
+```yaml
+drush_aliases_host_template: "{{ config_dir }}/templates/drupalvm.aliases.drushrc.php.j2"
+```
+
+Eg. to only print the alias for your main domain, and not the subdomain you can override the file using a child template.
+
+```php
+{% extends 'templates/drupalvm.aliases.drushrc.php.j2' %}
+
+{% block aliases %}
+{{ alias('drupalvm.dev', drupal_core_path) }}
+{% endblock %}
+```
+
 You can disable Drupal VM's automatic Drush alias file management if you want to manage drush aliases on your own. Just set the `configure_drush_aliases` variable in `config.yml` to `false`.
 
 ## Using sql-sync
diff --git a/provisioning/tasks/drush-aliases.yml b/provisioning/tasks/drush-aliases.yml
index ccb6d0ec6..ff557bbb6 100644
--- a/provisioning/tasks/drush-aliases.yml
+++ b/provisioning/tasks/drush-aliases.yml
@@ -18,7 +18,7 @@
 # Note that this doesn't work for Windows, since Ansible's running in the VM.
 - name: Configure host machine drush aliases.
   template:
-    src: ../templates/drupalvm.aliases.drushrc.php.j2
+    src: "{{ drush_aliases_host_template }}"
     dest: "~/.drush/{{ vagrant_machine_name }}.aliases.drushrc.php"
   delegate_to: 127.0.0.1
   become: no
@@ -30,7 +30,7 @@
 
 - name: Configure drush aliases for vagrant user inside VM.
   template:
-    src: ../templates/drupalvm-local.aliases.drushrc.php.j2
+    src: "{{ drush_aliases_guest_template }}"
     dest: "~/.drush/{{ vagrant_machine_name }}.aliases.drushrc.php"
   become: no
   when: configure_drush_aliases
@@ -40,6 +40,6 @@
 
 - name: Configure drush aliases for root user inside VM.
   template:
-    src: ../templates/drupalvm-local.aliases.drushrc.php.j2
+    src: "{{ drush_aliases_guest_template }}"
     dest: "~/.drush/{{ vagrant_machine_name }}.aliases.drushrc.php"
   when: configure_drush_aliases
diff --git a/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2 b/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2
index a0d6ae238..2be1c4d06 100644
--- a/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2
+++ b/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2
@@ -16,6 +16,7 @@ $aliases['{{ host }}'] = array(
 {% endif -%}
 {% endmacro %}
 
+{% block aliases -%}
 {%- if drupalvm_webserver == 'apache' -%}
   {%- for vhost in apache_vhosts -%}
     {{ alias(vhost.servername, vhost.documentroot) }}
@@ -32,3 +33,4 @@ $aliases['{{ host }}'] = array(
     {%- endfor -%}
   {%- endfor -%}
 {%- endif -%}
+{% endblock %}
diff --git a/provisioning/templates/drupalvm.aliases.drushrc.php.j2 b/provisioning/templates/drupalvm.aliases.drushrc.php.j2
index d782d30cf..e9d095b0d 100644
--- a/provisioning/templates/drupalvm.aliases.drushrc.php.j2
+++ b/provisioning/templates/drupalvm.aliases.drushrc.php.j2
@@ -22,6 +22,7 @@ $aliases['{{ host }}'] = array(
 {% endif -%}
 {% endmacro %}
 
+{% block aliases -%}
 {%- if drupalvm_webserver == 'apache' -%}
   {%- for vhost in apache_vhosts -%}
     {{ alias(vhost.servername, vhost.documentroot) }}
@@ -38,3 +39,4 @@ $aliases['{{ host }}'] = array(
     {%- endfor -%}
   {%- endfor -%}
 {%- endif -%}
+{% endblock %}

From 52addfb0508113a01eae4007bcc40e88f296e52e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Fri, 24 Mar 2017 11:42:08 -0500
Subject: [PATCH 0766/1273] minor docs fixes

---
 docs/configurations/webservers-nginx.md |  6 +++---
 docs/extras/drush.md                    |  2 +-
 docs/extras/varnish.md                  | 10 ++++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/docs/configurations/webservers-nginx.md b/docs/configurations/webservers-nginx.md
index 021654a6c..63629792e 100644
--- a/docs/configurations/webservers-nginx.md
+++ b/docs/configurations/webservers-nginx.md
@@ -40,7 +40,7 @@ If you are using Ubuntu as your base OS and you want to get started quickly with
         ssl_ciphers         HIGH:!aNULL:!MD5;
 ```
 
-### Customizing server block configuration
+## Customizing server block configuration
 
 If you can't customize via variables because an option isn't exposed, you can override the template used to generate the the virtualhost configuration file.
 
@@ -48,9 +48,9 @@ If you can't customize via variables because an option isn't exposed, you can ov
 nginx_vhost_template: "{{ config_dir }}/templates/nginx-vhost.conf.j2"
 ```
 
-You can either copy and modify the provided `nginx-vhost.conf.j2` template, or extend it and and override the specific template block you need to change.
+You can either copy and modify the provided `nginx-vhost.conf.j2` template, or extend it and override the specific template block you need to change.
 
-_If you extend Drupal VM's provided base template, the path referenced should to be relative to the playbook.yml._
+_If you extend Drupal VM's provided base template, the path referenced should to be relative to playbook.yml._
 
 ```
 {% extends 'templates/nginx-vhost.conf.j2' %}
diff --git a/docs/extras/drush.md b/docs/extras/drush.md
index 203e3c4ef..26267d4c7 100644
--- a/docs/extras/drush.md
+++ b/docs/extras/drush.md
@@ -41,7 +41,7 @@ If you want to customize the generated alias file you can override the `drush_al
 drush_aliases_host_template: "{{ config_dir }}/templates/drupalvm.aliases.drushrc.php.j2"
 ```
 
-Eg. to only print the alias for your main domain, and not the subdomain you can override the file using a child template.
+Eg. to only print the alias for your main domain, and not the subdomain you can override the file using a [Jinja2 child template](http://jinja.pocoo.org/docs/2.9/templates/#child-template).
 
 ```php
 {% extends 'templates/drupalvm.aliases.drushrc.php.j2' %}
diff --git a/docs/extras/varnish.md b/docs/extras/varnish.md
index 592cb11cf..49be21215 100644
--- a/docs/extras/varnish.md
+++ b/docs/extras/varnish.md
@@ -31,15 +31,17 @@ $settings['reverse_proxy_addresses'] = array('127.0.0.1');
 
 If you don't set these values, Drupal will think all requests are coming from `127.0.0.1`. There are other settings you can change to make Drupal not store copies of cached pages in the Database (since Varnish is caching everything, this is redundant), but those other settings are not covered here.
 
-### Extending the base `drupalvm.vcl.j2` template
+## Extending the base `drupalvm.vcl.j2` template
 
-If you can't customize via variables because an option isn't exposed, you can extend the base `drupalvm.vcl.j2` through Jinja2 template inheritance.
+If you can't customize via variables because an option isn't exposed, you can extend the base `drupalvm.vcl.j2` through [Jinja2 template inheritance](http://jinja.pocoo.org/docs/2.9/templates/#template-inheritance).
 
 ```yaml
 varnish_default_vcl_template_path: "{{ config_dir }}/templates/drupalvm.vcl.j2"
 ```
 
-_If you extend Drupal VM's provided base template, the path referenced should to be relative to the playbook.yml._
+Either copy the `drupalvm.vcl.j2` and modify it to your liking, or extend it and override the blocks you need to adjust.
+
+_If you extend Drupal VM's provided base template, the path referenced should to be relative to playbook.yml._
 
 ```
 {% extends 'templates/drupalvm.vcl.j2' %}
@@ -57,6 +59,6 @@ unset resp.http.Purge-Cache-Tags;
 {% endblock %}
 ```
 
-The `{{ super() }}` Jinja2 function returns the original block content from the base template.
+The [`{{ super() }}` Jinja2 function](http://jinja.pocoo.org/docs/2.9/templates/#super-blocks) returns the original block content from the base template.
 
 For a list of available role variables, see the [`geerlingguy.varnish` Ansible role's README](https://github.com/geerlingguy/ansible-role-varnish#readme).

From 2882ce71b1f59afd15ebba1cc90aff81a290b885 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 26 Apr 2017 19:43:09 -0500
Subject: [PATCH 0767/1273] Remove custom nginx vhost task as geerlingguy.nginx
 supports custom templates

---
 README.md                                            |  2 +-
 docs/configurations/webservers-nginx.md              |  6 +++---
 docs/deployment/multisite.md                         |  2 +-
 examples/prod/prod.config.yml                        |  2 +-
 provisioning/roles/drupalvm.www/tasks/main.yml       | 12 ------------
 provisioning/templates/dashboard.html.j2             |  6 +++---
 .../templates/drupalvm-local.aliases.drushrc.php.j2  |  2 +-
 .../templates/drupalvm.aliases.drushrc.php.j2        |  2 +-
 8 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index a6b3b1d2b..924e1f8a2 100644
--- a/README.md
+++ b/README.md
@@ -91,7 +91,7 @@ Note: *If there are any errors during the course of running `vagrant up`, and it
 ### 3 - Configure your host machine to access the VM.
 
   1. [Edit your hosts file](http://www.rackspace.com/knowledge_center/article/how-do-i-modify-my-hosts-file), adding the line `192.168.88.88  drupalvm.dev` so you can connect to the VM.
-    - You can have Vagrant automatically configure your hosts file if you install the `hostsupdater` plugin (`vagrant plugin install vagrant-hostsupdater`). All hosts defined in `apache_vhosts` or `nginx_hosts` will be automatically managed. `vagrant-hostmanager` is also supported.
+    - You can have Vagrant automatically configure your hosts file if you install the `hostsupdater` plugin (`vagrant plugin install vagrant-hostsupdater`). All hosts defined in `apache_vhosts` or `nginx_vhosts` will be automatically managed. `vagrant-hostmanager` is also supported.
     - The `auto_network` plugin (`vagrant plugin install vagrant-auto_network`) can help with IP address management if you set `vagrant_ip` to `0.0.0.0` inside `config.yml`.
   2. Open your browser and access [http://drupalvm.dev/](http://drupalvm.dev/). The default login for the admin account is `admin` for both the username and password.
 
diff --git a/docs/configurations/webservers-nginx.md b/docs/configurations/webservers-nginx.md
index 63629792e..0bd6b67e0 100644
--- a/docs/configurations/webservers-nginx.md
+++ b/docs/configurations/webservers-nginx.md
@@ -1,6 +1,6 @@
 To use Nginx instead of Apache, change the `drupalvm_webserver` variable inside your customized `config.yml`, from `apache` to `nginx`.
 
-Because Nginx server directives behave a little differently than Apache's VirtualHosts, Drupal VM includes a custom Drupal-optimized Nginx server block configuration, and you can control all the servers ('virtual hosts') Nginx will run using the `nginx_hosts` configuration. A few simple examples are shown in `default.config.yml`, but you have some extra flexibility if you need it. See the `nginx-vhost.conf.j2` template for more information.
+Because Nginx server directives behave a little differently than Apache's VirtualHosts, Drupal VM includes a custom Drupal-optimized Nginx server block configuration, and you can control all the servers ('virtual hosts') Nginx will run using the `nginx_vhosts` configuration. A few simple examples are shown in `default.config.yml`, but you have some extra flexibility if you need it. See the `nginx-vhost.conf.j2` template for more information.
 
 Also, see the examples included in the [`geerlingguy.nginx` Ansible role's README](https://github.com/geerlingguy/ansible-role-nginx#readme) for more info, as well as many other variables you can override to configure Nginx exactly how you like it.
 
@@ -10,7 +10,7 @@ _Note: if you're using php-fpm, you may want to reflect your use of nginx by set
 
 To enable SSL support for you virtual hosts you first need a certificate file. See the same section under the [Apache documentation](webservers-apache.md#enable-ssl-support-with-apache) for how to generate a self-signed certficiate.
 
-Modify your nginx host configuration by adding the following `extra_parameters` to the first entry in `nginx_hosts`:
+Modify your nginx host configuration by adding the following `extra_parameters` to the first entry in `nginx_vhosts`:
 
 ```yaml
 - server_name: "{{ drupal_domain }} www.{{ drupal_domain }}"
@@ -48,7 +48,7 @@ If you can't customize via variables because an option isn't exposed, you can ov
 nginx_vhost_template: "{{ config_dir }}/templates/nginx-vhost.conf.j2"
 ```
 
-You can either copy and modify the provided `nginx-vhost.conf.j2` template, or extend it and override the specific template block you need to change.
+You can either copy and modify the provided `nginx-vhost.conf.j2` template, or extend it and use [template inheritace](http://jinja.pocoo.org/docs/2.9/templates/#template-inheritance) to override the specific template block you need to change.
 
 _If you extend Drupal VM's provided base template, the path referenced should to be relative to playbook.yml._
 
diff --git a/docs/deployment/multisite.md b/docs/deployment/multisite.md
index bb1475792..7ece0bb33 100644
--- a/docs/deployment/multisite.md
+++ b/docs/deployment/multisite.md
@@ -1,4 +1,4 @@
-For multisite installations, make the changes outlined in the [Local Drupal codebase](local-codebase.md) guide, but, using the `apache_vhosts` variable (or `nginx_hosts` if using Nginx), configure as many domains pointing to the same docroot as you need:
+For multisite installations, make the changes outlined in the [Local Drupal codebase](local-codebase.md) guide, but, using the `apache_vhosts` variable (or `nginx_vhosts` if using Nginx), configure as many domains pointing to the same docroot as you need:
 
 ```yaml
 drupal_core_path: "/var/www/my-drupal-site"
diff --git a/examples/prod/prod.config.yml b/examples/prod/prod.config.yml
index 0c04dab39..93219afee 100644
--- a/examples/prod/prod.config.yml
+++ b/examples/prod/prod.config.yml
@@ -3,7 +3,7 @@
 drupal_domain: "drupalvm.dev"
 vagrant_hostname: "{{ drupal_domain }}"
 
-# Add only the `apache_vhosts` or `nginx_hosts` you need. If installing a
+# Add only the `apache_vhosts` or `nginx_vhosts` you need. If installing a
 # single Drupal site, the variable should look like this (Apache):
 apache_vhosts:
   - servername: "{{ drupal_domain }}"
diff --git a/provisioning/roles/drupalvm.www/tasks/main.yml b/provisioning/roles/drupalvm.www/tasks/main.yml
index 1860a1a18..aa5a2774e 100644
--- a/provisioning/roles/drupalvm.www/tasks/main.yml
+++ b/provisioning/roles/drupalvm.www/tasks/main.yml
@@ -85,15 +85,3 @@
     mode: 0755
     recurse: true
   when: drupalvm_webserver == 'apache'
-
-- name: Copy Nginx vhosts into place.
-  template:
-    src: "{{ nginx_vhost_template }}"
-    dest: "{{ nginx_vhost_path }}/{{ item.server_name.split(' ')[0] }}.conf"
-    force: yes
-    owner: root
-    group: root
-    mode: 0644
-  with_items: "{{ nginx_hosts }}"
-  notify: restart nginx
-  when: drupalvm_webserver == 'nginx'
diff --git a/provisioning/templates/dashboard.html.j2 b/provisioning/templates/dashboard.html.j2
index 7630b6114..0a8b90ca9 100644
--- a/provisioning/templates/dashboard.html.j2
+++ b/provisioning/templates/dashboard.html.j2
@@ -33,7 +33,7 @@
           {%- endif -%}
         {%- endfor -%}
       {%- elif drupalvm_webserver == 'nginx' -%}
-        {%- for host in nginx_hosts -%}
+        {%- for host in nginx_vhosts -%}
           {%- if host.root == path -%}
             {{ host.server_name }}
           {%- endif -%}
@@ -73,7 +73,7 @@
 
           {%- endfor -%}
         {%- elif drupalvm_webserver == 'nginx' -%}
-          {%- for host in nginx_hosts -%}
+          {%- for host in nginx_vhosts -%}
 
             {% for server_name in host.server_name.split(' ') -%}
               {{ printHostsEntry(vagrant_ip, server_name) }}
@@ -107,7 +107,7 @@
               {%- endif -%}
             {%- endfor -%}
           {%- elif drupalvm_webserver == 'nginx' -%}
-            {%- for host in nginx_hosts -%}
+            {%- for host in nginx_vhosts -%}
               {%- if host.root is defined -%}
                 {%- for hostname in host.server_name.split() -%}
                   {{ printSite(hostname, host.root) }}
diff --git a/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2 b/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2
index 2be1c4d06..635953cd2 100644
--- a/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2
+++ b/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2
@@ -27,7 +27,7 @@ $aliases['{{ host }}'] = array(
     {%- endif -%}
   {%- endfor -%}
 {%- elif drupalvm_webserver == 'nginx' -%}
-  {%- for host in nginx_hosts -%}
+  {%- for host in nginx_vhosts -%}
     {%- for server_name in host.server_name.split() -%}
       {{ alias(server_name, host.root) }}
     {%- endfor -%}
diff --git a/provisioning/templates/drupalvm.aliases.drushrc.php.j2 b/provisioning/templates/drupalvm.aliases.drushrc.php.j2
index e9d095b0d..c507836f8 100644
--- a/provisioning/templates/drupalvm.aliases.drushrc.php.j2
+++ b/provisioning/templates/drupalvm.aliases.drushrc.php.j2
@@ -33,7 +33,7 @@ $aliases['{{ host }}'] = array(
     {%- endif -%}
   {%- endfor -%}
 {%- elif drupalvm_webserver == 'nginx' -%}
-  {%- for host in nginx_hosts -%}
+  {%- for host in nginx_vhosts -%}
     {%- for server_name in host.server_name.split() -%}
       {{ alias(server_name, host.root) }}
     {%- endfor -%}

From bf417e5f13230da1c7dc5ad1f25420f92169ce67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 26 Apr 2017 20:07:08 -0500
Subject: [PATCH 0768/1273] Bring nginx-vhost.j2 in inline with upstream
 version

Added support for:
- item.index
- item.access_log
- item.error_log

Left out on purpose:
- item.error_page
- item.return
---
 provisioning/templates/nginx-vhost.conf.j2 | 28 ++++++++++++----------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/provisioning/templates/nginx-vhost.conf.j2 b/provisioning/templates/nginx-vhost.conf.j2
index 60be95114..521115e74 100644
--- a/provisioning/templates/nginx-vhost.conf.j2
+++ b/provisioning/templates/nginx-vhost.conf.j2
@@ -1,26 +1,28 @@
-{% block redirect %}
+{% block server_redirect %}
 {% if item.server_name_redirect is defined %}
 server {
     listen       80;
     server_name  {{ item.server_name_redirect }};
-    return       301 http://{{ item.server_name.split(' ')[0] }}$request_uri;
+    return       301 $scheme://{{ item.server_name.split(' ')[0] }}$request_uri;
 }
 {% endif %}
 {% endblock %}
 
 server {
-    {% block server_id -%}
-    listen {{ item.listen | default("80") }};
+    {% block server_begin %}{% endblock %}
+
+    {% block server_basic -%}
+    listen {{ item.listen | default('80') }};
     server_name {{ item.server_name }};
+    root {{ item.root }};
+    index {{ item.index | default('index.php index.html index.htm') }};
     {% endblock %}
 
     {% block server_logs -%}
-    error_log /var/log/nginx/error.log info;
-    {% endblock %}
-
-    {% block server_basics -%}
-    root {{ item.root }};
-    index index.php index.html index.htm;
+    {% if item.access_log is defined -%}
+    access_log {{ item.access_log }};
+    {% endif %}
+    error_log {{ item.error_log|default('/var/log/nginx/error.log') }} info;
     {% endblock %}
 
 {% if item.is_php is defined and item.is_php %}
@@ -99,7 +101,7 @@ server {
     {% endblock %}
 {% endif %}
 
-    {% block compression -%}
+    {% block server_compression -%}
     gzip on;
     gzip_proxied any;
     gzip_static on;
@@ -126,7 +128,9 @@ server {
     gzip_min_length 512;
     {% endblock %}
 
+    {% block server_end %}{% endblock %}
+
 {% if item.extra_parameters is defined %}
-    {{ item.extra_parameters }}
+    {{ item.extra_parameters|indent(4) }}
 {% endif %}
 }

From 312b744309ac838cf9117e2ad8895456ca5770da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 26 Apr 2017 21:28:19 -0500
Subject: [PATCH 0769/1273] shim nginx_hosts -> nginx_vhosts

---
 lib/drupalvm/vagrant.rb                        | 3 ++-
 provisioning/playbook.yml                      | 4 ++++
 provisioning/tasks/backwards-compatibility.yml | 5 +++++
 3 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 provisioning/tasks/backwards-compatibility.yml

diff --git a/lib/drupalvm/vagrant.rb b/lib/drupalvm/vagrant.rb
index 5048879f2..beaa3c432 100644
--- a/lib/drupalvm/vagrant.rb
+++ b/lib/drupalvm/vagrant.rb
@@ -95,7 +95,8 @@ def get_vhost_aliases(vconfig)
   if vconfig['drupalvm_webserver'] == 'apache'
     aliases = get_apache_vhosts(vconfig['apache_vhosts'])
   else
-    aliases = get_nginx_vhosts(vconfig['nginx_hosts'])
+    # @todo shim for `nginx_hosts`.
+    aliases = get_nginx_vhosts(vconfig.fetch('nginx_hosts', vconfig['nginx_vhosts']))
   end
   aliases = aliases.uniq - [vconfig['vagrant_ip']]
   # Remove wildcard subdomains.
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 167d8a3e2..4f6b6c00d 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -10,6 +10,10 @@
     - include: tasks/config.yml
       tags: ['always']
 
+    - include: tasks/backwards-compatibility.yml
+      tags: ['always']
+      static: no
+
     - include: "tasks/init-{{ ansible_os_family }}.yml"
       static: no
 
diff --git a/provisioning/tasks/backwards-compatibility.yml b/provisioning/tasks/backwards-compatibility.yml
new file mode 100644
index 000000000..53760db94
--- /dev/null
+++ b/provisioning/tasks/backwards-compatibility.yml
@@ -0,0 +1,5 @@
+---
+- name: nginx_hosts shim
+  set_fact:
+    nginx_vhosts: "{{ nginx_hosts }}"
+  when: nginx_hosts is defined

From f821c323ee2de1d9714c600bc86854195bb7c55e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 26 Apr 2017 23:43:52 -0500
Subject: [PATCH 0770/1273] fix whitespace in templates

---
 .../drupalvm-local.aliases.drushrc.php.j2      |  6 +++---
 .../templates/drupalvm.aliases.drushrc.php.j2  |  6 +++---
 provisioning/templates/drupalvm.vcl.j2         |  5 +++++
 provisioning/templates/nginx-vhost.conf.j2     | 18 +++++++++---------
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2 b/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2
index 635953cd2..4b5770104 100644
--- a/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2
+++ b/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2
@@ -6,7 +6,7 @@
  * @see example.aliases.drushrc.php.
  */
 
-{% macro alias(host, root) %}
+{% macro alias(host, root) -%}
 {%- if root not in _devtool_docroots %}
 $aliases['{{ host }}'] = array(
   'uri' => '{{ host }}',
@@ -14,7 +14,7 @@ $aliases['{{ host }}'] = array(
 );
 
 {% endif -%}
-{% endmacro %}
+{% endmacro -%}
 
 {% block aliases -%}
 {%- if drupalvm_webserver == 'apache' -%}
@@ -33,4 +33,4 @@ $aliases['{{ host }}'] = array(
     {%- endfor -%}
   {%- endfor -%}
 {%- endif -%}
-{% endblock %}
+{%- endblock %}
diff --git a/provisioning/templates/drupalvm.aliases.drushrc.php.j2 b/provisioning/templates/drupalvm.aliases.drushrc.php.j2
index c507836f8..ddf68b17b 100644
--- a/provisioning/templates/drupalvm.aliases.drushrc.php.j2
+++ b/provisioning/templates/drupalvm.aliases.drushrc.php.j2
@@ -6,7 +6,7 @@
  * @see example.aliases.drushrc.php.
  */
 
-{% macro alias(host, root) %}
+{% macro alias(host, root) -%}
 {%- if root not in _devtool_docroots %}
 $aliases['{{ host }}'] = array(
   'uri' => '{{ host }}',
@@ -20,7 +20,7 @@ $aliases['{{ host }}'] = array(
 );
 
 {% endif -%}
-{% endmacro %}
+{% endmacro -%}
 
 {% block aliases -%}
 {%- if drupalvm_webserver == 'apache' -%}
@@ -39,4 +39,4 @@ $aliases['{{ host }}'] = array(
     {%- endfor -%}
   {%- endfor -%}
 {%- endif -%}
-{% endblock %}
+{%- endblock %}
diff --git a/provisioning/templates/drupalvm.vcl.j2 b/provisioning/templates/drupalvm.vcl.j2
index c4ecd5fdd..cef0ae133 100644
--- a/provisioning/templates/drupalvm.vcl.j2
+++ b/provisioning/templates/drupalvm.vcl.j2
@@ -11,6 +11,7 @@ backend default {
     .port = "{{ varnish_default_backend_port }}";
     .first_byte_timeout = 300s;
     {% endblock %}
+
 }
 
 # Access control list for PURGE requests.
@@ -18,6 +19,7 @@ acl purge {
     {% block acl_purge -%}
     "127.0.0.1";
     {% endblock %}
+
 }
 
 # Respond to incoming requests.
@@ -124,6 +126,7 @@ sub vcl_recv {
         }
     }
     {% endblock %}
+
 }
 
 # Set a header to track a cache HITs and MISSes.
@@ -141,6 +144,7 @@ sub vcl_deliver {
         set resp.http.X-Varnish-Cache = "MISS";
     }
     {% endblock %}
+
 }
 
 # Instruct Varnish what to do in the case of certain backend responses (beresp).
@@ -172,4 +176,5 @@ sub vcl_backend_response {
     # Allow items to remain in cache up to 6 hours past their cache expiration.
     set beresp.grace = 6h;
     {% endblock %}
+
 }
diff --git a/provisioning/templates/nginx-vhost.conf.j2 b/provisioning/templates/nginx-vhost.conf.j2
index 521115e74..dffd9626e 100644
--- a/provisioning/templates/nginx-vhost.conf.j2
+++ b/provisioning/templates/nginx-vhost.conf.j2
@@ -1,5 +1,5 @@
-{% block server_redirect %}
-{% if item.server_name_redirect is defined %}
+{% block server_redirect -%}
+{% if item.server_name_redirect is defined -%}
 server {
     listen       80;
     server_name  {{ item.server_name_redirect }};
@@ -9,7 +9,7 @@ server {
 {% endblock %}
 
 server {
-    {% block server_begin %}{% endblock %}
+    {% block server_begin -%}{% endblock %}
 
     {% block server_basic -%}
     listen {{ item.listen | default('80') }};
@@ -19,9 +19,9 @@ server {
     {% endblock %}
 
     {% block server_logs -%}
-    {% if item.access_log is defined -%}
+    {%- if item.access_log is defined -%}
     access_log {{ item.access_log }};
-    {% endif %}
+    {%- endif -%}
     error_log {{ item.error_log|default('/var/log/nginx/error.log') }} info;
     {% endblock %}
 
@@ -45,7 +45,7 @@ server {
     {% endblock %}
 
     {% block location_drupal_legacy -%}
-    {% if drupal_major_version == 8 %}
+    {% if drupal_major_version == 8 -%}
     # Redirect common PHP files to their new locations.
     location ~ ^((?!.*(?:core)).*)/(install.php|rebuild.php) {
          return 301 $scheme://$host$1/core/$2$is_args$args;
@@ -128,9 +128,9 @@ server {
     gzip_min_length 512;
     {% endblock %}
 
-    {% block server_end %}{% endblock %}
+    {% block server_end -%}{% endblock %}
 
-{% if item.extra_parameters is defined %}
+{% if item.extra_parameters is defined -%}
     {{ item.extra_parameters|indent(4) }}
-{% endif %}
+{%- endif %}
 }

From ae587a84682d145711568c985315553150c3a482 Mon Sep 17 00:00:00 2001
From: Joe Bartlett <joe.bartlett@vml.com>
Date: Thu, 27 Apr 2017 21:24:08 -0500
Subject: [PATCH 0771/1273] Fixes Error Message "Message: LoadError: cannot
 load such file -- ./lib/drupalvm/vagrant" when running vagrant up or destroy.

In this particular instance, the error arose when using a build similar to that described in the [Composer Dependency](http://docs.drupalvm.com/en/latest/deployment/composer-dependency) documentation.
---
 Vagrantfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Vagrantfile b/Vagrantfile
index 1d6de8a0c..4b1916a79 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,7 +1,7 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-require './lib/drupalvm/vagrant'
+require_relative 'lib/drupalvm/vagrant'
 
 # Absolute paths on the host machine.
 host_drupalvm_dir = File.dirname(File.expand_path(__FILE__))

From a44a41b819ead90fec398bd858bf516a2011e0ab Mon Sep 17 00:00:00 2001
From: Charlie Morris <cdmorris22@gmail.com>
Date: Fri, 28 Apr 2017 10:43:14 -0400
Subject: [PATCH 0772/1273] to pass the Web Server Debug Validation

This solves the `Remote host is configured as 'localhost' despite server host is probably not local` problem in the validator. See http://stackoverflow.com/a/36152477/721065
---
 docs/extras/xdebug.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/extras/xdebug.md b/docs/extras/xdebug.md
index 19fc73cfe..90b597936 100644
--- a/docs/extras/xdebug.md
+++ b/docs/extras/xdebug.md
@@ -14,6 +14,11 @@ To use XDebug with PHPStorm, change the `php_xdebug_idekey` variable as shown be
 ```yaml
 php_xdebug_idekey: PHPSTORM
 ```
+In order to pass the Web Server Debug Validation, you'll need to also add the following your `config.yml`
+
+```yaml
+php_xdebug_remote_host: "{{ vagrant_hostname }}"
+```
 
 ### Sublime Text and XDebug with Drupal VM
 

From f6fcbd12ef1cc14af9e803c570d6220d03e73686 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 28 Apr 2017 15:59:58 -0400
Subject: [PATCH 0773/1273] Update Firewall role so Ubuntu 16.04 doesn't
 complain when ufw isn't installed.

---
 provisioning/requirements.yml                      |  2 +-
 .../tasks/disable-other-firewalls.yml              | 14 ++++++++++----
 .../templates/firewall.bash.j2                     |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index fb8294585..63b44c6f2 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -26,7 +26,7 @@
 - src: geerlingguy.elasticsearch
   version: 2.1.3
 - src: geerlingguy.firewall
-  version: 2.2.0
+  version: 2.2.1
 - src: geerlingguy.git
   version: 1.3.0
 - src: geerlingguy.java
diff --git a/provisioning/roles/geerlingguy.firewall/tasks/disable-other-firewalls.yml b/provisioning/roles/geerlingguy.firewall/tasks/disable-other-firewalls.yml
index 1ce768293..50e9b0e6c 100644
--- a/provisioning/roles/geerlingguy.firewall/tasks/disable-other-firewalls.yml
+++ b/provisioning/roles/geerlingguy.firewall/tasks/disable-other-firewalls.yml
@@ -1,6 +1,8 @@
 ---
-- name: Check firewalld package is installed (on RHEL).
+- name: Check if firewalld package is installed (on RHEL).
   shell: yum list installed firewalld
+  args:
+    warn: no
   register: firewalld_installed
   ignore_errors: true
   changed_when: false
@@ -13,8 +15,10 @@
     enabled: no
   when: ansible_os_family == "RedHat" and firewall_disable_firewalld and firewalld_installed.rc == 0
 
-- name: Check ufw package is installed (on Ubuntu).
-  shell: dpkg -l ufw
+- name: Check if ufw package is installed (on Ubuntu).
+  shell: service ufw status
+  args:
+    warn: no
   register: ufw_installed
   ignore_errors: true
   changed_when: false
@@ -27,8 +31,10 @@
     enabled: no
   when: ansible_distribution == "Ubuntu" and firewall_disable_ufw and ufw_installed.rc == 0
 
-- name: Check ufw package is installed (on Archlinux).
+- name: Check if ufw package is installed (on Archlinux).
   command: pacman -Q ufw
+  args:
+    warn: no
   register: ufw_installed
   ignore_errors: true
   changed_when: false
diff --git a/provisioning/roles/geerlingguy.firewall/templates/firewall.bash.j2 b/provisioning/roles/geerlingguy.firewall/templates/firewall.bash.j2
index ab0f459d1..f355e6846 100755
--- a/provisioning/roles/geerlingguy.firewall/templates/firewall.bash.j2
+++ b/provisioning/roles/geerlingguy.firewall/templates/firewall.bash.j2
@@ -8,7 +8,7 @@
 #   22: SSH
 #   25: SMTP
 #   80: HTTP
-#   123: DNS
+#   123: NTP
 #   443: HTTPS
 #   2222: SSH alternate
 #   4949: Munin

From 62c6604cf1a9ff907b57e3529b28ec23931fdfff Mon Sep 17 00:00:00 2001
From: Joe Stewart <joe.stewart@mediacurrent.com>
Date: Fri, 28 Apr 2017 17:09:32 -0400
Subject: [PATCH 0774/1273] Fixes #1351

Sets example.composer.json to use "web" directory.
Updates documentation references from "docroot" to "web".
---
 docs/deployment/composer.md  | 7 ++++---
 example.drupal.composer.json | 8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/docs/deployment/composer.md b/docs/deployment/composer.md
index 6d04b94de..fbfb8e967 100644
--- a/docs/deployment/composer.md
+++ b/docs/deployment/composer.md
@@ -1,13 +1,14 @@
 Drupal VM is configured to use `composer create-project` to build a Drupal 8 codebase by default but supports building Drupal from a custom `composer.json` file as well.
 
 1. Copy `example.drupal.composer.json` to `drupal.composer.json` and modify it to your liking.
-2. Use the Composer build system by setting `drupal_build_composer: true` in your `config.yml` (make sure `drupal_build_makefile` and `build_composer_project` are set to `false`).
-3. Configure `drupal_core_path` to point to the webroot directory: `drupal_core_path: {{ drupal_composer_install_dir }}/docroot`
+2. Use the Composer build system by setting `drupal_build_composer: true` in your `config.yml` (make sure `drupal_build_makefile` and `drupal_build_composer_project` are set to `false`).
+3. Ensure `drupal_core_path` points to the webroot directory: `drupal_core_path: {{ drupal_composer_install_dir }}/web`
 
 ```yaml
+drupal_build_makefile: false
 drupal_build_composer_project: false
 drupal_build_composer: true
-drupal_core_path: "{{ drupal_composer_install_dir }}/docroot"
+drupal_core_path: "{{ drupal_composer_install_dir }}/web"
 ```
 
 _The file set in `drupal_composer_path` (which defaults to `drupal.composer.json`) will be copied from your host computer into the VM's `drupal_composer_install_dir` and renamed `composer.json`._
diff --git a/example.drupal.composer.json b/example.drupal.composer.json
index e682239b2..58d433efc 100644
--- a/example.drupal.composer.json
+++ b/example.drupal.composer.json
@@ -28,10 +28,10 @@
     "prefer-stable": true,
     "extra": {
         "installer-paths": {
-            "docroot/core": ["type:drupal-core"],
-            "docroot/modules/contrib/{$name}": ["type:drupal-module"],
-            "docroot/profiles/contrib/{$name}": ["type:drupal-profile"],
-            "docroot/themes/contrib/{$name}": ["type:drupal-theme"],
+            "web/core": ["type:drupal-core"],
+            "web/modules/contrib/{$name}": ["type:drupal-module"],
+            "web/profiles/contrib/{$name}": ["type:drupal-profile"],
+            "web/themes/contrib/{$name}": ["type:drupal-theme"],
             "drush/contrib/{$name}": ["type:drupal-drush"]
         }
     },

From 49d212c981718b2c52b7919be0b33ad3d8114218 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 28 Apr 2017 23:16:05 -0400
Subject: [PATCH 0775/1273] Issue #1206: Add composer run-tests command for
 running tests in a Docker container.

---
 README.md          | 13 ++++++++++++-
 composer.json      |  8 +++++++-
 tests/run-tests.sh | 39 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100755 tests/run-tests.sh

diff --git a/README.md b/README.md
index 924e1f8a2..82c367f62 100644
--- a/README.md
+++ b/README.md
@@ -154,10 +154,21 @@ Drupal VM runs on almost any modern computer that can run VirtualBox and Vagrant
   - Find out more about local development with Vagrant + VirtualBox + Ansible in this presentation: [Local Development Environments - Vagrant, VirtualBox and Ansible](http://www.slideshare.net/geerlingguy/local-development-on-virtual-machines-vagrant-virtualbox-and-ansible).
   - Learn about how Ansible can accelerate your ability to innovate and manage your infrastructure by reading [Ansible for DevOps](http://www.ansiblefordevops.com/).
 
+## Tests
+
+To run basic integration tests using Docker:
+
+  1. [Install Docker](https://docs.docker.com/engine/installation/).
+  2. In this project directory, run: `composer run-tests`
+
+> Note: If you're on a Mac, and want to use Docker's `cached` volume option (or `delegated`, once it's available) for faster local filesystem access, you need to install [Docker's Edge release](https://docs.docker.com/docker-for-mac/install/#download-docker-for-mac).
+
+The project's automated tests are run via Travis CI, and the more comprehensive test suite covers multiple Linux distributions and many different Drupal VM use cases and deployment techniques.
+
 ## License
 
 This project is licensed under the MIT open source license.
 
 ## About the Author
 
-[Jeff Geerling](http://www.jeffgeerling.com/) created Drupal VM in 2014 for a more efficient Drupal site and core/contrib development workflow. This project is featured as an example in [Ansible for DevOps](http://www.ansiblefordevops.com/).
+[Jeff Geerling](https://www.jeffgeerling.com/) created Drupal VM in 2014 for a more efficient Drupal site and core/contrib development workflow. This project is featured as an example in [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/composer.json b/composer.json
index 1b9922d36..4a1b349c1 100644
--- a/composer.json
+++ b/composer.json
@@ -20,5 +20,11 @@
         "source": "https://github.com/geerlingguy/drupal-vm",
         "docs": "http://docs.drupalvm.com"
     },
-    "require": {}
+    "require": {},
+    "config": {
+        "process-timeout": 1800
+    },
+    "scripts": {
+        "run-tests": "./tests/run-tests.sh"
+    }
 }
diff --git a/tests/run-tests.sh b/tests/run-tests.sh
new file mode 100755
index 000000000..4dc82c127
--- /dev/null
+++ b/tests/run-tests.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+# Set volume options.
+if [[ "$OSTYPE" == "darwin"* ]]; then
+  volume_opts='rw,cached'
+else
+  volume_opts='rw'
+fi
+
+# Remove test container if it already exists.
+docker ps -aq --filter name=dvm-test | xargs docker rm -f -v
+
+# Run the container.
+docker run --name=dvm-test -d \
+  --add-host "$HOSTNAME  drupalvm":127.0.0.1 \
+  -v $PWD:/var/www/drupalvm/:$volume_opts \
+  -p 8888:80 \
+  --privileged \
+  geerlingguy/docker-ubuntu1604-ansible:latest \
+  /lib/systemd/systemd
+
+# Create Drupal directory.
+docker exec dvm-test mkdir -p /var/www/drupalvm/drupal
+
+# Check playbook syntax.
+docker exec --tty dvm-test env TERM=xterm ansible-playbook /var/www/drupalvm/provisioning/playbook.yml --syntax-check
+
+# Set things up and run the Ansible playbook.
+docker exec --tty dvm-test env TERM=xterm ansible-playbook /var/www/drupalvm/tests/test-setup.yml
+docker exec dvm-test env TERM=xterm ANSIBLE_FORCE_COLOR=true COMPOSER_PROCESS_TIMEOUT=1800 ansible-playbook /var/www/drupalvm/provisioning/playbook.yml
+
+# Check if Drupal was installed successfully.
+docker exec dvm-test curl -s --header Host:$HOSTNAME localhost \
+  | grep -q '<title>Welcome to Drupal' \
+  && (echo 'Drupal install pass' && exit 0) \
+  || (echo 'Drupal install fail' && exit 1)
+
+# Remove test container.
+docker rm -f dvm-test

From df90d4db0629e2096022073e6b0f56d79f85993a Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 28 Apr 2017 23:42:14 -0400
Subject: [PATCH 0776/1273] Issue #1206: Try running tests on Travis CI through
 Composer.

---
 .travis.yml | 164 +++++++++++++---------------------------------------
 1 file changed, 41 insertions(+), 123 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a6fc45160..232cebbc1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,45 +19,45 @@ env:
       distro: ubuntu1604
       init: /sbin/init
       run_opts: "--privileged"
-    # Defaults - Ubuntu 14.04.
-    - type: defaults
-      distro: ubuntu1404
-      init: /sbin/init
-      run_opts: "--privileged"
-    # PHP 5.6 - Ubuntu 16.04.
-    - type: defaults
-      distro: ubuntu1604
-      init: /sbin/init
-      run_opts: "--privileged"
-      local_config: tests/ubuntu-16-php56.config.yml
-      DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/drush/drush/drush"
-      TEST_INSTALLED_EXTRAS: false
-    # Nginx and Drush make file test - Ubuntu 16.04.
-    - type: nginx-drush-make
-      distro: ubuntu1604
-      init: /sbin/init
-      run_opts: "--privileged"
-      local_config: tests/ubuntu-16-nginx.config.yml
-      config_dir: /var/www/drupalvm/config
-    # PostgreSQL - Ubuntu 16.04.
-    - type: postgresql
-      distro: ubuntu1604
-      init: /sbin/init
-      run_opts: "--privileged"
-      local_config: tests/ubuntu-16-postgresql.config.yml
-      config_dir: /var/www/drupalvm/config
-      DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/drush/drush/drush"
-      TEST_INSTALLED_EXTRAS: false
-    # Defaults - CentOS 7.
-    - type: centos
-      distro: centos7
-      init: /usr/lib/systemd/systemd
-      run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-    # Defaults - Debian 8.
-    - type: debian
-      distro: debian8
-      init: /lib/systemd/systemd
-      run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    # # Defaults - Ubuntu 14.04.
+    # - type: defaults
+    #   distro: ubuntu1404
+    #   init: /sbin/init
+    #   run_opts: "--privileged"
+    # # PHP 5.6 - Ubuntu 16.04.
+    # - type: defaults
+    #   distro: ubuntu1604
+    #   init: /sbin/init
+    #   run_opts: "--privileged"
+    #   local_config: tests/ubuntu-16-php56.config.yml
+    #   DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/drush/drush/drush"
+    #   TEST_INSTALLED_EXTRAS: false
+    # # Nginx and Drush make file test - Ubuntu 16.04.
+    # - type: nginx-drush-make
+    #   distro: ubuntu1604
+    #   init: /sbin/init
+    #   run_opts: "--privileged"
+    #   local_config: tests/ubuntu-16-nginx.config.yml
+    #   config_dir: /var/www/drupalvm/config
+    # # PostgreSQL - Ubuntu 16.04.
+    # - type: postgresql
+    #   distro: ubuntu1604
+    #   init: /sbin/init
+    #   run_opts: "--privileged"
+    #   local_config: tests/ubuntu-16-postgresql.config.yml
+    #   config_dir: /var/www/drupalvm/config
+    #   DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/drush/drush/drush"
+    #   TEST_INSTALLED_EXTRAS: false
+    # # Defaults - CentOS 7.
+    # - type: centos
+    #   distro: centos7
+    #   init: /usr/lib/systemd/systemd
+    #   run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    # # Defaults - Debian 8.
+    # - type: debian
+    #   distro: debian8
+    #   init: /lib/systemd/systemd
+    #   run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
 
 before_install:
   # Pull container.
@@ -67,91 +67,9 @@ before_install:
   - 'gem install rubocop'
 
 script:
-  # Run container in detached state and store the id.
-  - 'tmpfile=$(mktemp)'
-  - 'docker run --detach --add-host "${HOSTNAME}$(echo -e "\t")${MACHINE_NAME}":127.0.0.1 --volume="${PWD}":${DRUPALVM_DIR}/:rw ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${tmpfile}"'
-  - 'container_id=$(cat ${tmpfile})'
-
-  # Setup directories.
-  - 'docker exec ${container_id} mkdir -p ${DRUPALVM_DIR}/drupal'
-
-  # Setup config directory.
-  - '[[ ! -z "${config_dir}" ]] && docker exec ${container_id} mkdir -p ${config_dir} || true'
-
-  # Copy configuration files into place.
-  - 'docker exec ${container_id} cp ${DRUPALVM_DIR}/${CONFIG} ${config_dir:-$DRUPALVM_DIR}/config.yml'
-  - 'docker exec ${container_id} cp ${DRUPALVM_DIR}/${MAKEFILE} ${config_dir:-$DRUPALVM_DIR}/drupal.make.yml'
-  - 'docker exec ${container_id} cp ${DRUPALVM_DIR}/${COMPOSERFILE} ${config_dir:-$DRUPALVM_DIR}/drupal.composer.json'
-
-  - '[[ ! -z "${DRUPALVM_ENV}" ]] && docker exec ${container_id} bash -c "cp ${DRUPALVM_DIR}/tests/${DRUPALVM_ENV}.config.yml ${config_dir:-$DRUPALVM_DIR}/${DRUPALVM_ENV}.config.yml" || true'
-
-  # Override configuration variables.
-  - '[[ ! -z "${local_config}" ]] && docker exec ${container_id} bash -c "cp ${DRUPALVM_DIR}/${local_config} ${config_dir:-$DRUPALVM_DIR}/local.config.yml" || true'
-
   # Vagrantfile syntax check.
   - 'rubocop ./Vagrantfile ./lib/drupalvm --except LineLength,Eval,MutableConstant,BlockLength,ConditionalAssignment,IndentArray,AlignParameters'
 
-  # Ansible syntax check.
-  - 'docker exec --tty ${container_id} env TERM=xterm ansible-playbook ${DRUPALVM_DIR}/provisioning/playbook.yml --syntax-check'
-
-  # Run the test setup playbook with ansible-playbook.
-  - 'docker exec --tty ${container_id} env TERM=xterm ansible-playbook ${DRUPALVM_DIR}/tests/test-setup.yml'
-
-  # Run the playbook with ansible-playbook.
-  - >
-    if [ ! -z "${config_dir}" ]; then
-      docker exec ${container_id} env TERM=xterm DRUPALVM_ENV=${DRUPALVM_ENV} ansible-playbook ${DRUPALVM_DIR}/provisioning/playbook.yml --extra-vars="config_dir=${config_dir}";
-    else
-      docker exec ${container_id} env TERM=xterm DRUPALVM_ENV=${DRUPALVM_ENV} ansible-playbook ${DRUPALVM_DIR}/provisioning/playbook.yml;
-    fi
-
-  # Run integration tests.
-  - >
-    docker exec ${container_id} curl -s --header Host:${HOSTNAME} localhost
-    | grep -q '<title>Welcome to Drupal'
-    && (echo 'Drupal install pass' && exit 0)
-    || (echo 'Drupal install fail' && exit 1)
-
-  - >
-    if [ $TEST_INSTALLED_EXTRAS = true ]; then
-      docker exec ${container_id} curl -s --header Host:adminer.${HOSTNAME} localhost \
-      | grep -q '<title>Login - Adminer' \
-      && (echo 'Adminer install pass' && exit 0) \
-      || (echo 'Adminer install fail' && exit 1)
-    fi
-
-  - >
-    if [ $TEST_INSTALLED_EXTRAS = true ]; then
-      docker exec ${container_id} curl -s --header Host:pimpmylog.${HOSTNAME} localhost \
-      | grep -q '<title>Pimp my Log' \
-      && (echo 'Pimp my Log install pass' && exit 0) \
-      || (echo 'Pimp my Log install fail' && exit 1)
-    fi
-
-  - >
-    if [ $TEST_INSTALLED_EXTRAS = true ]; then
-      docker exec ${container_id} curl -s localhost:8025 \
-      | grep -q '<title>MailHog' \
-      && (echo 'MailHog install pass' && exit 0) \
-      || (echo 'MailHog install fail' && exit 1)
-    fi
-
-  - >
-    if [ $TEST_INSTALLED_EXTRAS = true ]; then
-      docker exec ${container_id} curl -sI --header Host:${HOSTNAME} localhost:81 \
-      | grep -q 'Via: .* varnish' \
-      && (echo 'Varnish install pass' && exit 0) \
-      || (echo 'Varnish install fail' && exit 1)
-    fi
-
-  - >
-    docker exec ${container_id} curl -s --header Host:${IP} localhost
-    | grep -q "<li>${IP} ${HOSTNAME}</li>"
-    && (echo 'Dashboard install pass' && exit 0)
-    || (echo 'Dashboard install fail' && exit 1)
+  # Try something quite radical.
+  - composer run-tests
 
-  - >
-    docker exec ${container_id} ${DRUSH_BIN} @${MACHINE_NAME}.${HOSTNAME} status
-    | grep -q 'Drupal bootstrap.*Successful'
-    && (echo 'Drush install pass' && exit 0)
-    || (echo 'Drush install fail' && exit 1)

From 47f103cbc3545684bbe35d7178cbdb1c80506e44 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 29 Apr 2017 00:40:57 -0400
Subject: [PATCH 0777/1273] Issue #1206: Is it possible this will work?
 Everything is composer run-tests

---
 .travis.yml        |  81 ++++++++++-------------
 README.md          |   2 +-
 tests/run-tests.sh | 162 ++++++++++++++++++++++++++++++++++++++++-----
 3 files changed, 183 insertions(+), 62 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 232cebbc1..da46780db 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,6 @@
 ---
+language: php
+php: '7.1'
 services: docker
 
 env:
@@ -12,64 +14,53 @@ env:
       DRUPALVM_DIR: /var/www/drupalvm
       DRUSH_BIN: drush
       TEST_INSTALLED_EXTRAS: true
+      CONTAINER_ID: dvm-test
 
   matrix:
     # Defaults - Ubuntu 16.04.
     - type: defaults
       distro: ubuntu1604
-      init: /sbin/init
-      run_opts: "--privileged"
-    # # Defaults - Ubuntu 14.04.
-    # - type: defaults
-    #   distro: ubuntu1404
-    #   init: /sbin/init
-    #   run_opts: "--privileged"
-    # # PHP 5.6 - Ubuntu 16.04.
-    # - type: defaults
-    #   distro: ubuntu1604
-    #   init: /sbin/init
-    #   run_opts: "--privileged"
-    #   local_config: tests/ubuntu-16-php56.config.yml
-    #   DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/drush/drush/drush"
-    #   TEST_INSTALLED_EXTRAS: false
-    # # Nginx and Drush make file test - Ubuntu 16.04.
-    # - type: nginx-drush-make
-    #   distro: ubuntu1604
-    #   init: /sbin/init
-    #   run_opts: "--privileged"
-    #   local_config: tests/ubuntu-16-nginx.config.yml
-    #   config_dir: /var/www/drupalvm/config
-    # # PostgreSQL - Ubuntu 16.04.
-    # - type: postgresql
-    #   distro: ubuntu1604
-    #   init: /sbin/init
-    #   run_opts: "--privileged"
-    #   local_config: tests/ubuntu-16-postgresql.config.yml
-    #   config_dir: /var/www/drupalvm/config
-    #   DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/drush/drush/drush"
-    #   TEST_INSTALLED_EXTRAS: false
-    # # Defaults - CentOS 7.
-    # - type: centos
-    #   distro: centos7
-    #   init: /usr/lib/systemd/systemd
-    #   run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-    # # Defaults - Debian 8.
-    # - type: debian
-    #   distro: debian8
-    #   init: /lib/systemd/systemd
-    #   run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    # Defaults - Ubuntu 14.04.
+    - type: defaults
+      distro: ubuntu1404
+    # Defaults - CentOS 7.
+    - type: centos
+      distro: centos7
+    # Defaults - Debian 8.
+    - type: debian
+      distro: debian8
+
+    # PHP 5.6 - Ubuntu 16.04.
+    - type: defaults
+      distro: ubuntu1604
+      local_config: tests/ubuntu-16-php56.config.yml
+      DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/drush/drush/drush"
+      TEST_INSTALLED_EXTRAS: false
+
+    # Nginx and Drush make file test - Ubuntu 16.04.
+    - type: nginx-drush-make
+      distro: ubuntu1604
+      local_config: tests/ubuntu-16-nginx.config.yml
+      config_dir: /var/www/drupalvm/config
+
+    # PostgreSQL - Ubuntu 16.04.
+    - type: postgresql
+      distro: ubuntu1604
+      local_config: tests/ubuntu-16-postgresql.config.yml
+      config_dir: /var/www/drupalvm/config
+      DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/drush/drush/drush"
+      TEST_INSTALLED_EXTRAS: false
 
 before_install:
   # Pull container.
-  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
+  - docker pull geerlingguy/docker-${distro}-ansible:latest
 
   # Install lint tools.
-  - 'gem install rubocop'
+  - gem install rubocop
 
 script:
   # Vagrantfile syntax check.
   - 'rubocop ./Vagrantfile ./lib/drupalvm --except LineLength,Eval,MutableConstant,BlockLength,ConditionalAssignment,IndentArray,AlignParameters'
 
-  # Try something quite radical.
+  # Run tests.
   - composer run-tests
-
diff --git a/README.md b/README.md
index 82c367f62..42434dc17 100644
--- a/README.md
+++ b/README.md
@@ -161,7 +161,7 @@ To run basic integration tests using Docker:
   1. [Install Docker](https://docs.docker.com/engine/installation/).
   2. In this project directory, run: `composer run-tests`
 
-> Note: If you're on a Mac, and want to use Docker's `cached` volume option (or `delegated`, once it's available) for faster local filesystem access, you need to install [Docker's Edge release](https://docs.docker.com/docker-for-mac/install/#download-docker-for-mac).
+> Note: If you're on a Mac, you need to use [Docker's Edge release](https://docs.docker.com/docker-for-mac/install/#download-docker-for-mac), at least until [this issue](https://github.com/docker/for-mac/issues/77) is resolved.
 
 The project's automated tests are run via Travis CI, and the more comprehensive test suite covers multiple Linux distributions and many different Drupal VM use cases and deployment techniques.
 
diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index 4dc82c127..fdfb4bcbf 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -1,39 +1,169 @@
 #!/bin/bash
+#
+# A script to run Drupal VM functional tests.
 
-# Set volume options.
+# Set defaults if they're not set upstream.
+CONFIG="${CONFIG:-tests/config.yml}"
+MAKEFILE="${MAKEFILE:-example.drupal.make.yml}"
+COMPOSERFILE="${COMPOSERFILE:-example.drupal.composer.json}"
+HOSTNAME="${HOSTNAME:-drupalvm.dev}"
+MACHINE_NAME="${MACHINE_NAME:-drupalvm}"
+IP="${IP:-192.168.88.88}"
+DRUPALVM_DIR="${DRUPALVM_DIR:-/var/www/drupalvm}"
+DRUSH_BIN="${DRUSH_BIN:-drush}"
+TEST_INSTALLED_EXTRAS="${TEST_INSTALLED_EXTRAS:-true}"
+CONTAINER_ID="${CONTAINER_ID:-dvm-test}"
+type="${type:-tests/defaults}"
+distro="${distro:-ubuntu1604}"
+
+## Set up vars for Docker setup.
+# CentOS 7
+if [ $distro = 'centos7' ]; then
+  init="/usr/lib/systemd/systemd"
+  opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+# CentOS 6
+elif [ $distro = 'centos6' ]; then
+  init="/sbin/init"
+  opts="--privileged"
+# Ubuntu 16.04
+elif [ $distro = 'ubuntu1604' ]; then
+  init="/lib/systemd/systemd"
+  opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+# Ubuntu 14.04
+elif [ $distro = 'ubuntu1404' ]; then
+  init="/sbin/init"
+  opts="--privileged"
+# Ubuntu 12.04
+elif [ $distro = 'ubuntu1204' ]; then
+  init="/sbin/init"
+  opts="--privileged"
+# Debian 8
+elif [ $distro = 'debian8' ]; then
+  init="/lib/systemd/systemd"
+  opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+# Fedora 24
+elif [ $distro = 'fedora24' ]; then
+  init="/usr/lib/systemd/systemd"
+  opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+fi
+
+# Set OS-specific options.
 if [[ "$OSTYPE" == "darwin"* ]]; then
   volume_opts='rw,cached'
+  xargs_command='xargs'
 else
   volume_opts='rw'
+  xargs_command='xargs -r'
 fi
 
+# Exit on any individual command failure.
+set -e
+
+# Pretty colors.
+red='\033[0;31m'
+green='\033[0;32m'
+neutral='\033[0m'
+
 # Remove test container if it already exists.
-docker ps -aq --filter name=dvm-test | xargs docker rm -f -v
+printf "\n"${green}"Removing any existing test containers..."${neutral}"\n"
+docker ps -aq --filter name=$CONTAINER_ID | $xargs_command docker rm -f -v
+printf ${green}"...done!"${neutral}"\n"
 
 # Run the container.
-docker run --name=dvm-test -d \
+printf "\n"${green}"Starting Docker container: geerlingguy/docker-$distro-ansible."${neutral}"\n"
+docker run --name=$CONTAINER_ID -d \
   --add-host "$HOSTNAME  drupalvm":127.0.0.1 \
   -v $PWD:/var/www/drupalvm/:$volume_opts \
-  -p 8888:80 \
-  --privileged \
-  geerlingguy/docker-ubuntu1604-ansible:latest \
-  /lib/systemd/systemd
+  $opts \
+  geerlingguy/docker-$distro-ansible:latest \
+  $init
 
-# Create Drupal directory.
-docker exec dvm-test mkdir -p /var/www/drupalvm/drupal
+# Set up directories.
+docker exec $CONTAINER_ID mkdir -p /var/www/drupalvm/drupal
+[[ ! -z "$config_dir" ]] && docker exec $CONTAINER_ID mkdir -p $config_dir || true
+
+# Copy configuration into place.
+docker exec $CONTAINER_ID cp $DRUPALVM_DIR/$CONFIG ${config_dir:-$DRUPALVM_DIR}/config.yml
+docker exec $CONTAINER_ID cp $DRUPALVM_DIR/$MAKEFILE ${config_dir:-$DRUPALVM_DIR}/drupal.make.yml
+docker exec $CONTAINER_ID cp $DRUPALVM_DIR/$COMPOSERFILE ${config_dir:-$DRUPALVM_DIR}/drupal.composer.json
+[[ ! -z "$DRUPALVM_ENV" ]] && docker exec $CONTAINER_ID bash -c "cp $DRUPALVM_DIR/tests/$DRUPALVM_ENV.config.yml ${config_dir:-$DRUPALVM_DIR}/$DRUPALVM_ENV.config.yml" || true
+
+# Override configuration variables with local config.
+[[ ! -z "$local_config" ]] && docker exec $CONTAINER_ID bash -c "cp $DRUPALVM_DIR/$local_config ${config_dir:-$DRUPALVM_DIR}/local.config.yml" || true
 
 # Check playbook syntax.
-docker exec --tty dvm-test env TERM=xterm ansible-playbook /var/www/drupalvm/provisioning/playbook.yml --syntax-check
+printf "\n"${green}"Checking playbook syntax..."${neutral}"\n"
+docker exec --tty $CONTAINER_ID env TERM=xterm ansible-playbook $DRUPALVM_DIR/provisioning/playbook.yml --syntax-check
+
+# Run the setup playbook.
+printf "\n"${green}"Running the setup playbook..."${neutral}"\n"
+docker exec --tty $CONTAINER_ID env TERM=xterm ansible-playbook /var/www/drupalvm/tests/test-setup.yml
 
-# Set things up and run the Ansible playbook.
-docker exec --tty dvm-test env TERM=xterm ansible-playbook /var/www/drupalvm/tests/test-setup.yml
-docker exec dvm-test env TERM=xterm ANSIBLE_FORCE_COLOR=true COMPOSER_PROCESS_TIMEOUT=1800 ansible-playbook /var/www/drupalvm/provisioning/playbook.yml
+# Run the Drupal VM playbook.
+printf "\n"${green}"Running the Drupal VM playbook..."${neutral}"\n"
+if [ ! -z "${config_dir}" ]; then
+  # Run with config_dir specified.
+  docker exec $CONTAINER_ID env TERM=xterm ANSIBLE_FORCE_COLOR=true DRUPALVM_ENV=$DRUPALVM_ENV \
+    ansible-playbook $DRUPALVM_DIR/provisioning/playbook.yml \
+    --extra-vars="config_dir=$config_dir";
+else
+  # Run without config_dir specified.
+  docker exec $CONTAINER_ID env TERM=xterm ANSIBLE_FORCE_COLOR=true DRUPALVM_ENV=$DRUPALVM_ENV \
+    ansible-playbook $DRUPALVM_DIR/provisioning/playbook.yml;
+fi
 
-# Check if Drupal was installed successfully.
-docker exec dvm-test curl -s --header Host:$HOSTNAME localhost \
+# Drupal.
+printf "\n"${green}"Running functional tests..."${neutral}"\n"
+docker exec $CONTAINER_ID curl -s --header Host:$HOSTNAME localhost \
   | grep -q '<title>Welcome to Drupal' \
   && (echo 'Drupal install pass' && exit 0) \
   || (echo 'Drupal install fail' && exit 1)
 
+# Adminer.
+if [ $TEST_INSTALLED_EXTRAS = true ]; then
+  docker exec $CONTAINER_ID curl -s --header Host:adminer.$HOSTNAME localhost \
+    | grep -q '<title>Login - Adminer' \
+    && (echo 'Adminer install pass' && exit 0) \
+    || (echo 'Adminer install fail' && exit 1)
+fi
+
+# Pimp My Log.
+if [ $TEST_INSTALLED_EXTRAS = true ]; then
+  docker exec $CONTAINER_ID curl -s --header Host:pimpmylog.$HOSTNAME localhost \
+    | grep -q '<title>Pimp my Log' \
+    && (echo 'Pimp my Log install pass' && exit 0) \
+    || (echo 'Pimp my Log install fail' && exit 1)
+fi
+
+# MailHog.
+if [ $TEST_INSTALLED_EXTRAS = true ]; then
+  docker exec $CONTAINER_ID curl -s localhost:8025 \
+    | grep -q '<title>MailHog' \
+    && (echo 'MailHog install pass' && exit 0) \
+    || (echo 'MailHog install fail' && exit 1)
+fi
+
+# Varnish.
+if [ $TEST_INSTALLED_EXTRAS = true ]; then
+  docker exec $CONTAINER_ID curl -sI --header Host:$HOSTNAME localhost:81 \
+    | grep -q 'Via: .* varnish' \
+    && (echo 'Varnish install pass' && exit 0) \
+    || (echo 'Varnish install fail' && exit 1)
+fi
+
+# Dashboard.
+docker exec $CONTAINER_ID curl -s --header Host:$IP localhost
+  | grep -q "<li>$IP $HOSTNAME</li>"
+  && (echo 'Dashboard install pass' && exit 0)
+  || (echo 'Dashboard install fail' && exit 1)
+
+# Drush.
+docker exec $CONTAINER_ID $DRUSH_BIN @$MACHINE_NAME.$HOSTNAME status
+  | grep -q 'Drupal bootstrap.*Successful'
+  && (echo 'Drush install pass' && exit 0)
+  || (echo 'Drush install fail' && exit 1)
+
 # Remove test container.
-docker rm -f dvm-test
+printf "\n"${green}"Cleaning up..."${neutral}"\n"
+docker rm -f $CONTAINER_ID
+printf ${green}"...done!"${neutral}"\n\n"

From 8084dde28116b1eb13b1b031d28032d5b8bde3f9 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 29 Apr 2017 01:17:23 -0400
Subject: [PATCH 0778/1273] Issue #1206: Fix syntax in failing builds.

---
 tests/run-tests.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index fdfb4bcbf..d8b7c2a98 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -152,15 +152,15 @@ if [ $TEST_INSTALLED_EXTRAS = true ]; then
 fi
 
 # Dashboard.
-docker exec $CONTAINER_ID curl -s --header Host:$IP localhost
-  | grep -q "<li>$IP $HOSTNAME</li>"
-  && (echo 'Dashboard install pass' && exit 0)
+docker exec $CONTAINER_ID curl -s --header Host:$IP localhost \
+  | grep -q "<li>$IP $HOSTNAME</li>" \
+  && (echo 'Dashboard install pass' && exit 0) \
   || (echo 'Dashboard install fail' && exit 1)
 
 # Drush.
-docker exec $CONTAINER_ID $DRUSH_BIN @$MACHINE_NAME.$HOSTNAME status
-  | grep -q 'Drupal bootstrap.*Successful'
-  && (echo 'Drush install pass' && exit 0)
+docker exec $CONTAINER_ID $DRUSH_BIN @$MACHINE_NAME.$HOSTNAME status \
+  | grep -q 'Drupal bootstrap.*Successful' \
+  && (echo 'Drush install pass' && exit 0) \
   || (echo 'Drush install fail' && exit 1)
 
 # Remove test container.

From 4539d8e150e1307747219fbf48ede7a614bd11ed Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 29 Apr 2017 13:58:21 -0400
Subject: [PATCH 0779/1273] Issue #1206: Add Docker bakery commands.

---
 composer.json                     |  5 ++-
 default.config.yml                |  5 +++
 docs/other/docker.md              |  9 ++++++
 mkdocs.yml                        |  1 +
 provisioning/docker/bake.sh       | 52 +++++++++++++++++++++++++++++++
 provisioning/docker/load-image.sh | 31 ++++++++++++++++++
 provisioning/docker/parse-yaml.sh | 14 +++++++++
 provisioning/docker/save-image.sh | 34 ++++++++++++++++++++
 8 files changed, 150 insertions(+), 1 deletion(-)
 create mode 100644 docs/other/docker.md
 create mode 100755 provisioning/docker/bake.sh
 create mode 100755 provisioning/docker/load-image.sh
 create mode 100755 provisioning/docker/parse-yaml.sh
 create mode 100755 provisioning/docker/save-image.sh

diff --git a/composer.json b/composer.json
index 4a1b349c1..7bdfb1fd0 100644
--- a/composer.json
+++ b/composer.json
@@ -25,6 +25,9 @@
         "process-timeout": 1800
     },
     "scripts": {
-        "run-tests": "./tests/run-tests.sh"
+        "run-tests": "./tests/run-tests.sh",
+        "docker-bake": "./provisioning/docker/bake.sh",
+        "docker-save-image": "./provisioning/docker/save-image.sh",
+        "docker-load-image": "./provisioning/docker/load-image.sh"
     }
 }
diff --git a/default.config.yml b/default.config.yml
index 883175dc1..6c56bc02e 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -319,6 +319,11 @@ solr_xmx: "128M"
 # Selenium configuration.
 selenium_version: 2.53.0
 
+# Docker configuration.
+docker_container_name: drupal-vm
+docker_image_name: drupal-vm
+docker_image_path: ~/Downloads
+
 # Other configuration.
 dashboard_install_dir: /var/www/dashboard
 known_hosts_path: ~/.ssh/known_hosts
diff --git a/docs/other/docker.md b/docs/other/docker.md
new file mode 100644
index 000000000..6d9e9f712
--- /dev/null
+++ b/docs/other/docker.md
@@ -0,0 +1,9 @@
+Drupal VM can be used to bake and share [Docker](https://www.docker.com) images.
+
+While building a single Docker container with the entire LAMP/LEMP/LAPP stack is not necessarily the best way to manage Docker-based infrastructure, it works.
+
+TODO:
+
+  - composer docker-bake
+  - composer docker-save-image
+  - composer docker-load-image
diff --git a/mkdocs.yml b/mkdocs.yml
index 555a718ec..46ab76f57 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -67,6 +67,7 @@ pages:
     - 'Vagrant and VirtualBox': 'other/vagrant-virtualbox.md'
     - 'Vagrant LXC provider': 'other/vagrant-lxc.md'
     - 'Improving Performance': 'other/performance.md'
+    - 'Docker': 'other/docker.md'
     - 'BigPipe with Drupal VM': 'other/bigpipe.md'
     - 'Drupal multisite': 'deployment/multisite.md'
     - 'Drupal 6 Notes': 'other/drupal-6.md'
diff --git a/provisioning/docker/bake.sh b/provisioning/docker/bake.sh
new file mode 100755
index 000000000..ccb242b59
--- /dev/null
+++ b/provisioning/docker/bake.sh
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+# Set variables.
+DRUPALVM_MACHINE_NAME="${DRUPALVM_MACHINE_NAME:-drupal-vm}"
+DRUPALVM_HOSTNAME="${DRUPALVM_HOSTNAME:-localhost}"
+DRUPALVM_PROJECT_ROOT="${DRUPALVM_PROJECT_ROOT:-/var/www/drupalvm}"
+
+HOST_HTTP_PORT="${HOST_HTTP_PORT:-8080}"
+HOST_HTTPS_PORT="${HOST_HTTPS_PORT:-8443}"
+
+DISTRO="${DISTRO:-ubuntu1604}"
+OPTS="${OPTS:---privileged}"
+INIT="${INIT:-/lib/systemd/systemd}"
+
+# Pretty colors.
+red='\033[0;31m'
+green='\033[0;32m'
+neutral='\033[0m'
+
+# Set volume options.
+if [[ "$OSTYPE" == "darwin"* ]]; then
+  volume_opts='rw,cached'
+else
+  volume_opts='rw'
+fi
+
+# Run the container.
+printf "\n"${green}"Bringing up Docker container..."${neutral}"\n"
+docker run --name=$DRUPALVM_MACHINE_NAME -d \
+  --add-host "$DRUPALVM_HOSTNAME  drupalvm":127.0.0.1 \
+  -v $PWD:$DRUPALVM_PROJECT_ROOT/:$volume_opts \
+  -p $HOST_HTTP_PORT:80 \
+  -p $HOST_HTTPS_PORT:443 \
+  $OPTS \
+  geerlingguy/docker-$DISTRO-ansible:latest \
+  $INIT
+
+# Create Drupal directory.
+docker exec $DRUPALVM_MACHINE_NAME mkdir -p $DRUPALVM_PROJECT_ROOT/drupal
+
+# Set things up and run the Ansible playbook.
+printf "\n"${green}"Running setup playbook..."${neutral}"\n"
+docker exec --tty $DRUPALVM_MACHINE_NAME env TERM=xterm \
+  ansible-playbook $DRUPALVM_PROJECT_ROOT/tests/test-setup.yml
+
+printf "\n"${green}"Provisioning Drupal VM inside Docker container..."${neutral}"\n"
+docker exec $DRUPALVM_MACHINE_NAME env TERM=xterm ANSIBLE_FORCE_COLOR=true \
+  ansible-playbook $DRUPALVM_PROJECT_ROOT/provisioning/playbook.yml
+
+printf "\n"${green}"...done!"${neutral}"\n"
+
+printf "\n"${green}"Visit the Drupal VM dashboard: http://localhost:$HOST_HTTP_PORT"${neutral}"\n"
diff --git a/provisioning/docker/load-image.sh b/provisioning/docker/load-image.sh
new file mode 100755
index 000000000..ced9c391a
--- /dev/null
+++ b/provisioning/docker/load-image.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+#
+# Load a Docker image from an archive (tar).
+#
+# Required configuration (in config.yml):
+#
+#     docker_image_name: drupal-vm
+#     docker_image_path: ~/Downloads
+#
+
+# Exit on any individual command failure.
+set -e
+
+# Include YAML parser.
+source provisioning/docker/parse-yaml.sh
+
+# Pretty colors.
+red='\033[0;31m'
+green='\033[0;32m'
+neutral='\033[0m'
+
+# Set variables.
+image_name=$(parse_yaml config.yml docker_image_name)
+image_path=$(parse_yaml config.yml docker_image_path)
+image_full_path="$image_path/$image_name.tar.gz"
+image_full_path=${image_full_path/#\~/$HOME} # Expand ~ to $HOME.
+
+# Load the image.
+printf "\n"${green}"Loading Docker image..."${neutral}"\n"
+gunzip -c $image_full_path | docker load
+printf ${green}"...done!"${neutral}"\n"
diff --git a/provisioning/docker/parse-yaml.sh b/provisioning/docker/parse-yaml.sh
new file mode 100755
index 000000000..38f9be0f2
--- /dev/null
+++ b/provisioning/docker/parse-yaml.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+#
+# Parse a YAML file.
+#
+# Usage:
+#   parse_yaml [file-path] [variable-to-retrieve]
+#
+# Requires ruby.
+#   @see https://coderwall.com/p/bm_tpa/reading-yaml-files-in-bash-with-ruby
+#   @todo Consider using PHP so user doesn't need to install Ruby.
+
+function parse_yaml {
+  ruby -ryaml -e 'puts ARGV[1..-1].inject(YAML.load(File.read(ARGV[0]))) {|acc, key| acc[key] }' "$@"
+}
diff --git a/provisioning/docker/save-image.sh b/provisioning/docker/save-image.sh
new file mode 100755
index 000000000..c454f478e
--- /dev/null
+++ b/provisioning/docker/save-image.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+#
+# Commit a Docker image and save it to an archive (tar).
+#
+# Required configuration (in config.yml):
+#
+#     docker_container_name: drupal-vm
+#     docker_image_name: drupal-vm
+#     docker_image_path: ~/Downloads
+#
+
+# Exit on any individual command failure.
+set -e
+
+# Include YAML parser.
+source provisioning/docker/parse-yaml.sh
+
+# Pretty colors.
+red='\033[0;31m'
+green='\033[0;32m'
+neutral='\033[0m'
+
+# Set variables.
+container_name=$(parse_yaml config.yml docker_container_name)
+image_name=$(parse_yaml config.yml docker_image_name)
+image_path=$(parse_yaml config.yml docker_image_path)
+image_full_path="$image_path/$image_name.tar.gz"
+image_full_path="${image_full_path/#\~/$HOME}" # Expand ~ to $HOME.
+
+# Save the image.
+printf "\n"${green}"Saving Docker container to $image_full_path..."${neutral}"\n"
+docker commit $container_name $image_name
+docker save $image_name | gzip -1 > $image_full_path
+printf ${green}"...done!"${neutral}"\n"

From d1ff1c7f23b332b391a1bdf8fecc596d3b4cd790 Mon Sep 17 00:00:00 2001
From: Thom Toogood <thomtoogood@gmail.com>
Date: Sun, 30 Apr 2017 10:22:54 +1000
Subject: [PATCH 0780/1273] Update default node version to 6.x

---
 default.config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/default.config.yml b/default.config.yml
index f91b3456b..7a38d6d46 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -278,8 +278,8 @@ mysql_wait_timeout: 300
 adminer_install_filename: index.php
 
 # Node.js configuration (if enabled above).
-# Valid examples: "0.10", "0.12", "4.x", "5.x".
-nodejs_version: "0.12"
+# Valid examples: "0.10", "0.12", "4.x", "5.x", "6.x".
+nodejs_version: "6.x"
 nodejs_npm_global_packages: []
 nodejs_install_npm_user: "{{ drupalvm_user }}"
 npm_config_prefix: "/home/{{ drupalvm_user }}/.npm-global"

From 29f8ad5fbcbdc43782e20c7ffb6c70ebcb65e977 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 29 Apr 2017 22:21:00 -0500
Subject: [PATCH 0781/1273] Issue #1206: Testing some docker-compose bits.

---
 .gitignore                  |  1 +
 example.docker-compose.yml  | 27 +++++++++++++++++++++++++++
 provisioning/docker/bake.sh |  5 +++++
 3 files changed, 33 insertions(+)
 create mode 100644 example.docker-compose.yml

diff --git a/.gitignore b/.gitignore
index 75e5baa25..5ab7e0e8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ vagrant_ansible_inventory_default
 # Drupal VM specific files.
 local.config.yml
 config.yml
+docker-compose.yml
 drupal.make.yml
 Vagrantfile.local
 examples/prod/inventory
diff --git a/example.docker-compose.yml b/example.docker-compose.yml
new file mode 100644
index 000000000..7ecb34293
--- /dev/null
+++ b/example.docker-compose.yml
@@ -0,0 +1,27 @@
+version: "3"
+
+services:
+
+  drupal-vm:
+    image: drupal-vm
+    container_name: drupal-vm
+    ports:
+      - 8080:80
+      - 8443:443
+    privileged: true
+    volumes:
+      - ./:/var/www/drupalvm/:rw,cached
+    command: /lib/systemd/systemd
+    networks:
+      drupalvm:
+        ipv4_address: 192.168.88.88
+
+networks:
+
+  drupalvm:
+    driver: bridge
+    driver_opts:
+      ip: 192.168.88.1
+    ipam:
+      config:
+        - subnet: "192.168.88.0/16"
diff --git a/provisioning/docker/bake.sh b/provisioning/docker/bake.sh
index ccb242b59..93f2a48fc 100755
--- a/provisioning/docker/bake.sh
+++ b/provisioning/docker/bake.sh
@@ -1,4 +1,9 @@
 #!/bin/bash
+#
+# Bake a Docker container with Drupal VM.
+
+# Exit on any individual command failure.
+set -e
 
 # Set variables.
 DRUPALVM_MACHINE_NAME="${DRUPALVM_MACHINE_NAME:-drupal-vm}"

From 3ec27f9b14f4326d6f59289aa99bd393791df68a Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 1 May 2017 14:37:09 -0500
Subject: [PATCH 0782/1273] Fixes #1304: Update Drupal docroot path in example
 behat.yml.

---
 docs/extras/selenium.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/extras/selenium.md b/docs/extras/selenium.md
index d931eb59f..08b7f1c02 100644
--- a/docs/extras/selenium.md
+++ b/docs/extras/selenium.md
@@ -52,7 +52,7 @@ Using the default Drupal site as an example (it's installed in `/var/www/drupalv
               blackbox: ~
               api_driver: 'drupal'
               drupal:
-                drupal_root: '/var/www/drupalvm/drupal'
+                drupal_root: '/var/www/drupalvm/drupal/web'
               region_map:
                 content: "#content"
 

From dd60793da4dd02fbe3079fe750ce0ee03b015377 Mon Sep 17 00:00:00 2001
From: Charlie Morris <cdm32@psu.edu>
Date: Tue, 2 May 2017 11:43:49 -0400
Subject: [PATCH 0783/1273] Specify the host IP as the default remote host for
 XDebug

---
 default.config.yml    | 1 +
 docs/extras/xdebug.md | 5 -----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/default.config.yml b/default.config.yml
index 883175dc1..1bd8e656a 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -310,6 +310,7 @@ php_xdebug_remote_connect_back: 1
 # Use PHPSTORM for PHPStorm, sublime.xdebug for Sublime Text.
 php_xdebug_idekey: PHPSTORM
 php_xdebug_max_nesting_level: 256
+php_xdebug_remote_host: "{{ ansible_default_ipv4.gateway }}"
 
 # Solr Configuration (if enabled above).
 solr_version: "5.5.3"
diff --git a/docs/extras/xdebug.md b/docs/extras/xdebug.md
index 90b597936..19fc73cfe 100644
--- a/docs/extras/xdebug.md
+++ b/docs/extras/xdebug.md
@@ -14,11 +14,6 @@ To use XDebug with PHPStorm, change the `php_xdebug_idekey` variable as shown be
 ```yaml
 php_xdebug_idekey: PHPSTORM
 ```
-In order to pass the Web Server Debug Validation, you'll need to also add the following your `config.yml`
-
-```yaml
-php_xdebug_remote_host: "{{ vagrant_hostname }}"
-```
 
 ### Sublime Text and XDebug with Drupal VM
 

From 36cc68bc8c97f72029702edc9430c65abec5a1a3 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 4 May 2017 22:46:01 -0500
Subject: [PATCH 0784/1273] Fixes #1206: Finalize documentation for running
 Drupal VM inside Docker.

---
 docs/other/docker.md              | 65 ++++++++++++++++++++++++++++---
 provisioning/docker/load-image.sh | 13 +++++--
 provisioning/docker/save-image.sh | 16 ++++++--
 3 files changed, 81 insertions(+), 13 deletions(-)

diff --git a/docs/other/docker.md b/docs/other/docker.md
index 6d9e9f712..5a4f062a9 100644
--- a/docs/other/docker.md
+++ b/docs/other/docker.md
@@ -1,9 +1,62 @@
-Drupal VM can be used to bake and share [Docker](https://www.docker.com) images.
+Drupal VM can be used to bake and share [Docker](https://www.docker.com) images containing a custom prebuilt copy of Drupal VM.
 
-While building a single Docker container with the entire LAMP/LEMP/LAPP stack is not necessarily the best way to manage Docker-based infrastructure, it works.
+Drupal VM includes a few `composer` scripts and an example `docker-compose.yml` file which allow you to 'bake' a new Docker image using the current Drupal VM configuration, then use this image to quickly build or rebuild your Drupal development environment (or share the image with your development team for _immediate_ environment setup).
 
-TODO:
+> **Docker support is currently experimental**, so you may want to wait until Docker support is more finalized unless you're already familiar with Docker, and okay with potentially backwards-incompatible changes when upgrading Drupal VM.
 
-  - composer docker-bake
-  - composer docker-save-image
-  - composer docker-load-image
+## Building ('baking') a Docker container with Drupal VM
+
+After you've configured your Drupal VM settings in `config.yml` and other configuration files, run the following command to create and provision a new Docker container:
+
+    composer docker-bake
+
+This process can take some time (it should take a similar amount of time as it takes to build Drupal VM normally, using Vagrant and VirtualBox), and at the end, you should see a message like:
+
+```
+PLAY RECAP *********************************************************************
+localhost                  : ok=210  changed=94   unreachable=0    failed=0
+
+
+...done!
+
+Visit the Drupal VM dashboard: http://localhost:8080
+```
+
+Once the build is complete, you could view the dashboard by visiting the URL provided.
+
+## Saving the Docker container to an image
+
+If you are happy with the way the container was built, you can run the following command to convert the container into an image:
+
+    composer docker-save-image
+
+You can override the default values for the image creation by overriding the following three variables inside `config.yml`:
+
+    docker_container_name: drupal-vm
+    docker_image_name: drupal-vm
+    docker_image_path: ~/Downloads
+
+Using the default settings, this command will tag your current version of the container as `drupal-vm:latest` (on your local computer), then store an archive of the image in an archive file, in the path "`docker_image_path`/`docker_image_name`.tar.gz".
+
+## Loading the Docker container from an image
+
+On someone else's computer (or your own, if you have deleted the existing `drupal-vm` image), you can load an image archive by placing it in the path defined by "`docker_image_path`/`docker_image_name`.tar.gz" in your `config.yml` file. To do this, run the command:
+
+    composer docker-load-image
+
+## Using Drupal VM with `docker-compose.yml`
+
+Drupal VM includes an `example.docker-compose.yml` file. To use the file, copy it to `docker-compose.yml` and customize as you see fit. Once you've configured the exposed ports and settings as you like, run the following command to bring up the network and container(s) according to the compose file:
+
+    docker-compose up -d
+
+(The `-d` tells `docker-compose` to start the containers and run in the background.) You can stop the containers with `docker-compose stop`, or remove all their configuration with `docker-compose down`.
+
+> If you're using Docker for Mac, you need to perform two manual steps prior to running `docker-compose up` to ensure you can access Drupal VM using a unique IP address:
+> 
+>   1. Run `sudo nano /etc/hosts` and add a line for Drupal VM in Docker (e.g. `192.168.88.88  drupalvm.dev` using the defaults).
+>   2. Add an alias IP address on the loopback interface: `sudo ifconfig lo0 alias 192.168.88.88/24`
+> 
+> Note that you'll have to create the alias again after restarting your computer. And if you don't know what any of this means, you might want to hold off on running Drupal VM inside Docker for now :)
+> 
+> See [this Docker (moby) issue](https://github.com/moby/moby/issues/22753#issuecomment-246054946) for more details.
diff --git a/provisioning/docker/load-image.sh b/provisioning/docker/load-image.sh
index ced9c391a..33dd58c20 100755
--- a/provisioning/docker/load-image.sh
+++ b/provisioning/docker/load-image.sh
@@ -19,9 +19,16 @@ red='\033[0;31m'
 green='\033[0;32m'
 neutral='\033[0m'
 
-# Set variables.
-image_name=$(parse_yaml config.yml docker_image_name)
-image_path=$(parse_yaml config.yml docker_image_path)
+# Set variables, read from config.yml if available.
+# TODO: This could definitely be more intelligent!
+if [ -f 'config.yml' ]; then
+  image_name=$(parse_yaml config.yml docker_image_name)
+  image_path=$(parse_yaml config.yml docker_image_path)
+else
+  image_name=$(parse_yaml default.config.yml docker_image_name)
+  image_path=$(parse_yaml default.config.yml docker_image_path)
+fi
+
 image_full_path="$image_path/$image_name.tar.gz"
 image_full_path=${image_full_path/#\~/$HOME} # Expand ~ to $HOME.
 
diff --git a/provisioning/docker/save-image.sh b/provisioning/docker/save-image.sh
index c454f478e..eb3fc71a4 100755
--- a/provisioning/docker/save-image.sh
+++ b/provisioning/docker/save-image.sh
@@ -20,10 +20,18 @@ red='\033[0;31m'
 green='\033[0;32m'
 neutral='\033[0m'
 
-# Set variables.
-container_name=$(parse_yaml config.yml docker_container_name)
-image_name=$(parse_yaml config.yml docker_image_name)
-image_path=$(parse_yaml config.yml docker_image_path)
+# Set variables, read from config.yml if available.
+# TODO: This could definitely be more intelligent!
+if [ -f 'config.yml' ]; then
+  container_name=$(parse_yaml config.yml docker_container_name)
+  image_name=$(parse_yaml config.yml docker_image_name)
+  image_path=$(parse_yaml config.yml docker_image_path)
+else
+  container_name=$(parse_yaml default.config.yml docker_container_name)
+  image_name=$(parse_yaml default.config.yml docker_image_name)
+  image_path=$(parse_yaml default.config.yml docker_image_path)
+fi
+
 image_full_path="$image_path/$image_name.tar.gz"
 image_full_path="${image_full_path/#\~/$HOME}" # Expand ~ to $HOME.
 

From 415a110b8f753f4b040c007375ae94660cbf5851 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 5 May 2017 08:12:32 -0500
Subject: [PATCH 0785/1273] Issue #1206: Allow initial docker bake build to use
 custom IP.

---
 docs/other/docker.md        | 27 +++++++++++++++++----------
 provisioning/docker/bake.sh | 31 +++++++++++++++++--------------
 2 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/docs/other/docker.md b/docs/other/docker.md
index 5a4f062a9..f305d4b5c 100644
--- a/docs/other/docker.md
+++ b/docs/other/docker.md
@@ -4,11 +4,27 @@ Drupal VM includes a few `composer` scripts and an example `docker-compose.yml`
 
 > **Docker support is currently experimental**, so you may want to wait until Docker support is more finalized unless you're already familiar with Docker, and okay with potentially backwards-incompatible changes when upgrading Drupal VM.
 
+## Managing your hosts file
+
+Before using Docker to run Drupal VM, you should [edit your hosts file](https://support.rackspace.com/how-to/modify-your-hosts-file/) and add the following line:
+
+    192.168.88.88  drupalvm.dev
+
+...but substituting the IP address and domain name you'd like to use to access your Drupal VM container.
+
+> If you're using Docker for Mac, you need to perform one additional step to ensure you can access Drupal VM using a unique IP address:
+>
+>   1. Add an alias IP address on the loopback interface: `sudo ifconfig lo0 alias 192.168.88.88/24`
+>
+> Note that you'll have to create the alias again after restarting your computer. See [this Docker (moby) issue](https://github.com/moby/moby/issues/22753#issuecomment-246054946) for more details.
+
 ## Building ('baking') a Docker container with Drupal VM
 
 After you've configured your Drupal VM settings in `config.yml` and other configuration files, run the following command to create and provision a new Docker container:
 
-    composer docker-bake
+    [OPTIONS] composer docker-bake
+
+Look at the variables defined in the `provisioning/docker/bake.sh` file for all the currently-available options (e.g. `DRUPALVM_IP_ADDRESS`, `DISTRO`, etc.). You can use Drupal VM's defaults by running the `composer docker-bake` command without any options.
 
 This process can take some time (it should take a similar amount of time as it takes to build Drupal VM normally, using Vagrant and VirtualBox), and at the end, you should see a message like:
 
@@ -51,12 +67,3 @@ Drupal VM includes an `example.docker-compose.yml` file. To use the file, copy i
     docker-compose up -d
 
 (The `-d` tells `docker-compose` to start the containers and run in the background.) You can stop the containers with `docker-compose stop`, or remove all their configuration with `docker-compose down`.
-
-> If you're using Docker for Mac, you need to perform two manual steps prior to running `docker-compose up` to ensure you can access Drupal VM using a unique IP address:
-> 
->   1. Run `sudo nano /etc/hosts` and add a line for Drupal VM in Docker (e.g. `192.168.88.88  drupalvm.dev` using the defaults).
->   2. Add an alias IP address on the loopback interface: `sudo ifconfig lo0 alias 192.168.88.88/24`
-> 
-> Note that you'll have to create the alias again after restarting your computer. And if you don't know what any of this means, you might want to hold off on running Drupal VM inside Docker for now :)
-> 
-> See [this Docker (moby) issue](https://github.com/moby/moby/issues/22753#issuecomment-246054946) for more details.
diff --git a/provisioning/docker/bake.sh b/provisioning/docker/bake.sh
index 93f2a48fc..5783ce267 100755
--- a/provisioning/docker/bake.sh
+++ b/provisioning/docker/bake.sh
@@ -6,21 +6,25 @@
 set -e
 
 # Set variables.
+DRUPALVM_IP_ADDRESS="${DRUPALVM_IP_ADDRESS:-192.168.88.88}"
 DRUPALVM_MACHINE_NAME="${DRUPALVM_MACHINE_NAME:-drupal-vm}"
 DRUPALVM_HOSTNAME="${DRUPALVM_HOSTNAME:-localhost}"
 DRUPALVM_PROJECT_ROOT="${DRUPALVM_PROJECT_ROOT:-/var/www/drupalvm}"
 
-HOST_HTTP_PORT="${HOST_HTTP_PORT:-8080}"
-HOST_HTTPS_PORT="${HOST_HTTPS_PORT:-8443}"
+DRUPALVM_HTTP_PORT="${DRUPALVM_HTTP_PORT:-80}"
+DRUPALVM_HTTPS_PORT="${DRUPALVM_HTTPS_PORT:-443}"
 
 DISTRO="${DISTRO:-ubuntu1604}"
 OPTS="${OPTS:---privileged}"
 INIT="${INIT:-/lib/systemd/systemd}"
 
-# Pretty colors.
-red='\033[0;31m'
-green='\033[0;32m'
-neutral='\033[0m'
+# Helper function to colorize statuses.
+function status() {
+  status=$1
+  printf "\n"
+  echo -e -n "\033[32m$status"
+  echo -e '\033[0m'
+}
 
 # Set volume options.
 if [[ "$OSTYPE" == "darwin"* ]]; then
@@ -30,12 +34,12 @@ else
 fi
 
 # Run the container.
-printf "\n"${green}"Bringing up Docker container..."${neutral}"\n"
+status "Bringing up Docker container..."
 docker run --name=$DRUPALVM_MACHINE_NAME -d \
   --add-host "$DRUPALVM_HOSTNAME  drupalvm":127.0.0.1 \
   -v $PWD:$DRUPALVM_PROJECT_ROOT/:$volume_opts \
-  -p $HOST_HTTP_PORT:80 \
-  -p $HOST_HTTPS_PORT:443 \
+  -p $DRUPALVM_IP_ADDRESS:$DRUPALVM_HTTP_PORT:80 \
+  -p $DRUPALVM_IP_ADDRESS:$DRUPALVM_HTTPS_PORT:443 \
   $OPTS \
   geerlingguy/docker-$DISTRO-ansible:latest \
   $INIT
@@ -44,14 +48,13 @@ docker run --name=$DRUPALVM_MACHINE_NAME -d \
 docker exec $DRUPALVM_MACHINE_NAME mkdir -p $DRUPALVM_PROJECT_ROOT/drupal
 
 # Set things up and run the Ansible playbook.
-printf "\n"${green}"Running setup playbook..."${neutral}"\n"
+status "Running setup playbook..."
 docker exec --tty $DRUPALVM_MACHINE_NAME env TERM=xterm \
   ansible-playbook $DRUPALVM_PROJECT_ROOT/tests/test-setup.yml
 
-printf "\n"${green}"Provisioning Drupal VM inside Docker container..."${neutral}"\n"
+status "Provisioning Drupal VM inside Docker container..."
 docker exec $DRUPALVM_MACHINE_NAME env TERM=xterm ANSIBLE_FORCE_COLOR=true \
   ansible-playbook $DRUPALVM_PROJECT_ROOT/provisioning/playbook.yml
 
-printf "\n"${green}"...done!"${neutral}"\n"
-
-printf "\n"${green}"Visit the Drupal VM dashboard: http://localhost:$HOST_HTTP_PORT"${neutral}"\n"
+status "...done!"
+status "Visit the Drupal VM dashboard: http://$DRUPALVM_IP_ADDRESS:$DRUPALVM_HTTP_PORT"

From 1cfe79081fec19d352a58904f9447bb9c25a4ab9 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 8 May 2017 14:00:44 -0500
Subject: [PATCH 0786/1273] Fixes #1349: Update Node.js role to make it easier
 to install global packages by name.

---
 docs/extras/nodejs.md                                   | 8 ++++++++
 examples/scripts/pareview.sh                            | 2 +-
 provisioning/requirements.yml                           | 2 +-
 provisioning/roles/geerlingguy.nodejs/README.md         | 2 ++
 provisioning/roles/geerlingguy.nodejs/defaults/main.yml | 2 ++
 provisioning/roles/geerlingguy.nodejs/tasks/main.yml    | 2 +-
 provisioning/roles/geerlingguy.nodejs/tests/test.yml    | 2 +-
 7 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/docs/extras/nodejs.md b/docs/extras/nodejs.md
index e6499eeb1..ccef453e5 100644
--- a/docs/extras/nodejs.md
+++ b/docs/extras/nodejs.md
@@ -14,9 +14,17 @@ nodejs_version: "0.12"
 
 To install packages globally, you can add them to the list of `nodejs_npm_global_packages` in `config.yml`. As an example, many developers use `phantomjs` as a ghost web driver for Behat tests inside Drupal VM. To install it globally, add it to the list:
 
+```yaml
+nodejs_npm_global_packages:
+  - phantomjs
+```
+
+You can even specify a specific version to install:
+
 ```yaml
 nodejs_npm_global_packages:
   - name: phantomjs
+    version: 2.1.7
 ```
 
 For a list of available role variables, see the [`geerlingguy.nodejs` Ansible role's README](https://github.com/geerlingguy/ansible-role-nodejs#readme).
diff --git a/examples/scripts/pareview.sh b/examples/scripts/pareview.sh
index be9e3c95b..a25911179 100755
--- a/examples/scripts/pareview.sh
+++ b/examples/scripts/pareview.sh
@@ -14,7 +14,7 @@
 #    
 #     nodejs_version: "6.x"
 #     nodejs_npm_global_packages:
-#       - name: eslint
+#       - eslint
 #     ```
 #
 # After running `vagrant provision`, `pareview.sh` should be available anywhere
diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 63b44c6f2..ede2c06cc 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -40,7 +40,7 @@
 - src: geerlingguy.nginx
   version: 2.2.1
 - src: geerlingguy.nodejs
-  version: 4.1.0
+  version: 4.1.1
 - src: geerlingguy.php
   version: 3.4.4
 - src: geerlingguy.php-memcached
diff --git a/provisioning/roles/geerlingguy.nodejs/README.md b/provisioning/roles/geerlingguy.nodejs/README.md
index ff14d4321..fe381da82 100644
--- a/provisioning/roles/geerlingguy.nodejs/README.md
+++ b/provisioning/roles/geerlingguy.nodejs/README.md
@@ -38,6 +38,8 @@ A list of npm packages with a `name` and (optional) `version` to be installed gl
         version: 0.9.3
       # Install the latest stable release of a package.
       - name: node-sass
+      # This shorthand syntax also works (same as previous example).
+      - node-sass
 <!-- code block separator -->
 
     nodejs_package_json_path: ""
diff --git a/provisioning/roles/geerlingguy.nodejs/defaults/main.yml b/provisioning/roles/geerlingguy.nodejs/defaults/main.yml
index e318ba428..f862788b8 100644
--- a/provisioning/roles/geerlingguy.nodejs/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.nodejs/defaults/main.yml
@@ -19,6 +19,8 @@ nodejs_npm_global_packages: []
 #    version: 0.9.3
 #  # Install the latest stable release of a package.
 #  - name: node-sass
+#  # This shorthand syntax also works (same as previous example).
+#  - node-sass
 
 # The path of a package.json file used to install packages globally.
 nodejs_package_json_path: ""
diff --git a/provisioning/roles/geerlingguy.nodejs/tasks/main.yml b/provisioning/roles/geerlingguy.nodejs/tasks/main.yml
index 4e37ba77d..c99d6f6ff 100644
--- a/provisioning/roles/geerlingguy.nodejs/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.nodejs/tasks/main.yml
@@ -25,7 +25,7 @@
 
 - name: Ensure npm global packages are installed.
   npm:
-    name: "{{ item.name }}"
+    name: "{{ item.name | default(item) }}"
     version: "{{ item.version | default('latest') }}"
     global: yes
     state: latest
diff --git a/provisioning/roles/geerlingguy.nodejs/tests/test.yml b/provisioning/roles/geerlingguy.nodejs/tests/test.yml
index 6e0a90942..209dcf49d 100644
--- a/provisioning/roles/geerlingguy.nodejs/tests/test.yml
+++ b/provisioning/roles/geerlingguy.nodejs/tests/test.yml
@@ -7,7 +7,7 @@
     npm_config_prefix: /root/.npm-global
     npm_config_unsafe_perm: "true"
     nodejs_npm_global_packages:
-      - name: node-sass
+      - node-sass
       - name: jslint
         version: 0.9.6
       - name: yo

From 19df67a45b5c12e3e0123d432633914be8165d56 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 9 May 2017 10:23:46 -0500
Subject: [PATCH 0787/1273] Update Apache role to latest version.

---
 provisioning/requirements.yml                                 | 2 +-
 .../roles/geerlingguy.apache/templates/vhosts.conf.j2         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index ede2c06cc..6ff520573 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -8,7 +8,7 @@
 - src: geerlingguy.adminer
   version: 1.1.1
 - src: geerlingguy.apache
-  version: 2.1.0
+  version: 2.1.1
 - src: geerlingguy.apache-php-fpm
   version: 1.0.2
 - src: geerlingguy.blackfire
diff --git a/provisioning/roles/geerlingguy.apache/templates/vhosts.conf.j2 b/provisioning/roles/geerlingguy.apache/templates/vhosts.conf.j2
index 2ec5279b1..8b7af90bb 100644
--- a/provisioning/roles/geerlingguy.apache/templates/vhosts.conf.j2
+++ b/provisioning/roles/geerlingguy.apache/templates/vhosts.conf.j2
@@ -8,7 +8,7 @@
   ServerAlias {{ vhost.serveralias }}
 {% endif %}
 {% if vhost.documentroot is defined %}
-  DocumentRoot {{ vhost.documentroot }}
+  DocumentRoot "{{ vhost.documentroot }}"
 {% endif %}
 
 {% if vhost.serveradmin is defined %}
@@ -42,7 +42,7 @@
   ServerAlias {{ vhost.serveralias }}
 {% endif %}
 {% if vhost.documentroot is defined %}
-  DocumentRoot {{ vhost.documentroot }}
+  DocumentRoot "{{ vhost.documentroot }}"
 {% endif %}
 
   SSLEngine on

From 8f605ea68ecbdc4a2160428b33d610e76a69263d Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 12 May 2017 11:33:39 -0500
Subject: [PATCH 0788/1273] Update docker documentation example.

---
 docs/other/docker.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/other/docker.md b/docs/other/docker.md
index f305d4b5c..facfb1b44 100644
--- a/docs/other/docker.md
+++ b/docs/other/docker.md
@@ -35,7 +35,7 @@ localhost                  : ok=210  changed=94   unreachable=0    failed=0
 
 ...done!
 
-Visit the Drupal VM dashboard: http://localhost:8080
+Visit the Drupal VM dashboard: http://192.168.88.88:80
 ```
 
 Once the build is complete, you could view the dashboard by visiting the URL provided.

From b13fcea4d237969a8b9c80b8c7f7bb1e1dc5107c Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 12 May 2017 23:46:59 -0500
Subject: [PATCH 0789/1273] Issue #1356: Create an official drupal-vm image on
 Docker Hub.

---
 Dockerfile                                          | 12 ++++++++++++
 default.config.yml                                  |  5 +++--
 provisioning/playbook.yml                           |  2 +-
 provisioning/roles/drupalvm.hostname/README.md      |  2 +-
 provisioning/roles/drupalvm.hostname/tasks/main.yml |  3 ++-
 5 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 000000000..665a4534b
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,12 @@
+FROM geerlingguy/docker-debian8-ansible:latest
+MAINTAINER Jeff Geerling
+
+# Copy provisioning directory into VM.
+COPY ./ /etc/ansible/drupal-vm
+
+# Provision Drupal VM inside Docker.
+RUN ANSIBLE_FORCE_COLOR=true \
+  ansible-playbook /etc/ansible/drupal-vm/provisioning/playbook.yml \
+  --extra-vars="hostname_fqdn=false firewall_enabled=false"
+
+EXPOSE 22 80 81 443 8025
diff --git a/default.config.yml b/default.config.yml
index 72e4c1188..49b11a7cb 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -220,10 +220,11 @@ extra_packages:
   - sqlite
 
 # You can configure almost anything else on the server in the rest of this file.
-extra_security_enabled: false
-
 drush_version: "8.1.10"
 
+extra_security_enabled: false
+
+firewall_enabled: true
 firewall_allowed_tcp_ports:
   - "22"
   - "25"
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 4f6b6c00d..809d3351f 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -34,7 +34,7 @@
     # Essential roles.
     - { role: geerlingguy.repo-remi, when: ansible_os_family == 'RedHat', tags: ['webserver', 'php'] }
     - { role: drupalvm.hostname }
-    - { role: geerlingguy.firewall }
+    - { role: geerlingguy.firewall, when: firewall_enabled }
     - { role: geerlingguy.git }
     - { role: geerlingguy.postfix }
     - { role: geerlingguy.apache, when: drupalvm_webserver == 'apache', tags: ['webserver']}
diff --git a/provisioning/roles/drupalvm.hostname/README.md b/provisioning/roles/drupalvm.hostname/README.md
index 914954384..66f9bc582 100644
--- a/provisioning/roles/drupalvm.hostname/README.md
+++ b/provisioning/roles/drupalvm.hostname/README.md
@@ -14,7 +14,7 @@ Available variables are listed below:
 hostname_fqdn: "{{ inventory_hostname }}"
 ```
 
-The fully qualified domain name.
+The fully qualified domain name. If left blank, the `hostname` command will not be run (this can be useful if running the role within a Docker container).
 
 ```yaml
 hostname_short: "{{ hostname_fqdn|regex_replace('^([^.]+).*$', '\\1') }}"
diff --git a/provisioning/roles/drupalvm.hostname/tasks/main.yml b/provisioning/roles/drupalvm.hostname/tasks/main.yml
index 5dcebbb7c..83de7fe8d 100644
--- a/provisioning/roles/drupalvm.hostname/tasks/main.yml
+++ b/provisioning/roles/drupalvm.hostname/tasks/main.yml
@@ -19,7 +19,8 @@
     dest: /etc/hostname
     unsafe_writes: "{{ hostname_unsafe_writes }}"
   register: set_hostname
+  when: hostname_fqdn
 
 - name: Set the hostname for current session.
   shell: hostname --file /etc/hostname
-  when: set_hostname.changed
+  when: hostname_fqdn and set_hostname.changed

From 0dd13b617a42a613c7b3e07677b1dfc40b149985 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 13 May 2017 00:03:59 -0500
Subject: [PATCH 0790/1273] Issue #1356: Reword README more generically and fix
 broken hostname functionality.

---
 Dockerfile                                          | 2 +-
 README.md                                           | 8 ++++----
 default.config.yml                                  | 1 +
 provisioning/playbook.yml                           | 2 +-
 provisioning/roles/drupalvm.hostname/tasks/main.yml | 3 +--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 665a4534b..a7b782d64 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,6 +7,6 @@ COPY ./ /etc/ansible/drupal-vm
 # Provision Drupal VM inside Docker.
 RUN ANSIBLE_FORCE_COLOR=true \
   ansible-playbook /etc/ansible/drupal-vm/provisioning/playbook.yml \
-  --extra-vars="hostname_fqdn=false firewall_enabled=false"
+  --extra-vars="hostname_configure=false firewall_enabled=false"
 
 EXPOSE 22 80 81 443 8025
diff --git a/README.md b/README.md
index 42434dc17..222506c73 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
 ![Drupal VM Logo](https://raw.githubusercontent.com/geerlingguy/drupal-vm/master/docs/images/drupal-vm-logo.png)
 
-[![Build Status](https://travis-ci.org/geerlingguy/drupal-vm.svg?branch=master)](https://travis-ci.org/geerlingguy/drupal-vm) [![Documentation Status](https://readthedocs.org/projects/drupal-vm/badge/?version=latest)](http://docs.drupalvm.com) [![Packagist](https://img.shields.io/packagist/v/geerlingguy/drupal-vm.svg)](https://packagist.org/packages/geerlingguy/drupal-vm)
+[![Build Status](https://travis-ci.org/geerlingguy/drupal-vm.svg?branch=master)](https://travis-ci.org/geerlingguy/drupal-vm) [![Documentation Status](https://readthedocs.org/projects/drupal-vm/badge/?version=latest)](http://docs.drupalvm.com) [![Packagist](https://img.shields.io/packagist/v/geerlingguy/drupal-vm.svg)](https://packagist.org/packages/geerlingguy/drupal-vm) [![Docker Automated build](https://img.shields.io/docker/automated/geerlingguy/drupal-vm.svg?maxAge=2592000)](https://hub.docker.com/r/geerlingguy/drupal-vm/) [![](https://images.microbadger.com/badges/image/geerlingguy/drupal-vm.svg)](https://microbadger.com/images/geerlingguy/drupal-vm "Get your own image badge on microbadger.com")
 
-[Drupal VM](https://www.drupalvm.com/) is A VM for Drupal development, built with Vagrant + Ansible.
+[Drupal VM](https://www.drupalvm.com/) is A VM for Drupal, built with Ansible.
 
-Drupal VM makes building local Drupal development environments quick and easy, and introduces developers to the wonderful world of Drupal development on local virtual machines (instead of crufty old MAMP/WAMP-based development).
+Drupal VM makes building Drupal development environments quick and easy, and introduces developers to the wonderful world of Drupal development on virtual machines or Docker containers (instead of crufty old MAMP/WAMP-based development).
 
 It will install the following on an Ubuntu 16.04 (by default) linux VM:
 
@@ -32,7 +32,7 @@ It will install the following on an Ubuntu 16.04 (by default) linux VM:
 
 It should take 5-10 minutes to build or rebuild the VM from scratch on a decent broadband connection.
 
-Please read through the rest of this README and the [Drupal VM documentation](http://docs.drupalvm.com/) for help getting Drupal VM configured and integrated with your development workflow.
+Please read through the rest of this README and the [Drupal VM documentation](http://docs.drupalvm.com/) for help getting Drupal VM configured and integrated with your workflow.
 
 ## Documentation
 
diff --git a/default.config.yml b/default.config.yml
index 49b11a7cb..4415c5c86 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -328,5 +328,6 @@ docker_image_path: ~/Downloads
 # Other configuration.
 dashboard_install_dir: /var/www/dashboard
 known_hosts_path: ~/.ssh/known_hosts
+hostname_configure: true
 hostname_fqdn: "{{ vagrant_hostname }}"
 ssh_home: "{{ drupal_core_path }}"
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 809d3351f..4532b024b 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -33,7 +33,7 @@
   roles:
     # Essential roles.
     - { role: geerlingguy.repo-remi, when: ansible_os_family == 'RedHat', tags: ['webserver', 'php'] }
-    - { role: drupalvm.hostname }
+    - { role: drupalvm.hostname, when: hostname_configure }
     - { role: geerlingguy.firewall, when: firewall_enabled }
     - { role: geerlingguy.git }
     - { role: geerlingguy.postfix }
diff --git a/provisioning/roles/drupalvm.hostname/tasks/main.yml b/provisioning/roles/drupalvm.hostname/tasks/main.yml
index 83de7fe8d..5dcebbb7c 100644
--- a/provisioning/roles/drupalvm.hostname/tasks/main.yml
+++ b/provisioning/roles/drupalvm.hostname/tasks/main.yml
@@ -19,8 +19,7 @@
     dest: /etc/hostname
     unsafe_writes: "{{ hostname_unsafe_writes }}"
   register: set_hostname
-  when: hostname_fqdn
 
 - name: Set the hostname for current session.
   shell: hostname --file /etc/hostname
-  when: hostname_fqdn and set_hostname.changed
+  when: set_hostname.changed

From 067a73ef3ad555090900b3f8c205bbc8b3f2f23c Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 13 May 2017 16:35:51 -0500
Subject: [PATCH 0791/1273] Issue #1356: Change variable inclusion method for
 Docker.

---
 Dockerfile                             | 9 ++++-----
 provisioning/docker/vars/overrides.yml | 9 +++++++++
 2 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 provisioning/docker/vars/overrides.yml

diff --git a/Dockerfile b/Dockerfile
index a7b782d64..d91c3b0c8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,11 @@
 FROM geerlingguy/docker-debian8-ansible:latest
 MAINTAINER Jeff Geerling
 
-# Copy provisioning directory into VM.
+# Copy provisioning directory and vars files into container.
 COPY ./ /etc/ansible/drupal-vm
+COPY ./provisioning/docker/vars/overrides.yml /etc/ansible/drupal-vm/local.config.yml
 
 # Provision Drupal VM inside Docker.
-RUN ANSIBLE_FORCE_COLOR=true \
-  ansible-playbook /etc/ansible/drupal-vm/provisioning/playbook.yml \
-  --extra-vars="hostname_configure=false firewall_enabled=false"
+RUN ansible-playbook /etc/ansible/drupal-vm/provisioning/playbook.yml
 
-EXPOSE 22 80 81 443 8025
+EXPOSE 22 80 443 8025
diff --git a/provisioning/docker/vars/overrides.yml b/provisioning/docker/vars/overrides.yml
new file mode 100644
index 000000000..2154db475
--- /dev/null
+++ b/provisioning/docker/vars/overrides.yml
@@ -0,0 +1,9 @@
+---
+hostname_configure: false
+firewall_enabled: false
+installed_extras:
+  - adminer
+  - drush
+  - mailhog
+  - pimpmylog
+  # - varnish

From 00e985a7f2a6e09f3c7a7010ec58e1f0f4c9f122 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 14 May 2017 00:24:49 -0500
Subject: [PATCH 0792/1273] Issue #1356: Add second Dockerfile without a Drupal
 installation.

---
 Dockerfile-no-install                             | 11 +++++++++++
 example.docker-compose.yml                        |  5 +++--
 provisioning/docker/vars/overrides-no-install.yml | 15 +++++++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 Dockerfile-no-install
 create mode 100644 provisioning/docker/vars/overrides-no-install.yml

diff --git a/Dockerfile-no-install b/Dockerfile-no-install
new file mode 100644
index 000000000..e64b4b92e
--- /dev/null
+++ b/Dockerfile-no-install
@@ -0,0 +1,11 @@
+FROM geerlingguy/docker-debian8-ansible:latest
+MAINTAINER Jeff Geerling
+
+# Copy provisioning directory and vars files into container.
+COPY ./ /etc/ansible/drupal-vm
+COPY ./provisioning/docker/vars/overrides-no-install.yml /etc/ansible/drupal-vm/local.config.yml
+
+# Provision Drupal VM inside Docker.
+RUN ansible-playbook /etc/ansible/drupal-vm/provisioning/playbook.yml
+
+EXPOSE 22 80 443 8025
diff --git a/example.docker-compose.yml b/example.docker-compose.yml
index 7ecb34293..bc33298c9 100644
--- a/example.docker-compose.yml
+++ b/example.docker-compose.yml
@@ -3,11 +3,12 @@ version: "3"
 services:
 
   drupal-vm:
+    # Switch the image to `geerlingguy/drupal-vm` if not using your own image.
     image: drupal-vm
     container_name: drupal-vm
     ports:
-      - 8080:80
-      - 8443:443
+      - 80:80
+      - 443:443
     privileged: true
     volumes:
       - ./:/var/www/drupalvm/:rw,cached
diff --git a/provisioning/docker/vars/overrides-no-install.yml b/provisioning/docker/vars/overrides-no-install.yml
new file mode 100644
index 000000000..812e16b0e
--- /dev/null
+++ b/provisioning/docker/vars/overrides-no-install.yml
@@ -0,0 +1,15 @@
+---
+hostname_configure: false
+firewall_enabled: false
+installed_extras:
+  - adminer
+  - drush
+  - mailhog
+  - pimpmylog
+  # - varnish
+
+# Don't build or install Drupal inside the container.
+drupal_build_makefile: false
+drupal_build_composer: false
+drupal_build_composer_project: false
+drupal_install_site: false

From 721d9d85d3975b59da00cfedb6097a6985b23579 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 14 May 2017 00:35:05 -0500
Subject: [PATCH 0793/1273] Move Dockerfiles into Docker provisioning
 directory.

---
 Dockerfile => provisioning/docker/dockerfile-default/Dockerfile   | 0
 .../docker/dockerfile-no-install/Dockerfile                       | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename Dockerfile => provisioning/docker/dockerfile-default/Dockerfile (100%)
 rename Dockerfile-no-install => provisioning/docker/dockerfile-no-install/Dockerfile (100%)

diff --git a/Dockerfile b/provisioning/docker/dockerfile-default/Dockerfile
similarity index 100%
rename from Dockerfile
rename to provisioning/docker/dockerfile-default/Dockerfile
diff --git a/Dockerfile-no-install b/provisioning/docker/dockerfile-no-install/Dockerfile
similarity index 100%
rename from Dockerfile-no-install
rename to provisioning/docker/dockerfile-no-install/Dockerfile

From 8e814e996bd09c5a6290762f4a23806a046187c9 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 14 May 2017 00:56:38 -0500
Subject: [PATCH 0794/1273] Issue #1356: Revert back to single Dockerfile for
 the time being.

---
 provisioning/docker/dockerfile-default/Dockerfile => Dockerfile   | 0
 .../{dockerfile-no-install/Dockerfile => Dockerfile-no-install}   | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename provisioning/docker/dockerfile-default/Dockerfile => Dockerfile (100%)
 rename provisioning/docker/{dockerfile-no-install/Dockerfile => Dockerfile-no-install} (100%)

diff --git a/provisioning/docker/dockerfile-default/Dockerfile b/Dockerfile
similarity index 100%
rename from provisioning/docker/dockerfile-default/Dockerfile
rename to Dockerfile
diff --git a/provisioning/docker/dockerfile-no-install/Dockerfile b/provisioning/docker/Dockerfile-no-install
similarity index 100%
rename from provisioning/docker/dockerfile-no-install/Dockerfile
rename to provisioning/docker/Dockerfile-no-install

From 64f0f6ae22153eacc4e52ba7fd1c81bcaa062464 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 14 May 2017 01:03:52 -0500
Subject: [PATCH 0795/1273] Issue #1356: Default to not installing Drupal
 inside the public Docker Hub image.

---
 Dockerfile                                            |  2 +-
 example.docker-compose.yml                            |  1 +
 provisioning/docker/Dockerfile-no-install             | 11 -----------
 ...rrides-no-install.yml => docker-hub-overrides.yml} |  0
 provisioning/docker/vars/overrides.yml                |  9 ---------
 5 files changed, 2 insertions(+), 21 deletions(-)
 delete mode 100644 provisioning/docker/Dockerfile-no-install
 rename provisioning/docker/vars/{overrides-no-install.yml => docker-hub-overrides.yml} (100%)
 delete mode 100644 provisioning/docker/vars/overrides.yml

diff --git a/Dockerfile b/Dockerfile
index d91c3b0c8..adda4d181 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@ MAINTAINER Jeff Geerling
 
 # Copy provisioning directory and vars files into container.
 COPY ./ /etc/ansible/drupal-vm
-COPY ./provisioning/docker/vars/overrides.yml /etc/ansible/drupal-vm/local.config.yml
+COPY ./provisioning/docker/vars/docker-hub-overrides.yml /etc/ansible/drupal-vm/local.config.yml
 
 # Provision Drupal VM inside Docker.
 RUN ansible-playbook /etc/ansible/drupal-vm/provisioning/playbook.yml
diff --git a/example.docker-compose.yml b/example.docker-compose.yml
index bc33298c9..30d43d3c5 100644
--- a/example.docker-compose.yml
+++ b/example.docker-compose.yml
@@ -10,6 +10,7 @@ services:
       - 80:80
       - 443:443
     privileged: true
+    # Use of the `cached` option requires the Docker Edge release as of May '17.
     volumes:
       - ./:/var/www/drupalvm/:rw,cached
     command: /lib/systemd/systemd
diff --git a/provisioning/docker/Dockerfile-no-install b/provisioning/docker/Dockerfile-no-install
deleted file mode 100644
index e64b4b92e..000000000
--- a/provisioning/docker/Dockerfile-no-install
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM geerlingguy/docker-debian8-ansible:latest
-MAINTAINER Jeff Geerling
-
-# Copy provisioning directory and vars files into container.
-COPY ./ /etc/ansible/drupal-vm
-COPY ./provisioning/docker/vars/overrides-no-install.yml /etc/ansible/drupal-vm/local.config.yml
-
-# Provision Drupal VM inside Docker.
-RUN ansible-playbook /etc/ansible/drupal-vm/provisioning/playbook.yml
-
-EXPOSE 22 80 443 8025
diff --git a/provisioning/docker/vars/overrides-no-install.yml b/provisioning/docker/vars/docker-hub-overrides.yml
similarity index 100%
rename from provisioning/docker/vars/overrides-no-install.yml
rename to provisioning/docker/vars/docker-hub-overrides.yml
diff --git a/provisioning/docker/vars/overrides.yml b/provisioning/docker/vars/overrides.yml
deleted file mode 100644
index 2154db475..000000000
--- a/provisioning/docker/vars/overrides.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-hostname_configure: false
-firewall_enabled: false
-installed_extras:
-  - adminer
-  - drush
-  - mailhog
-  - pimpmylog
-  # - varnish

From 9e1fcef7f887358593022623fd8f8ec1fca0bf67 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 16 May 2017 22:33:06 -0500
Subject: [PATCH 0796/1273] Issue #1366: Fix PHP-FPM not enabled on Debian 8
 via systemd.

---
 provisioning/requirements.yml                 |  2 +-
 provisioning/roles/geerlingguy.php/.gitignore |  2 +
 .../roles/geerlingguy.php/.travis.yml         | 73 ++++++++-----------
 provisioning/roles/geerlingguy.php/LICENSE    | 20 +++++
 provisioning/roles/geerlingguy.php/README.md  |  6 +-
 .../roles/geerlingguy.php/defaults/main.yml   |  6 +-
 .../geerlingguy.php/tasks/configure-fpm.yml   | 12 ++-
 .../geerlingguy.php/templates/php.ini.j2      |  4 +-
 .../roles/geerlingguy.php/tests/README.md     | 11 +++
 .../roles/geerlingguy.php/tests/test.yml      | 28 +++++++
 10 files changed, 115 insertions(+), 49 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.php/.gitignore
 create mode 100644 provisioning/roles/geerlingguy.php/LICENSE
 create mode 100644 provisioning/roles/geerlingguy.php/tests/README.md

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 6ff520573..33da25020 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -42,7 +42,7 @@
 - src: geerlingguy.nodejs
   version: 4.1.1
 - src: geerlingguy.php
-  version: 3.4.4
+  version: 3.4.5
 - src: geerlingguy.php-memcached
   version: 2.0.0
 - src: geerlingguy.php-mysql
diff --git a/provisioning/roles/geerlingguy.php/.gitignore b/provisioning/roles/geerlingguy.php/.gitignore
new file mode 100644
index 000000000..c9b2377e3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/.gitignore
@@ -0,0 +1,2 @@
+*.retry
+tests/test.sh
diff --git a/provisioning/roles/geerlingguy.php/.travis.yml b/provisioning/roles/geerlingguy.php/.travis.yml
index 0c2146fb9..5337b1a10 100644
--- a/provisioning/roles/geerlingguy.php/.travis.yml
+++ b/provisioning/roles/geerlingguy.php/.travis.yml
@@ -4,79 +4,68 @@ services: docker
 env:
   # Test package install on all supported OSes.
   - distro: centos7
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     playbook: test.yml
     php_version: 7.0
   - distro: fedora24
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     playbook: test.yml
     php_version: 5.6
+  - distro: debian8
+    playbook: test.yml
+    php_version: 7.0
   - distro: ubuntu1604
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     playbook: test.yml
     php_version: 7.0
   - distro: ubuntu1404
-    init: /sbin/init
-    run_opts: ""
     playbook: test.yml
     php_version: 7.0
   - distro: ubuntu1204
-    init: /sbin/init
-    run_opts: ""
     playbook: test.yml
     php_version: 5.6
 
   # Only test source install on latest supported OSes.
   - distro: centos7
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     playbook: test-source.yml
     php_version: 7.0.13
   - distro: ubuntu1604
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     playbook: test-source.yml
     php_version: 7.0.13
 
-before_install:
-  # Pull container.
-  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
-
 script:
-  - container_id=$(mktemp)
-  # Run container in detached state.
-  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
+  # Configure test script so we can run extra tests after playbook is run.
+  - export container_id=$(date +%s)
+  - export cleanup=false
 
-  # Install dependencies.
-  - 'docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
+  # Download test shim.
+  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
+  - chmod +x ${PWD}/tests/test.sh
 
-  # Ansible syntax check.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} --syntax-check'
-
-  # Test role.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook}'
-
-  # Test role idempotence.
-  - idempotence=$(mktemp)
-  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} | tee -a ${idempotence}
-  - >
-    tail ${idempotence}
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
+  # Run tests.
+  - ${PWD}/tests/test.sh
 
   # Ensure PHP is installed and at the right version.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm which php'
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm test -x /usr/bin/php'
+  - 'docker exec --tty ${container_id} env TERM=xterm which php'
+  - 'docker exec --tty ${container_id} env TERM=xterm test -x /usr/bin/php'
 
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm php --version'
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm /usr/bin/php --version | grep -qF "PHP ${php_version}"'
+  - 'docker exec --tty ${container_id} env TERM=xterm php --version'
+  - 'docker exec --tty ${container_id} env TERM=xterm /usr/bin/php --version | grep -qF "PHP ${php_version}"'
 
   # Ensure PHP configurations have taken effect.
-  - docker exec --tty "$(cat ${container_id})" env TERM=xterm php -i | grep 'memory_limit.*192'
+  - docker exec --tty ${container_id} env TERM=xterm php -i | grep 'memory_limit.*192'
+
+  # Check the status of PHP-FPM.
+  - |
+    if [ "${playbook}" == "test.yml" ]; then
+      case "${distro}" in
+        "centos7"|"fedora24")
+          docker exec --tty ${container_id} env TERM=xterm systemctl --no-pager status php-fpm status
+          docker exec --tty ${container_id} env TERM=xterm systemctl --no-pager status php-fpm status | grep -qF "fpm.service; enabled"
+          ;;
+        "debian8"|"ubuntu1604")
+          docker exec --tty ${container_id} env TERM=xterm systemctl --no-pager status php${php_version}-fpm status
+          docker exec --tty ${container_id} env TERM=xterm systemctl --no-pager status php${php_version}-fpm status | grep -qF "fpm.service; enabled"
+          ;;
+      esac
+    fi
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.php/LICENSE b/provisioning/roles/geerlingguy.php/LICENSE
new file mode 100644
index 000000000..4275cf3c1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Jeff Geerling
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/provisioning/roles/geerlingguy.php/README.md b/provisioning/roles/geerlingguy.php/README.md
index 5d2143cd2..6c9bbb89d 100644
--- a/provisioning/roles/geerlingguy.php/README.md
+++ b/provisioning/roles/geerlingguy.php/README.md
@@ -63,7 +63,7 @@ If you're using Apache, you can easily get it configured to work with PHP-FPM us
     php_fpm_pm_min_spare_servers: 5
     php_fpm_pm_max_spare_servers: 5
 
-Specific settings inside the default `www.conf` PHP-FPM pool. If you'd like to manage additional settings, you can do so either by replacing the file with your own template or using `lineinfile` like this role does inside `tasks/configure.yml`.
+Specific settings inside the default `www.conf` PHP-FPM pool. If you'd like to manage additional settings, you can do so either by replacing the file with your own template or using `lineinfile` like this role does inside `tasks/configure-fpm.yml`.
 
 ### php.ini settings
 
@@ -76,7 +76,9 @@ By default, all the extra defaults below are applied through the php.ini include
     php_max_input_time: "60"
     php_max_input_vars: "1000"
     php_realpath_cache_size: "32K"
+    php_file_uploads: "On"
     php_upload_max_filesize: "64M"
+    php_max_file_uploads: "20"
     php_post_max_size: "32M"
     php_date_timezone: "America/Chicago"
     php_allow_url_fopen: "On"
@@ -214,4 +216,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.php/defaults/main.yml b/provisioning/roles/geerlingguy.php/defaults/main.yml
index cfdbb1986..15a03e942 100644
--- a/provisioning/roles/geerlingguy.php/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.php/defaults/main.yml
@@ -54,14 +54,18 @@ php_max_execution_time: "60"
 php_max_input_time: "60"
 php_max_input_vars: "1000"
 php_realpath_cache_size: "32K"
+
+php_file_uploads: "On"
 php_upload_max_filesize: "64M"
+php_max_file_uploads: "20"
+
 php_post_max_size: "32M"
 php_date_timezone: "America/Chicago"
 php_allow_url_fopen: "On"
 
 php_sendmail_path: "/usr/sbin/sendmail -t -i"
 php_output_buffering: "4096"
-php_short_open_tag: false
+php_short_open_tag: "Off"
 php_disable_functions: []
 
 php_session_cookie_lifetime: 0
diff --git a/provisioning/roles/geerlingguy.php/tasks/configure-fpm.yml b/provisioning/roles/geerlingguy.php/tasks/configure-fpm.yml
index 00f7427b6..c9c08bc32 100644
--- a/provisioning/roles/geerlingguy.php/tasks/configure-fpm.yml
+++ b/provisioning/roles/geerlingguy.php/tasks/configure-fpm.yml
@@ -41,6 +41,7 @@
     group: root
     mode: 0644
     force: no
+  when: php_enable_php_fpm
 
 - name: Configure php-fpm pool (if enabled).
   lineinfile:
@@ -73,4 +74,13 @@
     name: "{{ php_fpm_daemon }}"
     state: started
     enabled: yes
-  when: php_enable_php_fpm
+  when: php_enable_php_fpm and ansible_distribution != "Debian"
+
+# See: https://github.com/ansible/ansible/issues/22303
+- name: Ensure php-fpm is started and enabled at boot (if configured, Debian).
+  service:
+    name: "{{ php_fpm_daemon }}"
+    state: started
+    enabled: yes
+    use: service
+  when: php_enable_php_fpm and ansible_distribution == "Debian"
diff --git a/provisioning/roles/geerlingguy.php/templates/php.ini.j2 b/provisioning/roles/geerlingguy.php/templates/php.ini.j2
index 2ab925df2..b157df1de 100644
--- a/provisioning/roles/geerlingguy.php/templates/php.ini.j2
+++ b/provisioning/roles/geerlingguy.php/templates/php.ini.j2
@@ -81,9 +81,9 @@ realpath_cache_size = {{ php_realpath_cache_size }}
 ; File Uploads ;
 ;;;;;;;;;;;;;;;;
 
-file_uploads = On
+file_uploads = {{ php_file_uploads }}
 upload_max_filesize = {{ php_upload_max_filesize }}
-max_file_uploads = 20
+max_file_uploads = {{ php_max_file_uploads }}
 
 ;;;;;;;;;;;;;;;;;;
 ; Fopen wrappers ;
diff --git a/provisioning/roles/geerlingguy.php/tests/README.md b/provisioning/roles/geerlingguy.php/tests/README.md
new file mode 100644
index 000000000..6fb211721
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/tests/README.md
@@ -0,0 +1,11 @@
+# Ansible Role tests
+
+To run the test playbook(s) in this directory:
+
+  1. Install and start Docker.
+  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
+    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
+  1. Make the test shim executable: `chmod +x tests/test.sh`.
+  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
+
+If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.php/tests/test.yml b/provisioning/roles/geerlingguy.php/tests/test.yml
index eecafef2c..baaa7904e 100644
--- a/provisioning/roles/geerlingguy.php/tests/test.yml
+++ b/provisioning/roles/geerlingguy.php/tests/test.yml
@@ -3,6 +3,7 @@
 
   vars:
     php_enable_webserver: false
+    php_enable_php_fpm: true
     php_memory_limit: "192M"
     php_enablerepo: "remi,remi-php70"
     php_install_recommends: no
@@ -13,6 +14,7 @@
       when: ansible_os_family == 'Debian'
       changed_when: false
 
+    # Ubuntu-specific tasks.
     - include_vars: test-vars-ubuntu1204.yml
       when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '12.04'
 
@@ -24,6 +26,32 @@
       apt_repository: repo='ppa:ondrej/php'
       when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '12.04'
 
+    # Debian-specific tasks.
+    - name: Add dependencies for PHP versions (Debian).
+      apt:
+        name: "{{ item }}"
+      with_items:
+        - apt-transport-https
+        - ca-certificates
+      when: ansible_distribution == "Debian"
+
+    - name: Add Ondrej Sury's apt key (Debian).
+      apt_key:
+        url: https://packages.sury.org/php/apt.gpg
+        state: present
+      when: ansible_distribution == "Debian"
+
+    - name: Add Ondrej Sury's repo (Debian).
+      apt_repository:
+        repo: "deb https://packages.sury.org/php/ {{ ansible_distribution_release }} main"
+        state: present
+      register: php_ondrej_debian_repo
+      when: ansible_distribution == "Debian"
+
+    - name: Update apt caches after repo is added (Debian).
+      apt: update_cache=yes
+      when: php_ondrej_debian_repo.changed and (ansible_distribution == "Debian")
+
   roles:
     - role: geerlingguy.repo-remi
       when: ansible_os_family == 'RedHat' and ansible_distribution != 'Fedora'

From 81401ce097c0174d2902ea456e111ec49a02eaf6 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 18 May 2017 21:55:01 -0500
Subject: [PATCH 0797/1273] Issue #1366: Force php7.1-fpm to be running in the
 Docker image.

---
 Dockerfile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index adda4d181..4d0c39130 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,6 +6,8 @@ COPY ./ /etc/ansible/drupal-vm
 COPY ./provisioning/docker/vars/docker-hub-overrides.yml /etc/ansible/drupal-vm/local.config.yml
 
 # Provision Drupal VM inside Docker.
-RUN ansible-playbook /etc/ansible/drupal-vm/provisioning/playbook.yml
+RUN ansible-playbook /etc/ansible/drupal-vm/provisioning/playbook.yml \
+  # Enable FPM. See https://github.com/geerlingguy/drupal-vm/issues/1366.
+  && systemctl enable php7.1-fpm.service
 
-EXPOSE 22 80 443 8025
+EXPOSE 22 80 443 3306 8025

From a29509f4035213ff8068efe23f5e9b7cfb9f2147 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 19 May 2017 13:05:36 -0500
Subject: [PATCH 0798/1273] Fixes #1377: Extract php-versions role into
 standalone Galaxy role.

---
 provisioning/playbook.yml                     |  2 +-
 provisioning/requirements.yml                 |  2 +
 .../roles/drupalvm.php-versions/README.md     | 36 ----------------
 .../roles/geerlingguy.php-versions/.gitignore |  2 +
 .../geerlingguy.php-versions/.travis.yml      | 27 ++++++++++++
 .../roles/geerlingguy.php-versions/LICENSE    | 20 +++++++++
 .../roles/geerlingguy.php-versions/README.md  | 43 +++++++++++++++++++
 .../defaults/main.yml                         |  3 ++
 .../meta/main.yml                             | 17 +++++---
 .../tasks/main.yml                            |  0
 .../tasks/setup-Debian.yml                    |  0
 .../tasks/setup-RedHat.yml                    |  0
 .../geerlingguy.php-versions/tests/README.md  | 11 +++++
 .../tests/requirements.yml                    |  3 ++
 .../geerlingguy.php-versions/tests/test.yml   | 16 +++++++
 .../vars/Debian.yml                           |  0
 .../vars/RedHat.yml                           |  0
 17 files changed, 138 insertions(+), 44 deletions(-)
 delete mode 100644 provisioning/roles/drupalvm.php-versions/README.md
 create mode 100644 provisioning/roles/geerlingguy.php-versions/.gitignore
 create mode 100644 provisioning/roles/geerlingguy.php-versions/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.php-versions/LICENSE
 create mode 100644 provisioning/roles/geerlingguy.php-versions/README.md
 create mode 100644 provisioning/roles/geerlingguy.php-versions/defaults/main.yml
 rename provisioning/roles/{drupalvm.php-versions => geerlingguy.php-versions}/meta/main.yml (65%)
 rename provisioning/roles/{drupalvm.php-versions => geerlingguy.php-versions}/tasks/main.yml (100%)
 rename provisioning/roles/{drupalvm.php-versions => geerlingguy.php-versions}/tasks/setup-Debian.yml (100%)
 rename provisioning/roles/{drupalvm.php-versions => geerlingguy.php-versions}/tasks/setup-RedHat.yml (100%)
 create mode 100644 provisioning/roles/geerlingguy.php-versions/tests/README.md
 create mode 100644 provisioning/roles/geerlingguy.php-versions/tests/requirements.yml
 create mode 100644 provisioning/roles/geerlingguy.php-versions/tests/test.yml
 rename provisioning/roles/{drupalvm.php-versions => geerlingguy.php-versions}/vars/Debian.yml (100%)
 rename provisioning/roles/{drupalvm.php-versions => geerlingguy.php-versions}/vars/RedHat.yml (100%)

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 4532b024b..3f58303bd 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -40,7 +40,7 @@
     - { role: geerlingguy.apache, when: drupalvm_webserver == 'apache', tags: ['webserver']}
     - { role: geerlingguy.apache-php-fpm, when: drupalvm_webserver == 'apache', tags: ['webserver'] }
     - { role: geerlingguy.nginx, when: drupalvm_webserver == 'nginx', tags: ['webserver'] }
-    - { role: drupalvm.php-versions, tags: ['php', 'xdebug', 'database'] }
+    - { role: geerlingguy.php-versions, tags: ['php', 'xdebug', 'database'] }
     - { role: geerlingguy.php, tags: ['php'] }
     - { role: geerlingguy.php-pecl, tags: ['php'] }
     - { role: geerlingguy.composer }
diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 33da25020..122818d37 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -55,6 +55,8 @@
   version: 3.1.0
 - src: geerlingguy.php-tideways
   version: 1.1.0
+- src: geerlingguy.php-versions
+  version: 1.0.0
 - src: geerlingguy.php-xdebug
   version: 2.3.1
 - src: geerlingguy.php-xhprof
diff --git a/provisioning/roles/drupalvm.php-versions/README.md b/provisioning/roles/drupalvm.php-versions/README.md
deleted file mode 100644
index df076623b..000000000
--- a/provisioning/roles/drupalvm.php-versions/README.md
+++ /dev/null
@@ -1,36 +0,0 @@
-# Drupal VM PHP Versions Role
-
-This role is a shim to configure miscellaneous settings prior to installing PHP inside Drupal VM.
-
-## Requirements
-
-This role is meant to be run in Drupal VM. Use outside of Drupal VM will likely result in weird things happening.
-
-## Role Variables
-
-The role has no default variables, but configures the `geerlingguy.php` role variables according to OS and PHP versions.
-
-```yaml
-php_version
-```
-
-The PHP version used. This variable does not have a default and thus needs to be set.
-
-## Dependencies
-
-- geerlingguy.php is a soft dependency as the `php_version` variable is required to be set.
-
-## Example Playbook
-
-    - hosts: drupalvm
-      roles:
-         - drupalvm.php-versions
-         - geerlingguy.php
-
-## License
-
-MIT / BSD
-
-## Author Information
-
-This role was created in 2017 by [Oskar Schöldström](http://oxy.fi) and [Jeff Geerling](https://www.jeffgeerling.com/) (author of [Ansible for DevOps](https://www.ansiblefordevops.com/)).
diff --git a/provisioning/roles/geerlingguy.php-versions/.gitignore b/provisioning/roles/geerlingguy.php-versions/.gitignore
new file mode 100644
index 000000000..c9b2377e3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-versions/.gitignore
@@ -0,0 +1,2 @@
+*.retry
+tests/test.sh
diff --git a/provisioning/roles/geerlingguy.php-versions/.travis.yml b/provisioning/roles/geerlingguy.php-versions/.travis.yml
new file mode 100644
index 000000000..1943be869
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-versions/.travis.yml
@@ -0,0 +1,27 @@
+---
+services: docker
+
+env:
+  - distro: centos7
+  - distro: centos6
+  - distro: debian8
+  - distro: ubuntu1604
+  - distro: ubuntu1404
+
+script:
+  # Configure test script so we can run extra tests after playbook is run.
+  - export container_id=$(date +%s)
+  - export cleanup=false
+
+  # Download test shim.
+  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
+  - chmod +x ${PWD}/tests/test.sh
+
+  # Run tests.
+  - ${PWD}/tests/test.sh
+
+  # Run script to test PHP version.
+  - 'docker exec ${container_id} env TERM=xterm php -v | grep "7.1."'
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.php-versions/LICENSE b/provisioning/roles/geerlingguy.php-versions/LICENSE
new file mode 100644
index 000000000..4275cf3c1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-versions/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Jeff Geerling
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/provisioning/roles/geerlingguy.php-versions/README.md b/provisioning/roles/geerlingguy.php-versions/README.md
new file mode 100644
index 000000000..d8d597b97
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-versions/README.md
@@ -0,0 +1,43 @@
+# Ansible Role: PHP Versions
+
+[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-php-versions.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-php-versions)
+
+Allows different PHP versions to be installed when using the `geerlingguy.php` role (or a similar role). This role was originally built for [Drupal VM](https://www.drupalvm.com) but was released more generically so others could use an easier mechanism for switching PHP versions.
+
+## Requirements
+
+N/A
+
+## Role Variables
+
+Available variables are listed below, along with default values (see `defaults/main.yml`):
+
+    php_version: '7.1'
+
+The PHP version to be installed. Any [currently-supported PHP major version](http://php.net/supported-versions.php) is a valid option (e.g. `5.6`, `7.0`, `7.1`, etc.
+
+## Dependencies
+
+  - geerlingguy.php is a soft dependency as the `php_version` variable is required to be set.
+  - geerlingguy.repo-remi, if you're using CentOS or a Red Hat derivative.
+
+## Example Playbook
+
+    - hosts: webservers
+    
+      vars:
+        php_version: 7.1
+    
+      roles:
+        - role: geerlingguy.repo-remi
+          when: ansible_os_family == 'RedHat'
+        - geerlingguy.php-versions
+        - geerlingguy.php
+
+## License
+
+MIT / BSD
+
+## Author Information
+
+This role was created in 2017 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.php-versions/defaults/main.yml b/provisioning/roles/geerlingguy.php-versions/defaults/main.yml
new file mode 100644
index 000000000..ea9b3379b
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-versions/defaults/main.yml
@@ -0,0 +1,3 @@
+---
+# The PHP version to be installed.
+php_version: '7.1'
diff --git a/provisioning/roles/drupalvm.php-versions/meta/main.yml b/provisioning/roles/geerlingguy.php-versions/meta/main.yml
similarity index 65%
rename from provisioning/roles/drupalvm.php-versions/meta/main.yml
rename to provisioning/roles/geerlingguy.php-versions/meta/main.yml
index 92ca395ac..2d776bbe0 100644
--- a/provisioning/roles/drupalvm.php-versions/meta/main.yml
+++ b/provisioning/roles/geerlingguy.php-versions/meta/main.yml
@@ -1,12 +1,13 @@
 ---
+dependencies: []
+
 galaxy_info:
-  author: Jeff Geerling
-  description: A role to configure various odds and ends prior to installing PHP in Drupal VM.
-  company: Midwestern Mac, LLC
+  author: geerlingguy
+  description: Allows different PHP versions to be installed.
+  company: "Midwestern Mac, LLC"
+  license: "license (BSD, MIT)"
   issue_tracker_url: https://github.com/geerlingguy/drupal-vm/issues
-  license: MIT
   min_ansible_version: 2.2
-
   platforms:
     - name: EL
       versions:
@@ -21,8 +22,10 @@ galaxy_info:
         - saucy
         - trusty
         - xenial
-
   galaxy_tags:
+    - php
+    - web
     - drupal
     - vm
-    - php
+    - magento
+    - wordpress
diff --git a/provisioning/roles/drupalvm.php-versions/tasks/main.yml b/provisioning/roles/geerlingguy.php-versions/tasks/main.yml
similarity index 100%
rename from provisioning/roles/drupalvm.php-versions/tasks/main.yml
rename to provisioning/roles/geerlingguy.php-versions/tasks/main.yml
diff --git a/provisioning/roles/drupalvm.php-versions/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.php-versions/tasks/setup-Debian.yml
similarity index 100%
rename from provisioning/roles/drupalvm.php-versions/tasks/setup-Debian.yml
rename to provisioning/roles/geerlingguy.php-versions/tasks/setup-Debian.yml
diff --git a/provisioning/roles/drupalvm.php-versions/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.php-versions/tasks/setup-RedHat.yml
similarity index 100%
rename from provisioning/roles/drupalvm.php-versions/tasks/setup-RedHat.yml
rename to provisioning/roles/geerlingguy.php-versions/tasks/setup-RedHat.yml
diff --git a/provisioning/roles/geerlingguy.php-versions/tests/README.md b/provisioning/roles/geerlingguy.php-versions/tests/README.md
new file mode 100644
index 000000000..6fb211721
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-versions/tests/README.md
@@ -0,0 +1,11 @@
+# Ansible Role tests
+
+To run the test playbook(s) in this directory:
+
+  1. Install and start Docker.
+  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
+    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
+  1. Make the test shim executable: `chmod +x tests/test.sh`.
+  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
+
+If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.php-versions/tests/requirements.yml b/provisioning/roles/geerlingguy.php-versions/tests/requirements.yml
new file mode 100644
index 000000000..80e765f13
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-versions/tests/requirements.yml
@@ -0,0 +1,3 @@
+---
+- src: geerlingguy.repo-remi
+- src: geerlingguy.php
diff --git a/provisioning/roles/geerlingguy.php-versions/tests/test.yml b/provisioning/roles/geerlingguy.php-versions/tests/test.yml
new file mode 100644
index 000000000..0740bbf63
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-versions/tests/test.yml
@@ -0,0 +1,16 @@
+---
+- hosts: all
+
+  vars:
+    php_enable_webserver: false
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=yes cache_valid_time=600
+      when: ansible_os_family == 'Debian'
+
+  roles:
+    - role: geerlingguy.repo-remi
+      when: ansible_os_family == 'RedHat'
+    - role_under_test
+    - geerlingguy.php
diff --git a/provisioning/roles/drupalvm.php-versions/vars/Debian.yml b/provisioning/roles/geerlingguy.php-versions/vars/Debian.yml
similarity index 100%
rename from provisioning/roles/drupalvm.php-versions/vars/Debian.yml
rename to provisioning/roles/geerlingguy.php-versions/vars/Debian.yml
diff --git a/provisioning/roles/drupalvm.php-versions/vars/RedHat.yml b/provisioning/roles/geerlingguy.php-versions/vars/RedHat.yml
similarity index 100%
rename from provisioning/roles/drupalvm.php-versions/vars/RedHat.yml
rename to provisioning/roles/geerlingguy.php-versions/vars/RedHat.yml

From 9c25b9ffaa18371c679e76b18c23027c7cf653ff Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 19 May 2017 13:57:19 -0500
Subject: [PATCH 0799/1273] Update to latest version of arknoll.selenium role.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/arknoll.selenium/.travis.yml        | 41 +++----------------
 .../roles/arknoll.selenium/tasks/main.yml     | 13 ++----
 .../templates/selenium-unit.j2                |  2 +-
 .../roles/arknoll.selenium/tests/README.md    | 11 +++++
 5 files changed, 21 insertions(+), 48 deletions(-)
 create mode 100644 provisioning/roles/arknoll.selenium/tests/README.md

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 122818d37..ffa54b28f 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -1,6 +1,6 @@
 ---
 - src: arknoll.selenium
-  version: 2.2.0
+  version: 2.2.1
 - src: thom8.php-upload-progress
   version: 1.0.1
 - src: franklinkim.newrelic
diff --git a/provisioning/roles/arknoll.selenium/.travis.yml b/provisioning/roles/arknoll.selenium/.travis.yml
index cc071973c..6741ad76f 100644
--- a/provisioning/roles/arknoll.selenium/.travis.yml
+++ b/provisioning/roles/arknoll.selenium/.travis.yml
@@ -3,50 +3,19 @@ services: docker
 
 env:
   - distro: centos7
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
   - distro: centos6
-    init: /sbin/init
-    run_opts: "--privileged"
   - distro: ubuntu1604
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
   - distro: debian8
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
   - distro: ubuntu1404
-    init: /sbin/init
-    run_opts: "--privileged"
   - distro: ubuntu1204
-    init: /sbin/init
-    run_opts: "--privileged"
-
-before_install:
-  # Pull container.
-  - 'sudo docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
-  - container_id=$(mktemp)
-  # Run container in detached state.
-  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
-
-  # Install dependencies.
-  - 'sudo docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
-
-  # Ansible syntax check.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
-
-  # Test role.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+  # Download test shim.
+  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
+  - chmod +x ${PWD}/tests/test.sh
 
-  # Test role idempotence.
-  - idempotence=$(mktemp)
-  - sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
-  - >
-    tail ${idempotence}
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
+  # Run tests.
+  - ${PWD}/tests/test.sh
 
 notifications:
   email: false
diff --git a/provisioning/roles/arknoll.selenium/tasks/main.yml b/provisioning/roles/arknoll.selenium/tasks/main.yml
index a430a739f..16533ab49 100644
--- a/provisioning/roles/arknoll.selenium/tasks/main.yml
+++ b/provisioning/roles/arknoll.selenium/tasks/main.yml
@@ -80,6 +80,7 @@
     owner: root
     group: root
     mode: 0755
+  when: "ansible_service_mgr != 'systemd'"
   tags: [configuration, selenium, selenium-install]
 
 - name: Install systemd unit file (for systemd systems)
@@ -89,20 +90,12 @@
     owner: root
     group: root
     mode: 0755
-  when: >
-    (ansible_distribution == 'Ubuntu' and ansible_distribution_version.split(".")[0]|int >= 16) or
-    (ansible_distribution == 'Debian' and ansible_distribution_version.split(".")[0]|int >= 8) or
-    (ansible_distribution == 'CentOS' and ansible_distribution_version.split(".")[0]|int >= 7) or
-    (ansible_distribution == 'Fedora')
+  when: "ansible_service_mgr == 'systemd'"
   tags: [configuration, selenium, selenium-install]
 
 - name: Register systemd service status (for systemd systems)
   shell: 'systemctl status selenium | grep "active (running)"'
-  when: >
-    (ansible_distribution == 'Ubuntu' and ansible_distribution_version.split(".")[0]|int >= 16) or
-    (ansible_distribution == 'Debian' and ansible_distribution_version.split(".")[0]|int >= 8) or
-    (ansible_distribution == 'CentOS' and ansible_distribution_version.split(".")[0]|int >= 7) or
-    (ansible_distribution == 'Fedora')
+  when: "ansible_service_mgr == 'systemd'"
   register: selenium_running
   ignore_errors: yes
   changed_when: false
diff --git a/provisioning/roles/arknoll.selenium/templates/selenium-unit.j2 b/provisioning/roles/arknoll.selenium/templates/selenium-unit.j2
index ff1053615..f25dfcab0 100644
--- a/provisioning/roles/arknoll.selenium/templates/selenium-unit.j2
+++ b/provisioning/roles/arknoll.selenium/templates/selenium-unit.j2
@@ -3,7 +3,7 @@ Description=selenium test framework
 After=syslog.target network.target
 
 [Service]
-ExecStart=/usr/bin/xvfb-run /usr/bin/java -client -jar {{ selenium_install_dir }}/selenium/selenium-server-standalone-{{ selenium_version }}.jar
+ExecStart=/usr/bin/xvfb-run {{ selenium_xvfb_args }} /usr/bin/java -client -jar {{ selenium_install_dir }}/selenium/selenium-server-standalone-{{ selenium_version }}.jar
 Restart=on-failure
 RestartSec=20s
 
diff --git a/provisioning/roles/arknoll.selenium/tests/README.md b/provisioning/roles/arknoll.selenium/tests/README.md
new file mode 100644
index 000000000..6fb211721
--- /dev/null
+++ b/provisioning/roles/arknoll.selenium/tests/README.md
@@ -0,0 +1,11 @@
+# Ansible Role tests
+
+To run the test playbook(s) in this directory:
+
+  1. Install and start Docker.
+  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
+    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
+  1. Make the test shim executable: `chmod +x tests/test.sh`.
+  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
+
+If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`

From 3d115a394c4197d558659c677611f0930f2749ad Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 22 May 2017 01:42:38 -0400
Subject: [PATCH 0800/1273] Issue #1366: Add documentation for using Drupal VM
 with Docker for a single site.

---
 Dockerfile                 |  2 +-
 docs/other/docker.md       | 66 ++++++++++++++++++++++++++++++++------
 example.docker-compose.yml | 29 ++++++++++++++---
 3 files changed, 83 insertions(+), 14 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4d0c39130..ad11f659c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,4 +10,4 @@ RUN ansible-playbook /etc/ansible/drupal-vm/provisioning/playbook.yml \
   # Enable FPM. See https://github.com/geerlingguy/drupal-vm/issues/1366.
   && systemctl enable php7.1-fpm.service
 
-EXPOSE 22 80 443 3306 8025
+EXPOSE 80 443 3306 8025
diff --git a/docs/other/docker.md b/docs/other/docker.md
index facfb1b44..51cd50b56 100644
--- a/docs/other/docker.md
+++ b/docs/other/docker.md
@@ -1,8 +1,9 @@
-Drupal VM can be used to bake and share [Docker](https://www.docker.com) images containing a custom prebuilt copy of Drupal VM.
+Drupal VM can be used with [Docker](https://www.docker.com) instead of or in addition to Vagrant:
 
-Drupal VM includes a few `composer` scripts and an example `docker-compose.yml` file which allow you to 'bake' a new Docker image using the current Drupal VM configuration, then use this image to quickly build or rebuild your Drupal development environment (or share the image with your development team for _immediate_ environment setup).
+  - You can build a local instance using Docker, pulling the official [`geerlingguy/drupal-vm`](https://hub.docker.com/r/geerlingguy/drupal-vm/) image.
+  - You can 'bake your own' customized Drupal VM Docker image and reuse it or share it with your team.
 
-> **Docker support is currently experimental**, so you may want to wait until Docker support is more finalized unless you're already familiar with Docker, and okay with potentially backwards-incompatible changes when upgrading Drupal VM.
+> **Docker support is currently experimental**, so unless you're already familiar with Docker, it might be best to wait until later versions of Drupal VM are released with more stable support.
 
 ## Managing your hosts file
 
@@ -10,7 +11,9 @@ Before using Docker to run Drupal VM, you should [edit your hosts file](https://
 
     192.168.88.88  drupalvm.dev
 
-...but substituting the IP address and domain name you'd like to use to access your Drupal VM container.
+(Substitute the IP address and domain name you'd like to use to access your Drupal VM container.)
+
+You can also add other subdomains if you're using other built-in services, e.g. `adminer.drupalvm.dev`, `xhprof.drupalvm.com`, etc.
 
 > If you're using Docker for Mac, you need to perform one additional step to ensure you can access Drupal VM using a unique IP address:
 >
@@ -18,7 +21,52 @@ Before using Docker to run Drupal VM, you should [edit your hosts file](https://
 >
 > Note that you'll have to create the alias again after restarting your computer. See [this Docker (moby) issue](https://github.com/moby/moby/issues/22753#issuecomment-246054946) for more details.
 
-## Building ('baking') a Docker container with Drupal VM
+## Method 1: Build a default Drupal VM instance with Docker
+
+The [`geerlingguy/drupal-vm`](https://hub.docker.com/r/geerlingguy/drupal-vm/) image on Docker Hub contains a pre-built copy of Drupal VM, with all the latest Drupal VM defaults. If you need to quickly run your site in a container, or don't need to customize any of the components of Drupal VM, you can use this image.
+
+### (Optional) Add a `Dockerfile` for customization
+
+If you need to make small changes to the official `drupal-vm` image (instead of baking your own fully-custom image), you can create a `Dockerfile` to make those changes. In one site's example, ImageMagick was required for some media handling functionality, and so the following `Dockerfile` was places in the project's root directory (alongside the `docker-compose.yml` file):
+
+    FROM geerlingguy/drupal-vm:latest
+    MAINTAINER Jeff Geerling
+    
+    # Install imagemagick.
+    RUN apt-get install -y imagemagick
+    
+    EXPOSE 80 443 3306 8025
+
+You can customize the official image in many other ways, but if you end up doing more than a step or two in a `Dockerfile`, it's probably a better idea to 'bake you own' Drupal VM Docker image.
+
+### Add a `docker-compose.yml` file
+
+Copy the `example.docker-compose.yml` file out of Drupal VM (or grab a copy from GitHub [here](https://github.com/geerlingguy/drupal-vm/blob/master/example.docker-compose.yml)), rename it `docker-compose.yml`, and place it in your project root.
+
+_If you are using your own `Dockerfile` to further customize Drupal VM_, comment out the `image: drupal-vm` line, and uncomment the `build: .` line (this tells Docker Compose to build a new image based on your own `Dockerfile`).
+
+For the `volume:` definition in `docker-compose.yml`, Drupal VM's default site docroot is `/var/www/drupalvm/drupal/web`, which follows the convention of a typical Drupal project built with Composer. If you don't get your site when you attempt to access Drupal VM, you will either need to modify the `volume:` definition to match your project's structure, or use a custom `Dockerfile` and copy in a customized Apache `vhosts.conf` file.
+
+### Run Drupal VM
+
+Run the command `docker-compose up -d` (the `-d` tells `docker-compose` to start the containers and run in the background).
+
+This command takes the instructions in the Docker Compose file and does two things:
+
+  1. Creates a custom Docker network that exposes Drupal VM on the IP address you have configured in `docker-compose.yml` (by default, `192.168.88.88`).
+  2. Runs Drupal VM using the configuration in `docker-compose.yml`.
+
+After the Drupal VM container is running, you should be able to see the Dashboard page at the VM's IP address (e.g. `http://192.168.88.88`), and you should be able to access your site at the hostname you have configured in your hosts file (e.g. `http://drupalvm.dev/`).
+
+> Note: If you see Drupal's installer appear when accessing the site, that means the codebase was found, but either the database connection details are not in your local site configuration, or they are, but you don't have the default database populated yet. You may need to load in the database either via `drush sql-sync` or by importing a dump into the container. The default credentials are `drupal` and `drupal` for username and password, and `drupal` for the database name.
+
+You can stop the containers with `docker-compose stop`, or remove all their configuration with `docker-compose down`.
+
+## Method 2: 'Bake and Share' a custom Drupal VM Docker image
+
+If you need a more customized Drupal VM instance, it's best to build your own with Drupal VM's built-in Docker scripts.
+
+### Building ('baking') a Docker container with Drupal VM
 
 After you've configured your Drupal VM settings in `config.yml` and other configuration files, run the following command to create and provision a new Docker container:
 
@@ -40,7 +88,7 @@ Visit the Drupal VM dashboard: http://192.168.88.88:80
 
 Once the build is complete, you could view the dashboard by visiting the URL provided.
 
-## Saving the Docker container to an image
+### Saving the Docker container to an image
 
 If you are happy with the way the container was built, you can run the following command to convert the container into an image:
 
@@ -54,13 +102,13 @@ You can override the default values for the image creation by overriding the fol
 
 Using the default settings, this command will tag your current version of the container as `drupal-vm:latest` (on your local computer), then store an archive of the image in an archive file, in the path "`docker_image_path`/`docker_image_name`.tar.gz".
 
-## Loading the Docker container from an image
+### Loading the Docker container from an image
 
-On someone else's computer (or your own, if you have deleted the existing `drupal-vm` image), you can load an image archive by placing it in the path defined by "`docker_image_path`/`docker_image_name`.tar.gz" in your `config.yml` file. To do this, run the command:
+On someone else's computer (or your own, if you have deleted the existing `drupal-vm` image), you can load an archived image by placing it in the path defined by "`docker_image_path`/`docker_image_name`.tar.gz" in your `config.yml` file. To do this, run the command:
 
     composer docker-load-image
 
-## Using Drupal VM with `docker-compose.yml`
+### Using a baked Drupal VM image with `docker-compose.yml`
 
 Drupal VM includes an `example.docker-compose.yml` file. To use the file, copy it to `docker-compose.yml` and customize as you see fit. Once you've configured the exposed ports and settings as you like, run the following command to bring up the network and container(s) according to the compose file:
 
diff --git a/example.docker-compose.yml b/example.docker-compose.yml
index 30d43d3c5..0aa9dab92 100644
--- a/example.docker-compose.yml
+++ b/example.docker-compose.yml
@@ -3,23 +3,44 @@ version: "3"
 services:
 
   drupal-vm:
-    # Switch the image to `geerlingguy/drupal-vm` if not using your own image.
+
+    # Switch the image to `geerlingguy/drupal-vm` to use Drupal VM defaults.
     image: drupal-vm
+    # Comment out 'image' and uncomment the line below if customizing Drupal VM
+    # with a project-specific Dockerfile in the same directory as this file.
+    # build: .
+
+    # Set this to your project's machine name (e.g. example-com)
     container_name: drupal-vm
+
     ports:
       - 80:80
       - 443:443
-    privileged: true
-    # Use of the `cached` option requires the Docker Edge release as of May '17.
+      - 3306:3306
+      - 8025:8025
+
+    # Not strictly required, but custom DNS settings can help with stability.
+    dns:
+      - '8.8.8.8'
+      - '8.8.4.4'
+
+    # Use of the `delegated` option currently requires the Docker Edge release.
     volumes:
-      - ./:/var/www/drupalvm/:rw,cached
+      - ./:/var/www/drupalvm/:rw,delegated
+
+    privileged: true
     command: /lib/systemd/systemd
+
     networks:
       drupalvm:
+        # Set this IP address to something different if you already have another
+        # service running on the default IP address. If you change the subnet,
+        # you need to also change the bridge network IP and subnet below.
         ipv4_address: 192.168.88.88
 
 networks:
 
+  # This custom network allows Drupal VM to be accessed on an IP address.
   drupalvm:
     driver: bridge
     driver_opts:

From 0799427624a0c6ae5429526464f31b4324be7c88 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 23 May 2017 20:21:04 -0400
Subject: [PATCH 0801/1273] Fixes #1258: Document Git-based deployment option.
 [ci skip]

---
 docs/deployment/git.md   | 20 +++++++++++++++++++-
 docs/other/production.md |  8 +++++---
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/docs/deployment/git.md b/docs/deployment/git.md
index 1dcaeed45..3fffb373d 100644
--- a/docs/deployment/git.md
+++ b/docs/deployment/git.md
@@ -4,4 +4,22 @@ This is also the recommended method for deploying Drupal sites to Drupal VM when
 
 ## Deploying Drupal via Git
 
-TODO: See https://github.com/geerlingguy/drupal-vm/issues/1258.
+Drupal VM uses the [`geerlingguy.drupal`](https://github.com/geerlingguy/ansible-role-drupal) Ansible role to deploy and manage Drupal codebases.
+
+To deploy your Drupal project inside Drupal VM during provisioning, you need to set the following variables inside `config.yml`:
+
+    drupal_deploy: true
+    drupal_deploy_repo: "git@github.com:username/example.git"
+    drupal_deploy_dir: /var/www/drupal
+
+The above settings assume you want to deploy a Drupal codebase in the GitHub repository `username/example.git` (or any other valid Git URL to which you have access). And it will place that codebase inside `/var/www/drupal`, which you might have mounted as a shared folder, or if you want even better performance, you could configure a 'reverse mount' or just work on the codebase inside the VM.
+
+If you want to disable Drupal VM's default synced folder, set the following variable in `config.yml`:
+
+    vagrant_synced_folders: []
+
+When you run `vagrant provision` or deploy Drupal VM to a production server, the `geerlingguy.drupal` role will check out the Git repository into the `drupal_deploy_dir`.
+
+> Note: For private repositories, you can use your own SSH key if you use `ssh-agent`. On Mac or Linux, you can run `ssh-add -K` to add your default private key to the SSH Agent, or on Windows you can either use [Pageant](https://winscp.net/eng/docs/ui_pageant), an SSH agent built into your CLI emulator, or if you're on Windows 10, the SSH Agent that's installed with Ubuntu Bash.
+
+For more information about this technique, please read Jeff Geerling's blog post, [Drupal VM on Windows - a fast container for BLT project development](https://www.jeffgeerling.com/blog/2017/drupal-vm-on-windows-fast-container-blt-project-development). Note that this technique is great for better performance on Windows, but it can be used on any platform where Drupal VM is used.
diff --git a/docs/other/production.md b/docs/other/production.md
index e7ac57a7c..31d8fe698 100644
--- a/docs/other/production.md
+++ b/docs/other/production.md
@@ -1,4 +1,6 @@
-Drupal VM has _experimental_ support for deploying Drupal VM to a production environment. The security of your servers is _your_ responsibility.
+Drupal VM supports deploying Drupal VM to a production environment. The security of your servers is _your_ responsibility.
+
+(See companion blog post to this documentation: [Soup to Nuts: Using Drupal VM to build local and prod](https://www.jeffgeerling.com/blog/2017/soup-nuts-using-drupal-vm-build-local-and-prod).)
 
 ## Production specific overrides.
 
@@ -143,11 +145,11 @@ After a few minutes, your Drupal-VM-in-the-cloud Droplet should be fully configu
       $ sudo chmod -R 0700 /var/www/drupalvm/drupal/sites/default/files
       ```
 
-  - You can't synchronize folders between your host machine and DigitalOcean (at least not in any sane way); so you'll need to either have Drupal VM install a site from a given Drush make file or composer.json, or deploy your site yourself.
+  - You can't synchronize folders between your host machine and DigitalOcean (at least not in any sane way); so you'll need to either have Drupal VM install a site from a given Drush make file or composer.json, or deploy the site via Git, using the `geerlingguy.drupal` role's git deployment options.
   - Drupal VM doesn't include any kind of backup system. You should use one if you have any kind of important data on your server!
 
 ### Go Further
 
-You can use Ubuntu 12.04, Ubuntu 14.04, Ubuntu 16.04, CentOS 6 or CentOS 7 when you build the DigitalOcean Droplet. Just like with Drupal VM running locally, you can customize almost every aspect of the server!
+You can use Ubuntu 14.04, Ubuntu 16.04, Debian 8, CentOS 6 or CentOS 7 when you build the DigitalOcean Droplet. Just like with Drupal VM running locally, you can customize almost every aspect of the server!
 
 You may want to customize your configuration even further, to make sure Drupal VM is tuned for your specific Drupal site's needs, or you may want to change things and make the server configuration more flexible, etc. For all that, the book [Ansible for DevOps](http://ansiblefordevops.com/) will give you a great introduction to using Ansible to make Drupal VM and the included Ansible configuration do exactly what you need!

From e1d4ee20dab3580155cc4b8d37191e143613eeb4 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 23 May 2017 21:44:33 -0400
Subject: [PATCH 0802/1273] Issue #1366: Continue touching up Docker
 documentation.

---
 docs/other/docker.md | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/docs/other/docker.md b/docs/other/docker.md
index 51cd50b56..01c3c527c 100644
--- a/docs/other/docker.md
+++ b/docs/other/docker.md
@@ -25,6 +25,8 @@ You can also add other subdomains if you're using other built-in services, e.g.
 
 The [`geerlingguy/drupal-vm`](https://hub.docker.com/r/geerlingguy/drupal-vm/) image on Docker Hub contains a pre-built copy of Drupal VM, with all the latest Drupal VM defaults. If you need to quickly run your site in a container, or don't need to customize any of the components of Drupal VM, you can use this image.
 
+> For a reference installation that has configuration for running the local environment on _either_ Vagrant or Docker, see the [Drupal VM Live Site Repository](https://github.com/geerlingguy/drupalvm-live).
+
 ### (Optional) Add a `Dockerfile` for customization
 
 If you need to make small changes to the official `drupal-vm` image (instead of baking your own fully-custom image), you can create a `Dockerfile` to make those changes. In one site's example, ImageMagick was required for some media handling functionality, and so the following `Dockerfile` was places in the project's root directory (alongside the `docker-compose.yml` file):
@@ -43,9 +45,10 @@ You can customize the official image in many other ways, but if you end up doing
 
 Copy the `example.docker-compose.yml` file out of Drupal VM (or grab a copy from GitHub [here](https://github.com/geerlingguy/drupal-vm/blob/master/example.docker-compose.yml)), rename it `docker-compose.yml`, and place it in your project root.
 
-_If you are using your own `Dockerfile` to further customize Drupal VM_, comment out the `image: drupal-vm` line, and uncomment the `build: .` line (this tells Docker Compose to build a new image based on your own `Dockerfile`).
+  - _If you are using your own `Dockerfile` to further customize Drupal VM_, comment out the `image: drupal-vm` line, and uncomment the `build: .` line (this tells Docker Compose to build a new image based on your own `Dockerfile`).
+  - _If you're not using your own `Dockerfile`_, change the `image` line to: `image: geerlingguy/drupal-vm`.
 
-For the `volume:` definition in `docker-compose.yml`, Drupal VM's default site docroot is `/var/www/drupalvm/drupal/web`, which follows the convention of a typical Drupal project built with Composer. If you don't get your site when you attempt to access Drupal VM, you will either need to modify the `volume:` definition to match your project's structure, or use a custom `Dockerfile` and copy in a customized Apache `vhosts.conf` file.
+For the `volume:` definition in `docker-compose.yml`, Drupal VM's default docroot is `/var/www/drupalvm/drupal/web`, which follows the convention of a typical Drupal project built with Composer. If you don't get your site when you attempt to access Drupal VM, you will either need to modify the `volume:` definition to match your project's structure, or use a custom `Dockerfile` and copy in a customized Apache `vhosts.conf` file.
 
 ### Run Drupal VM
 
@@ -62,6 +65,12 @@ After the Drupal VM container is running, you should be able to see the Dashboar
 
 You can stop the containers with `docker-compose stop`, or remove all their configuration with `docker-compose down`.
 
+### Using Drush inside Docker
+
+Currently, the easiest way to use Drupal VM's `drush` inside a Docker container is to use `docker exec` to run `drush` internally. There are a few other ways you can try to get Drush working with a codebase running on a container, but the easiest way is to run a command like:
+
+    docker exec drupal-vm bash -c "drush --uri=drupalvm.dev --root=/var/www/drupalvm/drupal/web status"
+
 ## Method 2: 'Bake and Share' a custom Drupal VM Docker image
 
 If you need a more customized Drupal VM instance, it's best to build your own with Drupal VM's built-in Docker scripts.

From fc45e932e19d2be8e1e53fc0957b0b561d4c1547 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 23 May 2017 22:01:49 -0400
Subject: [PATCH 0803/1273] Update php-versions role to latest version.

---
 provisioning/requirements.yml                                  | 2 +-
 .../roles/geerlingguy.php-versions/tasks/setup-Debian.yml      | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index ffa54b28f..c53980f56 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -56,7 +56,7 @@
 - src: geerlingguy.php-tideways
   version: 1.1.0
 - src: geerlingguy.php-versions
-  version: 1.0.0
+  version: 1.0.1
 - src: geerlingguy.php-xdebug
   version: 2.3.1
 - src: geerlingguy.php-xhprof
diff --git a/provisioning/roles/geerlingguy.php-versions/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.php-versions/tasks/setup-Debian.yml
index 4e6d73da7..f06355ef2 100644
--- a/provisioning/roles/geerlingguy.php-versions/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.php-versions/tasks/setup-Debian.yml
@@ -1,8 +1,7 @@
 ---
-- name: Set the correct opcache filename (Ubuntu).
+- name: Set the correct opcache filename (Ubuntu/Debian).
   set_fact:
     php_opcache_conf_filename: "10-opcache.ini"
-  when: ansible_distribution == "Ubuntu"
 
 - name: Add repository for PHP versions (Ubuntu).
   apt_repository: repo='ppa:ondrej/php'

From 21ec8a62f60db6f4479882d3ccc77ba4acbacb60 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 23 May 2017 23:35:51 -0400
Subject: [PATCH 0804/1273] Touch up docker-compose command documentation. [ci
 skip]

---
 docs/other/docker.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/other/docker.md b/docs/other/docker.md
index 01c3c527c..1491bd058 100644
--- a/docs/other/docker.md
+++ b/docs/other/docker.md
@@ -63,7 +63,7 @@ After the Drupal VM container is running, you should be able to see the Dashboar
 
 > Note: If you see Drupal's installer appear when accessing the site, that means the codebase was found, but either the database connection details are not in your local site configuration, or they are, but you don't have the default database populated yet. You may need to load in the database either via `drush sql-sync` or by importing a dump into the container. The default credentials are `drupal` and `drupal` for username and password, and `drupal` for the database name.
 
-You can stop the containers with `docker-compose stop`, or remove all their configuration with `docker-compose down`.
+You can stop the container with `docker-compose stop` (and start it again with `docker-compose start`), or remove all the configuration with `docker-compose down` (warning: this will also wipe out the database and other local container modifications).
 
 ### Using Drush inside Docker
 
@@ -123,4 +123,4 @@ Drupal VM includes an `example.docker-compose.yml` file. To use the file, copy i
 
     docker-compose up -d
 
-(The `-d` tells `docker-compose` to start the containers and run in the background.) You can stop the containers with `docker-compose stop`, or remove all their configuration with `docker-compose down`.
+(The `-d` tells `docker-compose` to start the containers and run in the background.) You can stop the container with `docker-compose stop` (and start it again with `docker-compose start`), or remove all the configuration with `docker-compose down` (warning: this will also wipe out the database and other local container modifications).

From d03cc5286757255d7ba0c423f601f559d43452a3 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 24 May 2017 08:33:59 -0400
Subject: [PATCH 0805/1273] Issue #1383: Update CHANGELOG for 4.5.0 release.

---
 CHANGELOG.md | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fdb99bc70..f596b01c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,53 @@
 # Drupal VM Changelog
 
+## 4.5.0 "Break In (For Strings, Flutes, and Celesta)" (2017-05-24)
+
+### Breaking Changes
+
+  * The default `nodejs_version` is now set to `6.x`; if you need to stay on `0.12` or some other version, be sure to set the version explicitly in your own `config.yml`.
+
+### New/changed variables in default.config.yml
+
+  * Changed variables:
+    * `nodejs_version: "6.x"` (was `0.12`)
+  * New variables:
+    * Reconfigurable templates for Drush Aliases:
+      * `drush_aliases_host_template: "templates/drupalvm.aliases.drushrc.php.j2"`
+      * `drush_aliases_guest_template: "templates/drupalvm-local.aliases.drushrc.php.j2"`
+    * Reconfigurable template for Nginx hosts:
+      * `nginx_vhost_template: "templates/nginx-vhost.conf.j2"`
+    * `firewall_enabled: true` (allows the disabling of Drupal VM's default firewall, e.g. for Docker usage)
+    * `php_xdebug_remote_host: "{{ ansible_default_ipv4.gateway }}"` (prevents warnings when using Xdebug)
+    * New Docker configuration options:
+      * `docker_container_name: drupal-vm`
+      * `docker_image_name: drupal-vm`
+      * `docker_image_path: ~/Downloads`
+    * New hostname configuration options:
+      * `hostname_configure: true`
+      * `hostname_fqdn: "{{ vagrant_hostname }}"`
+
+### Improvements
+
+  * #1206: Add instructions for running Drupal VM inside Docker.
+  * #1356: Add an official geerlingguy/drupal-vm image on Docker Hub.
+  * #1366: Make Drupal VM Docker image easier to use for single-site installations.
+  * #1377: Extract php-versions (version switching tasks) into standalone role so anyone can use it.
+  * #1353: Update default Node.js version to 6.x.
+  * #1327: Refactor task includes into drupalvm Ansible roles.
+  * #1329: Update Nginx role, allowing use of extensible Nginx templates.
+  * #1254: Refactor Drupal VM's Nginx templates to allow for extensibility.
+  * #1349: Make it easier to install Node.js global packages by name.
+  * #1258: Finalize documentation for Git-based deployment.
+  * Updated roles: Firewall, Nginx, Node.js, Apache, Selenium.
+
+### Bugfixes
+
+  * #1351: Fix documentation bug concerning paths in example.drupal.composer.json.
+  * #1304: Fix documentation bug concerning Behat paths.
+  * #1350: Set the `php_xdebug_remote_host` to prevent Xdebug warnings.
+  * #1347: Fix LoadError message on vagrant up/down.
+
+
 ## 4.4.5 (2017-04-24)
 
 ### New/changed variables in default.config.yml

From 5adc3233f224d53b4d3de1833fbcfa052bad06d0 Mon Sep 17 00:00:00 2001
From: Dane Powell <danepowell@users.noreply.github.com>
Date: Wed, 24 May 2017 13:06:49 -0700
Subject: [PATCH 0806/1273] Update solr.md

---
 docs/extras/solr.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/extras/solr.md b/docs/extras/solr.md
index ebc7a1e8d..68594df77 100644
--- a/docs/extras/solr.md
+++ b/docs/extras/solr.md
@@ -23,6 +23,8 @@ post_provision_scripts:
  - "../examples/scripts/configure-solr.sh"
 ```
 
+Note that for Drupal 8, this script will create a new search core named `d8` (rather than modifying the default core `collection1`).
+
 ## Extra Solr configuration
 
 You can add extra configuration for Solr, like the minimum and maximum memory allocation for the JVM (`solr_xms` and `solr_xmx`), and even the `solr_version`, by setting the appropriate variables inside `config.yml` before you build Drupal VM.

From 5bc31eee7b8449551051d699f789c489f5f7953e Mon Sep 17 00:00:00 2001
From: Adam Bergstein <nerdstein@gmail.com>
Date: Sat, 27 May 2017 21:14:57 -0400
Subject: [PATCH 0807/1273] Updating docker image

---
 example.docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/example.docker-compose.yml b/example.docker-compose.yml
index 0aa9dab92..3bf17b83d 100644
--- a/example.docker-compose.yml
+++ b/example.docker-compose.yml
@@ -5,7 +5,7 @@ services:
   drupal-vm:
 
     # Switch the image to `geerlingguy/drupal-vm` to use Drupal VM defaults.
-    image: drupal-vm
+    image: geerlingguy/drupal-vm
     # Comment out 'image' and uncomment the line below if customizing Drupal VM
     # with a project-specific Dockerfile in the same directory as this file.
     # build: .

From 6a2c0f626eb5de8bbb930b5c3a93de5c71ec68aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Tue, 28 Feb 2017 15:45:52 -0500
Subject: [PATCH 0808/1273] Issue #1171: Allow client to pass PHP and XDEBUG
 environemnt variables over SSH

---
 provisioning/tasks/sshd.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/provisioning/tasks/sshd.yml b/provisioning/tasks/sshd.yml
index 2006c2f59..ede2cdbf5 100644
--- a/provisioning/tasks/sshd.yml
+++ b/provisioning/tasks/sshd.yml
@@ -6,6 +6,17 @@
     state: absent
     validate: "/usr/sbin/sshd -T -f %s"
 
+- name: Allow client to pass PHP and XDEBUG environment variables over SSH.
+  lineinfile:
+    dest: /etc/ssh/sshd_config
+    line: "AcceptEnv {{ item }}"
+    validate: "/usr/sbin/sshd -T -f %s"
+  with_items:
+    - PHP_IDE_CONFIG
+    - XDEBUG_CONFIG
+    - PHP_OPTIONS
+  when: '"xdebug" in installed_extras'
+
 - name: Check if local known_hosts file is present.
   stat: "path={{ known_hosts_path | default('~/.ssh/known_hosts') }}"
   register: known_hosts_file

From d828f88a99c526734edf951bca847a2445961e6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Tue, 30 May 2017 12:56:51 -0500
Subject: [PATCH 0809/1273] Forward PHP and XDebug env variables with Drush
 aliases

---
 provisioning/templates/drupalvm.aliases.drushrc.php.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/templates/drupalvm.aliases.drushrc.php.j2 b/provisioning/templates/drupalvm.aliases.drushrc.php.j2
index ddf68b17b..f0c3ee8f9 100644
--- a/provisioning/templates/drupalvm.aliases.drushrc.php.j2
+++ b/provisioning/templates/drupalvm.aliases.drushrc.php.j2
@@ -13,7 +13,7 @@ $aliases['{{ host }}'] = array(
   'root' => '{{ root }}',
   'remote-host' => '{{ host }}',
   'remote-user' => '{{ vagrant_user }}',
-  'ssh-options' => '-o PasswordAuthentication=no -i "' . (getenv('VAGRANT_HOME') ?: drush_server_home() . '/.vagrant.d') . '/insecure_private_key"',
+  'ssh-options' => '-o "SendEnv PHP_IDE_CONFIG PHP_OPTIONS XDEBUG_CONFIG" -o PasswordAuthentication=no -i "' . (getenv('VAGRANT_HOME') ?: drush_server_home() . '/.vagrant.d') . '/insecure_private_key"',
   'path-aliases' => array(
     '%drush-script' => '{{ drush_path }}',
   ),

From 0a7be0e6b4f98a871bd212da036a57e19534a4ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Tue, 30 May 2017 12:56:56 -0500
Subject: [PATCH 0810/1273] Add docs

---
 docs/extras/xdebug.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/docs/extras/xdebug.md b/docs/extras/xdebug.md
index 19fc73cfe..10b10530f 100644
--- a/docs/extras/xdebug.md
+++ b/docs/extras/xdebug.md
@@ -48,6 +48,27 @@ To use XDebug with NetBeans, change the `php_xdebug_idekey` variable as shown be
 php_xdebug_idekey: netbeans-xdebug
 ```
 
+### XDebug over SSH/Drush
+
+As long as `xdebug` is listed in `installed_extras` Drupal VM is configured to accept the `PHP_IDE_CONFIG`, `XDEBUG_CONFIG` and `PHP_OPTIONS` environment variables over SSH and this can be used to set up some IDE's as well as enable XDebug on a per request basis:
+
+```
+PHP_OPTIONS="-d xdebug.profiler_enable=1" drush @drupalvm.drupalvm.dev migrate-import
+```
+
+To send the environment variables when using `vagrant ssh`, [create a `Vagrantfile.local`](../extending/vagrantfile.md) with:
+
+```
+config.ssh.forward_env = ['PHP_IDE_CONFIG', 'XDEBUG_CONFIG', 'PHP_OPTIONS']
+```
+
+And you can run:
+
+```
+XDEBUG_CONFIG="-d profiler_enable=1" vagrant ssh -c 'php /var/www/drupalvm/drupal/web/core/scripts/run-tests.sh --url http://drupalvm.dev --all'
+XDEBUG_CONFIG="-d profiler_enable=1" vagrant ssh -c 'cd /var/www/drupalvm/drupal/web/core; php ../../vendor/bin/phpunit tests/Drupal/Tests/Core/Password/PasswordHashingTest.php'
+```
+
 ## Profiling code with XDebug
 
 While most people use XDebug only for debugging purposes, you can also use it for profiling. It's not as commonly used for profiling as either Blackfire or XHProf, but it works!

From c28b692af352b845b78b35ee0b006b5deccf9cc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Tue, 30 May 2017 14:03:39 -0500
Subject: [PATCH 0811/1273] Issue #1375: Allow /vagrant synced folder to be
 overridden through vagrant_synced_folders

---
 Vagrantfile | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 4b1916a79..9e9a5d24b 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -75,6 +75,14 @@ Vagrant.configure('2') do |config|
     config.hostmanager.aliases = aliases
   end
 
+  # Sync the project root directory to /vagrant
+  unless vconfig['vagrant_synced_folders'].any? { |synced_folder| synced_folder['destination'] == '/vagrant' }
+    vconfig['vagrant_synced_folders'].push(
+      'local_path' => host_project_dir,
+      'destination' => '/vagrant'
+    )
+  end
+
   # Synced folders.
   vconfig['vagrant_synced_folders'].each do |synced_folder|
     options = {
@@ -91,9 +99,6 @@ Vagrant.configure('2') do |config|
     config.vm.synced_folder synced_folder.fetch('local_path'), synced_folder.fetch('destination'), options
   end
 
-  # Allow override of the default synced folder type.
-  config.vm.synced_folder host_project_dir, '/vagrant', type: vconfig['vagrant_synced_folder_default_type']
-
   config.vm.provision provisioner do |ansible|
     ansible.playbook = playbook
     ansible.extra_vars = {

From d10662f65f8201d7985c278d878a946a1b54d353 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 31 May 2017 08:48:31 -0500
Subject: [PATCH 0812/1273] Document udp causing nfs issues on linux

---
 docs/getting-started/installation-linux.md | 24 ++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/docs/getting-started/installation-linux.md b/docs/getting-started/installation-linux.md
index 8de69ced1..e728426b3 100644
--- a/docs/getting-started/installation-linux.md
+++ b/docs/getting-started/installation-linux.md
@@ -74,6 +74,30 @@ If encryption is not the issue then it's likely that either NFS isn't running co
 
 After attempting any of the above fixes, run `vagrant reload --provision` to restart the VM and attempt mounting the synced folder again, or `vagrant destroy -f && vagrant up` to rebuild the VM from scratch.
 
+### NFS shares are slow or hang due to UDP protocol
+
+If the default transport protocol UDP is causing slowness or failures to mount NFS shared folders, you can switch to NFSv4 and TCP by configuring your `vagrant_synced_folders` like the example below:
+
+```
+vagrant_synced_folders:
+  # The default share.
+  - local_path: .
+    destination: /var/www/drupalvm
+    type: nfs
+    create: true
+    options_override:
+      nfs_version: 4
+      nfs_udp: false
+
+  # Manually specify the /vagrant share to override the defaults
+  - local_path: .
+    destination: /vagrant
+    type: nfs
+    options_override:
+      nfs_version: 4
+      nfs_udp: false
+```
+
 ## Intel VT-x virtualization support
 
 On some laptops, Intel VT-x virtualization (which is built into most modern Intel processors) is enabled by default. This allows VirtualBox to run virtual machines efficiently using the CPU itself instead of software CPU emulation. If you get a message like "VT-x is disabled in the bios for both all cpu modes" or something similar, you may need to enter your computer's BIOS or UEFI settings and enable this virtualization support.

From e69c2758b65f32caa5c42b11459c6ef3401c74d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 31 May 2017 13:21:58 -0500
Subject: [PATCH 0813/1273] Issue #1368: Fix private files not accessable with
 nginx

---
 provisioning/templates/nginx-vhost.conf.j2 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/provisioning/templates/nginx-vhost.conf.j2 b/provisioning/templates/nginx-vhost.conf.j2
index dffd9626e..b8bab48cf 100644
--- a/provisioning/templates/nginx-vhost.conf.j2
+++ b/provisioning/templates/nginx-vhost.conf.j2
@@ -76,6 +76,9 @@ server {
     location ~ ^/sites/.*/files/styles/ {
         try_files $uri @rewrite;
     }
+    location ~ ^(/[a-z\-]+)?/system/files/ {
+        try_files $uri /index.php?$query_string;
+    }
     {% endblock %}
 
     {% block location_favicon -%}

From 99951b27c45d282e401d4af0fc5cbcc2f3a87432 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 31 May 2017 15:29:42 -0500
Subject: [PATCH 0814/1273] Update PHP Versions role to allow defaults
 overrides.

---
 provisioning/requirements.yml                 |  2 +-
 .../geerlingguy.php-versions/tasks/main.yml   | 21 ++++++++++++++
 .../geerlingguy.php-versions/vars/Debian.yml  | 28 +++++++++----------
 .../geerlingguy.php-versions/vars/RedHat.yml  |  8 +++---
 4 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index c53980f56..06c9c6c92 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -56,7 +56,7 @@
 - src: geerlingguy.php-tideways
   version: 1.1.0
 - src: geerlingguy.php-versions
-  version: 1.0.1
+  version: 1.1.0
 - src: geerlingguy.php-xdebug
   version: 2.3.1
 - src: geerlingguy.php-xhprof
diff --git a/provisioning/roles/geerlingguy.php-versions/tasks/main.yml b/provisioning/roles/geerlingguy.php-versions/tasks/main.yml
index 006adbdc9..813b5b69d 100644
--- a/provisioning/roles/geerlingguy.php-versions/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php-versions/tasks/main.yml
@@ -2,6 +2,27 @@
 - name: Include OS-specific variables.
   include_vars: "{{ ansible_os_family }}.yml"
 
+- name: Define PHP variables.
+  set_fact: "{{ item.key }}={{ hostvars[inventory_hostname][item.value] }}"
+  when:
+    - hostvars[inventory_hostname][item.key] is undefined
+    - hostvars[inventory_hostname][item.value] is defined
+  with_dict:
+    php_conf_paths: __php_conf_paths
+    php_extension_conf_paths: __php_extension_conf_paths
+    php_fpm_daemon: __php_fpm_daemon
+    php_fpm_conf_path: __php_fpm_conf_path
+    php_fpm_pool_conf_path: __php_fpm_pool_conf_path
+    php_mysql_package: __php_mysql_package
+    php_redis_package: __php_redis_package
+    php_memcached_package: __php_memcached_package
+    php_pgsql_package: __php_pgsql_package
+    php_tideways_module_path: __php_tideways_module_path
+    php_uploadprogress_module_path: __php_uploadprogress_module_path
+    php_xdebug_module_path: __php_xdebug_module_path
+    php_xhprof_module_path: __php_xhprof_module_path
+    php_packages: __php_packages
+
 # Setup tasks.
 - include: "setup-{{ ansible_os_family }}.yml"
   static: no
diff --git a/provisioning/roles/geerlingguy.php-versions/vars/Debian.yml b/provisioning/roles/geerlingguy.php-versions/vars/Debian.yml
index 424c8c6b1..3c7254780 100644
--- a/provisioning/roles/geerlingguy.php-versions/vars/Debian.yml
+++ b/provisioning/roles/geerlingguy.php-versions/vars/Debian.yml
@@ -1,27 +1,27 @@
 ---
 # Configure PHP paths and packages for PHP 5.6 and PHP 7.0.
-php_conf_paths:
+__php_conf_paths:
   - "/etc/php/{{ php_version }}/fpm"
   - "/etc/php/{{ php_version }}/apache2"
   - "/etc/php/{{ php_version }}/cli"
-php_extension_conf_paths:
+__php_extension_conf_paths:
   - "/etc/php/{{ php_version }}/fpm/conf.d"
   - "/etc/php/{{ php_version }}/apache2/conf.d"
   - "/etc/php/{{ php_version }}/cli/conf.d"
-php_fpm_daemon: "php{{ php_version }}-fpm"
-php_fpm_conf_path: "/etc/php/{{ php_version }}/fpm"
-php_fpm_pool_conf_path: "{{ php_fpm_conf_path }}/pool.d/www.conf"
-php_mysql_package: "php{{ php_version }}-mysql"
-php_redis_package: "php{{ php_version }}-redis"
-php_memcached_package: "php{{ php_version }}-memcached"
-php_pgsql_package: "php{{ php_version }}-pgsql"
+__php_fpm_daemon: "php{{ php_version }}-fpm"
+__php_fpm_conf_path: "/etc/php/{{ php_version }}/fpm"
+__php_fpm_pool_conf_path: "{{ php_fpm_conf_path }}/pool.d/www.conf"
+__php_mysql_package: "php{{ php_version }}-mysql"
+__php_redis_package: "php{{ php_version }}-redis"
+__php_memcached_package: "php{{ php_version }}-memcached"
+__php_pgsql_package: "php{{ php_version }}-pgsql"
 
-php_tideways_module_path: "/usr/lib/php/{{ php_version }}/modules"
-php_uploadprogress_module_path: "/usr/lib/php/{{ php_version }}/modules"
-php_xdebug_module_path: "/usr/lib/php/{{ php_version }}/modules"
-php_xhprof_module_path: "/usr/lib/php/{{ php_version }}/modules"
+__php_tideways_module_path: "/usr/lib/php/{{ php_version }}/modules"
+__php_uploadprogress_module_path: "/usr/lib/php/{{ php_version }}/modules"
+__php_xdebug_module_path: "/usr/lib/php/{{ php_version }}/modules"
+__php_xhprof_module_path: "/usr/lib/php/{{ php_version }}/modules"
 
-php_packages:
+__php_packages:
   - "php{{ php_version }}"
   - "php{{ php_version }}-apcu"
   - "php{{ php_version }}-cli"
diff --git a/provisioning/roles/geerlingguy.php-versions/vars/RedHat.yml b/provisioning/roles/geerlingguy.php-versions/vars/RedHat.yml
index bca09b456..568eaf60f 100644
--- a/provisioning/roles/geerlingguy.php-versions/vars/RedHat.yml
+++ b/provisioning/roles/geerlingguy.php-versions/vars/RedHat.yml
@@ -1,5 +1,5 @@
 ---
-php_tideways_module_path: "/usr/lib64/php{{ php_version }}/modules"
-php_uploadprogress_module_path: "/usr/lib64/php{{ php_version }}/modules"
-php_xdebug_module_path: "/usr/lib64/php{{ php_version }}/modules"
-php_xhprof_module_path: "/usr/lib64/php{{ php_version }}/modules"
+__php_tideways_module_path: "/usr/lib64/php{{ php_version }}/modules"
+__php_uploadprogress_module_path: "/usr/lib64/php{{ php_version }}/modules"
+__php_xdebug_module_path: "/usr/lib64/php{{ php_version }}/modules"
+__php_xhprof_module_path: "/usr/lib64/php{{ php_version }}/modules"

From 1efd8ad906e877df774dd11b63d210b458d2d0aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 31 May 2017 12:53:15 -0500
Subject: [PATCH 0815/1273] Issue #1378: Auto-install Vagrant plugins

---
 Vagrantfile                                  |  2 ++
 default.config.yml                           |  4 +++
 docs/extending/vagrantfile.md                | 11 ++++++++
 docs/getting-started/installation-linux.md   |  5 ++--
 docs/getting-started/installation-windows.md |  2 +-
 docs/getting-started/syncing-folders.md      |  6 -----
 docs/other/vagrant-virtualbox.md             | 10 --------
 lib/drupalvm/vagrant.rb                      | 27 ++++++++++++++++++++
 mkdocs.yml                                   |  1 -
 9 files changed, 47 insertions(+), 21 deletions(-)
 delete mode 100644 docs/other/vagrant-virtualbox.md

diff --git a/Vagrantfile b/Vagrantfile
index 4b1916a79..18875296c 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -40,6 +40,8 @@ end
 require_ansible_version ">= #{vconfig['drupalvm_ansible_version_min']}"
 Vagrant.require_version ">= #{vconfig['drupalvm_vagrant_version_min']}"
 
+ensure_plugins(vconfig['vagrant_plugins'])
+
 Vagrant.configure('2') do |config|
   # Set the name of the VM. See: http://stackoverflow.com/a/17864388/100134
   config.vm.define vconfig['vagrant_machine_name']
diff --git a/default.config.yml b/default.config.yml
index 5b7a638bd..09367578b 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -33,6 +33,10 @@ vagrant_synced_folders:
 vagrant_memory: 2048
 vagrant_cpus: 1
 
+# Ensure vagrant plugins are installed.
+vagrant_plugins:
+  - name: vagrant-vbguest
+
 # Minimum required versions.
 drupalvm_vagrant_version_min: '1.8.6'
 drupalvm_ansible_version_min: '2.2'
diff --git a/docs/extending/vagrantfile.md b/docs/extending/vagrantfile.md
index c7b96db7e..4a5a0fcf8 100644
--- a/docs/extending/vagrantfile.md
+++ b/docs/extending/vagrantfile.md
@@ -14,6 +14,17 @@ config.vm.provider :virtualbox do |v|
 end
 ```
 
+### Automatically install Vagrant plugins
+
+Drupal VM can be configured to ensure Vagrant plugins are installed by adding them to the `vagrant_plugins` list in your `config.yml` file.
+
+```yaml
+vagrant_plugins:
+ - name: vagrant-vbguest
+ - name: vagrant-hostsupdater
+ - name: vagrant-aws
+```
+
 ### Example: Using the `vagrant-aws` provider
 
 Add the following variables to your `config.yml`.
diff --git a/docs/getting-started/installation-linux.md b/docs/getting-started/installation-linux.md
index 8de69ced1..fcc92e791 100644
--- a/docs/getting-started/installation-linux.md
+++ b/docs/getting-started/installation-linux.md
@@ -68,9 +68,8 @@ If the directory you are trying to mount is within an encrypted folder or volume
 If encryption is not the issue then it's likely that either NFS isn't running correctly on your host, certain ports or protocols are being blocked by the system firewall, or you need to add additional mount options to your `vagrant_synced_folders` configuration. Try the following fixes:
 
   1. On Ubuntu, if you get a message like `It appears your machine doesn't support NFS`, run `sudo apt-get install -y nfs-server`.
-  2. Install the `vagrant-vbguest` plugin, which will make sure you are running the latest version of the VirualBox Guest Additions inside the VM (this can solve many different problems!).
-  3. Make sure the `vboxnet` interfaces are not being blocked by your system firewall. For Fedora (and many flavors of Linux), check out this guide for more: [Get Vagrant's NFS working under Fedora 20](https://web.archive.org/web/20150706105420/http://blog.bak1an.so/blog/2014/03/23/fedora-vagrant-nfs/).
-  4. Add `mount_options: ['vers=3']` to your synced folder definition in config.yml after the other options like `local_path`, `destination`, and `type`.
+  1. Make sure the `vboxnet` interfaces are not being blocked by your system firewall. For Fedora (and many flavors of Linux), check out this guide for more: [Get Vagrant's NFS working under Fedora 20](https://web.archive.org/web/20150706105420/http://blog.bak1an.so/blog/2014/03/23/fedora-vagrant-nfs/).
+  1. Add `mount_options: ['vers=3']` to your synced folder definition in config.yml after the other options like `local_path`, `destination`, and `type`.
 
 After attempting any of the above fixes, run `vagrant reload --provision` to restart the VM and attempt mounting the synced folder again, or `vagrant destroy -f && vagrant up` to rebuild the VM from scratch.
 
diff --git a/docs/getting-started/installation-windows.md b/docs/getting-started/installation-windows.md
index 550751ff0..de896674a 100644
--- a/docs/getting-started/installation-windows.md
+++ b/docs/getting-started/installation-windows.md
@@ -67,7 +67,7 @@ If you are running Windows 7 and `vagrant up` hangs, you may need to upgrade Pow
 
 ## Hosts file updates
 
-If you install either the `vagrant-hostsupdater` or `vagrant-hostmanager` plugin, you might get a permissions error when Vagrant tries changing the hosts file. On a macOS or Linux workstation, you're prompted for a sudo password so the change can be made, but on Windows, you have to do one of the following to make sure hostsupdater works correctly:
+If you install either the `vagrant-hostsupdater` (installed by default unless removed from `vagrant_plugins` in your `config.yml`) or `vagrant-hostmanager` plugin, you might get a permissions error when Vagrant tries changing the hosts file. On a macOS or Linux workstation, you're prompted for a sudo password so the change can be made, but on Windows, you have to do one of the following to make sure hostsupdater works correctly:
 
   1. Run PowerShell or whatever CLI you use with Vagrant as an administrator. Right click on the application and select 'Run as administrator', then proceed with `vagrant` commands as normal.
   2. Change the permissions on the hosts file so your account has permission to edit the file (this has security implications, so it's best to use option 1 unless you know what you're doing). To do this, open `%SystemRoot%\system32\drivers\etc` in Windows Explorer, right-click the `hosts` file, and under Security, add your account and give yourself full access to the file.
diff --git a/docs/getting-started/syncing-folders.md b/docs/getting-started/syncing-folders.md
index a2f17bc9c..8c4c63a48 100644
--- a/docs/getting-started/syncing-folders.md
+++ b/docs/getting-started/syncing-folders.md
@@ -55,12 +55,6 @@ vagrant_synced_folders:
 
 See [this issue](https://github.com/geerlingguy/drupal-vm/issues/67) for more information.
 
-### VirtualBox Guest Additions out of date
-
-If you get errors when running `vagrant up` stating that your guest additions are out of date, you can fix this easily by installing the `vagrant-vbguest` plugin. Run the following command in the drupal-vm folder: `vagrant plugin install vagrant-vbguest`.
-
-Otherwise, you will need to make sure you're using the officially supported `geerlingguy/ubuntu1404` box, which should _generally_ have the latest (or near-latest) guest additions installed. If not, please open an issue in the upstream project for building the base box: [`packer-ubuntu-1404`](https://github.com/geerlingguy/packer-ubuntu-1404).
-
 ### Permissions-related errors
 
 If you're encountering errors where Drupal or some other software inside the VM is having permissions issues creating or deleting files inside a synced folder, you might need to either make sure the file permissions are correct on your host machine (if a folder is not readable by you, it probably also won't be readable when mounted via NFS!), or add extra configuration to the synced folders item (if using a sync method like `rsync`):
diff --git a/docs/other/vagrant-virtualbox.md b/docs/other/vagrant-virtualbox.md
deleted file mode 100644
index 17b77a21d..000000000
--- a/docs/other/vagrant-virtualbox.md
+++ /dev/null
@@ -1,10 +0,0 @@
-From time to time, users have reported particular issues with Vagrant or VirtualBox in certain environments, and this page shows some common issues and possible fixes/solutions.
-
-## Guest additions fail to be detected
-
-From time to time, if you `vagrant halt`, then `vagrant up` again, you might get a message like `No guest additions were detected on the base box for this VM!`, as well as messages about shared folders not working correctly.
-
-There are two ways you can fix this problem:
-
-  1. Make sure you're running the latest box version for Drupal VM. Update by running `vagrant box update`.
-  2. Install the `vagrant vbguest` plugin: `vagrant plugin install vagrant-vbguest`.
diff --git a/lib/drupalvm/vagrant.rb b/lib/drupalvm/vagrant.rb
index beaa3c432..d6465135a 100644
--- a/lib/drupalvm/vagrant.rb
+++ b/lib/drupalvm/vagrant.rb
@@ -72,6 +72,33 @@ def vagrant_provisioner
   ansible_bin ? :ansible : :ansible_local
 end
 
+def ensure_plugins(plugins)
+  logger = Vagrant::UI::Colored.new
+  installed = false
+
+  plugins.each do |plugin|
+    plugin_name = plugin['name']
+    manager = Vagrant::Plugin::Manager.instance
+
+    next if manager.installed_plugins.has_key?(plugin_name)
+
+    logger.warn("Installing plugin #{plugin_name}")
+
+    manager.install_plugin(
+      plugin_name,
+      sources: plugin.fetch('source', %w(https://rubygems.org/ https://gems.hashicorp.com/)),
+      version: plugin['version']
+    )
+
+    installed = true
+  end
+
+  if installed
+    logger.warn('`vagrant up` must be re-run now that plugins are installed')
+    exit
+  end
+end
+
 def get_apache_vhosts(vhosts)
   aliases = []
   vhosts.each do |host|
diff --git a/mkdocs.yml b/mkdocs.yml
index 46ab76f57..d84752270 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -64,7 +64,6 @@ pages:
     - 'Pre- and Post-Provision Scripts': 'extending/scripts.md'
   - Other Information:
     - 'Networking Notes': 'other/networking.md'
-    - 'Vagrant and VirtualBox': 'other/vagrant-virtualbox.md'
     - 'Vagrant LXC provider': 'other/vagrant-lxc.md'
     - 'Improving Performance': 'other/performance.md'
     - 'Docker': 'other/docker.md'

From f165aae9081787e4d7a47dca745d42a67074f2bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 31 May 2017 13:12:49 -0500
Subject: [PATCH 0816/1273] Add vagrant-hostsupdater as an auto-installed
 plugin

---
 README.md          | 9 ++++-----
 default.config.yml | 1 +
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 222506c73..693208937 100644
--- a/README.md
+++ b/README.md
@@ -88,12 +88,11 @@ Once the process is complete, you will have a Drupal codebase available inside t
 
 Note: *If there are any errors during the course of running `vagrant up`, and it drops you back to your command prompt, just run `vagrant provision` to continue building the VM from where you left off. If there are still errors after doing this a few times, post an issue to this project's issue queue on GitHub with the error.*
 
-### 3 - Configure your host machine to access the VM.
+### 3 - Access the VM.
 
-  1. [Edit your hosts file](http://www.rackspace.com/knowledge_center/article/how-do-i-modify-my-hosts-file), adding the line `192.168.88.88  drupalvm.dev` so you can connect to the VM.
-    - You can have Vagrant automatically configure your hosts file if you install the `hostsupdater` plugin (`vagrant plugin install vagrant-hostsupdater`). All hosts defined in `apache_vhosts` or `nginx_vhosts` will be automatically managed. `vagrant-hostmanager` is also supported.
-    - The `auto_network` plugin (`vagrant plugin install vagrant-auto_network`) can help with IP address management if you set `vagrant_ip` to `0.0.0.0` inside `config.yml`.
-  2. Open your browser and access [http://drupalvm.dev/](http://drupalvm.dev/). The default login for the admin account is `admin` for both the username and password.
+Open your browser and access [http://drupalvm.dev/](http://drupalvm.dev/). The default login for the admin account is `admin` for both the username and password.
+
+Note: *By default Drupal VM is configured to use `192.168.88.88` as it's IP, if you're running multiple VM's the `auto_network` plugin (`vagrant plugin install vagrant-auto_network`) can help with IP address management if you set `vagrant_ip` to `0.0.0.0` inside `config.yml`.*
 
 ## Extra software/utilities
 
diff --git a/default.config.yml b/default.config.yml
index 09367578b..3ab653034 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -36,6 +36,7 @@ vagrant_cpus: 1
 # Ensure vagrant plugins are installed.
 vagrant_plugins:
   - name: vagrant-vbguest
+  - name: vagrant-hostsupdater
 
 # Minimum required versions.
 drupalvm_vagrant_version_min: '1.8.6'

From 8b3c09616421989bf8a719bbeb0f5001da724cd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 1 Jun 2017 11:10:32 -0500
Subject: [PATCH 0817/1273] fix rubocop lint

---
 .travis.yml             |  2 +-
 lib/drupalvm/vagrant.rb | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index da46780db..a834adece 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -60,7 +60,7 @@ before_install:
 
 script:
   # Vagrantfile syntax check.
-  - 'rubocop ./Vagrantfile ./lib/drupalvm --except LineLength,Eval,MutableConstant,BlockLength,ConditionalAssignment,IndentArray,AlignParameters'
+  - 'rubocop ./Vagrantfile ./lib/drupalvm --except LineLength,Eval,MutableConstant,BlockLength,MethodLength,ConditionalAssignment,IndentArray,AlignParameters'
 
   # Run tests.
   - composer run-tests
diff --git a/lib/drupalvm/vagrant.rb b/lib/drupalvm/vagrant.rb
index d6465135a..f0dae32fb 100644
--- a/lib/drupalvm/vagrant.rb
+++ b/lib/drupalvm/vagrant.rb
@@ -80,23 +80,23 @@ def ensure_plugins(plugins)
     plugin_name = plugin['name']
     manager = Vagrant::Plugin::Manager.instance
 
-    next if manager.installed_plugins.has_key?(plugin_name)
+    next if manager.installed_plugins.key?(plugin_name)
 
     logger.warn("Installing plugin #{plugin_name}")
 
     manager.install_plugin(
       plugin_name,
-      sources: plugin.fetch('source', %w(https://rubygems.org/ https://gems.hashicorp.com/)),
+      sources: plugin.fetch('source', %w[https://rubygems.org/ https://gems.hashicorp.com/]),
       version: plugin['version']
     )
 
     installed = true
   end
 
-  if installed
-    logger.warn('`vagrant up` must be re-run now that plugins are installed')
-    exit
-  end
+  return unless installed
+
+  logger.warn('`vagrant up` must be re-run now that plugins are installed')
+  exit
 end
 
 def get_apache_vhosts(vhosts)

From 8586df602b79ecea370d2056ef3c9e98117716f6 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 1 Jun 2017 16:00:30 -0500
Subject: [PATCH 0818/1273] Update to latest version of PostgreSQL role.

---
 provisioning/requirements.yml                        |  2 +-
 provisioning/roles/geerlingguy.postgresql/README.md  | 12 ++++++++++++
 .../roles/geerlingguy.postgresql/defaults/main.yml   |  7 +++++++
 .../roles/geerlingguy.postgresql/tasks/configure.yml |  9 +++++++++
 .../roles/geerlingguy.postgresql/tasks/databases.yml |  1 +
 .../roles/geerlingguy.postgresql/tasks/main.yml      |  2 +-
 .../geerlingguy.postgresql/templates/pg_hba.conf.j2  |  9 +++++++++
 7 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.postgresql/templates/pg_hba.conf.j2

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 06c9c6c92..052201187 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -66,7 +66,7 @@
 - src: geerlingguy.postfix
   version: 1.1.0
 - src: geerlingguy.postgresql
-  version: 1.0.3
+  version: 1.1.0
 - src: geerlingguy.redis
   version: 1.4.1
 - src: geerlingguy.repo-remi
diff --git a/provisioning/roles/geerlingguy.postgresql/README.md b/provisioning/roles/geerlingguy.postgresql/README.md
index 906cdf8cf..81f62632a 100644
--- a/provisioning/roles/geerlingguy.postgresql/README.md
+++ b/provisioning/roles/geerlingguy.postgresql/README.md
@@ -37,6 +37,18 @@ The directories (usually one, but can be multiple) where PostgreSQL's socket wil
 
 Global configuration options that will be set in `postgresql.conf`. Note that for RHEL/CentOS 6 (or very old versions of PostgreSQL), you need to at least override this variable and set the `option` to `unix_socket_directory`.
 
+    postgresql_hba_entries:
+      - type: host # required; local, host, hostssl or hostnossl
+        database: exampledb # required
+        user: jdoe # required
+        address: 192.0.2.0/24 # either this or ip_address / ip_mask are required unless type is 'local'
+        ip_address: # alternative to 'address'
+        ip_mask: # alternative to 'address'
+        auth_method: # required
+        auth_options: # optional
+
+Configure [host based authentication](https://www.postgresql.org/docs/current/static/auth-pg-hba-conf.html) entries to be set in the `pg_hba.conf`. 
+
     postgresql_locales:
       - 'en_US.UTF-8'
 
diff --git a/provisioning/roles/geerlingguy.postgresql/defaults/main.yml b/provisioning/roles/geerlingguy.postgresql/defaults/main.yml
index 10cb662f8..3f5990460 100644
--- a/provisioning/roles/geerlingguy.postgresql/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.postgresql/defaults/main.yml
@@ -13,6 +13,13 @@ postgresql_global_config_options:
   - option: unix_socket_directories
     value: '{{ postgresql_unix_socket_directories | join(",") }}'
 
+# Host based authentication (hba) entries to be added to the pg_hba.conf.
+postgresql_hba_entries:
+  - type: local
+    database: all
+    user: all
+    auth_method: trust
+
 # Debian only. Used to generate the locales used by PostgreSQL databases.
 postgresql_locales:
   - 'en_US.UTF-8'
diff --git a/provisioning/roles/geerlingguy.postgresql/tasks/configure.yml b/provisioning/roles/geerlingguy.postgresql/tasks/configure.yml
index 9b03d9e95..a78bed3b7 100644
--- a/provisioning/roles/geerlingguy.postgresql/tasks/configure.yml
+++ b/provisioning/roles/geerlingguy.postgresql/tasks/configure.yml
@@ -8,6 +8,15 @@
   with_items: "{{ postgresql_global_config_options }}"
   notify: restart postgresql
 
+- name: Configure host based authentication.
+  template:
+    src: "templates/pg_hba.conf.j2"
+    dest: "{{ postgresql_config_path }}/pg_hba.conf"
+    owner: "{{ postgresql_user }}"
+    group: "{{ postgresql_group }}"
+    mode: 0600
+  notify: restart postgresql
+
 - name: Ensure PostgreSQL unix socket dirs exist.
   file:
     path: "{{ item }}"
diff --git a/provisioning/roles/geerlingguy.postgresql/tasks/databases.yml b/provisioning/roles/geerlingguy.postgresql/tasks/databases.yml
index 772ee1bb6..fa782ea9f 100644
--- a/provisioning/roles/geerlingguy.postgresql/tasks/databases.yml
+++ b/provisioning/roles/geerlingguy.postgresql/tasks/databases.yml
@@ -11,6 +11,7 @@
     login_user: "{{ item.login_user | default(postgresql_user) }}"
     login_unix_socket: "{{ item.login_unix_socket | default(postgresql_unix_socket_directories[0]) }}"
     port: "{{ item.port | default(omit) }}"
+    owner: "{{ item.owner | default(postgresql_user) }}"
     state: "{{ item.state | default('present') }}"
   with_items: "{{ postgresql_databases }}"
   become: yes
diff --git a/provisioning/roles/geerlingguy.postgresql/tasks/main.yml b/provisioning/roles/geerlingguy.postgresql/tasks/main.yml
index 3e5111478..b6a8c87b1 100644
--- a/provisioning/roles/geerlingguy.postgresql/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.postgresql/tasks/main.yml
@@ -22,5 +22,5 @@
     enabled: yes
 
 # Configure PostgreSQL.
-- include: databases.yml
 - include: users.yml
+- include: databases.yml
diff --git a/provisioning/roles/geerlingguy.postgresql/templates/pg_hba.conf.j2 b/provisioning/roles/geerlingguy.postgresql/templates/pg_hba.conf.j2
new file mode 100644
index 000000000..05cc8a0ab
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/templates/pg_hba.conf.j2
@@ -0,0 +1,9 @@
+{{ ansible_managed | comment }}
+# PostgreSQL Client Authentication Configuration File
+# ===================================================
+#
+# See: https://www.postgresql.org/docs/current/static/auth-pg-hba-conf.html
+
+{% for client in postgresql_hba_entries %}
+{{ client.type }} {{ client.database }} {{ client.user }} {{ client.address|default('') }} {{ client.ip_address|default('') }} {{ client.ip_mask|default('') }} {{ client.auth_method }} {{ client.auth_options|default("") }}
+{% endfor %}

From 0641cba7f60199d0591499c5e6a6a7155b49da3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 1 Jun 2017 21:32:11 -0500
Subject: [PATCH 0819/1273] english

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

diff --git a/README.md b/README.md
index 693208937..db586e384 100644
--- a/README.md
+++ b/README.md
@@ -92,7 +92,7 @@ Note: *If there are any errors during the course of running `vagrant up`, and it
 
 Open your browser and access [http://drupalvm.dev/](http://drupalvm.dev/). The default login for the admin account is `admin` for both the username and password.
 
-Note: *By default Drupal VM is configured to use `192.168.88.88` as it's IP, if you're running multiple VM's the `auto_network` plugin (`vagrant plugin install vagrant-auto_network`) can help with IP address management if you set `vagrant_ip` to `0.0.0.0` inside `config.yml`.*
+Note: *By default Drupal VM is configured to use `192.168.88.88` as its IP, if you're running multiple VM's the `auto_network` plugin (`vagrant plugin install vagrant-auto_network`) can help with IP address management if you set `vagrant_ip` to `0.0.0.0` inside `config.yml`.*
 
 ## Extra software/utilities
 

From 564d37bc81f40e4336acfc0b442bcd55e124ce3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 1 Jun 2017 23:51:47 -0500
Subject: [PATCH 0820/1273] Use xdebug.default_enable in XDebug ssh docs [ci
 skip]

---
 docs/extras/xdebug.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/extras/xdebug.md b/docs/extras/xdebug.md
index 10b10530f..85c184a24 100644
--- a/docs/extras/xdebug.md
+++ b/docs/extras/xdebug.md
@@ -53,7 +53,7 @@ php_xdebug_idekey: netbeans-xdebug
 As long as `xdebug` is listed in `installed_extras` Drupal VM is configured to accept the `PHP_IDE_CONFIG`, `XDEBUG_CONFIG` and `PHP_OPTIONS` environment variables over SSH and this can be used to set up some IDE's as well as enable XDebug on a per request basis:
 
 ```
-PHP_OPTIONS="-d xdebug.profiler_enable=1" drush @drupalvm.drupalvm.dev migrate-import
+PHP_OPTIONS="-d xdebug.default_enable=1" drush @drupalvm.drupalvm.dev migrate-import
 ```
 
 To send the environment variables when using `vagrant ssh`, [create a `Vagrantfile.local`](../extending/vagrantfile.md) with:
@@ -65,8 +65,8 @@ config.ssh.forward_env = ['PHP_IDE_CONFIG', 'XDEBUG_CONFIG', 'PHP_OPTIONS']
 And you can run:
 
 ```
-XDEBUG_CONFIG="-d profiler_enable=1" vagrant ssh -c 'php /var/www/drupalvm/drupal/web/core/scripts/run-tests.sh --url http://drupalvm.dev --all'
-XDEBUG_CONFIG="-d profiler_enable=1" vagrant ssh -c 'cd /var/www/drupalvm/drupal/web/core; php ../../vendor/bin/phpunit tests/Drupal/Tests/Core/Password/PasswordHashingTest.php'
+XDEBUG_CONFIG="-d default_enable=1" vagrant ssh -c 'php /var/www/drupalvm/drupal/web/core/scripts/run-tests.sh --url http://drupalvm.dev --all'
+XDEBUG_CONFIG="-d default_enable=1" vagrant ssh -c 'cd /var/www/drupalvm/drupal/web/core; php ../../vendor/bin/phpunit tests/Drupal/Tests/Core/Password/PasswordHashingTest.php'
 ```
 
 ## Profiling code with XDebug

From 6f89408c2ff01f1a304567b70700d01966ed40ac Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 2 Jun 2017 09:42:28 -0500
Subject: [PATCH 0821/1273] Update Redis role to latest version.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.redis/.gitignore        |  2 +
 .../roles/geerlingguy.redis/.travis.yml       | 51 +++++--------------
 provisioning/roles/geerlingguy.redis/LICENSE  | 20 ++++++++
 .../roles/geerlingguy.redis/README.md         | 23 ++++++++-
 .../roles/geerlingguy.redis/defaults/main.yml | 20 ++++++++
 .../geerlingguy.redis/templates/redis.conf.j2 | 10 ++++
 .../roles/geerlingguy.redis/tests/README.md   | 11 ++++
 .../roles/geerlingguy.redis/tests/test.yml    |  2 +-
 9 files changed, 99 insertions(+), 42 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.redis/.gitignore
 create mode 100644 provisioning/roles/geerlingguy.redis/LICENSE
 create mode 100644 provisioning/roles/geerlingguy.redis/tests/README.md

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 052201187..7fcc0717a 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -68,7 +68,7 @@
 - src: geerlingguy.postgresql
   version: 1.1.0
 - src: geerlingguy.redis
-  version: 1.4.1
+  version: 1.5.0
 - src: geerlingguy.repo-remi
   version: 1.2.0
 - src: geerlingguy.ruby
diff --git a/provisioning/roles/geerlingguy.redis/.gitignore b/provisioning/roles/geerlingguy.redis/.gitignore
new file mode 100644
index 000000000..c9b2377e3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.redis/.gitignore
@@ -0,0 +1,2 @@
+*.retry
+tests/test.sh
diff --git a/provisioning/roles/geerlingguy.redis/.travis.yml b/provisioning/roles/geerlingguy.redis/.travis.yml
index de27baf24..a745a785f 100644
--- a/provisioning/roles/geerlingguy.redis/.travis.yml
+++ b/provisioning/roles/geerlingguy.redis/.travis.yml
@@ -1,58 +1,33 @@
 ---
-sudo: required
+services: docker
 
 env:
   - distro: centos7
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     redis_daemon: redis
   # - distro: fedora24
-  #   init: /usr/lib/systemd/systemd
-  #   run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
   #   redis_daemon: redis
   - distro: ubuntu1604
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     redis_daemon: redis-server
 
-services:
-  - docker
-
-before_install:
-  # Pull container.
-  - 'sudo docker pull geerlingguy/docker-${distro}-ansible:latest'
-
 script:
-  - container_id=$(mktemp)
-  # Run container in detached state.
-  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
+  # Configure test script so we can run extra tests after playbook is run.
+  - export container_id=$(date +%s)
+  - export cleanup=false
 
-  # Ansible syntax check.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+  # Download test shim.
+  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
+  - chmod +x ${PWD}/tests/test.sh
 
-  # Test role.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
-
-  # Test role idempotence.
-  - idempotence=$(mktemp)
-  - sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
-  - >
-    tail ${idempotence}
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
+  # Run tests.
+  - ${PWD}/tests/test.sh
 
   # Make sure Redis is running, and can be stopped and started cleanly.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm systemctl --no-pager status ${redis_daemon}'
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm systemctl --no-pager stop ${redis_daemon}'
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm systemctl --no-pager start ${redis_daemon}'
+  - 'docker exec --tty ${container_id} env TERM=xterm systemctl --no-pager status ${redis_daemon}'
+  - 'docker exec --tty ${container_id} env TERM=xterm systemctl --no-pager stop ${redis_daemon}'
+  - 'docker exec --tty ${container_id} env TERM=xterm systemctl --no-pager start ${redis_daemon}'
 
 after_failure:
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm cat /var/log/redis/redis-server.log'
-
-after_success:
-  # Clean up.
-  - 'sudo docker stop "$(cat ${container_id})"'
+  - 'docker exec --tty ${container_id} env TERM=xterm cat /var/log/redis/redis-server.log'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.redis/LICENSE b/provisioning/roles/geerlingguy.redis/LICENSE
new file mode 100644
index 000000000..4275cf3c1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.redis/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Jeff Geerling
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/provisioning/roles/geerlingguy.redis/README.md b/provisioning/roles/geerlingguy.redis/README.md
index acb58aa20..db87939ed 100644
--- a/provisioning/roles/geerlingguy.redis/README.md
+++ b/provisioning/roles/geerlingguy.redis/README.md
@@ -79,7 +79,26 @@ Add extra include file paths to this list to include more/localized Redis config
 
 The redis package name for installation via the system package manager. Defaults to `redis-server` on Debian and `redis` on RHEL.
 
-    redis_package_name: "redis28u"
+    redis_package_name: "redis-server"
+
+(Default for RHEL shown) The redis package name for installation via the system package manager. Defaults to `redis-server` on Debian and `redis` on RHEL.
+
+    redis_requirepass: ""
+
+Set a password to require authentication to Redis. You can generate a strong password using `echo "my_password_here" | sha256sum`.
+
+    redis_disabled_commands: []
+
+For extra security, you can disable certain Redis commands (this is especially important if Redis is publicly accessible). For example:
+
+    redis_disabled_commands:
+      - FLUSHDB
+      - FLUSHALL
+      - KEYS
+      - PEXPIRE
+      - DEL
+      - CONFIG
+      - SHUTDOWN
 
 ## Dependencies
 
@@ -97,4 +116,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.redis/defaults/main.yml b/provisioning/roles/geerlingguy.redis/defaults/main.yml
index c7a05773b..3c9965d68 100644
--- a/provisioning/roles/geerlingguy.redis/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.redis/defaults/main.yml
@@ -31,3 +31,23 @@ redis_appendfsync: "everysec"
 
 # Add extra include files for local configuration/overrides.
 redis_includes: []
+
+# Require authentication to Redis with a password.
+redis_requirepass: ""
+
+# Disable certain Redis commands for security reasons.
+redis_disabled_commands: []
+#  - FLUSHDB
+#  - FLUSHALL
+#  - KEYS
+#  - PEXPIRE
+#  - DEL
+#  - CONFIG
+#  - SHUTDOWN
+#  - BGREWRITEAOF
+#  - BGSAVE
+#  - SAVE
+#  - SPOP
+#  - SREM
+#  - RENAME
+#  - DEBUG
diff --git a/provisioning/roles/geerlingguy.redis/templates/redis.conf.j2 b/provisioning/roles/geerlingguy.redis/templates/redis.conf.j2
index f7a7c5f04..9cec1c8a1 100644
--- a/provisioning/roles/geerlingguy.redis/templates/redis.conf.j2
+++ b/provisioning/roles/geerlingguy.redis/templates/redis.conf.j2
@@ -1,3 +1,5 @@
+# {{ ansible_managed }}
+
 daemonize yes
 pidfile /var/run/redis/{{ redis_daemon }}.pid
 port {{ redis_port }}
@@ -43,3 +45,11 @@ no-appendfsync-on-rewrite no
 {% for include in redis_includes %}
 include {{ include }}
 {% endfor %}
+
+{% if redis_requirepass %}
+requirepass {{ redis_requirepass }}
+{% endif %}
+
+{% for redis_disabled_command in redis_disabled_commands %}
+rename-command {{ redis_disabled_command }} ""
+{% endfor %}
diff --git a/provisioning/roles/geerlingguy.redis/tests/README.md b/provisioning/roles/geerlingguy.redis/tests/README.md
new file mode 100644
index 000000000..6fb211721
--- /dev/null
+++ b/provisioning/roles/geerlingguy.redis/tests/README.md
@@ -0,0 +1,11 @@
+# Ansible Role tests
+
+To run the test playbook(s) in this directory:
+
+  1. Install and start Docker.
+  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
+    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
+  1. Make the test shim executable: `chmod +x tests/test.sh`.
+  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
+
+If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.redis/tests/test.yml b/provisioning/roles/geerlingguy.redis/tests/test.yml
index 0b03377b8..7e86758c2 100644
--- a/provisioning/roles/geerlingguy.redis/tests/test.yml
+++ b/provisioning/roles/geerlingguy.redis/tests/test.yml
@@ -3,7 +3,7 @@
 
   pre_tasks:
     - name: Update apt cache.
-      apt: update_cache=yes
+      apt: update_cache=yes cache_valid_time=600
       when: ansible_os_family == 'Debian'
 
     - name: Clear out repo for Fedora.

From cb6e1e851f93929f2423ca5f0312bc94a2f09ec7 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 2 Jun 2017 15:02:25 -0500
Subject: [PATCH 0822/1273] Fixes #1403: Fix failing PostgreSQL test.

---
 provisioning/requirements.yml                            | 2 +-
 provisioning/roles/geerlingguy.postgresql/tasks/main.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 7fcc0717a..28296cc32 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -66,7 +66,7 @@
 - src: geerlingguy.postfix
   version: 1.1.0
 - src: geerlingguy.postgresql
-  version: 1.1.0
+  version: 1.2.0
 - src: geerlingguy.redis
   version: 1.5.0
 - src: geerlingguy.repo-remi
diff --git a/provisioning/roles/geerlingguy.postgresql/tasks/main.yml b/provisioning/roles/geerlingguy.postgresql/tasks/main.yml
index b6a8c87b1..3e5111478 100644
--- a/provisioning/roles/geerlingguy.postgresql/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.postgresql/tasks/main.yml
@@ -22,5 +22,5 @@
     enabled: yes
 
 # Configure PostgreSQL.
-- include: users.yml
 - include: databases.yml
+- include: users.yml

From cd8b3d329c2c9577ba6ad9ad59dcd32ff47c1465 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 2 Jun 2017 17:04:22 -0500
Subject: [PATCH 0823/1273] Fixes #1403: PostgreSQL will work correctly now.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.postgresql/README.md    | 27 ++++++++++++-------
 .../geerlingguy.postgresql/defaults/main.yml  | 11 ++++----
 .../tasks/configure.yml                       |  3 ++-
 .../geerlingguy.postgresql/tests/test.yml     |  3 ++-
 5 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 28296cc32..46242d033 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -66,7 +66,7 @@
 - src: geerlingguy.postfix
   version: 1.1.0
 - src: geerlingguy.postgresql
-  version: 1.2.0
+  version: 1.3.0
 - src: geerlingguy.redis
   version: 1.5.0
 - src: geerlingguy.repo-remi
diff --git a/provisioning/roles/geerlingguy.postgresql/README.md b/provisioning/roles/geerlingguy.postgresql/README.md
index 81f62632a..0a39860cf 100644
--- a/provisioning/roles/geerlingguy.postgresql/README.md
+++ b/provisioning/roles/geerlingguy.postgresql/README.md
@@ -38,16 +38,23 @@ The directories (usually one, but can be multiple) where PostgreSQL's socket wil
 Global configuration options that will be set in `postgresql.conf`. Note that for RHEL/CentOS 6 (or very old versions of PostgreSQL), you need to at least override this variable and set the `option` to `unix_socket_directory`.
 
     postgresql_hba_entries:
-      - type: host # required; local, host, hostssl or hostnossl
-        database: exampledb # required
-        user: jdoe # required
-        address: 192.0.2.0/24 # either this or ip_address / ip_mask are required unless type is 'local'
-        ip_address: # alternative to 'address'
-        ip_mask: # alternative to 'address'
-        auth_method: # required
-        auth_options: # optional
-
-Configure [host based authentication](https://www.postgresql.org/docs/current/static/auth-pg-hba-conf.html) entries to be set in the `pg_hba.conf`. 
+      - { type: local, database: all, user: postgres, auth_method: peer }
+      - { type: local, database: all, user: all, auth_method: peer }
+      - { type: host, database: all, user: all, address: '127.0.0.1/32', auth_method: md5 }
+      - { type: host, database: all, user: all, address: '::1/128', auth_method: md5 }
+
+Configure [host based authentication](https://www.postgresql.org/docs/current/static/auth-pg-hba-conf.html) entries to be set in the `pg_hba.conf`. Options for entries include:
+
+  - `type` (required)
+  - `database` (required)
+  - `user` (required)
+  - `address` (one of this or the following two are required)
+  - `ip_address`
+  - `ip_mask`
+  - `auth_method` (required)
+  - `auth_options` (optional)
+
+If overriding, make sure you copy all of the existing entries from `defaults/main.yml` if you need to preserve existing entries.
 
     postgresql_locales:
       - 'en_US.UTF-8'
diff --git a/provisioning/roles/geerlingguy.postgresql/defaults/main.yml b/provisioning/roles/geerlingguy.postgresql/defaults/main.yml
index 3f5990460..9a7dfa005 100644
--- a/provisioning/roles/geerlingguy.postgresql/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.postgresql/defaults/main.yml
@@ -13,12 +13,13 @@ postgresql_global_config_options:
   - option: unix_socket_directories
     value: '{{ postgresql_unix_socket_directories | join(",") }}'
 
-# Host based authentication (hba) entries to be added to the pg_hba.conf.
+# Host based authentication (hba) entries to be added to the pg_hba.conf. This
+# variable's defaults reflect the defaults that come with a fresh installation.
 postgresql_hba_entries:
-  - type: local
-    database: all
-    user: all
-    auth_method: trust
+  - { type: local, database: all, user: postgres, auth_method: peer }
+  - { type: local, database: all, user: all, auth_method: peer }
+  - { type: host, database: all, user: all, address: '127.0.0.1/32', auth_method: md5 }
+  - { type: host, database: all, user: all, address: '::1/128', auth_method: md5 }
 
 # Debian only. Used to generate the locales used by PostgreSQL databases.
 postgresql_locales:
diff --git a/provisioning/roles/geerlingguy.postgresql/tasks/configure.yml b/provisioning/roles/geerlingguy.postgresql/tasks/configure.yml
index a78bed3b7..d69965b7b 100644
--- a/provisioning/roles/geerlingguy.postgresql/tasks/configure.yml
+++ b/provisioning/roles/geerlingguy.postgresql/tasks/configure.yml
@@ -8,7 +8,7 @@
   with_items: "{{ postgresql_global_config_options }}"
   notify: restart postgresql
 
-- name: Configure host based authentication.
+- name: Configure host based authentication (if entries are configured).
   template:
     src: "templates/pg_hba.conf.j2"
     dest: "{{ postgresql_config_path }}/pg_hba.conf"
@@ -16,6 +16,7 @@
     group: "{{ postgresql_group }}"
     mode: 0600
   notify: restart postgresql
+  when: postgresql_hba_entries
 
 - name: Ensure PostgreSQL unix socket dirs exist.
   file:
diff --git a/provisioning/roles/geerlingguy.postgresql/tests/test.yml b/provisioning/roles/geerlingguy.postgresql/tests/test.yml
index 93c6ceff2..45dd9b554 100644
--- a/provisioning/roles/geerlingguy.postgresql/tests/test.yml
+++ b/provisioning/roles/geerlingguy.postgresql/tests/test.yml
@@ -12,8 +12,9 @@
       apt: update_cache=yes cache_valid_time=600
       when: ansible_os_family == 'Debian'
 
-    - name: Set custom variable name for old CentOS 6 PostgreSQL install.
+    - name: Set custom variables for old CentOS 6 PostgreSQL install.
       set_fact:
+        postgresql_hba_entries: []
         postgresql_global_config_options:
           - option: unix_socket_directory
             value: '{{ postgresql_unix_socket_directories[0] }}'

From f4af1fa92994aeec28c3e77bb6bd606ac0745887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 3 Jun 2017 10:30:00 -0500
Subject: [PATCH 0824/1273] Issue #1386: Remove Acquia example and add docs
 section pointing to BLT

---
 docs/other/acquia.md              |  1 +
 examples/acquia/README.md         | 11 -----------
 examples/acquia/acquia.config.yml | 12 ------------
 mkdocs.yml                        |  1 +
 4 files changed, 2 insertions(+), 23 deletions(-)
 create mode 100644 docs/other/acquia.md
 delete mode 100644 examples/acquia/README.md
 delete mode 100644 examples/acquia/acquia.config.yml

diff --git a/docs/other/acquia.md b/docs/other/acquia.md
new file mode 100644
index 000000000..bc687bf14
--- /dev/null
+++ b/docs/other/acquia.md
@@ -0,0 +1 @@
+To emulate the default Acquia Cloud environment with Drupal VM you should create a `config.yml` and override a few defaults from `default.config.yml`. For an up-to-date example, use [BLT's `config.yml`](https://github.com/acquia/blt/blob/8.x/scripts/drupal-vm/config.yml). Some of the variables in the BLT example are customized for BLT and you should be looking specifically at `vagrant_box`, `php_version`, and `php_packages_extra`.
diff --git a/examples/acquia/README.md b/examples/acquia/README.md
deleted file mode 100644
index 9d4244ae9..000000000
--- a/examples/acquia/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Acquia Cloud Drupal VM Configuration Example
-
-This directory contains example configuration overrides for the default Drupal VM `default.config.yml` file which emulate the default Acquia Cloud environment with Drupal VM:
-
-  - Ubuntu 12.04.5 LTS
-  - Apache 2.2.22
-  - PHP 5.6.21
-  - MySQL/Percona 5.5.24
-  - Apache Solr 4.5.1
-
-To use these overrides, copy `acquia.config.yml` to `config.yml`, and by looking at `default.config.yml` add any other overrides you'd like. Whatever variables you have set in `config.yml` will override the defaults set by `default.config.yml`.
diff --git a/examples/acquia/acquia.config.yml b/examples/acquia/acquia.config.yml
deleted file mode 100644
index 8f50db0c4..000000000
--- a/examples/acquia/acquia.config.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-# Acquia Cloud uses Ubuntu 12.04 LTS.
-vagrant_box: geerlingguy/ubuntu1204
-
-# Acquia Cloud defaults to PHP 5.6.
-php_version: "5.6"
-
-# Acquia Cloud Search defaults to Solr 4.x.
-solr_version: "4.5.1"
-installed_extras:
-  - drush
-  - solr
diff --git a/mkdocs.yml b/mkdocs.yml
index d84752270..952d83119 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -71,5 +71,6 @@ pages:
     - 'Drupal multisite': 'deployment/multisite.md'
     - 'Drupal 6 Notes': 'other/drupal-6.md'
     - 'Drupal VM Management Tools': 'other/management-tools.md'
+    - 'Emulating Acquia Cloud environment': 'other/acquia.md'
     - 'Deploying to a production environment': 'other/production.md'
     - 'Wordpress or other applications': 'other/wordpress-other-applications.md'

From 5cde5e731ed6064720409b07252da62f6968d4a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Sat, 3 Jun 2017 15:12:31 -0500
Subject: [PATCH 0825/1273] Add note about tideways rather than xhprof to
 default.config.yml

---
 default.config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.config.yml b/default.config.yml
index 3ab653034..17795a692 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -218,7 +218,7 @@ installed_extras:
   # - upload-progress
   - varnish
   # - xdebug
-  # - xhprof
+  # - xhprof # use `tideways` if you're installing PHP 7+
 
 # Add any extra apt or yum packages you would like installed.
 extra_packages:

From d3a0f087b514628bf87d9ffaa851cdf51aa6109d Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 3 Jun 2017 17:20:42 -0500
Subject: [PATCH 0826/1273] Update Nginx role to latest version.

---
 provisioning/requirements.yml                   |  2 +-
 provisioning/roles/geerlingguy.nginx/README.md  | 17 ++++++++++++++++-
 .../roles/geerlingguy.nginx/defaults/main.yml   |  4 +++-
 .../roles/geerlingguy.nginx/tasks/vhosts.yml    |  4 ++--
 .../roles/geerlingguy.nginx/tests/test.yml      |  5 +++--
 5 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 46242d033..2a2efb739 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -38,7 +38,7 @@
 - src: geerlingguy.mysql
   version: 2.7.2
 - src: geerlingguy.nginx
-  version: 2.2.1
+  version: 2.3.0
 - src: geerlingguy.nodejs
   version: 4.1.1
 - src: geerlingguy.php
diff --git a/provisioning/roles/geerlingguy.nginx/README.md b/provisioning/roles/geerlingguy.nginx/README.md
index 2e4a2d67b..5a5f66832 100644
--- a/provisioning/roles/geerlingguy.nginx/README.md
+++ b/provisioning/roles/geerlingguy.nginx/README.md
@@ -19,8 +19,9 @@ Available variables are listed below, along with default values (see `defaults/m
 A list of vhost definitions (server blocks) for Nginx virtual hosts. Each entry will create a separate config file named by `server_name`. If left empty, you will need to supply your own virtual host configuration. See the commented example in `defaults/main.yml` for available server options. If you have a large number of customizations required for your server definition(s), you're likely better off managing the vhost configuration file yourself, leaving this variable set to `[]`.
 
     nginx_vhosts:
-      - listen: "80 default_server"
+      - listen: "443 ssl http2"
         server_name: "example.com"
+        server_name_redirect: "www.example.com"
         root: "/var/www/example.com"
         index: "index.php index.html index.htm"
         error_page: ""
@@ -28,6 +29,7 @@ A list of vhost definitions (server blocks) for Nginx virtual hosts. Each entry
         error_log: ""
         state: "present"
         template: "{{ nginx_vhost_template }}"
+        filename: "example.com.conf"
         extra_parameters: |
           location ~ \.php$ {
               fastcgi_split_path_info ^(.+\.php)(/.+)$;
@@ -36,11 +38,24 @@ A list of vhost definitions (server blocks) for Nginx virtual hosts. Each entry
               fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
               include fastcgi_params;
           }
+          ssl_certificate     /etc/ssl/certs/ssl-cert-snakeoil.pem;
+          ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key;
+          ssl_protocols       TLSv1.1 TLSv1.2;
+          ssl_ciphers         HIGH:!aNULL:!MD5;
 
 An example of a fully-populated nginx_vhosts entry, using a `|` to declare a block of syntax for the `extra_parameters`.
 
 Please take note of the indentation in the above block. The first line should be a normal 2-space indent. All other lines should be indented normally relative to that line. In the generated file, the entire block will be 4-space indented. This style will ensure the config file is indented correctly.
 
+      - listen: "80"
+        server_name: "example.com www.example.com"
+        return "301 https://example.com$request_uri;"
+        filename: "example.com.80.conf"
+
+An example of a secondary vhost which will redirect to the one shown above.
+
+*Note: The `filename` defaults to the first domain in `server_name`, if you have two vhosts with the same domain, eg. a redirect, you need to manually set the `filename` so the second one doesn't override the first one*
+
     nginx_remove_default_vhost: false
 
 Whether to remove the 'default' virtualhost configuration supplied by Nginx. Useful if you want the base `/` URL to be directed at one of your own virtual hosts configured in a separate .conf file.
diff --git a/provisioning/roles/geerlingguy.nginx/defaults/main.yml b/provisioning/roles/geerlingguy.nginx/defaults/main.yml
index 5161e8200..b21140b10 100644
--- a/provisioning/roles/geerlingguy.nginx/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.nginx/defaults/main.yml
@@ -55,12 +55,14 @@ nginx_extra_http_options: ""
 nginx_remove_default_vhost: false
 nginx_vhosts: []
 # Example vhost below, showing all available options:
-# - listen: "80 default_server" # default: "80 default_server"
+# - listen: "80" # default: "80"
 #   server_name: "example.com" # default: N/A
 #   root: "/var/www/example.com" # default: N/A
 #   index: "index.html index.htm" # default: "index.html index.htm"
+#   filename: "example.com.conf" # Can be used to set the filename of the vhost file.
 #
 #   # Properties that are only added if defined:
+#   server_name_redirect: "www.example.com" # default: N/A
 #   error_page: ""
 #   access_log: ""
 #   error_log: ""
diff --git a/provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml b/provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml
index 03c32d9c1..05af0373d 100644
--- a/provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml
+++ b/provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml
@@ -15,7 +15,7 @@
 - name: Add managed vhost config files.
   template:
     src: "{{ item.template|default(nginx_vhost_template) }}"
-    dest: "{{ nginx_vhost_path }}/{{ item.server_name.split(' ')[0] }}.conf"
+    dest: "{{ nginx_vhost_path }}/{{ item.filename|default(item.server_name.split(' ')[0] ~ '.conf') }}"
     force: yes
     owner: root
     group: root
@@ -26,7 +26,7 @@
 
 - name: Remove managed vhost config files.
   file:
-    path: "{{ nginx_vhost_path }}/{{ item.server_name.split(' ')[0] }}.conf"
+    path: "{{ nginx_vhost_path }}/{{ item.filename|default(item.server_name.split(' ')[0] ~ '.conf') }}"
     state: absent
   when: item.state|default('present') == 'absent'
   with_items: "{{ nginx_vhosts }}"
diff --git a/provisioning/roles/geerlingguy.nginx/tests/test.yml b/provisioning/roles/geerlingguy.nginx/tests/test.yml
index 32b4e09ac..9ae896045 100644
--- a/provisioning/roles/geerlingguy.nginx/tests/test.yml
+++ b/provisioning/roles/geerlingguy.nginx/tests/test.yml
@@ -10,11 +10,12 @@
 
   pre_tasks:
     - name: Update apt cache.
-      apt: update_cache=yes cache_valid_time=86400
+      apt: update_cache=yes cache_valid_time=600
       when: ansible_os_family == 'Debian'
+      changed_when: false
 
     - name: Install dependencies.
-      package: name=curl
+      package: name=curl state=present
 
   roles:
     - role_under_test

From f3e06fd9bb302f875b42183902a6cfbfc2fa8e11 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 3 Jun 2017 20:50:12 -0500
Subject: [PATCH 0827/1273] Fixes #1399: Fix non-English Drupal reinstalls on
 provision.

---
 provisioning/requirements.yml                               | 2 +-
 .../roles/geerlingguy.drupal/tasks/install-site.yml         | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 2a2efb739..960dfc70e 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -18,7 +18,7 @@
 - src: geerlingguy.daemonize
   version: 1.1.1
 - src: geerlingguy.drupal
-  version: 2.2.1
+  version: 2.2.2
 - src: geerlingguy.drupal-console
   version: 1.1.0
 - src: geerlingguy.drush
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/install-site.yml b/provisioning/roles/geerlingguy.drupal/tasks/install-site.yml
index f695f8d17..1d7548d79 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/install-site.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/install-site.yml
@@ -11,7 +11,7 @@
 # See: https://www.drupal.org/node/2569365#comment-11680807
 - name: Configure database correctly if using PostgreSQL.
   command: psql -c "ALTER DATABASE {{ drupal_db_name }} SET bytea_output = 'escape';"
-  when: "('Successful' not in drupal_site_installed.stdout) and (drupal_db_backend == 'pgsql')"
+  when: "('Drupal bootstrap' not in drupal_site_installed.stdout) and (drupal_db_backend == 'pgsql')"
   become: yes
   become_user: "{{ postgresql_user }}"
   # See: https://github.com/ansible/ansible/issues/16048#issuecomment-229012509
@@ -30,7 +30,7 @@
   args:
     chdir: "{{ drupal_core_path }}"
   notify: clear opcache
-  when: "'Successful' not in drupal_site_installed.stdout"
+  when: "'Drupal bootstrap' not in drupal_site_installed.stdout"
   become: no
 
 - name: Install configured modules with drush.
@@ -39,5 +39,5 @@
     --root={{ drupal_core_path }}
   args:
     chdir: "{{ drupal_core_path }}"
-  when: ('Successful' not in drupal_site_installed.stdout) and drupal_enable_modules
+  when: ('Drupal bootstrap' not in drupal_site_installed.stdout) and drupal_enable_modules
   become: no

From 096b0766bd0e4340363b622b16418500457179bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Mon, 5 Jun 2017 21:55:18 -0500
Subject: [PATCH 0828/1273] Issue #1411: Fix gitignore applying rules to files
 in subdirectories

---
 .gitignore | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5ab7e0e8f..8cddce875 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,14 +16,11 @@ vagrant_ansible_inventory_default
 
 # Drupal VM specific files.
 local.config.yml
-config.yml
-docker-compose.yml
-drupal.make.yml
 Vagrantfile.local
-examples/prod/inventory
-examples/prod/bootstrap/vars.yml
-scripts/
-drupal/
-
-# Some roles include 'config.yml' files.
-!provisioning/roles/**/config.yml
+/config.yml
+/docker-compose.yml
+/drupal.make.yml
+/examples/prod/inventory
+/examples/prod/bootstrap/vars.yml
+/scripts/
+/drupal/

From a823f47bd024896adbb3ba062437b7cf3a3bdb13 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 7 Jun 2017 17:31:17 -0500
Subject: [PATCH 0829/1273] Update to latest version of Nginx role.

---
 provisioning/requirements.yml                           | 2 +-
 provisioning/roles/geerlingguy.nginx/templates/vhost.j2 | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 960dfc70e..aae187631 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -38,7 +38,7 @@
 - src: geerlingguy.mysql
   version: 2.7.2
 - src: geerlingguy.nginx
-  version: 2.3.0
+  version: 2.3.1
 - src: geerlingguy.nodejs
   version: 4.1.1
 - src: geerlingguy.php
diff --git a/provisioning/roles/geerlingguy.nginx/templates/vhost.j2 b/provisioning/roles/geerlingguy.nginx/templates/vhost.j2
index 40beceda2..0feb60299 100644
--- a/provisioning/roles/geerlingguy.nginx/templates/vhost.j2
+++ b/provisioning/roles/geerlingguy.nginx/templates/vhost.j2
@@ -1,5 +1,6 @@
 {% block server_redirect %}
 {% if item.server_name_redirect is defined %}
+server {
     listen       {{ item.listen | default('80') }};
     server_name  {{ item.server_name_redirect }};
     return       301 $scheme://{{ item.server_name.split(' ')[0] }}$request_uri;

From 7ad6ebf449bb0f9c464687ae62608a319ae21406 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 8 Jun 2017 21:25:56 -0500
Subject: [PATCH 0830/1273] Issue #1418: Allow default distribution php
 packages to be used.

---
 provisioning/playbook.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 3f58303bd..475b6c8f6 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -40,7 +40,7 @@
     - { role: geerlingguy.apache, when: drupalvm_webserver == 'apache', tags: ['webserver']}
     - { role: geerlingguy.apache-php-fpm, when: drupalvm_webserver == 'apache', tags: ['webserver'] }
     - { role: geerlingguy.nginx, when: drupalvm_webserver == 'nginx', tags: ['webserver'] }
-    - { role: geerlingguy.php-versions, tags: ['php', 'xdebug', 'database'] }
+    - { role: geerlingguy.php-versions, when: php_version != '', tags: ['php', 'xdebug', 'database'] }
     - { role: geerlingguy.php, tags: ['php'] }
     - { role: geerlingguy.php-pecl, tags: ['php'] }
     - { role: geerlingguy.composer }

From 91962459c5758984093b9e70a2b1337e68a64d70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Thu, 8 Jun 2017 22:03:30 -0500
Subject: [PATCH 0831/1273] Add docs on how to use default distribution php
 packages

---
 docs/configurations/php.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/configurations/php.md b/docs/configurations/php.md
index 4bbe9d7e8..38b8a2c76 100644
--- a/docs/configurations/php.md
+++ b/docs/configurations/php.md
@@ -14,3 +14,9 @@ Remi's RPM repository is included with Drupal VM, and you can make the following
 
   1. Make sure you've followed the directions for switching to CentOS 7 in the [use a different base OS](base-os.md) guide.
   2. Change `php_version` inside `config.yml` to `"5.6"` or `"7.0"`.
+
+## Using default distribution packages
+
+If you want parity with your production environment and wish to install the default distribution packages, set `php_version: ''` inside your `config.yml` to avoid adding Remi's or Ondřej's repositories. Doing this will use the default packages set in the [`geerlingguy.php`](https://github.com/geerlingguy/ansible-role-php) Ansible role.
+
+_Note: If you're using a base OS with a PHP version older than what's assumed in the `geerlingguy.php` role, you will also need to override some of the default variables set by that role in your `config.yml`. See the [`geerlingguy.php` Ansible role's README](https://github.com/geerlingguy/ansible-role-php-#readme) for more information._

From d0e9b086f4bed335f80fa8f5b0e287921233f863 Mon Sep 17 00:00:00 2001
From: Eelke Blok <eelke@blokspeed.net>
Date: Fri, 9 Jun 2017 10:00:00 +0200
Subject: [PATCH 0832/1273] Update comment in Solr post-provisioning script

Still says it is set up for D7, but is set up for D8.
---
 examples/scripts/configure-solr.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/scripts/configure-solr.sh b/examples/scripts/configure-solr.sh
index 5c65b8d10..b66bb3a7c 100755
--- a/examples/scripts/configure-solr.sh
+++ b/examples/scripts/configure-solr.sh
@@ -4,7 +4,7 @@
 #
 # This script configures the default Apache Solr search core to use one of the
 # Drupal Solr module's configurations. This shell script presumes you have
-# `solr` in the `installed_extras`, and is currently set up for the D7 versions
+# `solr` in the `installed_extras`, and is currently set up for the D8 versions
 # of Apache Solr Search or Search API Solr.
 
 SOLR_CORE_NAME="d8"

From 0401bf722f57781ff9427ffed8e23d3aa4e74e6e Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 13 Jun 2017 08:17:59 -0500
Subject: [PATCH 0833/1273] Fixes #1423: Document using Drupal VM for quick
 module dev or demo environments.

---
 Dockerfile                             |  5 +++-
 docs/other/docker.md                   | 41 ++++++++++++++++++++++++--
 provisioning/docker/bin/install-drupal | 33 +++++++++++++++++++++
 3 files changed, 75 insertions(+), 4 deletions(-)
 create mode 100755 provisioning/docker/bin/install-drupal

diff --git a/Dockerfile b/Dockerfile
index ad11f659c..9852d72ed 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,10 @@
 FROM geerlingguy/docker-debian8-ansible:latest
 MAINTAINER Jeff Geerling
 
-# Copy provisioning directory and vars files into container.
+# Copy provisioning directory, variable overrides, and scripts into container.
 COPY ./ /etc/ansible/drupal-vm
 COPY ./provisioning/docker/vars/docker-hub-overrides.yml /etc/ansible/drupal-vm/local.config.yml
+COPY ./provisioning/docker/bin/* /usr/local/bin
 
 # Provision Drupal VM inside Docker.
 RUN ansible-playbook /etc/ansible/drupal-vm/provisioning/playbook.yml \
@@ -11,3 +12,5 @@ RUN ansible-playbook /etc/ansible/drupal-vm/provisioning/playbook.yml \
   && systemctl enable php7.1-fpm.service
 
 EXPOSE 80 443 3306 8025
+
+CMD ["/lib/systemd/systemd"]
diff --git a/docs/other/docker.md b/docs/other/docker.md
index 1491bd058..6b7126c84 100644
--- a/docs/other/docker.md
+++ b/docs/other/docker.md
@@ -1,6 +1,7 @@
 Drupal VM can be used with [Docker](https://www.docker.com) instead of or in addition to Vagrant:
 
-  - You can build a local instance using Docker, pulling the official [`geerlingguy/drupal-vm`](https://hub.docker.com/r/geerlingguy/drupal-vm/) image.
+  - You can quickly install a Drupal site (any version) using the official [`geerlingguy/drupal-vm`](https://hub.docker.com/r/geerlingguy/drupal-vm/) image.
+  - You can build a customized local instance using Docker, pulling the official [`geerlingguy/drupal-vm`](https://hub.docker.com/r/geerlingguy/drupal-vm/) image.
   - You can 'bake your own' customized Drupal VM Docker image and reuse it or share it with your team.
 
 > **Docker support is currently experimental**, so unless you're already familiar with Docker, it might be best to wait until later versions of Drupal VM are released with more stable support.
@@ -21,7 +22,41 @@ You can also add other subdomains if you're using other built-in services, e.g.
 >
 > Note that you'll have to create the alias again after restarting your computer. See [this Docker (moby) issue](https://github.com/moby/moby/issues/22753#issuecomment-246054946) for more details.
 
-## Method 1: Build a default Drupal VM instance with Docker
+## Method 1: Get a quick Drupal site installed with Drupal VM's Docker image
+
+If you just want a quick, easy Drupal site for testing, you can run an instance of Drupal VM and install Drupal inside using the provided script.
+
+  1. Run an instance of Drupal VM: `docker run -d -p 80:80 -p 443:443 --name=drupalvm --privileged dvmtest`
+  2. Install Drupal on this instance: `docker exec drupalvm install-drupal` (you can choose a version using `install-drupal [version]`, using versions like `8.4.x`, `7.55`, `7.x`, etc.).
+
+You should be able to access the Drupal site at `http://localhost`. If you need to share a host directory into the VM, you can do so by adding another `-v` parameter, like `-v /path/on/host:/path/in/container.
+
+If you only need a simple container to run your site, and you want to package up the container configuration with your project, you can add a simple Docker Compose file to your project's docroot like the following:
+
+    ```yaml
+    version: "3"
+    
+    services:
+    
+      myproject:
+        image: geerlingguy/drupal-vm
+        container_name: myproject
+        ports:
+          - 80:80
+          - 443:443
+        privileged: true
+        volumes:
+          - ./:/var/www/drupalvm/drupal/web/:rw,delegated
+        command: /lib/systemd/systemd
+    ```
+
+Then, run `docker-compose up -d` to bring up the container.
+
+For an example use of the simple approach for a contributed module's local development environment, see the Honeypot module, where this approach was added in [Add local test environment configuration](https://www.drupal.org/node/2885488).
+
+If you need more flexibility, though, you use one of the other Docker container methods on this page.
+
+## Method 2: Build a default Drupal VM instance with Docker
 
 The [`geerlingguy/drupal-vm`](https://hub.docker.com/r/geerlingguy/drupal-vm/) image on Docker Hub contains a pre-built copy of Drupal VM, with all the latest Drupal VM defaults. If you need to quickly run your site in a container, or don't need to customize any of the components of Drupal VM, you can use this image.
 
@@ -71,7 +106,7 @@ Currently, the easiest way to use Drupal VM's `drush` inside a Docker container
 
     docker exec drupal-vm bash -c "drush --uri=drupalvm.dev --root=/var/www/drupalvm/drupal/web status"
 
-## Method 2: 'Bake and Share' a custom Drupal VM Docker image
+## Method 3: 'Bake and Share' a custom Drupal VM Docker image
 
 If you need a more customized Drupal VM instance, it's best to build your own with Drupal VM's built-in Docker scripts.
 
diff --git a/provisioning/docker/bin/install-drupal b/provisioning/docker/bin/install-drupal
new file mode 100755
index 000000000..f20fb1202
--- /dev/null
+++ b/provisioning/docker/bin/install-drupal
@@ -0,0 +1,33 @@
+#!/bin/bash
+#
+# Install a Drupal site with Drush.
+#
+# Usage:
+#   install-drupal [version]
+# [version] is optional, defaults to 8.3.x. Try 7.x, 7.55, 8.4.x, 8.3.2, etc.
+
+# Exit on any individual command failure.
+set -e
+
+# Setup.
+DRUPAL_VERSION="${1:-8.3.x}"
+PROJECT_PATH='/var/www/drupalvm/drupal'
+
+# Create Drupal project directory.
+mkdir -p $PROJECT_PATH
+
+# Download Drupal with Drush.
+echo "Downloading Drupal $DRUPAL_VERSION"
+drush dl drupal-$DRUPAL_VERSION \
+  --destination=$PROJECT_PATH \
+  --drupal-project-rename=web
+
+# Install Drupal with Drush.
+echo "Installing Drupal"
+drush si standard --root=$PROJECT_PATH/web -y \
+  --db-url='mysql://drupal:drupal@127.0.0.1/drupal' \
+  --site-name='Drupal VM' \
+  --account-name=admin --account-pass=admin
+
+# Set appropriate permissions.
+chown -R www-data:www-data $PROJECT_PATH

From c932c16210338747d9d140f17b9ec0d16d73b5c9 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 13 Jun 2017 16:25:17 -0500
Subject: [PATCH 0834/1273] Update Nginx role to latest version.

---
 provisioning/requirements.yml                          | 2 +-
 provisioning/roles/geerlingguy.nginx/README.md         | 4 ++--
 provisioning/roles/geerlingguy.nginx/defaults/main.yml | 2 +-
 provisioning/roles/geerlingguy.nginx/meta/main.yml     | 3 +++
 provisioning/roles/geerlingguy.nginx/tasks/main.yml    | 3 +++
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index aae187631..aa2b680ab 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -38,7 +38,7 @@
 - src: geerlingguy.mysql
   version: 2.7.2
 - src: geerlingguy.nginx
-  version: 2.3.1
+  version: 2.3.2
 - src: geerlingguy.nodejs
   version: 4.1.1
 - src: geerlingguy.php
diff --git a/provisioning/roles/geerlingguy.nginx/README.md b/provisioning/roles/geerlingguy.nginx/README.md
index 5a5f66832..9e4edb327 100644
--- a/provisioning/roles/geerlingguy.nginx/README.md
+++ b/provisioning/roles/geerlingguy.nginx/README.md
@@ -2,9 +2,9 @@
 
 [![Build Status](https://travis-ci.org/geerlingguy/ansible-role-nginx.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-nginx)
 
-Installs Nginx on RedHat/CentOS or Debian/Ubuntu Linux, FreeBSD or OpenBSD servers.
+Installs Nginx on RedHat/CentOS, Debian/Ubuntu, Archlinux, FreeBSD or OpenBSD servers.
 
-This role installs and configures the latest version of Nginx from the Nginx yum repository (on RedHat-based systems) or via apt (on Debian-based systems) or pkgng (on FreeBSD systems) or pkg_add (on OpenBSD systems). You will likely need to do extra setup work after this role has installed Nginx, like adding your own [virtualhost].conf file inside `/etc/nginx/conf.d/`, describing the location and options to use for your particular website.
+This role installs and configures the latest version of Nginx from the Nginx yum repository (on RedHat-based systems), apt (on Debian-based systems), pacman (Archlinux), pkgng (on FreeBSD systems) or pkg_add (on OpenBSD systems). You will likely need to do extra setup work after this role has installed Nginx, like adding your own [virtualhost].conf file inside `/etc/nginx/conf.d/`, describing the location and options to use for your particular website.
 
 ## Requirements
 
diff --git a/provisioning/roles/geerlingguy.nginx/defaults/main.yml b/provisioning/roles/geerlingguy.nginx/defaults/main.yml
index b21140b10..38aa3daf6 100644
--- a/provisioning/roles/geerlingguy.nginx/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.nginx/defaults/main.yml
@@ -9,7 +9,7 @@ nginx_yum_repo_enabled: true
 nginx_ppa_use: false
 nginx_ppa_version: stable
 
-# The name of the nginx apt/yum package to install.
+# The name of the nginx package to install.
 nginx_package_name: "nginx"
 
 nginx_conf_template: "nginx.conf.j2"
diff --git a/provisioning/roles/geerlingguy.nginx/meta/main.yml b/provisioning/roles/geerlingguy.nginx/meta/main.yml
index a7f79fc95..94188770a 100644
--- a/provisioning/roles/geerlingguy.nginx/meta/main.yml
+++ b/provisioning/roles/geerlingguy.nginx/meta/main.yml
@@ -18,6 +18,9 @@ galaxy_info:
     - name: Ubuntu
       versions:
       - all
+    - name: Archlinux
+      versions:
+      - all
     - name: FreeBSD
       versions:
       - 10.3
diff --git a/provisioning/roles/geerlingguy.nginx/tasks/main.yml b/provisioning/roles/geerlingguy.nginx/tasks/main.yml
index 74ca563e9..4ee901a41 100644
--- a/provisioning/roles/geerlingguy.nginx/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.nginx/tasks/main.yml
@@ -24,6 +24,9 @@
 - include: setup-OpenBSD.yml
   when: ansible_os_family == 'OpenBSD'
 
+- include: setup-Archlinux.yml
+  when: ansible_os_family == 'Archlinux'
+
 # Vhost configuration.
 - include: vhosts.yml
 

From 45a0ae1bb7ac5f2124958340ece517a768a9ead7 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 13 Jun 2017 16:27:41 -0500
Subject: [PATCH 0835/1273] Update Redis role to latest version, fix Nginx
 update.

---
 provisioning/requirements.yml                            | 2 +-
 .../roles/geerlingguy.nginx/tasks/setup-Archlinux.yml    | 5 +++++
 provisioning/roles/geerlingguy.nginx/vars/Archlinux.yml  | 9 +++++++++
 provisioning/roles/geerlingguy.redis/meta/main.yml       | 3 +++
 provisioning/roles/geerlingguy.redis/tasks/main.yml      | 3 +++
 .../roles/geerlingguy.redis/tasks/setup-Archlinux.yml    | 5 +++++
 provisioning/roles/geerlingguy.redis/vars/Archlinux.yml  | 4 ++++
 7 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 provisioning/roles/geerlingguy.nginx/tasks/setup-Archlinux.yml
 create mode 100644 provisioning/roles/geerlingguy.nginx/vars/Archlinux.yml
 create mode 100644 provisioning/roles/geerlingguy.redis/tasks/setup-Archlinux.yml
 create mode 100644 provisioning/roles/geerlingguy.redis/vars/Archlinux.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index aa2b680ab..1da1cd151 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -68,7 +68,7 @@
 - src: geerlingguy.postgresql
   version: 1.3.0
 - src: geerlingguy.redis
-  version: 1.5.0
+  version: 1.5.1
 - src: geerlingguy.repo-remi
   version: 1.2.0
 - src: geerlingguy.ruby
diff --git a/provisioning/roles/geerlingguy.nginx/tasks/setup-Archlinux.yml b/provisioning/roles/geerlingguy.nginx/tasks/setup-Archlinux.yml
new file mode 100644
index 000000000..2aa89ec9b
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nginx/tasks/setup-Archlinux.yml
@@ -0,0 +1,5 @@
+---
+- name: Ensure nginx is installed.
+  pacman:
+    name: "{{ nginx_package_name }}"
+    state: installed
diff --git a/provisioning/roles/geerlingguy.nginx/vars/Archlinux.yml b/provisioning/roles/geerlingguy.nginx/vars/Archlinux.yml
new file mode 100644
index 000000000..593e100f1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nginx/vars/Archlinux.yml
@@ -0,0 +1,9 @@
+---
+root_group: root
+nginx_conf_path: /etc/nginx/conf.d
+nginx_conf_file_path: /etc/nginx/nginx.conf
+nginx_mime_file_path: /etc/nginx/mime.types
+nginx_pidfile: /run/nginx.pid
+nginx_vhost_path: /etc/nginx/sites-enabled
+nginx_default_vhost_path: /etc/nginx/sites-enabled/default
+__nginx_user: "http"
diff --git a/provisioning/roles/geerlingguy.redis/meta/main.yml b/provisioning/roles/geerlingguy.redis/meta/main.yml
index 4f527bcfd..d4f114176 100644
--- a/provisioning/roles/geerlingguy.redis/meta/main.yml
+++ b/provisioning/roles/geerlingguy.redis/meta/main.yml
@@ -21,6 +21,9 @@ galaxy_info:
     - name: Ubuntu
       versions:
       - all
+    - name: Archlinux
+      versions:
+      - all
   galaxy_tags:
     - database
     - development
diff --git a/provisioning/roles/geerlingguy.redis/tasks/main.yml b/provisioning/roles/geerlingguy.redis/tasks/main.yml
index 22805260b..cb8114a9f 100644
--- a/provisioning/roles/geerlingguy.redis/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.redis/tasks/main.yml
@@ -15,6 +15,9 @@
 - include: setup-Debian.yml
   when: ansible_os_family == 'Debian'
 
+- include: setup-Archlinux.yml
+  when: ansible_os_family == 'Archlinux'
+
 - name: Ensure Redis is configured.
   template:
     src: redis.conf.j2
diff --git a/provisioning/roles/geerlingguy.redis/tasks/setup-Archlinux.yml b/provisioning/roles/geerlingguy.redis/tasks/setup-Archlinux.yml
new file mode 100644
index 000000000..d75d0e558
--- /dev/null
+++ b/provisioning/roles/geerlingguy.redis/tasks/setup-Archlinux.yml
@@ -0,0 +1,5 @@
+---
+- name: Ensure Redis is installed.
+  pacman:
+    name: "{{ redis_package }}"
+    state: present
diff --git a/provisioning/roles/geerlingguy.redis/vars/Archlinux.yml b/provisioning/roles/geerlingguy.redis/vars/Archlinux.yml
new file mode 100644
index 000000000..4aba21366
--- /dev/null
+++ b/provisioning/roles/geerlingguy.redis/vars/Archlinux.yml
@@ -0,0 +1,4 @@
+---
+__redis_package: redis
+redis_daemon: redis
+redis_conf_path: /etc/redis.conf

From e612dfe848db40e73064fcd2fb1eab9fa930c371 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <m@oxy.fi>
Date: Mon, 19 Jun 2017 13:26:17 -0500
Subject: [PATCH 0836/1273] Issue #1437: Add support for list of paths in
 pre/post_provision_tasks_dir

---
 provisioning/playbook.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 475b6c8f6..65a2465c8 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -25,8 +25,7 @@
       include: "{{ outer_item }}"
       loop_control:
         loop_var: outer_item
-      with_fileglob:
-        - "{{ pre_provision_tasks_dir|default(omit) }}"
+      with_fileglob: "{{ pre_provision_tasks_dir|default(omit) }}"
 
     - include: tasks/php.yml
 
@@ -128,5 +127,4 @@
       include: "{{ outer_item }}"
       loop_control:
         loop_var: outer_item
-      with_fileglob:
-        - "{{ post_provision_tasks_dir|default(omit) }}"
+      with_fileglob: "{{ post_provision_tasks_dir|default(omit) }}"

From b3bc553384d6262a497e06ea15c5a71302f0fd30 Mon Sep 17 00:00:00 2001
From: Dmytro Danylevskyi <dmytro@danylevskyi.com>
Date: Fri, 23 Jun 2017 07:18:16 +0300
Subject: [PATCH 0837/1273] Fix outdated comment for drupal_install_site
 variable

---
 default.config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.config.yml b/default.config.yml
index 17795a692..6889b7428 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -82,7 +82,7 @@ drupal_db_user: drupal
 drupal_db_password: drupal
 drupal_db_name: drupal
 
-# Settings for installing a Drupal site if 'install_site:' is 'true'.
+# Settings for installing a Drupal site if 'drupal_install_site:' is 'true'.
 drupal_major_version: 8
 drupal_domain: "{{ vagrant_hostname }}"
 drupal_site_name: "Drupal"

From 2ae7c352b96c3c940c0cb9c0dbc1e7517c0735b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <m@oxy.fi>
Date: Fri, 23 Jun 2017 19:16:14 -0500
Subject: [PATCH 0838/1273] Issue #1424: Add support for RFC 5785 with nginx

---
 provisioning/templates/nginx-vhost.conf.j2 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/provisioning/templates/nginx-vhost.conf.j2 b/provisioning/templates/nginx-vhost.conf.j2
index b8bab48cf..23562a25e 100644
--- a/provisioning/templates/nginx-vhost.conf.j2
+++ b/provisioning/templates/nginx-vhost.conf.j2
@@ -39,6 +39,10 @@ server {
         deny all;
         return 404;
     }
+    # Allow "Well-Known URIs" as per RFC 5785
+    location ~* ^/.well-known/ {
+        allow all;
+    }
     location ~ (^|/)\. {
         return 403;
     }

From db692df1dbc22687b047656479897f3279ebe132 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <m@oxy.fi>
Date: Sat, 24 Jun 2017 19:49:18 -0500
Subject: [PATCH 0839/1273] Issue #1443: Add an IRC badge linking to Riot room

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

diff --git a/README.md b/README.md
index db586e384..585ae2b8a 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ![Drupal VM Logo](https://raw.githubusercontent.com/geerlingguy/drupal-vm/master/docs/images/drupal-vm-logo.png)
 
-[![Build Status](https://travis-ci.org/geerlingguy/drupal-vm.svg?branch=master)](https://travis-ci.org/geerlingguy/drupal-vm) [![Documentation Status](https://readthedocs.org/projects/drupal-vm/badge/?version=latest)](http://docs.drupalvm.com) [![Packagist](https://img.shields.io/packagist/v/geerlingguy/drupal-vm.svg)](https://packagist.org/packages/geerlingguy/drupal-vm) [![Docker Automated build](https://img.shields.io/docker/automated/geerlingguy/drupal-vm.svg?maxAge=2592000)](https://hub.docker.com/r/geerlingguy/drupal-vm/) [![](https://images.microbadger.com/badges/image/geerlingguy/drupal-vm.svg)](https://microbadger.com/images/geerlingguy/drupal-vm "Get your own image badge on microbadger.com")
+[![Build Status](https://travis-ci.org/geerlingguy/drupal-vm.svg?branch=master)](https://travis-ci.org/geerlingguy/drupal-vm) [![Documentation Status](https://readthedocs.org/projects/drupal-vm/badge/?version=latest)](http://docs.drupalvm.com) [![Packagist](https://img.shields.io/packagist/v/geerlingguy/drupal-vm.svg)](https://packagist.org/packages/geerlingguy/drupal-vm) [![Docker Automated build](https://img.shields.io/docker/automated/geerlingguy/drupal-vm.svg?maxAge=2592000)](https://hub.docker.com/r/geerlingguy/drupal-vm/) [![](https://images.microbadger.com/badges/image/geerlingguy/drupal-vm.svg)](https://microbadger.com/images/geerlingguy/drupal-vm "Get your own image badge on microbadger.com") [![irc://irc.freenode.net/drupal-vm](https://img.shields.io/badge/irc.freenode.net-%23drupal--vm-brightgreen.svg)](https://riot.im/app/#/room/#drupal-vm:matrix.org)
 
 [Drupal VM](https://www.drupalvm.com/) is A VM for Drupal, built with Ansible.
 

From bdee554a3e34d7adfc5c57121d9c3166b38e2422 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 24 Jun 2017 21:52:30 -0500
Subject: [PATCH 0840/1273] Fixes #1388, Fixes #1389: Update documentation
 reflecting Docker Compose defaults.

---
 Dockerfile                 |  2 +-
 docs/other/docker.md       | 11 +++++------
 example.docker-compose.yml |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ad11f659c..2013951af 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 FROM geerlingguy/docker-debian8-ansible:latest
-MAINTAINER Jeff Geerling
+LABEL maintainer="Jeff Geerling"
 
 # Copy provisioning directory and vars files into container.
 COPY ./ /etc/ansible/drupal-vm
diff --git a/docs/other/docker.md b/docs/other/docker.md
index 1491bd058..b5a705a2b 100644
--- a/docs/other/docker.md
+++ b/docs/other/docker.md
@@ -29,24 +29,23 @@ The [`geerlingguy/drupal-vm`](https://hub.docker.com/r/geerlingguy/drupal-vm/) i
 
 ### (Optional) Add a `Dockerfile` for customization
 
-If you need to make small changes to the official `drupal-vm` image (instead of baking your own fully-custom image), you can create a `Dockerfile` to make those changes. In one site's example, ImageMagick was required for some media handling functionality, and so the following `Dockerfile` was places in the project's root directory (alongside the `docker-compose.yml` file):
+If you need to make small changes to the official `drupal-vm` image (instead of baking your own fully-custom image), you can create a `Dockerfile` to make those changes. In one site's example, ImageMagick was required for some media handling functionality, and so the following `Dockerfile` was placed in the project's root directory (alongside the `docker-compose.yml` file):
 
     FROM geerlingguy/drupal-vm:latest
-    MAINTAINER Jeff Geerling
+    LABEL maintainer="Jeff Geerling"
     
     # Install imagemagick.
     RUN apt-get install -y imagemagick
     
     EXPOSE 80 443 3306 8025
 
-You can customize the official image in many other ways, but if you end up doing more than a step or two in a `Dockerfile`, it's probably a better idea to 'bake you own' Drupal VM Docker image.
+You can customize the official image in many other ways, but if you end up doing more than a step or two in a `Dockerfile`, it's probably a better idea to 'bake your own' Drupal VM Docker image.
 
 ### Add a `docker-compose.yml` file
 
 Copy the `example.docker-compose.yml` file out of Drupal VM (or grab a copy from GitHub [here](https://github.com/geerlingguy/drupal-vm/blob/master/example.docker-compose.yml)), rename it `docker-compose.yml`, and place it in your project root.
 
   - _If you are using your own `Dockerfile` to further customize Drupal VM_, comment out the `image: drupal-vm` line, and uncomment the `build: .` line (this tells Docker Compose to build a new image based on your own `Dockerfile`).
-  - _If you're not using your own `Dockerfile`_, change the `image` line to: `image: geerlingguy/drupal-vm`.
 
 For the `volume:` definition in `docker-compose.yml`, Drupal VM's default docroot is `/var/www/drupalvm/drupal/web`, which follows the convention of a typical Drupal project built with Composer. If you don't get your site when you attempt to access Drupal VM, you will either need to modify the `volume:` definition to match your project's structure, or use a custom `Dockerfile` and copy in a customized Apache `vhosts.conf` file.
 
@@ -95,7 +94,7 @@ localhost                  : ok=210  changed=94   unreachable=0    failed=0
 Visit the Drupal VM dashboard: http://192.168.88.88:80
 ```
 
-Once the build is complete, you could view the dashboard by visiting the URL provided.
+Once the build is complete, you can view the dashboard by visiting the URL provided.
 
 ### Saving the Docker container to an image
 
@@ -119,7 +118,7 @@ On someone else's computer (or your own, if you have deleted the existing `drupa
 
 ### Using a baked Drupal VM image with `docker-compose.yml`
 
-Drupal VM includes an `example.docker-compose.yml` file. To use the file, copy it to `docker-compose.yml` and customize as you see fit. Once you've configured the exposed ports and settings as you like, run the following command to bring up the network and container(s) according to the compose file:
+Drupal VM includes an `example.docker-compose.yml` file. To use the file, copy it to `docker-compose.yml` and customize as you see fit, making sure to change the `image` to the value of `docker_image_name` (the default is `drupal-vm`). Once you've configured the exposed ports and settings as you like, run the following command to bring up the network and container(s) according to the compose file:
 
     docker-compose up -d
 
diff --git a/example.docker-compose.yml b/example.docker-compose.yml
index 3bf17b83d..dfd9d42e0 100644
--- a/example.docker-compose.yml
+++ b/example.docker-compose.yml
@@ -4,7 +4,7 @@ services:
 
   drupal-vm:
 
-    # Switch the image to `geerlingguy/drupal-vm` to use Drupal VM defaults.
+    # If using a custom baked image, change the name below to your image's name.
     image: geerlingguy/drupal-vm
     # Comment out 'image' and uncomment the line below if customizing Drupal VM
     # with a project-specific Dockerfile in the same directory as this file.

From eb81ee2aa3302f48b396dedf9dab4d900a05041f Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 27 Jun 2017 22:18:28 -0500
Subject: [PATCH 0841/1273] Fixes #1431: Better documentation examples for the
 composer docker-bake command.

---
 docs/other/docker.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/other/docker.md b/docs/other/docker.md
index 285288ac0..776024917 100644
--- a/docs/other/docker.md
+++ b/docs/other/docker.md
@@ -113,9 +113,11 @@ If you need a more customized Drupal VM instance, it's best to build your own wi
 
 After you've configured your Drupal VM settings in `config.yml` and other configuration files, run the following command to create and provision a new Docker container:
 
-    [OPTIONS] composer docker-bake
+    composer docker-bake
 
-Look at the variables defined in the `provisioning/docker/bake.sh` file for all the currently-available options (e.g. `DRUPALVM_IP_ADDRESS`, `DISTRO`, etc.). You can use Drupal VM's defaults by running the `composer docker-bake` command without any options.
+This will bake a Docker images using Drupal VM's default settings for distro, IP address, hostname, etc. You can override these options (all are listed in the `provisioning/docker/bake.sh` file) by prepending them to the `composer` command:
+
+    DRUPALVM_IP_ADDRESS='192.168.88.9' DISTRO='debian9' composer docker-bake
 
 This process can take some time (it should take a similar amount of time as it takes to build Drupal VM normally, using Vagrant and VirtualBox), and at the end, you should see a message like:
 

From 277a143e41ad23913db16c76dd4f1eb46c71cb06 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 27 Jun 2017 23:13:07 -0500
Subject: [PATCH 0842/1273] Issue #1451: Use 192.168.89.89 for default Docker
 Drupal VM IP.

---
 docs/other/docker.md        | 15 ++++++++-------
 example.docker-compose.yml  |  6 +++---
 provisioning/docker/bake.sh |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/docs/other/docker.md b/docs/other/docker.md
index 776024917..dee9e231a 100644
--- a/docs/other/docker.md
+++ b/docs/other/docker.md
@@ -10,7 +10,7 @@ Drupal VM can be used with [Docker](https://www.docker.com) instead of or in add
 
 Before using Docker to run Drupal VM, you should [edit your hosts file](https://support.rackspace.com/how-to/modify-your-hosts-file/) and add the following line:
 
-    192.168.88.88  drupalvm.dev
+    192.168.89.89  drupalvm.dev
 
 (Substitute the IP address and domain name you'd like to use to access your Drupal VM container.)
 
@@ -18,9 +18,10 @@ You can also add other subdomains if you're using other built-in services, e.g.
 
 > If you're using Docker for Mac, you need to perform one additional step to ensure you can access Drupal VM using a unique IP address:
 >
->   1. Add an alias IP address on the loopback interface: `sudo ifconfig lo0 alias 192.168.88.88/24`
+>   1. Add an alias IP address on the loopback interface: `sudo ifconfig lo0 alias 192.168.89.89/24`
+>   2. When you're finished using the container, delete the alias: `sudo ifconfig lo0 -alias 192.168.89.89` (or restart your Mac).
 >
-> Note that you'll have to create the alias again after restarting your computer. See [this Docker (moby) issue](https://github.com/moby/moby/issues/22753#issuecomment-246054946) for more details.
+> You'll have to create the alias again after restarting your Mac. See [this Docker (moby) issue](https://github.com/moby/moby/issues/22753#issuecomment-246054946) for more details.
 
 ## Method 1: Get a quick Drupal site installed with Drupal VM's Docker image
 
@@ -90,10 +91,10 @@ Run the command `docker-compose up -d` (the `-d` tells `docker-compose` to start
 
 This command takes the instructions in the Docker Compose file and does two things:
 
-  1. Creates a custom Docker network that exposes Drupal VM on the IP address you have configured in `docker-compose.yml` (by default, `192.168.88.88`).
+  1. Creates a custom Docker network that exposes Drupal VM on the IP address you have configured in `docker-compose.yml` (by default, `192.168.89.89`).
   2. Runs Drupal VM using the configuration in `docker-compose.yml`.
 
-After the Drupal VM container is running, you should be able to see the Dashboard page at the VM's IP address (e.g. `http://192.168.88.88`), and you should be able to access your site at the hostname you have configured in your hosts file (e.g. `http://drupalvm.dev/`).
+After the Drupal VM container is running, you should be able to see the Dashboard page at the VM's IP address (e.g. `http://192.168.89.89`), and you should be able to access your site at the hostname you have configured in your hosts file (e.g. `http://drupalvm.dev/`).
 
 > Note: If you see Drupal's installer appear when accessing the site, that means the codebase was found, but either the database connection details are not in your local site configuration, or they are, but you don't have the default database populated yet. You may need to load in the database either via `drush sql-sync` or by importing a dump into the container. The default credentials are `drupal` and `drupal` for username and password, and `drupal` for the database name.
 
@@ -117,7 +118,7 @@ After you've configured your Drupal VM settings in `config.yml` and other config
 
 This will bake a Docker images using Drupal VM's default settings for distro, IP address, hostname, etc. You can override these options (all are listed in the `provisioning/docker/bake.sh` file) by prepending them to the `composer` command:
 
-    DRUPALVM_IP_ADDRESS='192.168.88.9' DISTRO='debian9' composer docker-bake
+    DRUPALVM_IP_ADDRESS='192.168.89.90' DISTRO='debian9' composer docker-bake
 
 This process can take some time (it should take a similar amount of time as it takes to build Drupal VM normally, using Vagrant and VirtualBox), and at the end, you should see a message like:
 
@@ -128,7 +129,7 @@ localhost                  : ok=210  changed=94   unreachable=0    failed=0
 
 ...done!
 
-Visit the Drupal VM dashboard: http://192.168.88.88:80
+Visit the Drupal VM dashboard: http://192.168.89.89:80
 ```
 
 Once the build is complete, you can view the dashboard by visiting the URL provided.
diff --git a/example.docker-compose.yml b/example.docker-compose.yml
index dfd9d42e0..f856fe55c 100644
--- a/example.docker-compose.yml
+++ b/example.docker-compose.yml
@@ -36,7 +36,7 @@ services:
         # Set this IP address to something different if you already have another
         # service running on the default IP address. If you change the subnet,
         # you need to also change the bridge network IP and subnet below.
-        ipv4_address: 192.168.88.88
+        ipv4_address: 192.168.89.89
 
 networks:
 
@@ -44,7 +44,7 @@ networks:
   drupalvm:
     driver: bridge
     driver_opts:
-      ip: 192.168.88.1
+      ip: 192.168.89.1
     ipam:
       config:
-        - subnet: "192.168.88.0/16"
+        - subnet: "192.168.89.0/16"
diff --git a/provisioning/docker/bake.sh b/provisioning/docker/bake.sh
index 5783ce267..cf04f1fdb 100755
--- a/provisioning/docker/bake.sh
+++ b/provisioning/docker/bake.sh
@@ -6,7 +6,7 @@
 set -e
 
 # Set variables.
-DRUPALVM_IP_ADDRESS="${DRUPALVM_IP_ADDRESS:-192.168.88.88}"
+DRUPALVM_IP_ADDRESS="${DRUPALVM_IP_ADDRESS:-192.168.89.89}"
 DRUPALVM_MACHINE_NAME="${DRUPALVM_MACHINE_NAME:-drupal-vm}"
 DRUPALVM_HOSTNAME="${DRUPALVM_HOSTNAME:-localhost}"
 DRUPALVM_PROJECT_ROOT="${DRUPALVM_PROJECT_ROOT:-/var/www/drupalvm}"

From dde50ce6675bd327d98417464d4b0e34a9178a88 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 27 Jun 2017 23:13:50 -0500
Subject: [PATCH 0843/1273] Issue #1451: Document the availability of a debian9
 base box.

---
 default.config.yml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/default.config.yml b/default.config.yml
index 6889b7428..536b45bde 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -1,7 +1,14 @@
 ---
-# `vagrant_box` can also be set to geerlingguy/centos6, geerlingguy/centos7,
-# geerlingguy/debian8, geerlingguy/ubuntu1404, geerlingguy/ubuntu1204, etc.
+# Available `vagrant_box` values include:
+#   - geerlingguy/centos7
+#   - geerlingguy/centos6
+#   - geerlingguy/debian9
+#   - geerlingguy/debian8
+#   - geerlingguy/ubuntu1604
+#   - geerlingguy/ubuntu1404
+#   - geerlingguy/ubuntu1204
 vagrant_box: geerlingguy/ubuntu1604
+
 vagrant_user: vagrant
 vagrant_synced_folder_default_type: nfs
 vagrant_gui: false

From fcb7633af3d2913db3e815c198f9735b21db7efa Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 28 Jun 2017 07:39:02 -0500
Subject: [PATCH 0844/1273] Fixes #1455: Update Varnish role to 2.0.0.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.varnish/.travis.yml     | 15 +++++++
 .../roles/geerlingguy.varnish/README.md       |  4 +-
 .../geerlingguy.varnish/defaults/main.yml     |  2 +-
 .../roles/geerlingguy.varnish/meta/main.yml   |  2 +-
 .../roles/geerlingguy.varnish/tasks/main.yml  | 16 +++++---
 .../tasks/setup-Debian.yml                    | 13 +++----
 .../tasks/setup-RedHat.yml                    | 39 ++++++++++---------
 .../roles/geerlingguy.varnish/tests/debug.yml |  9 +++++
 .../roles/geerlingguy.varnish/tests/setup.yml | 17 ++++++++
 .../geerlingguy.varnish/tests/test-41.yml     | 14 +++++++
 .../roles/geerlingguy.varnish/tests/test.yml  | 27 ++-----------
 12 files changed, 99 insertions(+), 61 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.varnish/tests/debug.yml
 create mode 100644 provisioning/roles/geerlingguy.varnish/tests/setup.yml
 create mode 100644 provisioning/roles/geerlingguy.varnish/tests/test-41.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 1da1cd151..3db448b6b 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -78,4 +78,4 @@
 - src: geerlingguy.solr
   version: 3.5.5
 - src: geerlingguy.varnish
-  version: 1.9.0
+  version: 2.0.0
diff --git a/provisioning/roles/geerlingguy.varnish/.travis.yml b/provisioning/roles/geerlingguy.varnish/.travis.yml
index febc41820..8b9990896 100644
--- a/provisioning/roles/geerlingguy.varnish/.travis.yml
+++ b/provisioning/roles/geerlingguy.varnish/.travis.yml
@@ -6,8 +6,18 @@ env:
   - distro: centos6
   - distro: ubuntu1604
   - distro: ubuntu1404
+  # See: https://github.com/varnishcache/pkg-varnish-cache/issues/78
+  # - distro: debian9
   - distro: debian8
 
+  # Also test installing older versions.
+  - distro: centos7
+    playbook: test-41.yml
+    varnish_version: "4.1"
+  - distro: ubuntu1604
+    varnish_version: "4.1"
+    playbook: test-41.yml
+
 script:
   # Configure test script so we can run extra tests after playbook is run.
   - export container_id=$(date +%s)
@@ -23,5 +33,10 @@ script:
   # Make sure Varnish is running.
   - 'docker exec --tty ${container_id} env TERM=xterm varnishd -V'
 
+  # Test the version of Varnish installed (default to the main.yml default).
+  - |
+    varnish_version="${varnish_version:-5.1}"
+    docker exec --tty ${container_id} env TERM=xterm varnishd -V | grep "${varnish_version}"
+
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.varnish/README.md b/provisioning/roles/geerlingguy.varnish/README.md
index 784d0802b..c14ddadcc 100644
--- a/provisioning/roles/geerlingguy.varnish/README.md
+++ b/provisioning/roles/geerlingguy.varnish/README.md
@@ -16,9 +16,9 @@ Available variables are listed below, along with default values (see `defaults/m
 
 Varnish package name you want to install. See `apt-cache policy varnish` or `yum list varnish` for a listing of available candidates.
 
-    varnish_version: "4.1"
+    varnish_version: "5.1"
 
-Varnish version that should be installed. See `https://repo.varnish-cache.org/redhat/` for a listing of available versions (e.g. `3.0`, `4.0`, `4.1`). _Note: Ubuntu 16.04 "Xenial" defaults to 4.1 from the universe repoistory_
+Varnish version that should be installed. See the [Varnish Cache packagecloud.io repositories](https://packagecloud.io/varnishcache) for a listing of available versions. Some examples include: `5.1`, `5.0`, `4.1`, `4.0`, `3.0`, and `2.1`.
 
     varnish_config_path: /etc/varnish
 
diff --git a/provisioning/roles/geerlingguy.varnish/defaults/main.yml b/provisioning/roles/geerlingguy.varnish/defaults/main.yml
index ea3609efb..b85facb86 100644
--- a/provisioning/roles/geerlingguy.varnish/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.varnish/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
 varnish_package_name: "varnish"
-varnish_version: "4.1"
+varnish_version: "5.1"
 
 varnish_use_default_vcl: true
 varnish_default_vcl_template_path: default.vcl.j2
diff --git a/provisioning/roles/geerlingguy.varnish/meta/main.yml b/provisioning/roles/geerlingguy.varnish/meta/main.yml
index 5c6976181..10da3bc1f 100644
--- a/provisioning/roles/geerlingguy.varnish/meta/main.yml
+++ b/provisioning/roles/geerlingguy.varnish/meta/main.yml
@@ -6,7 +6,7 @@ galaxy_info:
   description: Varnish for Linux.
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 2.1
+  min_ansible_version: 2.2
   platforms:
     - name: EL
       versions:
diff --git a/provisioning/roles/geerlingguy.varnish/tasks/main.yml b/provisioning/roles/geerlingguy.varnish/tasks/main.yml
index cd3b921ce..80674faa6 100644
--- a/provisioning/roles/geerlingguy.varnish/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.varnish/tasks/main.yml
@@ -2,12 +2,21 @@
 - name: Include OS-specific variables.
   include_vars: "{{ ansible_os_family }}.yml"
 
+- name: Set the packagecloud repository name based on the version.
+  set_fact:
+    varnish_packagecloud_repo: "varnish{{ varnish_version|replace('.', '') }}"
+
 - include: setup-RedHat.yml
   when: ansible_os_family == 'RedHat'
 
 - include: setup-Debian.yml
   when: ansible_os_family == 'Debian'
 
+- name: Ensure Varnish config path exists.
+  file:
+    path: "{{ varnish_config_path }}"
+    state: directory
+
 - name: Copy Varnish configuration (sysvinit).
   template:
     src: varnish.j2
@@ -36,7 +45,7 @@
 - name: Copy Varnish configuration (systemd).
   template:
     src: varnish.params.j2
-    dest: /etc/varnish/varnish.params
+    dest: "{{ varnish_config_path }}/varnish.params"
     owner: root
     group: root
     mode: 0644
@@ -44,11 +53,6 @@
     (ansible_os_family == 'RedHat' and ansible_distribution_major_version|int >= 7) or
     (ansible_os_family == 'Debian' and ansible_distribution_release == "xenial")
 
-- name: Ensure Varnish config path exists.
-  file:
-    path: "{{ varnish_config_path }}"
-    state: directory
-
 - name: Copy Varnish default VCL.
   template:
     src: "{{ varnish_default_vcl_template_path }}"
diff --git a/provisioning/roles/geerlingguy.varnish/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.varnish/tasks/setup-Debian.yml
index be59e3a29..8a1d8fd4f 100644
--- a/provisioning/roles/geerlingguy.varnish/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.varnish/tasks/setup-Debian.yml
@@ -3,21 +3,18 @@
   apt:
     name: apt-transport-https
     state: installed
-  when: ansible_distribution_release != "xenial"
 
-- name: Add Varnish apt key.
+- name: Add packagecloud.io Varnish apt key.
   apt_key:
-    url: https://repo.varnish-cache.org/GPG-key.txt
+    url: https://packagecloud.io/varnishcache/{{ varnish_packagecloud_repo }}/gpgkey
     state: present
-  when: ansible_distribution_release != "xenial"
 
-- name: Add Varnish apt repository.
+- name: Add packagecloud.io Varnish apt repository.
   apt_repository:
-    repo: "deb https://repo.varnish-cache.org/{{ ansible_distribution | lower }}/ {{ ansible_distribution_release }} varnish-{{ varnish_version }}"
+    repo: "deb https://packagecloud.io/varnishcache/{{ varnish_packagecloud_repo }}/{{ ansible_distribution | lower }}/ {{ ansible_distribution_release }} main"
     state: present
-  when: ansible_distribution_release != "xenial"
 
-- name: Install Varnish.
+- name: Ensure Varnish is installed.
   apt:
     name: "{{ varnish_package_name }}"
     state: present
diff --git a/provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml
index e7b7d2098..86cd9dc3f 100644
--- a/provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml
@@ -2,28 +2,29 @@
 - name: Ensure Varnish dependencies are installed.
   yum: name={{ item }} state=present
   with_items:
-    - gcc
-    - libedit-devel
-    - initscripts
-    - redhat-rpm-config
+    - yum-utils
+    - pygpgme
 
-- name: Add Varnish repository.
-  yum:
-    name: https://repo.varnish-cache.org/redhat/varnish-{{ varnish_version }}.el6.rpm
-    state: present
-  when: ansible_distribution_major_version|int < 7
-
-- name: Set a string for the varnish repository identifier.
-  set_fact:
-    varnish_yum_repo: "varnish-{{ varnish_version }},epel"
+- name: Add Varnish packagecloud.io yum repo.
+  yum_repository:
+    name: varnishcache_{{ varnish_packagecloud_repo }}
+    description: Varnish Cache packagecloud.io repository.
+    baseurl: https://packagecloud.io/varnishcache/{{ varnish_packagecloud_repo }}/el/{{ ansible_distribution_major_version|int }}/$basearch
+    repo_gpgcheck: no
+    gpgcheck: no
+    enabled: yes
+    gpgkey: https://packagecloud.io/varnishcache/{{ varnish_packagecloud_repo }}/gpgkey
+    sslverify: 1
+    sslcacert: /etc/pki/tls/certs/ca-bundle.crt
+  register: varnish_packagecloud_repo_addition
 
-- name: Set repo fact appropriately.
-  set_fact:
-    varnish_yum_enablerepo: "{{ varnish_yum_repo if (ansible_distribution_major_version|int < 7) else 'epel' }}"
+- name: Refresh yum metadata cache if repo changed.
+  command: >
+    yum clean metadata
+    warn=no
+  when: varnish_packagecloud_repo_addition.changed
 
-- name: Install Varnish.
+- name: Ensure Varnish is installed.
   yum:
     name: "{{ varnish_package_name }}"
     state: installed
-    enablerepo: "{{ varnish_yum_enablerepo }}"
-    disablerepo: "*"
diff --git a/provisioning/roles/geerlingguy.varnish/tests/debug.yml b/provisioning/roles/geerlingguy.varnish/tests/debug.yml
new file mode 100644
index 000000000..9bea1b9e3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.varnish/tests/debug.yml
@@ -0,0 +1,9 @@
+---
+- name: Check what version of Varnish was installed.
+  command: varnishd -V
+  register: varnish_version
+  changed_when: no
+
+- name: Display the installed Varnish version.
+  debug: var=varnish_version
+  changed_when: no
diff --git a/provisioning/roles/geerlingguy.varnish/tests/setup.yml b/provisioning/roles/geerlingguy.varnish/tests/setup.yml
new file mode 100644
index 000000000..b40ee7eb2
--- /dev/null
+++ b/provisioning/roles/geerlingguy.varnish/tests/setup.yml
@@ -0,0 +1,17 @@
+---
+- name: Update apt cache.
+  apt: update_cache=yes cache_valid_time=600
+  when: ansible_os_family == 'Debian'
+
+- name: Ensure build dependencies are installed (RedHat 7+).
+  yum: 'name="{{ item }}" state=present'
+  with_items:
+    - logrotate
+    - systemd-sysv
+  when: ansible_os_family == 'RedHat' and ansible_distribution_major_version >= '7'
+
+- name: Ensure build dependencies are installed (RedHat < 7).
+  yum: 'name="{{ item }}" state=present'
+  with_items:
+    - logrotate
+  when: ansible_os_family == 'RedHat' and ansible_distribution_major_version < '7'
diff --git a/provisioning/roles/geerlingguy.varnish/tests/test-41.yml b/provisioning/roles/geerlingguy.varnish/tests/test-41.yml
new file mode 100644
index 000000000..066b1dc39
--- /dev/null
+++ b/provisioning/roles/geerlingguy.varnish/tests/test-41.yml
@@ -0,0 +1,14 @@
+---
+- hosts: all
+
+  vars:
+    varnish_version: "4.1"
+
+  pre_tasks:
+    - include: setup.yml
+
+  roles:
+    - role_under_test
+
+  post_tasks:
+    - include: debug.yml
diff --git a/provisioning/roles/geerlingguy.varnish/tests/test.yml b/provisioning/roles/geerlingguy.varnish/tests/test.yml
index 9a57544f3..ba405e723 100644
--- a/provisioning/roles/geerlingguy.varnish/tests/test.yml
+++ b/provisioning/roles/geerlingguy.varnish/tests/test.yml
@@ -1,29 +1,10 @@
 - hosts: all
 
   pre_tasks:
-    - name: Update apt cache.
-      apt: update_cache=yes cache_valid_time=600
-      when: ansible_os_family == 'Debian'
-
-    - name: Ensure build dependencies are installed (RedHat 7+).
-      yum: 'name="{{ item }}" state=present'
-      with_items:
-        - logrotate
-        - redhat-rpm-config
-        - systemd-sysv
-        - initscripts
-      when: ansible_os_family == 'RedHat' and ansible_distribution_major_version >= '7'
-
-    - name: Ensure build dependencies are installed (RedHat < 7).
-      yum: 'name="{{ item }}" state=present'
-      with_items:
-        - logrotate
-      when: ansible_os_family == 'RedHat' and ansible_distribution_major_version < '7'
-
-    - name: Force working version of Varnish on Ubuntu 14.04.
-      set_fact:
-        varnish_version: "4.0"
-      when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '14.04'
+    - include: setup.yml
 
   roles:
     - role_under_test
+
+  post_tasks:
+    - include: debug.yml

From f04cf99e94eb2d23cd0e972c985c82947d5aba19 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 28 Jun 2017 22:33:03 -0500
Subject: [PATCH 0845/1273] Issue #1454: Update CHANGELOG in preparation for
 the 4.6.0 release.

---
 CHANGELOG.md | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f596b01c6..6878de658 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,45 @@
 # Drupal VM Changelog
 
+## 4.6.0 "TODO" (2017-06-28)
+
+### Breaking Changes
+
+  * If you have `varnish` in your `installed_extras`, then the newest version of the Varnish role included in this release changes the Varnish package repository (on all OSes) to use the latest supported Varnish packages from Varnish's official packagecloud.io repos. This allows you to specify Varnish versions anywhere from the latest (currently 5.1) to early 2.x versions (and everything in-between)... but you might either have to uninstall Varnish before updating existing VMs, or just rebuild your VM to take advantage of the latest role version.
+
+### New/changed variables in default.config.yml
+
+  * `vagrant_box` still defaults to Ubuntu 16.04, but you can now use Debian 9 ('Stretch') if you set the variable to `geerlingguy/debian9`.
+  * `vagrant_plugins` was added (see #1378), and contains a list of Vagrant plugins that—if not already installed—will be installed for use by Vagrant.
+
+### Improvements
+
+  * #1455: Update Varnish role to allow for Varnish 5.1, 5.0, and any older version.
+  * #1451: Document the availability of `geerlingguy/debian9` base box (and Docker base container).
+  * #1378: Automatically install a configurable list of Vagrant plugins (`hostsupdater` and `vbguest` by default).
+  * #1423: Add documentation on using the official Docker image for quick Drupal testing environments.
+  * #1388, #1389: Use `geerlingguy/drupal-vm` docker image by default in Docker Compose file.
+  * #1437: Allow list of paths in `pre_provision_tasks_dir` and `post_provision_tasks_dir` (used to just be one path maximum).
+  * #1443: Add IRC badge linking to `#drupal-vm` freenode IRC room on Riot.
+  * #1171: Support using XDebug to debug Drush commands inside Drupal VM.
+  * #1368: Ensure private filesystem works correctly when using Nginx.
+  * #1375: Allow /vagrant default synced folder to be managed like other synced folders.
+  * #1406: Minor doc improvement for using Tideways instead of XHprof when using PHP 7+.
+  * #1431: Minor doc improvement for `composer docker-bake` command.
+  * #1386: Remove dated Acquia example and point to BLT's configuration instead.
+  * #1418: Allow PHP configuration to be overridden so default system packages can be used instead of Ondrej Sury's repo (allowing PHP 5.3, 5.4, and 5.5 to be used when absolutely necessary).
+  * #1424: Add support for RFC 5785 (`.well-known`) when using Nginx.
+  * #1451: Use 192.168.89.89 for default Docker Drupal VM IP.
+  * Updated roles: PostgreSQL, PHP Versions, Redis, Nginx, Varnish.
+
+### Bugfixes
+
+  * #1403: Ensure PostgreSQL works correctly on all supported OSes.
+  * #1399: Fix bug where Drupal would reinstall on reprovision if not using English as the default language.
+  * #1384, #1420: Update docs in Solr example for more clarity concerning use with Drupal 8.
+  * #1444: Fix outdated comment for `drupal_install_site` variable.
+  * #1411: Fix `.gitignore` file applying rules to files in subdirectories.
+
+
 ## 4.5.0 "Break In (For Strings, Flutes, and Celesta)" (2017-05-24)
 
 ### Breaking Changes

From c8e175a3ee6ee4edae515dafed8e67d551f7c521 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 28 Jun 2017 22:35:08 -0500
Subject: [PATCH 0846/1273] Issue #1454: Fix missing Tron soundtrack name for
 4.6.0 release in CHANGELOG.

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6878de658..cc0a76bfa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Drupal VM Changelog
 
-## 4.6.0 "TODO" (2017-06-28)
+## 4.6.0 "Water, Music, and Tronaction" (2017-06-28)
 
 ### Breaking Changes
 

From 6490a8589de267a9a619be3187a69bdeb2918534 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 28 Jun 2017 22:58:02 -0500
Subject: [PATCH 0847/1273] Fixes #1456: Default Docker example uses incorrect
 image.

---
 docs/other/docker.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/other/docker.md b/docs/other/docker.md
index dee9e231a..df7776fb6 100644
--- a/docs/other/docker.md
+++ b/docs/other/docker.md
@@ -27,7 +27,7 @@ You can also add other subdomains if you're using other built-in services, e.g.
 
 If you just want a quick, easy Drupal site for testing, you can run an instance of Drupal VM and install Drupal inside using the provided script.
 
-  1. Run an instance of Drupal VM: `docker run -d -p 80:80 -p 443:443 --name=drupalvm --privileged dvmtest`
+  1. Run an instance of Drupal VM: `docker run -d -p 80:80 -p 443:443 --name=drupalvm --privileged geerlingguy/drupal-vm`
   2. Install Drupal on this instance: `docker exec drupalvm install-drupal` (you can choose a version using `install-drupal [version]`, using versions like `8.4.x`, `7.55`, `7.x`, etc.).
 
 You should be able to access the Drupal site at `http://localhost`. If you need to share a host directory into the VM, you can do so by adding another `-v` parameter, like `-v /path/on/host:/path/in/container.

From 3ecf5b1e82e1201c1345b1578e4dba0837ab8f2b Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 30 Jun 2017 23:19:51 -0500
Subject: [PATCH 0848/1273] Update PostgreSQL role to work with Debian 9.

---
 provisioning/requirements.yml                          |  2 +-
 provisioning/roles/geerlingguy.postgresql/.travis.yml  |  3 +++
 provisioning/roles/geerlingguy.postgresql/README.md    |  4 ++++
 .../roles/geerlingguy.postgresql/defaults/main.yml     |  1 +
 .../geerlingguy.postgresql/tasks/setup-Debian.yml      |  8 ++++++--
 .../geerlingguy.postgresql/tasks/setup-RedHat.yml      | 10 ++++++++--
 .../roles/geerlingguy.postgresql/vars/Debian-9.yml     | 10 ++++++++++
 7 files changed, 33 insertions(+), 5 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.postgresql/vars/Debian-9.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 3db448b6b..6e3e4fb35 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -66,7 +66,7 @@
 - src: geerlingguy.postfix
   version: 1.1.0
 - src: geerlingguy.postgresql
-  version: 1.3.0
+  version: 1.3.1
 - src: geerlingguy.redis
   version: 1.5.1
 - src: geerlingguy.repo-remi
diff --git a/provisioning/roles/geerlingguy.postgresql/.travis.yml b/provisioning/roles/geerlingguy.postgresql/.travis.yml
index d28e2cb97..b1978d198 100644
--- a/provisioning/roles/geerlingguy.postgresql/.travis.yml
+++ b/provisioning/roles/geerlingguy.postgresql/.travis.yml
@@ -17,6 +17,9 @@ env:
   - distro: debian8
     postgresql_bin_dir: /usr/lib/postgresql/9.4/bin
     postgresql_data_dir: /var/lib/postgresql/9.4/main
+  - distro: debian9
+    postgresql_bin_dir: /usr/lib/postgresql/9.6/bin
+    postgresql_data_dir: /var/lib/postgresql/9.6/main
 
 script:
   # Configure test script so we can run extra tests after playbook is run.
diff --git a/provisioning/roles/geerlingguy.postgresql/README.md b/provisioning/roles/geerlingguy.postgresql/README.md
index 0a39860cf..04580d708 100644
--- a/provisioning/roles/geerlingguy.postgresql/README.md
+++ b/provisioning/roles/geerlingguy.postgresql/README.md
@@ -21,6 +21,10 @@ Available variables are listed below, along with default values (see `defaults/m
 
 (RHEL/CentOS only) You can set a repo to use for the PostgreSQL installation by passing it in here.
 
+    postgresql_python_library: python-psycopg2
+
+Library used by Ansible to communicate with PostgreSQL. If you are using Python 3 (e.g. set via `ansible_python_interpreter`), you should change this to `python3-psycopg2`.
+
     postgresql_user: postgres
     postgresql_group: postgres
 
diff --git a/provisioning/roles/geerlingguy.postgresql/defaults/main.yml b/provisioning/roles/geerlingguy.postgresql/defaults/main.yml
index 9a7dfa005..6d9a154ee 100644
--- a/provisioning/roles/geerlingguy.postgresql/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.postgresql/defaults/main.yml
@@ -2,6 +2,7 @@
 # RHEL/CentOS only. Set a repository to use for PostgreSQL installation.
 postgresql_enablerepo: ""
 
+postgresql_python_library: python-psycopg2
 postgresql_user: postgres
 postgresql_group: postgres
 
diff --git a/provisioning/roles/geerlingguy.postgresql/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.postgresql/tasks/setup-Debian.yml
index 13700d34e..fdfcc44f0 100644
--- a/provisioning/roles/geerlingguy.postgresql/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.postgresql/tasks/setup-Debian.yml
@@ -1,9 +1,13 @@
 ---
 - name: Ensure PostgreSQL Python libraries are installed.
-  apt: "name=python-psycopg2 state=installed"
+  apt:
+    name: "{{ postgresql_python_library }}"
+    state: installed
 
 - name: Ensure PostgreSQL packages are installed.
-  apt: "name={{ item }} state=installed"
+  apt:
+    name: "{{ item }}"
+    state: installed
   with_items: "{{ postgresql_packages }}"
 
 - name: Ensure all configured locales are present.
diff --git a/provisioning/roles/geerlingguy.postgresql/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.postgresql/tasks/setup-RedHat.yml
index 050c84202..d0ce7c7de 100644
--- a/provisioning/roles/geerlingguy.postgresql/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.postgresql/tasks/setup-RedHat.yml
@@ -1,7 +1,13 @@
 ---
 - name: Ensure PostgreSQL packages are installed.
-  package: "name={{ item }} state=installed enablerepo={{ postgresql_enablerepo }}"
+  package:
+    name: "{{ item }}"
+    state: installed
+    enablerepo: "{{ postgresql_enablerepo }}"
   with_items: "{{ postgresql_packages }}"
 
 - name: Ensure PostgreSQL Python libraries are installed.
-  package: "name=python-psycopg2 state=installed enablerepo={{ postgresql_enablerepo }}"
+  package:
+    name: "{{ postgresql_python_library }}"
+    state: installed
+    enablerepo: "{{ postgresql_enablerepo }}"
diff --git a/provisioning/roles/geerlingguy.postgresql/vars/Debian-9.yml b/provisioning/roles/geerlingguy.postgresql/vars/Debian-9.yml
new file mode 100644
index 000000000..7b57d5324
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/vars/Debian-9.yml
@@ -0,0 +1,10 @@
+---
+__postgresql_version: "9.6"
+__postgresql_data_dir: "/var/lib/postgresql/{{ __postgresql_version }}/main"
+__postgresql_bin_path: "/usr/lib/postgresql/{{ __postgresql_version }}/bin"
+__postgresql_config_path: "/etc/postgresql/{{ __postgresql_version }}/main"
+__postgresql_daemon: postgresql
+__postgresql_packages:
+  - postgresql
+  - postgresql-contrib
+  - libpq-dev

From f36e0ff8a2af2ed22f67ff9b6c84025c6a5491d0 Mon Sep 17 00:00:00 2001
From: Michael Jones <michaeljones401@gmail.com>
Date: Mon, 3 Jul 2017 14:48:27 +0100
Subject: [PATCH 0849/1273] Updating to latest Drupal build 8.3.4

---
 example.drupal.make.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/example.drupal.make.yml b/example.drupal.make.yml
index 04b70e99a..4872ca007 100644
--- a/example.drupal.make.yml
+++ b/example.drupal.make.yml
@@ -11,7 +11,7 @@ projects:
 
   # Core.
   drupal:
-    version: "8.2.6"
+    version: "8.3.4"
     # Use this if you need a working git repository of Drupal core instead of
     # the latest stable.
     # type: "core"

From a888d667d34d0f22683e88ddd3706f3a0b46c8ce Mon Sep 17 00:00:00 2001
From: "J.D. Flynn" <JDDoesDev@users.noreply.github.com>
Date: Wed, 5 Jul 2017 09:09:47 -0500
Subject: [PATCH 0850/1273] Change "OR" to 7.0 instead of 7.1 to avoid
 confusion

---
 docs/configurations/php.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/configurations/php.md b/docs/configurations/php.md
index 38b8a2c76..1289cceab 100644
--- a/docs/configurations/php.md
+++ b/docs/configurations/php.md
@@ -1,4 +1,4 @@
-Drupal VM defaults to PHP 7.1, but you can also install and use 5.6 or 7.1.
+Drupal VM defaults to PHP 7.1, but you can also install and use 5.6 or 7.0.
 
 ## Ubuntu
 

From 7c05f1ffb1b4c5a794e332a79c6b7d70e4c393bd Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 9 Jul 2017 21:11:50 -0500
Subject: [PATCH 0851/1273] Docker Edge release no longer required for
 delegated volumes.

---
 example.docker-compose.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/example.docker-compose.yml b/example.docker-compose.yml
index f856fe55c..49e2d490a 100644
--- a/example.docker-compose.yml
+++ b/example.docker-compose.yml
@@ -24,7 +24,6 @@ services:
       - '8.8.8.8'
       - '8.8.4.4'
 
-    # Use of the `delegated` option currently requires the Docker Edge release.
     volumes:
       - ./:/var/www/drupalvm/:rw,delegated
 

From ae89585b26ebd3c8605902b836fbf607a378eb46 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 16 Jul 2017 23:43:30 -0500
Subject: [PATCH 0852/1273] Update Nginx role to latest version.

---
 provisioning/requirements.yml                             | 2 +-
 provisioning/roles/geerlingguy.nginx/README.md            | 2 +-
 .../roles/geerlingguy.nginx/templates/nginx.conf.j2       | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 6e3e4fb35..7da9bfc94 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -38,7 +38,7 @@
 - src: geerlingguy.mysql
   version: 2.7.2
 - src: geerlingguy.nginx
-  version: 2.3.2
+  version: 2.4.0
 - src: geerlingguy.nodejs
   version: 4.1.1
 - src: geerlingguy.php
diff --git a/provisioning/roles/geerlingguy.nginx/README.md b/provisioning/roles/geerlingguy.nginx/README.md
index 9e4edb327..aa8c3ab14 100644
--- a/provisioning/roles/geerlingguy.nginx/README.md
+++ b/provisioning/roles/geerlingguy.nginx/README.md
@@ -49,7 +49,7 @@ Please take note of the indentation in the above block. The first line should be
 
       - listen: "80"
         server_name: "example.com www.example.com"
-        return "301 https://example.com$request_uri;"
+        return: "301 https://example.com$request_uri"
         filename: "example.com.80.conf"
 
 An example of a secondary vhost which will redirect to the one shown above.
diff --git a/provisioning/roles/geerlingguy.nginx/templates/nginx.conf.j2 b/provisioning/roles/geerlingguy.nginx/templates/nginx.conf.j2
index cb187d838..7cdec6028 100644
--- a/provisioning/roles/geerlingguy.nginx/templates/nginx.conf.j2
+++ b/provisioning/roles/geerlingguy.nginx/templates/nginx.conf.j2
@@ -7,6 +7,10 @@ pid        {{ nginx_pidfile }};
 worker_processes  {{ nginx_worker_processes }};
 {% endblock %}
 
+{% if nginx_extra_conf_options %}
+{{ nginx_extra_conf_options }}
+{% endif %}
+
 {% block events %}
 events {
     worker_connections  {{ nginx_worker_connections }};
@@ -14,10 +18,6 @@ events {
 }
 {% endblock %}
 
-{% if nginx_extra_conf_options %}
-{{ nginx_extra_conf_options }}
-{% endif %}
-
 http {
     {% block http_begin %}{% endblock %}
 

From 743969d0978bb4d3952593316c6399a773d102e5 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 16 Jul 2017 23:50:06 -0500
Subject: [PATCH 0853/1273] Update Firewall role to latest version.

---
 provisioning/requirements.yml                                  | 2 +-
 .../roles/geerlingguy.firewall/templates/firewall.init.j2      | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 7da9bfc94..224c1fa42 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -26,7 +26,7 @@
 - src: geerlingguy.elasticsearch
   version: 2.1.3
 - src: geerlingguy.firewall
-  version: 2.2.1
+  version: 2.2.2
 - src: geerlingguy.git
   version: 1.3.0
 - src: geerlingguy.java
diff --git a/provisioning/roles/geerlingguy.firewall/templates/firewall.init.j2 b/provisioning/roles/geerlingguy.firewall/templates/firewall.init.j2
index e2705f609..1235e94c8 100644
--- a/provisioning/roles/geerlingguy.firewall/templates/firewall.init.j2
+++ b/provisioning/roles/geerlingguy.firewall/templates/firewall.init.j2
@@ -24,6 +24,9 @@ case "$1" in
   stop)
     echo "Stopping firewall."
     iptables -F
+    if [ -x "$(which ip6tables 2>/dev/null)" ]; then
+        ip6tables -F
+    fi
     ;;
   restart)
     echo "Restarting firewall."

From 66c6b98ab288df18382bfdfa2d4cc886912f4927 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 16 Jul 2017 23:54:13 -0500
Subject: [PATCH 0854/1273] Update Firewall to latest version.

---
 provisioning/requirements.yml                             | 2 +-
 provisioning/roles/geerlingguy.firewall/README.md         | 5 +++++
 provisioning/roles/geerlingguy.firewall/defaults/main.yml | 3 +++
 provisioning/roles/geerlingguy.firewall/tasks/main.yml    | 7 +++++--
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 224c1fa42..0ba482788 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -26,7 +26,7 @@
 - src: geerlingguy.elasticsearch
   version: 2.1.3
 - src: geerlingguy.firewall
-  version: 2.2.2
+  version: 2.3.0
 - src: geerlingguy.git
   version: 1.3.0
 - src: geerlingguy.java
diff --git a/provisioning/roles/geerlingguy.firewall/README.md b/provisioning/roles/geerlingguy.firewall/README.md
index 059e2501b..541daf1c2 100644
--- a/provisioning/roles/geerlingguy.firewall/README.md
+++ b/provisioning/roles/geerlingguy.firewall/README.md
@@ -16,6 +16,11 @@ None.
 
 Available variables are listed below, along with default values (see `defaults/main.yml`):
 
+    firewall_state: started
+    firewall_enabled_at_boot: true
+
+Controls the state of the firewall service; whether it should be running (`firewall_state`) and/or enabled on system boot (`firewall_enabled_at_boot`).
+
     firewall_allowed_tcp_ports:
       - "22"
       - "80"
diff --git a/provisioning/roles/geerlingguy.firewall/defaults/main.yml b/provisioning/roles/geerlingguy.firewall/defaults/main.yml
index e7bad1982..3d3cceba4 100644
--- a/provisioning/roles/geerlingguy.firewall/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.firewall/defaults/main.yml
@@ -1,4 +1,7 @@
 ---
+firewall_state: started
+firewall_enabled_at_boot: true
+
 firewall_allowed_tcp_ports:
   - "22"
   - "25"
diff --git a/provisioning/roles/geerlingguy.firewall/tasks/main.yml b/provisioning/roles/geerlingguy.firewall/tasks/main.yml
index a08783db6..33b5fae5c 100644
--- a/provisioning/roles/geerlingguy.firewall/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.firewall/tasks/main.yml
@@ -34,8 +34,11 @@
     mode: 0644
   when: "ansible_service_mgr == 'systemd'"
 
-- name: Ensure the firewall is enabled and will start on boot.
-  service: name=firewall state=started enabled=yes
+- name: Configure the firewall service.
+  service:
+    name: firewall
+    state: "{{ firewall_state }}"
+    enabled: "{{ firewall_enabled_at_boot }}"
 
 - include: disable-other-firewalls.yml
   when: firewall_disable_firewalld or firewall_disable_ufw

From faa6c2e0d4a4b547762553db0203cdbaca74354a Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 17 Jul 2017 23:05:22 -0500
Subject: [PATCH 0855/1273] Fixes #1462: Update pecl role so pecl itself can be
 easily installed.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.php-pecl/.gitignore     |  2 +
 .../roles/geerlingguy.php-pecl/.travis.yml    | 37 +++++--------------
 .../roles/geerlingguy.php-pecl/LICENSE        | 20 ++++++++++
 .../roles/geerlingguy.php-pecl/README.md      | 16 ++++++--
 .../geerlingguy.php-pecl/defaults/main.yml    |  2 +
 .../roles/geerlingguy.php-pecl/tasks/main.yml | 11 +++++-
 .../geerlingguy.php-pecl/tests/README.md      | 11 ++++++
 .../roles/geerlingguy.php-pecl/tests/test.yml | 12 +++++-
 .../geerlingguy.php-pecl/vars/Debian.yml      |  2 +
 .../geerlingguy.php-pecl/vars/RedHat.yml      |  2 +
 11 files changed, 82 insertions(+), 35 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.php-pecl/.gitignore
 create mode 100644 provisioning/roles/geerlingguy.php-pecl/LICENSE
 create mode 100644 provisioning/roles/geerlingguy.php-pecl/tests/README.md
 create mode 100644 provisioning/roles/geerlingguy.php-pecl/vars/Debian.yml
 create mode 100644 provisioning/roles/geerlingguy.php-pecl/vars/RedHat.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 0ba482788..30967ecfa 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -48,7 +48,7 @@
 - src: geerlingguy.php-mysql
   version: 2.0.1
 - src: geerlingguy.php-pecl
-  version: 1.3.0
+  version: 1.4.0
 - src: geerlingguy.php-pgsql
   version: 1.0.0
 - src: geerlingguy.php-redis
diff --git a/provisioning/roles/geerlingguy.php-pecl/.gitignore b/provisioning/roles/geerlingguy.php-pecl/.gitignore
new file mode 100644
index 000000000..c9b2377e3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-pecl/.gitignore
@@ -0,0 +1,2 @@
+*.retry
+tests/test.sh
diff --git a/provisioning/roles/geerlingguy.php-pecl/.travis.yml b/provisioning/roles/geerlingguy.php-pecl/.travis.yml
index 52e85f65b..b74454fd2 100644
--- a/provisioning/roles/geerlingguy.php-pecl/.travis.yml
+++ b/provisioning/roles/geerlingguy.php-pecl/.travis.yml
@@ -3,42 +3,23 @@ services: docker
 
 env:
   - distro: centos7
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
   - distro: ubuntu1604
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-
-before_install:
-  # Pull container.
-  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
-  - container_id=$(mktemp)
-  # Run container in detached state.
-  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
-
-  # Install dependencies.
-  - 'docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
+  # Configure test script so we can run extra tests after playbook is run.
+  - export container_id=$(date +%s)
+  - export cleanup=false
 
-  # Ansible syntax check.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+  # Download test shim.
+  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
+  - chmod +x ${PWD}/tests/test.sh
 
-  # Test role.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
-
-  # Test role idempotence.
-  - idempotence=$(mktemp)
-  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
-  - >
-    tail ${idempotence}
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
+  # Run tests.
+  - ${PWD}/tests/test.sh
 
   # Make sure Pecl is installed.
   - >
-    sudo docker exec "$(cat ${container_id})" which pecl
+    sudo docker exec ${container_id} which pecl
     && (echo 'Pecl is installed' && exit 0)
     || (echo 'Pecl is not installed' && exit 1)
 
diff --git a/provisioning/roles/geerlingguy.php-pecl/LICENSE b/provisioning/roles/geerlingguy.php-pecl/LICENSE
new file mode 100644
index 000000000..4275cf3c1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-pecl/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Jeff Geerling
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/provisioning/roles/geerlingguy.php-pecl/README.md b/provisioning/roles/geerlingguy.php-pecl/README.md
index 0f8d69beb..baf34e213 100644
--- a/provisioning/roles/geerlingguy.php-pecl/README.md
+++ b/provisioning/roles/geerlingguy.php-pecl/README.md
@@ -2,16 +2,22 @@
 
 [![Build Status](https://travis-ci.org/geerlingguy/ansible-role-php-pecl.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-php-pecl)
 
-Installs PHP PECL extensions on servers with PHP already installed.
+Installs PHP PECL extensions (and optionally `pecl` itself) on servers with PHP already installed.
 
 ## Requirements
 
-PHP must already be installed on the server (along with the package `php-pear`), so the `pecl` command can be run.
+PHP must already be installed on the server. This role works great with and is tested alongside `geerlingguy.php`.
+
+Also, if you don't already have `php-pear` (RedHat) or `php-pecl` (Debian) installed, you should set `php_pecl_install_pecl: true` to force this role to install the proper package.
 
 ## Role Variables
 
 Available variables are listed below, along with default values (see `defaults/main.yml`):
 
+    php_pecl_install_pecl: false
+
+Whether to install `php-pecl` (Debian-based OSes) or `php-pear` (RedHat-based OSes).
+
     php_pecl_install_command: "pecl install"
 
 The command that will be run to install extensions. The default is generally correct, but if you're running Ubuntu 14.04 LTS and run into [this issue](https://github.com/geerlingguy/ansible-role-php-pecl/pull/7), you should override this default with `"pecl install -Z"`
@@ -21,6 +27,7 @@ The command that will be run to install extensions. The default is generally cor
 A list of extensions that should be installed via `pecl install`. If you'd like to have this role install extensions like XDebug, just add it in the list, like so:
 
     php_pecl_extensions:
+      - redis
       - xdebug
 
 ## Dependencies
@@ -33,11 +40,12 @@ A list of extensions that should be installed via `pecl install`. If you'd like
       vars_files:
         - vars/main.yml
       roles:
-        - { role: geerlingguy.php-pecl }
+        - geerlingguy.php-pecl
 
 *Inside `vars/main.yml`*:
 
     php_pecl_extensions:
+      - redis
       - xdebug
 
 ## License
@@ -46,4 +54,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.php-pecl/defaults/main.yml b/provisioning/roles/geerlingguy.php-pecl/defaults/main.yml
index 90f29e0b1..3138b59cd 100644
--- a/provisioning/roles/geerlingguy.php-pecl/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.php-pecl/defaults/main.yml
@@ -1,4 +1,6 @@
 ---
+php_pecl_install_pecl: false
+
 php_pecl_install_command: "pecl install"
 
 # Add extensions to this list to have them installed with this role.
diff --git a/provisioning/roles/geerlingguy.php-pecl/tasks/main.yml b/provisioning/roles/geerlingguy.php-pecl/tasks/main.yml
index 44577c142..c9e500e1a 100644
--- a/provisioning/roles/geerlingguy.php-pecl/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php-pecl/tasks/main.yml
@@ -1,6 +1,15 @@
 ---
+- name: Include OS-Specific variables.
+  include_vars: "{{ ansible_os_family }}.yml"
+
+- name: Ensure pecl is installed (if configured).
+  package:
+    name: "{{ php_pecl_package }}"
+    state: present
+  when: php_pecl_install_pecl
+
 - name: Install PECL libaries.
-  shell: "yes \"\" | {{ php_pecl_install_command }} {{ item }}"
+  shell: "yes '' | {{ php_pecl_install_command }} {{ item }}"
   register: pecl_result
   changed_when: "pecl_result.rc == 0"
   failed_when: "not (('already installed' in pecl_result.stdout) or ('install ok:' in pecl_result.stdout))"
diff --git a/provisioning/roles/geerlingguy.php-pecl/tests/README.md b/provisioning/roles/geerlingguy.php-pecl/tests/README.md
new file mode 100644
index 000000000..6fb211721
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-pecl/tests/README.md
@@ -0,0 +1,11 @@
+# Ansible Role tests
+
+To run the test playbook(s) in this directory:
+
+  1. Install and start Docker.
+  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
+    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
+  1. Make the test shim executable: `chmod +x tests/test.sh`.
+  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
+
+If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.php-pecl/tests/test.yml b/provisioning/roles/geerlingguy.php-pecl/tests/test.yml
index f5256d43f..298f34d7f 100644
--- a/provisioning/roles/geerlingguy.php-pecl/tests/test.yml
+++ b/provisioning/roles/geerlingguy.php-pecl/tests/test.yml
@@ -4,12 +4,22 @@
   vars:
     php_enable_webserver: false
     php_enablerepo: "remi,remi-php70"
+    php_pecl_extensions:
+      - redis
 
   pre_tasks:
     - name: Update apt cache.
-      apt: update_cache=yes
+      apt: update_cache=yes cache_valid_time=600
       when: ansible_os_family == 'Debian'
 
+    - name: Install development tools (Debian).
+      apt: name=build-essential state=present
+      when: ansible_os_family == 'Debian'
+
+    - name: Install development tools (RedHat).
+      yum: name="@Development tools" state=present
+      when: ansible_os_family == 'RedHat'
+
   roles:
     - role: geerlingguy.repo-remi
       when: ansible_os_family == 'RedHat'
diff --git a/provisioning/roles/geerlingguy.php-pecl/vars/Debian.yml b/provisioning/roles/geerlingguy.php-pecl/vars/Debian.yml
new file mode 100644
index 000000000..47c282c72
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-pecl/vars/Debian.yml
@@ -0,0 +1,2 @@
+---
+php_pecl_package: php-pecl
diff --git a/provisioning/roles/geerlingguy.php-pecl/vars/RedHat.yml b/provisioning/roles/geerlingguy.php-pecl/vars/RedHat.yml
new file mode 100644
index 000000000..fd71295b9
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-pecl/vars/RedHat.yml
@@ -0,0 +1,2 @@
+---
+php_pecl_package: php-pear

From b0fc6602500fd98c1dd95c2541b0f6882c843443 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <m@oxy.fi>
Date: Thu, 20 Jul 2017 11:51:35 -0500
Subject: [PATCH 0856/1273] Issue #1468: Fix various Linux issues with NFS by
 defaulting to TCP

---
 Vagrantfile                                |  3 ++-
 docs/getting-started/installation-linux.md | 24 ----------------------
 docs/getting-started/syncing-folders.md    |  2 +-
 3 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index c69c53a39..774121ef8 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -93,7 +93,8 @@ Vagrant.configure('2') do |config|
       rsync__args: ['--verbose', '--archive', '--delete', '-z', '--copy-links', '--chmod=ugo=rwX'],
       id: synced_folder['id'],
       create: synced_folder.fetch('create', false),
-      mount_options: synced_folder.fetch('mount_options', [])
+      mount_options: synced_folder.fetch('mount_options', []),
+      nfs_udp: synced_folder.fetch('nfs_udp', false)
     }
     synced_folder.fetch('options_override', {}).each do |key, value|
       options[key.to_sym] = value
diff --git a/docs/getting-started/installation-linux.md b/docs/getting-started/installation-linux.md
index 69196cd37..fcc92e791 100644
--- a/docs/getting-started/installation-linux.md
+++ b/docs/getting-started/installation-linux.md
@@ -73,30 +73,6 @@ If encryption is not the issue then it's likely that either NFS isn't running co
 
 After attempting any of the above fixes, run `vagrant reload --provision` to restart the VM and attempt mounting the synced folder again, or `vagrant destroy -f && vagrant up` to rebuild the VM from scratch.
 
-### NFS shares are slow or hang due to UDP protocol
-
-If the default transport protocol UDP is causing slowness or failures to mount NFS shared folders, you can switch to NFSv4 and TCP by configuring your `vagrant_synced_folders` like the example below:
-
-```
-vagrant_synced_folders:
-  # The default share.
-  - local_path: .
-    destination: /var/www/drupalvm
-    type: nfs
-    create: true
-    options_override:
-      nfs_version: 4
-      nfs_udp: false
-
-  # Manually specify the /vagrant share to override the defaults
-  - local_path: .
-    destination: /vagrant
-    type: nfs
-    options_override:
-      nfs_version: 4
-      nfs_udp: false
-```
-
 ## Intel VT-x virtualization support
 
 On some laptops, Intel VT-x virtualization (which is built into most modern Intel processors) is enabled by default. This allows VirtualBox to run virtual machines efficiently using the CPU itself instead of software CPU emulation. If you get a message like "VT-x is disabled in the bios for both all cpu modes" or something similar, you may need to enter your computer's BIOS or UEFI settings and enable this virtualization support.
diff --git a/docs/getting-started/syncing-folders.md b/docs/getting-started/syncing-folders.md
index 8c4c63a48..d75a5c377 100644
--- a/docs/getting-started/syncing-folders.md
+++ b/docs/getting-started/syncing-folders.md
@@ -14,7 +14,7 @@ You can add as many synced folders as you'd like, and you can configure [any typ
 
 ## Options
 
-The synced folder options exposed are `type`, `excluded_paths` (when using rsync), `id`, `create` and `mount_options`. Besides these there are some sane defaults set when using rsync. For example all files synced with rsync will be writable by everyone, thus allowing the web server to create files.
+The synced folder options exposed are `type`, `excluded_paths` (when using rsync), `id`, `create`, `mount_options` and `nfs_udp`. Besides these there are some sane defaults set when using rsync. For example all files synced with rsync will be writable by everyone, thus allowing the web server to create files.
 
 ### Overriding defaults
 

From 9c712ae497c95e2b159212bd9a26d14b8b4600cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <m@oxy.fi>
Date: Fri, 21 Jul 2017 10:15:28 -0500
Subject: [PATCH 0857/1273] Use absolute paths for example
 post_provision_scripts

---
 default.config.yml                     |  7 ++++---
 docs/deployment/composer-dependency.md | 10 ----------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/default.config.yml b/default.config.yml
index 536b45bde..bab56f4ca 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -280,11 +280,12 @@ composer_home_group: "{{ drupalvm_user }}"
 composer_global_packages:
   - { name: hirak/prestissimo, release: '^0.3' }
 
-# Run specified scripts before or after VM is provisioned. Path is relative to
-# the `provisioning/playbook.yml` file.
+# Run specified scripts before or after VM is provisioned. Use {{ playbook_dir }}
+# to reference the provisioning/ folder in Drupal VM or {{ config_dir }} to
+# reference the directory where your `config.yml` is.
 pre_provision_scripts: []
 post_provision_scripts: []
-  # - "../examples/scripts/configure-solr.sh"
+  # - "{{ playbook_dir }}/../examples/scripts/configure-solr.sh"
 
 # MySQL Configuration.
 mysql_root_password: root
diff --git a/docs/deployment/composer-dependency.md b/docs/deployment/composer-dependency.md
index 8fd48d263..2ef2ac614 100644
--- a/docs/deployment/composer-dependency.md
+++ b/docs/deployment/composer-dependency.md
@@ -45,16 +45,6 @@ If you intened to use the devel module, it must be added as a requirement to you
 drupal_enabled_modules: []
 ```
 
-If you're using `pre_provision_scripts` or `post_provision_scripts` you also need to adjust their paths to take into account the new directory structure. The examples used in `default.config.yml` assume the files are located in the Drupal VM directory. You can use the `config_dir` variable which is the absolute path of the directory where your `config.yml` is located.
-
-```yaml
-post_provision_scripts:
-  # The default provided in `default.config.yml`:
-  - "../../examples/scripts/configure-solr.sh"
-  # With Drupal VM as a Composer dependency:
-  - "{{ config_dir }}/../examples/scripts/configure-solr.sh"
-```
-
 ### Create a delegating `Vagrantfile`
 
 Create a delegating `Vagrantfile` that will catch all your `vagrant` commands and send them to Drupal VM's own `Vagrantfile`. Place this file in your project's root directory.

From 00f10c1a1c687665fa72c89f01287835a3f4cb5b Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 23 Jul 2017 14:44:07 -0500
Subject: [PATCH 0858/1273] Update MySQL role to latest version.

---
 provisioning/requirements.yml                        |  2 +-
 provisioning/roles/geerlingguy.mysql/README.md       | 12 +++++++++++-
 provisioning/roles/geerlingguy.mysql/tasks/users.yml |  1 +
 .../roles/geerlingguy.mysql/templates/my.cnf.j2      |  2 ++
 .../roles/geerlingguy.mysql/templates/root-my.cnf.j2 |  2 ++
 .../roles/geerlingguy.mysql/templates/user-my.cnf.j2 |  2 ++
 6 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 30967ecfa..02be9e152 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -36,7 +36,7 @@
 - src: geerlingguy.memcached
   version: 1.0.7
 - src: geerlingguy.mysql
-  version: 2.7.2
+  version: 2.8.0
 - src: geerlingguy.nginx
   version: 2.4.0
 - src: geerlingguy.nodejs
diff --git a/provisioning/roles/geerlingguy.mysql/README.md b/provisioning/roles/geerlingguy.mysql/README.md
index 8a194898b..be864bc22 100644
--- a/provisioning/roles/geerlingguy.mysql/README.md
+++ b/provisioning/roles/geerlingguy.mysql/README.md
@@ -60,7 +60,17 @@ The MySQL databases to create. A database has the values `name`, `encoding` (def
 
     mysql_users: []
 
-The MySQL users and their privileges. A user has the values `name`, `host` (defaults to `localhost`), `password`, `priv` (defaults to `*.*:USAGE`), `append_privs` (defaults to `no`),  `state`  (defaults to `present`). The formats of these are the same as in the `mysql_user` module.
+The MySQL users and their privileges. A user has the values:
+
+  - `name`
+  - `host` (defaults to `localhost`)
+  - `password` (can be plaintext or encrypted—if encrypted, set `encrypted: yes`)
+  - `encrypted` (defaults to `no`)
+  - `priv` (defaults to `*.*:USAGE`)
+  - `append_privs` (defaults to `no`)
+  - `state`  (defaults to `present`)
+
+The formats of these are the same as in the `mysql_user` module.
 
     mysql_packages:
       - mysql
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/users.yml b/provisioning/roles/geerlingguy.mysql/tasks/users.yml
index 6c41ce770..75265ea42 100644
--- a/provisioning/roles/geerlingguy.mysql/tasks/users.yml
+++ b/provisioning/roles/geerlingguy.mysql/tasks/users.yml
@@ -7,5 +7,6 @@
     priv: "{{ item.priv | default('*.*:USAGE') }}"
     state: "{{ item.state | default('present') }}"
     append_privs: "{{ item.append_privs | default('no') }}"
+    encrypted: "{{ item.encrypted | default('no') }}"
   with_items: "{{ mysql_users }}"
   no_log: true
diff --git a/provisioning/roles/geerlingguy.mysql/templates/my.cnf.j2 b/provisioning/roles/geerlingguy.mysql/templates/my.cnf.j2
index 2066dc5cb..b2ce8d386 100644
--- a/provisioning/roles/geerlingguy.mysql/templates/my.cnf.j2
+++ b/provisioning/roles/geerlingguy.mysql/templates/my.cnf.j2
@@ -1,3 +1,5 @@
+# {{ ansible_managed }}
+
 [client]
 #password = your_password
 port = {{ mysql_port }}
diff --git a/provisioning/roles/geerlingguy.mysql/templates/root-my.cnf.j2 b/provisioning/roles/geerlingguy.mysql/templates/root-my.cnf.j2
index b0d27b8c8..5d2ab5272 100644
--- a/provisioning/roles/geerlingguy.mysql/templates/root-my.cnf.j2
+++ b/provisioning/roles/geerlingguy.mysql/templates/root-my.cnf.j2
@@ -1,3 +1,5 @@
+# {{ ansible_managed }}
+
 [client]
 user="{{ mysql_root_username }}"
 password="{{ mysql_root_password }}"
diff --git a/provisioning/roles/geerlingguy.mysql/templates/user-my.cnf.j2 b/provisioning/roles/geerlingguy.mysql/templates/user-my.cnf.j2
index f8a8f6526..257a97349 100644
--- a/provisioning/roles/geerlingguy.mysql/templates/user-my.cnf.j2
+++ b/provisioning/roles/geerlingguy.mysql/templates/user-my.cnf.j2
@@ -1,3 +1,5 @@
+# {{ ansible_managed }}
+
 [client]
 user="{{ mysql_user_name }}"
 password="{{ mysql_user_password }}"

From bc96336883d52ac3008079adaf85ab78371067d7 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 27 Jul 2017 08:43:42 -0500
Subject: [PATCH 0859/1273] Fixes #1476: Update Drupal role to speed up initial
 Drupal project generation.

---
 provisioning/requirements.yml                 |  2 +-
 .../tasks/build-composer-project.yml          | 27 ++++++++++++++-----
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 02be9e152..056a26e51 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -18,7 +18,7 @@
 - src: geerlingguy.daemonize
   version: 1.1.1
 - src: geerlingguy.drupal
-  version: 2.2.2
+  version: 2.3.0
 - src: geerlingguy.drupal-console
   version: 1.1.0
 - src: geerlingguy.drush
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/build-composer-project.yml b/provisioning/roles/geerlingguy.drupal/tasks/build-composer-project.yml
index 8d10099f4..32cf2c2ec 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/build-composer-project.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/build-composer-project.yml
@@ -1,4 +1,20 @@
 ---
+- name: Delete old /tmp/composer-project
+  file:
+    path: "/tmp/composer-project"
+    state: absent
+  when: not drupal_site_exists
+
+- name: Generate Drupal project with composer package in /tmp/composer-project.
+  command: >
+    {{ composer_path }} create-project
+    {{ drupal_composer_project_package }} /tmp/composer-project
+    {{ drupal_composer_project_options|default('--prefer-dist --no-interaction') }}
+  when: not drupal_site_exists
+  become: no
+  environment:
+      COMPOSER_PROCESS_TIMEOUT: 1200
+
 - name: Ensure drupal_composer_install_dir directory has proper permissions.
   file:
     path: "{{ drupal_composer_install_dir }}"
@@ -9,15 +25,12 @@
   when: not drupal_site_exists
   failed_when: false
 
-- name: Generate Drupal project with composer package.
+- name: Move Drupal project files to drupal_composer_install_dir.
   command: >
-    {{ composer_path }} create-project
-    {{ drupal_composer_project_package }} {{ drupal_composer_install_dir }}
-    {{ drupal_composer_project_options|default('--prefer-dist --no-interaction') }}
-  when: not drupal_site_exists
+    cp -r /tmp/composer-project/. {{ drupal_composer_install_dir }}/
+    creates={{ drupal_core_path }}/index.php
   become: no
-  environment:
-      COMPOSER_PROCESS_TIMEOUT: 1200
+  when: not drupal_site_exists
 
 - name: Install dependencies with composer require.
   composer:

From ac6a172b994fd252a1097d985923ae6d467c1256 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 31 Jul 2017 22:52:28 -0500
Subject: [PATCH 0860/1273] Fixes #1487: Install mod_headers for Apache by
 default.

---
 default.config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/default.config.yml b/default.config.yml
index bab56f4ca..2e7b0125f 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -148,6 +148,7 @@ apache_packages_state: latest
 apache_remove_default_vhost: true
 apache_mods_enabled:
   - expires.load
+  - headers.load
   - ssl.load
   - rewrite.load
   - proxy.load

From fa1efadfabb9283a0e93bd22c35d23dbd70cc0c1 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 2 Aug 2017 22:43:31 -0500
Subject: [PATCH 0861/1273] Issue #1497, Issue #1451: Bump the Drupal VM Docker
 image base to Debian 9 'Stretch'.

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

diff --git a/Dockerfile b/Dockerfile
index 7c6d3d6ba..cc8d19490 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM geerlingguy/docker-debian8-ansible:latest
+FROM geerlingguy/docker-debian9-ansible:latest
 LABEL maintainer="Jeff Geerling"
 
 # Copy provisioning directory, variable overrides, and scripts into container.

From be032d6db61e4e6d3a1eba5265c196586a722272 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 25 Jun 2017 16:05:35 -0500
Subject: [PATCH 0862/1273] Issue #1451: Add automated test build on Debian 9
 (Stretch).

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index a834adece..131437338 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,6 +26,9 @@ env:
     # Defaults - CentOS 7.
     - type: centos
       distro: centos7
+    # Defaults - Debian 9.
+    - type: debian
+      distro: debian9
     # Defaults - Debian 8.
     - type: debian
       distro: debian8

From 83ed2135fcd0a3d349a55c1fcd81ba35665b5f69 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 27 Jun 2017 21:11:26 -0500
Subject: [PATCH 0863/1273] Issue #1451: Fix debian9 test usage.

---
 tests/run-tests.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index d8b7c2a98..93b2545a3 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -37,6 +37,10 @@ elif [ $distro = 'ubuntu1404' ]; then
 elif [ $distro = 'ubuntu1204' ]; then
   init="/sbin/init"
   opts="--privileged"
+# Debian 9
+elif [ $distro = 'debian9' ]; then
+  init="/lib/systemd/systemd"
+  opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
 # Debian 8
 elif [ $distro = 'debian8' ]; then
   init="/lib/systemd/systemd"

From 5c29387305a6d02116742327e1539e6e6742d95e Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 2 Aug 2017 23:11:02 -0500
Subject: [PATCH 0864/1273] Fixes #1497: Recommend mounting /var/lib/mysql as a
 volume for Docker.

---
 docs/other/docker.md       | 3 +++
 example.docker-compose.yml | 1 +
 2 files changed, 4 insertions(+)

diff --git a/docs/other/docker.md b/docs/other/docker.md
index df7776fb6..3e8ca05ab 100644
--- a/docs/other/docker.md
+++ b/docs/other/docker.md
@@ -48,6 +48,7 @@ If you only need a simple container to run your site, and you want to package up
         privileged: true
         volumes:
           - ./:/var/www/drupalvm/drupal/web/:rw,delegated
+          - /var/lib/mysql
         command: /lib/systemd/systemd
     ```
 
@@ -85,6 +86,8 @@ Copy the `example.docker-compose.yml` file out of Drupal VM (or grab a copy from
 
 For the `volume:` definition in `docker-compose.yml`, Drupal VM's default docroot is `/var/www/drupalvm/drupal/web`, which follows the convention of a typical Drupal project built with Composer. If you don't get your site when you attempt to access Drupal VM, you will either need to modify the `volume:` definition to match your project's structure, or use a custom `Dockerfile` and copy in a customized Apache `vhosts.conf` file.
 
+You should also add a volume for MySQL data, otherwise MySQL may not start up correctly. By default, you should have a volume for `/var/lib/mysql` (no need to sync it locally). See Drupal VM's example docker-compose file for reference.
+
 ### Run Drupal VM
 
 Run the command `docker-compose up -d` (the `-d` tells `docker-compose` to start the containers and run in the background).
diff --git a/example.docker-compose.yml b/example.docker-compose.yml
index 49e2d490a..a3a9fea7f 100644
--- a/example.docker-compose.yml
+++ b/example.docker-compose.yml
@@ -26,6 +26,7 @@ services:
 
     volumes:
       - ./:/var/www/drupalvm/:rw,delegated
+      - /var/lib/mysql
 
     privileged: true
     command: /lib/systemd/systemd

From 0e4fab482f260839ad5b357d362250d73ac03939 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 6 Aug 2017 20:50:21 -0500
Subject: [PATCH 0865/1273] Issue #1451: Try to add a MySQL volume for Debian 9
 test.

---
 tests/run-tests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index 93b2545a3..eb30ddd79 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -40,7 +40,7 @@ elif [ $distro = 'ubuntu1204' ]; then
 # Debian 9
 elif [ $distro = 'debian9' ]; then
   init="/lib/systemd/systemd"
-  opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro --volume=/var/lib/mysql"
 # Debian 8
 elif [ $distro = 'debian8' ]; then
   init="/lib/systemd/systemd"

From fd9dabaf45218fe23526fc41a7d58bd82dcccc67 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 7 Aug 2017 21:32:23 -0500
Subject: [PATCH 0866/1273] Issue #1451: Could be as easy as localhost instead
 of IP.

---
 default.config.yml | 1 +
 tests/run-tests.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/default.config.yml b/default.config.yml
index 2e7b0125f..3b90a26d7 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -88,6 +88,7 @@ drupal_core_owner: "{{ drupalvm_user }}"
 drupal_db_user: drupal
 drupal_db_password: drupal
 drupal_db_name: drupal
+drupal_db_host: localhost
 
 # Settings for installing a Drupal site if 'drupal_install_site:' is 'true'.
 drupal_major_version: 8
diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index eb30ddd79..93b2545a3 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -40,7 +40,7 @@ elif [ $distro = 'ubuntu1204' ]; then
 # Debian 9
 elif [ $distro = 'debian9' ]; then
   init="/lib/systemd/systemd"
-  opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro --volume=/var/lib/mysql"
+  opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
 # Debian 8
 elif [ $distro = 'debian8' ]; then
   init="/lib/systemd/systemd"

From 98b969e2cc8d7e49b4e2d0afd79a86fa5f8e919a Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 8 Aug 2017 00:28:37 -0500
Subject: [PATCH 0867/1273] Update drush_version to 8.1.12.

---
 default.config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.config.yml b/default.config.yml
index 3b90a26d7..12099aa55 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -234,7 +234,7 @@ extra_packages:
   - sqlite
 
 # You can configure almost anything else on the server in the rest of this file.
-drush_version: "8.1.10"
+drush_version: "8.1.12"
 
 extra_security_enabled: false
 

From 9d7e4da9f885fa05be9476abd23850b2cd7828fb Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 8 Aug 2017 00:29:57 -0500
Subject: [PATCH 0868/1273] Fixes #1451: Update geerlingguy.varnish role so it
 works correctly with Debian 9+.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.varnish/.travis.yml     |  6 +++--
 .../roles/geerlingguy.varnish/tasks/main.yml  | 22 +++++++++++++++----
 .../roles/geerlingguy.varnish/tests/setup.yml |  3 +++
 4 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 056a26e51..1e747090d 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -78,4 +78,4 @@
 - src: geerlingguy.solr
   version: 3.5.5
 - src: geerlingguy.varnish
-  version: 2.0.0
+  version: 2.0.2
diff --git a/provisioning/roles/geerlingguy.varnish/.travis.yml b/provisioning/roles/geerlingguy.varnish/.travis.yml
index 8b9990896..75956f173 100644
--- a/provisioning/roles/geerlingguy.varnish/.travis.yml
+++ b/provisioning/roles/geerlingguy.varnish/.travis.yml
@@ -6,8 +6,7 @@ env:
   - distro: centos6
   - distro: ubuntu1604
   - distro: ubuntu1404
-  # See: https://github.com/varnishcache/pkg-varnish-cache/issues/78
-  # - distro: debian9
+  - distro: debian9
   - distro: debian8
 
   # Also test installing older versions.
@@ -38,5 +37,8 @@ script:
     varnish_version="${varnish_version:-5.1}"
     docker exec --tty ${container_id} env TERM=xterm varnishd -V | grep "${varnish_version}"
 
+  # Test port 80.
+  - 'docker exec --tty ${container_id} env TERM=xterm curl -sI localhost:80 | grep -q "Via: .* varnish"'
+
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.varnish/tasks/main.yml b/provisioning/roles/geerlingguy.varnish/tasks/main.yml
index 80674faa6..231e1486c 100644
--- a/provisioning/roles/geerlingguy.varnish/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.varnish/tasks/main.yml
@@ -36,8 +36,8 @@
     group: root
     mode: 0644
   when: >
-    (ansible_os_family == 'Debian') and
-    (ansible_distribution_release == "jessie" or ansible_distribution_release == "xenial")
+    (ansible_distribution == 'Debian' and ansible_distribution_version|int >= 8) or
+    (ansible_distribution == 'Ubuntu' and ansible_distribution_version.split(".")[0]|int >= 16)
   notify:
     - reload systemd
     - restart varnish
@@ -72,10 +72,24 @@
     mode: 0644
   notify: restart varnish
 
-- name: Ensure Varnish services are started enabled on startup.
+- name: Ensure Varnish services are started and enabled on startup.
   service:
     name: "{{ item }}"
     state: started
     enabled: yes
   with_items: "{{ varnish_enabled_services | default([]) }}"
-  when: varnish_enabled_services
+  when: >
+    varnish_enabled_services and
+    (ansible_os_family != 'Debian' and ansible_distribution_release != "xenial")
+
+# See: https://github.com/ansible/ansible/issues/22303
+- name: Ensure Varnish services are started enabled on startup (Xenial specific)
+  service:
+    name: "{{ item }}"
+    state: started
+    enabled: yes
+    use: "service"
+  with_items: "{{ varnish_enabled_services | default([]) }}"
+  when:
+    - varnish_enabled_services
+    - (ansible_os_family == 'Debian' and ansible_distribution_release == "xenial")
diff --git a/provisioning/roles/geerlingguy.varnish/tests/setup.yml b/provisioning/roles/geerlingguy.varnish/tests/setup.yml
index b40ee7eb2..61f75d4f0 100644
--- a/provisioning/roles/geerlingguy.varnish/tests/setup.yml
+++ b/provisioning/roles/geerlingguy.varnish/tests/setup.yml
@@ -15,3 +15,6 @@
   with_items:
     - logrotate
   when: ansible_os_family == 'RedHat' and ansible_distribution_major_version < '7'
+
+- name: Ensure curl is installed.
+  package: 'name=curl state=present'

From 93ddfe408c106b43eb972e6fd5be413fee92d18f Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 8 Aug 2017 08:50:42 -0500
Subject: [PATCH 0869/1273] Fixes #1504: Display (this may take a while) for
 long-running Composer tasks.

---
 provisioning/requirements.yml                               | 2 +-
 provisioning/roles/geerlingguy.drupal/README.md             | 3 ++-
 provisioning/roles/geerlingguy.drupal/defaults/main.yml     | 1 +
 .../geerlingguy.drupal/tasks/build-composer-project.yml     | 6 +++---
 .../roles/geerlingguy.drupal/tasks/build-composer.yml       | 4 ++--
 .../roles/geerlingguy.drupal/tasks/install-site.yml         | 2 +-
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 1e747090d..0eade5004 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -18,7 +18,7 @@
 - src: geerlingguy.daemonize
   version: 1.1.1
 - src: geerlingguy.drupal
-  version: 2.3.0
+  version: 2.3.1
 - src: geerlingguy.drupal-console
   version: 1.1.0
 - src: geerlingguy.drush
diff --git a/provisioning/roles/geerlingguy.drupal/README.md b/provisioning/roles/geerlingguy.drupal/README.md
index 6086d45df..71d9bc513 100644
--- a/provisioning/roles/geerlingguy.drupal/README.md
+++ b/provisioning/roles/geerlingguy.drupal/README.md
@@ -84,11 +84,12 @@ Set this to `false` if you don't need to install Drupal (using the `drupal_*` se
     drupal_domain: "drupaltest.dev"
     drupal_site_name: "Drupal"
     drupal_install_profile: standard
+    drupal_site_install_extra_args: []
     drupal_enable_modules: []
     drupal_account_name: admin
     drupal_account_pass: admin
 
-Settings for installing a Drupal site if `drupal_install_site` is `true`.
+Settings for installing a Drupal site if `drupal_install_site` is `true`. If you need to pass additional arguments to the `drush site-install` command, you can pass them in as a list to the `drupal_site_install_extra_args` variable.
 
 ## Dependencies
 
diff --git a/provisioning/roles/geerlingguy.drupal/defaults/main.yml b/provisioning/roles/geerlingguy.drupal/defaults/main.yml
index b3d28015b..defa9e1cd 100644
--- a/provisioning/roles/geerlingguy.drupal/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.drupal/defaults/main.yml
@@ -46,6 +46,7 @@ drupal_install_site: true
 drupal_domain: "drupaltest.dev"
 drupal_site_name: "Drupal"
 drupal_install_profile: standard
+drupal_site_install_extra_args: []
 drupal_enable_modules: []
 drupal_account_name: admin
 drupal_account_pass: admin
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/build-composer-project.yml b/provisioning/roles/geerlingguy.drupal/tasks/build-composer-project.yml
index 32cf2c2ec..1d9cbe5d6 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/build-composer-project.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/build-composer-project.yml
@@ -5,7 +5,7 @@
     state: absent
   when: not drupal_site_exists
 
-- name: Generate Drupal project with composer package in /tmp/composer-project.
+- name: Generate Drupal project with composer package in /tmp/composer-project (this may take a while).
   command: >
     {{ composer_path }} create-project
     {{ drupal_composer_project_package }} /tmp/composer-project
@@ -25,14 +25,14 @@
   when: not drupal_site_exists
   failed_when: false
 
-- name: Move Drupal project files to drupal_composer_install_dir.
+- name: Move Drupal project files to drupal_composer_install_dir (this may take a while).
   command: >
     cp -r /tmp/composer-project/. {{ drupal_composer_install_dir }}/
     creates={{ drupal_core_path }}/index.php
   become: no
   when: not drupal_site_exists
 
-- name: Install dependencies with composer require.
+- name: Install dependencies with composer require (this may take a while).
   composer:
     command: require
     arguments: "{{ item }}"
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/build-composer.yml b/provisioning/roles/geerlingguy.drupal/tasks/build-composer.yml
index 1aeee2124..508b0a969 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/build-composer.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/build-composer.yml
@@ -21,14 +21,14 @@
   when: drupal_composer_path and not drupal_site_exists
   become: no
 
-- name: Run composer install.
+- name: Run composer install (this may take a while).
   composer:
     command: install
     working_dir: "{{ drupal_composer_install_dir }}"
   when: not drupal_site_exists
   become: no
 
-- name: Install dependencies with composer require.
+- name: Install dependencies with composer require (this may take a while).
   composer:
     command: require
     arguments: "{{ item }}"
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/install-site.yml b/provisioning/roles/geerlingguy.drupal/tasks/install-site.yml
index 1d7548d79..7a4f5b649 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/install-site.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/install-site.yml
@@ -26,7 +26,7 @@
     --account-name={{ drupal_account_name }}
     --account-pass={{ drupal_account_pass }}
     --db-url={{ drupal_db_backend }}://{{ drupal_db_user }}:{{ drupal_db_password }}@{{ drupal_db_host }}/{{ drupal_db_name }}
-    {{ drupal_site_install_extra_args | default([]) | join(" ") }}
+    {{ drupal_site_install_extra_args | join(" ") }}
   args:
     chdir: "{{ drupal_core_path }}"
   notify: clear opcache

From 86cc7e882473131c8654a20bb2bed90106a09b28 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 9 Aug 2017 21:45:27 -0500
Subject: [PATCH 0870/1273] Fixes #1508: Switch to using localhost for MySQL so
 install-drupal works on Debian 9.

---
 provisioning/docker/bin/install-drupal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/docker/bin/install-drupal b/provisioning/docker/bin/install-drupal
index f20fb1202..43165e01f 100755
--- a/provisioning/docker/bin/install-drupal
+++ b/provisioning/docker/bin/install-drupal
@@ -25,7 +25,7 @@ drush dl drupal-$DRUPAL_VERSION \
 # Install Drupal with Drush.
 echo "Installing Drupal"
 drush si standard --root=$PROJECT_PATH/web -y \
-  --db-url='mysql://drupal:drupal@127.0.0.1/drupal' \
+  --db-url='mysql://drupal:drupal@localhost/drupal' \
   --site-name='Drupal VM' \
   --account-name=admin --account-pass=admin
 

From 29c064759a4827f4b7058a79a26ac64b79b0f841 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 10 Aug 2017 13:12:58 -0500
Subject: [PATCH 0871/1273] Update Drupal Console docs to reflect that it's not
 enabled by default.

---
 docs/extras/drupal-console.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/extras/drupal-console.md b/docs/extras/drupal-console.md
index 367c81320..f6ffa0a2d 100644
--- a/docs/extras/drupal-console.md
+++ b/docs/extras/drupal-console.md
@@ -1,6 +1,6 @@
 [Drupal Console](https://drupalconsole.com/) is a modern CLI for interacting with Drupal and scaffolding a site. It works only with Drupal 8+, and is built on top of the Symfony Console component.
 
-Drupal VM will automatically install Drupal Console if you install Drupal 8 or later in your VM (this is based on the value of the `drupal_major_version` variable inside `config.yml`.
+To have Drupal Console installed globally inside Drupal VM, make sure `drupalconsole` is in the list of `installed_extras` in your `config.yml` file. If you're adding it to an existing Drupal VM, run `vagrant provision` so it gets installed. You also (or instead) might want to add Drupal Console as a dependency of your Drupal project—if you do this, you may not need to add `drupalconsole` to Drupal VM globally.
 
 To use Drupal Console with a Drupal 8 site (in this case, using the default configuration that ships with Drupal VM):
 

From 0cf2b0e9c721fdac035ee8e9b02690d5dabaa0cc Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 10 Aug 2017 22:58:40 -0500
Subject: [PATCH 0872/1273] Update Ruby role to latest version.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.ruby/.gitignore         |  2 +
 .../roles/geerlingguy.ruby/.travis.yml        | 64 ++++++-------------
 provisioning/roles/geerlingguy.ruby/LICENSE   | 20 ++++++
 provisioning/roles/geerlingguy.ruby/README.md |  2 +-
 .../roles/geerlingguy.ruby/defaults/main.yml  |  4 +-
 .../roles/geerlingguy.ruby/tasks/main.yml     | 14 ++--
 .../geerlingguy.ruby/tasks/setup-Debian.yml   |  4 +-
 .../geerlingguy.ruby/tasks/setup-RedHat.yml   |  4 +-
 .../roles/geerlingguy.ruby/tests/README.md    | 11 ++++
 .../roles/geerlingguy.ruby/tests/test.yml     | 13 ++++
 11 files changed, 86 insertions(+), 54 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.ruby/.gitignore
 create mode 100644 provisioning/roles/geerlingguy.ruby/LICENSE
 create mode 100644 provisioning/roles/geerlingguy.ruby/tests/README.md

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 0eade5004..06942c576 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -72,7 +72,7 @@
 - src: geerlingguy.repo-remi
   version: 1.2.0
 - src: geerlingguy.ruby
-  version: 2.4.2
+  version: 2.4.3
 - src: geerlingguy.security
   version: 1.5.0
 - src: geerlingguy.solr
diff --git a/provisioning/roles/geerlingguy.ruby/.gitignore b/provisioning/roles/geerlingguy.ruby/.gitignore
new file mode 100644
index 000000000..c9b2377e3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.ruby/.gitignore
@@ -0,0 +1,2 @@
+*.retry
+tests/test.sh
diff --git a/provisioning/roles/geerlingguy.ruby/.travis.yml b/provisioning/roles/geerlingguy.ruby/.travis.yml
index c6bbd6902..b3c2f57aa 100644
--- a/provisioning/roles/geerlingguy.ruby/.travis.yml
+++ b/provisioning/roles/geerlingguy.ruby/.travis.yml
@@ -4,88 +4,64 @@ services: docker
 env:
   # Package install on all OSes.
   - distro: centos7
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     playbook: test.yml
     ruby_version: 2.0.0
     ruby_path_prefix: /usr
   - distro: ubuntu1604
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     playbook: test.yml
     ruby_version: 2.3.1
     ruby_path_prefix: /usr
   - distro: ubuntu1404
-    init: /sbin/init
-    run_opts: ""
     playbook: test.yml
     ruby_version: 1.9.3
     ruby_path_prefix: /usr
   - distro: debian8
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     playbook: test.yml
     ruby_version: 2.1.5
     ruby_path_prefix: /usr
 
   # Source install on latest OSes.
   - distro: centos7
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     playbook: test-source.yml
     ruby_version: 2.3.0
     ruby_path_prefix: /usr/local
   - distro: ubuntu1604
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     playbook: test-source.yml
     ruby_version: 2.3.0
     ruby_path_prefix: /usr/local
 
-before_install:
-  # Pull container.
-  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
-
 script:
-  - container_id=$(mktemp)
-  # Run container in detached state.
-  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
-
-  # Install dependencies.
-  - 'docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
-
-  # Ansible syntax check.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} --syntax-check'
+  # Configure test script so we can run extra tests after playbook is run.
+  - export container_id=$(date +%s)
+  - export cleanup=false
 
-  # Test role.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook}'
+  # Download test shim.
+  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
+  - chmod +x ${PWD}/tests/test.sh
 
-  # Test role idempotence.
-  - idempotence=$(mktemp)
-  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} | tee -a ${idempotence}
-  - >
-    tail ${idempotence}
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
+  # Run tests.
+  - ${PWD}/tests/test.sh
 
   # Make sure ruby is installed and at the correct version.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm which ruby'
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm test -x ${ruby_path_prefix}/bin/ruby'
+  - 'docker exec --tty ${container_id} env TERM=xterm which ruby'
+  - 'docker exec --tty ${container_id} env TERM=xterm test -x ${ruby_path_prefix}/bin/ruby'
 
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ruby --version'
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ${ruby_path_prefix}/bin/ruby --version | grep -qF ${ruby_version}'
+  - 'docker exec --tty ${container_id} env TERM=xterm ruby --version'
+  - 'docker exec --tty ${container_id} env TERM=xterm ${ruby_path_prefix}/bin/ruby --version | grep -qF ${ruby_version}'
 
   # Make sure bundler is installed.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ls -lah /usr/local/bin'
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm which bundle'
+  - 'docker exec --tty ${container_id} env TERM=xterm ls -lah /usr/local/bin'
+  - 'docker exec --tty ${container_id} env TERM=xterm which bundle'
 
   # Make sure user installed gems are available.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm bash --login -c "which sass"'
+  - |
+    if [ "${distro}" != "ubuntu1404" ]; then
+      docker exec --tty ${container_id} env TERM=xterm bash --login -c "which sass"
+    fi
 
 after_failure:
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm which ruby'
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ruby --version'
+  - 'docker exec --tty ${container_id} env TERM=xterm which ruby'
+  - 'docker exec --tty ${container_id} env TERM=xterm ruby --version'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.ruby/LICENSE b/provisioning/roles/geerlingguy.ruby/LICENSE
new file mode 100644
index 000000000..4275cf3c1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.ruby/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Jeff Geerling
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/provisioning/roles/geerlingguy.ruby/README.md b/provisioning/roles/geerlingguy.ruby/README.md
index da0fad8a2..a4ce38666 100644
--- a/provisioning/roles/geerlingguy.ruby/README.md
+++ b/provisioning/roles/geerlingguy.ruby/README.md
@@ -60,4 +60,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.ruby/defaults/main.yml b/provisioning/roles/geerlingguy.ruby/defaults/main.yml
index 93e4f9b9e..d057b400d 100644
--- a/provisioning/roles/geerlingguy.ruby/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.ruby/defaults/main.yml
@@ -13,8 +13,8 @@ ruby_install_gems_user: "{{ ansible_user }}"
 # If set to TRUE, ruby will be installed from source, using the version set with
 # the 'ruby_version' variable instead of using a package.
 ruby_install_from_source: false
-ruby_download_url: http://cache.ruby-lang.org/pub/ruby/2.3/ruby-2.3.0.tar.gz
-ruby_version: 2.3.0
+ruby_download_url: http://cache.ruby-lang.org/pub/ruby/2.4/ruby-2.4.1.tar.gz
+ruby_version: 2.4.1
 
 # Default should usually work, but this will be overridden on Ubuntu 14.04.
 ruby_rubygems_package_name: rubygems
diff --git a/provisioning/roles/geerlingguy.ruby/tasks/main.yml b/provisioning/roles/geerlingguy.ruby/tasks/main.yml
index ab7d3247e..513f1775b 100644
--- a/provisioning/roles/geerlingguy.ruby/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.ruby/tasks/main.yml
@@ -1,14 +1,18 @@
 ---
 # Include OS-specific installation tasks.
 - include: setup-RedHat.yml
-  when: (ruby_install_from_source == false) and (ansible_os_family == 'RedHat')
+  when:
+    - ruby_install_from_source == False
+    - ansible_os_family == 'RedHat'
 
 - include: setup-Debian.yml
-  when: (ruby_install_from_source == false) and (ansible_os_family == 'Debian')
+  when:
+    - ruby_install_from_source == False
+    - ansible_os_family == 'Debian'
 
 # Install ruby from source when ruby_install_from_source is true.
 - include: install-from-source.yml
-  when: ruby_install_from_source == true
+  when: ruby_install_from_source == True
 
 - name: Add user installed RubyGems bin directory to global $PATH.
   copy:
@@ -22,7 +26,9 @@
   when: ruby_install_bundler
 
 - name: Install configured gems.
-  gem: "name={{ item }} state=present"
+  gem:
+    name: "{{ item }}"
+    state: present
   become: yes
   become_user: "{{ ruby_install_gems_user }}"
   with_items: "{{ ruby_install_gems }}"
diff --git a/provisioning/roles/geerlingguy.ruby/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.ruby/tasks/setup-Debian.yml
index fdcce9b89..da73a7ef0 100644
--- a/provisioning/roles/geerlingguy.ruby/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.ruby/tasks/setup-Debian.yml
@@ -7,8 +7,10 @@
     ruby_rubygems_package_name: rubygems-integration
   when: ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'trusty'
 
-- name: Install ruby and rubygems.
+- name: Install ruby, rubygems, and build-essential.
   apt: "name={{ item }} state=present"
   with_items:
     - ruby-full
+    - ruby-dev
     - "{{ ruby_rubygems_package_name }}"
+    - build-essential
diff --git a/provisioning/roles/geerlingguy.ruby/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.ruby/tasks/setup-RedHat.yml
index 6df6be14f..6e5df1cf4 100644
--- a/provisioning/roles/geerlingguy.ruby/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.ruby/tasks/setup-RedHat.yml
@@ -1,6 +1,8 @@
 ---
-- name: Install ruby and rubygems.
+- name: Install ruby, rubygems, and development tools.
   yum: "name={{ item }} state=present"
   with_items:
     - ruby
+    - ruby-devel
     - "{{ ruby_rubygems_package_name }}"
+    - '@development'
diff --git a/provisioning/roles/geerlingguy.ruby/tests/README.md b/provisioning/roles/geerlingguy.ruby/tests/README.md
new file mode 100644
index 000000000..6fb211721
--- /dev/null
+++ b/provisioning/roles/geerlingguy.ruby/tests/README.md
@@ -0,0 +1,11 @@
+# Ansible Role tests
+
+To run the test playbook(s) in this directory:
+
+  1. Install and start Docker.
+  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
+    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
+  1. Make the test shim executable: `chmod +x tests/test.sh`.
+  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
+
+If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.ruby/tests/test.yml b/provisioning/roles/geerlingguy.ruby/tests/test.yml
index 1e3fecd26..dbf3a888b 100644
--- a/provisioning/roles/geerlingguy.ruby/tests/test.yml
+++ b/provisioning/roles/geerlingguy.ruby/tests/test.yml
@@ -5,11 +5,24 @@
     ruby_install_gems_user: root
     ruby_install_gems:
       - sass
+    ruby_gems_bin_path: /root/.gem/ruby/bin
 
   pre_tasks:
     - name: Update apt cache.
       apt: update_cache=yes cache_valid_time=600
       when: ansible_os_family == 'Debian'
 
+    - name: Use different gems for older OSes (Ubuntu 14.04).
+      set_fact:
+        ruby_install_gems: ['json']
+      when:
+        - ansible_distribution == 'Ubuntu'
+        - ansible_distribution_version == '14.04'
+
+    - name: Add rubygems bin dir to system-wide $PATH.
+      copy:
+        dest: /etc/profile.d/ruby.sh
+        content: 'PATH=$PATH:{{ ruby_gems_bin_path }}'
+
   roles:
     - role_under_test

From 3a49f25f0a2e649d8f81e5d4cd7cd52930d19c8b Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 18 Aug 2017 16:10:33 -0500
Subject: [PATCH 0873/1273] Fixes #1507: Use https URL to download Adminer.

---
 provisioning/requirements.yml                         | 2 +-
 provisioning/roles/geerlingguy.adminer/tasks/main.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 06942c576..85db0e8bc 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -6,7 +6,7 @@
 - src: franklinkim.newrelic
   version: 1.6.0
 - src: geerlingguy.adminer
-  version: 1.1.1
+  version: 1.2.0
 - src: geerlingguy.apache
   version: 2.1.1
 - src: geerlingguy.apache-php-fpm
diff --git a/provisioning/roles/geerlingguy.adminer/tasks/main.yml b/provisioning/roles/geerlingguy.adminer/tasks/main.yml
index 3ad51e0c0..c943258a2 100644
--- a/provisioning/roles/geerlingguy.adminer/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.adminer/tasks/main.yml
@@ -8,7 +8,7 @@
 
 - name: Download Adminer to configured directory.
   get_url:
-    url: http://www.adminer.org/latest.php
+    url: https://www.adminer.org/latest.php
     dest: "{{ adminer_install_dir }}/{{ adminer_install_filename }}"
     mode: 0644
     timeout: 60

From 840b63a4491bfb5eb26a0a0adc323c354a98e020 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 18 Aug 2017 23:04:39 -0500
Subject: [PATCH 0874/1273] Fixes #1495: Update Drupal role so composer install
 can be skipped on deploy.

---
 provisioning/requirements.yml                           | 2 +-
 provisioning/roles/geerlingguy.drupal/README.md         | 4 ++++
 provisioning/roles/geerlingguy.drupal/defaults/main.yml | 1 +
 provisioning/roles/geerlingguy.drupal/tasks/deploy.yml  | 4 +++-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 85db0e8bc..4f16a5a36 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -18,7 +18,7 @@
 - src: geerlingguy.daemonize
   version: 1.1.1
 - src: geerlingguy.drupal
-  version: 2.3.1
+  version: 2.4.0
 - src: geerlingguy.drupal-console
   version: 1.1.0
 - src: geerlingguy.drush
diff --git a/provisioning/roles/geerlingguy.drupal/README.md b/provisioning/roles/geerlingguy.drupal/README.md
index 71d9bc513..49de79b9b 100644
--- a/provisioning/roles/geerlingguy.drupal/README.md
+++ b/provisioning/roles/geerlingguy.drupal/README.md
@@ -37,6 +37,10 @@ Set `drupal_deploy` to `true` and `drupal_build_composer*` to `false` if you wou
   - `dir`: The directory into which the repository will be checked out
   - `accept_hostkey`: Whether to automatically accept the Git server's hostkey on the first connection.
 
+You can also control whether a `composer install` is run after the git clone is finished using the following variable:
+
+    drupal_deploy_composer_install: yes
+
 ### Build a project from a Drush Make file
 
     drupal_build_makefile: false
diff --git a/provisioning/roles/geerlingguy.drupal/defaults/main.yml b/provisioning/roles/geerlingguy.drupal/defaults/main.yml
index defa9e1cd..a114542ea 100644
--- a/provisioning/roles/geerlingguy.drupal/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.drupal/defaults/main.yml
@@ -7,6 +7,7 @@ drupal_deploy_version: master
 drupal_deploy_update: true
 drupal_deploy_dir: "/var/www/drupal"
 drupal_deploy_accept_hostkey: no
+drupal_deploy_composer_install: yes
 
 # Set this to 'true' and 'drupal_build_composer*' to 'false' if you would like
 # to build a Drupal make file with Drush.
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/deploy.yml b/provisioning/roles/geerlingguy.drupal/tasks/deploy.yml
index 4d29b73f9..b6bf53133 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/deploy.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/deploy.yml
@@ -28,5 +28,7 @@
   composer:
     command: install
     working_dir: "{{ drupal_deploy_dir }}"
-  when: drupal_deploy_composer_file.stat.exists == true
+  when:
+    - drupal_deploy_composer_file.stat.exists == true
+    - drupal_deploy_composer_install == true
   become: no

From 2b3f96fec10d790c098f78ac00f565e9f07b2d7d Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 19 Aug 2017 23:04:15 -0500
Subject: [PATCH 0875/1273] Add pipelining option to ansible.cfg for speedup
 over SSH.

---
 provisioning/ansible.cfg | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/provisioning/ansible.cfg b/provisioning/ansible.cfg
index 002a50dd5..4b1740edf 100644
--- a/provisioning/ansible.cfg
+++ b/provisioning/ansible.cfg
@@ -1,2 +1,6 @@
 [defaults]
 roles_path = ./roles
+
+[ssh_connection]
+pipelining = True
+control_path = /tmp/ansible-ssh-%%h-%%p-%%r

From 8d21f15665a7accf38f01c62670ed32901f48db4 Mon Sep 17 00:00:00 2001
From: Petr Illek <petr@morpht.com>
Date: Tue, 22 Aug 2017 22:32:52 +0200
Subject: [PATCH 0876/1273] Reorganization of the dashboard with small styling
 update.

---
 provisioning/templates/dashboard.html.j2 | 318 ++++++++++++-----------
 1 file changed, 167 insertions(+), 151 deletions(-)

diff --git a/provisioning/templates/dashboard.html.j2 b/provisioning/templates/dashboard.html.j2
index 0a8b90ca9..7e3125bbf 100644
--- a/provisioning/templates/dashboard.html.j2
+++ b/provisioning/templates/dashboard.html.j2
@@ -90,37 +90,41 @@
     {%- endmacro -%}
 
     {%- macro sectionSiteList() -%}
-      <table class="table">
-        <thead>
-          <tr>
-            <th>Hostname</th>
-            <th>Document Root</th>
-            {% if configure_drush_aliases -%}
-              <th>Drush alias*</th>
+      <div class="table-responsive">
+        <table class="table table-striped table-hover">
+          <thead>
+            <tr>
+              <th>Hostname</th>
+              <th>Document Root</th>
+              {% if configure_drush_aliases -%}
+                <th>Drush alias*</th>
+              {%- endif %}
+            </tr>
+          </thead>
+          <tbody>
+            {% if drupalvm_webserver == 'apache' -%}
+              {%- for host in apache_vhosts -%}
+                {%- if host.documentroot is defined -%}
+                  {{ printSite(host.servername, host.documentroot) }}
+                {%- endif -%}
+              {%- endfor -%}
+            {%- elif drupalvm_webserver == 'nginx' -%}
+              {%- for host in nginx_vhosts -%}
+                {%- if host.root is defined -%}
+                  {%- for hostname in host.server_name.split() -%}
+                    {{ printSite(hostname, host.root) }}
+                  {%- endfor -%}
+                {%- endif -%}
+              {%- endfor -%}
             {%- endif %}
-        </thead>
-        <tbody>
-          {% if drupalvm_webserver == 'apache' -%}
-            {%- for host in apache_vhosts -%}
-              {%- if host.documentroot is defined -%}
-                {{ printSite(host.servername, host.documentroot) }}
-              {%- endif -%}
-            {%- endfor -%}
-          {%- elif drupalvm_webserver == 'nginx' -%}
-            {%- for host in nginx_vhosts -%}
-              {%- if host.root is defined -%}
-                {%- for hostname in host.server_name.split() -%}
-                  {{ printSite(hostname, host.root) }}
-                {%- endfor -%}
-              {%- endif -%}
-            {%- endfor -%}
-          {%- endif %}
-          <tr><td colspan=3><small>*Note: If Ansible isn't installed on your host, Drush aliases are only created inside the VM.</small></td></tr>
-        </tbody>
-      </table>
+            <tr><td colspan=3><small>*Note: If Ansible isn't installed on your host, Drush aliases are only created inside the VM.</small></td></tr>
+          </tbody>
+        </table>
+      </div>
     {%- endmacro -%}
 
     {%- macro sectionDevelopmentTools() -%}
+          <div class="table-responsive">
       <table class="table">
         {% if not installed_extras -%}
           <tr>
@@ -132,9 +136,9 @@
           {%- if servername() != "/{{ adminer_install_filename }}" -%}
             <tr>
               <th>Adminer</th>
-              <td><a href="http://{{ servername() }}">{{ servername() }}</a></td>
-              <td class="text-right">
-                <a href="http://{{ servername() }}" class="btn btn-success btn-xs" role="button">Open</a>
+              <td><a href="http://{{ servername() }}">{{ servername() }}</a>
+              </br>
+              <a href="http://{{ servername() }}" class="btn btn-success btn-xs" role="button">Open</a>
                 <a href="http://docs.drupalvm.com/en/latest/extras/mysql/#connect-using-adminer" target="_blank" class="btn btn-info btn-xs" role="button">Documentation</a>
               </td>
             </tr>
@@ -145,9 +149,9 @@
           {%- if servername() != ":8025" -%}
             <tr>
               <th>MailHog</th>
-              <td><a href="http://{{ servername() }}">{{ servername() }}</a></td>
-              <td class="text-right">
-                <a href="http://{{ servername() }}" class="btn btn-success btn-xs" role="button">Open</a>
+              <td><a href="http://{{ servername() }}">{{ servername() }}</a>
+              </br>
+              <a href="http://{{ servername() }}" class="btn btn-success btn-xs" role="button">Open</a>
                 <a href="http://docs.drupalvm.com/en/latest/extras/mailhog/" target="_blank" class="btn btn-info btn-xs" role="button">Documentation</a>
               </td>
             </tr>
@@ -158,9 +162,9 @@
           {%- if servername() -%}
             <tr>
               <th>PimpMyLog</th>
-              <td><a href="http://{{ servername() }}">{{ servername() }}</a></td>
-              <td class="text-right">
-                <a href="http://{{ servername() }}" class="btn btn-success btn-xs" role="button">Open</a>
+              <td><a href="http://{{ servername() }}">{{ servername() }}</a>
+              </br>
+              <a href="http://{{ servername() }}" class="btn btn-success btn-xs" role="button">Open</a>
                 <a href="http://docs.drupalvm.com/en/latest/extras/pimpmylog/" target="_blank" class="btn btn-info btn-xs" role="button">Documentation</a>
               </td>
             </tr>
@@ -170,9 +174,9 @@
           {% macro servername() %}{{ vagrant_hostname }}:{{ solr_port }}/solr/{% endmacro %}
           <tr>
             <th>Solr</th>
-            <td><a href="http://{{ servername() }}">{{ servername() }}</a></td>
-            <td class="text-right">
-              <a href="http://{{ servername() }}" class="btn btn-success btn-xs" role="button">Open</a>
+            <td><a href="http://{{ servername() }}">{{ servername() }}</a>
+            </br>
+            <a href="http://{{ servername() }}" class="btn btn-success btn-xs" role="button">Open</a>
               <a href="http://docs.drupalvm.com/en/latest/extras/solr/" target="_blank" class="btn btn-info btn-xs" role="button">Documentation</a>
             </td>
           </tr>
@@ -182,157 +186,156 @@
           {%- if servername() -%}
             <tr>
               <th>XHProf</th>
-              <td><a href="http://{{ servername() }}">{{ servername() }}</a></td>
-              <td class="text-right">
-                <a href="http://{{ servername() }}" class="btn btn-success btn-xs" role="button">Open</a>
+              <td><a href="http://{{ servername() }}">{{ servername() }}</a>
+              </br>
+              <a href="http://{{ servername() }}" class="btn btn-success btn-xs" role="button">Open</a>
                 <a href="http://docs.drupalvm.com/en/latest/extras/xhprof/" target="_blank" class="btn btn-info btn-xs" role="button">Documentation</a>
               </td>
             </tr>
           {%- endif -%}
         {%- endif %}
       </table>
+      </div>
     {%- endmacro -%}
 
     {%- macro sectionPhpInformation() -%}
-      <table class="table">
-        <tr>
-          <th>PHP Version</th>
-          <td><code>{{ php_version }}</code></td>
-        </tr>
-        <tr>
-          <th>Webserver</th>
-          <td><code>{{ drupalvm_webserver|capitalize }}</code></td>
-        </tr>
-        <tr>
-          <th>Memory limit</th>
-          <td><code>{{ php_memory_limit }}</code></td>
-        </tr>
-        <tr>
-          <th>PHP-FPM enabled</th>
-          <td><code>{{ 'yes' if php_enable_php_fpm else 'no' }}</code></td>
-        </tr>
-        <tr><td colspan=2><small><a href="/server-info.php">View more details in the server's phpinfo() report</a>.</small></td></tr>
-      </table>
+      <div class="table-responsive">
+        <table class="table">
+          <tr>
+            <th>PHP Version</th>
+            <td><code>{{ php_version }}</code></td>
+          </tr>
+          <tr>
+            <th>Webserver</th>
+            <td><code>{{ drupalvm_webserver|capitalize }}</code></td>
+          </tr>
+          <tr>
+            <th>Memory limit</th>
+            <td><code>{{ php_memory_limit }}</code></td>
+          </tr>
+          <tr>
+            <th>PHP-FPM enabled</th>
+            <td><code>{{ 'yes' if php_enable_php_fpm else 'no' }}</code></td>
+          </tr>
+          <tr><td colspan=2><small><a href="/server-info.php">View more details in the server's phpinfo() report</a>.</small></td></tr>
+        </table>
+      </div>
     {%- endmacro -%}
 
     {%- macro sectionDatabaseConnection() -%}
-      <table class="table">
-        <tr>
-          <th>MySQL Hostname</th>
-          <td><code>127.0.0.1</code></td>
-        </tr>
-        <tr>
-          <th>MySQL Port</th>
-          <td><code>{{ mysql_port }}</code></td>
-        </tr>
-        <tr>
-          <th>MySQL Username</th>
-          <td><code>{{ mysql_root_username }}</code></td>
-        </tr>
-        <tr>
-          <th>MySQL Password</th>
-          <td><code>{{ mysql_root_password }}</code></td>
-        </tr>
-        <tr>
-          <th>SSH Hostname</th>
-          <td><code>{{ vagrant_ip }}</code></td>
-        </tr>
-        <tr>
-          <th>SSH Username</th>
-          <td><code>{{ vagrant_user }}</code></td>
-        </tr>
-        <tr>
-          <th>SSH Private Key</th>
-          <td><code>~/.vagrant.d/insecure_private_key</code></td>
-        </tr>
-      </table>
+      <div class="table-responsive">
+        <table class="table">
+          <tr>
+            <th>MySQL Hostname</th>
+            <td><code>127.0.0.1</code></td>
+          </tr>
+          <tr>
+            <th>MySQL Port</th>
+            <td><code>{{ mysql_port }}</code></td>
+          </tr>
+          <tr>
+            <th>MySQL Username</th>
+            <td><code>{{ mysql_root_username }}</code></td>
+          </tr>
+          <tr>
+            <th>MySQL Password</th>
+            <td><code>{{ mysql_root_password }}</code></td>
+          </tr>
+          <tr>
+            <th>SSH Hostname</th>
+            <td><code>{{ vagrant_ip }}</code></td>
+          </tr>
+          <tr>
+            <th>SSH Username</th>
+            <td><code>{{ vagrant_user }}</code></td>
+          </tr>
+          <tr>
+            <th>SSH Private Key</th>
+            <td><code>~/.vagrant.d/insecure_private_key</code></td>
+          </tr>
+        </table>
+      </div>
     {%- endmacro -%}
 
     {%- macro sectionDatabaseList() -%}
-      <table class="table">
-        <thead>
-          <tr>
-            <th>Database name</th>
+      <div class="table-responsive">
+        <table class="table table-striped table-hover">
+          <tbody>
+            {% for database in mysql_databases -%}
             {% if 'adminer' in installed_extras -%}
-              <th></th>
+              <tr>
+                <td>
+                  <a href="http://{{ getServernameFromDocroot(adminer_install_dir) }}/{{ adminer_install_filename }}?username={{ mysql_root_username }}&db={{ database.name }}" class="btn btn-success btn-xs" role="button">{{ database.name }}</a>
+                </td>
+              </tr>
+            {% else -%}
+              <tr>
+                <td>{{ database.name }}</td>
+              </tr>
             {%- endif %}
-          </tr>
-        </thead>
-        <tbody>
-          {% for database in mysql_databases -%}
-            <tr>
-              <td><code>{{ database.name }}</code></td>
-              {% if 'adminer' in installed_extras -%}
-              <td>
-                <a href="http://{{ getServernameFromDocroot(adminer_install_dir) }}/{{ adminer_install_filename }}?username={{ mysql_root_username }}&db={{ database.name }}" class="btn btn-success btn-xs" role="button">Adminer</a>
-              </td>
-              {%- endif %}
-            </tr>
-          {%- endfor %}
-        </tbody>
-      </table>
+            {%- endfor %}
+          </tbody>
+        </table>
+      </div>
     {%- endmacro -%}
 
     {%- macro sectionDatabaseUserList() -%}
-      <table class="table">
-        <thead>
-          <tr>
-            <th>Username</th>
-            <th>Password</th>
-          </tr>
-        </thead>
-        <tbody>
-          {% for user in mysql_users -%}
+      <div class="table-responsive">
+        <table class="table table-striped table-hover">
+          <thead>
             <tr>
-              <td><code>{{ user.name }}</code></td>
-              <td><code>{{ user.password }}</code></td>
+              <th>Username</th>
+              <th>Password</th>
             </tr>
-          {%- endfor %}
-        </tbody>
-      </table>
+          </thead>
+          <tbody>
+            {% for user in mysql_users -%}
+              <tr>
+                <td><code>{{ user.name }}</code></td>
+                <td><code>{{ user.password }}</code></td>
+              </tr>
+            {%- endfor %}
+          </tbody>
+        </table>
+      </div>
     {%- endmacro -%}
 
     <div class="container">
 
       <div class="row">
         <div class="col-md-12">
-          <section class="jumbotron">
-            <div class="row">
-              <div class="col-md-7 text-center">
-                <a href="https://www.drupalvm.com/"><img src="http://docs.drupalvm.com/en/latest/images/drupal-vm-logo.png" alt="Drupal VM" title="Welcome to Drupal VM"></a>
-                <p><a href="https://github.com/geerlingguy/drupal-vm">Drupal VM</a> is a VM for local Drupal development, built with Vagrant + Ansible.</p>
-                <p><a class="btn btn-primary btn-lg" href="http://docs.drupalvm.com/en/latest/" role="button">Read the documentation</a></p>
-              </div>
-
-              <div class="col-md-5">
-                <h5>/etc/hosts</h5>
-                <section class="well small">
-                  {{ sectionHost() }}
-                </section>
-                <small>Unless you're using the <a href="https://github.com/cogitatio/vagrant-hostsupdater" target="_blank">vagrant-hostsupdater</a> or <a href="https://github.com/smdahlen/vagrant-hostmanager" target="_blank">vagrant-hostmanager</a> plugin, add the lines above to your host machine's hosts file.</small>
-              </div>
-            </div>
+          <section class="jumbotron text-center">
+            <a href="https://www.drupalvm.com/"><img src="http://docs.drupalvm.com/en/latest/images/drupal-vm-logo.png" alt="Drupal VM" title="Welcome to Drupal VM" class="img-responsive center-block"></a>
+            <p><a href="https://github.com/geerlingguy/drupal-vm">Drupal VM</a> is a VM for local Drupal development, built with Vagrant + Ansible.</p>
+            <p><a class="btn btn-primary btn-lg" href="http://docs.drupalvm.com/en/latest/" role="button">Read the documentation</a></p>
           </section>
         </div>
       </div>
 
       <div class="row">
-        <div class="col-md-7">
-
+        <div class="col-md-9">
           <section class="panel panel-default">
             <div class="panel-heading">Your sites</div>
             <div class="panel-body">
               {{ sectionSiteList() }}
             </div>
           </section>
+        </div>
 
+        <div class="col-md-3">
           <section class="panel panel-default">
-            <div class="panel-heading">Development tools</div>
+            <div class="panel-heading">Databases {% if 'adminer' in installed_extras -%} with Adminer {%- endif %} </div>
             <div class="panel-body">
-              {{ sectionDevelopmentTools() }}
+              {{ sectionDatabaseList() }}
+
+              {{ sectionDatabaseUserList() }}
             </div>
           </section>
+        </div>
+      </div>
 
+      <div class="row">
+        <div class="col-md-3">
           <section class="panel panel-default">
             <div class="panel-heading">PHP information</div>
             <div class="panel-body">
@@ -341,25 +344,38 @@
           </section>
         </div>
 
-        <div class="col-md-5">
+        <div class="col-md-6">
           <section class="panel panel-default">
             <div class="panel-heading">MySQL connection information</div>
             <div class="panel-body">
               {{ sectionDatabaseConnection() }}
             </div>
           </section>
+        </div>
 
+        <div class="col-md-3">
           <section class="panel panel-default">
-            <div class="panel-heading">Databases</div>
+            <div class="panel-heading">Development tools</div>
             <div class="panel-body">
-              {{ sectionDatabaseList() }}
-
-              {{ sectionDatabaseUserList() }}
+              {{ sectionDevelopmentTools() }}
             </div>
           </section>
-        </div>
+        </div>  
       </div>
 
+      <div class="row">
+        <div class="col-md-12">
+          <section class="panel panel-default">
+            <div class="panel-heading">/etc/hosts</div>
+              <div class="panel-body">
+                <section class="well small">
+                  {{ sectionHost() }}
+                </section>
+                <small>Unless you're using the <a href="https://github.com/cogitatio/vagrant-hostsupdater" target="_blank">vagrant-hostsupdater</a> or <a href="https://github.com/smdahlen/vagrant-hostmanager" target="_blank">vagrant-hostmanager</a> plugin, add the lines above to your host machine's hosts file.</small>
+              </div>
+          </section>
+        </div>
+      </div>
     </div>
 
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">

From 0cf00773b070f063a60045f551acebdd65d096bd Mon Sep 17 00:00:00 2001
From: Thom Toogood <thomtoogood@gmail.com>
Date: Fri, 25 Aug 2017 14:28:44 +1000
Subject: [PATCH 0877/1273] Always enable linked clones.

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

diff --git a/Vagrantfile b/Vagrantfile
index 774121ef8..b03db8d23 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -124,7 +124,7 @@ Vagrant.configure('2') do |config|
 
   # VirtualBox.
   config.vm.provider :virtualbox do |v|
-    v.linked_clone = true if Vagrant::VERSION =~ /^1.8/
+    v.linked_clone = true
     v.name = vconfig['vagrant_hostname']
     v.memory = vconfig['vagrant_memory']
     v.cpus = vconfig['vagrant_cpus']

From c36cc19b6794c792fa455fd74290ff08c85690aa Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 24 Aug 2017 23:47:18 -0500
Subject: [PATCH 0878/1273] Update Varnish role to 2.1.1.

---
 provisioning/requirements.yml                               | 2 +-
 .../roles/geerlingguy.varnish/tasks/setup-Debian.yml        | 6 ++++++
 .../roles/geerlingguy.varnish/templates/default.vcl.j2      | 2 ++
 provisioning/roles/geerlingguy.varnish/vars/Debian.yml      | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 4f16a5a36..a4ac3edf7 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -78,4 +78,4 @@
 - src: geerlingguy.solr
   version: 3.5.5
 - src: geerlingguy.varnish
-  version: 2.0.2
+  version: 2.1.1
diff --git a/provisioning/roles/geerlingguy.varnish/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.varnish/tasks/setup-Debian.yml
index 8a1d8fd4f..2c912bd18 100644
--- a/provisioning/roles/geerlingguy.varnish/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.varnish/tasks/setup-Debian.yml
@@ -18,3 +18,9 @@
   apt:
     name: "{{ varnish_package_name }}"
     state: present
+
+- name: Ensure old role-managed Varnish systemd unit file is removed.
+  file:
+    path: /etc/systemd/system/varnish.service
+    state: absent
+  when: varnish_systemd_config_path != '/etc/systemd/system'
diff --git a/provisioning/roles/geerlingguy.varnish/templates/default.vcl.j2 b/provisioning/roles/geerlingguy.varnish/templates/default.vcl.j2
index b1173972c..03201bd9e 100644
--- a/provisioning/roles/geerlingguy.varnish/templates/default.vcl.j2
+++ b/provisioning/roles/geerlingguy.varnish/templates/default.vcl.j2
@@ -1,4 +1,6 @@
+{% if varnish_version | version_compare('4.0', '>=') %}
 vcl 4.0;
+{% endif %}
 
 # This is a basic VCL configuration file for varnish.  See the vcl(7)
 # man page for details on VCL syntax and semantics.
diff --git a/provisioning/roles/geerlingguy.varnish/vars/Debian.yml b/provisioning/roles/geerlingguy.varnish/vars/Debian.yml
index 98ec82dcd..f8ebf38a6 100644
--- a/provisioning/roles/geerlingguy.varnish/vars/Debian.yml
+++ b/provisioning/roles/geerlingguy.varnish/vars/Debian.yml
@@ -1,3 +1,3 @@
 ---
 varnish_sysvinit_config_path: /etc/default
-varnish_systemd_config_path: /etc/systemd/system
+varnish_systemd_config_path: /lib/systemd/system

From 32eee6e7829f84d1869b5bd3deec8e9ca75cef68 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 25 Aug 2017 08:21:02 -0500
Subject: [PATCH 0879/1273] Update Node.js role to latest version.

---
 provisioning/requirements.yml                          |  2 +-
 provisioning/roles/geerlingguy.nodejs/.travis.yml      | 10 +++++++++-
 provisioning/roles/geerlingguy.nodejs/README.md        |  2 +-
 .../roles/geerlingguy.nodejs/defaults/main.yml         |  2 +-
 provisioning/roles/geerlingguy.nodejs/meta/main.yml    |  3 ---
 provisioning/roles/geerlingguy.nodejs/tests/test.yml   |  1 -
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index a4ac3edf7..3536f98d0 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -40,7 +40,7 @@
 - src: geerlingguy.nginx
   version: 2.4.0
 - src: geerlingguy.nodejs
-  version: 4.1.1
+  version: 4.1.2
 - src: geerlingguy.php
   version: 3.4.5
 - src: geerlingguy.php-memcached
diff --git a/provisioning/roles/geerlingguy.nodejs/.travis.yml b/provisioning/roles/geerlingguy.nodejs/.travis.yml
index 729908d52..ad892bd4e 100644
--- a/provisioning/roles/geerlingguy.nodejs/.travis.yml
+++ b/provisioning/roles/geerlingguy.nodejs/.travis.yml
@@ -2,11 +2,19 @@
 services: docker
 
 env:
+  # Defaults.
   - distro: centos7
   - distro: centos6
   - distro: ubuntu1604
   - distro: ubuntu1404
-  - distro: ubuntu1204
+  - distro: debian9
+  - distro: debian8
+
+  # Latest release.
+  - distro: centos7
+    playbook: test-latest.yml
+  - distro: ubuntu1604
+    playbook: test-latest.yml
 
 script:
   # Configure test script so we can run extra tests after playbook is run.
diff --git a/provisioning/roles/geerlingguy.nodejs/README.md b/provisioning/roles/geerlingguy.nodejs/README.md
index fe381da82..941427379 100644
--- a/provisioning/roles/geerlingguy.nodejs/README.md
+++ b/provisioning/roles/geerlingguy.nodejs/README.md
@@ -20,7 +20,7 @@ The Node.js version to install. "6.x" is the default and works on most supported
 
 The user for whom the npm packages will be installed can be set here, this defaults to `ansible_user`.
 
-    npm_config_prefix: "~/.npm-global"
+    npm_config_prefix: "/usr/local/lib/npm"
 
 The global installation directory. This should be writeable by the `nodejs_install_npm_user`.
 
diff --git a/provisioning/roles/geerlingguy.nodejs/defaults/main.yml b/provisioning/roles/geerlingguy.nodejs/defaults/main.yml
index f862788b8..bb9391447 100644
--- a/provisioning/roles/geerlingguy.nodejs/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.nodejs/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-# Set the version of Node.js to install ("0.10", "0.12", "4.x", "5.x", "6.x").
+# Set the version of Node.js to install ("0.12", "4.x", "5.x", "6.x", "8.x").
 # Version numbers from Nodesource: https://github.com/nodesource/distributions
 nodejs_version: "6.x"
 
diff --git a/provisioning/roles/geerlingguy.nodejs/meta/main.yml b/provisioning/roles/geerlingguy.nodejs/meta/main.yml
index 8925daaf8..26bb728c5 100644
--- a/provisioning/roles/geerlingguy.nodejs/meta/main.yml
+++ b/provisioning/roles/geerlingguy.nodejs/meta/main.yml
@@ -17,9 +17,6 @@ galaxy_info:
       - all
     - name: Ubuntu
       versions:
-      - precise
-      - raring
-      - saucy
       - trusty
       - xenial
   galaxy_tags:
diff --git a/provisioning/roles/geerlingguy.nodejs/tests/test.yml b/provisioning/roles/geerlingguy.nodejs/tests/test.yml
index 209dcf49d..72832e0d8 100644
--- a/provisioning/roles/geerlingguy.nodejs/tests/test.yml
+++ b/provisioning/roles/geerlingguy.nodejs/tests/test.yml
@@ -2,7 +2,6 @@
 - hosts: all
 
   vars:
-    nodejs_version: "5.x"
     nodejs_install_npm_user: root
     npm_config_prefix: /root/.npm-global
     npm_config_unsafe_perm: "true"

From 4e356669b04d4bbbbbb73753c0ca66e838bf50ff Mon Sep 17 00:00:00 2001
From: Petr Illek <petr@morpht.com>
Date: Tue, 29 Aug 2017 12:19:31 +0200
Subject: [PATCH 0880/1273] Moving the DatabaseList label condition from the
 template part to macros.

---
 provisioning/templates/dashboard.html.j2 | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/provisioning/templates/dashboard.html.j2 b/provisioning/templates/dashboard.html.j2
index 7e3125bbf..372ab43a9 100644
--- a/provisioning/templates/dashboard.html.j2
+++ b/provisioning/templates/dashboard.html.j2
@@ -279,6 +279,15 @@
       </div>
     {%- endmacro -%}
 
+    {%- macro SectionDatabaseListLabel() -%}
+      {% if 'adminer' in installed_extras -%}
+        Databases using Adminer
+      {% else -%}
+        Databases
+      {%- endif %}
+    {%- endmacro -%}
+
+
     {%- macro sectionDatabaseUserList() -%}
       <div class="table-responsive">
         <table class="table table-striped table-hover">
@@ -324,7 +333,7 @@
 
         <div class="col-md-3">
           <section class="panel panel-default">
-            <div class="panel-heading">Databases {% if 'adminer' in installed_extras -%} with Adminer {%- endif %} </div>
+            <div class="panel-heading"> {{ SectionDatabaseListLabel() }}</div>
             <div class="panel-body">
               {{ sectionDatabaseList() }}
 

From 32e2c7a7422b57ab0fa59041bda349a4f2448b27 Mon Sep 17 00:00:00 2001
From: Joel Pittet <joel@pittet.ca>
Date: Fri, 8 Sep 2017 10:22:59 -0700
Subject: [PATCH 0881/1273] IP consistency

Had my IP in there, may confuse someone.
---
 docs/other/docker.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/other/docker.md b/docs/other/docker.md
index 3e8ca05ab..ac3a32b1a 100644
--- a/docs/other/docker.md
+++ b/docs/other/docker.md
@@ -121,7 +121,7 @@ After you've configured your Drupal VM settings in `config.yml` and other config
 
 This will bake a Docker images using Drupal VM's default settings for distro, IP address, hostname, etc. You can override these options (all are listed in the `provisioning/docker/bake.sh` file) by prepending them to the `composer` command:
 
-    DRUPALVM_IP_ADDRESS='192.168.89.90' DISTRO='debian9' composer docker-bake
+    DRUPALVM_IP_ADDRESS='192.168.89.89' DISTRO='debian9' composer docker-bake
 
 This process can take some time (it should take a similar amount of time as it takes to build Drupal VM normally, using Vagrant and VirtualBox), and at the end, you should see a message like:
 

From 83547893fce01d0628bb8e7f930499f9b980ab57 Mon Sep 17 00:00:00 2001
From: betz <tom@behets.me>
Date: Thu, 15 Jun 2017 13:03:52 +0200
Subject: [PATCH 0882/1273] Use .localhost instead of .dev as default hostname.

---
 default.config.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/default.config.yml b/default.config.yml
index 12099aa55..c9a2b95a9 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -15,7 +15,8 @@ vagrant_gui: false
 
 # If you need to run multiple instances of Drupal VM, set a unique hostname,
 # machine name, and IP address for each instance.
-vagrant_hostname: drupalvm.dev
+# rfc2606 limits to only use one of .test, .example, .invalid, or .localhost
+vagrant_hostname: drupalvm.localhost
 vagrant_machine_name: drupalvm
 vagrant_ip: 192.168.88.88
 

From dd3bd3f307ab9d45b80954fcb7dd47418a669388 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 18 Sep 2017 13:37:47 -0500
Subject: [PATCH 0883/1273] Fixes #1427: Use drupalvm.test for local
 development default.

---
 .travis.yml                            |  2 +-
 README.md                              |  2 +-
 default.config.yml                     |  3 +--
 docs/configurations/databases-mysql.md |  2 +-
 docs/deployment/drush-make.md          |  2 +-
 docs/deployment/local-codebase.md      |  2 +-
 docs/deployment/multisite.md           |  2 +-
 docs/extras/adminer.md                 |  2 +-
 docs/extras/blackfire.md               |  2 +-
 docs/extras/drupal-console.md          |  2 +-
 docs/extras/drush.md                   | 10 +++++-----
 docs/extras/elasticsearch.md           |  2 +-
 docs/extras/mailhog.md                 |  2 +-
 docs/extras/pimpmylog.md               |  4 ++--
 docs/extras/selenium.md                |  4 ++--
 docs/extras/solr.md                    |  2 +-
 docs/extras/tideways.md                |  2 +-
 docs/extras/xdebug.md                  |  4 ++--
 docs/extras/xhprof.md                  |  4 ++--
 docs/other/docker.md                   |  8 ++++----
 docs/other/performance.md              |  2 +-
 examples/prod/prod.config.yml          |  2 +-
 tests/run-tests.sh                     |  2 +-
 23 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 131437338..70adede57 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ env:
     - CONFIG: tests/config.yml
       MAKEFILE: example.drupal.make.yml
       COMPOSERFILE: example.drupal.composer.json
-      HOSTNAME: drupalvm.dev
+      HOSTNAME: drupalvm.test
       MACHINE_NAME: drupalvm
       IP: 192.168.88.88
       DRUPALVM_DIR: /var/www/drupalvm
diff --git a/README.md b/README.md
index 585ae2b8a..2f6fb0e4d 100644
--- a/README.md
+++ b/README.md
@@ -90,7 +90,7 @@ Note: *If there are any errors during the course of running `vagrant up`, and it
 
 ### 3 - Access the VM.
 
-Open your browser and access [http://drupalvm.dev/](http://drupalvm.dev/). The default login for the admin account is `admin` for both the username and password.
+Open your browser and access [http://drupalvm.test/](http://drupalvm.test/). The default login for the admin account is `admin` for both the username and password.
 
 Note: *By default Drupal VM is configured to use `192.168.88.88` as its IP, if you're running multiple VM's the `auto_network` plugin (`vagrant plugin install vagrant-auto_network`) can help with IP address management if you set `vagrant_ip` to `0.0.0.0` inside `config.yml`.*
 
diff --git a/default.config.yml b/default.config.yml
index c9a2b95a9..a3e0e0912 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -15,8 +15,7 @@ vagrant_gui: false
 
 # If you need to run multiple instances of Drupal VM, set a unique hostname,
 # machine name, and IP address for each instance.
-# rfc2606 limits to only use one of .test, .example, .invalid, or .localhost
-vagrant_hostname: drupalvm.localhost
+vagrant_hostname: drupalvm.test
 vagrant_machine_name: drupalvm
 vagrant_ip: 192.168.88.88
 
diff --git a/docs/configurations/databases-mysql.md b/docs/configurations/databases-mysql.md
index 6b9cc3642..24a0e3411 100644
--- a/docs/configurations/databases-mysql.md
+++ b/docs/configurations/databases-mysql.md
@@ -2,7 +2,7 @@ By default, this VM is set up so you can manage MySQL databases on your own. The
 
 ## Connect using Adminer
 
-If you have `adminer` listed as one of the `installed_extras` inside `config.yml`, you can use Adminer's web-based interface to interact with databases. With Drupal VM running, visit [http://adminer.drupalvm.dev/](http://adminer.drupalvm.dev/), and log in with `drupal` as the username and the password you set in `config.yml` (`drupal_db_password`). Leave the "Server" field blank. The "Database" field is optional.
+If you have `adminer` listed as one of the `installed_extras` inside `config.yml`, you can use Adminer's web-based interface to interact with databases. With Drupal VM running, visit [http://adminer.drupalvm.test/](http://adminer.drupalvm.test/), and log in with `drupal` as the username and the password you set in `config.yml` (`drupal_db_password`). Leave the "Server" field blank. The "Database" field is optional.
 
 More about how to use Adminer: [Adminer website](http://www.adminer.org/).
 
diff --git a/docs/deployment/drush-make.md b/docs/deployment/drush-make.md
index 26b39b458..3877287b5 100644
--- a/docs/deployment/drush-make.md
+++ b/docs/deployment/drush-make.md
@@ -5,7 +5,7 @@ drupal_build_composer_project: false
 drupal_build_makefile: true
 ```
 
-Have a look at the defaults in `default.config.yml` and tweak the settings as you'd like in your `config.yml`, then run `vagrant up` as in the Quick Start Guide. Within a few minutes, you should have your site running and available at the `drupal_domain` configured in `config.yml`, falling back to the default `http://drupalvm.dev` set in `default.config.yml`.
+Have a look at the defaults in `default.config.yml` and tweak the settings as you'd like in your `config.yml`, then run `vagrant up` as in the Quick Start Guide. Within a few minutes, you should have your site running and available at the `drupal_domain` configured in `config.yml`, falling back to the default `http://drupalvm.test` set in `default.config.yml`.
 
 With the default settings the Drupal site will be built on the VM inside `/var/www/drupalvm/drupal/web` but the `web/` subdirectory is only required for `composer` based projects and you can simplify this directory structure by setting `drupal_core_path` to `/var/www/drupalvm/drupal`.
 
diff --git a/docs/deployment/local-codebase.md b/docs/deployment/local-codebase.md
index 1ad452458..50620d3e3 100644
--- a/docs/deployment/local-codebase.md
+++ b/docs/deployment/local-codebase.md
@@ -39,7 +39,7 @@ This variable will be used for the document root of the webserver.
 
 ## Set the domain
 
-By default the domain of your site will be `drupalvm.dev` but you can change it by setting `drupal_domain` to the domain of your choice:
+By default the domain of your site will be `drupalvm.test` but you can change it by setting `drupal_domain` to the domain of your choice:
 
 ```yaml
 drupal_domain: "local.my-drupal-site.com"
diff --git a/docs/deployment/multisite.md b/docs/deployment/multisite.md
index 7ece0bb33..15afd8a0a 100644
--- a/docs/deployment/multisite.md
+++ b/docs/deployment/multisite.md
@@ -6,7 +6,7 @@ drupal_core_path: "/var/www/my-drupal-site"
 ...
 
 apache_vhosts:
-  # Drupal VM's default domain, evaluating to whatever `vagrant_hostname` is set to (drupalvm.dev by default).
+  # Drupal VM's default domain, evaluating to whatever `vagrant_hostname` is set to (drupalvm.test by default).
   - servername: "{{ drupal_domain }}"
     serveralias: "www.{{ drupal_domain }}"
     documentroot: "{{ drupal_core_path }}"
diff --git a/docs/extras/adminer.md b/docs/extras/adminer.md
index 54392c568..302560f13 100644
--- a/docs/extras/adminer.md
+++ b/docs/extras/adminer.md
@@ -1,3 +1,3 @@
-If you have `adminer` listed as one of the `installed_extras` inside `config.yml`, you can use Adminer's web-based interface to interact with databases. With Drupal VM running, visit [http://adminer.drupalvm.dev/](http://adminer.drupalvm.dev/), and log in with `drupal` as the username and the password you set in `config.yml` (`drupal_db_password`). Leave the "Server" field blank. The "Database" field is optional.
+If you have `adminer` listed as one of the `installed_extras` inside `config.yml`, you can use Adminer's web-based interface to interact with databases. With Drupal VM running, visit [http://adminer.drupalvm.test/](http://adminer.drupalvm.test/), and log in with `drupal` as the username and the password you set in `config.yml` (`drupal_db_password`). Leave the "Server" field blank. The "Database" field is optional.
 
 For a list of available role variables, see the [`geerlingguy.adminer` Ansible role's README](https://github.com/geerlingguy/ansible-role-adminer#readme).
diff --git a/docs/extras/blackfire.md b/docs/extras/blackfire.md
index 7f911959b..0b794aa73 100644
--- a/docs/extras/blackfire.md
+++ b/docs/extras/blackfire.md
@@ -7,7 +7,7 @@ It doesn't require any additional Drupal modules to use, but once you've made su
 Once you've configured your environment for your own Blackfire account, you can profile a request with Blackfire by running something like the following example (within Drupal VM, after logging in with `vagrant ssh`):
 
 ```
-$ blackfire curl http://drupalvm.dev/
+$ blackfire curl http://drupalvm.test/
 Profiling: [########################################] 10/10
 Blackfire cURL completed
 Graph URL https://blackfire.io/profiles/[UUID]/graph
diff --git a/docs/extras/drupal-console.md b/docs/extras/drupal-console.md
index f6ffa0a2d..6da54af0b 100644
--- a/docs/extras/drupal-console.md
+++ b/docs/extras/drupal-console.md
@@ -33,7 +33,7 @@ dev:
 
 Execute from host machine using the `--target` option.
 
-    drupal --target=drupalvm.dev site:status
+    drupal --target=drupalvm.test site:status
 
 For more details, see [Drupal Console's documentation](https://hechoendrupal.gitbooks.io/drupal-console/content/en/using/how-to-use-drupal-console-in-a-remote-installation.html)
 
diff --git a/docs/extras/drush.md b/docs/extras/drush.md
index 26267d4c7..e06bd74c5 100644
--- a/docs/extras/drush.md
+++ b/docs/extras/drush.md
@@ -1,11 +1,11 @@
 If you have [Drush](http://www.drush.org) and Ansible installed on your host workstation, and would like to interact with a Drupal site running inside Drupal VM, there are drush aliases automatically created by Drupal VM for each of the virtual hosts you have configured.
 
-With the example configuration, you can manage the example Drupal site using the Drush alias `@drupalvm.dev`. For example, to check if Drush can connect to the site in Drupal VM, run:
+With the example configuration, you can manage the example Drupal site using the Drush alias `@drupalvm.test`. For example, to check if Drush can connect to the site in Drupal VM, run:
 
 ```
-$ drush @drupalvm.dev status
+$ drush @drupalvm.test status
  Drupal version         :  8.0.0-dev
- Site URI               :  drupalvm.dev
+ Site URI               :  drupalvm.test
  Database driver        :  mysql
  Database hostname      :  localhost
  Database port          :
@@ -47,7 +47,7 @@ Eg. to only print the alias for your main domain, and not the subdomain you can
 {% extends 'templates/drupalvm.aliases.drushrc.php.j2' %}
 
 {% block aliases %}
-{{ alias('drupalvm.dev', drupal_core_path) }}
+{{ alias('drupalvm.test', drupal_core_path) }}
 {% endblock %}
 ```
 
@@ -62,7 +62,7 @@ If you're locked to an older version of Drush, it is likely that Drush will try
 If you're still having issues, you can avoid `sql-sync` entirely and pipe the mysqldump output yourself with:
 
 ```
-drush @remote sql-dump | drush @drupalvm.drupalvm.dev sql-cli
+drush @remote sql-dump | drush @drupalvm.drupalvm.test sql-cli
 ```
 
 ## Running `drush core-cron` as a cron job.
diff --git a/docs/extras/elasticsearch.md b/docs/extras/elasticsearch.md
index e57453e9d..798b21641 100644
--- a/docs/extras/elasticsearch.md
+++ b/docs/extras/elasticsearch.md
@@ -12,7 +12,7 @@ To access Elasticsearch from the host computer requires changing the IP address
 
 The Elasticsearch server can then be accessed at the configured domain:
 
-    http://drupalvm.dev:9200
+    http://drupalvm.test:9200
 
 ## Elasticsearch configuration
 
diff --git a/docs/extras/mailhog.md b/docs/extras/mailhog.md
index 42f0c4f7f..700099b58 100644
--- a/docs/extras/mailhog.md
+++ b/docs/extras/mailhog.md
@@ -1,4 +1,4 @@
-By default, Drupal VM redirects all PHP emails to [MailHog](https://github.com/mailhog/MailHog) (instead of sending them to the outside world). You can access the MailHog UI at [http://drupalvm.dev:8025/](http://drupalvm.dev:8025) (or whatever domain you have configured in `config.yml`).
+By default, Drupal VM redirects all PHP emails to [MailHog](https://github.com/mailhog/MailHog) (instead of sending them to the outside world). You can access the MailHog UI at [http://drupalvm.test:8025/](http://drupalvm.test:8025) (or whatever domain you have configured in `config.yml`).
 
 ## Disable MailHog
 
diff --git a/docs/extras/pimpmylog.md b/docs/extras/pimpmylog.md
index 93a17f08b..38d05052c 100644
--- a/docs/extras/pimpmylog.md
+++ b/docs/extras/pimpmylog.md
@@ -1,8 +1,8 @@
-[Pimp my Log](http://pimpmylog.com/) is a PHP-based web GUI for viewing log files on a given server. By default, it is installed on Drupal VM, and you can access it at the URL [http://pimpmylog.drupalvm.dev/](http://pimpmylog.drupalvm.dev) (as long as you have a hosts entry for that URL pointing at Drupal VM's IP address!).
+[Pimp my Log](http://pimpmylog.com/) is a PHP-based web GUI for viewing log files on a given server. By default, it is installed on Drupal VM, and you can access it at the URL [http://pimpmylog.drupalvm.test/](http://pimpmylog.drupalvm.test) (as long as you have a hosts entry for that URL pointing at Drupal VM's IP address!).
 
 By default, it will find the default Apache 2 `access.log` and `error.log` files, but it will not find other logs, like MySQL or extra Apache virtualhost logs.
 
-When configuring Pimp my Log (on the first visit to [pimpmylog.drupalvm.dev](http://pimpmylog.drupalvm.dev)), you can add extra paths in the UI, or you can add them after the fact by manually editing the configuration file, which by default is stored at `/usr/share/php/pimpmylog/config.user.php`. You can also delete that file and re-configure Pimp my Log via the web UI.
+When configuring Pimp my Log (on the first visit to [pimpmylog.drupalvm.test](http://pimpmylog.drupalvm.test)), you can add extra paths in the UI, or you can add them after the fact by manually editing the configuration file, which by default is stored at `/usr/share/php/pimpmylog/config.user.php`. You can also delete that file and re-configure Pimp my Log via the web UI.
 
 Some log files you may be interested in monitoring:
 
diff --git a/docs/extras/selenium.md b/docs/extras/selenium.md
index 08b7f1c02..0369d9309 100644
--- a/docs/extras/selenium.md
+++ b/docs/extras/selenium.md
@@ -46,8 +46,8 @@ Using the default Drupal site as an example (it's installed in `/var/www/drupalv
               goutte: ~
               javascript_session: selenium2
               selenium2:
-                wd_host: http://drupalvm.dev:4444/wd/hub
-              base_url: http://drupalvm.dev
+                wd_host: http://drupalvm.test:4444/wd/hub
+              base_url: http://drupalvm.test
             Drupal\DrupalExtension:
               blackbox: ~
               api_driver: 'drupal'
diff --git a/docs/extras/solr.md b/docs/extras/solr.md
index 68594df77..6237f6d36 100644
--- a/docs/extras/solr.md
+++ b/docs/extras/solr.md
@@ -6,7 +6,7 @@ The URL to connect to the local solr server (assuming you're using the default `
 
     http://localhost:8983/solr/collection1
 
-This will connect to the default search core (`collection1`) set up by Solr. If you are using a multisite installation and want to have a search core per Drupal site, you can add more cores through Apache Solr's admin interface (visit `http://drupalvm.dev:8983/solr/`), then connect to each core by adding the core name to the end of the above URL (e.g. `core2` would be `http://localhost:8983/solr/core2`).
+This will connect to the default search core (`collection1`) set up by Solr. If you are using a multisite installation and want to have a search core per Drupal site, you can add more cores through Apache Solr's admin interface (visit `http://drupalvm.test:8983/solr/`), then connect to each core by adding the core name to the end of the above URL (e.g. `core2` would be `http://localhost:8983/solr/core2`).
 
 ## Using Different Solr versions
 
diff --git a/docs/extras/tideways.md b/docs/extras/tideways.md
index e7d5fe463..8f42c83b9 100644
--- a/docs/extras/tideways.md
+++ b/docs/extras/tideways.md
@@ -8,7 +8,7 @@ To use Tideways make sure `tideways` is in the list of `installed_extras`.
 
 To enable profiling of Drupal pages using the Tideways PHP Extension, follow the directions for [configuring the XHProf and the XHProf module](xhprof.md#xhprof-module), but choose the _Tideways_ extension under the _Profiling settings_ section.
 
-As with the XHProf extension, you can view callgraphs (and a listing of all stored runs) using Drupal VM's own XHProf UI installation by visiting [http://xhprof.drupalvm.dev/](http://xhprof.drupalvm.dev) and clicking on the relevant run, then clicking the _[View Full Callgraph]_ link.
+As with the XHProf extension, you can view callgraphs (and a listing of all stored runs) using Drupal VM's own XHProf UI installation by visiting [http://xhprof.drupalvm.test/](http://xhprof.drupalvm.test) and clicking on the relevant run, then clicking the _[View Full Callgraph]_ link.
 
 ### Profiling with the Tideways module
 
diff --git a/docs/extras/xdebug.md b/docs/extras/xdebug.md
index 85c184a24..31a7d4457 100644
--- a/docs/extras/xdebug.md
+++ b/docs/extras/xdebug.md
@@ -53,7 +53,7 @@ php_xdebug_idekey: netbeans-xdebug
 As long as `xdebug` is listed in `installed_extras` Drupal VM is configured to accept the `PHP_IDE_CONFIG`, `XDEBUG_CONFIG` and `PHP_OPTIONS` environment variables over SSH and this can be used to set up some IDE's as well as enable XDebug on a per request basis:
 
 ```
-PHP_OPTIONS="-d xdebug.default_enable=1" drush @drupalvm.drupalvm.dev migrate-import
+PHP_OPTIONS="-d xdebug.default_enable=1" drush @drupalvm.drupalvm.test migrate-import
 ```
 
 To send the environment variables when using `vagrant ssh`, [create a `Vagrantfile.local`](../extending/vagrantfile.md) with:
@@ -65,7 +65,7 @@ config.ssh.forward_env = ['PHP_IDE_CONFIG', 'XDEBUG_CONFIG', 'PHP_OPTIONS']
 And you can run:
 
 ```
-XDEBUG_CONFIG="-d default_enable=1" vagrant ssh -c 'php /var/www/drupalvm/drupal/web/core/scripts/run-tests.sh --url http://drupalvm.dev --all'
+XDEBUG_CONFIG="-d default_enable=1" vagrant ssh -c 'php /var/www/drupalvm/drupal/web/core/scripts/run-tests.sh --url http://drupalvm.test --all'
 XDEBUG_CONFIG="-d default_enable=1" vagrant ssh -c 'cd /var/www/drupalvm/drupal/web/core; php ../../vendor/bin/phpunit tests/Drupal/Tests/Core/Password/PasswordHashingTest.php'
 ```
 
diff --git a/docs/extras/xhprof.md b/docs/extras/xhprof.md
index 44681ac53..d57a03b7d 100644
--- a/docs/extras/xhprof.md
+++ b/docs/extras/xhprof.md
@@ -8,13 +8,13 @@ The easiest way to use XHProf to profile your PHP code on a Drupal site is to in
 
 The XHProf module doesn't include built-in support for callgraphs, but there's an issue to [add callgraph support](https://www.drupal.org/node/1470740).
 
-You can view callgraphs (and a listing of all stored runs) using Drupal VM's own XHProf installation by visiting [http://xhprof.drupalvm.dev/](http://xhprof.drupalvm.dev) and clicking on the relevant run, then clicking the _[View Full Callgraph]_ link.
+You can view callgraphs (and a listing of all stored runs) using Drupal VM's own XHProf installation by visiting [http://xhprof.drupalvm.test/](http://xhprof.drupalvm.test) and clicking on the relevant run, then clicking the _[View Full Callgraph]_ link.
 
 ### Devel module (deprecated)
 
 The Devel module also *used* to provide XHProf configuration, and setting the options below would allow Devel's XHProf integration to work correctly with Drupal VM's XHProf installation:
 
   - **xhprof directory**: `/usr/share/php`
-  - **XHProf URL**: `http://xhprof.drupalvm.dev`
+  - **XHProf URL**: `http://xhprof.drupalvm.test`
 
 **Note**: You should only enable one code profiler at a time—e.g. when using [Blackfire](blackfire.md), disable [XHProf](xhprof.md), [Tideways](tideways.md) and [XDebug](xdebug.md).
diff --git a/docs/other/docker.md b/docs/other/docker.md
index ac3a32b1a..d733fcbfb 100644
--- a/docs/other/docker.md
+++ b/docs/other/docker.md
@@ -10,11 +10,11 @@ Drupal VM can be used with [Docker](https://www.docker.com) instead of or in add
 
 Before using Docker to run Drupal VM, you should [edit your hosts file](https://support.rackspace.com/how-to/modify-your-hosts-file/) and add the following line:
 
-    192.168.89.89  drupalvm.dev
+    192.168.89.89  drupalvm.test
 
 (Substitute the IP address and domain name you'd like to use to access your Drupal VM container.)
 
-You can also add other subdomains if you're using other built-in services, e.g. `adminer.drupalvm.dev`, `xhprof.drupalvm.com`, etc.
+You can also add other subdomains if you're using other built-in services, e.g. `adminer.drupalvm.test`, `xhprof.drupalvm.com`, etc.
 
 > If you're using Docker for Mac, you need to perform one additional step to ensure you can access Drupal VM using a unique IP address:
 >
@@ -97,7 +97,7 @@ This command takes the instructions in the Docker Compose file and does two thin
   1. Creates a custom Docker network that exposes Drupal VM on the IP address you have configured in `docker-compose.yml` (by default, `192.168.89.89`).
   2. Runs Drupal VM using the configuration in `docker-compose.yml`.
 
-After the Drupal VM container is running, you should be able to see the Dashboard page at the VM's IP address (e.g. `http://192.168.89.89`), and you should be able to access your site at the hostname you have configured in your hosts file (e.g. `http://drupalvm.dev/`).
+After the Drupal VM container is running, you should be able to see the Dashboard page at the VM's IP address (e.g. `http://192.168.89.89`), and you should be able to access your site at the hostname you have configured in your hosts file (e.g. `http://drupalvm.test/`).
 
 > Note: If you see Drupal's installer appear when accessing the site, that means the codebase was found, but either the database connection details are not in your local site configuration, or they are, but you don't have the default database populated yet. You may need to load in the database either via `drush sql-sync` or by importing a dump into the container. The default credentials are `drupal` and `drupal` for username and password, and `drupal` for the database name.
 
@@ -107,7 +107,7 @@ You can stop the container with `docker-compose stop` (and start it again with `
 
 Currently, the easiest way to use Drupal VM's `drush` inside a Docker container is to use `docker exec` to run `drush` internally. There are a few other ways you can try to get Drush working with a codebase running on a container, but the easiest way is to run a command like:
 
-    docker exec drupal-vm bash -c "drush --uri=drupalvm.dev --root=/var/www/drupalvm/drupal/web status"
+    docker exec drupal-vm bash -c "drush --uri=drupalvm.test --root=/var/www/drupalvm/drupal/web status"
 
 ## Method 3: 'Bake and Share' a custom Drupal VM Docker image
 
diff --git a/docs/other/performance.md b/docs/other/performance.md
index 8b067256e..39750b581 100644
--- a/docs/other/performance.md
+++ b/docs/other/performance.md
@@ -113,6 +113,6 @@ Though it's not supported natively by Vagrant, you can mount a Samba share _from
   1. Install Samba inside the VM.
   2. Configure Samba (through `smb.conf`) to share a directory inside the VM.
   3. Open firewall ports `137`, `138`, `139`, and `445`.
-  4. Mount the Samba shared folder within Windows Explorer (e.g. visit `\\drupalvm.dev\share_name`)
+  4. Mount the Samba shared folder within Windows Explorer (e.g. visit `\\drupalvm.test\share_name`)
 
 Read this blog post for further detail in creating a Samba share: [Configure a reverse-mounted Samba shared folder](https://www.jeffgeerling.com/blog/2017/drupal-vm-on-windows-fast-container-blt-project-development#reverse-share).
diff --git a/examples/prod/prod.config.yml b/examples/prod/prod.config.yml
index 93219afee..524d85dc6 100644
--- a/examples/prod/prod.config.yml
+++ b/examples/prod/prod.config.yml
@@ -1,6 +1,6 @@
 ---
 # Normally, this would be set to the hostname of your DigitalOcean Droplet.
-drupal_domain: "drupalvm.dev"
+drupal_domain: "drupalvm.test"
 vagrant_hostname: "{{ drupal_domain }}"
 
 # Add only the `apache_vhosts` or `nginx_vhosts` you need. If installing a
diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index 93b2545a3..542316f1a 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -6,7 +6,7 @@
 CONFIG="${CONFIG:-tests/config.yml}"
 MAKEFILE="${MAKEFILE:-example.drupal.make.yml}"
 COMPOSERFILE="${COMPOSERFILE:-example.drupal.composer.json}"
-HOSTNAME="${HOSTNAME:-drupalvm.dev}"
+HOSTNAME="${HOSTNAME:-drupalvm.test}"
 MACHINE_NAME="${MACHINE_NAME:-drupalvm}"
 IP="${IP:-192.168.88.88}"
 DRUPALVM_DIR="${DRUPALVM_DIR:-/var/www/drupalvm}"

From 45b281277e6dd59f61c7a5c35029e3e54f6aac6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <m@oxy.fi>
Date: Mon, 18 Sep 2017 21:13:11 -0500
Subject: [PATCH 0884/1273] Update php-versions role for PHP 7.2 support

---
 default.config.yml                            |  2 +-
 docs/configurations/php.md                    | 10 +++---
 docs/extras/xhprof.md                         |  2 +-
 provisioning/requirements.yml                 |  2 +-
 .../geerlingguy.php-versions/.travis.yml      | 34 +++++++++++++++----
 .../roles/geerlingguy.php-versions/README.md  |  2 +-
 .../geerlingguy.php-versions/tasks/main.yml   |  5 ++-
 .../tasks/setup-Debian.yml                    |  9 ++---
 .../tasks/setup-RedHat.yml                    |  4 +++
 .../tests/test-7.2.yml                        | 17 ++++++++++
 .../vars/Debian-php7.2.yml                    | 16 +++++++++
 11 files changed, 83 insertions(+), 20 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.php-versions/tests/test-7.2.yml
 create mode 100644 provisioning/roles/geerlingguy.php-versions/vars/Debian-php7.2.yml

diff --git a/default.config.yml b/default.config.yml
index a3e0e0912..746997f63 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -255,7 +255,7 @@ firewall_log_dropped_packets: false
 firewall_disable_firewalld: true
 firewall_disable_ufw: true
 
-# PHP Configuration. Currently-supported versions: 5.6, 7.0, 7.1.
+# PHP Configuration. Currently-supported versions: 5.6, 7.0, 7.1, 7.2.
 # See version-specific notes: http://docs.drupalvm.com/en/latest/configurations/php/
 php_version: "7.1"
 php_install_recommends: no
diff --git a/docs/configurations/php.md b/docs/configurations/php.md
index 1289cceab..a454ab3bd 100644
--- a/docs/configurations/php.md
+++ b/docs/configurations/php.md
@@ -1,19 +1,19 @@
-Drupal VM defaults to PHP 7.1, but you can also install and use 5.6 or 7.0.
+Drupal VM defaults to PHP 7.1, but you can also install and use 5.6, 7.0 or 7.2.
 
 ## Ubuntu
 
-Ondřej Surý's PPA for PHP is used to install PHP 7.1, but you can switch to using 5.6 or 7.0 packages by changing `php_version` inside `config.yml` to `"5.6"` or `"7.0"`.
+Ondřej Surý's PPA for PHP is used to install PHP 7.1, but you can switch version by changing `php_version` inside `config.yml` to `"5.6"`, `"7.0"` or `"7.2"`.
 
 If you're using Apache with `mod_php` you should also add `libapache2-mod-php5.6` or `libapache2-mod-php7.0` to the `extra_packages` list.
 
-_Note: XHProf does currently not work with PHP 7.1, make sure you don't have it listed in `installed_extras`._
+_Note: XHProf does currently not work with PHP 7.1+, make sure you don't have it listed in `installed_extras`._
 
 ## RedHat/CentOS 7
 
-Remi's RPM repository is included with Drupal VM, and you can make the following changes to use it to install PHP 7.0 or PHP 5.6 instead of 7.1:
+Remi's RPM repository is included with Drupal VM, and you can make the following changes to use it to install a different version of PHP than 7.1:
 
   1. Make sure you've followed the directions for switching to CentOS 7 in the [use a different base OS](base-os.md) guide.
-  2. Change `php_version` inside `config.yml` to `"5.6"` or `"7.0"`.
+  2. Change `php_version` inside `config.yml` to `"5.6"`, `"7.0"` or `"7.2"`.
 
 ## Using default distribution packages
 
diff --git a/docs/extras/xhprof.md b/docs/extras/xhprof.md
index d57a03b7d..2598bad7d 100644
--- a/docs/extras/xhprof.md
+++ b/docs/extras/xhprof.md
@@ -1,6 +1,6 @@
 [XHProf](http://xhprof.io/) allows easy code profiling and can be used in many different ways. Ensure `xhprof` is in the list of `installed_extras` inside `config.yml`.
 
-_Note: XHProf does currently not work with PHP 7.1. The PHP extension has barely been maintained since Facebook abandoned the project around 2015, so it's difficult to get it running under newer versions of PHP. If you require support for PHP 7.1 you should use [Tideways](tideways.md) instead._
+_Note: XHProf does currently not work with PHP 7.1+. The PHP extension has barely been maintained since Facebook abandoned the project around 2015, so it's difficult to get it running under newer versions of PHP. If you require support for PHP 7.1 or newer, you should use [Tideways](tideways.md) instead._
 
 ### XHProf module
 
diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 3536f98d0..2f8d76a1b 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -56,7 +56,7 @@
 - src: geerlingguy.php-tideways
   version: 1.1.0
 - src: geerlingguy.php-versions
-  version: 1.1.0
+  version: 2.0.0
 - src: geerlingguy.php-xdebug
   version: 2.3.1
 - src: geerlingguy.php-xhprof
diff --git a/provisioning/roles/geerlingguy.php-versions/.travis.yml b/provisioning/roles/geerlingguy.php-versions/.travis.yml
index 1943be869..ab4fc3c92 100644
--- a/provisioning/roles/geerlingguy.php-versions/.travis.yml
+++ b/provisioning/roles/geerlingguy.php-versions/.travis.yml
@@ -2,11 +2,33 @@
 services: docker
 
 env:
-  - distro: centos7
-  - distro: centos6
-  - distro: debian8
-  - distro: ubuntu1604
-  - distro: ubuntu1404
+  global:
+    php_version: "7.1"
+
+  matrix:
+    # Default - PHP 7.1
+    - distro: centos7
+    - distro: centos6
+    - distro: debian8
+    - distro: ubuntu1604
+    - distro: ubuntu1404
+
+    # PHP 7.2
+    - distro: centos7
+      playbook: test-7.2.yml
+      php_version: "7.2"
+    - distro: centos6
+      playbook: test-7.2.yml
+      php_version: "7.2"
+    - distro: debian8
+      playbook: test-7.2.yml
+      php_version: "7.2"
+    - distro: ubuntu1604
+      playbook: test-7.2.yml
+      php_version: "7.2"
+    - distro: ubuntu1404
+      playbook: test-7.2.yml
+      php_version: "7.2"
 
 script:
   # Configure test script so we can run extra tests after playbook is run.
@@ -21,7 +43,7 @@ script:
   - ${PWD}/tests/test.sh
 
   # Run script to test PHP version.
-  - 'docker exec ${container_id} env TERM=xterm php -v | grep "7.1."'
+  - 'docker exec ${container_id} env TERM=xterm php -v | grep -F "${php_version}."'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.php-versions/README.md b/provisioning/roles/geerlingguy.php-versions/README.md
index d8d597b97..14cd1ea80 100644
--- a/provisioning/roles/geerlingguy.php-versions/README.md
+++ b/provisioning/roles/geerlingguy.php-versions/README.md
@@ -26,7 +26,7 @@ The PHP version to be installed. Any [currently-supported PHP major version](htt
     - hosts: webservers
     
       vars:
-        php_version: 7.1
+        php_version: '7.1'
     
       roles:
         - role: geerlingguy.repo-remi
diff --git a/provisioning/roles/geerlingguy.php-versions/tasks/main.yml b/provisioning/roles/geerlingguy.php-versions/tasks/main.yml
index 813b5b69d..f53afd1cf 100644
--- a/provisioning/roles/geerlingguy.php-versions/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php-versions/tasks/main.yml
@@ -1,6 +1,9 @@
 ---
 - name: Include OS-specific variables.
-  include_vars: "{{ ansible_os_family }}.yml"
+  include_vars: "{{ item }}"
+  with_fileglob:
+    - "../vars/{{ ansible_os_family }}.yml"
+    - "../vars/{{ ansible_os_family }}-php{{ php_version }}.yml"
 
 - name: Define PHP variables.
   set_fact: "{{ item.key }}={{ hostvars[inventory_hostname][item.value] }}"
diff --git a/provisioning/roles/geerlingguy.php-versions/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.php-versions/tasks/setup-Debian.yml
index f06355ef2..8da592d6c 100644
--- a/provisioning/roles/geerlingguy.php-versions/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.php-versions/tasks/setup-Debian.yml
@@ -45,7 +45,8 @@
     purge: yes
     force: yes
   when: "'php' + php_version not in item"
-  with_flattened:
-    - "{{ php_packages|regex_replace('php' + php_version, 'php5.6') }}"
-    - "{{ php_packages|regex_replace('php' + php_version, 'php7.0') }}"
-    - "{{ php_packages|regex_replace('php' + php_version, 'php7.1') }}"
+  with_items:
+    - php5.6-common
+    - php7.0-common
+    - php7.1-common
+    - php7.2-common
diff --git a/provisioning/roles/geerlingguy.php-versions/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.php-versions/tasks/setup-RedHat.yml
index 773e53f25..7af8bf9e3 100644
--- a/provisioning/roles/geerlingguy.php-versions/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.php-versions/tasks/setup-RedHat.yml
@@ -10,3 +10,7 @@
 - name: Enable remi repo for PHP 7.1.
   set_fact: php_enablerepo="remi,remi-php71"
   when: php_version == "7.1"
+
+- name: Enable remi repo for PHP 7.2.
+  set_fact: php_enablerepo="remi,remi-php72"
+  when: php_version == "7.2"
diff --git a/provisioning/roles/geerlingguy.php-versions/tests/test-7.2.yml b/provisioning/roles/geerlingguy.php-versions/tests/test-7.2.yml
new file mode 100644
index 000000000..5f7070f52
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-versions/tests/test-7.2.yml
@@ -0,0 +1,17 @@
+---
+- hosts: all
+
+  vars:
+    php_enable_webserver: false
+    php_version: "7.2"
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=yes cache_valid_time=600
+      when: ansible_os_family == 'Debian'
+
+  roles:
+    - role: geerlingguy.repo-remi
+      when: ansible_os_family == 'RedHat'
+    - role_under_test
+    - geerlingguy.php
diff --git a/provisioning/roles/geerlingguy.php-versions/vars/Debian-php7.2.yml b/provisioning/roles/geerlingguy.php-versions/vars/Debian-php7.2.yml
new file mode 100644
index 000000000..7c6674e34
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-versions/vars/Debian-php7.2.yml
@@ -0,0 +1,16 @@
+__php_packages:
+  - "php{{ php_version }}"
+  - "php{{ php_version }}-apcu"
+  - "php{{ php_version }}-cli"
+  - "php{{ php_version }}-common"
+  - "php{{ php_version }}-curl"
+  - "php{{ php_version }}-dev"
+  - "php{{ php_version }}-fpm"
+  - "php{{ php_version }}-gd"
+  - "php{{ php_version }}-imap"
+  - "php{{ php_version }}-json"
+  - "php{{ php_version }}-mbstring"
+  - "php{{ php_version }}-opcache"
+  - "php{{ php_version }}-sqlite3"
+  - "php{{ php_version }}-xml"
+  - "php{{ php_version }}-yaml"

From 3c84e2df4ae4cd7b368c545588f018edfa432891 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 21 Sep 2017 23:34:03 -0500
Subject: [PATCH 0885/1273] Fixes #1521: Update docs to remove Ubuntu 12.04
 mentions, install Ansible via pip inside VM.

---
 Vagrantfile                    |  4 ++++
 default.config.yml             |  1 -
 docs/configurations/base-os.md | 21 +++++++++++++--------
 tests/run-tests.sh             |  4 ----
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 774121ef8..7020c92dd 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -110,6 +110,10 @@ Vagrant.configure('2') do |config|
     }
     ansible.raw_arguments = ENV['DRUPALVM_ANSIBLE_ARGS']
     ansible.tags = ENV['DRUPALVM_ANSIBLE_TAGS']
+    # Use pip to get the latest Ansible version when using ansible_local.
+    if provisioner == :ansible_local
+      ansible.install_mode = "pip"
+    end
   end
 
   # VMware Fusion.
diff --git a/default.config.yml b/default.config.yml
index a3e0e0912..bfcf96a41 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -6,7 +6,6 @@
 #   - geerlingguy/debian8
 #   - geerlingguy/ubuntu1604
 #   - geerlingguy/ubuntu1404
-#   - geerlingguy/ubuntu1204
 vagrant_box: geerlingguy/ubuntu1604
 
 vagrant_user: vagrant
diff --git a/docs/configurations/base-os.md b/docs/configurations/base-os.md
index bc55c33c2..26aaf6b83 100644
--- a/docs/configurations/base-os.md
+++ b/docs/configurations/base-os.md
@@ -2,11 +2,12 @@ Drupal VM's configuration is designed to work with RedHat and Debian-compatible
 
 Currently-supported OSes are:
 
-  - Ubuntu 16.04 (default)
-  - Ubuntu 14.04
-  - Ubuntu 12.04
+  - Ubuntu 16.04 'Xenial' (default)
+  - Ubuntu 14.04 'Precise'
   - RedHat Enterprise Linux / CentOS 7
-  - RedHat Enterprise Linux / CentOS 6
+  - RedHat Enterprise Linux / CentOS 6 (limited support)
+  - Debian 9 'Stretch'
+  - Debian 8 'Jessie'
 
 For certain OSes, there are a couple other caveats and tweaks you may need to perform to get things running smoothly—the main features and latest development is only guaranteed to work with the default OS as configured in `default.config.yml`.
 
@@ -20,10 +21,6 @@ Everything should work out of the box with Ubuntu 16.04.
 
 Everything should work out of the box with Ubuntu 14.04.
 
-## Ubuntu 12.04 Precise LTS
-
-Everything should work out of the box with Ubuntu 12.04.
-
 ## RedHat Enterprise Linux / CentOS 7
 
 Everything should work out of the box with RHEL 7.
@@ -43,3 +40,11 @@ php_opcache_enabled_in_ini: false
 ```yaml
 firewall_disable_firewalld: false
 ```
+
+## Debian 9 Stretch
+
+Everything should work out of the box with Debian 9.
+
+## Debian 8 Jessie
+
+Everything should work out of the box with Debian 8.
diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index 542316f1a..3aa4167c2 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -33,10 +33,6 @@ elif [ $distro = 'ubuntu1604' ]; then
 elif [ $distro = 'ubuntu1404' ]; then
   init="/sbin/init"
   opts="--privileged"
-# Ubuntu 12.04
-elif [ $distro = 'ubuntu1204' ]; then
-  init="/sbin/init"
-  opts="--privileged"
 # Debian 9
 elif [ $distro = 'debian9' ]; then
   init="/lib/systemd/systemd"

From 9f68a077b22e44cfc9a25d4d1a44f2aee1353f3d Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 21 Sep 2017 23:45:32 -0500
Subject: [PATCH 0886/1273] Updated PHP role to latest version.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.php/.travis.yml         |  7 ++-----
 .../roles/geerlingguy.php/defaults/main.yml   |  3 ++-
 .../roles/geerlingguy.php/meta/main.yml       | 10 ++++++++-
 .../tasks/install-from-source.yml             | 12 +++++------
 .../geerlingguy.php/tests/test-source.yml     |  4 +---
 .../tests/test-vars-ubuntu1204.yml            | 21 -------------------
 .../roles/geerlingguy.php/tests/test.yml      |  9 +-------
 8 files changed, 22 insertions(+), 46 deletions(-)
 delete mode 100644 provisioning/roles/geerlingguy.php/tests/test-vars-ubuntu1204.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 2f8d76a1b..2f120aebc 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -42,7 +42,7 @@
 - src: geerlingguy.nodejs
   version: 4.1.2
 - src: geerlingguy.php
-  version: 3.4.5
+  version: 3.5.0
 - src: geerlingguy.php-memcached
   version: 2.0.0
 - src: geerlingguy.php-mysql
diff --git a/provisioning/roles/geerlingguy.php/.travis.yml b/provisioning/roles/geerlingguy.php/.travis.yml
index 5337b1a10..bdaa1a8ff 100644
--- a/provisioning/roles/geerlingguy.php/.travis.yml
+++ b/provisioning/roles/geerlingguy.php/.travis.yml
@@ -18,17 +18,14 @@ env:
   - distro: ubuntu1404
     playbook: test.yml
     php_version: 7.0
-  - distro: ubuntu1204
-    playbook: test.yml
-    php_version: 5.6
 
   # Only test source install on latest supported OSes.
   - distro: centos7
     playbook: test-source.yml
-    php_version: 7.0.13
+    php_version: 7.1.9
   - distro: ubuntu1604
     playbook: test-source.yml
-    php_version: 7.0.13
+    php_version: 7.1.9
 
 script:
   # Configure test script so we can run extra tests after playbook is run.
diff --git a/provisioning/roles/geerlingguy.php/defaults/main.yml b/provisioning/roles/geerlingguy.php/defaults/main.yml
index 15a03e942..dc3a058a7 100644
--- a/provisioning/roles/geerlingguy.php/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.php/defaults/main.yml
@@ -25,7 +25,7 @@ php_fpm_pm_max_spare_servers: 5
 # The executable to run when calling PHP from the command line.
 php_executable: "php"
 
-# OpCache settings (useful for PHP >=5.5).
+# OpCache settings.
 php_opcache_zend_extension: "opcache.so"
 php_opcache_enable: "1"
 php_opcache_enable_cli: "0"
@@ -81,6 +81,7 @@ php_display_startup_errors: "Off"
 
 # Install PHP from source (instead of using a package manager) with these vars.
 php_install_from_source: false
+php_source_repo: "https://git.php.net/repository/php-src.git"
 php_source_version: "master"
 php_source_clone_dir: "~/php-src"
 php_source_clone_depth: 1
diff --git a/provisioning/roles/geerlingguy.php/meta/main.yml b/provisioning/roles/geerlingguy.php/meta/main.yml
index 44ec3c8fa..b7506327a 100644
--- a/provisioning/roles/geerlingguy.php/meta/main.yml
+++ b/provisioning/roles/geerlingguy.php/meta/main.yml
@@ -20,7 +20,15 @@ galaxy_info:
     - all
   - name: Ubuntu
     versions:
-    - all
+    - trusty
+    - xenial
   galaxy_tags:
     - development
     - web
+    - php
+    - language
+    - fpm
+    - drupal
+    - wordpress
+    - joomla
+    - magento
diff --git a/provisioning/roles/geerlingguy.php/tasks/install-from-source.yml b/provisioning/roles/geerlingguy.php/tasks/install-from-source.yml
index fdbad6beb..c277d3d0a 100644
--- a/provisioning/roles/geerlingguy.php/tasks/install-from-source.yml
+++ b/provisioning/roles/geerlingguy.php/tasks/install-from-source.yml
@@ -78,31 +78,31 @@
 
 - name: Clone the PHP repository.
   git:
-    repo: https://git.php.net/repository/php-src.git
+    repo: "{{ php_source_repo }}"
     dest: "{{ php_source_clone_dir }}"
     version: "{{ php_source_version }}"
     accept_hostkey: yes
     depth: "{{ php_source_clone_depth }}"
-  when: php_installed|failed
+  when: php_installed.rc != 0
 
 - name: Ensure PHP installation path exists.
   file:
     path: "{{ php_source_install_path }}"
     state: directory
     mode: 0755
-  when: php_installed|failed
+  when: php_installed.rc != 0
 
 - name: Build configure script.
   shell: >
     ./buildconf --force
     chdir={{ php_source_clone_dir }}
-  when: php_installed|failed
+  when: php_installed.rc != 0
 
 - name: Run configure script.
   shell: >
     {{ php_source_configure_command }}
     chdir={{ php_source_clone_dir }}
-  when: php_installed|failed
+  when: php_installed.rc != 0
 
 - name: Make and install PHP.
   shell: >
@@ -111,7 +111,7 @@
   with_items:
     - "{{ php_source_make_command }}"
     - make install
-  when: php_installed|failed
+  when: php_installed.rc != 0
 
 - name: Ensure php executable is symlinked into a standard path.
   file:
diff --git a/provisioning/roles/geerlingguy.php/tests/test-source.yml b/provisioning/roles/geerlingguy.php/tests/test-source.yml
index 5bd5bb16d..f364cc09d 100644
--- a/provisioning/roles/geerlingguy.php/tests/test-source.yml
+++ b/provisioning/roles/geerlingguy.php/tests/test-source.yml
@@ -5,10 +5,8 @@
     php_enable_webserver: false
     php_install_from_source: true
     php_source_clone_dir: /root/php-src
-    # Workaround for https://github.com/ansible/ansible-modules-core/issues/5457
-    php_source_clone_depth: 0
     php_source_make_command: "make --jobs=2"
-    php_source_version: "php-7.0.13"
+    php_source_version: "php-7.1.9"
     php_memory_limit: "192M"
 
   pre_tasks:
diff --git a/provisioning/roles/geerlingguy.php/tests/test-vars-ubuntu1204.yml b/provisioning/roles/geerlingguy.php/tests/test-vars-ubuntu1204.yml
deleted file mode 100644
index 49c96b888..000000000
--- a/provisioning/roles/geerlingguy.php/tests/test-vars-ubuntu1204.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-php_packages:
-  - php5.6
-  - php5.6-mcrypt
-  - php5.6-cli
-  - php5.6-common
-  - php5.6-curl
-  - php5.6-dev
-  - php5.6-fpm
-  - php5.6-gd
-  - libpcre3-dev
-php_conf_paths:
-  - /etc/php/5.6/fpm
-  - /etc/php/5.6/apache2
-  - /etc/php/5.6/cli
-php_extension_conf_paths:
-  - /etc/php/5.6/fpm/conf.d
-  - /etc/php/5.6/apache2/conf.d
-  - /etc/php/5.6/cli/conf.d
-php_fpm_daemon: php5.6-fpm
-php_fpm_conf_path: "/etc/php/5.6/fpm"
diff --git a/provisioning/roles/geerlingguy.php/tests/test.yml b/provisioning/roles/geerlingguy.php/tests/test.yml
index baaa7904e..ff72fc3dd 100644
--- a/provisioning/roles/geerlingguy.php/tests/test.yml
+++ b/provisioning/roles/geerlingguy.php/tests/test.yml
@@ -15,16 +15,9 @@
       changed_when: false
 
     # Ubuntu-specific tasks.
-    - include_vars: test-vars-ubuntu1204.yml
-      when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '12.04'
-
     - name: Add repository for PHP 7.
       apt_repository: repo='ppa:ondrej/php'
-      when: ansible_distribution == 'Ubuntu' and ansible_distribution_version != '12.04'
-
-    - name: Add repository for PHP 5.6.
-      apt_repository: repo='ppa:ondrej/php'
-      when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '12.04'
+      when: ansible_distribution == 'Ubuntu'
 
     # Debian-specific tasks.
     - name: Add dependencies for PHP versions (Debian).

From 9ad50b27ac94c7bca702e87fc4b24f9ac05dcc14 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 22 Sep 2017 09:10:55 -0500
Subject: [PATCH 0887/1273] Fix broken test due to rubocop validation.

---
 Vagrantfile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 7020c92dd..e6cc36b07 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -111,9 +111,7 @@ Vagrant.configure('2') do |config|
     ansible.raw_arguments = ENV['DRUPALVM_ANSIBLE_ARGS']
     ansible.tags = ENV['DRUPALVM_ANSIBLE_TAGS']
     # Use pip to get the latest Ansible version when using ansible_local.
-    if provisioner == :ansible_local
-      ansible.install_mode = "pip"
-    end
+    provisioner == :ansible_local && ansible.install_mode = 'pip'
   end
 
   # VMware Fusion.

From 93439db76efcdc50198c2f288191173f8ef6c6ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <m@oxy.fi>
Date: Fri, 22 Sep 2017 21:11:29 -0500
Subject: [PATCH 0888/1273] Output result in travis tests when there are
 failures

---
 tests/run-tests.sh | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index 3aa4167c2..3df15f33a 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -115,53 +115,60 @@ fi
 # Drupal.
 printf "\n"${green}"Running functional tests..."${neutral}"\n"
 docker exec $CONTAINER_ID curl -s --header Host:$HOSTNAME localhost \
+  | tee /tmp/dvm-test \
   | grep -q '<title>Welcome to Drupal' \
   && (echo 'Drupal install pass' && exit 0) \
-  || (echo 'Drupal install fail' && exit 1)
+  || (echo 'Drupal install fail' && cat /tmp/dvm-test && exit 1)
 
 # Adminer.
 if [ $TEST_INSTALLED_EXTRAS = true ]; then
   docker exec $CONTAINER_ID curl -s --header Host:adminer.$HOSTNAME localhost \
+    | tee /tmp/dvm-test \
     | grep -q '<title>Login - Adminer' \
     && (echo 'Adminer install pass' && exit 0) \
-    || (echo 'Adminer install fail' && exit 1)
+    || (echo 'Adminer install fail' && cat /tmp/dvm-test && exit 1)
 fi
 
 # Pimp My Log.
 if [ $TEST_INSTALLED_EXTRAS = true ]; then
   docker exec $CONTAINER_ID curl -s --header Host:pimpmylog.$HOSTNAME localhost \
+    | tee /tmp/dvm-test \
     | grep -q '<title>Pimp my Log' \
     && (echo 'Pimp my Log install pass' && exit 0) \
-    || (echo 'Pimp my Log install fail' && exit 1)
+    || (echo 'Pimp my Log install fail' && cat /tmp/dvm-test && exit 1)
 fi
 
 # MailHog.
 if [ $TEST_INSTALLED_EXTRAS = true ]; then
   docker exec $CONTAINER_ID curl -s localhost:8025 \
+    | tee /tmp/dvm-test \
     | grep -q '<title>MailHog' \
     && (echo 'MailHog install pass' && exit 0) \
-    || (echo 'MailHog install fail' && exit 1)
+    || (echo 'MailHog install fail' && cat /tmp/dvm-test && exit 1)
 fi
 
 # Varnish.
 if [ $TEST_INSTALLED_EXTRAS = true ]; then
   docker exec $CONTAINER_ID curl -sI --header Host:$HOSTNAME localhost:81 \
+    | tee /tmp/dvm-test \
     | grep -q 'Via: .* varnish' \
     && (echo 'Varnish install pass' && exit 0) \
-    || (echo 'Varnish install fail' && exit 1)
+    || (echo 'Varnish install fail' && cat /tmp/dvm-test && exit 1)
 fi
 
 # Dashboard.
 docker exec $CONTAINER_ID curl -s --header Host:$IP localhost \
+  | tee /tmp/dvm-test \
   | grep -q "<li>$IP $HOSTNAME</li>" \
   && (echo 'Dashboard install pass' && exit 0) \
-  || (echo 'Dashboard install fail' && exit 1)
+  || (echo 'Dashboard install fail' && cat /tmp/dvm-test && exit 1)
 
 # Drush.
 docker exec $CONTAINER_ID $DRUSH_BIN @$MACHINE_NAME.$HOSTNAME status \
+  | tee /tmp/dvm-test \
   | grep -q 'Drupal bootstrap.*Successful' \
   && (echo 'Drush install pass' && exit 0) \
-  || (echo 'Drush install fail' && exit 1)
+  || (echo 'Drush install fail' && cat /tmp/dvm-test && exit 1)
 
 # Remove test container.
 printf "\n"${green}"Cleaning up..."${neutral}"\n"

From a3a69a2d89430a96b287362f558000871d4222df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <m@oxy.fi>
Date: Sat, 23 Sep 2017 10:01:42 -0500
Subject: [PATCH 0889/1273] Fixes #1520: Let local.config.yml override
 environment.config.yml

---
 Vagrantfile                                |  4 ++--
 docs/getting-started/configure-drupalvm.md | 14 +++++++-------
 provisioning/tasks/config.yml              |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index e6cc36b07..e90fb6727 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -23,8 +23,8 @@ end
 vconfig = load_config([
   default_config_file,
   "#{host_config_dir}/config.yml",
-  "#{host_config_dir}/local.config.yml",
-  "#{host_config_dir}/#{drupalvm_env}.config.yml"
+  "#{host_config_dir}/#{drupalvm_env}.config.yml",
+  "#{host_config_dir}/local.config.yml"
 ])
 
 provisioner = vconfig['force_ansible_local'] ? :ansible_local : vagrant_provisioner
diff --git a/docs/getting-started/configure-drupalvm.md b/docs/getting-started/configure-drupalvm.md
index a4d4c6190..4c3741449 100644
--- a/docs/getting-started/configure-drupalvm.md
+++ b/docs/getting-started/configure-drupalvm.md
@@ -20,7 +20,13 @@ vagrant_machine_name: my_custom_site
 php_version: "5.6"
 ```
 
-#### 3. local.config.yml
+### 3. vagrant.config.yml
+
+Environment specific overrides. When you run Drupal VM through _Vagrant_, the environment will be set to `vagrant` and this file is loaded when available. If you're doing something more advanced, such as running Drupal VM on a [production environment](../other/production.md), you can use a different environment configuration file, eg `prod.config.yml`.
+
+_Note: In addition to the variables listed in `default.config.yml`, you can also override the variables set by any of the ansible roles. In the "Installed extras" section of this documentation, each role has a link to the available variables._
+
+#### 4. local.config.yml
 
 Local development overrides. Commonly this file is ignored from VCS so that each team member can make local customizations.
 
@@ -37,12 +43,6 @@ vagrant_synced_folders:
     create: true
 ```
 
-### 4. vagrant.config.yml
-
-Environment specific overrides. When you run Drupal VM through _Vagrant_, the environment will be set to `vagrant` and this file is loaded when available. If you're doing something more advanced, such as running Drupal VM on a [production environment](../other/production.md), you can use a different environment configuration file, eg `prod.config.yml`.
-
-_Note: In addition to the variables listed in `default.config.yml`, you can also override the variables set by any of the ansible roles. In the "Installed extras" section of this documentation, each role has a link to the available variables._
-
 ## Additional resources
 
 - Jeff Geerling's DrupalDC talk "[Drupal VM Tips and Tricks for Drupal 8 development](https://www.youtube.com/watch?v=_wV6MDsT42Y)"
diff --git a/provisioning/tasks/config.yml b/provisioning/tasks/config.yml
index c7cf99bbe..904501cc2 100644
--- a/provisioning/tasks/config.yml
+++ b/provisioning/tasks/config.yml
@@ -11,6 +11,6 @@
   include_vars: "{{ item }}"
   with_fileglob:
     - "{{ config_dir }}/config.yml"
-    - "{{ config_dir }}/local.config.yml"
     - "{{ config_dir }}/secrets.yml"
     - "{{ config_dir }}/{{ lookup('env', 'DRUPALVM_ENV')|default(drupalvm_env, true)|default(ansible_env.DRUPALVM_ENV)|default(omit) }}.config.yml"
+    - "{{ config_dir }}/local.config.yml"

From 066ef09047947490912858d90c9c61b513664d1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <m@oxy.fi>
Date: Sat, 23 Sep 2017 20:06:50 -0500
Subject: [PATCH 0890/1273] typo [ci skip]

---
 docs/getting-started/configure-drupalvm.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/getting-started/configure-drupalvm.md b/docs/getting-started/configure-drupalvm.md
index 4c3741449..57cbcfcc4 100644
--- a/docs/getting-started/configure-drupalvm.md
+++ b/docs/getting-started/configure-drupalvm.md
@@ -20,7 +20,7 @@ vagrant_machine_name: my_custom_site
 php_version: "5.6"
 ```
 
-### 3. vagrant.config.yml
+#### 3. vagrant.config.yml
 
 Environment specific overrides. When you run Drupal VM through _Vagrant_, the environment will be set to `vagrant` and this file is loaded when available. If you're doing something more advanced, such as running Drupal VM on a [production environment](../other/production.md), you can use a different environment configuration file, eg `prod.config.yml`.
 

From 73da90a62a5411e76ed835184284d8415ed94b28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <m@oxy.fi>
Date: Sat, 23 Sep 2017 20:20:25 -0500
Subject: [PATCH 0891/1273] Use shellwords hack to allow spaces in
 DRUPALVM_ANSIBLE_ARGS

https://gist.github.com/phantomwhale/9657134
---
 Vagrantfile                    | 2 +-
 docs/extending/ansible-args.md | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index e6cc36b07..1425b1b46 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -108,7 +108,7 @@ Vagrant.configure('2') do |config|
       config_dir: config_dir,
       drupalvm_env: drupalvm_env
     }
-    ansible.raw_arguments = ENV['DRUPALVM_ANSIBLE_ARGS']
+    ansible.raw_arguments = Shellwords.shellsplit(ENV['DRUPALVM_ANSIBLE_ARGS']) if ENV['DRUPALVM_ANSIBLE_ARGS']
     ansible.tags = ENV['DRUPALVM_ANSIBLE_TAGS']
     # Use pip to get the latest Ansible version when using ansible_local.
     provisioner == :ansible_local && ansible.install_mode = 'pip'
diff --git a/docs/extending/ansible-args.md b/docs/extending/ansible-args.md
index 0da086146..69d56914d 100644
--- a/docs/extending/ansible-args.md
+++ b/docs/extending/ansible-args.md
@@ -28,11 +28,11 @@ DRUPALVM_ANSIBLE_ARGS='--verbose' vagrant provision
 Begin the provisioning at a particular task:
 
 ```sh
-DRUPALVM_ANSIBLE_ARGS='--start-at-task=*post-provision shell*' vagrant provision
+DRUPALVM_ANSIBLE_ARGS="--start-at-task '*post-provision shell*'" vagrant provision
 ```
 
 Override a config variable:
 
 ```sh
-DRUPALVM_ANSIBLE_ARGS='--extra-vars=drupal_db_backend=pgsql' vagrant provision
+DRUPALVM_ANSIBLE_ARGS='--extra-vars "drupal_db_backend=pgsql"' vagrant provision
 ```

From d401e590e2e887f58200d74f1b3744f310382948 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <m@oxy.fi>
Date: Fri, 22 Sep 2017 21:32:33 -0500
Subject: [PATCH 0892/1273] Show curl failures and headers in travis tests

---
 tests/run-tests.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index 3df15f33a..f96d41eed 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -114,7 +114,7 @@ fi
 
 # Drupal.
 printf "\n"${green}"Running functional tests..."${neutral}"\n"
-docker exec $CONTAINER_ID curl -s --header Host:$HOSTNAME localhost \
+docker exec $CONTAINER_ID curl -sSi --header Host:$HOSTNAME localhost \
   | tee /tmp/dvm-test \
   | grep -q '<title>Welcome to Drupal' \
   && (echo 'Drupal install pass' && exit 0) \
@@ -122,7 +122,7 @@ docker exec $CONTAINER_ID curl -s --header Host:$HOSTNAME localhost \
 
 # Adminer.
 if [ $TEST_INSTALLED_EXTRAS = true ]; then
-  docker exec $CONTAINER_ID curl -s --header Host:adminer.$HOSTNAME localhost \
+  docker exec $CONTAINER_ID curl -sSi --header Host:adminer.$HOSTNAME localhost \
     | tee /tmp/dvm-test \
     | grep -q '<title>Login - Adminer' \
     && (echo 'Adminer install pass' && exit 0) \
@@ -131,7 +131,7 @@ fi
 
 # Pimp My Log.
 if [ $TEST_INSTALLED_EXTRAS = true ]; then
-  docker exec $CONTAINER_ID curl -s --header Host:pimpmylog.$HOSTNAME localhost \
+  docker exec $CONTAINER_ID curl -sSi --header Host:pimpmylog.$HOSTNAME localhost \
     | tee /tmp/dvm-test \
     | grep -q '<title>Pimp my Log' \
     && (echo 'Pimp my Log install pass' && exit 0) \
@@ -140,7 +140,7 @@ fi
 
 # MailHog.
 if [ $TEST_INSTALLED_EXTRAS = true ]; then
-  docker exec $CONTAINER_ID curl -s localhost:8025 \
+  docker exec $CONTAINER_ID curl -sSi localhost:8025 \
     | tee /tmp/dvm-test \
     | grep -q '<title>MailHog' \
     && (echo 'MailHog install pass' && exit 0) \
@@ -149,7 +149,7 @@ fi
 
 # Varnish.
 if [ $TEST_INSTALLED_EXTRAS = true ]; then
-  docker exec $CONTAINER_ID curl -sI --header Host:$HOSTNAME localhost:81 \
+  docker exec $CONTAINER_ID curl -sSI --header Host:$HOSTNAME localhost:81 \
     | tee /tmp/dvm-test \
     | grep -q 'Via: .* varnish' \
     && (echo 'Varnish install pass' && exit 0) \
@@ -157,7 +157,7 @@ if [ $TEST_INSTALLED_EXTRAS = true ]; then
 fi
 
 # Dashboard.
-docker exec $CONTAINER_ID curl -s --header Host:$IP localhost \
+docker exec $CONTAINER_ID curl -sSi --header Host:$IP localhost \
   | tee /tmp/dvm-test \
   | grep -q "<li>$IP $HOSTNAME</li>" \
   && (echo 'Dashboard install pass' && exit 0) \

From 39046b498dd9a0420e465d65abf160b25615722a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <m@oxy.fi>
Date: Sun, 24 Sep 2017 09:44:54 -0500
Subject: [PATCH 0893/1273] Make cleanup optional in run-tests.sh script

---
 tests/run-tests.sh | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index f96d41eed..b37cff24b 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -15,6 +15,7 @@ TEST_INSTALLED_EXTRAS="${TEST_INSTALLED_EXTRAS:-true}"
 CONTAINER_ID="${CONTAINER_ID:-dvm-test}"
 type="${type:-tests/defaults}"
 distro="${distro:-ubuntu1604}"
+cleanup="${cleanup:-true}"
 
 ## Set up vars for Docker setup.
 # CentOS 7
@@ -171,6 +172,11 @@ docker exec $CONTAINER_ID $DRUSH_BIN @$MACHINE_NAME.$HOSTNAME status \
   || (echo 'Drush install fail' && cat /tmp/dvm-test && exit 1)
 
 # Remove test container.
-printf "\n"${green}"Cleaning up..."${neutral}"\n"
-docker rm -f $CONTAINER_ID
-printf ${green}"...done!"${neutral}"\n\n"
+if [ $cleanup = true ]; then
+  printf "\n"${green}"Cleaning up..."${neutral}"\n"
+  docker rm -f $CONTAINER_ID
+  printf ${green}"...done!"${neutral}"\n\n"
+else
+  printf "\n"${green}"Skipping cleanup for container id: ${CONTAINER_ID}!"${neutral}"\n"
+  printf ${green}"Done!"${neutral}"\n\n"
+fi

From b65caca81567c932ab01181564506975ac3a38c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <m@oxy.fi>
Date: Sun, 24 Sep 2017 09:46:05 -0500
Subject: [PATCH 0894/1273] Fix run-tests.sh when macos has gnu xargs

---
 tests/run-tests.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index b37cff24b..fe4126134 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -51,10 +51,15 @@ fi
 # Set OS-specific options.
 if [[ "$OSTYPE" == "darwin"* ]]; then
   volume_opts='rw,cached'
-  xargs_command='xargs'
 else
   volume_opts='rw'
+fi
+
+# Use correct xargs command depending if it's GNU or BSD.
+if xargs --version 2>&1 | grep -s GNU >/dev/null; then
   xargs_command='xargs -r'
+else
+  xargs_command='xargs'
 fi
 
 # Exit on any individual command failure.

From 1c873ba1fdea0d9f6688df212ddd5fcd4cd27f78 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 24 Sep 2017 16:41:56 -0500
Subject: [PATCH 0895/1273] Fixes #1558: Update Daemonize role to work on
 Ubuntu 14.04 with Ansible 2.4.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.daemonize/.gitignore    |  2 +
 .../roles/geerlingguy.daemonize/.travis.yml   | 63 +++++--------------
 .../roles/geerlingguy.daemonize/LICENSE       | 20 ++++++
 .../roles/geerlingguy.daemonize/README.md     |  2 +-
 .../geerlingguy.daemonize/tasks/main.yml      |  2 +-
 .../geerlingguy.daemonize/tests/README.md     | 11 ++++
 .../geerlingguy.daemonize/tests/test.yml      |  5 +-
 8 files changed, 53 insertions(+), 54 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.daemonize/.gitignore
 create mode 100644 provisioning/roles/geerlingguy.daemonize/LICENSE
 create mode 100644 provisioning/roles/geerlingguy.daemonize/tests/README.md

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 2f120aebc..9db972e49 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -16,7 +16,7 @@
 - src: geerlingguy.composer
   version: 1.6.1
 - src: geerlingguy.daemonize
-  version: 1.1.1
+  version: 1.2.0
 - src: geerlingguy.drupal
   version: 2.4.0
 - src: geerlingguy.drupal-console
diff --git a/provisioning/roles/geerlingguy.daemonize/.gitignore b/provisioning/roles/geerlingguy.daemonize/.gitignore
new file mode 100644
index 000000000..c9b2377e3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.daemonize/.gitignore
@@ -0,0 +1,2 @@
+*.retry
+tests/test.sh
diff --git a/provisioning/roles/geerlingguy.daemonize/.travis.yml b/provisioning/roles/geerlingguy.daemonize/.travis.yml
index 53f562446..b3d24462e 100644
--- a/provisioning/roles/geerlingguy.daemonize/.travis.yml
+++ b/provisioning/roles/geerlingguy.daemonize/.travis.yml
@@ -1,60 +1,27 @@
 ---
-sudo: required
+services: docker
 
 env:
-  - repository: geerlingguy/docker-centos7-ansible
-    version: latest
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-  - repository: geerlingguy/docker-centos6-ansible
-    version: latest
-    init: /sbin/init
-    run_opts: ""
-  - repository: geerlingguy/docker-ubuntu1604-ansible
-    version: latest
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-  - repository: geerlingguy/docker-ubuntu1404-ansible
-    version: latest
-    init: /sbin/init
-    run_opts: ""
-  - repository: geerlingguy/docker-ubuntu1204-ansible
-    version: latest
-    init: /sbin/init
-    run_opts: ""
-
-services:
-  - docker
-
-before_install:
-  # Pull container.
-  - 'sudo docker pull ${repository}:${version}'
+  - distro: centos7
+  - distro: centos6
+  - distro: ubuntu1604
+  - distro: ubuntu1404
+  - distro: ubuntu1204
 
 script:
-  - container_id=$(mktemp)
-  # Run container in detached state.
-  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${repository}:${version} "${init}" > "${container_id}"'
+  # Configure test script so we can run extra tests after playbook is run.
+  - export container_id=$(date +%s)
+  - export cleanup=false
 
-  # Ansible syntax check.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+  # Download test shim.
+  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
+  - chmod +x ${PWD}/tests/test.sh
 
-  # Test role.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
-
-  # Test role idempotence.
-  - idempotence=$(mktemp)
-  - sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
-  - >
-    tail ${idempotence}
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
+  # Run tests.
+  - ${PWD}/tests/test.sh
 
   # Ensure daemonize is available.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm which daemonize'
-
-  # Clean up.
-  - 'sudo docker stop "$(cat ${container_id})"'
+  - 'docker exec --tty ${container_id} env TERM=xterm which daemonize'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.daemonize/LICENSE b/provisioning/roles/geerlingguy.daemonize/LICENSE
new file mode 100644
index 000000000..4275cf3c1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.daemonize/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Jeff Geerling
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/provisioning/roles/geerlingguy.daemonize/README.md b/provisioning/roles/geerlingguy.daemonize/README.md
index c2f219022..3f1f2d974 100644
--- a/provisioning/roles/geerlingguy.daemonize/README.md
+++ b/provisioning/roles/geerlingguy.daemonize/README.md
@@ -40,4 +40,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.daemonize/tasks/main.yml b/provisioning/roles/geerlingguy.daemonize/tasks/main.yml
index 38334682a..4a69bf555 100644
--- a/provisioning/roles/geerlingguy.daemonize/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.daemonize/tasks/main.yml
@@ -21,7 +21,7 @@
   command: >
     {{ item }}
     chdir={{ workspace }}/daemonize-release-{{ daemonize_version }}
-  when: daemonize_installed | failed
+  when: daemonize_installed.rc != 0
   with_items:
     - "./configure --prefix={{ daemonize_install_path }}"
     - make
diff --git a/provisioning/roles/geerlingguy.daemonize/tests/README.md b/provisioning/roles/geerlingguy.daemonize/tests/README.md
new file mode 100644
index 000000000..6fb211721
--- /dev/null
+++ b/provisioning/roles/geerlingguy.daemonize/tests/README.md
@@ -0,0 +1,11 @@
+# Ansible Role tests
+
+To run the test playbook(s) in this directory:
+
+  1. Install and start Docker.
+  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
+    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
+  1. Make the test shim executable: `chmod +x tests/test.sh`.
+  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
+
+If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.daemonize/tests/test.yml b/provisioning/roles/geerlingguy.daemonize/tests/test.yml
index 068c5e54d..9d3720595 100644
--- a/provisioning/roles/geerlingguy.daemonize/tests/test.yml
+++ b/provisioning/roles/geerlingguy.daemonize/tests/test.yml
@@ -8,13 +8,12 @@
         - "@Development tools"
         - tar
         - unzip
-        - sudo
-        - which
       when: ansible_os_family == 'RedHat'
 
     - name: Update apt cache.
-      apt: update_cache=yes
+      apt: update_cache=yes cache_valid_time=600
       when: ansible_os_family == 'Debian'
+      changed_when: false
 
     - name: Ensure build dependencies are installed (Debian).
       apt: 'name="{{ item }}" state=installed'

From 7c3d210bc2296ee5b9fa1eff45475a9f5fd2cd12 Mon Sep 17 00:00:00 2001
From: Dane Powell <danepowell@users.noreply.github.com>
Date: Mon, 25 Sep 2017 17:11:17 -0700
Subject: [PATCH 0896/1273] php_xdebug_cli_enable is unused

---
 default.config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.config.yml b/default.config.yml
index 131f2236c..7940a24b0 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -319,7 +319,7 @@ pimpmylog_grant_all_privs: true
 # XDebug configuration. XDebug is disabled by default for better performance.
 php_xdebug_default_enable: 0
 php_xdebug_coverage_enable: 0
-php_xdebug_cli_enable: 1
+php_xdebug_cli_disable: yes
 php_xdebug_remote_enable: 1
 php_xdebug_remote_connect_back: 1
 # Use PHPSTORM for PHPStorm, sublime.xdebug for Sublime Text.

From 6c30752af0a72218819e7a9d1e3ce3343a98041b Mon Sep 17 00:00:00 2001
From: Justin Gable <justgable@gmail.com>
Date: Tue, 3 Oct 2017 11:25:03 -0700
Subject: [PATCH 0897/1273] Update broken link to drupal console documentation

---
 docs/extras/drupal-console.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/extras/drupal-console.md b/docs/extras/drupal-console.md
index 6da54af0b..f45815e22 100644
--- a/docs/extras/drupal-console.md
+++ b/docs/extras/drupal-console.md
@@ -35,7 +35,7 @@ Execute from host machine using the `--target` option.
 
     drupal --target=drupalvm.test site:status
 
-For more details, see [Drupal Console's documentation](https://hechoendrupal.gitbooks.io/drupal-console/content/en/using/how-to-use-drupal-console-in-a-remote-installation.html)
+For more details, see [Drupal Console's documentation](https://docs.drupalconsole.com/en/alias/how-to-use-drupal-console-in-a-remote-installation.html)
 
 For a list of available role variables, see the [`geerlingguy.drupal-console` Ansible role's README](https://github.com/geerlingguy/ansible-role-drupal-console#readme).
 

From 128fbbf9e446c6dc1da16dd15a719fe2f671c39b Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 4 Oct 2017 15:05:20 -0500
Subject: [PATCH 0898/1273] Issue #1573: Update default drush_version to
 8.1.14.

---
 default.config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.config.yml b/default.config.yml
index 131f2236c..11d736a11 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -233,7 +233,7 @@ extra_packages:
   - sqlite
 
 # You can configure almost anything else on the server in the rest of this file.
-drush_version: "8.1.12"
+drush_version: "8.1.14"
 
 extra_security_enabled: false
 

From 127d094ac7ea8636a50845d9d955a6afe28782cf Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 4 Oct 2017 15:16:57 -0500
Subject: [PATCH 0899/1273] Issue #1573: Update default drupal versions to
 8.4.x.

---
 example.drupal.make.yml                | 6 +++---
 provisioning/docker/bin/install-drupal | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/example.drupal.make.yml b/example.drupal.make.yml
index 4872ca007..1339d477e 100644
--- a/example.drupal.make.yml
+++ b/example.drupal.make.yml
@@ -11,13 +11,13 @@ projects:
 
   # Core.
   drupal:
-    version: "8.3.4"
+    version: "8.4.0"
     # Use this if you need a working git repository of Drupal core instead of
     # the latest stable.
     # type: "core"
     # download:
-    #   # Drupal core branch (e.g. "6.x", "7.x", "8.2.x", "8.3.x").
-    #   branch: "8.1.x"
+    #   # Drupal core branch (e.g. "6.x", "7.x", "8.3.x", "8.5.x").
+    #   branch: "8.4.x"
     #   working-copy: true
 
   # Other modules.
diff --git a/provisioning/docker/bin/install-drupal b/provisioning/docker/bin/install-drupal
index 43165e01f..9efaad8b5 100755
--- a/provisioning/docker/bin/install-drupal
+++ b/provisioning/docker/bin/install-drupal
@@ -4,13 +4,13 @@
 #
 # Usage:
 #   install-drupal [version]
-# [version] is optional, defaults to 8.3.x. Try 7.x, 7.55, 8.4.x, 8.3.2, etc.
+# [version] is optional, defaults to 8.4.x. Try 7.x, 7.55, 8.5.x, 8.3.2, etc.
 
 # Exit on any individual command failure.
 set -e
 
 # Setup.
-DRUPAL_VERSION="${1:-8.3.x}"
+DRUPAL_VERSION="${1:-8.4.x}"
 PROJECT_PATH='/var/www/drupalvm/drupal'
 
 # Create Drupal project directory.

From a257648034b7811507b318a30b942719160e1d16 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 4 Oct 2017 17:10:20 -0500
Subject: [PATCH 0900/1273] Issue #1573: Fix latent issues with mailhog not
 getting installed on some builds.

---
 tests/ubuntu-16-php56.config.yml      | 1 +
 tests/ubuntu-16-postgresql.config.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/tests/ubuntu-16-php56.config.yml b/tests/ubuntu-16-php56.config.yml
index a4782a83f..0379a90d8 100644
--- a/tests/ubuntu-16-php56.config.yml
+++ b/tests/ubuntu-16-php56.config.yml
@@ -1,3 +1,4 @@
 ---
 php_version: "5.6"
+php_sendmail_path: "/usr/sbin/sendmail -t -i"
 installed_extras: []
diff --git a/tests/ubuntu-16-postgresql.config.yml b/tests/ubuntu-16-postgresql.config.yml
index 7dc6042f5..573d78e13 100644
--- a/tests/ubuntu-16-postgresql.config.yml
+++ b/tests/ubuntu-16-postgresql.config.yml
@@ -1,3 +1,4 @@
 ---
 drupal_db_backend: pgsql
+php_sendmail_path: "/usr/sbin/sendmail -t -i"
 installed_extras: []

From aedfc16db569a49c9a0c358212d7029483385b0d Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 6 Oct 2017 23:35:10 -0500
Subject: [PATCH 0901/1273] Issue #1573: Update CHANGELOG for 4.7.0 release.

---
 CHANGELOG.md | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cc0a76bfa..06844b016 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,56 @@
 # Drupal VM Changelog
 
+## 4.7.0 "Water, Music, and Tronaction" (2017-10-06)
+
+### Breaking Changes
+
+  * In Issue #1520, the precedence of configuration override files was changed slightly. Previously, `[environment].config.yml` overrode all other configuration files, including `local.config.yml`. The intention of the local config file is that it is always the final override. The order of config file precedence (from lowest to highest) is now:
+    1. `config.yml`
+    2. `secrets.yml`
+    3. `[environment].config.yml`
+    4. `local.config.yml`
+
+### New/changed variables in default.config.yml
+
+  * Removed `geerlingguy/ubuntu1204` support (LTS support ended in April).
+  * Default `vagrant_hostname` is now `drupalvm.test` (Google owns `.dev` and some DNS issues have forced us to switch to `.test` as the default).
+  * Added `drupal_db_host: localhost` to fix a DB connection issue with Debian 9 'Stretch'.
+  * Added `headers.load` to `apache_mods_enabled`.
+  * Updated `drush_version` to `8.1.14`.
+  * Updated example `post_provision_scripts` path to include the full `playbook_dir`-based path.
+
+### Improvements
+
+  * #1551: Add PHP 7.2 support via php-versions role.
+  * #1427: Use drupalvm.test for local development default.
+  * #1521: Remove Ubuntu 12.04 support, officially.
+  * #1521: Install Ansible with pip if provisioning inside the VM.
+  * #1527: Revamp dashboard for better layout, especially on mobile.
+  * #1476: Update Drupal role to speed up initial Drupal project generation.
+  * #1487: Install mod_headers for Apache by default.
+  * #1528: ALways enable linked clones in VirtualBox.
+  * #1520: Let local.config.yml override environment.config.yml.
+  * #1564: Allow spaces in `DRUPALVM_ANSIBLE_ARGS` to make it more useful.
+  * #1560, #1558: Various improvements to test scripts.
+  * #1451: Bump the Drupal VM Docker image base to Debian 9 'Stretch'.
+  * #1451: Add full support and automated tests for Debian 9 'Stretch'.
+  * #1504: Display (this may take a while) for long-running Composer tasks.
+  * #1507: Use https URL to download Adminer.
+  * #1495: Update Drupal role so composer install can be skipped on deploy.
+  * #1573: Update default Drupal version to 8.4.x, Drush to 8.1.14.
+  * Updated roles: postgresql, firewall, nginx, php-pecl, mysql, varnish, ruby, adminer, nodejs, php, php-versions.
+
+### Bugfixes
+
+  * #1456: Default Docker example uses incorrect image.
+  * #1481: Use absolute paths for example post_provision_scripts.
+  * #1468: Fix various Linux issues with NFS by defaulting to TCP.
+  * #1508: Switch to using localhost for MySQL so install-drupal works on Debian 9.
+  * #1540: Fix incorrect IP address in some docs.
+  * #1558: Update Daemonize role to work on Ubuntu 14.04 with Ansible 2.4.
+  * #1572: Fix broken link to Drupal Console documentation.
+
+
 ## 4.6.0 "Water, Music, and Tronaction" (2017-06-28)
 
 ### Breaking Changes

From 174f4739f6e9484b1b50ae154c6be33f620f4f99 Mon Sep 17 00:00:00 2001
From: Dan Bohea <git@bohea.co.uk>
Date: Thu, 19 Oct 2017 13:17:05 +0100
Subject: [PATCH 0902/1273] Typo in README.md

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

diff --git a/README.md b/README.md
index 2f6fb0e4d..675dca56d 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/geerlingguy/drupal-vm.svg?branch=master)](https://travis-ci.org/geerlingguy/drupal-vm) [![Documentation Status](https://readthedocs.org/projects/drupal-vm/badge/?version=latest)](http://docs.drupalvm.com) [![Packagist](https://img.shields.io/packagist/v/geerlingguy/drupal-vm.svg)](https://packagist.org/packages/geerlingguy/drupal-vm) [![Docker Automated build](https://img.shields.io/docker/automated/geerlingguy/drupal-vm.svg?maxAge=2592000)](https://hub.docker.com/r/geerlingguy/drupal-vm/) [![](https://images.microbadger.com/badges/image/geerlingguy/drupal-vm.svg)](https://microbadger.com/images/geerlingguy/drupal-vm "Get your own image badge on microbadger.com") [![irc://irc.freenode.net/drupal-vm](https://img.shields.io/badge/irc.freenode.net-%23drupal--vm-brightgreen.svg)](https://riot.im/app/#/room/#drupal-vm:matrix.org)
 
-[Drupal VM](https://www.drupalvm.com/) is A VM for Drupal, built with Ansible.
+[Drupal VM](https://www.drupalvm.com/) is a VM for Drupal, built with Ansible.
 
 Drupal VM makes building Drupal development environments quick and easy, and introduces developers to the wonderful world of Drupal development on virtual machines or Docker containers (instead of crufty old MAMP/WAMP-based development).
 

From 0d3c10e0a15f400ce72ac9088ed8325892934907 Mon Sep 17 00:00:00 2001
From: Dan Bohea <git@bohea.co.uk>
Date: Sat, 21 Oct 2017 17:17:13 +0100
Subject: [PATCH 0903/1273] Added name to Ansible provisioner in Vagrantfile

This is allows Drupal VM's Ansible provisioner to be targeted specifically if desired (i.e. you're debugging more than one Vagrantfile):

vagrant provision --provision-with drupalvm
---
 Vagrantfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Vagrantfile b/Vagrantfile
index 6498282dd..69333bab4 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -102,7 +102,7 @@ Vagrant.configure('2') do |config|
     config.vm.synced_folder synced_folder.fetch('local_path'), synced_folder.fetch('destination'), options
   end
 
-  config.vm.provision provisioner do |ansible|
+  config.vm.provision "drupalvm", type: "ansible"  do |ansible|
     ansible.playbook = playbook
     ansible.extra_vars = {
       config_dir: config_dir,

From b5789fc39c1e11c8266c717b32cd42ade788c267 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 25 Oct 2017 10:55:37 -0500
Subject: [PATCH 0904/1273] Update php-xdebug role to latest version.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.php-xdebug/.gitignore   |  3 +-
 .../roles/geerlingguy.php-xdebug/.travis.yml  | 39 +++++--------------
 .../roles/geerlingguy.php-xdebug/LICENSE      | 20 ++++++++++
 .../roles/geerlingguy.php-xdebug/README.md    | 12 +++---
 .../geerlingguy.php-xdebug/defaults/main.yml  |  3 +-
 .../geerlingguy.php-xdebug/meta/main.yml      |  3 +-
 .../tasks/configure.yml                       | 10 +++++
 .../templates/xdebug.ini.j2                   |  1 -
 .../geerlingguy.php-xdebug/tests/README.md    | 11 ++++++
 10 files changed, 63 insertions(+), 41 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.php-xdebug/LICENSE
 create mode 100644 provisioning/roles/geerlingguy.php-xdebug/tests/README.md

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 9db972e49..f2ebbb472 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -58,7 +58,7 @@
 - src: geerlingguy.php-versions
   version: 2.0.0
 - src: geerlingguy.php-xdebug
-  version: 2.3.1
+  version: 2.4.0
 - src: geerlingguy.php-xhprof
   version: 2.2.2
 - src: geerlingguy.pimpmylog
diff --git a/provisioning/roles/geerlingguy.php-xdebug/.gitignore b/provisioning/roles/geerlingguy.php-xdebug/.gitignore
index e43b0f988..c9b2377e3 100644
--- a/provisioning/roles/geerlingguy.php-xdebug/.gitignore
+++ b/provisioning/roles/geerlingguy.php-xdebug/.gitignore
@@ -1 +1,2 @@
-.DS_Store
+*.retry
+tests/test.sh
diff --git a/provisioning/roles/geerlingguy.php-xdebug/.travis.yml b/provisioning/roles/geerlingguy.php-xdebug/.travis.yml
index 4849f250e..12deab75c 100644
--- a/provisioning/roles/geerlingguy.php-xdebug/.travis.yml
+++ b/provisioning/roles/geerlingguy.php-xdebug/.travis.yml
@@ -3,44 +3,23 @@ services: docker
 
 env:
   - distro: centos7
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
   - distro: ubuntu1604
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
   - distro: debian8
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-
-before_install:
-  # Pull container.
-  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
-  - container_id=$(mktemp)
-  # Run container in detached state.
-  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
-
-  # Install dependencies.
-  - 'docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
-
-  # Ansible syntax check.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+  # Configure test script so we can run extra tests after playbook is run.
+  - export container_id=$(date +%s)
+  - export cleanup=false
 
-  # Test role.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+  # Download test shim.
+  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
+  - chmod +x ${PWD}/tests/test.sh
 
-  # Test role idempotence.
-  - idempotence=$(mktemp)
-  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
-  - >
-    tail ${idempotence}
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
+  # Run tests.
+  - ${PWD}/tests/test.sh
 
   # Run script to test if Xdebug is available and working.
-  - 'docker exec "$(cat ${container_id})" env TERM=xterm php /etc/ansible/roles/role_under_test/tests/xdebug-test.php'
+  - 'docker exec ${container_id} env TERM=xterm php /etc/ansible/roles/role_under_test/tests/xdebug-test.php'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.php-xdebug/LICENSE b/provisioning/roles/geerlingguy.php-xdebug/LICENSE
new file mode 100644
index 000000000..4275cf3c1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xdebug/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Jeff Geerling
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/provisioning/roles/geerlingguy.php-xdebug/README.md b/provisioning/roles/geerlingguy.php-xdebug/README.md
index 9c50ac1de..5e594a560 100644
--- a/provisioning/roles/geerlingguy.php-xdebug/README.md
+++ b/provisioning/roles/geerlingguy.php-xdebug/README.md
@@ -16,7 +16,7 @@ Available variables are listed below, along with default values (see `defaults/m
 
 Where Xdebug setup files will be downloaded and built.
 
-    php_xdebug_version: 2.4.1
+    php_xdebug_version: 2.5.0
 
 The version of Xdebug to be installed (see [Updates](https://xdebug.org/updates.php) for a current listing).
 
@@ -25,10 +25,6 @@ The version of Xdebug to be installed (see [Updates](https://xdebug.org/updates.
 
 Whether to enable XDebug coverage and default exception handling or not. Disable these for slightly improved PHP performance, enable these to use XDebug to the fullest extent.
 
-    php_xdebug_cli_enable: 1
-
-Whether xdebug is enabled for the CLI.
-
     php_xdebug_module_path: /usr/lib64/php/modules
 
 The path where `xdebug.so` will be installed.
@@ -54,10 +50,14 @@ The location of the xdebug log (useful if you're having trouble connecting).
 
 The IDE key to use in the URL when making Xdebug requests (e.g. `http://example.local/?XDEBUG_SESSION_START=sublime.xdebug`).
 
-    php_xdebug_max_nesting_level: 100
+    php_xdebug_max_nesting_level: 256
 
 The maximimum function nesting level before Xdebug bails and throws a fatal exception.
 
+    php_xdebug_cli_disable: no
+
+(Debian/Ubuntu ONLY) Disable xdebug for the CLI SAPI.
+
 ## Dependencies
 
   - geerlingguy.php
diff --git a/provisioning/roles/geerlingguy.php-xdebug/defaults/main.yml b/provisioning/roles/geerlingguy.php-xdebug/defaults/main.yml
index bcb47358e..3c32f236c 100644
--- a/provisioning/roles/geerlingguy.php-xdebug/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.php-xdebug/defaults/main.yml
@@ -5,7 +5,6 @@ php_xdebug_version: 2.5.0
 
 php_xdebug_coverage_enable: 1
 php_xdebug_default_enable: 1
-php_xdebug_cli_enable: 1
 
 php_xdebug_remote_enable: "false"
 php_xdebug_remote_connect_back: "false"
@@ -18,3 +17,5 @@ php_xdebug_idekey: sublime.xdebug
 
 php_xdebug_max_nesting_level: 256
 
+# Only used on Debian/Ubuntu.
+php_xdebug_cli_disable: no
diff --git a/provisioning/roles/geerlingguy.php-xdebug/meta/main.yml b/provisioning/roles/geerlingguy.php-xdebug/meta/main.yml
index 026a37a7e..27c831b1c 100644
--- a/provisioning/roles/geerlingguy.php-xdebug/meta/main.yml
+++ b/provisioning/roles/geerlingguy.php-xdebug/meta/main.yml
@@ -1,5 +1,6 @@
 ---
-dependencies: []
+dependencies:
+  - geerlingguy.php
 
 galaxy_info:
   author: geerlingguy
diff --git a/provisioning/roles/geerlingguy.php-xdebug/tasks/configure.yml b/provisioning/roles/geerlingguy.php-xdebug/tasks/configure.yml
index 944e35b5f..b13be4930 100644
--- a/provisioning/roles/geerlingguy.php-xdebug/tasks/configure.yml
+++ b/provisioning/roles/geerlingguy.php-xdebug/tasks/configure.yml
@@ -6,7 +6,17 @@
     owner: root
     group: root
     mode: 0644
+  when: "'cli' not in item or ('cli' in item and not php_xdebug_cli_disable)"
   with_items: "{{ php_extension_conf_paths }}"
   notify:
     - restart webserver
     - restart php-fpm
+
+- name: Disable xdebug for PHP CLI.
+  file:
+    path: "/etc/php/{{ php_version }}/cli/conf.d/{{ php_xdebug_config_filename }}"
+    state: absent
+  when: ansible_os_family == 'Debian' and php_xdebug_cli_disable
+  notify:
+    - restart webserver
+    - restart php-fpm
diff --git a/provisioning/roles/geerlingguy.php-xdebug/templates/xdebug.ini.j2 b/provisioning/roles/geerlingguy.php-xdebug/templates/xdebug.ini.j2
index 2de4d442a..805b67f67 100644
--- a/provisioning/roles/geerlingguy.php-xdebug/templates/xdebug.ini.j2
+++ b/provisioning/roles/geerlingguy.php-xdebug/templates/xdebug.ini.j2
@@ -8,7 +8,6 @@ xdebug.remote_enable={{ php_xdebug_remote_enable }}
 xdebug.remote_connect_back={{ php_xdebug_remote_connect_back }}
 xdebug.remote_host={{ php_xdebug_remote_host }}
 xdebug.remote_port={{ php_xdebug_remote_port }}
-xdebug.remote_handler=dbgp
 xdebug.remote_log={{ php_xdebug_remote_log }}
 xdebug.remote_autostart={{ php_xdebug_remote_autostart }}
 
diff --git a/provisioning/roles/geerlingguy.php-xdebug/tests/README.md b/provisioning/roles/geerlingguy.php-xdebug/tests/README.md
new file mode 100644
index 000000000..6fb211721
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xdebug/tests/README.md
@@ -0,0 +1,11 @@
+# Ansible Role tests
+
+To run the test playbook(s) in this directory:
+
+  1. Install and start Docker.
+  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
+    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
+  1. Make the test shim executable: `chmod +x tests/test.sh`.
+  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
+
+If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`

From cade6a5a0b9af48d5931f468ce875cd07ab75a42 Mon Sep 17 00:00:00 2001
From: Petr Illek <petr@morpht.com>
Date: Sat, 4 Nov 2017 22:21:44 +0100
Subject: [PATCH 0905/1273] Add machine name to dashboard header.

---
 provisioning/templates/dashboard.html.j2 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/provisioning/templates/dashboard.html.j2 b/provisioning/templates/dashboard.html.j2
index 372ab43a9..5fae7e798 100644
--- a/provisioning/templates/dashboard.html.j2
+++ b/provisioning/templates/dashboard.html.j2
@@ -316,6 +316,7 @@
           <section class="jumbotron text-center">
             <a href="https://www.drupalvm.com/"><img src="http://docs.drupalvm.com/en/latest/images/drupal-vm-logo.png" alt="Drupal VM" title="Welcome to Drupal VM" class="img-responsive center-block"></a>
             <p><a href="https://github.com/geerlingguy/drupal-vm">Drupal VM</a> is a VM for local Drupal development, built with Vagrant + Ansible.</p>
+            <p><small>Machine name: <strong>{{ vagrant_machine_name }}</strong></small></p>
             <p><a class="btn btn-primary btn-lg" href="http://docs.drupalvm.com/en/latest/" role="button">Read the documentation</a></p>
           </section>
         </div>

From fa5e3d98e9b7c36e543428868963f012421bcba4 Mon Sep 17 00:00:00 2001
From: Dan Bohea <git@bohea.co.uk>
Date: Thu, 16 Nov 2017 08:46:17 +0000
Subject: [PATCH 0906/1273] Addressed rubocop formatting complaints in
 Vagrantfile

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

diff --git a/Vagrantfile b/Vagrantfile
index 69333bab4..a1f09feb2 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -102,7 +102,7 @@ Vagrant.configure('2') do |config|
     config.vm.synced_folder synced_folder.fetch('local_path'), synced_folder.fetch('destination'), options
   end
 
-  config.vm.provision "drupalvm", type: "ansible"  do |ansible|
+  config.vm.provision 'drupalvm', type: 'ansible' do |ansible|
     ansible.playbook = playbook
     ansible.extra_vars = {
       config_dir: config_dir,

From 000e5d6bde829ccd7f189942e68a234222162838 Mon Sep 17 00:00:00 2001
From: kevin howbrook <kbhowbrook@gmail.com>
Date: Thu, 23 Nov 2017 17:09:15 +0000
Subject: [PATCH 0907/1273] Update php.md

---
 docs/configurations/php.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/configurations/php.md b/docs/configurations/php.md
index a454ab3bd..240f95aff 100644
--- a/docs/configurations/php.md
+++ b/docs/configurations/php.md
@@ -19,4 +19,4 @@ Remi's RPM repository is included with Drupal VM, and you can make the following
 
 If you want parity with your production environment and wish to install the default distribution packages, set `php_version: ''` inside your `config.yml` to avoid adding Remi's or Ondřej's repositories. Doing this will use the default packages set in the [`geerlingguy.php`](https://github.com/geerlingguy/ansible-role-php) Ansible role.
 
-_Note: If you're using a base OS with a PHP version older than what's assumed in the `geerlingguy.php` role, you will also need to override some of the default variables set by that role in your `config.yml`. See the [`geerlingguy.php` Ansible role's README](https://github.com/geerlingguy/ansible-role-php-#readme) for more information._
+_Note: If you're using a base OS with a PHP version older than what's assumed in the `geerlingguy.php` role, you will also need to override some of the default variables set by that role in your `config.yml`. See the [`geerlingguy.php` Ansible role's README](https://github.com/geerlingguy/drupal-vm/blob/master/provisioning/README.md) for more information._

From fba6c6a9189377c76175b3225e8cd190c0606b2f Mon Sep 17 00:00:00 2001
From: brockfanning <brockfanning@gmail.com>
Date: Fri, 24 Nov 2017 12:56:54 -0500
Subject: [PATCH 0908/1273] Add an example of what to put in secrets.yml

I grabbed the text for this change from: https://www.jeffgeerling.com/blog/2017/soup-nuts-using-drupal-vm-build-local-and-prod
---
 docs/other/production.md | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/docs/other/production.md b/docs/other/production.md
index 31d8fe698..e5ecff8eb 100644
--- a/docs/other/production.md
+++ b/docs/other/production.md
@@ -43,7 +43,15 @@ First, you'd create an Ansible Vault encrypted file:
 
     $ ansible-vault create secrets.yml
 
-Create the file inside your VM's configuration directory, add any plaintext passwords, and save it. Ansible Vault will encrypt the file, and you can edit the file using `ansible-vault edit`.
+Create the file inside your VM's configuration directory, and save the following inside (replacing the actual passwords with your own secure ones!):
+
+```
+drupal_account_pass: add-your-secure-password-1-here
+drupal_db_password: add-your-secure-password-2-here                                                                  
+mysql_root_password: add-your-secure-password-3-here
+```
+
+Ansible Vault will encrypt the file, and you can edit the file using `ansible-vault edit`.
 
 When running `vagrant` commands, make sure you tell the Ansible provisioner to use `--ask-vault-pass`, e.g.:
 

From b2aa67dcf4daffcf7d49798a89f688d9cef036b6 Mon Sep 17 00:00:00 2001
From: Thom Toogood <thomtoogood@gmail.com>
Date: Thu, 30 Nov 2017 00:48:57 +1100
Subject: [PATCH 0909/1273] Add beet/box as an available base box.

---
 default.config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/default.config.yml b/default.config.yml
index 11d736a11..cca1d7901 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -1,5 +1,6 @@
 ---
 # Available `vagrant_box` values include:
+#   - beet/box
 #   - geerlingguy/centos7
 #   - geerlingguy/centos6
 #   - geerlingguy/debian9

From a6da2651e93b3228e901ab8f5b908a448dba7f28 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 29 Nov 2017 11:46:54 -0600
Subject: [PATCH 0910/1273] Update Solr role to 4.0.0, Solr default version to
 5.5.5.

---
 default.config.yml                            |  2 +-
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.solr/.travis.yml        | 12 +++--
 provisioning/roles/geerlingguy.solr/README.md | 10 ++++
 .../roles/geerlingguy.solr/defaults/main.yml  |  5 +-
 .../roles/geerlingguy.solr/meta/container.yml |  9 ++++
 .../roles/geerlingguy.solr/meta/main.yml      |  6 +++
 .../geerlingguy.solr/tasks/install-pre5.yml   |  2 +-
 .../roles/geerlingguy.solr/tasks/install.yml  | 12 ++---
 .../roles/geerlingguy.solr/tasks/main.yml     |  5 +-
 .../roles/geerlingguy.solr/tasks/trim-fat.yml | 15 ++++--
 .../geerlingguy.solr/tests/test-solr-4.yml    |  1 +
 .../geerlingguy.solr/tests/test-solr-5.yml    |  5 +-
 .../geerlingguy.solr/tests/test-solr-7.yml    | 47 +++++++++++++++++++
 14 files changed, 109 insertions(+), 24 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.solr/meta/container.yml
 create mode 100644 provisioning/roles/geerlingguy.solr/tests/test-solr-7.yml

diff --git a/default.config.yml b/default.config.yml
index 11d736a11..e567a10d3 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -328,7 +328,7 @@ php_xdebug_max_nesting_level: 256
 php_xdebug_remote_host: "{{ ansible_default_ipv4.gateway }}"
 
 # Solr Configuration (if enabled above).
-solr_version: "5.5.3"
+solr_version: "5.5.5"
 solr_xms: "64M"
 solr_xmx: "128M"
 
diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index f2ebbb472..eef924cf9 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -76,6 +76,6 @@
 - src: geerlingguy.security
   version: 1.5.0
 - src: geerlingguy.solr
-  version: 3.5.5
+  version: 4.0.0
 - src: geerlingguy.varnish
   version: 2.1.1
diff --git a/provisioning/roles/geerlingguy.solr/.travis.yml b/provisioning/roles/geerlingguy.solr/.travis.yml
index 0bdfdba88..195144bdf 100644
--- a/provisioning/roles/geerlingguy.solr/.travis.yml
+++ b/provisioning/roles/geerlingguy.solr/.travis.yml
@@ -4,13 +4,19 @@ services: docker
 env:
   # Test current version of Solr on latest supported OSes.
   - distro: centos7
-    playbook: test-solr-6.yml
+    playbook: test-solr-7.yml
   - distro: ubuntu1604
-    playbook: test-solr-6.yml
+    playbook: test-solr-7.yml
   - distro: debian8
-    playbook: test-solr-6.yml
+    playbook: test-solr-7.yml
+  - distro: debian9
+    playbook: test-solr-7.yml
 
   # Test older versions of Solr / OSes.
+  - distro: centos7
+    playbook: test-solr-6.yml
+  - distro: debian9
+    playbook: test-solr-6.yml
   - distro: ubuntu1404
     playbook: test-solr-5.yml
   - distro: ubuntu1204
diff --git a/provisioning/roles/geerlingguy.solr/README.md b/provisioning/roles/geerlingguy.solr/README.md
index 7db4ce7fe..3d1dd07f7 100644
--- a/provisioning/roles/geerlingguy.solr/README.md
+++ b/provisioning/roles/geerlingguy.solr/README.md
@@ -31,6 +31,16 @@ The Apache Solr version to install. For a full list, see [available Apache Solr
 
 The Apache Project mirror from which the Solr tarball will be downloaded. In case of slow download speed or timeouts it is useful to set the mirror to the one suggested by Apache's [mirror download site](https://www.apache.org/dyn/closer.cgi/lucene/solr/).
 
+    solr_remove_cruft: false
+
+Whether to remove unneccessary documentation and examples from the solr directory.
+
+    solr_service_manage: true
+    solr_service_name: solr
+    solr_service_state: started
+
+By default, this role will manage the `solr` service, ensuring it is enabled at system boot and is running. You can ensure Solr is stopped by setting `solr_service_state: stopped`, or you can disable this role's management of the `solr` service entirely by setting `solr_service_manage: true`. You may also want to set `solr_restart_handler_enabled: false` (documented later) in this case.
+
     solr_install_dir: /opt
     solr_install_path: /opt/solr
 
diff --git a/provisioning/roles/geerlingguy.solr/defaults/main.yml b/provisioning/roles/geerlingguy.solr/defaults/main.yml
index 91b78a12a..6bb5e1078 100644
--- a/provisioning/roles/geerlingguy.solr/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.solr/defaults/main.yml
@@ -4,11 +4,14 @@ solr_workspace: /root
 solr_create_user: true
 solr_user: solr
 
-solr_version: "6.3.0"
+solr_version: "7.1.0"
 solr_mirror: "https://archive.apache.org/dist"
 solr_remove_cruft: false
 
+solr_service_manage: true
 solr_service_name: solr
+solr_service_state: started
+
 solr_install_dir: /opt
 solr_install_path: "/opt/{{ solr_service_name }}"
 solr_home: "/var/{{ solr_service_name }}"
diff --git a/provisioning/roles/geerlingguy.solr/meta/container.yml b/provisioning/roles/geerlingguy.solr/meta/container.yml
new file mode 100644
index 000000000..63c2979fd
--- /dev/null
+++ b/provisioning/roles/geerlingguy.solr/meta/container.yml
@@ -0,0 +1,9 @@
+# See: https://github.com/geerlingguy/solr-container
+solr:
+  from: "debian:9"
+  ports:
+    - "8983:8983"
+  command: ["/opt/solr/bin/solr", "start", "-f", "-force"]
+  roles:
+    - geerlingguy.java
+    - geerlingguy.solr
diff --git a/provisioning/roles/geerlingguy.solr/meta/main.yml b/provisioning/roles/geerlingguy.solr/meta/main.yml
index 77548dd65..7ce04c9f8 100644
--- a/provisioning/roles/geerlingguy.solr/meta/main.yml
+++ b/provisioning/roles/geerlingguy.solr/meta/main.yml
@@ -20,3 +20,9 @@ galaxy_info:
       - all
   galaxy_tags:
     - development
+    - solr
+    - search
+    - lucene
+    - container
+    - apache
+    - text
diff --git a/provisioning/roles/geerlingguy.solr/tasks/install-pre5.yml b/provisioning/roles/geerlingguy.solr/tasks/install-pre5.yml
index 27e9b447a..18c069539 100644
--- a/provisioning/roles/geerlingguy.solr/tasks/install-pre5.yml
+++ b/provisioning/roles/geerlingguy.solr/tasks/install-pre5.yml
@@ -79,5 +79,5 @@
   when: >
     (ansible_distribution == 'Ubuntu' and ansible_distribution_version == '16.04') or
     (ansible_distribution == 'Debian' and ansible_distribution_version|int >= 8) or
-    (ansible_distribution == 'CentOS' and ansible_distribution_version|int >= 7) or
+    (ansible_distribution == 'CentOS' and ansible_distribution_major_version|int >= 7) or
     (ansible_distribution == 'Fedora')
diff --git a/provisioning/roles/geerlingguy.solr/tasks/install.yml b/provisioning/roles/geerlingguy.solr/tasks/install.yml
index aa32ea430..1efd5a4c2 100644
--- a/provisioning/roles/geerlingguy.solr/tasks/install.yml
+++ b/provisioning/roles/geerlingguy.solr/tasks/install.yml
@@ -1,10 +1,10 @@
 ---
-- name: Ensure lsof is present (RedHat).
-  yum: name=lsof state=present
-  when: ansible_os_family == "RedHat"
-
-- name: Ensure setfacl support is present.
-  package: name=acl state=present
+- name: Ensure dependencies are installed.
+  package: name={{ item }} state=present
+  with_items:
+    - lsof
+    - acl
+    - sudo
 
 - name: Run Solr installation script.
   shell: >
diff --git a/provisioning/roles/geerlingguy.solr/tasks/main.yml b/provisioning/roles/geerlingguy.solr/tasks/main.yml
index 6c109e139..743b9b702 100644
--- a/provisioning/roles/geerlingguy.solr/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.solr/tasks/main.yml
@@ -40,11 +40,12 @@
 - include: install.yml
   when: "solr_version.split('.')[0] >= '5'"
 
-- name: Ensure solr is started and enabled on boot.
+- name: Ensure solr is started and enabled on boot if configured.
   service:
     name: "{{ solr_service_name }}"
-    state: started
+    state: "{{ solr_service_state }}"
     enabled: yes
+  when: solr_service_manage
 
 # Configure solr.
 - include: configure.yml
diff --git a/provisioning/roles/geerlingguy.solr/tasks/trim-fat.yml b/provisioning/roles/geerlingguy.solr/tasks/trim-fat.yml
index 506fde443..f5a87e55e 100644
--- a/provisioning/roles/geerlingguy.solr/tasks/trim-fat.yml
+++ b/provisioning/roles/geerlingguy.solr/tasks/trim-fat.yml
@@ -7,11 +7,16 @@
     - "{{ solr_workspace }}/{{ solr_filename }}.tgz"
     - "{{ solr_workspace }}/{{ solr_filename }}"
 
-- name: Remove extra cruft, if configured.
+- name: Remove docs, if not needed.
   file:
-    path: "{{ item }}"
+    path: "{{ solr_install_path }}/docs"
     state: absent
-  with_items:
-    - "{{ solr_install_path }}/docs"
-    - "{{ solr_install_path }}/example"
   when: solr_remove_cruft
+
+- name: Remove example dir, if not needed.
+  file:
+    path: "{{ solr_install_path }}/example"
+    state: absent
+  when:
+    - solr_remove_cruft
+    - solr_version.split('.')[0] >= '5'
diff --git a/provisioning/roles/geerlingguy.solr/tests/test-solr-4.yml b/provisioning/roles/geerlingguy.solr/tests/test-solr-4.yml
index f9c31ba9e..6bbc30d2f 100644
--- a/provisioning/roles/geerlingguy.solr/tests/test-solr-4.yml
+++ b/provisioning/roles/geerlingguy.solr/tests/test-solr-4.yml
@@ -3,6 +3,7 @@
 
   vars:
     solr_version: "4.10.4"
+    solr_remove_cruft: true
     java_packages:
       - openjdk-7-jdk
 
diff --git a/provisioning/roles/geerlingguy.solr/tests/test-solr-5.yml b/provisioning/roles/geerlingguy.solr/tests/test-solr-5.yml
index 364830978..d27b54087 100644
--- a/provisioning/roles/geerlingguy.solr/tests/test-solr-5.yml
+++ b/provisioning/roles/geerlingguy.solr/tests/test-solr-5.yml
@@ -2,7 +2,7 @@
 - hosts: all
 
   vars:
-    solr_version: "5.5.3"
+    solr_version: "5.5.4"
     solr_remove_cruft: true
     java_packages:
       - openjdk-7-jdk
@@ -12,9 +12,6 @@
       apt: update_cache=yes cache_valid_time=600
       when: ansible_os_family == "Debian"
 
-    - name: Ensure sudo is present.
-      package: name=sudo state=present
-
   roles:
     - geerlingguy.java
     - role_under_test
diff --git a/provisioning/roles/geerlingguy.solr/tests/test-solr-7.yml b/provisioning/roles/geerlingguy.solr/tests/test-solr-7.yml
new file mode 100644
index 000000000..e45dec076
--- /dev/null
+++ b/provisioning/roles/geerlingguy.solr/tests/test-solr-7.yml
@@ -0,0 +1,47 @@
+---
+- hosts: all
+
+  pre_tasks:
+    - name: Set Java 8 package for RedHat.
+      set_fact:
+        java_packages:
+          - java-1.8.0-openjdk
+      when: ansible_os_family == "RedHat"
+
+    - name: Set Java 8 package for Debian/Ubuntu.
+      set_fact:
+        java_packages:
+          - openjdk-8-jdk
+      when: >
+        ansible_distribution == "Debian" or
+        (ansible_distribution == "Ubuntu" and ansible_distribution_version == "14.04")
+
+    - name: Add repository for OpenJDK 8 (Ubuntu 14.04).
+      apt_repository: repo='ppa:openjdk-r/ppa'
+      when: ansible_distribution == "Ubuntu" and ansible_distribution_version == "14.04"
+
+    - name: Enable Backports repository (Debian).
+      apt_repository:
+        repo: 'deb http://ftp.debian.org/debian {{ ansible_distribution_release }}-backports main'
+        state: present
+        filename: "{{ ansible_distribution_release }}_backports"
+      register: debian_backports
+      when: ansible_distribution == "Debian"
+
+    - name: Update apt cache.
+      apt: update_cache=yes cache_valid_time=600
+      when: ansible_os_family == "Debian"
+
+    # See: http://unix.stackexchange.com/a/342469
+    - name: Install dependencies (Debian).
+      apt:
+        default_release: "{{ ansible_distribution_release }}-backports"
+        name:
+          - openjdk-8-jre-headless
+          - ca-certificates-java
+        state: present
+      when: ansible_distribution == "Debian"
+
+  roles:
+    - geerlingguy.java
+    - role_under_test

From a78ac47bd285ed9b4ab125e81dae1765c9c713fb Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 3 Jan 2018 16:56:15 -0600
Subject: [PATCH 0911/1273] Update MySQL role to latest version to allow
 database deletion.

---
 provisioning/requirements.yml                            | 2 +-
 provisioning/roles/geerlingguy.mysql/README.md           | 2 ++
 provisioning/roles/geerlingguy.mysql/tasks/databases.yml | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index eef924cf9..a25b4fbe9 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -36,7 +36,7 @@
 - src: geerlingguy.memcached
   version: 1.0.7
 - src: geerlingguy.mysql
-  version: 2.8.0
+  version: 2.8.1
 - src: geerlingguy.nginx
   version: 2.4.0
 - src: geerlingguy.nodejs
diff --git a/provisioning/roles/geerlingguy.mysql/README.md b/provisioning/roles/geerlingguy.mysql/README.md
index be864bc22..8fa69fac2 100644
--- a/provisioning/roles/geerlingguy.mysql/README.md
+++ b/provisioning/roles/geerlingguy.mysql/README.md
@@ -58,6 +58,8 @@ A list of files that should override the default global my.cnf. Each item in the
 
 The MySQL databases to create. A database has the values `name`, `encoding` (defaults to `utf8`), `collation` (defaults to `utf8_general_ci`) and `replicate` (defaults to `1`, only used if replication is configured). The formats of these are the same as in the `mysql_db` module.
 
+You can also delete a database (or ensure it's not on the server) by setting `state` to `absent` (defaults to `present`).
+
     mysql_users: []
 
 The MySQL users and their privileges. A user has the values:
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/databases.yml b/provisioning/roles/geerlingguy.mysql/tasks/databases.yml
index 681e51501..ca6243257 100644
--- a/provisioning/roles/geerlingguy.mysql/tasks/databases.yml
+++ b/provisioning/roles/geerlingguy.mysql/tasks/databases.yml
@@ -4,5 +4,5 @@
     name: "{{ item.name }}"
     collation: "{{ item.collation | default('utf8_general_ci') }}"
     encoding: "{{ item.encoding | default('utf8') }}"
-    state: present
+    state: "{{ item.state | default('present') }}"
   with_items: "{{ mysql_databases }}"

From 870de31d0616c124bdb5fd0e1d1a470d2e50bf9a Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 3 Jan 2018 22:43:19 -0600
Subject: [PATCH 0912/1273] Update geerlingguy.postfix role to 2.0.0 latest
 version.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.postfix/.travis.yml     | 36 +++++--------------
 .../roles/geerlingguy.postfix/README.md       | 20 +++++++++--
 .../geerlingguy.postfix/defaults/main.yml     |  7 ++++
 .../roles/geerlingguy.postfix/tasks/main.yml  | 26 ++++++++++----
 .../roles/geerlingguy.postfix/tests/inventory |  1 -
 .../roles/geerlingguy.postfix/tests/test.yml  | 16 +++++++--
 7 files changed, 66 insertions(+), 42 deletions(-)
 delete mode 100644 provisioning/roles/geerlingguy.postfix/tests/inventory

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index a25b4fbe9..74bbab338 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -64,7 +64,7 @@
 - src: geerlingguy.pimpmylog
   version: 1.0.2
 - src: geerlingguy.postfix
-  version: 1.1.0
+  version: 2.0.0
 - src: geerlingguy.postgresql
   version: 1.3.1
 - src: geerlingguy.redis
diff --git a/provisioning/roles/geerlingguy.postfix/.travis.yml b/provisioning/roles/geerlingguy.postfix/.travis.yml
index df7b65408..e4a7f31a7 100644
--- a/provisioning/roles/geerlingguy.postfix/.travis.yml
+++ b/provisioning/roles/geerlingguy.postfix/.travis.yml
@@ -1,36 +1,18 @@
 ---
-sudo: required
-language: python
-python: "2.7"
+services: docker
 
 env:
-  - SITE=test.yml
-
-before_install:
-  - sudo apt-get update -qq
-
-install:
-  # Install Ansible.
-  - pip install ansible
-
-  # Add ansible.cfg to pick up roles path.
-  - "{ echo '[defaults]'; echo 'roles_path = ../'; } >> ansible.cfg"
+  - distro: centos7
+  - distro: ubuntu1604
+  - distro: debian9
 
 script:
-  # Check the role/playbook's syntax.
-  - "ansible-playbook -i tests/inventory tests/$SITE --syntax-check"
-
-  # Run the role/playbook with ansible-playbook.
-  - "ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo"
-
-  # Run the role/playbook again, checking to make sure it's idempotent.
-  - >
-    ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
+  # Download test shim.
+  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
+  - chmod +x ${PWD}/tests/test.sh
 
-  # TODO - Add test to check if postfix is working correctly.
+  # Run tests.
+  - ${PWD}/tests/test.sh
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.postfix/README.md b/provisioning/roles/geerlingguy.postfix/README.md
index 6bb46a155..8e71655d1 100644
--- a/provisioning/roles/geerlingguy.postfix/README.md
+++ b/provisioning/roles/geerlingguy.postfix/README.md
@@ -10,7 +10,21 @@ If you're using this as an SMTP relay server, you will need to do that on your o
 
 ## Role Variables
 
-None.
+Available variables are listed below, along with default values (see `defaults/main.yml`):
+
+    postfix_config_file: /etc/postfix/main.cf
+
+The path to the Postfix `main.cf` configuration file.
+
+    postfix_service_state: started
+    postfix_service_enabled: yes
+
+The state in which the Postfix service should be after this role runs, and whether to enable the service on startup.
+
+    postfix_inet_interfaces: localhost
+    postfix_inet_protocols: all
+
+Options for values `inet_interfaces` and `inet_protocols` in the `main.cf` file.
 
 ## Dependencies
 
@@ -20,7 +34,7 @@ None.
 
     - hosts: all
       roles:
-        - { role: geerlingguy.postfix }
+        - geerlingguy.postfix
 
 ## License
 
@@ -28,4 +42,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.postfix/defaults/main.yml b/provisioning/roles/geerlingguy.postfix/defaults/main.yml
index ed97d539c..73d244012 100644
--- a/provisioning/roles/geerlingguy.postfix/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.postfix/defaults/main.yml
@@ -1 +1,8 @@
 ---
+postfix_config_file: /etc/postfix/main.cf
+
+postfix_service_state: started
+postfix_service_enabled: yes
+
+postfix_inet_interfaces: localhost
+postfix_inet_protocols: all
diff --git a/provisioning/roles/geerlingguy.postfix/tasks/main.yml b/provisioning/roles/geerlingguy.postfix/tasks/main.yml
index 6d0ca1a7c..af245a8f0 100644
--- a/provisioning/roles/geerlingguy.postfix/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.postfix/tasks/main.yml
@@ -1,11 +1,23 @@
 ---
-- name: Ensure postfix is installed (RedHat).
-  yum: name=postfix state=installed
-  when: ansible_os_family == 'RedHat'
+- name: Ensure postfix is installed.
+  package:
+    name: postfix
+    state: present
 
-- name: Ensure postfix is installed (Debian).
-  apt: name=postfix state=installed
-  when: ansible_os_family == 'Debian'
+- name: Update Postfix configuration.
+  lineinfile:
+    dest: "{{ postfix_config_file }}"
+    line: "{{ item.name }} = {{ item.value }}"
+    regexp: "^{{ item.name }} ="
+  with_items:
+    - name: inet_interfaces
+      value: "{{ postfix_inet_interfaces }}"
+    - name: inet_protocols
+      value: "{{ postfix_inet_protocols }}"
+  notify: restart postfix
 
 - name: Ensure postfix is started and enabled at boot.
-  service: name=postfix state=started enabled=yes
+  service:
+    name: postfix
+    state: "{{ postfix_service_state }}"
+    enabled: "{{ postfix_service_enabled }}"
diff --git a/provisioning/roles/geerlingguy.postfix/tests/inventory b/provisioning/roles/geerlingguy.postfix/tests/inventory
deleted file mode 100644
index 2fbb50c4a..000000000
--- a/provisioning/roles/geerlingguy.postfix/tests/inventory
+++ /dev/null
@@ -1 +0,0 @@
-localhost
diff --git a/provisioning/roles/geerlingguy.postfix/tests/test.yml b/provisioning/roles/geerlingguy.postfix/tests/test.yml
index f404e408f..2505c1d66 100644
--- a/provisioning/roles/geerlingguy.postfix/tests/test.yml
+++ b/provisioning/roles/geerlingguy.postfix/tests/test.yml
@@ -1,5 +1,15 @@
 ---
-- hosts: localhost
-  remote_user: root
+- hosts: all
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=yes cache_valid_time=600
+      when: ansible_os_family == 'Debian'
+
+    - name: Override postfix_inet_protocols (RHEL).
+      set_fact:
+        postfix_inet_protocols: ipv4
+      when: ansible_os_family == 'RedHat'
+
   roles:
-    - ansible-role-postfix
+    - role_under_test

From e8e5ca10cafa54c6edfb29c7d74bdca92d4a27f9 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 3 Jan 2018 22:58:35 -0600
Subject: [PATCH 0913/1273] Add missing files from geerlingguy.postfix role.

---
 .../roles/geerlingguy.postfix/.gitignore      |  2 ++
 .../roles/geerlingguy.postfix/LICENSE         | 20 +++++++++++++++++++
 .../geerlingguy.postfix/handlers/main.yml     |  3 +++
 .../roles/geerlingguy.postfix/tests/README.md | 11 ++++++++++
 4 files changed, 36 insertions(+)
 create mode 100644 provisioning/roles/geerlingguy.postfix/.gitignore
 create mode 100644 provisioning/roles/geerlingguy.postfix/LICENSE
 create mode 100644 provisioning/roles/geerlingguy.postfix/handlers/main.yml
 create mode 100644 provisioning/roles/geerlingguy.postfix/tests/README.md

diff --git a/provisioning/roles/geerlingguy.postfix/.gitignore b/provisioning/roles/geerlingguy.postfix/.gitignore
new file mode 100644
index 000000000..c9b2377e3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postfix/.gitignore
@@ -0,0 +1,2 @@
+*.retry
+tests/test.sh
diff --git a/provisioning/roles/geerlingguy.postfix/LICENSE b/provisioning/roles/geerlingguy.postfix/LICENSE
new file mode 100644
index 000000000..4275cf3c1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postfix/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Jeff Geerling
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/provisioning/roles/geerlingguy.postfix/handlers/main.yml b/provisioning/roles/geerlingguy.postfix/handlers/main.yml
new file mode 100644
index 000000000..ec7fb0508
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postfix/handlers/main.yml
@@ -0,0 +1,3 @@
+---
+- name: restart postfix
+  service: name=postfix state=restarted
diff --git a/provisioning/roles/geerlingguy.postfix/tests/README.md b/provisioning/roles/geerlingguy.postfix/tests/README.md
new file mode 100644
index 000000000..6fb211721
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postfix/tests/README.md
@@ -0,0 +1,11 @@
+# Ansible Role tests
+
+To run the test playbook(s) in this directory:
+
+  1. Install and start Docker.
+  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
+    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
+  1. Make the test shim executable: `chmod +x tests/test.sh`.
+  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
+
+If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`

From 775224c905a6f4f2bcf35140b2499a7b1f42ca53 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 3 Jan 2018 23:04:29 -0600
Subject: [PATCH 0914/1273] Fix breaking CentOS 7 test.

---
 tests/test-setup.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/test-setup.yml b/tests/test-setup.yml
index 375c9cdd5..ad4fccc0c 100644
--- a/tests/test-setup.yml
+++ b/tests/test-setup.yml
@@ -11,6 +11,11 @@
       package: name=logrotate state=present
       when: ansible_os_family == 'RedHat'
 
+    - name: Override postfix_inet_protocols (RHEL).
+      set_fact:
+        postfix_inet_protocols: ipv4
+      when: ansible_os_family == 'RedHat'
+
     - name: Copy initctl_faker into place for Ubuntu 14.04.
       copy:
         src: initctl_faker

From 15b1a3a53fdbabb5ba429fbb3ec0b3f24e6bcbec Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 3 Jan 2018 23:48:52 -0600
Subject: [PATCH 0915/1273] Actually fix the CentOS 7 failing test build.

---
 .travis.yml               | 7 ++++---
 tests/centos-7.config.yml | 2 ++
 tests/test-setup.yml      | 5 -----
 3 files changed, 6 insertions(+), 8 deletions(-)
 create mode 100644 tests/centos-7.config.yml

diff --git a/.travis.yml b/.travis.yml
index 70adede57..1689344d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,15 +23,16 @@ env:
     # Defaults - Ubuntu 14.04.
     - type: defaults
       distro: ubuntu1404
-    # Defaults - CentOS 7.
-    - type: centos
-      distro: centos7
     # Defaults - Debian 9.
     - type: debian
       distro: debian9
     # Defaults - Debian 8.
     - type: debian
       distro: debian8
+    # Defaults - CentOS 7.
+    - type: centos
+      distro: centos7
+      local_config: tests/centos-7.config.yml
 
     # PHP 5.6 - Ubuntu 16.04.
     - type: defaults
diff --git a/tests/centos-7.config.yml b/tests/centos-7.config.yml
new file mode 100644
index 000000000..c5b40e548
--- /dev/null
+++ b/tests/centos-7.config.yml
@@ -0,0 +1,2 @@
+---
+postfix_inet_protocols: ipv4
diff --git a/tests/test-setup.yml b/tests/test-setup.yml
index ad4fccc0c..375c9cdd5 100644
--- a/tests/test-setup.yml
+++ b/tests/test-setup.yml
@@ -11,11 +11,6 @@
       package: name=logrotate state=present
       when: ansible_os_family == 'RedHat'
 
-    - name: Override postfix_inet_protocols (RHEL).
-      set_fact:
-        postfix_inet_protocols: ipv4
-      when: ansible_os_family == 'RedHat'
-
     - name: Copy initctl_faker into place for Ubuntu 14.04.
       copy:
         src: initctl_faker

From 1cc6763853763baecfedafaac00e8cb4377fe4e4 Mon Sep 17 00:00:00 2001
From: Dane Powell <danepowell@users.noreply.github.com>
Date: Fri, 5 Jan 2018 13:07:57 -0800
Subject: [PATCH 0916/1273] Update NPM by default

---
 default.config.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/default.config.yml b/default.config.yml
index e567a10d3..ba65e9315 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -298,7 +298,8 @@ adminer_install_filename: index.php
 # Node.js configuration (if enabled above).
 # Valid examples: "0.10", "0.12", "4.x", "5.x", "6.x".
 nodejs_version: "6.x"
-nodejs_npm_global_packages: []
+nodejs_npm_global_packages:
+  - name: npm
 nodejs_install_npm_user: "{{ drupalvm_user }}"
 npm_config_prefix: "/home/{{ drupalvm_user }}/.npm-global"
 

From 33585246f31dc395de3ec664c0ca62b866e310f7 Mon Sep 17 00:00:00 2001
From: Keith Bremner <kmbremner@gmail.com>
Date: Sat, 6 Jan 2018 20:01:11 +0000
Subject: [PATCH 0917/1273] Update composer-dependency.md

Fix typo
---
 docs/deployment/composer-dependency.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/deployment/composer-dependency.md b/docs/deployment/composer-dependency.md
index 2ef2ac614..dd7d7b6b2 100644
--- a/docs/deployment/composer-dependency.md
+++ b/docs/deployment/composer-dependency.md
@@ -39,7 +39,7 @@ drupal_composer_install_dir: "/var/www/drupalvm"
 drupal_core_path: "{{ drupal_composer_install_dir }}/docroot"
 ```
 
-If you intened to use the devel module, it must be added as a requirement to your `composer.json` file. Alternatively, if you do not intend to use it remove it from `drupal_enabled_modules` in your `config.yml` file:
+If you intend to use the devel module, it must be added as a requirement to your `composer.json` file. Alternatively, if you do not intend to use it remove it from `drupal_enabled_modules` in your `config.yml` file:
 
 ```yaml
 drupal_enabled_modules: []

From fb3febdec3f20ce06f6252fcbbd9683bc7755feb Mon Sep 17 00:00:00 2001
From: Keith Bremner <kmbremner@gmail.com>
Date: Wed, 10 Jan 2018 16:19:34 +0000
Subject: [PATCH 0918/1273] Update mkdocs.yml to fix typo

Menu item should be "tideways" rather than "tidways"
---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 952d83119..2c9151873 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -53,7 +53,7 @@ pages:
     - 'ruby': 'extras/ruby.md'
     - 'selenium (BDD with Behat)': 'extras/selenium.md'
     - 'solr (Search engine)': 'extras/solr.md'
-    - 'tidways (Profiling tool)': 'extras/tideways.md'
+    - 'tideways (Profiling tool)': 'extras/tideways.md'
     - 'upload-progress': 'extras/upload-progress.md'
     - 'varnish (Caching reverse proxy)': 'extras/varnish.md'
     - 'xdebug (Debugging tool)': 'extras/xdebug.md'

From 053a2013d46f2909f5bd481da1f9c8dea8f01d74 Mon Sep 17 00:00:00 2001
From: kevin howbrook <kbhowbrook@gmail.com>
Date: Tue, 16 Jan 2018 15:03:53 +0000
Subject: [PATCH 0919/1273] Update php.md

---
 docs/configurations/php.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/configurations/php.md b/docs/configurations/php.md
index 240f95aff..8963417fb 100644
--- a/docs/configurations/php.md
+++ b/docs/configurations/php.md
@@ -19,4 +19,4 @@ Remi's RPM repository is included with Drupal VM, and you can make the following
 
 If you want parity with your production environment and wish to install the default distribution packages, set `php_version: ''` inside your `config.yml` to avoid adding Remi's or Ondřej's repositories. Doing this will use the default packages set in the [`geerlingguy.php`](https://github.com/geerlingguy/ansible-role-php) Ansible role.
 
-_Note: If you're using a base OS with a PHP version older than what's assumed in the `geerlingguy.php` role, you will also need to override some of the default variables set by that role in your `config.yml`. See the [`geerlingguy.php` Ansible role's README](https://github.com/geerlingguy/drupal-vm/blob/master/provisioning/README.md) for more information._
+_Note: If you're using a base OS with a PHP version older than what's assumed in the `geerlingguy.php` role, you will also need to override some of the default variables set by that role in your `config.yml`. See the [`geerlingguy.php` Ansible role's README]( https://github.com/geerlingguy/ansible-role-php#readme) for more information._

From 031ad3dc13552043cca2ba14ac885dbc6b7dcd45 Mon Sep 17 00:00:00 2001
From: kevin howbrook <kbhowbrook@gmail.com>
Date: Tue, 16 Jan 2018 15:07:20 +0000
Subject: [PATCH 0920/1273] Update php.md

---
 docs/configurations/php.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/configurations/php.md b/docs/configurations/php.md
index 8963417fb..b278de704 100644
--- a/docs/configurations/php.md
+++ b/docs/configurations/php.md
@@ -19,4 +19,4 @@ Remi's RPM repository is included with Drupal VM, and you can make the following
 
 If you want parity with your production environment and wish to install the default distribution packages, set `php_version: ''` inside your `config.yml` to avoid adding Remi's or Ondřej's repositories. Doing this will use the default packages set in the [`geerlingguy.php`](https://github.com/geerlingguy/ansible-role-php) Ansible role.
 
-_Note: If you're using a base OS with a PHP version older than what's assumed in the `geerlingguy.php` role, you will also need to override some of the default variables set by that role in your `config.yml`. See the [`geerlingguy.php` Ansible role's README]( https://github.com/geerlingguy/ansible-role-php#readme) for more information._
+_Note: If you're using a base OS with a PHP version older than what's assumed in the `geerlingguy.php` role, you will also need to override some of the default variables set by that role in your `config.yml`. See the [`geerlingguy.php` Ansible role's README](https://github.com/geerlingguy/ansible-role-php#readme) for more information._

From b2c58007c8cb59fa3865aca3fd8c45739779190a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <m@oxy.fi>
Date: Tue, 16 Jan 2018 14:15:07 -0300
Subject: [PATCH 0921/1273] Issue #1606: Fix vagrant-cachier for modern nfs
 installations with udp disabled

---
 Vagrantfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Vagrantfile b/Vagrantfile
index 6498282dd..515fc4cb4 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -152,7 +152,8 @@ Vagrant.configure('2') do |config|
     # Cache the composer directory.
     config.cache.enable :generic, cache_dir: '/home/vagrant/.composer/cache'
     config.cache.synced_folder_opts = {
-      type: vconfig['vagrant_synced_folder_default_type']
+      type: vconfig['vagrant_synced_folder_default_type'],
+      nfs_udp: false
     }
   end
 

From af2398c1736749da0081fa184373b0880c63907d Mon Sep 17 00:00:00 2001
From: Dan Bohea <git@bohea.co.uk>
Date: Tue, 16 Jan 2018 17:38:23 +0000
Subject: [PATCH 0922/1273] 'drupalvm' provisioner to still use `provisioner`
 type

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

diff --git a/Vagrantfile b/Vagrantfile
index a1f09feb2..584183f00 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -102,7 +102,7 @@ Vagrant.configure('2') do |config|
     config.vm.synced_folder synced_folder.fetch('local_path'), synced_folder.fetch('destination'), options
   end
 
-  config.vm.provision 'drupalvm', type: 'ansible' do |ansible|
+  config.vm.provision 'drupalvm', type: provisioner do |ansible|
     ansible.playbook = playbook
     ansible.extra_vars = {
       config_dir: config_dir,

From e3322c15f737fac7e59ad1e466c922b11394097a Mon Sep 17 00:00:00 2001
From: Richard Sheppard <richard.sheppard@ecorys.com>
Date: Wed, 17 Jan 2018 10:05:30 +0000
Subject: [PATCH 0923/1273] Caveat about group perms for web server with
 bindfs.

---
 docs/getting-started/syncing-folders.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/getting-started/syncing-folders.md b/docs/getting-started/syncing-folders.md
index d75a5c377..b03be1f4b 100644
--- a/docs/getting-started/syncing-folders.md
+++ b/docs/getting-started/syncing-folders.md
@@ -96,6 +96,12 @@ vconfig['vagrant_synced_folders'].each do |synced_folder|
   end
 end
 ```
+__Note:__ The content for the `Vagrantfile.local` above works for Ubuntu and Debian boxes. If using Centos you might see an error such as:
+
+```
+==> drupalvm: Cannot create bind mount from '/var/nfs/home/joeschmoe/projects/drupal-vm' to '/var/www/drupalvm': Group 'www-data' doesn't exist
+```
+The key is to change the line `g: 'www-data'` to the group which your web server is running as. For example `g: 'apache'`.
 
 ### Other NFS-related errors
 

From 72b8e1247cac3b40d05799ce6a2e8160d5694f0a Mon Sep 17 00:00:00 2001
From: Thom Toogood <thomtoogood@gmail.com>
Date: Thu, 18 Jan 2018 21:47:03 +1100
Subject: [PATCH 0924/1273] Added OS info.

---
 default.config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.config.yml b/default.config.yml
index cca1d7901..e4f39ada4 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -1,6 +1,6 @@
 ---
 # Available `vagrant_box` values include:
-#   - beet/box
+#   - beet/box (pre-provisioned, based on Ubuntu 16.04)
 #   - geerlingguy/centos7
 #   - geerlingguy/centos6
 #   - geerlingguy/debian9

From a6044010ab27adb82c3eb46d68604dfb9e30f24d Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 23 Jan 2018 20:47:48 -0600
Subject: [PATCH 0925/1273] Issue #1667: Update CHANGELOG for 4.7.1 release.
 [ci skip]

---
 CHANGELOG.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 06844b016..2ab561ce2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,31 @@
 # Drupal VM Changelog
 
+## 4.7.1 (2018-01-23)
+
+### Breaking Changes
+
+N/A
+
+### New/changed variables in default.config.yml
+
+  * `nodejs_npm_global_packages` now adds `npm` by default (see #1651).
+  * `solr_version` is now `5.5.5` by default (was `5.5.3`).
+
+### Improvements
+
+  * #1602: Add machine name to dashboard header.
+  * #1651: Update NPM when provisioning (as per NPM's recommendation).
+  * Solr default version updated to `5.5.5`.
+  * Updated roles: php-xdebug, solr, mysql, postfix.
+
+### Bugfixes
+
+  * #1606: Fix vagrant-cachier for modern nfs installations with udp disabled.
+  * #1585: Fix typo in README.md
+  * #1653: Fix typo in mkdocs.yml
+  * #1617: Fix typos in PHP.md
+
+
 ## 4.7.0 "Water, Music, and Tronaction" (2017-10-06)
 
 ### Breaking Changes

From 624e9289d7e68b044486eaa3f66515da00fe3b07 Mon Sep 17 00:00:00 2001
From: Sidney Gijzen <sidneygijzen@users.noreply.github.com>
Date: Wed, 24 Jan 2018 11:58:15 +0100
Subject: [PATCH 0926/1273] Update referenced variables in comments

---
 default.config.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/default.config.yml b/default.config.yml
index ba65e9315..b708805c7 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -63,7 +63,7 @@ drupal_build_makefile: false
 drush_makefile_path: "{{ config_dir }}/drupal.make.yml"
 drush_make_options: "--no-gitinfofile"
 
-# Set 'build_makefile' to 'false' and this to 'true' if you are using a
+# Set 'drupal_build_makefile' to 'false' and this to 'true' if you are using a
 # composer based site deployment strategy.
 drupal_build_composer: false
 drupal_composer_path: "{{ config_dir }}/drupal.composer.json"
@@ -71,8 +71,8 @@ drupal_composer_install_dir: "/var/www/drupalvm/drupal"
 drupal_composer_dependencies:
   - "drupal/devel:1.x-dev"
 
-# Set this to 'true' and 'build_makefile', 'build_composer' to 'false' if you
-# are using Composer's create-project as a site deployment strategy.
+# Set this to 'true' and 'drupal_build_makefile', 'drupal_build_composer' to 'false'
+# if you are using Composer's create-project as a site deployment strategy.
 drupal_build_composer_project: true
 drupal_composer_project_package: "drupal-composer/drupal-project:8.x-dev"
 drupal_composer_project_options: "--prefer-dist --stability dev --no-interaction"

From 938481dedd788306e3aa94fa7def9b09ea6d5307 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 25 Jan 2018 21:06:44 -0600
Subject: [PATCH 0927/1273] PR #1659 follow-up: Mention correct group for
 syncing folders with CentOS in all places.

---
 docs/getting-started/syncing-folders.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/getting-started/syncing-folders.md b/docs/getting-started/syncing-folders.md
index b03be1f4b..5ec0cff88 100644
--- a/docs/getting-started/syncing-folders.md
+++ b/docs/getting-started/syncing-folders.md
@@ -34,6 +34,8 @@ options_override:
   ]
 ```
 
+> Note If you're using CentOS, the group should be set to `httpd` or `apache` instead.
+
 ## Synced Folder Troubleshooting
 
 _Read the following [overview on the performance of the different synced folder mechanisms](../other/performance.md#synced-folder-performance)._
@@ -71,6 +73,8 @@ vagrant_synced_folders:
       group: "www-data"
 ```
 
+> Note If you're using CentOS, the group should be set to `httpd` or `apache` instead.
+
 See [this issue](https://github.com/geerlingguy/drupal-vm/issues/66) for more details.
 
 ### Using [`vagrant-bindfs`](https://github.com/gael-ian/vagrant-bindfs) to work around permissions-related errors
@@ -96,12 +100,8 @@ vconfig['vagrant_synced_folders'].each do |synced_folder|
   end
 end
 ```
-__Note:__ The content for the `Vagrantfile.local` above works for Ubuntu and Debian boxes. If using Centos you might see an error such as:
 
-```
-==> drupalvm: Cannot create bind mount from '/var/nfs/home/joeschmoe/projects/drupal-vm' to '/var/www/drupalvm': Group 'www-data' doesn't exist
-```
-The key is to change the line `g: 'www-data'` to the group which your web server is running as. For example `g: 'apache'`.
+> Note If you're using CentOS, the group should be set to `httpd` or `apache` instead.
 
 ### Other NFS-related errors
 

From d763594284d9d3ed375180d585e8fe43747ee18e Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 26 Jan 2018 15:10:52 -0600
Subject: [PATCH 0928/1273] Fixes #1539: Update drush role so it works
 correctly on Debian 8 and 9.

---
 default.config.yml                            |  2 +-
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.drush/.gitignore        |  2 +
 .../roles/geerlingguy.drush/.travis.yml       | 43 ++++++-------------
 provisioning/roles/geerlingguy.drush/LICENSE  | 20 +++++++++
 .../roles/geerlingguy.drush/README.md         |  8 ++++
 .../roles/geerlingguy.drush/defaults/main.yml |  2 +-
 .../roles/geerlingguy.drush/tasks/install.yml |  6 +++
 .../roles/geerlingguy.drush/tests/README.md   | 11 +++++
 .../roles/geerlingguy.drush/tests/test.yml    | 26 +++++++++++
 10 files changed, 89 insertions(+), 33 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.drush/.gitignore
 create mode 100644 provisioning/roles/geerlingguy.drush/LICENSE
 create mode 100644 provisioning/roles/geerlingguy.drush/tests/README.md

diff --git a/default.config.yml b/default.config.yml
index 2acc4ed97..85b921280 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -234,7 +234,7 @@ extra_packages:
   - sqlite
 
 # You can configure almost anything else on the server in the rest of this file.
-drush_version: "8.1.14"
+drush_version: "8.1.15"
 
 extra_security_enabled: false
 
diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 74bbab338..eceb04536 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -22,7 +22,7 @@
 - src: geerlingguy.drupal-console
   version: 1.1.0
 - src: geerlingguy.drush
-  version: 2.0.1
+  version: 2.0.2
 - src: geerlingguy.elasticsearch
   version: 2.1.3
 - src: geerlingguy.firewall
diff --git a/provisioning/roles/geerlingguy.drush/.gitignore b/provisioning/roles/geerlingguy.drush/.gitignore
new file mode 100644
index 000000000..c9b2377e3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drush/.gitignore
@@ -0,0 +1,2 @@
+*.retry
+tests/test.sh
diff --git a/provisioning/roles/geerlingguy.drush/.travis.yml b/provisioning/roles/geerlingguy.drush/.travis.yml
index 2a02913f0..a20651e66 100644
--- a/provisioning/roles/geerlingguy.drush/.travis.yml
+++ b/provisioning/roles/geerlingguy.drush/.travis.yml
@@ -4,48 +4,31 @@ services: docker
 env:
   # Normal installation.
   - distro: centos7
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     playbook: test.yml
   - distro: ubuntu1604
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    playbook: test.yml
+  - distro: debian8
+    playbook: test.yml
+  - distro: debian9
     playbook: test.yml
   # Install from source.
   - distro: centos7
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     playbook: test-source-install.yml
 
-before_install:
-  # Pull container.
-  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
-
 script:
-  - container_id=$(mktemp)
-  # Run container in detached state.
-  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
-
-  # Install dependencies.
-  - 'docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
-
-  # Ansible syntax check.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} --syntax-check'
+  # Configure test script so we can run extra tests after playbook is run.
+  - export container_id=$(date +%s)
+  - export cleanup=false
 
-  # Test role.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook}'
+  # Download test shim.
+  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
+  - chmod +x ${PWD}/tests/test.sh
 
-  # Test role idempotence.
-  - idempotence=$(mktemp)
-  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} | tee -a ${idempotence}
-  - >
-    tail ${idempotence}
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
+  # Run tests.
+  - ${PWD}/tests/test.sh
 
   # Test Drush.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm drush --version || true'
+  - 'docker exec --tty ${container_id} env TERM=xterm drush --version || true'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.drush/LICENSE b/provisioning/roles/geerlingguy.drush/LICENSE
new file mode 100644
index 000000000..4275cf3c1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drush/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Jeff Geerling
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/provisioning/roles/geerlingguy.drush/README.md b/provisioning/roles/geerlingguy.drush/README.md
index 6bb830eb8..2a003aa8a 100644
--- a/provisioning/roles/geerlingguy.drush/README.md
+++ b/provisioning/roles/geerlingguy.drush/README.md
@@ -26,6 +26,14 @@ The path where drush will be installed and available to your system. Should be i
 
 Path to the directory where Drush will store its generated config.
 
+    drush_install_from_source: no
+
+Whether to use Git and Composer to install Drush from source.
+
+    drush_version: 8.1.10
+
+The version of Drush to download (examples: `8.1.10`, `8.1.9`). This should exactly match an available [Drush release](https://github.com/drush-ops/drush/releases). Note that setting `drush_install_from_source` to `yes` changes the possible values for `drush_version`--see below for more information.
+
 ### Variables used for source install (Git).
 
     drush_install_path: /usr/local/share/drush
diff --git a/provisioning/roles/geerlingguy.drush/defaults/main.yml b/provisioning/roles/geerlingguy.drush/defaults/main.yml
index 704fb3f7c..0fdc7200a 100644
--- a/provisioning/roles/geerlingguy.drush/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.drush/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
 # Install from phar (faster, but less flexible).
-drush_version: "8.1.10"
+drush_version: "8.1.15"
 drush_phar_url: https://github.com/drush-ops/drush/releases/download/{{ drush_version }}/drush.phar
 drush_path: /usr/local/bin/drush
 
diff --git a/provisioning/roles/geerlingguy.drush/tasks/install.yml b/provisioning/roles/geerlingguy.drush/tasks/install.yml
index fb8b3eae5..09fb3f762 100644
--- a/provisioning/roles/geerlingguy.drush/tasks/install.yml
+++ b/provisioning/roles/geerlingguy.drush/tasks/install.yml
@@ -10,6 +10,12 @@
     state: absent
   when: drush_path_state.stat.islnk is defined and drush_path_state.stat.islnk
 
+- name: Ensure Drush path directory exists.
+  file:
+    path: "{{ drush_path | dirname }}"
+    state: directory
+    mode: 0755
+
 - name: Install Drush.
   get_url:
     url: "{{ drush_phar_url }}"
diff --git a/provisioning/roles/geerlingguy.drush/tests/README.md b/provisioning/roles/geerlingguy.drush/tests/README.md
new file mode 100644
index 000000000..6fb211721
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drush/tests/README.md
@@ -0,0 +1,11 @@
+# Ansible Role tests
+
+To run the test playbook(s) in this directory:
+
+  1. Install and start Docker.
+  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
+    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
+  1. Make the test shim executable: `chmod +x tests/test.sh`.
+  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
+
+If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.drush/tests/test.yml b/provisioning/roles/geerlingguy.drush/tests/test.yml
index 9b6efdeb9..93420f3b7 100644
--- a/provisioning/roles/geerlingguy.drush/tests/test.yml
+++ b/provisioning/roles/geerlingguy.drush/tests/test.yml
@@ -14,6 +14,32 @@
       apt: update_cache=yes cache_valid_time=600
       when: ansible_os_family == 'Debian'
 
+    # Debian-specific tasks.
+    - name: Add dependencies for PHP versions (Debian).
+      apt:
+        name: "{{ item }}"
+      with_items:
+        - apt-transport-https
+        - ca-certificates
+      when: ansible_distribution == "Debian"
+
+    - name: Add Ondrej Sury's apt key (Debian).
+      apt_key:
+        url: https://packages.sury.org/php/apt.gpg
+        state: present
+      when: ansible_distribution == "Debian"
+
+    - name: Add Ondrej Sury's repo (Debian).
+      apt_repository:
+        repo: "deb https://packages.sury.org/php/ {{ ansible_distribution_release }} main"
+        state: present
+      register: php_ondrej_debian_repo
+      when: ansible_distribution == "Debian"
+
+    - name: Update apt caches after repo is added (Debian).
+      apt: update_cache=yes
+      when: php_ondrej_debian_repo.changed and (ansible_distribution == "Debian")
+
   roles:
     - role: geerlingguy.repo-remi
       when: ansible_os_family == 'RedHat'

From 0863edac083d005929fe85ef4c366a44e0e80cc3 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 29 Jan 2018 11:21:09 -0600
Subject: [PATCH 0929/1273] Issue #1673: Update CHANGELOG.md for 4.7.2.

---
 CHANGELOG.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ab561ce2..47b1eb3a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,27 @@
 # Drupal VM Changelog
 
+## 4.7.2 (2018-01-29)
+
+### Breaking Changes
+
+N/A
+
+### New/changed variables in default.config.yml
+
+  * #1624: Added `beet/box` to list of recommended base boxes (for faster Ubuntu 16.04 provisioning).
+  * #1668: Fixed some comments which had incorrect variable references.
+  * Updated `drush_version` to `"8.1.15"` (was `"8.1.14"`).
+
+### Improvements
+
+  * Updated roles: drush.
+
+### Bugfixes
+
+  * #1659: Mention changes required for CentOS when using specialized synced folder methods.
+  * #1539: Update Drush role so Drush installs correctly on Debian 8 and 9.
+
+
 ## 4.7.1 (2018-01-23)
 
 ### Breaking Changes

From 4765d8100cf63bf9d2336c36bb809b398bcc45d5 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 29 Jan 2018 11:40:00 -0600
Subject: [PATCH 0930/1273] #1672: Update geerlingguy.drush role to 3.0.0.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.drush/.travis.yml       |  5 +-
 .../roles/geerlingguy.drush/README.md         | 59 +++++++++++++++----
 .../roles/geerlingguy.drush/defaults/main.yml | 21 ++++---
 .../tasks/install-drush-composer.yml          | 22 +++++++
 ...install.yml => install-drush-launcher.yml} | 12 ++--
 ...{source-install.yml => install-source.yml} | 16 ++---
 .../roles/geerlingguy.drush/tasks/main.yml    |  9 ++-
 .../tests/test-composer-install.yml           | 56 ++++++++++++++++++
 .../tests/test-source-install.yml             |  2 +
 .../roles/geerlingguy.drush/tests/test.yml    |  4 ++
 11 files changed, 169 insertions(+), 39 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.drush/tasks/install-drush-composer.yml
 rename provisioning/roles/geerlingguy.drush/tasks/{install.yml => install-drush-launcher.yml} (62%)
 rename provisioning/roles/geerlingguy.drush/tasks/{source-install.yml => install-source.yml} (73%)
 create mode 100644 provisioning/roles/geerlingguy.drush/tests/test-composer-install.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index eceb04536..44f760823 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -22,7 +22,7 @@
 - src: geerlingguy.drupal-console
   version: 1.1.0
 - src: geerlingguy.drush
-  version: 2.0.2
+  version: 3.0.0
 - src: geerlingguy.elasticsearch
   version: 2.1.3
 - src: geerlingguy.firewall
diff --git a/provisioning/roles/geerlingguy.drush/.travis.yml b/provisioning/roles/geerlingguy.drush/.travis.yml
index a20651e66..51f05fe8e 100644
--- a/provisioning/roles/geerlingguy.drush/.travis.yml
+++ b/provisioning/roles/geerlingguy.drush/.travis.yml
@@ -2,7 +2,7 @@
 services: docker
 
 env:
-  # Normal installation.
+  # Default installation.
   - distro: centos7
     playbook: test.yml
   - distro: ubuntu1604
@@ -11,6 +11,9 @@ env:
     playbook: test.yml
   - distro: debian9
     playbook: test.yml
+  # Install from composer.
+  - distro: centos7
+    playbook: test-composer-install.yml
   # Install from source.
   - distro: centos7
     playbook: test-source-install.yml
diff --git a/provisioning/roles/geerlingguy.drush/README.md b/provisioning/roles/geerlingguy.drush/README.md
index 2a003aa8a..8bc94d6f2 100644
--- a/provisioning/roles/geerlingguy.drush/README.md
+++ b/provisioning/roles/geerlingguy.drush/README.md
@@ -2,47 +2,80 @@
 
 [![Build Status](https://travis-ci.org/geerlingguy/ansible-role-drush.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-drush)
 
-Installs [Drush](http://www.drush.org/en/master/), a command line shell and scripting interface for Drupal, on any Linux or UNIX system.
+Installs [Drush](http://www.drush.org), a command line shell and scripting interface for Drupal, on any Linux or UNIX system.
 
 ## Requirements
 
 PHP must be installed on the system prior to running this role (suggested role: `geerlingguy.php`).
 
+Global composer installation requires Composer to also be installed on the system (suggested role: `geerlingguy.composer`).
+
 Source installation additionally requires Git and Composer to also be installed on the system (suggested roles: `geerlingguy.git` and `geerlingguy.composer`).
 
 ## Role Variables
 
 Available variables are listed below, along with default values (see `defaults/main.yml`):
 
-    drush_phar_url: https://github.com/drush-ops/drush/releases/download/8.1.10/drush.phar
+### Drush Launcher
+
+[Drush Launcher](https://github.com/drush-ops/drush-launcher) is a small wrapper around Drush for your global `$PATH`.
+
+It is the recommended way to use `drush`, but there are some situations where you might wish to install and run Drush globally without using Drush Launcher. The following variables control Drush Launcher's installation:
+
+    drush_launcher_install: yes
+
+Set to `no` if you don't want the launcher installed.
 
-The URL from which the Drush phar file will be downloaded.
+    drush_launcher_version: "0.5.1"
 
-    drush_path: /usr/local/bin/drush
+The version of the Drush Launcher to install. This should exactly match an available [Drush Launcher release](https://github.com/drush-ops/drush-launcher/releases).
+
+    drush_launcher_phar_url: https://github.com/drush-ops/drush-launcher/releases/download/{{ drush_launcher_version }}/drush.phar
+
+The URL from which the Drush Launcher phar file will be downloaded.
+
+    drush_launcher_path: /usr/local/bin/drush
 
 The path where drush will be installed and available to your system. Should be in your user's `$PATH` so you can run commands simply with `drush` instead of the full path.
 
-    drush_config: ~/.drush
+### Drush global install via Composer
 
-Path to the directory where Drush will store its generated config.
+Some people need to have the full power of `drush` available globally, and this role allows the global install of Drush via Composer. If using this option, make sure you have Composer installed!
 
-    drush_install_from_source: no
+    drush_composer_global_install: no
 
-Whether to use Git and Composer to install Drush from source.
+Set to `yes` (and set `drush_launcher_install` to `no`) if you want to install `drush` globally using Composer.
 
-    drush_version: 8.1.10
+    drush_composer_version: "~9.0"
 
-The version of Drush to download (examples: `8.1.10`, `8.1.9`). This should exactly match an available [Drush release](https://github.com/drush-ops/drush/releases). Note that setting `drush_install_from_source` to `yes` changes the possible values for `drush_version`--see below for more information.
+The version constraint for the global Drush installation.
+
+    drush_composer_update: no
+
+Whether to run `composer update drush/drush` to ensure the version of Drush installed globally is the latest version.
+
+    drush_composer_path: /usr/local/bin/drush
+
+The path in which a symlink to the Drush binary installed via Composer should be placed.
+
+> NOTE: Composer 'global' installation is global _to the user under which Drush is installed_—e.g. if you install globally using the root user, `drush` will only work properly as `root` or when using `sudo`.
 
 ### Variables used for source install (Git).
 
-    drush_install_path: /usr/local/share/drush
+You can also install Drush from source if you need a bleeding-edge release, or if you need a specific version which can't be installed via Composer.
+
+    drush_install_from_source: no
+
+Set to `yes` (and set `drush_launcher_install` to `no`) if you want to install `drush` globally using the Drush source code.
+
+    drush_source_install_bin_path: /usr/local/bin/drush
+    drush_source_install_path: /usr/local/share/drush
 
 The location of the entire drush installation (includes all the supporting files, as well as the `drush` executable file.
 
-    drush_version: "master"
+    drush_source_install_version: "8.x"
 
-The version of Drush to install (examples: `"master"` for the bleeding edge, `"7.x"`, `"6.x"`, `"6.2.0"`). This should be a string as it refers to a git branch, tag, or commit hash.
+The version of Drush to install (examples: `"master"` for the bleeding edge, `"8.x"`, `"7.x"`, `"6.2.0"`). This should be a string as it refers to a git branch, tag, or commit hash.
 
     drush_keep_updated: no
     drush_force_update: no
diff --git a/provisioning/roles/geerlingguy.drush/defaults/main.yml b/provisioning/roles/geerlingguy.drush/defaults/main.yml
index 0fdc7200a..00bbd33a2 100644
--- a/provisioning/roles/geerlingguy.drush/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.drush/defaults/main.yml
@@ -1,16 +1,23 @@
 ---
-# Install from phar (faster, but less flexible).
-drush_version: "8.1.15"
-drush_phar_url: https://github.com/drush-ops/drush/releases/download/{{ drush_version }}/drush.phar
-drush_path: /usr/local/bin/drush
+# Install Drush Launcher.
+drush_launcher_install: yes
+drush_launcher_version: "0.5.1"
+drush_launcher_phar_url: https://github.com/drush-ops/drush-launcher/releases/download/{{ drush_launcher_version }}/drush.phar
+drush_launcher_path: /usr/local/bin/drush
+
+# Install Drush via Composer globally.
+drush_composer_global_install: no
+drush_composer_version: "~9.0"
+drush_composer_update: no
+drush_composer_path: /usr/local/bin/drush
 
 # Install from source (git clone + composer-based install).
 drush_install_from_source: no
-drush_install_path: /usr/local/share/drush
-# drush_version: "master"
+drush_source_install_bin_path: /usr/local/bin/drush
+drush_source_install_path: /usr/local/share/drush
+drush_source_install_version: "8.x"
 drush_keep_updated: no
 drush_force_update: no
 drush_force_composer_install: no
-
 drush_composer_cli_options: "--prefer-dist --no-interaction"
 drush_clone_depth: 1
diff --git a/provisioning/roles/geerlingguy.drush/tasks/install-drush-composer.yml b/provisioning/roles/geerlingguy.drush/tasks/install-drush-composer.yml
new file mode 100644
index 000000000..ea7a934f0
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drush/tasks/install-drush-composer.yml
@@ -0,0 +1,22 @@
+---
+- name: Ensure Drush is installed globally via Composer.
+  composer:
+    command: require
+    global_command: yes
+    arguments: "drush/drush:{{ drush_composer_version }}"
+  register: drush_composer_require
+
+- name: Update global Drush install if configured.
+  composer:
+    command: update
+    global_command: yes
+    arguments: "drush/drush --with-dependencies"
+  when:
+    - drush_composer_update
+    - not drush_composer_require.changed
+
+- name: Ensure globally-installed Drush is symlinked into bin dir.
+  file:
+    src: "~/.composer/vendor/bin/drush"
+    dest: "{{ drush_composer_path }}"
+    state: link
diff --git a/provisioning/roles/geerlingguy.drush/tasks/install.yml b/provisioning/roles/geerlingguy.drush/tasks/install-drush-launcher.yml
similarity index 62%
rename from provisioning/roles/geerlingguy.drush/tasks/install.yml
rename to provisioning/roles/geerlingguy.drush/tasks/install-drush-launcher.yml
index 09fb3f762..449e01c57 100644
--- a/provisioning/roles/geerlingguy.drush/tasks/install.yml
+++ b/provisioning/roles/geerlingguy.drush/tasks/install-drush-launcher.yml
@@ -1,27 +1,27 @@
 ---
 - name: Check current state.
   stat:
-    path: "{{ drush_path }}"
+    path: "{{ drush_launcher_path }}"
   register: drush_path_state
 
 - name: Perform cleanup of old symlink.
   file:
-    path: "{{ drush_path }}"
+    path: "{{ drush_launcher_path }}"
     state: absent
   when: drush_path_state.stat.islnk is defined and drush_path_state.stat.islnk
 
 - name: Ensure Drush path directory exists.
   file:
-    path: "{{ drush_path | dirname }}"
+    path: "{{ drush_launcher_path | dirname }}"
     state: directory
     mode: 0755
 
 - name: Install Drush.
   get_url:
-    url: "{{ drush_phar_url }}"
-    dest: "{{ drush_path }}"
+    url: "{{ drush_launcher_phar_url }}"
+    dest: "{{ drush_launcher_path }}"
 
 - name: Ensure Drush is executable.
   file:
-    path: "{{ drush_path }}"
+    path: "{{ drush_launcher_path }}"
     mode: 0755
diff --git a/provisioning/roles/geerlingguy.drush/tasks/source-install.yml b/provisioning/roles/geerlingguy.drush/tasks/install-source.yml
similarity index 73%
rename from provisioning/roles/geerlingguy.drush/tasks/source-install.yml
rename to provisioning/roles/geerlingguy.drush/tasks/install-source.yml
index edcf3adfd..0349fc97e 100644
--- a/provisioning/roles/geerlingguy.drush/tasks/source-install.yml
+++ b/provisioning/roles/geerlingguy.drush/tasks/install-source.yml
@@ -2,39 +2,39 @@
 - name: Clone Drush from GitHub.
   git:
     repo: https://github.com/drush-ops/drush.git
-    dest: "{{ drush_install_path }}"
-    version: "{{ drush_version }}"
+    dest: "{{ drush_source_install_path }}"
+    version: "{{ drush_source_install_version }}"
     update: "{{ drush_keep_updated }}"
     force: "{{ drush_force_update }}"
     depth: "{{ drush_clone_depth }}"
   register: drush_clone
 
 - name: Check for composer.json
-  stat: path={{ drush_install_path }}/composer.json
+  stat: path={{ drush_source_install_path }}/composer.json
   register: drush_composer
 
 # See: https://github.com/geerlingguy/ansible-role-drush/issues/6
 - name: Ensure Drush can be installed on Debian Wheezy.
   shell: >
     {{ composer_path }} update {{ drush_composer_cli_options }}
-    chdir={{ drush_install_path }}
+    chdir={{ drush_source_install_path }}
   when: drush_clone.changed and ansible_distribution == "Debian" and ansible_distribution_release == "wheezy" and drush_composer.stat.exists
 
 - name: Install Drush dependencies with Composer.
   shell: >
     {{ composer_path }} install {{ drush_composer_cli_options }}
-    chdir={{ drush_install_path }}
+    chdir={{ drush_source_install_path }}
   when: (drush_clone.changed and drush_composer.stat.exists) or drush_force_composer_install
 
 - name: Create drush symlink.
   file:
-    src: "{{ drush_install_path }}/drush"
-    dest: "{{ drush_path }}"
+    src: "{{ drush_source_install_path }}/drush"
+    dest: "{{ drush_source_install_bin_path }}"
     state: link
     force: yes
 
 - name: Run drush to finish setting it up.
-  command: "{{ drush_path }}"
+  command: "{{ drush_source_install_bin_path }}"
   register: drush_result
   changed_when: "'Execute a drush command' not in drush_result.stdout"
   become: no
diff --git a/provisioning/roles/geerlingguy.drush/tasks/main.yml b/provisioning/roles/geerlingguy.drush/tasks/main.yml
index 37f9d36cf..f6c93b268 100644
--- a/provisioning/roles/geerlingguy.drush/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.drush/tasks/main.yml
@@ -1,6 +1,9 @@
 ---
-- include: install.yml
-  when: not drush_install_from_source
+- include: install-drush-launcher.yml
+  when: drush_launcher_install
 
-- include: source-install.yml
+- include: install-drush-composer.yml
+  when: drush_composer_global_install
+
+- include: install-source.yml
   when: drush_install_from_source
diff --git a/provisioning/roles/geerlingguy.drush/tests/test-composer-install.yml b/provisioning/roles/geerlingguy.drush/tests/test-composer-install.yml
new file mode 100644
index 000000000..942eed94c
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drush/tests/test-composer-install.yml
@@ -0,0 +1,56 @@
+---
+- hosts: all
+
+  vars:
+    php_enable_webserver: false
+    php_opcache_enable: "0"
+
+    # Use Composer global install.
+    drush_launcher_install: no
+    drush_composer_global_install: yes
+    drush_composer_update: yes
+
+  pre_tasks:
+    - name: Enable remi repo for PHP 7.0 (RedHat).
+      set_fact: php_enablerepo="remi,remi-php70"
+      when: ansible_os_family == 'RedHat'
+
+    - name: Update apt cache.
+      apt: update_cache=yes cache_valid_time=600
+      when: ansible_os_family == 'Debian'
+
+    - name: Ensure unzip is installed.
+      package: name=unzip state=present
+
+    # Debian-specific tasks.
+    - name: Add dependencies for PHP versions (Debian).
+      apt:
+        name: "{{ item }}"
+      with_items:
+        - apt-transport-https
+        - ca-certificates
+      when: ansible_distribution == "Debian"
+
+    - name: Add Ondrej Sury's apt key (Debian).
+      apt_key:
+        url: https://packages.sury.org/php/apt.gpg
+        state: present
+      when: ansible_distribution == "Debian"
+
+    - name: Add Ondrej Sury's repo (Debian).
+      apt_repository:
+        repo: "deb https://packages.sury.org/php/ {{ ansible_distribution_release }} main"
+        state: present
+      register: php_ondrej_debian_repo
+      when: ansible_distribution == "Debian"
+
+    - name: Update apt caches after repo is added (Debian).
+      apt: update_cache=yes
+      when: php_ondrej_debian_repo.changed and (ansible_distribution == "Debian")
+
+  roles:
+    - role: geerlingguy.repo-remi
+      when: ansible_os_family == 'RedHat'
+    - geerlingguy.php
+    - geerlingguy.composer
+    - role_under_test
diff --git a/provisioning/roles/geerlingguy.drush/tests/test-source-install.yml b/provisioning/roles/geerlingguy.drush/tests/test-source-install.yml
index f72b0bf89..2fb7c4241 100644
--- a/provisioning/roles/geerlingguy.drush/tests/test-source-install.yml
+++ b/provisioning/roles/geerlingguy.drush/tests/test-source-install.yml
@@ -4,6 +4,8 @@
   vars:
     php_enable_webserver: false
     php_opcache_enable: "0"
+    drush_launcher_install: no
+    drush_composer_global_install: no
     drush_install_from_source: yes
 
   pre_tasks:
diff --git a/provisioning/roles/geerlingguy.drush/tests/test.yml b/provisioning/roles/geerlingguy.drush/tests/test.yml
index 93420f3b7..c486a27f7 100644
--- a/provisioning/roles/geerlingguy.drush/tests/test.yml
+++ b/provisioning/roles/geerlingguy.drush/tests/test.yml
@@ -14,6 +14,9 @@
       apt: update_cache=yes cache_valid_time=600
       when: ansible_os_family == 'Debian'
 
+    - name: Ensure unzip is installed.
+      package: name=unzip state=present
+
     # Debian-specific tasks.
     - name: Add dependencies for PHP versions (Debian).
       apt:
@@ -44,4 +47,5 @@
     - role: geerlingguy.repo-remi
       when: ansible_os_family == 'RedHat'
     - geerlingguy.php
+    - geerlingguy.composer
     - role_under_test

From bd571260934e657976c907e57cb0f1941e555711 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 29 Jan 2018 15:48:09 -0600
Subject: [PATCH 0931/1273] Issue #1692, Issue #1595: Set up Drush aliases for
 all Drush versions.

---
 default.config.yml                            |   2 +
 provisioning/playbook.yml                     |   1 +
 provisioning/tasks/drush-aliases.yml          | 110 ++++++++++++++----
 .../drupalvm-local.aliases.drushrc.php.j2     |   2 +-
 .../templates/drupalvm-local.aliases.yml.j2   |  30 +++++
 .../templates/drupalvm.aliases.drushrc.php.j2 |   2 +-
 .../templates/drupalvm.aliases.yml.j2         |  35 ++++++
 provisioning/templates/drush.yml              |   4 +
 8 files changed, 162 insertions(+), 24 deletions(-)
 create mode 100644 provisioning/templates/drupalvm-local.aliases.yml.j2
 create mode 100644 provisioning/templates/drupalvm.aliases.yml.j2
 create mode 100644 provisioning/templates/drush.yml

diff --git a/default.config.yml b/default.config.yml
index 85b921280..3deb7c701 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -110,7 +110,9 @@ drupalvm_cron_jobs: []
 # this variable is 'true'.
 configure_drush_aliases: true
 drush_aliases_host_template: "templates/drupalvm.aliases.drushrc.php.j2"
+drush_aliases_host_template_yml: "templates/drupalvm.aliases.yml.j2"
 drush_aliases_guest_template: "templates/drupalvm-local.aliases.drushrc.php.j2"
+drush_aliases_guest_template_yml: "templates/drupalvm-local.aliases.yml.j2"
 
 # Helper variable to configure the PHP-FPM connection for each Apache
 # VirtualHost in the `apache_vhosts` list.
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 65a2465c8..715fbb0ea 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -111,6 +111,7 @@
       tags: ['database']
 
     - include: tasks/drush-aliases.yml
+      when: configure_drush_aliases
 
     - include: tasks/cron.yml
       tags: ['cron']
diff --git a/provisioning/tasks/drush-aliases.yml b/provisioning/tasks/drush-aliases.yml
index ff557bbb6..65bc58d63 100644
--- a/provisioning/tasks/drush-aliases.yml
+++ b/provisioning/tasks/drush-aliases.yml
@@ -1,45 +1,111 @@
 ---
-- name: Check if local Drush configuration folder exists.
+# On the host machine.
+- name: Ensure Drush directories exist.
+  file:
+    path: "{{ item }}"
+    state: directory
+    mode: 0755
+  delegate_to: 127.0.0.1
+  become: no
+  with_items:
+    - ~/.drush
+    - ~/.drush/sites
+
+- name: Check if Drush configuration file exists.
   stat:
-    path: ~/.drush
-  register: local_drush_config_folder
+    path: ~/.drush/drush.yml
   delegate_to: 127.0.0.1
   become: no
-  when: configure_drush_aliases
+  register: drush_config_file
 
-- name: Create Drush configuration folder if it doesn't exist.
-  file:
-    path: ~/.drush
-    state: directory
+- name: Create a Drush configuration file with a custom alias-path.
+  copy:
+    src: ../templates/drush.yml
+    dest: ~/.drush/drush.yml
+    mode: 0644
   delegate_to: 127.0.0.1
   become: no
-  when: configure_drush_aliases and (local_drush_config_folder.stat.exists == false)
+  when: not drush_config_file.stat.exists
 
 # Note that this doesn't work for Windows, since Ansible's running in the VM.
+# Note also that we are copying both Drush < 9 and Drush >= 9 alias files since
+# there's no other way to support multiple versions of Drush :-(.
 - name: Configure host machine drush aliases.
   template:
-    src: "{{ drush_aliases_host_template }}"
-    dest: "~/.drush/{{ vagrant_machine_name }}.aliases.drushrc.php"
+    src: "{{ item.src }}"
+    dest: "{{ item.dest }}"
   delegate_to: 127.0.0.1
   become: no
-  when: configure_drush_aliases
+  with_items:
+    - src: "{{ drush_aliases_host_template }}"
+      dest: "~/.drush/{{ vagrant_machine_name }}.aliases.drushrc.php"
+    - src: "{{ drush_aliases_host_template_yml }}"
+      dest: "~/.drush/sites/{{ vagrant_machine_name }}.site.yml"
 
-- name: Ensure drush directory exists for vagrant user inside VM.
-  file: 'path="~/.drush" state=directory'
+# Inside the VM - Vagrant user.
+- name: Ensure drush directories exist for vagrant user inside VM.
+  file:
+    path: "{{ item }}"
+    state: directory
+    mode: 0755
   become: no
+  with_items:
+    - ~/.drush
+    - ~/.drush/sites
+
+- name: Check if Drush configuration file exists.
+  stat:
+    path: ~/.drush/drush.yml
+  become: no
+  register: drush_config_file_inside
+
+- name: Create a Drush configuration file with a custom alias-path.
+  copy:
+    src: ../templates/drush.yml
+    dest: ~/.drush/drush.yml
+    mode: 0644
+  become: no
+  when: not drush_config_file_inside.stat.exists
 
 - name: Configure drush aliases for vagrant user inside VM.
   template:
-    src: "{{ drush_aliases_guest_template }}"
-    dest: "~/.drush/{{ vagrant_machine_name }}.aliases.drushrc.php"
+    src: "{{ item.src }}"
+    dest: "{{ item.dest }}"
   become: no
-  when: configure_drush_aliases
+  with_items:
+    - src: "{{ drush_aliases_guest_template }}"
+      dest: "~/.drush/{{ vagrant_machine_name }}.aliases.drushrc.php"
+    - src: "{{ drush_aliases_guest_template_yml }}"
+      dest: "~/.drush/sites/{{ vagrant_machine_name }}.site.yml"
+
+# Inside the VM - root user.
+- name: Ensure drush directories exist for root user inside VM.
+  file:
+    path: "{{ item }}"
+    state: directory
+    mode: 0755
+  with_items:
+    - ~/.drush
+    - ~/.drush/sites
+
+- name: Check if Drush configuration file exists.
+  stat:
+    path: ~/.drush/drush.yml
+  register: drush_config_file_inside_root
 
-- name: Ensure drush directory exists for root user inside VM.
-  file: 'path="~/.drush" state=directory'
+- name: Create a Drush configuration file with a custom alias-path.
+  copy:
+    src: ../templates/drush.yml
+    dest: ~/.drush/drush.yml
+    mode: 0644
+  when: not drush_config_file_inside_root.stat.exists
 
 - name: Configure drush aliases for root user inside VM.
   template:
-    src: "{{ drush_aliases_guest_template }}"
-    dest: "~/.drush/{{ vagrant_machine_name }}.aliases.drushrc.php"
-  when: configure_drush_aliases
+    src: "{{ item.src }}"
+    dest: "{{ item.dest }}"
+  with_items:
+    - src: "{{ drush_aliases_guest_template }}"
+      dest: "~/.drush/{{ vagrant_machine_name }}.aliases.drushrc.php"
+    - src: "{{ drush_aliases_guest_template_yml }}"
+      dest: "~/.drush/sites/{{ vagrant_machine_name }}.site.yml"
diff --git a/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2 b/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2
index 4b5770104..9f99d70bb 100644
--- a/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2
+++ b/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2
@@ -3,7 +3,7 @@
 /**
  * Drupal VM drush aliases.
  *
- * @see example.aliases.drushrc.php.
+ * {{ ansible_managed }}
  */
 
 {% macro alias(host, root) -%}
diff --git a/provisioning/templates/drupalvm-local.aliases.yml.j2 b/provisioning/templates/drupalvm-local.aliases.yml.j2
new file mode 100644
index 000000000..1a7fc0320
--- /dev/null
+++ b/provisioning/templates/drupalvm-local.aliases.yml.j2
@@ -0,0 +1,30 @@
+# {{ ansible_managed }}
+{% macro alias(host, root) -%}
+{%- if root not in _devtool_docroots %}
+{{ host }}:
+  host: 'drupalvm.test'
+  options: {  }
+  root: '{{ root }}'
+  uri: drupalvm.test
+
+{% endif -%}
+{% endmacro -%}
+
+{% block aliases -%}
+{%- if drupalvm_webserver == 'apache' -%}
+  {%- for vhost in apache_vhosts -%}
+    {{ alias(vhost.servername, vhost.documentroot) }}
+    {%- if vhost.serveralias is defined -%}
+      {%- for serveralias in vhost.serveralias.split() -%}
+        {{ alias(serveralias, vhost.documentroot) }}
+      {%- endfor -%}
+    {%- endif -%}
+  {%- endfor -%}
+{%- elif drupalvm_webserver == 'nginx' -%}
+  {%- for host in nginx_vhosts -%}
+    {%- for server_name in host.server_name.split() -%}
+      {{ alias(server_name, host.root) }}
+    {%- endfor -%}
+  {%- endfor -%}
+{%- endif -%}
+{%- endblock %}
diff --git a/provisioning/templates/drupalvm.aliases.drushrc.php.j2 b/provisioning/templates/drupalvm.aliases.drushrc.php.j2
index f0c3ee8f9..8b40fca57 100644
--- a/provisioning/templates/drupalvm.aliases.drushrc.php.j2
+++ b/provisioning/templates/drupalvm.aliases.drushrc.php.j2
@@ -3,7 +3,7 @@
 /**
  * Drupal VM drush aliases.
  *
- * @see example.aliases.drushrc.php.
+ * {{ ansible_managed }}
  */
 
 {% macro alias(host, root) -%}
diff --git a/provisioning/templates/drupalvm.aliases.yml.j2 b/provisioning/templates/drupalvm.aliases.yml.j2
new file mode 100644
index 000000000..e4be94565
--- /dev/null
+++ b/provisioning/templates/drupalvm.aliases.yml.j2
@@ -0,0 +1,35 @@
+# {{ ansible_managed }}
+{% macro alias(host, root) -%}
+{%- if root not in _devtool_docroots %}
+{{ host }}:
+  host: '{{ host }}'
+  options: {  }
+  paths:
+    drush-script: '{{ drush_path }}'
+  root: '{{ root }}'
+  uri: '{{ host }}'
+  user: vagrant
+  ssh:
+    options: '-o "SendEnv PHP_IDE_CONFIG PHP_OPTIONS XDEBUG_CONFIG" -o PasswordAuthentication=no -i "${env.home}/.vagrant.d/insecure_private_key"'
+
+{% endif -%}
+{% endmacro -%}
+
+{% block aliases -%}
+{%- if drupalvm_webserver == 'apache' -%}
+  {%- for vhost in apache_vhosts -%}
+    {{ alias(vhost.servername, vhost.documentroot) }}
+    {%- if vhost.serveralias is defined -%}
+      {%- for serveralias in vhost.serveralias.split() -%}
+        {{ alias(serveralias, vhost.documentroot) }}
+      {%- endfor -%}
+    {%- endif -%}
+  {%- endfor -%}
+{%- elif drupalvm_webserver == 'nginx' -%}
+  {%- for host in nginx_vhosts -%}
+    {%- for server_name in host.server_name.split() -%}
+      {{ alias(server_name, host.root) }}
+    {%- endfor -%}
+  {%- endfor -%}
+{%- endif -%}
+{%- endblock %}
diff --git a/provisioning/templates/drush.yml b/provisioning/templates/drush.yml
new file mode 100644
index 000000000..e04ccc67d
--- /dev/null
+++ b/provisioning/templates/drush.yml
@@ -0,0 +1,4 @@
+drush:
+  paths:
+    alias-path:
+      - '${env.home}/.drush/sites'

From 19b3a925024a81a1fda684a0719f179671d77f50 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 29 Jan 2018 16:07:30 -0600
Subject: [PATCH 0932/1273] Issue #1692: See if changing directories fixes
 drush tests.

---
 tests/run-tests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index fe4126134..d83381723 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -170,7 +170,7 @@ docker exec $CONTAINER_ID curl -sSi --header Host:$IP localhost \
   || (echo 'Dashboard install fail' && cat /tmp/dvm-test && exit 1)
 
 # Drush.
-docker exec $CONTAINER_ID $DRUSH_BIN @$MACHINE_NAME.$HOSTNAME status \
+docker exec $CONTAINER_ID "bash -c 'cd $DRUPALVM_DIR/drupal/web; $DRUSH_BIN @$MACHINE_NAME.$HOSTNAME status'" \
   | tee /tmp/dvm-test \
   | grep -q 'Drupal bootstrap.*Successful' \
   && (echo 'Drush install pass' && exit 0) \

From d12962a38888082b01f049c72d91f0fa6d03db03 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 29 Jan 2018 16:19:41 -0600
Subject: [PATCH 0933/1273] Issue #1692: Use simplified Drush functionality
 test.

---
 tests/run-tests.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index d83381723..da4283953 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -169,10 +169,17 @@ docker exec $CONTAINER_ID curl -sSi --header Host:$IP localhost \
   && (echo 'Dashboard install pass' && exit 0) \
   || (echo 'Dashboard install fail' && cat /tmp/dvm-test && exit 1)
 
+# Drush - see https://github.com/drush-ops/drush/issues/3336.
+# docker exec $CONTAINER_ID $DRUSH_BIN @$MACHINE_NAME.$HOSTNAME status \
+#   | tee /tmp/dvm-test \
+#   | grep -q 'Drupal bootstrap.*Successful' \
+#   && (echo 'Drush install pass' && exit 0) \
+#   || (echo 'Drush install fail' && cat /tmp/dvm-test && exit 1)
+
 # Drush.
-docker exec $CONTAINER_ID "bash -c 'cd $DRUPALVM_DIR/drupal/web; $DRUSH_BIN @$MACHINE_NAME.$HOSTNAME status'" \
+docker exec $CONTAINER_ID $DRUSH_BIN status \
   | tee /tmp/dvm-test \
-  | grep -q 'Drupal bootstrap.*Successful' \
+  | grep -q 'Drush launcher' \
   && (echo 'Drush install pass' && exit 0) \
   || (echo 'Drush install fail' && cat /tmp/dvm-test && exit 1)
 

From 60d37cb0954f4e5540e88bba17d1a0f1d893f416 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 29 Jan 2018 16:40:37 -0600
Subject: [PATCH 0934/1273] Issue #1692: For Drush Make test, explicitly
 install Drush 8.1.15.

---
 .travis.yml                                                   | 2 +-
 default.config.yml                                            | 2 --
 tests/run-tests.sh                                            | 4 +++-
 ...nginx.config.yml => ubuntu-16-nginx-drush-make.config.yml} | 3 +++
 4 files changed, 7 insertions(+), 4 deletions(-)
 rename tests/{ubuntu-16-nginx.config.yml => ubuntu-16-nginx-drush-make.config.yml} (64%)

diff --git a/.travis.yml b/.travis.yml
index 1689344d3..79b7dffe8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,7 +44,7 @@ env:
     # Nginx and Drush make file test - Ubuntu 16.04.
     - type: nginx-drush-make
       distro: ubuntu1604
-      local_config: tests/ubuntu-16-nginx.config.yml
+      local_config: tests/ubuntu-16-nginx-drush-make.config.yml
       config_dir: /var/www/drupalvm/config
 
     # PostgreSQL - Ubuntu 16.04.
diff --git a/default.config.yml b/default.config.yml
index 3deb7c701..a96dc5369 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -236,8 +236,6 @@ extra_packages:
   - sqlite
 
 # You can configure almost anything else on the server in the rest of this file.
-drush_version: "8.1.15"
-
 extra_security_enabled: false
 
 firewall_enabled: true
diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index da4283953..7147ce469 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -169,7 +169,9 @@ docker exec $CONTAINER_ID curl -sSi --header Host:$IP localhost \
   && (echo 'Dashboard install pass' && exit 0) \
   || (echo 'Dashboard install fail' && cat /tmp/dvm-test && exit 1)
 
-# Drush - see https://github.com/drush-ops/drush/issues/3336.
+# Drush - see https://github.com/drush-ops/drush/issues/3336. This test would
+# also test generated global Drush aliases, but it's currently not working due
+# to $reasons.
 # docker exec $CONTAINER_ID $DRUSH_BIN @$MACHINE_NAME.$HOSTNAME status \
 #   | tee /tmp/dvm-test \
 #   | grep -q 'Drupal bootstrap.*Successful' \
diff --git a/tests/ubuntu-16-nginx.config.yml b/tests/ubuntu-16-nginx-drush-make.config.yml
similarity index 64%
rename from tests/ubuntu-16-nginx.config.yml
rename to tests/ubuntu-16-nginx-drush-make.config.yml
index 917a585f1..b50cf53ad 100644
--- a/tests/ubuntu-16-nginx.config.yml
+++ b/tests/ubuntu-16-nginx-drush-make.config.yml
@@ -2,6 +2,9 @@
 drupalvm_webserver: nginx
 
 # Test makefile based installation.
+drush_launcher_install: no
+drush_install_from_source: yes
+drush_source_install_version: "8.1.15"
 drupal_build_makefile: true
 drupal_build_composer_project: false
 drupal_core_path: "/var/www/drupalvm/drupal"

From da7009d7cad992fa8637d58e70cb9da2b5f2ebbc Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 29 Jan 2018 16:53:49 -0600
Subject: [PATCH 0935/1273] Issue #1672: Even simpler Drush test since the
 situation is getting complicated.

---
 docs/extras/drush.md | 6 ++++--
 tests/run-tests.sh   | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/extras/drush.md b/docs/extras/drush.md
index e06bd74c5..247508b5c 100644
--- a/docs/extras/drush.md
+++ b/docs/extras/drush.md
@@ -1,5 +1,7 @@
 If you have [Drush](http://www.drush.org) and Ansible installed on your host workstation, and would like to interact with a Drupal site running inside Drupal VM, there are drush aliases automatically created by Drupal VM for each of the virtual hosts you have configured.
 
+> Note: Drush 9.0.0 and later require some architectural changes to the way Drush is installed and used both within Drupal VM and on your host computer. Please check the [Drush](https://github.com/drush-ops/drush/issues) and [Drupal VM](https://github.com/geerlingguy/drupal-vm/issues) issue queues if you encounter any strange behavior when using Drush.
+
 With the example configuration, you can manage the example Drupal site using the Drush alias `@drupalvm.test`. For example, to check if Drush can connect to the site in Drupal VM, run:
 
 ```
@@ -33,9 +35,9 @@ $ drush @drupalvm.test status
  Staging config path    :  [...]
 ```
 
-Drupal VM automatically generates a drush alias file in `~/.drush/drupalvm.aliases.drushrc.php` with an alias for every site you have defined in the `apache_vhosts` variable.
+Drupal VM automatically generates a drush alias file in `~/.drush/drupalvm.aliases.drushrc.php` (for Drush < 9.0.0) and `~/.drush/sites/drupalvm.site.yml` (for Drupal 9.0.0+) with an alias for every site you have defined in the `apache_vhosts` or `nginx_vhosts` variable.
 
-If you want to customize the generated alias file you can override the `drush_aliases_host_template` and `drush_aliases_guest_template` variables in your `config.yml`.
+If you want to customize the generated alias file you can override the `drush_aliases_host_template` and `drush_aliases_guest_template` variables (or `_yml` variables for Drush 9.0.0+) in your `config.yml`.
 
 ```yaml
 drush_aliases_host_template: "{{ config_dir }}/templates/drupalvm.aliases.drushrc.php.j2"
diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index 7147ce469..d04e083a2 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -181,7 +181,7 @@ docker exec $CONTAINER_ID curl -sSi --header Host:$IP localhost \
 # Drush.
 docker exec $CONTAINER_ID $DRUSH_BIN status \
   | tee /tmp/dvm-test \
-  | grep -q 'Drush launcher' \
+  | grep -q 'Drush' \
   && (echo 'Drush install pass' && exit 0) \
   || (echo 'Drush install fail' && cat /tmp/dvm-test && exit 1)
 

From 8dd2ddb0099f590f2c5db72402614c72a0033244 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 30 Jan 2018 09:09:47 -0600
Subject: [PATCH 0936/1273] Issue #1672: Update Drush make installation
 instructions.

---
 docs/deployment/drush-make.md | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/docs/deployment/drush-make.md b/docs/deployment/drush-make.md
index 3877287b5..6a9deb56b 100644
--- a/docs/deployment/drush-make.md
+++ b/docs/deployment/drush-make.md
@@ -1,8 +1,15 @@
-If you want to build a Drupal site using a [Drush make file](http://www.drush.org/en/master/make/) instead of composer, set `drupal_build_composer_project: false`, `drupal_build_makefile: true` and either use the `example.drupal.make.yml` file as a base, or use your own Drush make file: just place it or symlink it into the root of the Drupal VM folder with the filename `drupal.make.yml`. You can also set a separate path to the makefile using the `drush_makefile_path` variable.
+If you want to build a Drupal site using a [Drush make file](http://www.drush.org/en/master/make/) instead of Composer, you will need to do the following:
+
+  - Set `drupal_build_composer_project: false`
+  - Set `drupal_build_makefile: true`
+  - Use the `example.drupal.make.yml` file as a base (copy it to a new file named `drupal.make.yml`), or use your own Drush make file
+    - (You can also set a separate path to the makefile using the `drush_makefile_path` variable.)
+  - Set the following options to force an install an older version of Drush (Drush 9+ no longer supports Drush make files):
 
 ```yaml
-drupal_build_composer_project: false
-drupal_build_makefile: true
+drush_launcher_install: no
+drush_install_from_source: yes
+drush_source_install_version: "8.1.15"
 ```
 
 Have a look at the defaults in `default.config.yml` and tweak the settings as you'd like in your `config.yml`, then run `vagrant up` as in the Quick Start Guide. Within a few minutes, you should have your site running and available at the `drupal_domain` configured in `config.yml`, falling back to the default `http://drupalvm.test` set in `default.config.yml`.

From cd79a49c06fb90736febd34630648cd6a33a2db0 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 30 Jan 2018 09:44:17 -0600
Subject: [PATCH 0937/1273] Issue #1672: More fixes for Drush aliases.

---
 docs/extras/drush.md                                        | 2 +-
 docs/extras/xdebug.md                                       | 2 +-
 .../templates/drupalvm-local.aliases.drushrc.php.j2         | 2 +-
 provisioning/templates/drupalvm-local.aliases.yml.j2        | 5 ++---
 provisioning/templates/drupalvm.aliases.drushrc.php.j2      | 2 +-
 provisioning/templates/drupalvm.aliases.yml.j2              | 6 ++----
 6 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/docs/extras/drush.md b/docs/extras/drush.md
index 247508b5c..aac930a27 100644
--- a/docs/extras/drush.md
+++ b/docs/extras/drush.md
@@ -64,7 +64,7 @@ If you're locked to an older version of Drush, it is likely that Drush will try
 If you're still having issues, you can avoid `sql-sync` entirely and pipe the mysqldump output yourself with:
 
 ```
-drush @remote sql-dump | drush @drupalvm.drupalvm.test sql-cli
+drush @remote sql-dump | drush @drupalvm.drupalvm sql-cli
 ```
 
 ## Running `drush core-cron` as a cron job.
diff --git a/docs/extras/xdebug.md b/docs/extras/xdebug.md
index 31a7d4457..b2a136677 100644
--- a/docs/extras/xdebug.md
+++ b/docs/extras/xdebug.md
@@ -53,7 +53,7 @@ php_xdebug_idekey: netbeans-xdebug
 As long as `xdebug` is listed in `installed_extras` Drupal VM is configured to accept the `PHP_IDE_CONFIG`, `XDEBUG_CONFIG` and `PHP_OPTIONS` environment variables over SSH and this can be used to set up some IDE's as well as enable XDebug on a per request basis:
 
 ```
-PHP_OPTIONS="-d xdebug.default_enable=1" drush @drupalvm.drupalvm.test migrate-import
+PHP_OPTIONS="-d xdebug.default_enable=1" drush @drupalvm.drupalvm migrate-import
 ```
 
 To send the environment variables when using `vagrant ssh`, [create a `Vagrantfile.local`](../extending/vagrantfile.md) with:
diff --git a/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2 b/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2
index 9f99d70bb..280d62394 100644
--- a/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2
+++ b/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2
@@ -8,7 +8,7 @@
 
 {% macro alias(host, root) -%}
 {%- if root not in _devtool_docroots %}
-$aliases['{{ host }}'] = array(
+$aliases['{{ host.split('.')[0] }}'] = array(
   'uri' => '{{ host }}',
   'root' => '{{ root }}',
 );
diff --git a/provisioning/templates/drupalvm-local.aliases.yml.j2 b/provisioning/templates/drupalvm-local.aliases.yml.j2
index 1a7fc0320..cefdb4ccc 100644
--- a/provisioning/templates/drupalvm-local.aliases.yml.j2
+++ b/provisioning/templates/drupalvm-local.aliases.yml.j2
@@ -1,11 +1,10 @@
 # {{ ansible_managed }}
 {% macro alias(host, root) -%}
 {%- if root not in _devtool_docroots %}
-{{ host }}:
-  host: 'drupalvm.test'
+{{ host.split('.')[0] }}:
   options: {  }
   root: '{{ root }}'
-  uri: drupalvm.test
+  uri: '{{ host }}'
 
 {% endif -%}
 {% endmacro -%}
diff --git a/provisioning/templates/drupalvm.aliases.drushrc.php.j2 b/provisioning/templates/drupalvm.aliases.drushrc.php.j2
index 8b40fca57..efb3e3ccc 100644
--- a/provisioning/templates/drupalvm.aliases.drushrc.php.j2
+++ b/provisioning/templates/drupalvm.aliases.drushrc.php.j2
@@ -8,7 +8,7 @@
 
 {% macro alias(host, root) -%}
 {%- if root not in _devtool_docroots %}
-$aliases['{{ host }}'] = array(
+$aliases['{{ host.split('.')[0] }}'] = array(
   'uri' => '{{ host }}',
   'root' => '{{ root }}',
   'remote-host' => '{{ host }}',
diff --git a/provisioning/templates/drupalvm.aliases.yml.j2 b/provisioning/templates/drupalvm.aliases.yml.j2
index e4be94565..c91041ade 100644
--- a/provisioning/templates/drupalvm.aliases.yml.j2
+++ b/provisioning/templates/drupalvm.aliases.yml.j2
@@ -1,14 +1,12 @@
 # {{ ansible_managed }}
 {% macro alias(host, root) -%}
 {%- if root not in _devtool_docroots %}
-{{ host }}:
+{{ host.split('.')[0] }}:
   host: '{{ host }}'
   options: {  }
-  paths:
-    drush-script: '{{ drush_path }}'
   root: '{{ root }}'
   uri: '{{ host }}'
-  user: vagrant
+  user: '{{ vagrant_user }}'
   ssh:
     options: '-o "SendEnv PHP_IDE_CONFIG PHP_OPTIONS XDEBUG_CONFIG" -o PasswordAuthentication=no -i "${env.home}/.vagrant.d/insecure_private_key"'
 

From 1a708194d019149779b807d7fef085ac5a1e9462 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 30 Jan 2018 10:34:03 -0600
Subject: [PATCH 0938/1273] Issue #1675: Allow failure of the postgresql
 example for now.

---
 .travis.yml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 79b7dffe8..bfb85b3fb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,13 +47,15 @@ env:
       local_config: tests/ubuntu-16-nginx-drush-make.config.yml
       config_dir: /var/www/drupalvm/config
 
-    # PostgreSQL - Ubuntu 16.04.
-    - type: postgresql
-      distro: ubuntu1604
-      local_config: tests/ubuntu-16-postgresql.config.yml
-      config_dir: /var/www/drupalvm/config
-      DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/drush/drush/drush"
-      TEST_INSTALLED_EXTRAS: false
+    # TODO: See https://github.com/geerlingguy/drupal-vm/issues/1675.
+    allow_failures:
+      # PostgreSQL - Ubuntu 16.04.
+      - type: postgresql
+        distro: ubuntu1604
+        local_config: tests/ubuntu-16-postgresql.config.yml
+        config_dir: /var/www/drupalvm/config
+        DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/drush/drush/drush"
+        TEST_INSTALLED_EXTRAS: false
 
 before_install:
   # Pull container.

From fdaabee0f5c26a6c308205828b33e50a946bacf9 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 30 Jan 2018 10:44:33 -0600
Subject: [PATCH 0939/1273] Issue #1675: Allow failure of the postgresql
 example for now - attempt 2.

---
 .travis.yml | 63 ++++++++++++++++++++++++++++++-----------------------
 1 file changed, 36 insertions(+), 27 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bfb85b3fb..17fc88448 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,35 +17,44 @@ env:
       CONTAINER_ID: dvm-test
 
   matrix:
-    # Defaults - Ubuntu 16.04.
-    - type: defaults
-      distro: ubuntu1604
-    # Defaults - Ubuntu 14.04.
-    - type: defaults
-      distro: ubuntu1404
-    # Defaults - Debian 9.
-    - type: debian
-      distro: debian9
-    # Defaults - Debian 8.
-    - type: debian
-      distro: debian8
-    # Defaults - CentOS 7.
-    - type: centos
-      distro: centos7
-      local_config: tests/centos-7.config.yml
+    include:
+      # Defaults - Ubuntu 16.04.
+      - type: defaults
+        distro: ubuntu1604
+      # Defaults - Ubuntu 14.04.
+      - type: defaults
+        distro: ubuntu1404
+      # Defaults - Debian 9.
+      - type: debian
+        distro: debian9
+      # Defaults - Debian 8.
+      - type: debian
+        distro: debian8
+      # Defaults - CentOS 7.
+      - type: centos
+        distro: centos7
+        local_config: tests/centos-7.config.yml
 
-    # PHP 5.6 - Ubuntu 16.04.
-    - type: defaults
-      distro: ubuntu1604
-      local_config: tests/ubuntu-16-php56.config.yml
-      DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/drush/drush/drush"
-      TEST_INSTALLED_EXTRAS: false
+      # PHP 5.6 - Ubuntu 16.04.
+      - type: defaults
+        distro: ubuntu1604
+        local_config: tests/ubuntu-16-php56.config.yml
+        DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/drush/drush/drush"
+        TEST_INSTALLED_EXTRAS: false
+
+      # Nginx and Drush make file test - Ubuntu 16.04.
+      - type: nginx-drush-make
+        distro: ubuntu1604
+        local_config: tests/ubuntu-16-nginx-drush-make.config.yml
+        config_dir: /var/www/drupalvm/config
 
-    # Nginx and Drush make file test - Ubuntu 16.04.
-    - type: nginx-drush-make
-      distro: ubuntu1604
-      local_config: tests/ubuntu-16-nginx-drush-make.config.yml
-      config_dir: /var/www/drupalvm/config
+      # PostgreSQL - Ubuntu 16.04.
+      - type: postgresql
+        distro: ubuntu1604
+        local_config: tests/ubuntu-16-postgresql.config.yml
+        config_dir: /var/www/drupalvm/config
+        DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/drush/drush/drush"
+        TEST_INSTALLED_EXTRAS: false
 
     # TODO: See https://github.com/geerlingguy/drupal-vm/issues/1675.
     allow_failures:

From d579225ec4f310e0042b506dfbfaec1dbeede64c Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 30 Jan 2018 10:47:39 -0600
Subject: [PATCH 0940/1273] Issue #1675: Stop testing postgres for now.

---
 .travis.yml | 80 +++++++++++++++++++++++------------------------------
 1 file changed, 35 insertions(+), 45 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 17fc88448..cbd44873b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,54 +17,44 @@ env:
       CONTAINER_ID: dvm-test
 
   matrix:
-    include:
-      # Defaults - Ubuntu 16.04.
-      - type: defaults
-        distro: ubuntu1604
-      # Defaults - Ubuntu 14.04.
-      - type: defaults
-        distro: ubuntu1404
-      # Defaults - Debian 9.
-      - type: debian
-        distro: debian9
-      # Defaults - Debian 8.
-      - type: debian
-        distro: debian8
-      # Defaults - CentOS 7.
-      - type: centos
-        distro: centos7
-        local_config: tests/centos-7.config.yml
+    # Defaults - Ubuntu 16.04.
+    - type: defaults
+      distro: ubuntu1604
+    # Defaults - Ubuntu 14.04.
+    - type: defaults
+      distro: ubuntu1404
+    # Defaults - Debian 9.
+    - type: debian
+      distro: debian9
+    # Defaults - Debian 8.
+    - type: debian
+      distro: debian8
+    # Defaults - CentOS 7.
+    - type: centos
+      distro: centos7
+      local_config: tests/centos-7.config.yml
 
-      # PHP 5.6 - Ubuntu 16.04.
-      - type: defaults
-        distro: ubuntu1604
-        local_config: tests/ubuntu-16-php56.config.yml
-        DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/drush/drush/drush"
-        TEST_INSTALLED_EXTRAS: false
+    # PHP 5.6 - Ubuntu 16.04.
+    - type: defaults
+      distro: ubuntu1604
+      local_config: tests/ubuntu-16-php56.config.yml
+      DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/drush/drush/drush"
+      TEST_INSTALLED_EXTRAS: false
 
-      # Nginx and Drush make file test - Ubuntu 16.04.
-      - type: nginx-drush-make
-        distro: ubuntu1604
-        local_config: tests/ubuntu-16-nginx-drush-make.config.yml
-        config_dir: /var/www/drupalvm/config
+    # Nginx and Drush make file test - Ubuntu 16.04.
+    - type: nginx-drush-make
+      distro: ubuntu1604
+      local_config: tests/ubuntu-16-nginx-drush-make.config.yml
+      config_dir: /var/www/drupalvm/config
 
-      # PostgreSQL - Ubuntu 16.04.
-      - type: postgresql
-        distro: ubuntu1604
-        local_config: tests/ubuntu-16-postgresql.config.yml
-        config_dir: /var/www/drupalvm/config
-        DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/drush/drush/drush"
-        TEST_INSTALLED_EXTRAS: false
-
-    # TODO: See https://github.com/geerlingguy/drupal-vm/issues/1675.
-    allow_failures:
-      # PostgreSQL - Ubuntu 16.04.
-      - type: postgresql
-        distro: ubuntu1604
-        local_config: tests/ubuntu-16-postgresql.config.yml
-        config_dir: /var/www/drupalvm/config
-        DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/drush/drush/drush"
-        TEST_INSTALLED_EXTRAS: false
+    # TODO: See https://github.com/geerlingguy/drupal-vm/issues/1675
+    # PostgreSQL - Ubuntu 16.04.
+    # - type: postgresql
+    #   distro: ubuntu1604
+    #   local_config: tests/ubuntu-16-postgresql.config.yml
+    #   config_dir: /var/www/drupalvm/config
+    #   DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/drush/drush/drush"
+    #   TEST_INSTALLED_EXTRAS: false
 
 before_install:
   # Pull container.

From 0ca883a9fd413b3a251c5a144167f7500cf884b4 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 30 Jan 2018 16:22:26 -0600
Subject: [PATCH 0941/1273] Issue #1679: Update CHANGELOG for 4.8.0 release.
 [ci skip]

---
 CHANGELOG.md | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47b1eb3a9..83022accf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,35 @@
 # Drupal VM Changelog
 
+## 4.8.0 "Tower Music / Let Us Pray" (2018-01-30)
+
+This release is all about Drush. Please read my blog post [Drupal VM 4.8 and Drush 9.0.0 - Some major changes](https://www.jeffgeerling.com/blog/2018/drupal-vm-48-and-drush-900-some-major-changes) for details and more background.
+
+If you have Drush 8 installed on your host machine, primarily use Drush _outside_ of Drupal VM, and don't use a Drush make file, none of the breaking changes should affect you.
+
+### Breaking Changes
+
+  * Drush is no longer installed inside Drupal VM if you have `drush` in `installed_extras`. Drush Launcher is installed by default.
+  * The `drush_version` configuration option is no longer used by default.
+  * Drush make files cannot be built with Drush 9+. If you have `drupal_build_makefile: true` in your `config.yml`, you _must_ add configuration to install an older version of Drush inside Drupal VM. See the [Drupal VM Drush make docs](http://docs.drupalvm.com/en/latest/deployment/drush-make/).
+
+### New/changed variables in default.config.yml
+
+  * Added the following variables to support Drush 9:
+    * `drush_aliases_host_template_yml: "templates/drupalvm.aliases.yml.j2"`
+    * `drush_aliases_guest_template_yml: "templates/drupalvm-local.aliases.yml.j2"`
+  * Removed now-unused variable: `drush_version: "8.1.15"` (Drush Launcher is installed by default inside Drupal VM).
+
+### Improvements
+
+  * #1672: Upgrade Drupal VM to use Drush Launcher and natively support Drush 9.0.0.
+  * #1595: Create Drush global aliases that work for Drush 9+ and work outside Drupal VM.
+  * Updated roles: drush.
+
+### Bugfixes
+
+N/A
+
+
 ## 4.7.2 (2018-01-29)
 
 ### Breaking Changes

From 1f8d3b4bedd25072dd19578bf23d709635f0e876 Mon Sep 17 00:00:00 2001
From: Tormi Tabor <tormi.tabor@gmail.com>
Date: Fri, 2 Feb 2018 17:34:49 +0200
Subject: [PATCH 0942/1273] Added Atom and XDebug with Drupal VM section

From PR https://github.com/geerlingguy/drupal-vm/pull/1631.
---
 docs/extras/xdebug.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/extras/xdebug.md b/docs/extras/xdebug.md
index b2a136677..54cccd683 100644
--- a/docs/extras/xdebug.md
+++ b/docs/extras/xdebug.md
@@ -47,6 +47,13 @@ To use XDebug with NetBeans, change the `php_xdebug_idekey` variable as shown be
 ```yaml
 php_xdebug_idekey: netbeans-xdebug
 ```
+### Atom and XDebug with Drupal VM
+
+To use XDebug with Atom, change the `php_xdebug_idekey` variable as shown below in `config.yml`, and then run `vagrant provision` to reconfigure the VM.
+
+```yaml
+php_xdebug_idekey: xdebug-atom
+```
 
 ### XDebug over SSH/Drush
 

From dd60045f2efea55b888bce98b1e8143618ce6d23 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 7 Feb 2018 11:52:29 -0600
Subject: [PATCH 0943/1273] Update geerlingguy.git and geerlingguy.ruby roles
 to latest versions.

---
 provisioning/requirements.yml                 |  4 +-
 .../roles/geerlingguy.git/.travis.yml         |  9 ++--
 provisioning/roles/geerlingguy.git/README.md  |  2 +-
 .../roles/geerlingguy.git/defaults/main.yml   |  2 +-
 .../tasks/install-from-source.yml             | 49 +++++++++++--------
 .../geerlingguy.git/tests/test-source.yml     |  2 +-
 .../roles/geerlingguy.git/vars/Debian.yml     |  9 ++++
 .../roles/geerlingguy.git/vars/Fedora.yml     | 13 +++++
 .../roles/geerlingguy.git/vars/RedHat.yml     | 12 +++++
 .../roles/geerlingguy.git/vars/main.yml       |  1 +
 .../geerlingguy.nodejs/tests/test-latest.yml  | 21 ++++++++
 .../geerlingguy.ruby/tasks/setup-Debian.yml   |  5 +-
 12 files changed, 99 insertions(+), 30 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.git/vars/Debian.yml
 create mode 100644 provisioning/roles/geerlingguy.git/vars/Fedora.yml
 create mode 100644 provisioning/roles/geerlingguy.git/vars/RedHat.yml
 create mode 100644 provisioning/roles/geerlingguy.nodejs/tests/test-latest.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 44f760823..6cb4d6b3b 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -28,7 +28,7 @@
 - src: geerlingguy.firewall
   version: 2.3.0
 - src: geerlingguy.git
-  version: 1.3.0
+  version: 1.4.1
 - src: geerlingguy.java
   version: 1.7.4
 - src: geerlingguy.mailhog
@@ -72,7 +72,7 @@
 - src: geerlingguy.repo-remi
   version: 1.2.0
 - src: geerlingguy.ruby
-  version: 2.4.3
+  version: 2.4.4
 - src: geerlingguy.security
   version: 1.5.0
 - src: geerlingguy.solr
diff --git a/provisioning/roles/geerlingguy.git/.travis.yml b/provisioning/roles/geerlingguy.git/.travis.yml
index bebd98101..fdc22815e 100644
--- a/provisioning/roles/geerlingguy.git/.travis.yml
+++ b/provisioning/roles/geerlingguy.git/.travis.yml
@@ -5,10 +5,13 @@ env:
   # Test source install on latest supported OSes.
   - distro: centos7
     playbook: test-source.yml
-    GIT_VERSION: 2.9.3
+    GIT_VERSION: 2.16.1
+  - distro: fedora24
+    playbook: test-source.yml
+    GIT_VERSION: 2.16.1
   - distro: ubuntu1604
     playbook: test-source.yml
-    GIT_VERSION: 2.9.3
+    GIT_VERSION: 2.16.1
 
   # Test package install on all supported OSes.
   - distro: centos7
@@ -19,7 +22,7 @@ env:
     GIT_VERSION: 1.7.1
   - distro: fedora24
     playbook: test.yml
-    GIT_VERSION: 2.7.4
+    GIT_VERSION: 2.7.5
   - distro: ubuntu1604
     playbook: test.yml
     GIT_VERSION: 2.7.4
diff --git a/provisioning/roles/geerlingguy.git/README.md b/provisioning/roles/geerlingguy.git/README.md
index 02733dd32..97f950a7c 100644
--- a/provisioning/roles/geerlingguy.git/README.md
+++ b/provisioning/roles/geerlingguy.git/README.md
@@ -28,7 +28,7 @@ The specific Git packages that will be installed. By default, `git-svn` is inclu
 
     git_install_from_source: false
     git_install_path: "/usr"
-    git_version: "2.1.0"
+    git_version: "2.16.1"
 
 Whether to install Git from source; if set to `true`, `git_version` is required and will be used to install a particular version of git (see all available versions here: https://www.kernel.org/pub/software/scm/git/), and `git_install_path` defines where git should be installed.
 
diff --git a/provisioning/roles/geerlingguy.git/defaults/main.yml b/provisioning/roles/geerlingguy.git/defaults/main.yml
index d08bf8c35..28c721622 100644
--- a/provisioning/roles/geerlingguy.git/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.git/defaults/main.yml
@@ -13,7 +13,7 @@ git_packages:
 # the 'git_version' variable instead of using a package.
 git_install_from_source: false
 git_install_path: "/usr"
-git_version: "2.9.3"
+git_version: "2.16.1"
 
 # If git is already installed at and older version, force a new source build.
 # Only applies if git_install_from_source is `true`.
diff --git a/provisioning/roles/geerlingguy.git/tasks/install-from-source.yml b/provisioning/roles/geerlingguy.git/tasks/install-from-source.yml
index 829e70c25..58db1a094 100644
--- a/provisioning/roles/geerlingguy.git/tasks/install-from-source.yml
+++ b/provisioning/roles/geerlingguy.git/tasks/install-from-source.yml
@@ -1,27 +1,32 @@
 ---
+
+- name: Include OS-specific variables (RedHat).
+  include_vars: "{{ ansible_os_family }}.yml"
+  when:
+    - ansible_os_family == "RedHat"
+    - ansible_distribution != "Fedora"
+
+- name: Include OS-specific variables (Fedora).
+  include_vars: "{{ ansible_distribution }}.yml"
+  when: ansible_distribution == "Fedora"
+
+- name: Include OS-specific variables (Debian).
+  include_vars: "{{ ansible_os_family }}.yml"
+  when: ansible_os_family == "Debian"
+
+- name: Define git_install_from_source_dependencies.
+  set_fact:
+    git_install_from_source_dependencies: "{{ __git_install_from_source_dependencies | list }}"
+  when: git_install_from_source_dependencies is not defined
+
 - name: Ensure git's dependencies are installed (RedHat).
   package: "name={{ item }} state=installed"
-  with_items:
-    - gettext-devel
-    - expat-devel
-    - curl-devel
-    - zlib-devel
-    - perl-devel
-    - openssl-devel
-    - subversion-perl
-    - make
-    - gcc
+  with_items: "{{ git_install_from_source_dependencies }}"
   when: ansible_os_family == 'RedHat'
 
 - name: Ensure git's dependencies are installed (Debian).
   apt: "name={{ item }} state=installed"
-  with_items:
-    - libcurl4-gnutls-dev
-    - libexpat1-dev
-    - gettext
-    - libssl-dev
-    - build-essential
-    - gcc
+  with_items: "{{ git_install_from_source_dependencies }}"
   when: ansible_os_family == 'Debian'
 
 - name: Get installed version
@@ -36,13 +41,15 @@
 - name: Force git install if the version numbers do not match
   set_fact:
     git_reinstall_from_source: true
-  when: 'git_install_from_source_force_update and (git_installed_version|success and (git_installed_version.stdout | regex_replace("^.*?([0-9\.]+)$", "\\1") | version_compare(git_version, operator="!=")))'
+  when:
+    - git_install_from_source_force_update
+    - (git_installed_version.rc == 0) and (git_installed_version.stdout | regex_replace("^.*?([0-9\.]+)$", "\\1") | version_compare(git_version, operator="!="))
 
 - name: Download git.
   get_url:
     url: "https://www.kernel.org/pub/software/scm/git/git-{{ git_version }}.tar.gz"
     dest: "{{ workspace }}/git-{{ git_version }}.tar.gz"
-  when:  git_installed_version|failed or git_reinstall_from_source
+  when: (git_installed_version.rc != 0) or git_reinstall_from_source
 
 - name: Expand git archive.
   unarchive:
@@ -50,7 +57,7 @@
     dest: "{{ workspace }}"
     creates: "{{ workspace }}/git-{{ git_version }}/README"
     copy: no
-  when:  git_installed_version|failed or git_reinstall_from_source
+  when: (git_installed_version.rc != 0) or git_reinstall_from_source
 
 - name: Build git.
   command: >
@@ -59,5 +66,5 @@
   with_items:
     - all
     - install
-  when:  git_installed_version|failed or git_reinstall_from_source
+  when: (git_installed_version.rc != 0) or git_reinstall_from_source
   become: yes
diff --git a/provisioning/roles/geerlingguy.git/tests/test-source.yml b/provisioning/roles/geerlingguy.git/tests/test-source.yml
index 207c48215..9d8f861f7 100644
--- a/provisioning/roles/geerlingguy.git/tests/test-source.yml
+++ b/provisioning/roles/geerlingguy.git/tests/test-source.yml
@@ -4,7 +4,7 @@
   vars:
     git_install_from_source: true
     git_install_from_source_force_update: true
-    git_version: 2.9.3
+    git_version: "2.16.1"
 
   pre_tasks:
     - name: Update apt cache.
diff --git a/provisioning/roles/geerlingguy.git/vars/Debian.yml b/provisioning/roles/geerlingguy.git/vars/Debian.yml
new file mode 100644
index 000000000..21dfef90c
--- /dev/null
+++ b/provisioning/roles/geerlingguy.git/vars/Debian.yml
@@ -0,0 +1,9 @@
+---
+git_install_from_source_dependencies:
+  - libcurl4-gnutls-dev
+  - libexpat1-dev
+  - gettext
+  - libssl-dev
+  - build-essential
+  - gcc
+
diff --git a/provisioning/roles/geerlingguy.git/vars/Fedora.yml b/provisioning/roles/geerlingguy.git/vars/Fedora.yml
new file mode 100644
index 000000000..5aeb81c0f
--- /dev/null
+++ b/provisioning/roles/geerlingguy.git/vars/Fedora.yml
@@ -0,0 +1,13 @@
+---
+git_install_from_source_dependencies:
+  - gettext-devel
+  - expat-devel
+  - curl-devel
+  - zlib-devel
+  - perl-devel
+  - openssl-devel
+  - subversion-perl
+  - make
+  - gcc
+  - tar
+
diff --git a/provisioning/roles/geerlingguy.git/vars/RedHat.yml b/provisioning/roles/geerlingguy.git/vars/RedHat.yml
new file mode 100644
index 000000000..d3a8d1ad2
--- /dev/null
+++ b/provisioning/roles/geerlingguy.git/vars/RedHat.yml
@@ -0,0 +1,12 @@
+---
+git_install_from_source_dependencies:
+  - gettext-devel
+  - expat-devel
+  - curl-devel
+  - zlib-devel
+  - perl-devel
+  - openssl-devel
+  - subversion-perl
+  - make
+  - gcc
+
diff --git a/provisioning/roles/geerlingguy.git/vars/main.yml b/provisioning/roles/geerlingguy.git/vars/main.yml
index 10e268ab3..a4b7c64f8 100644
--- a/provisioning/roles/geerlingguy.git/vars/main.yml
+++ b/provisioning/roles/geerlingguy.git/vars/main.yml
@@ -1,2 +1,3 @@
 ---
 # This space intentionally left blank.
+
diff --git a/provisioning/roles/geerlingguy.nodejs/tests/test-latest.yml b/provisioning/roles/geerlingguy.nodejs/tests/test-latest.yml
new file mode 100644
index 000000000..59044d851
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nodejs/tests/test-latest.yml
@@ -0,0 +1,21 @@
+---
+- hosts: all
+
+  vars:
+    nodejs_version: "8.x"
+    nodejs_install_npm_user: root
+    npm_config_prefix: /root/.npm-global
+    npm_config_unsafe_perm: "true"
+    nodejs_npm_global_packages:
+      - node-sass
+      - name: jslint
+        version: 0.9.6
+      - name: yo
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=yes cache_valid_time=600
+      when: ansible_os_family == 'Debian'
+
+  roles:
+    - role_under_test
diff --git a/provisioning/roles/geerlingguy.ruby/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.ruby/tasks/setup-Debian.yml
index da73a7ef0..04ab88d09 100644
--- a/provisioning/roles/geerlingguy.ruby/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.ruby/tasks/setup-Debian.yml
@@ -7,10 +7,13 @@
     ruby_rubygems_package_name: rubygems-integration
   when: ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'trusty'
 
-- name: Install ruby, rubygems, and build-essential.
+- name: Install ruby and other required dependencies.
   apt: "name={{ item }} state=present"
   with_items:
     - ruby-full
     - ruby-dev
     - "{{ ruby_rubygems_package_name }}"
     - build-essential
+    - autogen
+    - autoconf
+    - libtool

From 07c61f6c30501d603c53f77966a4d0769685fa57 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 8 Feb 2018 14:44:37 -0600
Subject: [PATCH 0944/1273] Update geerlingguy.apache-php-fpm role to latest
 version.

---
 provisioning/requirements.yml                 |  2 +-
 .../geerlingguy.apache-php-fpm/.travis.yml    | 41 ++++++++-----------
 .../roles/geerlingguy.apache-php-fpm/LICENSE  | 20 +++++++++
 .../geerlingguy.apache-php-fpm/README.md      | 32 ++++++++++-----
 .../geerlingguy.apache-php-fpm/meta/main.yml  |  7 +++-
 .../tasks/configure-Debian.yml                | 10 -----
 .../tasks/configure-RedHat.yml                |  7 ----
 .../geerlingguy.apache-php-fpm/tasks/main.yml | 15 ++++---
 .../tests/Dockerfile.centos-7                 | 27 ------------
 .../tests/Dockerfile.ubuntu-12.04             | 11 -----
 .../tests/Dockerfile.ubuntu-14.04             | 11 -----
 .../geerlingguy.apache-php-fpm/tests/test.yml | 10 ++---
 12 files changed, 78 insertions(+), 115 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.apache-php-fpm/LICENSE
 delete mode 100644 provisioning/roles/geerlingguy.apache-php-fpm/tasks/configure-Debian.yml
 delete mode 100644 provisioning/roles/geerlingguy.apache-php-fpm/tasks/configure-RedHat.yml
 delete mode 100644 provisioning/roles/geerlingguy.apache-php-fpm/tests/Dockerfile.centos-7
 delete mode 100644 provisioning/roles/geerlingguy.apache-php-fpm/tests/Dockerfile.ubuntu-12.04
 delete mode 100644 provisioning/roles/geerlingguy.apache-php-fpm/tests/Dockerfile.ubuntu-14.04

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 6cb4d6b3b..6a90f30ee 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -10,7 +10,7 @@
 - src: geerlingguy.apache
   version: 2.1.1
 - src: geerlingguy.apache-php-fpm
-  version: 1.0.2
+  version: 1.1.0
 - src: geerlingguy.blackfire
   version: 1.0.0
 - src: geerlingguy.composer
diff --git a/provisioning/roles/geerlingguy.apache-php-fpm/.travis.yml b/provisioning/roles/geerlingguy.apache-php-fpm/.travis.yml
index a74f40609..756cb37f3 100644
--- a/provisioning/roles/geerlingguy.apache-php-fpm/.travis.yml
+++ b/provisioning/roles/geerlingguy.apache-php-fpm/.travis.yml
@@ -1,53 +1,44 @@
 ---
-sudo: required
+services: docker
 
 env:
-  - distribution: centos
-    version: 7
+  - distro: centos7
     init: /usr/lib/systemd/systemd
     run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-  - distribution: ubuntu
-    version: 14.04
-    init: /sbin/init
-    run_opts: ""
-  - distribution: ubuntu
-    version: 12.04
+  - distro: ubuntu1604
+    init: /lib/systemd/systemd
+    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distro: ubuntu1404
     init: /sbin/init
     run_opts: ""
 
-services:
-  - docker
-
 before_install:
-  # Pull container
-  - 'sudo docker pull ${distribution}:${version}'
-  # Customize container
-  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+  # Pull container.
+  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
   - container_id=$(mktemp)
   # Run container in detached state.
-  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
 
   # Install required Galaxy roles.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-galaxy install geerlingguy.repo-remi geerlingguy.apache geerlingguy.php'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-galaxy install geerlingguy.repo-remi geerlingguy.apache geerlingguy.php'
 
   # Ansible syntax check.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
 
   # Test role.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+  - 'docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+  - 'docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
 
   # Test role idempotence.
+  - idempotence=$(mktemp)
+  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
   - >
-    sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml
+    tail ${idempotence}
     | grep -q 'changed=0.*failed=0'
     && (echo 'Idempotence test: pass' && exit 0)
     || (echo 'Idempotence test: fail' && exit 1)
 
-  # Clean up
-  - 'sudo docker stop "$(cat ${container_id})"'
-
 notifications:
    webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.apache-php-fpm/LICENSE b/provisioning/roles/geerlingguy.apache-php-fpm/LICENSE
new file mode 100644
index 000000000..4275cf3c1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache-php-fpm/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Jeff Geerling
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/provisioning/roles/geerlingguy.apache-php-fpm/README.md b/provisioning/roles/geerlingguy.apache-php-fpm/README.md
index 5591e6a41..23e7e7e8e 100644
--- a/provisioning/roles/geerlingguy.apache-php-fpm/README.md
+++ b/provisioning/roles/geerlingguy.apache-php-fpm/README.md
@@ -8,12 +8,6 @@ An Ansible Role that configures Apache for PHP-FPM usage on RHEL/CentOS and Debi
 
 This role is dependent upon `geerlingguy.apache`, and also requires you have PHP running with PHP-FPM somewhere on the server or elsewhere (I usually configure PHP with the `geerlingguy.php` role).
 
-Additionally, this role will only work correctly if you have Apache 2.4.9+ installed; on older versions of Debian/Ubuntu Linux (e.g. 12.04), you can add `ppa:ondrej/apache2` prior to Apache installation to install Apache 2.4, for example:
-
-    - name: Add repository for Apache 2.4 on Ubuntu 12.04.
-      apt_repository: repo='ppa:ondrej/apache2'
-      when: ansible_distribution_version == "12.04"
-
 When configuring your Apache virtual hosts, you can add the following line to any vhost definition to enable passthrough to PHP-FPM:
 
     # If using a TCP port:
@@ -24,6 +18,23 @@ When configuring your Apache virtual hosts, you can add the following line to an
 
 For a full usage example with the `geerlingguy.apache` role, see the Example Playbook later in this README.
 
+### RedHat 6 and 7
+
+RedHat/CentOS 7 automatically installs and enables mod_proxy_fcgi by default.
+
+RedHat/CentOS 6 installs Apache 2.2, and is much harder to get configured with FastCGI, but here are two guides in case you need to support this use case:
+
+  - [Apache 2.2 + mod_fastcgi](http://stackoverflow.com/a/21409702/100134)
+  - [Apache 2.4 + mod_proxy_fcgi](http://unix.stackexchange.com/a/138903/16194
+
+### Ubuntu < 14.04
+
+This role will only work correctly if you have Apache 2.4.9+ installed; on older versions of Debian/Ubuntu Linux (e.g. 12.04), you can add `ppa:ondrej/apache2` prior to Apache installation to install Apache 2.4, for example:
+
+    - name: Add repository for Apache 2.4 on Ubuntu 12.04.
+      apt_repository: repo='ppa:ondrej/apache2'
+      when: ansible_distribution_version == "12.04"
+
 ## Role Variables
 
 None.
@@ -37,6 +48,7 @@ None.
     - hosts: webservers
     
       vars:
+        php_enable_php_fpm: true
         apache_vhosts:
           - servername: "www.example.com"
             documentroot: "/var/www/example"
@@ -44,9 +56,9 @@ None.
                   ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://127.0.0.1:9000/var/www/example"
     
       roles:
-        - { role: geerlingguy.apache }
-        - { role: geerlingguy.php }
-        - { role: geerlingguy.apache-fastcgi-php }
+        - geerlingguy.apache
+        - geerlingguy.php
+        - geerlingguy.apache-php-fpm
 
 ## License
 
@@ -54,4 +66,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2016 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://www.ansiblefordevops.com/).
+This role was created in 2016 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](http://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.apache-php-fpm/meta/main.yml b/provisioning/roles/geerlingguy.apache-php-fpm/meta/main.yml
index 153a07bf0..c22187d59 100644
--- a/provisioning/roles/geerlingguy.apache-php-fpm/meta/main.yml
+++ b/provisioning/roles/geerlingguy.apache-php-fpm/meta/main.yml
@@ -7,7 +7,7 @@ galaxy_info:
   description: Apache 2.4+ PHP-FPM support for Linux.
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 1.4
+  min_ansible_version: 2.0
   platforms:
   - name: EL
     versions:
@@ -17,6 +17,7 @@ galaxy_info:
     versions:
     - wheezy
     - jessie
+    - stretch
   - name: Ubuntu
     versions:
     - precise
@@ -24,3 +25,7 @@ galaxy_info:
     - xenial
   galaxy_tags:
     - web
+    - apache
+    - php
+    - cgi
+    - php-fpm
diff --git a/provisioning/roles/geerlingguy.apache-php-fpm/tasks/configure-Debian.yml b/provisioning/roles/geerlingguy.apache-php-fpm/tasks/configure-Debian.yml
deleted file mode 100644
index f4eb185df..000000000
--- a/provisioning/roles/geerlingguy.apache-php-fpm/tasks/configure-Debian.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-- name: Enable mod_proxy_fcgi.
-  file:
-    src: "{{ apache_server_root }}/mods-available/{{ item }}"
-    dest: "{{ apache_server_root }}/mods-enabled/{{ item }}"
-    state: link
-  with_items:
-    - proxy.load
-    - proxy_fcgi.load
-  notify: restart apache
diff --git a/provisioning/roles/geerlingguy.apache-php-fpm/tasks/configure-RedHat.yml b/provisioning/roles/geerlingguy.apache-php-fpm/tasks/configure-RedHat.yml
deleted file mode 100644
index b42a7be4c..000000000
--- a/provisioning/roles/geerlingguy.apache-php-fpm/tasks/configure-RedHat.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-# RHEL/CentOS 7 automatically installs and enables mod_proxy_fcgi by default.
-
-# RHEL/CentOS 6 installs Apache 2.2... and is much harder to get configured with
-# FastCGI, but here are two guides:
-#   - Apache 2.2 + mod_fastcgi: http://stackoverflow.com/a/21409702/100134
-#   - Apache 2.4 + mod_proxy_fcgi: http://unix.stackexchange.com/a/138903/16194
diff --git a/provisioning/roles/geerlingguy.apache-php-fpm/tasks/main.yml b/provisioning/roles/geerlingguy.apache-php-fpm/tasks/main.yml
index 545b65d0c..5fbaa835c 100644
--- a/provisioning/roles/geerlingguy.apache-php-fpm/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.apache-php-fpm/tasks/main.yml
@@ -1,7 +1,12 @@
 ---
-# Configuration tasks.
-- include: configure-Debian.yml
+# For RedHat/CentOS, see notes in README.
+- name: Enable mod_proxy_fcgi.
+  file:
+    src: "{{ apache_server_root }}/mods-available/{{ item }}"
+    dest: "{{ apache_server_root }}/mods-enabled/{{ item }}"
+    state: link
+  with_items:
+    - proxy.load
+    - proxy_fcgi.load
+  notify: restart apache
   when: ansible_os_family == 'Debian'
-
-- include: configure-RedHat.yml
-  when: ansible_os_family == 'RedHat'
diff --git a/provisioning/roles/geerlingguy.apache-php-fpm/tests/Dockerfile.centos-7 b/provisioning/roles/geerlingguy.apache-php-fpm/tests/Dockerfile.centos-7
deleted file mode 100644
index 8aa065497..000000000
--- a/provisioning/roles/geerlingguy.apache-php-fpm/tests/Dockerfile.centos-7
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM centos:7
-
-# Install systemd -- See https://hub.docker.com/_/centos/
-RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
-RUN yum -y update; yum clean all; \
-(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
-rm -f /lib/systemd/system/multi-user.target.wants/*; \
-rm -f /etc/systemd/system/*.wants/*; \
-rm -f /lib/systemd/system/local-fs.target.wants/*; \
-rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
-rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
-rm -f /lib/systemd/system/basic.target.wants/*; \
-rm -f /lib/systemd/system/anaconda.target.wants/*;
-
-# Install Ansible
-RUN yum -y install epel-release
-RUN yum -y install git ansible sudo
-RUN yum clean all
-
-# Disable requiretty
-RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
-
-# Install Ansible inventory file
-RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
-
-VOLUME ["/sys/fs/cgroup"]
-CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.apache-php-fpm/tests/Dockerfile.ubuntu-12.04 b/provisioning/roles/geerlingguy.apache-php-fpm/tests/Dockerfile.ubuntu-12.04
deleted file mode 100644
index d0c130cdf..000000000
--- a/provisioning/roles/geerlingguy.apache-php-fpm/tests/Dockerfile.ubuntu-12.04
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM ubuntu:12.04
-RUN apt-get update
-
-# Install Ansible
-RUN apt-get install -y software-properties-common python-software-properties git
-RUN apt-add-repository -y ppa:ansible/ansible
-RUN apt-get update
-RUN apt-get install -y ansible
-
-# Install Ansible inventory file
-RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.apache-php-fpm/tests/Dockerfile.ubuntu-14.04 b/provisioning/roles/geerlingguy.apache-php-fpm/tests/Dockerfile.ubuntu-14.04
deleted file mode 100644
index ca332871f..000000000
--- a/provisioning/roles/geerlingguy.apache-php-fpm/tests/Dockerfile.ubuntu-14.04
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM ubuntu:14.04
-RUN apt-get update
-
-# Install Ansible
-RUN apt-get install -y software-properties-common git
-RUN apt-add-repository -y ppa:ansible/ansible
-RUN apt-get update
-RUN apt-get install -y ansible
-
-# Install Ansible inventory file
-RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.apache-php-fpm/tests/test.yml b/provisioning/roles/geerlingguy.apache-php-fpm/tests/test.yml
index 88f3d7caf..b72410ccf 100644
--- a/provisioning/roles/geerlingguy.apache-php-fpm/tests/test.yml
+++ b/provisioning/roles/geerlingguy.apache-php-fpm/tests/test.yml
@@ -11,13 +11,9 @@
         documentroot: "/var/www/vhosts/example_com"
 
   pre_tasks:
-    - name: Add repository for PHP 5.5 + Apache 2.4 on Ubuntu 12.04.
-      apt_repository: repo='ppa:ondrej/php5'
-      when: ansible_distribution_version == "12.04"
-
-    - name: Update apt cache on Ubuntu 12.04.
-      apt: update_cache=yes
-      when: ansible_distribution_version == "12.04"
+    - name: Add repository for PHP 7.
+      apt_repository: repo='ppa:ondrej/php'
+      when: ansible_distribution == 'Ubuntu' and ansible_distribution_version != '16.04'
 
   roles:
     - role: geerlingguy.repo-remi

From 63433a0a8b71373b802724e20b54240fd999abd9 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 15 Feb 2018 17:55:49 -0600
Subject: [PATCH 0945/1273] Update Solr role version to latest release.

---
 provisioning/requirements.yml                                   | 2 +-
 .../roles/geerlingguy.solr/templates/solr-init-Debian-pre5.j2   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 6a90f30ee..b4aa47f4b 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -76,6 +76,6 @@
 - src: geerlingguy.security
   version: 1.5.0
 - src: geerlingguy.solr
-  version: 4.0.0
+  version: 4.0.1
 - src: geerlingguy.varnish
   version: 2.1.1
diff --git a/provisioning/roles/geerlingguy.solr/templates/solr-init-Debian-pre5.j2 b/provisioning/roles/geerlingguy.solr/templates/solr-init-Debian-pre5.j2
index ff2704d5e..1dd40cf9d 100644
--- a/provisioning/roles/geerlingguy.solr/templates/solr-init-Debian-pre5.j2
+++ b/provisioning/roles/geerlingguy.solr/templates/solr-init-Debian-pre5.j2
@@ -25,7 +25,7 @@ LOG_FILE="{{ solr_log_file_path }}"
 start () {
     echo -n "Starting {{ solr_service_name }}... "
 
-    daemon --chdir="$SOLR_DIR" --command "$START_COMMAND" --respawn --output=$LOG_FILE --name={{ solr_service_name }}
+    daemon -U --chdir="$SOLR_DIR" --command "$START_COMMAND" --respawn --output=$LOG_FILE --name={{ solr_service_name }}
 
     RETVAL=$?
     if [ $RETVAL = 0 ]

From 46bb95f1a829cc2ed2119565ab21232e580214ed Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 17 Feb 2018 14:46:05 -0600
Subject: [PATCH 0946/1273] Upgrade geerlingguy.security role to latest
 version.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.security/.gitignore     |  2 +
 .../roles/geerlingguy.security/.travis.yml    | 41 +++++--------------
 .../roles/geerlingguy.security/LICENSE        | 20 +++++++++
 .../roles/geerlingguy.security/README.md      |  2 +-
 .../roles/geerlingguy.security/meta/main.yml  | 11 ++++-
 .../tasks/autoupdate-Debian.yml               |  2 +-
 .../tasks/autoupdate-RedHat.yml               |  2 +-
 .../tasks/fail2ban-Debian.yml                 |  2 +-
 .../tasks/fail2ban-RedHat.yml                 |  2 +-
 .../geerlingguy.security/tests/README.md      | 11 +++++
 .../roles/geerlingguy.security/tests/test.yml | 12 ++++--
 12 files changed, 68 insertions(+), 41 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.security/.gitignore
 create mode 100644 provisioning/roles/geerlingguy.security/LICENSE
 create mode 100644 provisioning/roles/geerlingguy.security/tests/README.md

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index b4aa47f4b..f423e68f3 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -74,7 +74,7 @@
 - src: geerlingguy.ruby
   version: 2.4.4
 - src: geerlingguy.security
-  version: 1.5.0
+  version: 1.6.0
 - src: geerlingguy.solr
   version: 4.0.1
 - src: geerlingguy.varnish
diff --git a/provisioning/roles/geerlingguy.security/.gitignore b/provisioning/roles/geerlingguy.security/.gitignore
new file mode 100644
index 000000000..c9b2377e3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.security/.gitignore
@@ -0,0 +1,2 @@
+*.retry
+tests/test.sh
diff --git a/provisioning/roles/geerlingguy.security/.travis.yml b/provisioning/roles/geerlingguy.security/.travis.yml
index f91967112..0af68829e 100644
--- a/provisioning/roles/geerlingguy.security/.travis.yml
+++ b/provisioning/roles/geerlingguy.security/.travis.yml
@@ -3,48 +3,27 @@ services: docker
 
 env:
   - distro: centos7
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
   - distro: centos6
-    init: /sbin/init
-    run_opts: ""
   - distro: ubuntu1604
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
   - distro: ubuntu1404
-    init: /sbin/init
-    run_opts: ""
   - distro: debian8
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-
-before_install:
-  # Pull container.
-  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
+  - distro: fedora24
 
 script:
-  - container_id=$(mktemp)
-  # Run container in detached state.
-  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
-
-  # Ansible syntax check.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+  # Configure test script so we can run extra tests after playbook is run.
+  - export container_id=$(date +%s)
+  - export cleanup=false
 
-  # Test role.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+  # Download test shim.
+  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
+  - chmod +x ${PWD}/tests/test.sh
 
-  # Test role idempotence.
-  - idempotence=$(mktemp)
-  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
-  - >
-    tail ${idempotence}
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
+  # Run tests.
+  - ${PWD}/tests/test.sh
 
   # Make sure fail2ban process is running.
   - >
-    sudo docker exec "$(cat ${container_id})" ps -ax | grep -q 'fail2ban'
+    sudo docker exec ${container_id} ps -ax | grep -q 'fail2ban'
     && (echo 'fail2ban is on: pass' && exit 0)
     || (echo 'fail2ban is on: fail' && exit 1)
 
diff --git a/provisioning/roles/geerlingguy.security/LICENSE b/provisioning/roles/geerlingguy.security/LICENSE
new file mode 100644
index 000000000..4275cf3c1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.security/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Jeff Geerling
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/provisioning/roles/geerlingguy.security/README.md b/provisioning/roles/geerlingguy.security/README.md
index 26062b653..29084f14b 100644
--- a/provisioning/roles/geerlingguy.security/README.md
+++ b/provisioning/roles/geerlingguy.security/README.md
@@ -86,4 +86,4 @@ MIT (Expat) / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.security/meta/main.yml b/provisioning/roles/geerlingguy.security/meta/main.yml
index 1d1ffaf16..f80c938e7 100644
--- a/provisioning/roles/geerlingguy.security/meta/main.yml
+++ b/provisioning/roles/geerlingguy.security/meta/main.yml
@@ -6,11 +6,14 @@ galaxy_info:
   description: Security software installation and configuration.
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 1.9
+  min_ansible_version: 2.0
   platforms:
     - name: EL
       versions:
       - all
+    - name: Fedora
+      versions:
+      - all
     - name: Debian
       versions:
       - all
@@ -20,3 +23,9 @@ galaxy_info:
   galaxy_tags:
     - system
     - security
+    - fail2ban
+    - automatic-updates
+    - yum
+    - apt
+    - dnf
+    - hardening
diff --git a/provisioning/roles/geerlingguy.security/tasks/autoupdate-Debian.yml b/provisioning/roles/geerlingguy.security/tasks/autoupdate-Debian.yml
index 784e2c682..4071475d9 100644
--- a/provisioning/roles/geerlingguy.security/tasks/autoupdate-Debian.yml
+++ b/provisioning/roles/geerlingguy.security/tasks/autoupdate-Debian.yml
@@ -1,6 +1,6 @@
 ---
 - name: Install unattended upgrades package.
-  apt: name=unattended-upgrades state=present
+  package: name=unattended-upgrades state=present
 
 - name: Copy unattended-upgrades configuration files in place.
   template:
diff --git a/provisioning/roles/geerlingguy.security/tasks/autoupdate-RedHat.yml b/provisioning/roles/geerlingguy.security/tasks/autoupdate-RedHat.yml
index 3e7a0a2de..c69f10565 100644
--- a/provisioning/roles/geerlingguy.security/tasks/autoupdate-RedHat.yml
+++ b/provisioning/roles/geerlingguy.security/tasks/autoupdate-RedHat.yml
@@ -1,6 +1,6 @@
 ---
 - name: Install yum-cron.
-  yum: name=yum-cron state=present
+  package: name=yum-cron state=present
 
 - name: Ensure yum-cron is running and enabled on boot.
   service: name=yum-cron state=started enabled=yes
diff --git a/provisioning/roles/geerlingguy.security/tasks/fail2ban-Debian.yml b/provisioning/roles/geerlingguy.security/tasks/fail2ban-Debian.yml
index 238c1a286..ae644edfc 100644
--- a/provisioning/roles/geerlingguy.security/tasks/fail2ban-Debian.yml
+++ b/provisioning/roles/geerlingguy.security/tasks/fail2ban-Debian.yml
@@ -1,3 +1,3 @@
 ---
 - name: Install fail2ban.
-  apt: name=fail2ban state=present
+  package: name=fail2ban state=present
diff --git a/provisioning/roles/geerlingguy.security/tasks/fail2ban-RedHat.yml b/provisioning/roles/geerlingguy.security/tasks/fail2ban-RedHat.yml
index 4f49ddea4..f725c8437 100644
--- a/provisioning/roles/geerlingguy.security/tasks/fail2ban-RedHat.yml
+++ b/provisioning/roles/geerlingguy.security/tasks/fail2ban-RedHat.yml
@@ -1,3 +1,3 @@
 ---
 - name: Install fail2ban.
-  yum: name=fail2ban state=present enablerepo=epel
+  package: name=fail2ban state=present enablerepo=epel
diff --git a/provisioning/roles/geerlingguy.security/tests/README.md b/provisioning/roles/geerlingguy.security/tests/README.md
new file mode 100644
index 000000000..6fb211721
--- /dev/null
+++ b/provisioning/roles/geerlingguy.security/tests/README.md
@@ -0,0 +1,11 @@
+# Ansible Role tests
+
+To run the test playbook(s) in this directory:
+
+  1. Install and start Docker.
+  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
+    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
+  1. Make the test shim executable: `chmod +x tests/test.sh`.
+  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
+
+If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.security/tests/test.yml b/provisioning/roles/geerlingguy.security/tests/test.yml
index 17bfdbad6..7a290daed 100644
--- a/provisioning/roles/geerlingguy.security/tests/test.yml
+++ b/provisioning/roles/geerlingguy.security/tests/test.yml
@@ -2,18 +2,24 @@
 
   pre_tasks:
     - name: Update apt cache.
-      apt: update_cache=yes cache_valid_time=600
+      package: update_cache=yes cache_valid_time=600
       when: ansible_os_family == 'Debian'
 
     - name: Ensure build dependencies are installed (RedHat).
-      yum: 'name="{{ item }}" state=present'
+      package: 'name="{{ item }}" state=present'
       with_items:
         - openssh-server
         - openssh-clients
       when: ansible_os_family == 'RedHat'
 
+    - name: Ensure build dependencies are installed (Fedora).
+      package: 'name="{{ item }}" state=present'
+      with_items:
+        - procps
+      when: ansible_distribution == 'Fedora'
+
     - name: Ensure build dependencies are installed (Debian).
-      apt: 'name="{{ item }}" state=present'
+      package: 'name="{{ item }}" state=present'
       with_items:
         - openssh-server
         - openssh-client

From 2432f60bbc0fc05bc28b05eb05ab137ec771bcea Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 18 Feb 2018 10:57:07 -0600
Subject: [PATCH 0947/1273] Upgrade Java role to latest version to support
 Debian 9 better.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.java/.gitignore         |  2 +
 .../roles/geerlingguy.java/.travis.yml        | 47 +++++--------------
 provisioning/roles/geerlingguy.java/LICENSE   | 20 ++++++++
 .../roles/geerlingguy.java/meta/main.yml      |  8 +++-
 .../roles/geerlingguy.java/tasks/main.yml     | 10 ++--
 .../roles/geerlingguy.java/tests/README.md    | 11 +++++
 .../vars/{Debian.yml => Debian-8.yml}         |  0
 .../roles/geerlingguy.java/vars/Debian-9.yml  |  6 +++
 .../vars/{Ubuntu-12.04.yml => Ubuntu-12.yml}  |  0
 .../vars/{Ubuntu-14.04.yml => Ubuntu-14.yml}  |  0
 .../vars/{Ubuntu-16.04.yml => Ubuntu-16.yml}  |  0
 12 files changed, 64 insertions(+), 42 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.java/.gitignore
 create mode 100644 provisioning/roles/geerlingguy.java/LICENSE
 create mode 100644 provisioning/roles/geerlingguy.java/tests/README.md
 rename provisioning/roles/geerlingguy.java/vars/{Debian.yml => Debian-8.yml} (100%)
 create mode 100644 provisioning/roles/geerlingguy.java/vars/Debian-9.yml
 rename provisioning/roles/geerlingguy.java/vars/{Ubuntu-12.04.yml => Ubuntu-12.yml} (100%)
 rename provisioning/roles/geerlingguy.java/vars/{Ubuntu-14.04.yml => Ubuntu-14.yml} (100%)
 rename provisioning/roles/geerlingguy.java/vars/{Ubuntu-16.04.yml => Ubuntu-16.yml} (100%)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index f423e68f3..7b831c7e9 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -30,7 +30,7 @@
 - src: geerlingguy.git
   version: 1.4.1
 - src: geerlingguy.java
-  version: 1.7.4
+  version: 1.7.6
 - src: geerlingguy.mailhog
   version: 2.1.3
 - src: geerlingguy.memcached
diff --git a/provisioning/roles/geerlingguy.java/.gitignore b/provisioning/roles/geerlingguy.java/.gitignore
new file mode 100644
index 000000000..c9b2377e3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.java/.gitignore
@@ -0,0 +1,2 @@
+*.retry
+tests/test.sh
diff --git a/provisioning/roles/geerlingguy.java/.travis.yml b/provisioning/roles/geerlingguy.java/.travis.yml
index f8a882fa0..0222cdc8f 100644
--- a/provisioning/roles/geerlingguy.java/.travis.yml
+++ b/provisioning/roles/geerlingguy.java/.travis.yml
@@ -3,53 +3,28 @@ services: docker
 
 env:
   - distro: centos7
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
   - distro: centos6
-    init: /sbin/init
-    run_opts: ""
-  - distro: fedora24
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distro: fedora27
   - distro: ubuntu1604
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
   - distro: ubuntu1404
-    init: /sbin/init
-    run_opts: ""
   - distro: ubuntu1204
-    init: /sbin/init
-    run_opts: ""
+  - distro: debian9
   - distro: debian8
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-
-before_install:
-  # Pull container.
-  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
-  - container_id=$(mktemp)
-  # Run container in detached state.
-  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
-
-  # Ansible syntax check.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+  # Configure test script so we can run extra tests after playbook is run.
+  - export container_id=$(date +%s)
+  - export cleanup=false
 
-  # Test role.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+  # Download test shim.
+  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
+  - chmod +x ${PWD}/tests/test.sh
 
-  # Test role idempotence.
-  - idempotence=$(mktemp)
-  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
-  - >
-    tail ${idempotence}
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
+  # Run tests.
+  - ${PWD}/tests/test.sh
 
   # Ensure Java is installed.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm which java'
+  - 'docker exec --tty ${container_id} env TERM=xterm which java'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.java/LICENSE b/provisioning/roles/geerlingguy.java/LICENSE
new file mode 100644
index 000000000..4275cf3c1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.java/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Jeff Geerling
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/provisioning/roles/geerlingguy.java/meta/main.yml b/provisioning/roles/geerlingguy.java/meta/main.yml
index d20d1243c..a10555cee 100644
--- a/provisioning/roles/geerlingguy.java/meta/main.yml
+++ b/provisioning/roles/geerlingguy.java/meta/main.yml
@@ -17,7 +17,9 @@ galaxy_info:
       - all
     - name: Debian
       versions:
-      - all
+      - wheezy
+      - jessie
+      - stretch
     - name: Ubuntu
       versions:
       - all
@@ -28,3 +30,7 @@ galaxy_info:
     - development
     - system
     - web
+    - java
+    - jdk
+    - openjdk
+    - oracle
diff --git a/provisioning/roles/geerlingguy.java/tasks/main.yml b/provisioning/roles/geerlingguy.java/tasks/main.yml
index 5fa557855..d620f595b 100644
--- a/provisioning/roles/geerlingguy.java/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.java/tasks/main.yml
@@ -1,15 +1,17 @@
 ---
 - name: Include OS-specific variables.
   include_vars: "{{ ansible_os_family }}.yml"
-  when: ansible_distribution != 'Ubuntu' or ansible_distribution != 'Fedora'
+  when:
+    - ansible_os_family != 'Debian'
+    - ansible_distribution != 'Fedora'
 
 - name: Include OS-specific variables for Fedora.
   include_vars: "{{ ansible_distribution }}.yml"
   when: ansible_distribution == 'Fedora'
 
-- name: Include version-specific variables for Ubuntu.
-  include_vars: "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yml"
-  when: ansible_distribution == 'Ubuntu'
+- name: Include version-specific variables for Debian.
+  include_vars: "{{ ansible_distribution }}-{{ ansible_distribution_version.split('.')[0] }}.yml"
+  when: ansible_os_family == 'Debian'
 
 - name: Define java_packages.
   set_fact:
diff --git a/provisioning/roles/geerlingguy.java/tests/README.md b/provisioning/roles/geerlingguy.java/tests/README.md
new file mode 100644
index 000000000..6fb211721
--- /dev/null
+++ b/provisioning/roles/geerlingguy.java/tests/README.md
@@ -0,0 +1,11 @@
+# Ansible Role tests
+
+To run the test playbook(s) in this directory:
+
+  1. Install and start Docker.
+  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
+    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
+  1. Make the test shim executable: `chmod +x tests/test.sh`.
+  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
+
+If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.java/vars/Debian.yml b/provisioning/roles/geerlingguy.java/vars/Debian-8.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.java/vars/Debian.yml
rename to provisioning/roles/geerlingguy.java/vars/Debian-8.yml
diff --git a/provisioning/roles/geerlingguy.java/vars/Debian-9.yml b/provisioning/roles/geerlingguy.java/vars/Debian-9.yml
new file mode 100644
index 000000000..17e49bf36
--- /dev/null
+++ b/provisioning/roles/geerlingguy.java/vars/Debian-9.yml
@@ -0,0 +1,6 @@
+---
+# JDK version options include:
+#   - java
+#   - openjdk-8-jdk
+__java_packages:
+  - openjdk-8-jdk
diff --git a/provisioning/roles/geerlingguy.java/vars/Ubuntu-12.04.yml b/provisioning/roles/geerlingguy.java/vars/Ubuntu-12.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.java/vars/Ubuntu-12.04.yml
rename to provisioning/roles/geerlingguy.java/vars/Ubuntu-12.yml
diff --git a/provisioning/roles/geerlingguy.java/vars/Ubuntu-14.04.yml b/provisioning/roles/geerlingguy.java/vars/Ubuntu-14.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.java/vars/Ubuntu-14.04.yml
rename to provisioning/roles/geerlingguy.java/vars/Ubuntu-14.yml
diff --git a/provisioning/roles/geerlingguy.java/vars/Ubuntu-16.04.yml b/provisioning/roles/geerlingguy.java/vars/Ubuntu-16.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.java/vars/Ubuntu-16.04.yml
rename to provisioning/roles/geerlingguy.java/vars/Ubuntu-16.yml

From 5784a0cf9cfd514c9bd01edf1e8ed7798be6660e Mon Sep 17 00:00:00 2001
From: Keith Bremner <kmbremner@gmail.com>
Date: Tue, 27 Feb 2018 11:11:00 +0000
Subject: [PATCH 0948/1273] Selenium paths value needs to be quoted

With behat 3.4.3, the example config gives the following error on behat --init:

The reserved indicator "%" cannot start a plain scalar; you need to quote the scalar at line 4 (near "paths: [ %paths.base%/features/web ]").

This is fixed by quoting the paths value.
---
 docs/extras/selenium.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/extras/selenium.md b/docs/extras/selenium.md
index 0369d9309..80f725b14 100644
--- a/docs/extras/selenium.md
+++ b/docs/extras/selenium.md
@@ -34,7 +34,7 @@ Using the default Drupal site as an example (it's installed in `/var/www/drupalv
         default:
           suites:
             web_features:
-              paths: [ %paths.base%/features/web ]
+              paths: [ "%paths.base%/features/web" ]
               contexts:
                 - WebContext
                 - Drupal\DrupalExtension\Context\DrupalContext

From 8c0f5d64e3b785797b8b769466c72eb928dde352 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 1 Mar 2018 14:41:13 -0600
Subject: [PATCH 0949/1273] Fixes #1704: Ansible version check is done on host
 even when force_ansible_local is true.

---
 Vagrantfile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 515fc4cb4..f51da2653 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -31,13 +31,15 @@ provisioner = vconfig['force_ansible_local'] ? :ansible_local : vagrant_provisio
 if provisioner == :ansible
   playbook = "#{host_drupalvm_dir}/provisioning/playbook.yml"
   config_dir = host_config_dir
+
+  # Verify Ansible version requirement.
+  require_ansible_version ">= #{vconfig['drupalvm_ansible_version_min']}"
 else
   playbook = "#{guest_drupalvm_dir}/provisioning/playbook.yml"
   config_dir = guest_config_dir
 end
 
-# Verify version requirements.
-require_ansible_version ">= #{vconfig['drupalvm_ansible_version_min']}"
+# Verify Vagrant version requirement.
 Vagrant.require_version ">= #{vconfig['drupalvm_vagrant_version_min']}"
 
 ensure_plugins(vconfig['vagrant_plugins'])

From 50300e4b63714de47b7a51660f68443e53502e7b Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 1 Mar 2018 16:45:49 -0600
Subject: [PATCH 0950/1273] Fixes #1692: Fix the install-drupal command on the
 Docker image.

---
 README.md                              |  9 ++++++++-
 docs/other/docker.md                   |  4 ++--
 provisioning/docker/bin/install-drupal | 16 ++++++++--------
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 675dca56d..2f1554516 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,14 @@
 
 Drupal VM makes building Drupal development environments quick and easy, and introduces developers to the wonderful world of Drupal development on virtual machines or Docker containers (instead of crufty old MAMP/WAMP-based development).
 
-It will install the following on an Ubuntu 16.04 (by default) linux VM:
+There are two ways you can use Drupal VM:
+
+  1. With Vagrant and VirtualBox.
+  2. With Docker.
+
+The rest of this README assumes you're using Vagrant and VirtualBox (this is currently the most flexible and widely-used method of using Drupal VM). If you'd like to use Drupal VM with Docker, please read the [Drupal VM Docker documentation](http://docs.drupalvm.com/en/latest/other/docker/).
+
+Drupal VM installs the following on an Ubuntu 16.04 (by default) linux VM:
 
   - Apache 2.4.x (or Nginx)
   - PHP 7.1.x (configurable)
diff --git a/docs/other/docker.md b/docs/other/docker.md
index d733fcbfb..76f0af810 100644
--- a/docs/other/docker.md
+++ b/docs/other/docker.md
@@ -28,11 +28,11 @@ You can also add other subdomains if you're using other built-in services, e.g.
 If you just want a quick, easy Drupal site for testing, you can run an instance of Drupal VM and install Drupal inside using the provided script.
 
   1. Run an instance of Drupal VM: `docker run -d -p 80:80 -p 443:443 --name=drupalvm --privileged geerlingguy/drupal-vm`
-  2. Install Drupal on this instance: `docker exec drupalvm install-drupal` (you can choose a version using `install-drupal [version]`, using versions like `8.4.x`, `7.55`, `7.x`, etc.).
+  2. Install Drupal on this instance: `docker exec drupalvm install-drupal` (you can choose a version using `install-drupal [version]`, using versions like `8.x-dev` or `7.x-dev`).
 
 You should be able to access the Drupal site at `http://localhost`. If you need to share a host directory into the VM, you can do so by adding another `-v` parameter, like `-v /path/on/host:/path/in/container.
 
-If you only need a simple container to run your site, and you want to package up the container configuration with your project, you can add a simple Docker Compose file to your project's docroot like the following:
+If you only need a container to run your site, and you want to package up the container configuration with your project, you can add a Docker Compose file to your project's docroot like the following:
 
     ```yaml
     version: "3"
diff --git a/provisioning/docker/bin/install-drupal b/provisioning/docker/bin/install-drupal
index 9efaad8b5..ef2637f0f 100755
--- a/provisioning/docker/bin/install-drupal
+++ b/provisioning/docker/bin/install-drupal
@@ -4,27 +4,27 @@
 #
 # Usage:
 #   install-drupal [version]
-# [version] is optional, defaults to 8.4.x. Try 7.x, 7.55, 8.5.x, 8.3.2, etc.
+# [version] is optional, defaults to 8.x-dev. Can switch to 7.x-dev if needed.
 
 # Exit on any individual command failure.
 set -e
 
 # Setup.
-DRUPAL_VERSION="${1:-8.4.x}"
-PROJECT_PATH='/var/www/drupalvm/drupal'
+DRUPAL_VERSION="${1:-8.x-dev}"
+PROJECT_PATH='/var/www/drupalvm'
 
 # Create Drupal project directory.
 mkdir -p $PROJECT_PATH
 
-# Download Drupal with Drush.
+# Create a Drupal project.
 echo "Downloading Drupal $DRUPAL_VERSION"
-drush dl drupal-$DRUPAL_VERSION \
-  --destination=$PROJECT_PATH \
-  --drupal-project-rename=web
+cd $PROJECT_PATH
+COMPOSER_ALLOW_SUPERUSER=1 composer create-project drupal-composer/drupal-project:$DRUPAL_VERSION drupal --stability dev --no-interaction
 
 # Install Drupal with Drush.
 echo "Installing Drupal"
-drush si standard --root=$PROJECT_PATH/web -y \
+cd drupal/web
+drush si standard --root=$PROJECT_PATH/drupal/web -y \
   --db-url='mysql://drupal:drupal@localhost/drupal' \
   --site-name='Drupal VM' \
   --account-name=admin --account-pass=admin

From 1f2bc935d792fca5350803d0d96cfb033a02c29b Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 1 Mar 2018 17:32:39 -0600
Subject: [PATCH 0951/1273] Fixes #1701: Ansible version is TOO DARN LOW

---
 README.md                                                   | 2 +-
 default.config.yml                                          | 2 +-
 provisioning/requirements.yml                               | 2 +-
 provisioning/roles/geerlingguy.git/.travis.yml              | 6 +++---
 provisioning/roles/geerlingguy.git/meta/main.yml            | 2 +-
 .../roles/geerlingguy.git/tasks/install-from-source.yml     | 4 ++--
 provisioning/roles/geerlingguy.git/tasks/main.yml           | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 2f1554516..8b0f7dd97 100644
--- a/README.md
+++ b/README.md
@@ -81,7 +81,7 @@ Notes:
   - **For faster provisioning** (macOS/Linux only): *[Install Ansible](http://docs.ansible.com/intro_installation.html) on your host machine, so Drupal VM can run the provisioning steps locally instead of inside the VM.*
   - **For stability**: Because every version of VirtualBox introduces changes to networking, for the best stability, you should install Vagrant's `vbguest` plugin: `vagrant plugin install vagrant-vbguest`.
   - **NFS on Linux**: *If NFS is not already installed on your host, you will need to install it to use the default NFS synced folder configuration. See guides for [Debian/Ubuntu](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-ubuntu-14-04), [Arch](https://wiki.archlinux.org/index.php/NFS#Installation), and [RHEL/CentOS](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-centos-6).*
-  - **Versions**: *Make sure you're running the latest releases of Vagrant, VirtualBox, and Ansible—as of late 2016, Drupal VM recommends: Vagrant 1.8.6, VirtualBox 5.1.10+, and Ansible 2.2.x*
+  - **Versions**: *Make sure you're running the latest releases of Vagrant, VirtualBox, and Ansible—as of early 2018, Drupal VM recommends: Vagrant 2.0.x, VirtualBox 5.2.x, and Ansible 2.4.x*
 
 ### 2 - Build the Virtual Machine
 
diff --git a/default.config.yml b/default.config.yml
index a96dc5369..d929a1fd8 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -47,7 +47,7 @@ vagrant_plugins:
 
 # Minimum required versions.
 drupalvm_vagrant_version_min: '1.8.6'
-drupalvm_ansible_version_min: '2.2'
+drupalvm_ansible_version_min: '2.4'
 
 # Force use of ansible_local provisioner, even if Ansible is installed on host.
 force_ansible_local: false
diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 7b831c7e9..5fa02dc80 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -28,7 +28,7 @@
 - src: geerlingguy.firewall
   version: 2.3.0
 - src: geerlingguy.git
-  version: 1.4.1
+  version: 2.0.0
 - src: geerlingguy.java
   version: 1.7.6
 - src: geerlingguy.mailhog
diff --git a/provisioning/roles/geerlingguy.git/.travis.yml b/provisioning/roles/geerlingguy.git/.travis.yml
index fdc22815e..eb6a85d72 100644
--- a/provisioning/roles/geerlingguy.git/.travis.yml
+++ b/provisioning/roles/geerlingguy.git/.travis.yml
@@ -6,7 +6,7 @@ env:
   - distro: centos7
     playbook: test-source.yml
     GIT_VERSION: 2.16.1
-  - distro: fedora24
+  - distro: fedora27
     playbook: test-source.yml
     GIT_VERSION: 2.16.1
   - distro: ubuntu1604
@@ -20,9 +20,9 @@ env:
   - distro: centos6
     playbook: test.yml
     GIT_VERSION: 1.7.1
-  - distro: fedora24
+  - distro: fedora27
     playbook: test.yml
-    GIT_VERSION: 2.7.5
+    GIT_VERSION: 2.14.3
   - distro: ubuntu1604
     playbook: test.yml
     GIT_VERSION: 2.7.4
diff --git a/provisioning/roles/geerlingguy.git/meta/main.yml b/provisioning/roles/geerlingguy.git/meta/main.yml
index 0c0174032..02fc294b2 100644
--- a/provisioning/roles/geerlingguy.git/meta/main.yml
+++ b/provisioning/roles/geerlingguy.git/meta/main.yml
@@ -6,7 +6,7 @@ galaxy_info:
   description: Git version control software
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 2.2
+  min_ansible_version: 2.4
   platforms:
   - name: EL
     versions:
diff --git a/provisioning/roles/geerlingguy.git/tasks/install-from-source.yml b/provisioning/roles/geerlingguy.git/tasks/install-from-source.yml
index 58db1a094..e2fe77835 100644
--- a/provisioning/roles/geerlingguy.git/tasks/install-from-source.yml
+++ b/provisioning/roles/geerlingguy.git/tasks/install-from-source.yml
@@ -29,7 +29,7 @@
   with_items: "{{ git_install_from_source_dependencies }}"
   when: ansible_os_family == 'Debian'
 
-- name: Get installed version
+- name: Get installed version.
   command: >
     git --version
     warn=no
@@ -38,7 +38,7 @@
   check_mode: no
   register: git_installed_version
 
-- name: Force git install if the version numbers do not match
+- name: Force git install if the version numbers do not match.
   set_fact:
     git_reinstall_from_source: true
   when:
diff --git a/provisioning/roles/geerlingguy.git/tasks/main.yml b/provisioning/roles/geerlingguy.git/tasks/main.yml
index d829b1c75..8cffb9d92 100644
--- a/provisioning/roles/geerlingguy.git/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.git/tasks/main.yml
@@ -19,5 +19,5 @@
   when: (git_install_from_source == false) and (ansible_os_family == 'Debian')
 
 # Install git from source when git_install_from_source is true.
-- include: install-from-source.yml
+- import_tasks: install-from-source.yml
   when: git_install_from_source == true

From 96f32694afe1856dfbc39c7002cdeeef844882f4 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 9 Mar 2018 15:23:27 -0600
Subject: [PATCH 0952/1273] Upgrade geerlingguy.git to the latest version.

---
 provisioning/requirements.yml                      |  2 +-
 provisioning/roles/geerlingguy.git/.travis.yml     | 14 +++++++-------
 provisioning/roles/geerlingguy.git/README.md       |  2 +-
 .../roles/geerlingguy.git/defaults/main.yml        |  2 +-
 provisioning/roles/geerlingguy.git/meta/main.yml   |  4 ++++
 .../roles/geerlingguy.git/tests/test-source.yml    |  2 +-
 provisioning/roles/geerlingguy.git/vars/Debian.yml |  1 +
 7 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 5fa02dc80..6960921fd 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -28,7 +28,7 @@
 - src: geerlingguy.firewall
   version: 2.3.0
 - src: geerlingguy.git
-  version: 2.0.0
+  version: 2.0.1
 - src: geerlingguy.java
   version: 1.7.6
 - src: geerlingguy.mailhog
diff --git a/provisioning/roles/geerlingguy.git/.travis.yml b/provisioning/roles/geerlingguy.git/.travis.yml
index eb6a85d72..ea385e7e0 100644
--- a/provisioning/roles/geerlingguy.git/.travis.yml
+++ b/provisioning/roles/geerlingguy.git/.travis.yml
@@ -5,13 +5,13 @@ env:
   # Test source install on latest supported OSes.
   - distro: centos7
     playbook: test-source.yml
-    GIT_VERSION: 2.16.1
+    GIT_VERSION: 2.16.2
   - distro: fedora27
     playbook: test-source.yml
-    GIT_VERSION: 2.16.1
-  - distro: ubuntu1604
+    GIT_VERSION: 2.16.2
+  - distro: ubuntu1804
     playbook: test-source.yml
-    GIT_VERSION: 2.16.1
+    GIT_VERSION: 2.16.2
 
   # Test package install on all supported OSes.
   - distro: centos7
@@ -23,15 +23,15 @@ env:
   - distro: fedora27
     playbook: test.yml
     GIT_VERSION: 2.14.3
+  - distro: ubuntu1804
+    playbook: test.yml
+    GIT_VERSION: 2.15.1
   - distro: ubuntu1604
     playbook: test.yml
     GIT_VERSION: 2.7.4
   - distro: ubuntu1404
     playbook: test.yml
     GIT_VERSION: 1.9.1
-  - distro: ubuntu1204
-    playbook: test.yml
-    GIT_VERSION: 1.7.9.5
   - distro: debian8
     playbook: test.yml
     GIT_VERSION: 2.1.4
diff --git a/provisioning/roles/geerlingguy.git/README.md b/provisioning/roles/geerlingguy.git/README.md
index 97f950a7c..d1eb74df3 100644
--- a/provisioning/roles/geerlingguy.git/README.md
+++ b/provisioning/roles/geerlingguy.git/README.md
@@ -28,7 +28,7 @@ The specific Git packages that will be installed. By default, `git-svn` is inclu
 
     git_install_from_source: false
     git_install_path: "/usr"
-    git_version: "2.16.1"
+    git_version: "2.16.2"
 
 Whether to install Git from source; if set to `true`, `git_version` is required and will be used to install a particular version of git (see all available versions here: https://www.kernel.org/pub/software/scm/git/), and `git_install_path` defines where git should be installed.
 
diff --git a/provisioning/roles/geerlingguy.git/defaults/main.yml b/provisioning/roles/geerlingguy.git/defaults/main.yml
index 28c721622..d01f33254 100644
--- a/provisioning/roles/geerlingguy.git/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.git/defaults/main.yml
@@ -13,7 +13,7 @@ git_packages:
 # the 'git_version' variable instead of using a package.
 git_install_from_source: false
 git_install_path: "/usr"
-git_version: "2.16.1"
+git_version: "2.16.2"
 
 # If git is already installed at and older version, force a new source build.
 # Only applies if git_install_from_source is `true`.
diff --git a/provisioning/roles/geerlingguy.git/meta/main.yml b/provisioning/roles/geerlingguy.git/meta/main.yml
index 02fc294b2..716e52633 100644
--- a/provisioning/roles/geerlingguy.git/meta/main.yml
+++ b/provisioning/roles/geerlingguy.git/meta/main.yml
@@ -23,3 +23,7 @@ galaxy_info:
   galaxy_tags:
     - development
     - system
+    - git
+    - vcs
+    - source
+    - code
diff --git a/provisioning/roles/geerlingguy.git/tests/test-source.yml b/provisioning/roles/geerlingguy.git/tests/test-source.yml
index 9d8f861f7..5e71ecda0 100644
--- a/provisioning/roles/geerlingguy.git/tests/test-source.yml
+++ b/provisioning/roles/geerlingguy.git/tests/test-source.yml
@@ -4,7 +4,7 @@
   vars:
     git_install_from_source: true
     git_install_from_source_force_update: true
-    git_version: "2.16.1"
+    git_version: "2.16.2"
 
   pre_tasks:
     - name: Update apt cache.
diff --git a/provisioning/roles/geerlingguy.git/vars/Debian.yml b/provisioning/roles/geerlingguy.git/vars/Debian.yml
index 21dfef90c..66316d876 100644
--- a/provisioning/roles/geerlingguy.git/vars/Debian.yml
+++ b/provisioning/roles/geerlingguy.git/vars/Debian.yml
@@ -4,6 +4,7 @@ git_install_from_source_dependencies:
   - libexpat1-dev
   - gettext
   - libssl-dev
+  - zlib1g-dev
   - build-essential
   - gcc
 

From f9e36c33be4ef0f47e131b8c4bd4334d21977cf0 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 10 Mar 2018 11:19:31 -0600
Subject: [PATCH 0953/1273] Update geerlingguy.php role to latest version.

---
 provisioning/requirements.yml                      | 2 +-
 provisioning/roles/geerlingguy.php/.travis.yml     | 7 +++++--
 provisioning/roles/geerlingguy.php/vars/Debian.yml | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 6960921fd..4f165bebb 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -42,7 +42,7 @@
 - src: geerlingguy.nodejs
   version: 4.1.2
 - src: geerlingguy.php
-  version: 3.5.0
+  version: 3.5.1
 - src: geerlingguy.php-memcached
   version: 2.0.0
 - src: geerlingguy.php-mysql
diff --git a/provisioning/roles/geerlingguy.php/.travis.yml b/provisioning/roles/geerlingguy.php/.travis.yml
index bdaa1a8ff..528306610 100644
--- a/provisioning/roles/geerlingguy.php/.travis.yml
+++ b/provisioning/roles/geerlingguy.php/.travis.yml
@@ -6,9 +6,12 @@ env:
   - distro: centos7
     playbook: test.yml
     php_version: 7.0
-  - distro: fedora24
+  - distro: fedora27
     playbook: test.yml
-    php_version: 5.6
+    php_version: 7.1
+  - distro: debian9
+    playbook: test.yml
+    php_version: 7.0
   - distro: debian8
     playbook: test.yml
     php_version: 7.0
diff --git a/provisioning/roles/geerlingguy.php/vars/Debian.yml b/provisioning/roles/geerlingguy.php/vars/Debian.yml
index ae927c200..2dba0149d 100644
--- a/provisioning/roles/geerlingguy.php/vars/Debian.yml
+++ b/provisioning/roles/geerlingguy.php/vars/Debian.yml
@@ -28,7 +28,7 @@ __php_extension_conf_paths:
   - /etc/php/7.0/cli/conf.d
 
 __php_apc_conf_filename: 20-apcu.ini
-__php_opcache_conf_filename: 05-opcache.ini
+__php_opcache_conf_filename: 10-opcache.ini
 __php_fpm_daemon: php7.0-fpm
 __php_fpm_conf_path: "/etc/php/7.0/fpm"
 __php_fpm_pool_conf_path: "{{ __php_fpm_conf_path }}/pool.d/www.conf"

From 1868184ad30ad407b1a2b659e719de9ce5bfd298 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 10 Mar 2018 11:47:45 -0600
Subject: [PATCH 0954/1273] Issue #1718: Add 4.8.1 release notes. [ci skip]

---
 CHANGELOG.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 83022accf..31e41b98d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,28 @@
 # Drupal VM Changelog
 
+## 4.8.1 (2018-03-10)
+
+### Breaking Changes
+
+Drupal VM now requires Ansible 2.4+ if you are using the version installed on your host. (Used to require 2.2+).
+
+### New/changed variables in default.config.yml
+
+  * `drupalvm_ansible_version_min` is now `2.4`. Make sure to upgrade if you're on an older version!
+
+### Improvements
+
+  * #1701: Ansible required version is TOO DARN LOW!
+  * #1682: Add documentation for setting up Atom with XDebug.
+  * Updated roles: git, ruby, apache-php-fpm, solr, security, java, git, php.
+
+### Bugfixes
+
+  * #1692: Fix the install-drupal command on the Docker image.
+  * #1704: Ansible version check is done on host even when force_ansible_local is true.
+  * #1708: Selenium paths value in docs should be quoted.
+
+
 ## 4.8.0 "Tower Music / Let Us Pray" (2018-01-30)
 
 This release is all about Drush. Please read my blog post [Drupal VM 4.8 and Drush 9.0.0 - Some major changes](https://www.jeffgeerling.com/blog/2018/drupal-vm-48-and-drush-900-some-major-changes) for details and more background.

From 789266c848a7681d5dd7916cafc8e23b04d1b4f6 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 10 Mar 2018 14:04:01 -0600
Subject: [PATCH 0955/1273] Fix build failure due to rubocop short function
 name limitation.

---
 lib/drupalvm/vagrant.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/drupalvm/vagrant.rb b/lib/drupalvm/vagrant.rb
index f0dae32fb..fe7ecf1ee 100644
--- a/lib/drupalvm/vagrant.rb
+++ b/lib/drupalvm/vagrant.rb
@@ -13,11 +13,11 @@ def which(cmd)
 end
 
 # Recursively walk an tree and run provided block on each value found.
-def walk(obj, &fn)
+def walk(obj, &function)
   if obj.is_a?(Array)
-    obj.map { |value| walk(value, &fn) }
+    obj.map { |value| walk(value, &function) }
   elsif obj.is_a?(Hash)
-    obj.each_pair { |key, value| obj[key] = walk(value, &fn) }
+    obj.each_pair { |key, value| obj[key] = walk(value, &function) }
   else
     obj = yield(obj)
   end

From 70785fd12f732ff3722a380593ac6854c268156b Mon Sep 17 00:00:00 2001
From: Valentine Sakwa <valeygal360@gmail.com>
Date: Sun, 11 Mar 2018 15:42:09 -0400
Subject: [PATCH 0956/1273] 619: Added Documentation for using xdebug with
 Eclipse

---
 docs/extras/xdebug.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/docs/extras/xdebug.md b/docs/extras/xdebug.md
index 54cccd683..31d534759 100644
--- a/docs/extras/xdebug.md
+++ b/docs/extras/xdebug.md
@@ -55,6 +55,13 @@ To use XDebug with Atom, change the `php_xdebug_idekey` variable as shown below
 php_xdebug_idekey: xdebug-atom
 ```
 
+### Eclipse and XDebug with Drupal VM
+
+To use XDebug with Eclipse,change the `php_xdebug_idekey` variable as shown below in `config.yml`, and then run `vagrant provision` to reconfigure the VM.
+```yaml
+php_xdebug_idekey: ECLIPSE_DBGP
+```
+
 ### XDebug over SSH/Drush
 
 As long as `xdebug` is listed in `installed_extras` Drupal VM is configured to accept the `PHP_IDE_CONFIG`, `XDEBUG_CONFIG` and `PHP_OPTIONS` environment variables over SSH and this can be used to set up some IDE's as well as enable XDebug on a per request basis:
@@ -83,3 +90,6 @@ While most people use XDebug only for debugging purposes, you can also use it fo
 **Note**: You should only enable one code profiler at a time—e.g. when using [Blackfire](blackfire.md), disable [XHProf](xhprof.md), [Tideways](tideways.md) and [XDebug](xdebug.md).
 
 For a list of available role variables, see the [`geerlingguy.php-xdebug` Ansible role's README](https://github.com/geerlingguy/ansible-role-php-xdebug#readme).
+
+
+

From 410e8788a719777f4f23fd93b46c1b5b5d422091 Mon Sep 17 00:00:00 2001
From: rsanzante <ricardo@metadrop.net>
Date: Tue, 13 Mar 2018 14:33:06 +0100
Subject: [PATCH 0957/1273] Make ansible version parsing compatible with
 releases from git repository

When ansible is installed from repository version string is like:
ansible 2.4.3.0 (stable-2.4 8708105616)
Instead of:
ansible 2.4.3.0

Regexp fails because it includes the part in parenthesis. Added new regexp that ignores that part. See http://rubular.com/r/J4TBshh16b to see it working.
---
 lib/drupalvm/vagrant.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/drupalvm/vagrant.rb b/lib/drupalvm/vagrant.rb
index fe7ecf1ee..bcb3956c4 100644
--- a/lib/drupalvm/vagrant.rb
+++ b/lib/drupalvm/vagrant.rb
@@ -52,7 +52,7 @@ def ansible_bin
 
 # Return the ansible version parsed from running the executable path provided.
 def ansible_version
-  /^[^\s]+ (.+)$/.match(`#{ansible_bin} --version`) { |match| return match[1] }
+  /^[^\s]+ ([^\(]+).*$/.match(`#{ansible_bin} --version`) { |match| return match[1] }
 end
 
 # Require that if installed, the ansible version meets the requirements.

From 002c534c4710776a610e736888d027c8fcc38b09 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 16 Mar 2018 15:03:18 -0500
Subject: [PATCH 0958/1273] Update arknoll.selenium role to latest version.

---
 provisioning/requirements.yml                      | 2 +-
 provisioning/roles/arknoll.selenium/tasks/main.yml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 4f165bebb..611daafd4 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -1,6 +1,6 @@
 ---
 - src: arknoll.selenium
-  version: 2.2.1
+  version: 2.2.2
 - src: thom8.php-upload-progress
   version: 1.0.1
 - src: franklinkim.newrelic
diff --git a/provisioning/roles/arknoll.selenium/tasks/main.yml b/provisioning/roles/arknoll.selenium/tasks/main.yml
index 16533ab49..f5986213a 100644
--- a/provisioning/roles/arknoll.selenium/tasks/main.yml
+++ b/provisioning/roles/arknoll.selenium/tasks/main.yml
@@ -54,7 +54,7 @@
 
 - name: Get the latest release for chromedriver
   uri:
-    url: http://chromedriver.storage.googleapis.com/LATEST_RELEASE
+    url: https://chromedriver.storage.googleapis.com/LATEST_RELEASE
     return_content: yes
   register: chromedriver_latest
   when: selenium_install_chrome
@@ -62,7 +62,7 @@
 
 - name: Install chromedriver
   unarchive:
-    src: "http://chromedriver.storage.googleapis.com/{{ chromedriver_latest.content | trim }}/chromedriver_linux64.zip"
+    src: "https://chromedriver.storage.googleapis.com/{{ chromedriver_latest.content | trim }}/chromedriver_linux64.zip"
     dest: /usr/bin
     mode: 0755
     copy: no

From c96c2071b345b82f7f6507aea3a784e4cf721a26 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 19 Mar 2018 10:58:12 -0500
Subject: [PATCH 0959/1273] PR #1720: Clean up syntax slightly.

---
 docs/extras/xdebug.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/extras/xdebug.md b/docs/extras/xdebug.md
index 31d534759..36adf8cd5 100644
--- a/docs/extras/xdebug.md
+++ b/docs/extras/xdebug.md
@@ -47,6 +47,7 @@ To use XDebug with NetBeans, change the `php_xdebug_idekey` variable as shown be
 ```yaml
 php_xdebug_idekey: netbeans-xdebug
 ```
+
 ### Atom and XDebug with Drupal VM
 
 To use XDebug with Atom, change the `php_xdebug_idekey` variable as shown below in `config.yml`, and then run `vagrant provision` to reconfigure the VM.
@@ -57,7 +58,8 @@ php_xdebug_idekey: xdebug-atom
 
 ### Eclipse and XDebug with Drupal VM
 
-To use XDebug with Eclipse,change the `php_xdebug_idekey` variable as shown below in `config.yml`, and then run `vagrant provision` to reconfigure the VM.
+To use XDebug with Eclipse, change the `php_xdebug_idekey` variable as shown below in `config.yml`, and then run `vagrant provision` to reconfigure the VM.
+
 ```yaml
 php_xdebug_idekey: ECLIPSE_DBGP
 ```

From 031e247299d02b4425d4941d5583ffe7a84fdceb Mon Sep 17 00:00:00 2001
From: Chris Hoffman <hoff331@users.noreply.github.com>
Date: Mon, 19 Mar 2018 14:47:47 -0500
Subject: [PATCH 0960/1273] Update acquia.md - broken link to BLT config.yml

---
 docs/other/acquia.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/other/acquia.md b/docs/other/acquia.md
index bc687bf14..920d14041 100644
--- a/docs/other/acquia.md
+++ b/docs/other/acquia.md
@@ -1 +1 @@
-To emulate the default Acquia Cloud environment with Drupal VM you should create a `config.yml` and override a few defaults from `default.config.yml`. For an up-to-date example, use [BLT's `config.yml`](https://github.com/acquia/blt/blob/8.x/scripts/drupal-vm/config.yml). Some of the variables in the BLT example are customized for BLT and you should be looking specifically at `vagrant_box`, `php_version`, and `php_packages_extra`.
+To emulate the default Acquia Cloud environment with Drupal VM you should create a `config.yml` and override a few defaults from `default.config.yml`. For an up-to-date example, use [BLT's `config.yml`](https://github.com/acquia/blt/blob/9.x/scripts/drupal-vm/config.yml). Some of the variables in the BLT example are customized for BLT and you should be looking specifically at `vagrant_box`, `php_version`, and `php_packages_extra`.

From c1eeeaf0b45b92e39a98130121477e5bb1f1899b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <m@oxy.fi>
Date: Wed, 21 Mar 2018 09:47:07 -0300
Subject: [PATCH 0961/1273] Issue #1736, Followup #1725: Fix ansible version
 parsing of non-git releases

---
 lib/drupalvm/vagrant.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/drupalvm/vagrant.rb b/lib/drupalvm/vagrant.rb
index bcb3956c4..93d4d45ae 100644
--- a/lib/drupalvm/vagrant.rb
+++ b/lib/drupalvm/vagrant.rb
@@ -52,7 +52,7 @@ def ansible_bin
 
 # Return the ansible version parsed from running the executable path provided.
 def ansible_version
-  /^[^\s]+ ([^\(]+).*$/.match(`#{ansible_bin} --version`) { |match| return match[1] }
+  /^[^\s]+ ([^\s]+)/.match(`#{ansible_bin} --version`) { |match| return match[1] }
 end
 
 # Require that if installed, the ansible version meets the requirements.

From 4e74956ba8d5519abac7426585ab23fd4a4f7d19 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 21 Mar 2018 12:41:51 -0500
Subject: [PATCH 0962/1273] Fixes #1654: Make sure Tideways can be installed.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.php-tideways/.gitignore |  3 +-
 .../geerlingguy.php-tideways/.travis.yml      | 39 +++++--------------
 .../roles/geerlingguy.php-tideways/README.md  |  8 ++--
 .../defaults/main.yml                         |  4 +-
 .../geerlingguy.php-tideways/tasks/main.yml   |  6 +--
 .../templates/tideways.ini.j2                 |  2 +-
 .../tests/tideways-test.php                   |  6 +--
 8 files changed, 25 insertions(+), 45 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 611daafd4..2c4b798d9 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -54,7 +54,7 @@
 - src: geerlingguy.php-redis
   version: 3.1.0
 - src: geerlingguy.php-tideways
-  version: 1.1.0
+  version: 2.0.1
 - src: geerlingguy.php-versions
   version: 2.0.0
 - src: geerlingguy.php-xdebug
diff --git a/provisioning/roles/geerlingguy.php-tideways/.gitignore b/provisioning/roles/geerlingguy.php-tideways/.gitignore
index e43b0f988..c9b2377e3 100644
--- a/provisioning/roles/geerlingguy.php-tideways/.gitignore
+++ b/provisioning/roles/geerlingguy.php-tideways/.gitignore
@@ -1 +1,2 @@
-.DS_Store
+*.retry
+tests/test.sh
diff --git a/provisioning/roles/geerlingguy.php-tideways/.travis.yml b/provisioning/roles/geerlingguy.php-tideways/.travis.yml
index 73d695fbc..53a55e084 100644
--- a/provisioning/roles/geerlingguy.php-tideways/.travis.yml
+++ b/provisioning/roles/geerlingguy.php-tideways/.travis.yml
@@ -3,44 +3,23 @@ services: docker
 
 env:
   - distro: centos7
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
   - distro: ubuntu1604
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
   - distro: debian8
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-
-before_install:
-  # Pull container.
-  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
-  - container_id=$(mktemp)
-  # Run container in detached state.
-  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
-
-  # Install dependencies.
-  - 'docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
-
-  # Ansible syntax check.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+  # Configure test script so we can run extra tests after playbook is run.
+  - export container_id=$(date +%s)
+  - export cleanup=false
 
-  # Test role.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+  # Download test shim.
+  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
+  - chmod +x ${PWD}/tests/test.sh
 
-  # Test role idempotence.
-  - idempotence=$(mktemp)
-  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
-  - >
-    tail ${idempotence}
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
+  # Run tests.
+  - ${PWD}/tests/test.sh
 
   # Run script to test if Tideways is available and working.
-  - 'docker exec "$(cat ${container_id})" env TERM=xterm php /etc/ansible/roles/role_under_test/tests/tideways-test.php'
+  - 'docker exec ${container_id} env TERM=xterm php /etc/ansible/roles/role_under_test/tests/tideways-test.php'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.php-tideways/README.md b/provisioning/roles/geerlingguy.php-tideways/README.md
index fb1cc5432..102cb068d 100644
--- a/provisioning/roles/geerlingguy.php-tideways/README.md
+++ b/provisioning/roles/geerlingguy.php-tideways/README.md
@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/geerlingguy/ansible-role-php-tideways.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-php-tideways)
 
-Installs the [Tideways PHP Profile Extension](https://github.com/tideways/php-profiler-extension) on Linux servers.
+Installs the [Tideways PHP Profile Extension](https://github.com/tideways/php-xhprof-extension) on Linux servers.
 
 ## Requirements
 
@@ -16,8 +16,8 @@ Available variables are listed below, along with default values (see `defaults/m
 
 Where Tideways setup files will be downloaded and built.
 
-    tideways_download_url: https://github.com/tideways/php-profiler-extension/archive/master.zip
-    tideways_download_folder_name: php-profiler-extension-master
+    tideways_download_url: https://github.com/tideways/php-xhprof-extension/archive/master.zip
+    tideways_download_folder_name: php-xhprof-extension-master
 
 The URL from which Tideways will be downloaded.
 
@@ -58,4 +58,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2017 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
+This role was created in 2017 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.php-tideways/defaults/main.yml b/provisioning/roles/geerlingguy.php-tideways/defaults/main.yml
index e9c945b39..d00c72d7f 100644
--- a/provisioning/roles/geerlingguy.php-tideways/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.php-tideways/defaults/main.yml
@@ -1,8 +1,8 @@
 ---
 workspace: /root
 
-tideways_download_url: https://github.com/tideways/php-profiler-extension/archive/master.zip
-tideways_download_folder_name: php-profiler-extension-master
+tideways_download_url: https://github.com/tideways/php-xhprof-extension/archive/master.zip
+tideways_download_folder_name: php-xhprof-extension-master
 
 # If you use the Tideways UI, set this variable to your API key. Otherwise the
 # extension can be used along with the XHProf UI to view profiles.
diff --git a/provisioning/roles/geerlingguy.php-tideways/tasks/main.yml b/provisioning/roles/geerlingguy.php-tideways/tasks/main.yml
index c353f9806..5061a0b50 100644
--- a/provisioning/roles/geerlingguy.php-tideways/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php-tideways/tasks/main.yml
@@ -31,7 +31,7 @@
   shell: >
     {{ item }}
     chdir={{ workspace }}/{{ tideways_download_folder_name }}
-    creates={{ workspace }}/{{ tideways_download_folder_name }}/modules/tideways.so
+    creates={{ workspace }}/{{ tideways_download_folder_name }}/modules/tideways_xhprof.so
   with_items:
     - phpize
     - ./configure
@@ -49,8 +49,8 @@
 
 - name: Move Tideways module into place.
   shell: >
-    cp {{ workspace }}/{{ tideways_download_folder_name }}/modules/tideways.so {{ php_tideways_module_path }}/tideways.so
-    creates={{ php_tideways_module_path }}/tideways.so
+    cp {{ workspace }}/{{ tideways_download_folder_name }}/modules/tideways_xhprof.so {{ php_tideways_module_path }}/tideways_xhprof.so
+    creates={{ php_tideways_module_path }}/tideways_xhprof.so
   notify: restart webserver
 
 # TODO - Install the Tideways.php file for UI?
diff --git a/provisioning/roles/geerlingguy.php-tideways/templates/tideways.ini.j2 b/provisioning/roles/geerlingguy.php-tideways/templates/tideways.ini.j2
index 53d30391e..67dd48b33 100644
--- a/provisioning/roles/geerlingguy.php-tideways/templates/tideways.ini.j2
+++ b/provisioning/roles/geerlingguy.php-tideways/templates/tideways.ini.j2
@@ -1,5 +1,5 @@
 [tideways]
-extension="{{ php_tideways_module_path }}/tideways.so"
+extension="{{ php_tideways_module_path }}/tideways_xhprof.so"
 {% if tideways_api_key %}
 tideways.api_key={{ tideways_api_key }}
 {% else %}
diff --git a/provisioning/roles/geerlingguy.php-tideways/tests/tideways-test.php b/provisioning/roles/geerlingguy.php-tideways/tests/tideways-test.php
index 712cce3ff..bb07fd589 100644
--- a/provisioning/roles/geerlingguy.php-tideways/tests/tideways-test.php
+++ b/provisioning/roles/geerlingguy.php-tideways/tests/tideways-test.php
@@ -9,10 +9,10 @@
 $xhprof_root_dir = '/usr/share/php';
 $success = TRUE;
 
-tideways_enable();
-$data = tideways_disable();
+tideways_xhprof_enable();
+$data = tideways_xhprof_disable();
 
-if (isset($data['main()==>tideways_disable'])) {
+if (isset($data['main()==>tideways_xhprof_disable'])) {
   print "Tideways profiling working.\r\n";
 }
 else {

From 0da337a7116b2e2e9a24943535ed7de8970372d0 Mon Sep 17 00:00:00 2001
From: Gobinath Mallaiyan <gobinathm@users.noreply.github.com>
Date: Tue, 27 Mar 2018 18:05:47 -0400
Subject: [PATCH 0963/1273] Update default.config.yml

- Adding Instruction for Visual Studio Code
---
 default.config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.config.yml b/default.config.yml
index d929a1fd8..84c1c6495 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -324,7 +324,7 @@ php_xdebug_coverage_enable: 0
 php_xdebug_cli_enable: 1
 php_xdebug_remote_enable: 1
 php_xdebug_remote_connect_back: 1
-# Use PHPSTORM for PHPStorm, sublime.xdebug for Sublime Text.
+# Use PHPSTORM for PHPStorm, sublime.xdebug for Sublime Text, VSCODE for Visual Studio Code.
 php_xdebug_idekey: PHPSTORM
 php_xdebug_max_nesting_level: 256
 php_xdebug_remote_host: "{{ ansible_default_ipv4.gateway }}"

From a8f568c3d602460430192a9c3006b3d3bf779936 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 3 Apr 2018 08:42:34 -0500
Subject: [PATCH 0964/1273] Update php-tideways and firewall roles to latest
 version.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.firewall/tasks/main.yml |  4 ++--
 .../roles/geerlingguy.php-tideways/LICENSE    | 20 +++++++++++++++++++
 .../geerlingguy.php-tideways/tests/README.md  | 11 ++++++++++
 4 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.php-tideways/LICENSE
 create mode 100644 provisioning/roles/geerlingguy.php-tideways/tests/README.md

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 2c4b798d9..f12651e64 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -26,7 +26,7 @@
 - src: geerlingguy.elasticsearch
   version: 2.1.3
 - src: geerlingguy.firewall
-  version: 2.3.0
+  version: 2.3.1
 - src: geerlingguy.git
   version: 2.0.1
 - src: geerlingguy.java
diff --git a/provisioning/roles/geerlingguy.firewall/tasks/main.yml b/provisioning/roles/geerlingguy.firewall/tasks/main.yml
index 33b5fae5c..85b58765d 100644
--- a/provisioning/roles/geerlingguy.firewall/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.firewall/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
-- name: Ensure iptables is installed.
-  package: name=iptables state=installed
+- name: Ensure iptables is present.
+  package: name=iptables state=present
 
 - name: Flush iptables the first time playbook runs.
   command: >
diff --git a/provisioning/roles/geerlingguy.php-tideways/LICENSE b/provisioning/roles/geerlingguy.php-tideways/LICENSE
new file mode 100644
index 000000000..4275cf3c1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-tideways/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Jeff Geerling
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/provisioning/roles/geerlingguy.php-tideways/tests/README.md b/provisioning/roles/geerlingguy.php-tideways/tests/README.md
new file mode 100644
index 000000000..6fb211721
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-tideways/tests/README.md
@@ -0,0 +1,11 @@
+# Ansible Role tests
+
+To run the test playbook(s) in this directory:
+
+  1. Install and start Docker.
+  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
+    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
+  1. Make the test shim executable: `chmod +x tests/test.sh`.
+  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
+
+If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`

From bc5b14b750712b73ed4cb463b7f46d9bf4ae546c Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 4 Apr 2018 21:10:27 -0500
Subject: [PATCH 0965/1273] Issue #1552: Make sure Xdebug works with PHP 7.2
 out of the box.

---
 provisioning/requirements.yml                               | 2 +-
 provisioning/roles/geerlingguy.php-xdebug/.travis.yml       | 2 +-
 provisioning/roles/geerlingguy.php-xdebug/README.md         | 4 ++--
 provisioning/roles/geerlingguy.php-xdebug/defaults/main.yml | 2 +-
 provisioning/roles/geerlingguy.php-xdebug/meta/main.yml     | 6 +++++-
 provisioning/roles/geerlingguy.php-xdebug/tasks/main.yml    | 6 +++---
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index f12651e64..8d55b0a27 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -58,7 +58,7 @@
 - src: geerlingguy.php-versions
   version: 2.0.0
 - src: geerlingguy.php-xdebug
-  version: 2.4.0
+  version: 2.5.0
 - src: geerlingguy.php-xhprof
   version: 2.2.2
 - src: geerlingguy.pimpmylog
diff --git a/provisioning/roles/geerlingguy.php-xdebug/.travis.yml b/provisioning/roles/geerlingguy.php-xdebug/.travis.yml
index 12deab75c..994c635dc 100644
--- a/provisioning/roles/geerlingguy.php-xdebug/.travis.yml
+++ b/provisioning/roles/geerlingguy.php-xdebug/.travis.yml
@@ -4,7 +4,7 @@ services: docker
 env:
   - distro: centos7
   - distro: ubuntu1604
-  - distro: debian8
+  - distro: debian9
 
 script:
   # Configure test script so we can run extra tests after playbook is run.
diff --git a/provisioning/roles/geerlingguy.php-xdebug/README.md b/provisioning/roles/geerlingguy.php-xdebug/README.md
index 5e594a560..5361cdbb3 100644
--- a/provisioning/roles/geerlingguy.php-xdebug/README.md
+++ b/provisioning/roles/geerlingguy.php-xdebug/README.md
@@ -16,9 +16,9 @@ Available variables are listed below, along with default values (see `defaults/m
 
 Where Xdebug setup files will be downloaded and built.
 
-    php_xdebug_version: 2.5.0
+    php_xdebug_version: 2.6.0
 
-The version of Xdebug to be installed (see [Updates](https://xdebug.org/updates.php) for a current listing).
+The version of Xdebug to be installed (see [Updates](https://xdebug.org/updates.php) for a current listing). **If using PHP 5.6**: Set this to `2.5.0` or earlier, as starting with XDebug 2.6.0, PHP 5.x support has been dropped.
 
     php_xdebug_default_enable: 1
     php_xdebug_coverage_enable: 1
diff --git a/provisioning/roles/geerlingguy.php-xdebug/defaults/main.yml b/provisioning/roles/geerlingguy.php-xdebug/defaults/main.yml
index 3c32f236c..ac1d78ef5 100644
--- a/provisioning/roles/geerlingguy.php-xdebug/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.php-xdebug/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
 workspace: /root
 
-php_xdebug_version: 2.5.0
+php_xdebug_version: 2.6.0
 
 php_xdebug_coverage_enable: 1
 php_xdebug_default_enable: 1
diff --git a/provisioning/roles/geerlingguy.php-xdebug/meta/main.yml b/provisioning/roles/geerlingguy.php-xdebug/meta/main.yml
index 27c831b1c..5841bc200 100644
--- a/provisioning/roles/geerlingguy.php-xdebug/meta/main.yml
+++ b/provisioning/roles/geerlingguy.php-xdebug/meta/main.yml
@@ -7,7 +7,7 @@ galaxy_info:
   description: PHP XDebug for Linux
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 2.0
+  min_ansible_version: 2.4
   platforms:
     - name: EL
       versions:
@@ -42,3 +42,7 @@ galaxy_info:
   galaxy_tags:
     - development
     - web
+    - php
+    - xdebug
+    - debug
+    - profile
diff --git a/provisioning/roles/geerlingguy.php-xdebug/tasks/main.yml b/provisioning/roles/geerlingguy.php-xdebug/tasks/main.yml
index ae83c8eaf..9366df443 100644
--- a/provisioning/roles/geerlingguy.php-xdebug/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php-xdebug/tasks/main.yml
@@ -13,13 +13,13 @@
   when: php_xdebug_config_filename is not defined
 
 - name: Ensure dependencies for building from source are installed (RedHat).
-  yum: "name={{ item }} state=installed"
+  yum: "name={{ item }} state=present"
   with_items:
     - '@development'
   when: ansible_os_family == 'RedHat'
 
 - name: Ensure dependencies for building from source are installed (Debian).
-  apt: "name={{ item }} state=installed"
+  apt: "name={{ item }} state=present"
   with_items:
     - build-essential
   when: ansible_os_family == 'Debian'
@@ -56,4 +56,4 @@
     remote_src: True
   notify: restart webserver
 
-- include: configure.yml
+- include_tasks: configure.yml

From 6607e848b337006e4b693b9d5a0073c257fa3e1a Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 5 Apr 2018 08:38:59 -0500
Subject: [PATCH 0966/1273] Fixes #1748: Bump memory_limit for PHP 5.6 tests
 due to Composer fatal error.

---
 tests/ubuntu-16-php56.config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/ubuntu-16-php56.config.yml b/tests/ubuntu-16-php56.config.yml
index 0379a90d8..81e5e3416 100644
--- a/tests/ubuntu-16-php56.config.yml
+++ b/tests/ubuntu-16-php56.config.yml
@@ -1,4 +1,5 @@
 ---
 php_version: "5.6"
+php_memory_limit: "2G"
 php_sendmail_path: "/usr/sbin/sendmail -t -i"
 installed_extras: []

From d240b0e3af75e4c3070f53a605478a978fdedfe0 Mon Sep 17 00:00:00 2001
From: "Mallaiyan, Gobinath [GTSUS Non-J&J]" <GMallai1@ITS.JNJ.com>
Date: Fri, 6 Apr 2018 16:15:23 -0400
Subject: [PATCH 0967/1273] Updated XDebug IDE Config information

---
 default.config.yml    | 1 -
 docs/extras/xdebug.md | 8 ++++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/default.config.yml b/default.config.yml
index 84c1c6495..3aa77e8f9 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -324,7 +324,6 @@ php_xdebug_coverage_enable: 0
 php_xdebug_cli_enable: 1
 php_xdebug_remote_enable: 1
 php_xdebug_remote_connect_back: 1
-# Use PHPSTORM for PHPStorm, sublime.xdebug for Sublime Text, VSCODE for Visual Studio Code.
 php_xdebug_idekey: PHPSTORM
 php_xdebug_max_nesting_level: 256
 php_xdebug_remote_host: "{{ ansible_default_ipv4.gateway }}"
diff --git a/docs/extras/xdebug.md b/docs/extras/xdebug.md
index 36adf8cd5..4a9bfa5d9 100644
--- a/docs/extras/xdebug.md
+++ b/docs/extras/xdebug.md
@@ -64,6 +64,14 @@ To use XDebug with Eclipse, change the `php_xdebug_idekey` variable as shown bel
 php_xdebug_idekey: ECLIPSE_DBGP
 ```
 
+### Visual Studio Code and XDebug with Drupal VM
+
+To use XDebug with Visual Studio Code, change the `php_xdebug_idekey` variable as shown below in `config.yml`, and then run `vagrant provision` to reconfigure the VM.
+
+```yaml
+php_xdebug_idekey: VSCODE
+```
+
 ### XDebug over SSH/Drush
 
 As long as `xdebug` is listed in `installed_extras` Drupal VM is configured to accept the `PHP_IDE_CONFIG`, `XDEBUG_CONFIG` and `PHP_OPTIONS` environment variables over SSH and this can be used to set up some IDE's as well as enable XDebug on a per request basis:

From 588fae87937017039fc5596f5f475e882146133f Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 13 Apr 2018 12:26:23 -0500
Subject: [PATCH 0968/1273] Update author homepage in composer.json.

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 7bdfb1fd0..fae792f0a 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
     "authors": [
         {
             "name": "Jeff Geerling",
-            "homepage": "http://www.jeffgeerling.com"
+            "homepage": "https://www.jeffgeerling.com"
         },
         {
             "name": "Oskar Schöldström",

From aa5effb6371ae426d5f3ed25a2a57a2292320780 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 13 Apr 2018 12:32:42 -0500
Subject: [PATCH 0969/1273] Update Drupal Console role to latest version to
 work with Ubuntu 14.04.

---
 provisioning/requirements.yml                 |  2 +-
 .../geerlingguy.drupal-console/.travis.yml    |  2 ++
 .../geerlingguy.drupal-console/tasks/main.yml | 28 +++++++++++++++++++
 .../geerlingguy.drupal-console/tests/test.yml |  4 +++
 4 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 8d55b0a27..41422d072 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -20,7 +20,7 @@
 - src: geerlingguy.drupal
   version: 2.4.0
 - src: geerlingguy.drupal-console
-  version: 1.1.0
+  version: 1.1.1
 - src: geerlingguy.drush
   version: 3.0.0
 - src: geerlingguy.elasticsearch
diff --git a/provisioning/roles/geerlingguy.drupal-console/.travis.yml b/provisioning/roles/geerlingguy.drupal-console/.travis.yml
index 76b7c4948..38bb908c1 100644
--- a/provisioning/roles/geerlingguy.drupal-console/.travis.yml
+++ b/provisioning/roles/geerlingguy.drupal-console/.travis.yml
@@ -4,6 +4,8 @@ services: docker
 env:
   - distro: ubuntu1604
     playbook: test.yml
+  - distro: ubuntu1404
+    playbook: test.yml
   - distro: ubuntu1604
     playbook: test-self-update.yml
 
diff --git a/provisioning/roles/geerlingguy.drupal-console/tasks/main.yml b/provisioning/roles/geerlingguy.drupal-console/tasks/main.yml
index 7f0801dcb..0a413085d 100644
--- a/provisioning/roles/geerlingguy.drupal-console/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.drupal-console/tasks/main.yml
@@ -1,4 +1,32 @@
 ---
+- name: Ensure pip is available for an extra dependency on Ubuntu 14.04.
+  package:
+    name: "{{ item }}"
+    state: present
+  with_items:
+    - python-pip
+    - python-openssl
+    - python-pyasn1
+  when:
+    - ansible_distribution == 'Ubuntu'
+    - ansible_distribution_version == '14.04'
+
+- name: Upgrade setuptools on Ubuntu 14.04.
+  pip:
+    name: setuptools
+    state: latest
+  when:
+    - ansible_distribution == 'Ubuntu'
+    - ansible_distribution_version == '14.04'
+
+- name: Ensure ndg-httpsclient is available on Ubuntu 14.04.
+  pip:
+    name: ndg-httpsclient
+    state: present
+  when:
+    - ansible_distribution == 'Ubuntu'
+    - ansible_distribution_version == '14.04'
+
 - name: Install Drupal Console.
   get_url:
     url: https://drupalconsole.com/installer
diff --git a/provisioning/roles/geerlingguy.drupal-console/tests/test.yml b/provisioning/roles/geerlingguy.drupal-console/tests/test.yml
index 1896551a8..b920c8d5b 100644
--- a/provisioning/roles/geerlingguy.drupal-console/tests/test.yml
+++ b/provisioning/roles/geerlingguy.drupal-console/tests/test.yml
@@ -10,6 +10,10 @@
       when: ansible_os_family == 'Debian'
       changed_when: false
 
+    - name: Add repository for PHP 7.0 (Ubuntu).
+      apt_repository: repo='ppa:ondrej/php'
+      when: ansible_distribution == "Ubuntu" and ansible_distribution_version != "16.04"
+
   roles:
     - geerlingguy.php
     - role_under_test

From 80159a1ee8971979646f429aa365953d3069f84f Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 23 Apr 2018 16:42:59 -0500
Subject: [PATCH 0970/1273] Update Solr role to latest version.

---
 provisioning/requirements.yml                       |  2 +-
 provisioning/roles/geerlingguy.solr/meta/main.yml   |  2 +-
 .../roles/geerlingguy.solr/tasks/install-pre5.yml   |  2 +-
 provisioning/roles/geerlingguy.solr/tasks/main.yml  | 13 ++++++-------
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 41422d072..810ad3a66 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -76,6 +76,6 @@
 - src: geerlingguy.security
   version: 1.6.0
 - src: geerlingguy.solr
-  version: 4.0.1
+  version: 4.1.0
 - src: geerlingguy.varnish
   version: 2.1.1
diff --git a/provisioning/roles/geerlingguy.solr/meta/main.yml b/provisioning/roles/geerlingguy.solr/meta/main.yml
index 7ce04c9f8..402f07b57 100644
--- a/provisioning/roles/geerlingguy.solr/meta/main.yml
+++ b/provisioning/roles/geerlingguy.solr/meta/main.yml
@@ -6,7 +6,7 @@ galaxy_info:
   description: Apache Solr for Linux.
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 2.2
+  min_ansible_version: 2.4
   platforms:
     - name: EL
       versions:
diff --git a/provisioning/roles/geerlingguy.solr/tasks/install-pre5.yml b/provisioning/roles/geerlingguy.solr/tasks/install-pre5.yml
index 18c069539..b2b3e1fcd 100644
--- a/provisioning/roles/geerlingguy.solr/tasks/install-pre5.yml
+++ b/provisioning/roles/geerlingguy.solr/tasks/install-pre5.yml
@@ -66,7 +66,7 @@
     mode: 0755
 
 - name: Ensure daemon is installed (Debian).
-  apt: name=daemon state=installed
+  apt: name=daemon state=present
   when: ansible_os_family == "Debian"
 
 - name: Copy solr systemd unit file into place (for systemd systems).
diff --git a/provisioning/roles/geerlingguy.solr/tasks/main.yml b/provisioning/roles/geerlingguy.solr/tasks/main.yml
index 743b9b702..3c4ec6f11 100644
--- a/provisioning/roles/geerlingguy.solr/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.solr/tasks/main.yml
@@ -1,5 +1,5 @@
 ---
-- include: user.yml
+- import_tasks: user.yml
   when: solr_create_user
 
 - name: Set solr_filename for Solr 4+.
@@ -33,11 +33,11 @@
   when: solr_download_status.changed
 
 # Install Solr < 5.
-- include: install-pre5.yml
+- include_tasks: install-pre5.yml
   when: "solr_version.split('.')[0] < '5'"
 
 # Install Solr 5+.
-- include: install.yml
+- include_tasks: install.yml
   when: "solr_version.split('.')[0] >= '5'"
 
 - name: Ensure solr is started and enabled on boot if configured.
@@ -48,12 +48,11 @@
   when: solr_service_manage
 
 # Configure solr.
-- include: configure.yml
+- include_tasks: configure.yml
   when: "solr_version.split('.')[0] >= '5'"
 
 # Create cores, if any are configured.
-- include: cores.yml
+- include_tasks: cores.yml
   when: "solr_cores and solr_version.split('.')[0] >= '5'"
 
-- include: trim-fat.yml
-  static: no
+- include_tasks: trim-fat.yml

From cb2d4a56811f639fab85597ae9380d29ccef2c12 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 24 Apr 2018 13:39:42 -0500
Subject: [PATCH 0971/1273] Update Nginx role to latest version.

---
 provisioning/requirements.yml                      |  2 +-
 provisioning/roles/geerlingguy.nginx/.travis.yml   |  5 +++--
 provisioning/roles/geerlingguy.nginx/README.md     | 11 +++++++++++
 .../roles/geerlingguy.nginx/defaults/main.yml      |  2 +-
 provisioning/roles/geerlingguy.nginx/meta/main.yml | 10 ++++++++--
 .../roles/geerlingguy.nginx/tasks/main.yml         | 14 +++++++-------
 .../geerlingguy.nginx/tasks/setup-Archlinux.yml    |  2 +-
 .../roles/geerlingguy.nginx/tasks/setup-Debian.yml |  2 +-
 .../roles/geerlingguy.nginx/tasks/setup-RedHat.yml |  2 +-
 9 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 810ad3a66..9c078a273 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -38,7 +38,7 @@
 - src: geerlingguy.mysql
   version: 2.8.1
 - src: geerlingguy.nginx
-  version: 2.4.0
+  version: 2.6.0
 - src: geerlingguy.nodejs
   version: 4.1.2
 - src: geerlingguy.php
diff --git a/provisioning/roles/geerlingguy.nginx/.travis.yml b/provisioning/roles/geerlingguy.nginx/.travis.yml
index 352227a9c..5d3b1bec7 100644
--- a/provisioning/roles/geerlingguy.nginx/.travis.yml
+++ b/provisioning/roles/geerlingguy.nginx/.travis.yml
@@ -5,7 +5,8 @@ env:
   - distro: centos7
   - distro: ubuntu1604
   - distro: ubuntu1404
-  - distro: ubuntu1204
+  - distro: debian9
+  - distro: debian8
 
 script:
   # Configure test script so we can run extra tests after playbook is run.
@@ -24,7 +25,7 @@ script:
   - 'docker exec ${container_id} bash -c "echo Success >| /var/www/test/index.html"'
 
   # Make sure virtualhost exists.
-  - 'docker exec --tty ${container_id} env TERM=xterm curl http://test.dev/ | grep "Success"'
+  - 'docker exec --tty ${container_id} env TERM=xterm curl http://localhost/ | grep "Success"'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.nginx/README.md b/provisioning/roles/geerlingguy.nginx/README.md
index aa8c3ab14..04223bff2 100644
--- a/provisioning/roles/geerlingguy.nginx/README.md
+++ b/provisioning/roles/geerlingguy.nginx/README.md
@@ -117,6 +117,17 @@ Extra lines to be inserted in the top-level `http` block in `nginx.conf`. The va
       proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
       proxy_set_header   Host $http_host;
 
+See the template in `templates/nginx.conf.j2` for more details on the placement.
+
+    nginx_extra_conf_options: ""
+
+Extra lines to be inserted in the top of `nginx.conf`. The value should be defined literally (as you would insert it directly in the `nginx.conf`, adhering to the Nginx configuration syntax - such as `;` for line termination, etc.), for example:
+
+    nginx_extra_conf_options: |
+      worker_rlimit_nofile 8192;
+
+See the template in `templates/nginx.conf.j2` for more details on the placement.
+
     nginx_log_format: |
       '$remote_addr - $remote_user [$time_local] "$request" '
       '$status $body_bytes_sent "$http_referer" '
diff --git a/provisioning/roles/geerlingguy.nginx/defaults/main.yml b/provisioning/roles/geerlingguy.nginx/defaults/main.yml
index 38aa3daf6..73100c571 100644
--- a/provisioning/roles/geerlingguy.nginx/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.nginx/defaults/main.yml
@@ -20,7 +20,7 @@ nginx_worker_connections: "1024"
 nginx_multi_accept: "off"
 
 nginx_error_log: "/var/log/nginx/error.log warn"
-nginx_access_log: "/var/log/nginx/access.log main buffer=16k"
+nginx_access_log: "/var/log/nginx/access.log main buffer=16k flush=2m"
 
 nginx_sendfile: "on"
 nginx_tcp_nopush: "on"
diff --git a/provisioning/roles/geerlingguy.nginx/meta/main.yml b/provisioning/roles/geerlingguy.nginx/meta/main.yml
index 94188770a..da5e3486f 100644
--- a/provisioning/roles/geerlingguy.nginx/meta/main.yml
+++ b/provisioning/roles/geerlingguy.nginx/meta/main.yml
@@ -6,7 +6,7 @@ galaxy_info:
   description: Nginx installation for Linux, FreeBSD and OpenBSD.
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 1.8
+  min_ansible_version: 2.4
   platforms:
     - name: EL
       versions:
@@ -17,7 +17,8 @@ galaxy_info:
       - all
     - name: Ubuntu
       versions:
-      - all
+      - trusty
+      - xenial
     - name: Archlinux
       versions:
       - all
@@ -35,3 +36,8 @@ galaxy_info:
   galaxy_tags:
     - development
     - web
+    - nginx
+    - reverse
+    - proxy
+    - load
+    - balancer
diff --git a/provisioning/roles/geerlingguy.nginx/tasks/main.yml b/provisioning/roles/geerlingguy.nginx/tasks/main.yml
index 4ee901a41..fd523d92e 100644
--- a/provisioning/roles/geerlingguy.nginx/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.nginx/tasks/main.yml
@@ -9,26 +9,26 @@
   when: nginx_user is not defined
 
 # Setup/install tasks.
-- include: setup-RedHat.yml
+- include_tasks: setup-RedHat.yml
   when: ansible_os_family == 'RedHat'
 
-- include: setup-Ubuntu.yml
+- include_tasks: setup-Ubuntu.yml
   when: ansible_distribution == 'Ubuntu'
 
-- include: setup-Debian.yml
+- include_tasks: setup-Debian.yml
   when: ansible_os_family == 'Debian'
 
-- include: setup-FreeBSD.yml
+- include_tasks: setup-FreeBSD.yml
   when: ansible_os_family == 'FreeBSD'
 
-- include: setup-OpenBSD.yml
+- include_tasks: setup-OpenBSD.yml
   when: ansible_os_family == 'OpenBSD'
 
-- include: setup-Archlinux.yml
+- include_tasks: setup-Archlinux.yml
   when: ansible_os_family == 'Archlinux'
 
 # Vhost configuration.
-- include: vhosts.yml
+- import_tasks: vhosts.yml
 
 # Nginx setup.
 - name: Copy nginx configuration in place.
diff --git a/provisioning/roles/geerlingguy.nginx/tasks/setup-Archlinux.yml b/provisioning/roles/geerlingguy.nginx/tasks/setup-Archlinux.yml
index 2aa89ec9b..46e1f5bdf 100644
--- a/provisioning/roles/geerlingguy.nginx/tasks/setup-Archlinux.yml
+++ b/provisioning/roles/geerlingguy.nginx/tasks/setup-Archlinux.yml
@@ -2,4 +2,4 @@
 - name: Ensure nginx is installed.
   pacman:
     name: "{{ nginx_package_name }}"
-    state: installed
+    state: present
diff --git a/provisioning/roles/geerlingguy.nginx/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.nginx/tasks/setup-Debian.yml
index 2638ce052..554dc2e77 100644
--- a/provisioning/roles/geerlingguy.nginx/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.nginx/tasks/setup-Debian.yml
@@ -6,5 +6,5 @@
 - name: Ensure nginx is installed.
   apt:
     name: "{{ nginx_package_name }}"
-    state: installed
+    state: present
     default_release: "{{ nginx_default_release }}"
diff --git a/provisioning/roles/geerlingguy.nginx/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.nginx/tasks/setup-RedHat.yml
index 21f3c73f2..cac0b4b2d 100644
--- a/provisioning/roles/geerlingguy.nginx/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.nginx/tasks/setup-RedHat.yml
@@ -11,4 +11,4 @@
 - name: Ensure nginx is installed.
   yum:
     name: "{{ nginx_package_name }}"
-    state: installed
+    state: present

From 6f9a8ab98966e35e9a2e49d7a1f2e55d7be580c9 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 24 Apr 2018 13:56:35 -0500
Subject: [PATCH 0972/1273] Issue #1553: Fix use of deprecated includes.

---
 provisioning/playbook.yml | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 715fbb0ea..7844eab70 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -7,27 +7,25 @@
     - ../default.config.yml
 
   pre_tasks:
-    - include: tasks/config.yml
+    - include_tasks: tasks/config.yml
       tags: ['always']
 
-    - include: tasks/backwards-compatibility.yml
+    - include_tasks: tasks/backwards-compatibility.yml
       tags: ['always']
-      static: no
 
-    - include: "tasks/init-{{ ansible_os_family }}.yml"
-      static: no
+    - include_tasks: "tasks/init-{{ ansible_os_family }}.yml"
 
     - name: Run configured pre-provision shell scripts.
       script: "{{ item }}"
       with_items: "{{ pre_provision_scripts|default([]) }}"
 
     - name: Run configured pre-provision ansible task files.
-      include: "{{ outer_item }}"
+      include_tasks: "{{ outer_item }}"
       loop_control:
         loop_var: outer_item
       with_fileglob: "{{ pre_provision_tasks_dir|default(omit) }}"
 
-    - include: tasks/php.yml
+    - import_tasks: tasks/php.yml
 
   roles:
     # Essential roles.
@@ -103,20 +101,20 @@
     - { role: geerlingguy.security, when: extra_security_enabled }
 
   tasks:
-    - include: tasks/sshd.yml
-    - include: tasks/extras.yml
+    - import_tasks: tasks/sshd.yml
+    - import_tasks: tasks/extras.yml
 
-    - include: tasks/apparmor.yml
+    - include_tasks: tasks/apparmor.yml
       when: ansible_os_family == 'Debian' and drupal_db_backend == 'mysql'
       tags: ['database']
 
-    - include: tasks/drush-aliases.yml
+    - include_tasks: tasks/drush-aliases.yml
       when: configure_drush_aliases
 
-    - include: tasks/cron.yml
+    - import_tasks: tasks/cron.yml
       tags: ['cron']
 
-    - include: tasks/dashboard.yml
+    - include_tasks: tasks/dashboard.yml
       when: dashboard_install_dir is defined and dashboard_install_dir != ''
       tags: ['webserver', 'database', 'php']
 
@@ -125,7 +123,7 @@
       with_items: "{{ post_provision_scripts|default([]) }}"
 
     - name: Run configured post-provision ansible task files.
-      include: "{{ outer_item }}"
+      include_tasks: "{{ outer_item }}"
       loop_control:
         loop_var: outer_item
       with_fileglob: "{{ post_provision_tasks_dir|default(omit) }}"

From e66755469522cc903859ff3856d5e2df68ece896 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 24 Apr 2018 14:51:55 -0500
Subject: [PATCH 0973/1273] Issue #1553: Update to latest Apache role version.

---
 provisioning/requirements.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 9c078a273..41a20483a 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -8,7 +8,7 @@
 - src: geerlingguy.adminer
   version: 1.2.0
 - src: geerlingguy.apache
-  version: 2.1.1
+  version: 3.0.0
 - src: geerlingguy.apache-php-fpm
   version: 1.1.0
 - src: geerlingguy.blackfire

From fa12f333482864a496a57e4c654053cd5fe7f42a Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 24 Apr 2018 14:52:33 -0500
Subject: [PATCH 0974/1273] Issue #1553: Update to latest Apache role version.

---
 provisioning/roles/geerlingguy.apache/.travis.yml |  3 ++-
 provisioning/roles/geerlingguy.apache/README.md   | 15 ++++++++-------
 .../roles/geerlingguy.apache/defaults/main.yml    |  6 +++---
 .../roles/geerlingguy.apache/meta/main.yml        |  6 ++----
 .../roles/geerlingguy.apache/tasks/main.yml       |  6 ++----
 5 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/provisioning/roles/geerlingguy.apache/.travis.yml b/provisioning/roles/geerlingguy.apache/.travis.yml
index 4fd8d652d..2992c92cd 100644
--- a/provisioning/roles/geerlingguy.apache/.travis.yml
+++ b/provisioning/roles/geerlingguy.apache/.travis.yml
@@ -4,9 +4,10 @@ services: docker
 env:
   - distro: centos7
   - distro: centos6
+  - distro: ubuntu1804
   - distro: ubuntu1604
   - distro: ubuntu1404
-  - distro: ubuntu1204
+  - distro: debian9
   - distro: debian8
 
 script:
diff --git a/provisioning/roles/geerlingguy.apache/README.md b/provisioning/roles/geerlingguy.apache/README.md
index b0c0ca159..b4f52ec4f 100644
--- a/provisioning/roles/geerlingguy.apache/README.md
+++ b/provisioning/roles/geerlingguy.apache/README.md
@@ -63,13 +63,14 @@ The `|` denotes a multiline scalar block in YAML, so newlines are preserved in t
 No SSL vhosts are configured by default, but you can add them using the same pattern as `apache_vhosts`, with a few additional directives, like the following example:
 
     apache_vhosts_ssl:
-      - {
-        servername: "local.dev",
-        documentroot: "/var/www/html",
-        certificate_file: "/home/vagrant/example.crt",
-        certificate_key_file: "/home/vagrant/example.key",
+      - servername: "local.dev"
+        documentroot: "/var/www/html"
+        certificate_file: "/home/vagrant/example.crt"
+        certificate_key_file: "/home/vagrant/example.key"
         certificate_chain_file: "/path/to/certificate_chain.crt"
-      }
+        extra_parameters: |
+          RewriteCond %{HTTP_HOST} !^www\. [NC]
+          RewriteRule ^(.*)$ http://www.%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
 
 Other SSL directives can be managed with other SSL-related role variables.
 
@@ -99,7 +100,7 @@ The list of packages to be installed. This defaults to a set of platform-specifi
 
 Set initial Apache daemon state to be enforced when this role is run. This should generally remain `started`, but you can set it to `stopped` if you need to fix the Apache config during a playbook run or otherwise would not like Apache started at the time this role is run.
 
-    apache_packages_state: installed
+    apache_packages_state: present
 
 If you have enabled any additional repositories such as _ondrej/apache2_, [geerlingguy.repo-epel](https://github.com/geerlingguy/ansible-role-repo-epel), or [geerlingguy.repo-remi](https://github.com/geerlingguy/ansible-role-repo-remi), you may want an easy way to upgrade versions. You can set this to `latest` (combined with `apache_enablerepo` on RHEL) and can directly upgrade to a different Apache version from a different repo (instead of uninstalling and reinstalling Apache).
 
diff --git a/provisioning/roles/geerlingguy.apache/defaults/main.yml b/provisioning/roles/geerlingguy.apache/defaults/main.yml
index 12ee9379d..f325d0b38 100644
--- a/provisioning/roles/geerlingguy.apache/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.apache/defaults/main.yml
@@ -53,6 +53,6 @@ apache_state: started
 # `restarted` or `reloaded`
 apache_restart_state: restarted
 
-# Apache package state; use `installed` to make sure it's installed, or `latest` if
-# you want to upgrade or switch versions using a new repo.
-apache_packages_state: installed
+# Apache package state; use `present` to make sure it's installed, or `latest`
+# if you want to upgrade or switch versions using a new repo.
+apache_packages_state: present
diff --git a/provisioning/roles/geerlingguy.apache/meta/main.yml b/provisioning/roles/geerlingguy.apache/meta/main.yml
index 2936b4bf1..2bd0b3387 100644
--- a/provisioning/roles/geerlingguy.apache/meta/main.yml
+++ b/provisioning/roles/geerlingguy.apache/meta/main.yml
@@ -6,7 +6,7 @@ galaxy_info:
   description: Apache 2.x for Linux.
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 2.2
+  min_ansible_version: 2.4
   platforms:
     - name: EL
       versions:
@@ -19,11 +19,9 @@ galaxy_info:
         - all
     - name: Ubuntu
       versions:
-        - precise
-        - raring
-        - saucy
         - trusty
         - xenial
+        - bionic
     - name: Suse
       versions:
         - all
diff --git a/provisioning/roles/geerlingguy.apache/tasks/main.yml b/provisioning/roles/geerlingguy.apache/tasks/main.yml
index 0a6006408..0c9717533 100644
--- a/provisioning/roles/geerlingguy.apache/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.apache/tasks/main.yml
@@ -13,8 +13,7 @@
   when: apache_packages is not defined
 
 # Setup/install tasks.
-- include: "setup-{{ ansible_os_family }}.yml"
-  static: no
+- include_tasks: "setup-{{ ansible_os_family }}.yml"
 
 # Figure out what version of Apache is installed.
 - name: Get installed version of Apache.
@@ -34,8 +33,7 @@
   when: "apache_version.split('.')[1] == '4'"
 
 # Configure Apache.
-- include: "configure-{{ ansible_os_family }}.yml"
-  static: no
+- include_tasks: "configure-{{ ansible_os_family }}.yml"
 
 - name: Ensure Apache has selected state and enabled on boot.
   service:

From 8c0f88ddce46e24a1bca8e86da6c67699e1a7741 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 24 Apr 2018 15:20:38 -0500
Subject: [PATCH 0975/1273] Issue #1553: Update to latest Varnish role version.

---
 provisioning/requirements.yml                                 | 2 +-
 provisioning/roles/geerlingguy.varnish/README.md              | 4 ++++
 provisioning/roles/geerlingguy.varnish/defaults/main.yml      | 2 ++
 provisioning/roles/geerlingguy.varnish/meta/main.yml          | 2 +-
 provisioning/roles/geerlingguy.varnish/tasks/main.yml         | 4 ++--
 provisioning/roles/geerlingguy.varnish/tasks/setup-Debian.yml | 2 +-
 provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml | 2 +-
 provisioning/roles/geerlingguy.varnish/templates/varnish.j2   | 3 +++
 .../roles/geerlingguy.varnish/templates/varnish.params.j2     | 4 +++-
 .../roles/geerlingguy.varnish/templates/varnish.service.j2    | 2 +-
 provisioning/roles/geerlingguy.varnish/tests/test-41.yml      | 4 ++--
 provisioning/roles/geerlingguy.varnish/tests/test.yml         | 4 ++--
 12 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 41a20483a..eb9fd345b 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -78,4 +78,4 @@
 - src: geerlingguy.solr
   version: 4.1.0
 - src: geerlingguy.varnish
-  version: 2.1.1
+  version: 2.3.0
diff --git a/provisioning/roles/geerlingguy.varnish/README.md b/provisioning/roles/geerlingguy.varnish/README.md
index c14ddadcc..fd5b264a9 100644
--- a/provisioning/roles/geerlingguy.varnish/README.md
+++ b/provisioning/roles/geerlingguy.varnish/README.md
@@ -62,6 +62,10 @@ How Varnish stores cache entries (this is passed in as the argument for `-s`). I
 
 Varnish PID file path. Set to an empty string if you don't want to use a PID file.
 
+    varnishd_extra_options: ""
+
+Extra options or flags to pass to the Varnish daemon when it starts (e.g. `-p http_max_hdr=128`).
+
     varnish_enabled_services:
       - varnish
 
diff --git a/provisioning/roles/geerlingguy.varnish/defaults/main.yml b/provisioning/roles/geerlingguy.varnish/defaults/main.yml
index b85facb86..0faacc18d 100644
--- a/provisioning/roles/geerlingguy.varnish/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.varnish/defaults/main.yml
@@ -19,6 +19,8 @@ varnish_admin_listen_port: "6082"
 varnish_storage: "file,/var/lib/varnish/varnish_storage.bin,256M"
 varnish_pidfile: /run/varnishd.pid
 
+varnishd_extra_options: ""
+
 varnish_enabled_services:
   - varnish
 
diff --git a/provisioning/roles/geerlingguy.varnish/meta/main.yml b/provisioning/roles/geerlingguy.varnish/meta/main.yml
index 10da3bc1f..b60f7a0a5 100644
--- a/provisioning/roles/geerlingguy.varnish/meta/main.yml
+++ b/provisioning/roles/geerlingguy.varnish/meta/main.yml
@@ -6,7 +6,7 @@ galaxy_info:
   description: Varnish for Linux.
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 2.2
+  min_ansible_version: 2.4
   platforms:
     - name: EL
       versions:
diff --git a/provisioning/roles/geerlingguy.varnish/tasks/main.yml b/provisioning/roles/geerlingguy.varnish/tasks/main.yml
index 231e1486c..dda345589 100644
--- a/provisioning/roles/geerlingguy.varnish/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.varnish/tasks/main.yml
@@ -6,10 +6,10 @@
   set_fact:
     varnish_packagecloud_repo: "varnish{{ varnish_version|replace('.', '') }}"
 
-- include: setup-RedHat.yml
+- include_tasks: setup-RedHat.yml
   when: ansible_os_family == 'RedHat'
 
-- include: setup-Debian.yml
+- include_tasks: setup-Debian.yml
   when: ansible_os_family == 'Debian'
 
 - name: Ensure Varnish config path exists.
diff --git a/provisioning/roles/geerlingguy.varnish/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.varnish/tasks/setup-Debian.yml
index 2c912bd18..6428d917e 100644
--- a/provisioning/roles/geerlingguy.varnish/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.varnish/tasks/setup-Debian.yml
@@ -2,7 +2,7 @@
 - name: Ensure APT HTTPS Transport is installed.
   apt:
     name: apt-transport-https
-    state: installed
+    state: present
 
 - name: Add packagecloud.io Varnish apt key.
   apt_key:
diff --git a/provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml
index 86cd9dc3f..fc06952c3 100644
--- a/provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml
@@ -27,4 +27,4 @@
 - name: Ensure Varnish is installed.
   yum:
     name: "{{ varnish_package_name }}"
-    state: installed
+    state: present
diff --git a/provisioning/roles/geerlingguy.varnish/templates/varnish.j2 b/provisioning/roles/geerlingguy.varnish/templates/varnish.j2
index 0e5b97902..b63fbb0ab 100644
--- a/provisioning/roles/geerlingguy.varnish/templates/varnish.j2
+++ b/provisioning/roles/geerlingguy.varnish/templates/varnish.j2
@@ -106,6 +106,9 @@ DAEMON_OPTS="-a ${VARNISH_LISTEN_ADDRESS}:${VARNISH_LISTEN_PORT} \
              -p thread_pool_timeout=${VARNISH_THREAD_TIMEOUT} \
 {% if varnish_version | version_compare('4.1', '<') %}
              -u varnish -g varnish \
+{% endif %}
+{% if varnishd_extra_options %}
+             {{ varnishd_extra_options }}
 {% endif %}
              -S ${VARNISH_SECRET_FILE} \
              -s ${VARNISH_STORAGE}"
diff --git a/provisioning/roles/geerlingguy.varnish/templates/varnish.params.j2 b/provisioning/roles/geerlingguy.varnish/templates/varnish.params.j2
index bd5637e9c..e6c9cbcd0 100644
--- a/provisioning/roles/geerlingguy.varnish/templates/varnish.params.j2
+++ b/provisioning/roles/geerlingguy.varnish/templates/varnish.params.j2
@@ -32,4 +32,6 @@ VARNISH_USER=varnish
 VARNISH_GROUP=varnish
 
 # Other options, see the man page varnishd(1)
-#DAEMON_OPTS="-p thread_pool_min=5 -p thread_pool_max=500 -p thread_pool_timeout=300"
+{% if varnishd_extra_options %}
+DAEMON_OPTS="{{ varnishd_extra_options }}"
+{% endif %}
diff --git a/provisioning/roles/geerlingguy.varnish/templates/varnish.service.j2 b/provisioning/roles/geerlingguy.varnish/templates/varnish.service.j2
index 40c4e98df..80d0377a2 100644
--- a/provisioning/roles/geerlingguy.varnish/templates/varnish.service.j2
+++ b/provisioning/roles/geerlingguy.varnish/templates/varnish.service.j2
@@ -8,7 +8,7 @@ PIDFile={{ varnish_pidfile }}
 {% endif %}
 LimitNOFILE={{ varnish_limit_nofile }}
 LimitMEMLOCK=82000
-ExecStart=/usr/sbin/varnishd -a :{{ varnish_listen_port }} -T {{ varnish_admin_listen_host }}:{{ varnish_admin_listen_port }}{% if varnish_pidfile %} -P {{ varnish_pidfile }}{% endif %} -f {{ varnish_config_path }}/default.vcl -S {{ varnish_config_path }}/secret -s {{ varnish_storage }}
+ExecStart=/usr/sbin/varnishd -a :{{ varnish_listen_port }} -T {{ varnish_admin_listen_host }}:{{ varnish_admin_listen_port }}{% if varnish_pidfile %} -P {{ varnish_pidfile }}{% endif %} -f {{ varnish_config_path }}/default.vcl -S {{ varnish_config_path }}/secret -s {{ varnish_storage }} {{ varnishd_extra_options }}
 ExecReload=/usr/share/varnish/reload-vcl
 
 [Install]
diff --git a/provisioning/roles/geerlingguy.varnish/tests/test-41.yml b/provisioning/roles/geerlingguy.varnish/tests/test-41.yml
index 066b1dc39..6500c3942 100644
--- a/provisioning/roles/geerlingguy.varnish/tests/test-41.yml
+++ b/provisioning/roles/geerlingguy.varnish/tests/test-41.yml
@@ -5,10 +5,10 @@
     varnish_version: "4.1"
 
   pre_tasks:
-    - include: setup.yml
+    - import_tasks: setup.yml
 
   roles:
     - role_under_test
 
   post_tasks:
-    - include: debug.yml
+    - include_tasks: debug.yml
diff --git a/provisioning/roles/geerlingguy.varnish/tests/test.yml b/provisioning/roles/geerlingguy.varnish/tests/test.yml
index ba405e723..175abdf47 100644
--- a/provisioning/roles/geerlingguy.varnish/tests/test.yml
+++ b/provisioning/roles/geerlingguy.varnish/tests/test.yml
@@ -1,10 +1,10 @@
 - hosts: all
 
   pre_tasks:
-    - include: setup.yml
+    - import_tasks: setup.yml
 
   roles:
     - role_under_test
 
   post_tasks:
-    - include: debug.yml
+    - include_tasks: debug.yml

From 8f04366de25a8a1431ad807d30955578c566b11f Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 24 Apr 2018 15:46:27 -0500
Subject: [PATCH 0976/1273] Issue #1553: Update to latest Postgres role
 version.

---
 provisioning/requirements.yml                   |  2 +-
 .../roles/geerlingguy.postgresql/README.md      |  6 +++++-
 .../geerlingguy.postgresql/defaults/main.yml    |  4 ++++
 .../geerlingguy.postgresql/handlers/main.yml    |  5 ++++-
 .../roles/geerlingguy.postgresql/meta/main.yml  |  2 +-
 .../roles/geerlingguy.postgresql/tasks/main.yml | 17 +++++++----------
 .../tasks/setup-Debian.yml                      |  4 ++--
 .../tasks/setup-RedHat.yml                      |  4 ++--
 8 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index eb9fd345b..2f7429643 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -66,7 +66,7 @@
 - src: geerlingguy.postfix
   version: 2.0.0
 - src: geerlingguy.postgresql
-  version: 1.3.1
+  version: 1.4.1
 - src: geerlingguy.redis
   version: 1.5.1
 - src: geerlingguy.repo-remi
diff --git a/provisioning/roles/geerlingguy.postgresql/README.md b/provisioning/roles/geerlingguy.postgresql/README.md
index 04580d708..760262cd4 100644
--- a/provisioning/roles/geerlingguy.postgresql/README.md
+++ b/provisioning/roles/geerlingguy.postgresql/README.md
@@ -21,6 +21,10 @@ Available variables are listed below, along with default values (see `defaults/m
 
 (RHEL/CentOS only) You can set a repo to use for the PostgreSQL installation by passing it in here.
 
+    postgresql_restarted_state: "restarted"
+
+Set the state of the service when configuration changes are made. Recommended values are `restarted` or `reloaded`.
+
     postgresql_python_library: python-psycopg2
 
 Library used by Ansible to communicate with PostgreSQL. If you are using Python 3 (e.g. set via `ansible_python_interpreter`), you should change this to `python3-psycopg2`.
@@ -102,7 +106,7 @@ A list of users to ensure exist on the server. Only the `name` is required; all
     postgresql_daemon: [OS-specific]
     postgresql_packages: [OS-specific]
 
-OS-specific variables that are set by include files in this role's `vars` directory. These shouldn't be overridden unless you're using a verison of PostgreSQL that wasn't installed using system packages.
+OS-specific variables that are set by include files in this role's `vars` directory. These shouldn't be overridden unless you're using a version of PostgreSQL that wasn't installed using system packages.
 
 ## Dependencies
 
diff --git a/provisioning/roles/geerlingguy.postgresql/defaults/main.yml b/provisioning/roles/geerlingguy.postgresql/defaults/main.yml
index 6d9a154ee..25f2c2ff9 100644
--- a/provisioning/roles/geerlingguy.postgresql/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.postgresql/defaults/main.yml
@@ -2,6 +2,10 @@
 # RHEL/CentOS only. Set a repository to use for PostgreSQL installation.
 postgresql_enablerepo: ""
 
+# Set postgresql state when configuration changes are made. Recommended values:
+# `restarted` or `reloaded`
+postgresql_restarted_state: "restarted"
+
 postgresql_python_library: python-psycopg2
 postgresql_user: postgres
 postgresql_group: postgres
diff --git a/provisioning/roles/geerlingguy.postgresql/handlers/main.yml b/provisioning/roles/geerlingguy.postgresql/handlers/main.yml
index 523ad1b17..cce42b722 100644
--- a/provisioning/roles/geerlingguy.postgresql/handlers/main.yml
+++ b/provisioning/roles/geerlingguy.postgresql/handlers/main.yml
@@ -1,3 +1,6 @@
 ---
 - name: restart postgresql
-  service: "name={{ postgresql_daemon }} state=restarted sleep=5"
+  service:
+    name: "{{ postgresql_daemon }}"
+    state: "{{ postgresql_restarted_state }}"
+    sleep: 5
diff --git a/provisioning/roles/geerlingguy.postgresql/meta/main.yml b/provisioning/roles/geerlingguy.postgresql/meta/main.yml
index db0b759d6..8ed8f82fb 100644
--- a/provisioning/roles/geerlingguy.postgresql/meta/main.yml
+++ b/provisioning/roles/geerlingguy.postgresql/meta/main.yml
@@ -6,7 +6,7 @@ galaxy_info:
   description: PostgreSQL server for Linux.
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 2.0
+  min_ansible_version: 2.4
   platforms:
     - name: EL
       versions:
diff --git a/provisioning/roles/geerlingguy.postgresql/tasks/main.yml b/provisioning/roles/geerlingguy.postgresql/tasks/main.yml
index 3e5111478..6859c7395 100644
--- a/provisioning/roles/geerlingguy.postgresql/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.postgresql/tasks/main.yml
@@ -1,19 +1,16 @@
 ---
 # Variable configuration.
-- include: variables.yml
-  static: no
+- include_tasks: variables.yml
 
 # Setup/install tasks.
-- include: setup-RedHat.yml
+- include_tasks: setup-RedHat.yml
   when: ansible_os_family == 'RedHat'
-  static: no
 
-- include: setup-Debian.yml
+- include_tasks: setup-Debian.yml
   when: ansible_os_family == 'Debian'
-  static: no
 
-- include: initialize.yml
-- include: configure.yml
+- include_tasks: initialize.yml
+- include_tasks: configure.yml
 
 - name: Ensure PostgreSQL is started and enabled on boot.
   service:
@@ -22,5 +19,5 @@
     enabled: yes
 
 # Configure PostgreSQL.
-- include: databases.yml
-- include: users.yml
+- import_tasks: databases.yml
+- import_tasks: users.yml
diff --git a/provisioning/roles/geerlingguy.postgresql/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.postgresql/tasks/setup-Debian.yml
index fdfcc44f0..fc47d0f02 100644
--- a/provisioning/roles/geerlingguy.postgresql/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.postgresql/tasks/setup-Debian.yml
@@ -2,12 +2,12 @@
 - name: Ensure PostgreSQL Python libraries are installed.
   apt:
     name: "{{ postgresql_python_library }}"
-    state: installed
+    state: present
 
 - name: Ensure PostgreSQL packages are installed.
   apt:
     name: "{{ item }}"
-    state: installed
+    state: present
   with_items: "{{ postgresql_packages }}"
 
 - name: Ensure all configured locales are present.
diff --git a/provisioning/roles/geerlingguy.postgresql/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.postgresql/tasks/setup-RedHat.yml
index d0ce7c7de..da39ac151 100644
--- a/provisioning/roles/geerlingguy.postgresql/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.postgresql/tasks/setup-RedHat.yml
@@ -2,12 +2,12 @@
 - name: Ensure PostgreSQL packages are installed.
   package:
     name: "{{ item }}"
-    state: installed
+    state: present
     enablerepo: "{{ postgresql_enablerepo }}"
   with_items: "{{ postgresql_packages }}"
 
 - name: Ensure PostgreSQL Python libraries are installed.
   package:
     name: "{{ postgresql_python_library }}"
-    state: installed
+    state: present
     enablerepo: "{{ postgresql_enablerepo }}"

From 635700b378323ec14e875a6c66f98cbd756da3ae Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 25 Apr 2018 09:44:28 -0500
Subject: [PATCH 0977/1273] Issue #1553: Update to latest New Relic role
 version.

---
 provisioning/requirements.yml                 |   2 +-
 .../roles/franklinkim.newrelic/.editorconfig  |   3 +
 .../roles/franklinkim.newrelic/.gitignore     |  12 +-
 .../roles/franklinkim.newrelic/.travis.yml    |  57 +++-
 .../roles/franklinkim.newrelic/CHANGELOG.md   |  27 ++
 .../roles/franklinkim.newrelic/Makefile       |  25 ++
 .../roles/franklinkim.newrelic/README.md      |   5 +-
 .../franklinkim.newrelic/defaults/main.yml    |   4 +-
 .../roles/franklinkim.newrelic/meta/main.yml  | 259 +++++++++++-------
 .../franklinkim.newrelic/tasks/install.yml    |   4 +-
 .../tasks/install_debian.yml                  |   1 +
 .../roles/franklinkim.newrelic/tasks/main.yml |   6 +-
 .../roles/franklinkim.newrelic/tests/main.yml |   1 -
 .../roles/franklinkim.newrelic/tests/run.sh   |  17 --
 14 files changed, 282 insertions(+), 141 deletions(-)
 create mode 100644 provisioning/roles/franklinkim.newrelic/Makefile
 delete mode 100755 provisioning/roles/franklinkim.newrelic/tests/run.sh

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 2f7429643..58e0e3379 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -4,7 +4,7 @@
 - src: thom8.php-upload-progress
   version: 1.0.1
 - src: franklinkim.newrelic
-  version: 1.6.0
+  version: 1.7.2
 - src: geerlingguy.adminer
   version: 1.2.0
 - src: geerlingguy.apache
diff --git a/provisioning/roles/franklinkim.newrelic/.editorconfig b/provisioning/roles/franklinkim.newrelic/.editorconfig
index e99064344..737f59183 100644
--- a/provisioning/roles/franklinkim.newrelic/.editorconfig
+++ b/provisioning/roles/franklinkim.newrelic/.editorconfig
@@ -14,3 +14,6 @@ charset = utf-8
 end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
+
+[Makefile]
+indent_style = tab
diff --git a/provisioning/roles/franklinkim.newrelic/.gitignore b/provisioning/roles/franklinkim.newrelic/.gitignore
index 91bcbe432..61f047aff 100644
--- a/provisioning/roles/franklinkim.newrelic/.gitignore
+++ b/provisioning/roles/franklinkim.newrelic/.gitignore
@@ -1,6 +1,6 @@
-.*
-*~
-!.git*
-!.clog.toml
-!.travis.yml
-!.editorconfig
+*.log
+*.retry
+.DS_Store
+.vagrant
+.vscode
+.idea
diff --git a/provisioning/roles/franklinkim.newrelic/.travis.yml b/provisioning/roles/franklinkim.newrelic/.travis.yml
index f2bd5cf73..dc0ff1a4a 100644
--- a/provisioning/roles/franklinkim.newrelic/.travis.yml
+++ b/provisioning/roles/franklinkim.newrelic/.travis.yml
@@ -1,10 +1,57 @@
 ---
-
-language: ruby
 sudo: required
+language: python
 services:
   - docker
-install:
-  - docker pull franklinkim/ansible:ubuntu-trusty
+env:
+  global:
+    - role: franklinkim.newrelic
+  matrix:
+    - distribution: Ubuntu
+      distribution_version: xenial
+      init: /lib/systemd/systemd
+      run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    - distribution: Ubuntu
+      distribution_version: trusty
+      init: /sbin/init
+      run_opts: ""
+    - distribution: Debian
+      distribution_version: stretch
+      init: /lib/systemd/systemd
+      run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    - distribution: Debian
+      distribution_version: jessie
+      init: /lib/systemd/systemd
+      run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    - distribution: EL
+      distribution_version: "7"
+      init: /usr/lib/systemd/systemd
+      run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+
+before_install:
+  - sudo apt-get update
+  - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
+  - docker pull ansiblecheck/ansiblecheck:"${distribution,,}"-"${distribution_version}"
+
 script:
-  - docker run -v $(pwd):/opt/ansible franklinkim/ansible:ubuntu-trusty tests/run.sh
+  - container_id=$(mktemp)
+  # Start The Built Container In The Background
+  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/${role}:ro ${run_opts} ansiblecheck/ansiblecheck:"${distribution,,}"-"${distribution_version}" "${init}" > "${container_id}"'
+
+  # Ansible syntax check.
+  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/${role}/tests/main.yml --syntax-check'
+
+  # Test role.
+  - 'docker exec "$(cat ${container_id})" env ANSIBLE_FORCE_COLOR=1 ansible-playbook /etc/ansible/roles/${role}/tests/main.yml'
+
+  # Test Idempotence
+  - idempotence=$(mktemp)
+  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/${role}/tests/main.yml | tee -a ${idempotence}
+  - >
+    tail ${idempotence}
+    | grep -q 'failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/franklinkim.newrelic/CHANGELOG.md b/provisioning/roles/franklinkim.newrelic/CHANGELOG.md
index 6831e5541..602d23980 100644
--- a/provisioning/roles/franklinkim.newrelic/CHANGELOG.md
+++ b/provisioning/roles/franklinkim.newrelic/CHANGELOG.md
@@ -1,3 +1,30 @@
+<a name="1.7.2"></a>
+### 1.7.2 (2018-04-25)
+
+
+#### Features
+
+*   update apt on dependency installation ([af5a4208](https://github.com/weareinteractive/ansible-newrelic/commit/af5a42085a23f6aa90d73d597a6f772e2eed4559))
+*   update depricated include module ([b00a529f](https://github.com/weareinteractive/ansible-newrelic/commit/b00a529fb329868218626e40760d6b801d6a13dc))
+
+
+
+<a name="1.7.1"></a>
+### 1.7.1 (2017-11-07)
+
+
+
+
+<a name="1.7.0"></a>
+## 1.7.0 (2017-11-04)
+
+
+#### Features
+
+*   remove default hostname ([8808db40](https://github.com/weareinteractive/ansible-newrelic/commit/8808db40d26ce00e5b9a2390ad1fde7fc5359ca5))
+
+
+
 <a name="1.6.0"></a>
 ## 1.6.0 (2016-11-11)
 
diff --git a/provisioning/roles/franklinkim.newrelic/Makefile b/provisioning/roles/franklinkim.newrelic/Makefile
new file mode 100644
index 000000000..458633e98
--- /dev/null
+++ b/provisioning/roles/franklinkim.newrelic/Makefile
@@ -0,0 +1,25 @@
+PWD=$(shell pwd)
+ROLE_NAME=franklinkim.newrelic
+ROLE_PATH=/etc/ansible/roles/$(ROLE_NAME)
+TEST_VERSION=ansible --version
+TEST_SYNTAX=ansible-playbook -v -i 'localhost,' -c local $(ROLE_PATH)/tests/main.yml --syntax-check
+TEST_PLAYBOOK=ansible-playbook -vvvv -i 'localhost,' -c local $(ROLE_PATH)/tests/main.yml
+TEST_CMD=$(TEST_VERSION); $(TEST_SYNTAX); $(TEST_PLAYBOOK); $(TEST_PLAYBOOK)
+
+ubuntu16.04: dist=ubuntu-16.04
+ubuntu16.04: .run
+
+ubuntu14.04: dist=ubuntu-14.04
+ubuntu14.04: .run
+
+debian9: dist=debian-9
+debian9: .run
+
+debian8: dist=debian-8
+debian8: .run
+
+centos7: dist=el-7
+centos7: .run
+
+.run:
+	docker run -it --rm -v $(PWD):$(ROLE_PATH) ansiblecheck/ansiblecheck:$(dist) /bin/bash -c "$(TEST_CMD)"
diff --git a/provisioning/roles/franklinkim.newrelic/README.md b/provisioning/roles/franklinkim.newrelic/README.md
index 80fdc1388..597470deb 100644
--- a/provisioning/roles/franklinkim.newrelic/README.md
+++ b/provisioning/roles/franklinkim.newrelic/README.md
@@ -50,7 +50,7 @@ newrelic_user: newrelic
 newrelic_group: newrelic
 # User groups to append to user
 newrelic_groups: []
-# Name of the file where the server monitor will store it's log messages.
+# Name of the file where the server monitor will store its log messages.
 newrelic_logfile: /var/log/newrelic/nrsysmond.log
 # Level of detail you want in the log file
 newrelic_loglevel: info
@@ -63,7 +63,7 @@ newrelic_service_enabled: yes
 # current state: started, stopped
 newrelic_service_state: started
 # use default hostname, set a value to override the default hostname
-newrelic_override_hostname: ~
+newrelic_override_hostname:
 # A series of label_type/label_value pairings: label_type:label_value
 newrelic_labels:
 # proxy server to use (i.e. proxy-host:8080)
@@ -97,7 +97,6 @@ This is an example playbook:
 ---
 
 - hosts: all
-  become: yes
   roles:
     - franklinkim.newrelic
   vars:
diff --git a/provisioning/roles/franklinkim.newrelic/defaults/main.yml b/provisioning/roles/franklinkim.newrelic/defaults/main.yml
index 722d2e729..2df4878aa 100644
--- a/provisioning/roles/franklinkim.newrelic/defaults/main.yml
+++ b/provisioning/roles/franklinkim.newrelic/defaults/main.yml
@@ -8,7 +8,7 @@ newrelic_user: newrelic
 newrelic_group: newrelic
 # User groups to append to user
 newrelic_groups: []
-# Name of the file where the server monitor will store it's log messages.
+# Name of the file where the server monitor will store its log messages.
 newrelic_logfile: /var/log/newrelic/nrsysmond.log
 # Level of detail you want in the log file
 newrelic_loglevel: info
@@ -21,7 +21,7 @@ newrelic_service_enabled: yes
 # current state: started, stopped
 newrelic_service_state: started
 # use default hostname, set a value to override the default hostname
-newrelic_override_hostname: ~
+newrelic_override_hostname:
 # A series of label_type/label_value pairings: label_type:label_value
 newrelic_labels:
 # proxy server to use (i.e. proxy-host:8080)
diff --git a/provisioning/roles/franklinkim.newrelic/meta/main.yml b/provisioning/roles/franklinkim.newrelic/meta/main.yml
index 89849bcf4..efa4e96a0 100644
--- a/provisioning/roles/franklinkim.newrelic/meta/main.yml
+++ b/provisioning/roles/franklinkim.newrelic/meta/main.yml
@@ -13,128 +13,185 @@ galaxy_info:
   # (usually master) will be used.
   github_branch: master
   #
+  # List tags for your role here, one per line. A tag is
+  # a keyword that describes and categorizes the role.
+  # Users find roles by searching for tags. Be sure to
+  # remove the '[]' above if you add tags to this list.
+  #
+  # NOTE: A tag is limited to a single word comprised of
+  # alphanumeric characters. Maximum 20 tags per role.
+  #
+  galaxy_tags:
+    - monitoring
+    - newrelic
+  #
   # Below are all platforms currently available. Just uncomment
   # the ones that apply to your role. If you don't see your
   # platform on this list, let us know and we'll get it added!
   #
   platforms:
-  - name: EL
-    versions:
-    - all
-  #  - 5
-  #  - 6
-  #  - 7
-  #- name: GenericUNIX
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Solaris
+  #- name: OpenBSD
   #  versions:
-  #  - all
-  #  - 10
-  #  - 11.0
-  #  - 11.1
-  #  - 11.2
-  #  - 11.3
+  #    - all
+  #    - 5.6
+  #    - 5.7
+  #    - 5.8
+  #    - 5.9
+  #    - 6.0
   #- name: Fedora
   #  versions:
-  #  - all
-  #  - 16
-  #  - 17
-  #  - 18
-  #  - 19
-  #  - 20
-  #  - 21
-  #  - 22
-  #  - 23
-  #- name: Windows
+  #    - all
+  #   - 16
+  #   - 17
+  #   - 18
+  #   - 19
+  #   - 20
+  #   - 21
+  #   - 22
+  #   - 23
+  #   - 24
+  #- name: DellOS
   #  versions:
-  #  - all
-  #  - 2012R2
-  #- name: SmartOS
+  #    - all
+  #    - 10
+  #    - 6
+  #    - 9
+  #- name: MacOSX
   #  versions:
-  #  - all
-  #  - any
-  #- name: opensuse
+  #    - all
+  #    - 10.10
+  #    - 10.11
+  #    - 10.12
+  #    - 10.7
+  #    - 10.8
+  #    - 10.9
+  #- name: Junos
+  #  versions:
+  #    - all
+  #    - any
+  #- name: GenericBSD
+  #  versions:
+  #    - all
+  #    - any
+  #- name: Void Linux
+  #  versions:
+  #    - all
+  #    - any
+  #- name: GenericLinux
   #  versions:
-  #  - all
-  #  - 12.1
-  #  - 12.2
-  #  - 12.3
-  #  - 13.1
-  #  - 13.2
+  #    - all
+  #    - any
+  #- name: NXOS
+  #  versions:
+  #    - all
+  #    - any
+  #- name: IOS
+  #  versions:
+  #    - all
+  #    - any
   #- name: Amazon
   #  versions:
-  #  - all
-  #  - 2013.03
-  #  - 2013.09
-  #- name: GenericBSD
+  #    - all
+  #    - 2013.03
+  #    - 2013.09
+  #    - 2016.03
+  #- name: ArchLinux
   #  versions:
-  #  - all
-  #  - any
+  #    - all
+  #    - any
   #- name: FreeBSD
   #  versions:
-  #  - all
-  #  - 10.0
-  #  - 10.1
-  #  - 10.2
-  #  - 8.0
-  #  - 8.1
-  #  - 8.2
-  #  - 8.3
-  #  - 8.4
-  #  - 9.0
-  #  - 9.1
-  #  - 9.1
-  #  - 9.2
-  #  - 9.3
+  #    - all
+  #    - 10.0
+  #    - 10.1
+  #    - 10.2
+  #    - 10.3
+  #    - 8.0
+  #    - 8.1
+  #    - 8.2
+  #    - 8.3
+  #    - 8.4
+  #    - 9.0
+  #    - 9.1
+  #    - 9.1
+  #    - 9.2
+  #    - 9.3
   - name: Ubuntu
     versions:
-    - all
-  #  - lucid
-  #  - maverick
-  #  - natty
-  #  - oneiric
-  #  - precise
-  #  - quantal
-  #  - raring
-  #  - saucy
-  #  - trusty
-  #  - utopic
-  #  - vivid
-  #  - wily
+  #    - all
+  #    - lucid
+  #    - maverick
+  #    - natty
+  #    - oneiric
+  #    - precise
+  #    - quantal
+  #    - raring
+  #    - saucy
+      - trusty
+  #    - utopic
+  #    - vivid
+  #    - wily
+      - xenial
+  - name: Debian
+    versions:
+  #    - all
+  #    - etch
+      - jessie
+  #    - lenny
+  #    - sid
+  #    - squeeze
+      - stretch
+  #    - wheezy
+  - name: EL
+    versions:
+  #    - all
+  #    - 5
+  #    - 6
+      - 7
+  #- name: Windows
+  #  versions:
+  #    - all
+  #    - 2012R2
+  #- name: SmartOS
+  #  versions:
+  #    - all
+  #    - any
+  #- name: opensuse
+  #  versions:
+  #    - all
+  #    - 12.1
+  #    - 12.2
+  #    - 12.3
+  #    - 13.1
+  #    - 13.2
   #- name: SLES
   #  versions:
-  #  - all
-  #  - 10SP3
-  #  - 10SP4
-  #  - 11
-  #  - 11SP1
-  #  - 11SP2
-  #  - 11SP3
-  #- name: GenericLinux
+  #    - all
+  #    - 10SP3
+  #    - 10SP4
+  #    - 11
+  #    - 11SP1
+  #    - 11SP2
+  #    - 11SP3
+  #    - 11SP4
+  #    - 12
+  #    - 12SP1
+  #- name: GenericUNIX
   #  versions:
-  #  - all
-  #  - any
-  - name: Debian
-    versions:
-    - all
-  #  - etch
-  #  - jessie
-  #  - lenny
-  #  - squeeze
-  #  - wheezy  categories:
-  #
-  # List tags for your role here, one per line. A tag is
-  # a keyword that describes and categorizes the role.
-  # Users find roles by searching for tags. Be sure to
-  # remove the '[]' above if you add tags to this list.
-  #
-  # NOTE: A tag is limited to a single word comprised of
-  # alphanumeric characters. Maximum 20 tags per role.
-  galaxy_tags:
-    - monitoring
-    - newrelic
+  #    - all
+  #    - any
+  #- name: Solaris
+  #  versions:
+  #    - all
+  #    - 10
+  #    - 11.0
+  #    - 11.1
+  #    - 11.2
+  #    - 11.3
+  #- name: eos
+  #  versions:
+  #    - all
+  #    - Any
 # List your role dependencies here, one per line. Only
 # dependencies available via galaxy should be listed here.
 # Be sure to remove the '[]' above if you add dependencies
diff --git a/provisioning/roles/franklinkim.newrelic/tasks/install.yml b/provisioning/roles/franklinkim.newrelic/tasks/install.yml
index f56069d09..46b9ba804 100644
--- a/provisioning/roles/franklinkim.newrelic/tasks/install.yml
+++ b/provisioning/roles/franklinkim.newrelic/tasks/install.yml
@@ -1,7 +1,7 @@
 ---
 
-- include: install_debian.yml
+- import_tasks: install_debian.yml
   when: ansible_os_family == 'Debian'
 
-- include: install_redhat.yml
+- import_tasks: install_redhat.yml
   when: ansible_os_family == 'RedHat'
diff --git a/provisioning/roles/franklinkim.newrelic/tasks/install_debian.yml b/provisioning/roles/franklinkim.newrelic/tasks/install_debian.yml
index 6f0e16d58..18158de11 100644
--- a/provisioning/roles/franklinkim.newrelic/tasks/install_debian.yml
+++ b/provisioning/roles/franklinkim.newrelic/tasks/install_debian.yml
@@ -3,6 +3,7 @@
 - name: Installing dependencies
   apt:
     pkg: apt-transport-https
+    update_cache: yes
     state: present
 
 - name: Adding APT key
diff --git a/provisioning/roles/franklinkim.newrelic/tasks/main.yml b/provisioning/roles/franklinkim.newrelic/tasks/main.yml
index 514a108ba..9f6b7fe87 100644
--- a/provisioning/roles/franklinkim.newrelic/tasks/main.yml
+++ b/provisioning/roles/franklinkim.newrelic/tasks/main.yml
@@ -5,21 +5,21 @@
     msg: "newrelic_license_key has not been defined"
   when: newrelic_license_key|default(False) == False
 
-- include: install.yml
+- import_tasks: install.yml
   tags:
     - monitoring
     - newrelic
     - install
     - newrelic-install
 
-- include: config.yml
+- import_tasks: config.yml
   tags:
     - monitoring
     - newrelic
     - config
     - newrelic-config
 
-- include: service.yml
+- import_tasks: service.yml
   tags:
     - monitoring
     - newrelic
diff --git a/provisioning/roles/franklinkim.newrelic/tests/main.yml b/provisioning/roles/franklinkim.newrelic/tests/main.yml
index 60404e597..e35a5b5a9 100644
--- a/provisioning/roles/franklinkim.newrelic/tests/main.yml
+++ b/provisioning/roles/franklinkim.newrelic/tests/main.yml
@@ -1,7 +1,6 @@
 ---
 
 - hosts: all
-  become: yes
   roles:
     - franklinkim.newrelic
   vars:
diff --git a/provisioning/roles/franklinkim.newrelic/tests/run.sh b/provisioning/roles/franklinkim.newrelic/tests/run.sh
deleted file mode 100755
index 72e2f4dc5..000000000
--- a/provisioning/roles/franklinkim.newrelic/tests/run.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-# define variables
-ROLE_NAME=franklinkim.newrelic
-
-# install dependencies
-# echo '* installing dependencies'
-# ansible-galaxy install franklinkim.openssl
-
-# create role symlink
-echo '* creating symlink'
-ln -s $(pwd) /usr/share/ansible/roles/$ROLE_NAME
-
-# run tests
-echo 'running playbook'
-ansible-playbook --syntax-check -i 'localhost,' -c local $(pwd)/tests/main.yml
-ansible-playbook -vvvv -i 'localhost,' -c local $(pwd)/tests/main.yml

From 0f0baad2183abde7c5851bf58564f1af80204550 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 25 Apr 2018 09:59:58 -0500
Subject: [PATCH 0978/1273] Issue #1553: Fix 'state=installed' deprecation
 warnings, update many roles.

---
 examples/prod/prod.config.yml                 |  2 +-
 provisioning/requirements.yml                 | 22 ++++-----
 .../geerlingguy.daemonize/tests/test.yml      |  2 +-
 .../geerlingguy.elasticsearch/.gitignore      |  2 +
 .../geerlingguy.elasticsearch/.travis.yml     | 41 ++++------------
 .../roles/geerlingguy.elasticsearch/LICENSE   | 20 ++++++++
 .../roles/geerlingguy.elasticsearch/README.md |  2 +-
 .../tasks/setup-RedHat.yml                    |  2 +-
 .../geerlingguy.elasticsearch/tests/README.md | 11 +++++
 .../tasks/install-from-source.yml             |  4 +-
 .../roles/geerlingguy.git/tasks/main.yml      |  4 +-
 .../geerlingguy.java/tasks/setup-RedHat.yml   |  2 +-
 .../roles/geerlingguy.mailhog/.travis.yml     |  3 +-
 .../roles/geerlingguy.mailhog/tests/test.yml  |  2 +-
 .../roles/geerlingguy.memcached/.gitignore    |  3 +-
 .../roles/geerlingguy.memcached/.travis.yml   | 47 ++++---------------
 .../roles/geerlingguy.memcached/LICENSE       | 20 ++++++++
 .../roles/geerlingguy.memcached/README.md     |  2 +-
 .../geerlingguy.memcached/tasks/main.yml      |  2 +-
 .../geerlingguy.memcached/tests/README.md     | 11 +++++
 .../roles/geerlingguy.mysql/README.md         |  1 +
 .../roles/geerlingguy.mysql/defaults/main.yml |  3 ++
 .../geerlingguy.mysql/tasks/configure.yml     |  4 +-
 .../geerlingguy.mysql/tasks/setup-Debian.yml  |  4 +-
 .../geerlingguy.mysql/tasks/setup-RedHat.yml  |  4 +-
 .../roles/geerlingguy.mysql/vars/Debian.yml   |  1 +
 .../geerlingguy.php-memcached/.gitignore      |  2 +
 .../geerlingguy.php-memcached/.travis.yml     | 40 +++++-----------
 .../roles/geerlingguy.php-memcached/LICENSE   | 20 ++++++++
 .../roles/geerlingguy.php-memcached/README.md |  2 +-
 .../geerlingguy.php-memcached/tasks/main.yml  |  4 +-
 .../geerlingguy.php-memcached/tests/README.md | 11 +++++
 .../geerlingguy.php-memcached/tests/inventory |  1 -
 .../tests/requirements.yml                    |  3 ++
 .../geerlingguy.php-memcached/tests/test.yml  |  6 +--
 .../roles/geerlingguy.php-redis/.gitignore    |  2 +
 .../roles/geerlingguy.php-redis/.travis.yml   | 37 ++++-----------
 .../roles/geerlingguy.php-redis/LICENSE       | 20 ++++++++
 .../roles/geerlingguy.php-redis/README.md     |  2 +-
 .../geerlingguy.php-redis/tasks/main.yml      |  4 +-
 .../geerlingguy.php-redis/tests/README.md     | 11 +++++
 .../geerlingguy.php-tideways/.travis.yml      |  2 +-
 .../geerlingguy.php-tideways/tasks/main.yml   |  2 +-
 .../geerlingguy.php-tideways/tasks/xhprof.yml |  2 +-
 .../roles/geerlingguy.php-xhprof/.gitignore   |  3 +-
 .../roles/geerlingguy.php-xhprof/.travis.yml  | 39 ++++-----------
 .../roles/geerlingguy.php-xhprof/LICENSE      | 20 ++++++++
 .../roles/geerlingguy.php-xhprof/README.md    |  2 +-
 .../geerlingguy.php-xhprof/tasks/main.yml     |  2 +-
 .../geerlingguy.php-xhprof/tests/README.md    | 11 +++++
 provisioning/roles/geerlingguy.php/README.md  |  2 +-
 .../roles/geerlingguy.php/defaults/main.yml   |  4 +-
 .../tasks/install-from-source.yml             |  4 +-
 provisioning/tasks/extras.yml                 |  4 +-
 provisioning/tasks/init-Debian.yml            |  2 +-
 provisioning/tasks/init-RedHat.yml            |  2 +-
 56 files changed, 274 insertions(+), 213 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.elasticsearch/.gitignore
 create mode 100644 provisioning/roles/geerlingguy.elasticsearch/LICENSE
 create mode 100644 provisioning/roles/geerlingguy.elasticsearch/tests/README.md
 create mode 100644 provisioning/roles/geerlingguy.memcached/LICENSE
 create mode 100644 provisioning/roles/geerlingguy.memcached/tests/README.md
 create mode 100644 provisioning/roles/geerlingguy.php-memcached/.gitignore
 create mode 100644 provisioning/roles/geerlingguy.php-memcached/LICENSE
 create mode 100644 provisioning/roles/geerlingguy.php-memcached/tests/README.md
 delete mode 100644 provisioning/roles/geerlingguy.php-memcached/tests/inventory
 create mode 100644 provisioning/roles/geerlingguy.php-memcached/tests/requirements.yml
 create mode 100644 provisioning/roles/geerlingguy.php-redis/.gitignore
 create mode 100644 provisioning/roles/geerlingguy.php-redis/LICENSE
 create mode 100644 provisioning/roles/geerlingguy.php-redis/tests/README.md
 create mode 100644 provisioning/roles/geerlingguy.php-xhprof/LICENSE
 create mode 100644 provisioning/roles/geerlingguy.php-xhprof/tests/README.md

diff --git a/examples/prod/prod.config.yml b/examples/prod/prod.config.yml
index 524d85dc6..a5cd12ec1 100644
--- a/examples/prod/prod.config.yml
+++ b/examples/prod/prod.config.yml
@@ -26,7 +26,7 @@ installed_extras:
   - varnish
 
 # Disable Apache package upgrades.
-apache_packages_state: installed
+apache_packages_state: present
 
 # Disable the dashboard page. Also remove any unneeded virtualhosts.
 dashboard_install_dir: ''
diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 58e0e3379..ed53ee025 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -24,27 +24,27 @@
 - src: geerlingguy.drush
   version: 3.0.0
 - src: geerlingguy.elasticsearch
-  version: 2.1.3
+  version: 2.1.4
 - src: geerlingguy.firewall
   version: 2.3.1
 - src: geerlingguy.git
-  version: 2.0.1
+  version: 2.0.2
 - src: geerlingguy.java
-  version: 1.7.6
+  version: 1.7.7
 - src: geerlingguy.mailhog
-  version: 2.1.3
+  version: 2.1.4
 - src: geerlingguy.memcached
-  version: 1.0.7
+  version: 1.0.8
 - src: geerlingguy.mysql
-  version: 2.8.1
+  version: 2.8.3
 - src: geerlingguy.nginx
   version: 2.6.0
 - src: geerlingguy.nodejs
   version: 4.1.2
 - src: geerlingguy.php
-  version: 3.5.1
+  version: 3.5.2
 - src: geerlingguy.php-memcached
-  version: 2.0.0
+  version: 2.0.1
 - src: geerlingguy.php-mysql
   version: 2.0.1
 - src: geerlingguy.php-pecl
@@ -52,15 +52,15 @@
 - src: geerlingguy.php-pgsql
   version: 1.0.0
 - src: geerlingguy.php-redis
-  version: 3.1.0
+  version: 3.1.1
 - src: geerlingguy.php-tideways
-  version: 2.0.1
+  version: 2.0.2
 - src: geerlingguy.php-versions
   version: 2.0.0
 - src: geerlingguy.php-xdebug
   version: 2.5.0
 - src: geerlingguy.php-xhprof
-  version: 2.2.2
+  version: 2.2.3
 - src: geerlingguy.pimpmylog
   version: 1.0.2
 - src: geerlingguy.postfix
diff --git a/provisioning/roles/geerlingguy.daemonize/tests/test.yml b/provisioning/roles/geerlingguy.daemonize/tests/test.yml
index 9d3720595..3b4e619d7 100644
--- a/provisioning/roles/geerlingguy.daemonize/tests/test.yml
+++ b/provisioning/roles/geerlingguy.daemonize/tests/test.yml
@@ -16,7 +16,7 @@
       changed_when: false
 
     - name: Ensure build dependencies are installed (Debian).
-      apt: 'name="{{ item }}" state=installed'
+      apt: 'name="{{ item }}" state=present'
       with_items:
         - build-essential
         - unzip
diff --git a/provisioning/roles/geerlingguy.elasticsearch/.gitignore b/provisioning/roles/geerlingguy.elasticsearch/.gitignore
new file mode 100644
index 000000000..c9b2377e3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.elasticsearch/.gitignore
@@ -0,0 +1,2 @@
+*.retry
+tests/test.sh
diff --git a/provisioning/roles/geerlingguy.elasticsearch/.travis.yml b/provisioning/roles/geerlingguy.elasticsearch/.travis.yml
index 03ce07776..6082c46e4 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/.travis.yml
+++ b/provisioning/roles/geerlingguy.elasticsearch/.travis.yml
@@ -3,47 +3,24 @@ services: docker
 
 env:
   - distro: centos7
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
   - distro: ubuntu1604
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
   - distro: ubuntu1404
-    init: /sbin/init
-    run_opts: ""
   - distro: ubuntu1204
-    init: /sbin/init
-    run_opts: ""
-
-before_install:
-  # Pull container.
-  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
-  - container_id=$(mktemp)
-  # Run container in detached state.
-  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
-
-  # Install dependencies.
-  - 'docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
-
-  # Ansible syntax check.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+  # Configure test script so we can run extra tests after playbook is run.
+  - export container_id=$(date +%s)
+  - export cleanup=false
 
-  # Test role.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+  # Download test shim.
+  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
+  - chmod +x ${PWD}/tests/test.sh
 
-  # Test role idempotence.
-  - idempotence=$(mktemp)
-  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
-  - >
-    tail ${idempotence}
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
+  # Run tests.
+  - ${PWD}/tests/test.sh
 
   # Test if Elasticsearch is working.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm curl -XGET localhost:9200'
+  - 'docker exec --tty ${container_id} env TERM=xterm curl -XGET localhost:9200'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.elasticsearch/LICENSE b/provisioning/roles/geerlingguy.elasticsearch/LICENSE
new file mode 100644
index 000000000..4275cf3c1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.elasticsearch/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Jeff Geerling
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/provisioning/roles/geerlingguy.elasticsearch/README.md b/provisioning/roles/geerlingguy.elasticsearch/README.md
index 7a3494f36..4fc5d121c 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/README.md
+++ b/provisioning/roles/geerlingguy.elasticsearch/README.md
@@ -41,4 +41,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.elasticsearch/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.elasticsearch/tasks/setup-RedHat.yml
index 543cce2f0..8997f721a 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.elasticsearch/tasks/setup-RedHat.yml
@@ -11,4 +11,4 @@
     mode: 0644
 
 - name: Install Elasticsearch.
-  yum: pkg=elasticsearch state=installed
+  yum: pkg=elasticsearch state=present
diff --git a/provisioning/roles/geerlingguy.elasticsearch/tests/README.md b/provisioning/roles/geerlingguy.elasticsearch/tests/README.md
new file mode 100644
index 000000000..6fb211721
--- /dev/null
+++ b/provisioning/roles/geerlingguy.elasticsearch/tests/README.md
@@ -0,0 +1,11 @@
+# Ansible Role tests
+
+To run the test playbook(s) in this directory:
+
+  1. Install and start Docker.
+  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
+    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
+  1. Make the test shim executable: `chmod +x tests/test.sh`.
+  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
+
+If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.git/tasks/install-from-source.yml b/provisioning/roles/geerlingguy.git/tasks/install-from-source.yml
index e2fe77835..18c25e21e 100644
--- a/provisioning/roles/geerlingguy.git/tasks/install-from-source.yml
+++ b/provisioning/roles/geerlingguy.git/tasks/install-from-source.yml
@@ -20,12 +20,12 @@
   when: git_install_from_source_dependencies is not defined
 
 - name: Ensure git's dependencies are installed (RedHat).
-  package: "name={{ item }} state=installed"
+  package: "name={{ item }} state=present"
   with_items: "{{ git_install_from_source_dependencies }}"
   when: ansible_os_family == 'RedHat'
 
 - name: Ensure git's dependencies are installed (Debian).
-  apt: "name={{ item }} state=installed"
+  apt: "name={{ item }} state=present"
   with_items: "{{ git_install_from_source_dependencies }}"
   when: ansible_os_family == 'Debian'
 
diff --git a/provisioning/roles/geerlingguy.git/tasks/main.yml b/provisioning/roles/geerlingguy.git/tasks/main.yml
index 8cffb9d92..055b57e98 100644
--- a/provisioning/roles/geerlingguy.git/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.git/tasks/main.yml
@@ -2,7 +2,7 @@
 - name: Ensure git is installed (RedHat).
   package:
     name: "{{ item }}"
-    state: installed
+    state: present
     enablerepo: "{{ git_enablerepo }}"
   with_items: "{{ git_packages }}"
   when: (git_install_from_source == false) and (ansible_os_family == 'RedHat')
@@ -14,7 +14,7 @@
 - name: Ensure git is installed (Debian).
   apt:
     name: "{{ item }}"
-    state: installed
+    state: present
   with_items: "{{ git_packages }}"
   when: (git_install_from_source == false) and (ansible_os_family == 'Debian')
 
diff --git a/provisioning/roles/geerlingguy.java/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.java/tasks/setup-RedHat.yml
index 053b84751..4110f4d3b 100644
--- a/provisioning/roles/geerlingguy.java/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.java/tasks/setup-RedHat.yml
@@ -1,4 +1,4 @@
 ---
 - name: Ensure Java is installed.
-  package: "name={{ item }} state=installed"
+  package: "name={{ item }} state=present"
   with_items: "{{ java_packages }}"
diff --git a/provisioning/roles/geerlingguy.mailhog/.travis.yml b/provisioning/roles/geerlingguy.mailhog/.travis.yml
index 8fd97815c..41eb314af 100644
--- a/provisioning/roles/geerlingguy.mailhog/.travis.yml
+++ b/provisioning/roles/geerlingguy.mailhog/.travis.yml
@@ -3,9 +3,8 @@ services: docker
 
 env:
   - distro: centos7
-  - distro: centos6
   - distro: ubuntu1604
-  - distro: ubuntu1404
+  - distro: debian9
 
 script:
   # Configure test script so we can run extra tests after playbook is run.
diff --git a/provisioning/roles/geerlingguy.mailhog/tests/test.yml b/provisioning/roles/geerlingguy.mailhog/tests/test.yml
index b4626b0c1..e6b944666 100644
--- a/provisioning/roles/geerlingguy.mailhog/tests/test.yml
+++ b/provisioning/roles/geerlingguy.mailhog/tests/test.yml
@@ -16,7 +16,7 @@
       when: ansible_os_family == 'RedHat'
 
     - name: Ensure build dependencies are installed (Debian).
-      apt: 'name="{{ item }}" state=installed'
+      apt: 'name="{{ item }}" state=present'
       with_items:
         - build-essential
         - tar
diff --git a/provisioning/roles/geerlingguy.memcached/.gitignore b/provisioning/roles/geerlingguy.memcached/.gitignore
index e43b0f988..c9b2377e3 100644
--- a/provisioning/roles/geerlingguy.memcached/.gitignore
+++ b/provisioning/roles/geerlingguy.memcached/.gitignore
@@ -1 +1,2 @@
-.DS_Store
+*.retry
+tests/test.sh
diff --git a/provisioning/roles/geerlingguy.memcached/.travis.yml b/provisioning/roles/geerlingguy.memcached/.travis.yml
index b4e17c489..946894e2f 100644
--- a/provisioning/roles/geerlingguy.memcached/.travis.yml
+++ b/provisioning/roles/geerlingguy.memcached/.travis.yml
@@ -1,53 +1,26 @@
 ---
-sudo: required
+services: docker
 
 env:
   - distro: centos7
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
   - distro: ubuntu1604
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
   - distro: ubuntu1404
-    init: /sbin/init
-    run_opts: ""
   - distro: ubuntu1204
-    init: /sbin/init
-    run_opts: ""
-
-services:
-  - docker
-
-before_install:
-  # Pull container
-  - 'sudo docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
-  - container_id=$(mktemp)
-  # Run container in detached state.
-  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
+  # Configure test script so we can run extra tests after playbook is run.
+  - export container_id=$(date +%s)
+  - export cleanup=false
 
-  # Ansible syntax check.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+  # Download test shim.
+  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
+  - chmod +x ${PWD}/tests/test.sh
 
-  # Test role.
-  - 'sudo docker exec "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
-
-  # Test role idempotence.
-  - idempotence=$(mktemp)
-  - sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
-  - >
-    tail ${idempotence}
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
+  # Run tests.
+  - ${PWD}/tests/test.sh
 
   # Check if memcached is running.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm memcached -h'
-
-after_success:
-  # Clean up.
-  - 'sudo docker stop "$(cat ${container_id})"'
+  - 'docker exec --tty ${container_id} env TERM=xterm memcached -h'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.memcached/LICENSE b/provisioning/roles/geerlingguy.memcached/LICENSE
new file mode 100644
index 000000000..4275cf3c1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.memcached/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Jeff Geerling
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/provisioning/roles/geerlingguy.memcached/README.md b/provisioning/roles/geerlingguy.memcached/README.md
index fe35ae581..f0231ff26 100644
--- a/provisioning/roles/geerlingguy.memcached/README.md
+++ b/provisioning/roles/geerlingguy.memcached/README.md
@@ -50,4 +50,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.memcached/tasks/main.yml b/provisioning/roles/geerlingguy.memcached/tasks/main.yml
index 522b8065c..fc7ff4bba 100644
--- a/provisioning/roles/geerlingguy.memcached/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.memcached/tasks/main.yml
@@ -14,7 +14,7 @@
   when: ansible_os_family == 'Debian'
 
 - name: Install Memcached.
-  package: name=memcached state=installed
+  package: name=memcached state=present
   register: memcached_install
 
 # Configure Memcached.
diff --git a/provisioning/roles/geerlingguy.memcached/tests/README.md b/provisioning/roles/geerlingguy.memcached/tests/README.md
new file mode 100644
index 000000000..6fb211721
--- /dev/null
+++ b/provisioning/roles/geerlingguy.memcached/tests/README.md
@@ -0,0 +1,11 @@
+# Ansible Role tests
+
+To run the test playbook(s) in this directory:
+
+  1. Install and start Docker.
+  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
+    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
+  1. Make the test shim executable: `chmod +x tests/test.sh`.
+  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
+
+If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.mysql/README.md b/provisioning/roles/geerlingguy.mysql/README.md
index 8fa69fac2..53f3d182e 100644
--- a/provisioning/roles/geerlingguy.mysql/README.md
+++ b/provisioning/roles/geerlingguy.mysql/README.md
@@ -92,6 +92,7 @@ The formats of these are the same as in the `mysql_user` module.
 
 Default MySQL connection configuration.
 
+    mysql_log_file_group: mysql *adm on Debian*
     mysql_log: ""
     mysql_log_error: *default value depends on OS*
     mysql_syslog_tag: *default value depends on OS*
diff --git a/provisioning/roles/geerlingguy.mysql/defaults/main.yml b/provisioning/roles/geerlingguy.mysql/defaults/main.yml
index 213253c38..28ff187f1 100644
--- a/provisioning/roles/geerlingguy.mysql/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.mysql/defaults/main.yml
@@ -44,6 +44,9 @@ mysql_sql_mode: ''
 # mysql_pid_file: /var/run/mysqld/mysqld.pid
 # mysql_socket: /var/lib/mysql/mysql.sock
 
+# Log file settings.
+mysql_log_file_group: mysql
+
 # Slow query log settings.
 mysql_slow_query_log_enabled: no
 mysql_slow_query_time: "2"
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/configure.yml b/provisioning/roles/geerlingguy.mysql/tasks/configure.yml
index 506c06c48..15185a3c3 100644
--- a/provisioning/roles/geerlingguy.mysql/tasks/configure.yml
+++ b/provisioning/roles/geerlingguy.mysql/tasks/configure.yml
@@ -50,7 +50,7 @@
     path: "{{ mysql_slow_query_log_file }}"
     state: file
     owner: mysql
-    group: mysql
+    group: "{{ mysql_log_file_group }}"
     mode: 0640
   when: mysql_slow_query_log_enabled
 
@@ -66,7 +66,7 @@
     path: "{{ mysql_log_error }}"
     state: file
     owner: mysql
-    group: mysql
+    group: "{{ mysql_log_file_group }}"
     mode: 0640
   when: mysql_log == "" and mysql_log_error != ""
 
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.mysql/tasks/setup-Debian.yml
index 85770f2a8..6ed76b3a5 100644
--- a/provisioning/roles/geerlingguy.mysql/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.mysql/tasks/setup-Debian.yml
@@ -8,10 +8,10 @@
   when: mysql_installed.stat.exists == false
 
 - name: Ensure MySQL Python libraries are installed.
-  apt: "name=python-mysqldb state=installed"
+  apt: "name=python-mysqldb state=present"
 
 - name: Ensure MySQL packages are installed.
-  apt: "name={{ item }} state=installed"
+  apt: "name={{ item }} state=present"
   with_items: "{{ mysql_packages }}"
   register: deb_mysql_install_packages
 
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.mysql/tasks/setup-RedHat.yml
index fc05bee62..2dadf2273 100644
--- a/provisioning/roles/geerlingguy.mysql/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.mysql/tasks/setup-RedHat.yml
@@ -1,8 +1,8 @@
 ---
 - name: Ensure MySQL packages are installed.
-  yum: "name={{ item }} state=installed enablerepo={{ mysql_enablerepo }}"
+  yum: "name={{ item }} state=present enablerepo={{ mysql_enablerepo }}"
   with_items: "{{ mysql_packages }}"
   register: rh_mysql_install_packages
 
 - name: Ensure MySQL Python libraries are installed.
-  yum: "name=MySQL-python state=installed enablerepo={{ mysql_enablerepo }}"
+  yum: "name=MySQL-python state=present enablerepo={{ mysql_enablerepo }}"
diff --git a/provisioning/roles/geerlingguy.mysql/vars/Debian.yml b/provisioning/roles/geerlingguy.mysql/vars/Debian.yml
index fa7c48acf..a96a025c6 100644
--- a/provisioning/roles/geerlingguy.mysql/vars/Debian.yml
+++ b/provisioning/roles/geerlingguy.mysql/vars/Debian.yml
@@ -3,6 +3,7 @@ __mysql_daemon: mysql
 __mysql_packages:
   - mysql-common
   - mysql-server
+mysql_log_file_group: adm
 __mysql_slow_query_log_file: /var/log/mysql/mysql-slow.log
 __mysql_log_error: /var/log/mysql/mysql.err
 __mysql_syslog_tag: mysql
diff --git a/provisioning/roles/geerlingguy.php-memcached/.gitignore b/provisioning/roles/geerlingguy.php-memcached/.gitignore
new file mode 100644
index 000000000..c9b2377e3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-memcached/.gitignore
@@ -0,0 +1,2 @@
+*.retry
+tests/test.sh
diff --git a/provisioning/roles/geerlingguy.php-memcached/.travis.yml b/provisioning/roles/geerlingguy.php-memcached/.travis.yml
index 8115dc351..f7463f310 100644
--- a/provisioning/roles/geerlingguy.php-memcached/.travis.yml
+++ b/provisioning/roles/geerlingguy.php-memcached/.travis.yml
@@ -1,40 +1,24 @@
 ---
-sudo: required
-language: python
-python: "2.7"
+services: docker
 
 env:
-  - SITE=test.yml
-
-before_install:
-  - sudo apt-get update -qq
-
-install:
-  # Install Ansible.
-  - pip install ansible
-
-  # Add ansible.cfg to pick up roles path.
-  - "{ echo '[defaults]'; echo 'roles_path = ../'; } >> ansible.cfg"
-
-  # Install dependencies.
-  - ansible-galaxy install geerlingguy.memcached geerlingguy.php
+  - distro: centos7
+  - distro: ubuntu1604
 
 script:
-  # Check the role/playbook's syntax.
-  - "ansible-playbook -i tests/inventory tests/$SITE --syntax-check"
+  # Configure test script so we can run extra tests after playbook is run.
+  - export container_id=$(date +%s)
+  - export cleanup=false
 
-  # Run the role/playbook with ansible-playbook.
-  - "ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo"
+  # Download test shim.
+  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
+  - chmod +x ${PWD}/tests/test.sh
 
-  # Run the role/playbook again, checking to make sure it's idempotent.
-  - >
-    ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
+  # Run tests.
+  - ${PWD}/tests/test.sh
 
   # Run script to test if Memcached is available and working.
-  - php tests/memcached-test.php
+  - 'docker exec ${container_id} env TERM=xterm php /etc/ansible/roles/role_under_test/tests/memcached-test.php'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.php-memcached/LICENSE b/provisioning/roles/geerlingguy.php-memcached/LICENSE
new file mode 100644
index 000000000..4275cf3c1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-memcached/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Jeff Geerling
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/provisioning/roles/geerlingguy.php-memcached/README.md b/provisioning/roles/geerlingguy.php-memcached/README.md
index b565c6781..035eda6f8 100644
--- a/provisioning/roles/geerlingguy.php-memcached/README.md
+++ b/provisioning/roles/geerlingguy.php-memcached/README.md
@@ -36,4 +36,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.php-memcached/tasks/main.yml b/provisioning/roles/geerlingguy.php-memcached/tasks/main.yml
index f11ffab53..f8cca0f51 100644
--- a/provisioning/roles/geerlingguy.php-memcached/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php-memcached/tasks/main.yml
@@ -11,7 +11,7 @@
 - name: Install PHP Memcached extension (RedHat).
   yum:
     name: "{{ php_memcached_package }}"
-    state: installed
+    state: present
     enablerepo: "{{ php_enablerepo }}"
   notify:
     - restart webserver
@@ -21,7 +21,7 @@
 - name: Install PHP Memcached extension (Debian).
   apt:
     name: "{{ php_memcached_package }}"
-    state: installed
+    state: present
   notify:
     - restart webserver
     - restart php-fpm
diff --git a/provisioning/roles/geerlingguy.php-memcached/tests/README.md b/provisioning/roles/geerlingguy.php-memcached/tests/README.md
new file mode 100644
index 000000000..6fb211721
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-memcached/tests/README.md
@@ -0,0 +1,11 @@
+# Ansible Role tests
+
+To run the test playbook(s) in this directory:
+
+  1. Install and start Docker.
+  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
+    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
+  1. Make the test shim executable: `chmod +x tests/test.sh`.
+  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
+
+If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.php-memcached/tests/inventory b/provisioning/roles/geerlingguy.php-memcached/tests/inventory
deleted file mode 100644
index 2fbb50c4a..000000000
--- a/provisioning/roles/geerlingguy.php-memcached/tests/inventory
+++ /dev/null
@@ -1 +0,0 @@
-localhost
diff --git a/provisioning/roles/geerlingguy.php-memcached/tests/requirements.yml b/provisioning/roles/geerlingguy.php-memcached/tests/requirements.yml
new file mode 100644
index 000000000..5793141c1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-memcached/tests/requirements.yml
@@ -0,0 +1,3 @@
+---
+- src: geerlingguy.memcached
+- src: geerlingguy.php
diff --git a/provisioning/roles/geerlingguy.php-memcached/tests/test.yml b/provisioning/roles/geerlingguy.php-memcached/tests/test.yml
index 8ff255785..19d4f6de8 100644
--- a/provisioning/roles/geerlingguy.php-memcached/tests/test.yml
+++ b/provisioning/roles/geerlingguy.php-memcached/tests/test.yml
@@ -1,12 +1,10 @@
 ---
-- hosts: localhost
-  remote_user: root
+- hosts: all
 
   vars:
     php_enable_webserver: false
-    php_memcached_package: php5-memcached
 
   roles:
     - geerlingguy.memcached
     - geerlingguy.php
-    - ansible-role-php-memcached
+    - role_under_test
diff --git a/provisioning/roles/geerlingguy.php-redis/.gitignore b/provisioning/roles/geerlingguy.php-redis/.gitignore
new file mode 100644
index 000000000..c9b2377e3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-redis/.gitignore
@@ -0,0 +1,2 @@
+*.retry
+tests/test.sh
diff --git a/provisioning/roles/geerlingguy.php-redis/.travis.yml b/provisioning/roles/geerlingguy.php-redis/.travis.yml
index c01ba821e..f000e2fa3 100644
--- a/provisioning/roles/geerlingguy.php-redis/.travis.yml
+++ b/provisioning/roles/geerlingguy.php-redis/.travis.yml
@@ -3,41 +3,22 @@ services: docker
 
 env:
   - distro: centos7
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
   - distro: ubuntu1604
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-
-before_install:
-  # Pull container.
-  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
-  - container_id=$(mktemp)
-  # Run container in detached state.
-  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
-
-  # Install dependencies.
-  - 'docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
-
-  # Ansible syntax check.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+  # Configure test script so we can run extra tests after playbook is run.
+  - export container_id=$(date +%s)
+  - export cleanup=false
 
-  # Test role.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+  # Download test shim.
+  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
+  - chmod +x ${PWD}/tests/test.sh
 
-  # Test role idempotence.
-  - idempotence=$(mktemp)
-  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
-  - >
-    tail ${idempotence}
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
+  # Run tests.
+  - ${PWD}/tests/test.sh
 
   # Run script to test if Memcached is available and working.
-  - 'docker exec "$(cat ${container_id})" env TERM=xterm php /etc/ansible/roles/role_under_test/tests/redis-test.php'
+  - 'docker exec ${container_id} env TERM=xterm php /etc/ansible/roles/role_under_test/tests/redis-test.php'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.php-redis/LICENSE b/provisioning/roles/geerlingguy.php-redis/LICENSE
new file mode 100644
index 000000000..4275cf3c1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-redis/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Jeff Geerling
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/provisioning/roles/geerlingguy.php-redis/README.md b/provisioning/roles/geerlingguy.php-redis/README.md
index 70652506b..7ba22f9bf 100644
--- a/provisioning/roles/geerlingguy.php-redis/README.md
+++ b/provisioning/roles/geerlingguy.php-redis/README.md
@@ -60,4 +60,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2015 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
+This role was created in 2015 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.php-redis/tasks/main.yml b/provisioning/roles/geerlingguy.php-redis/tasks/main.yml
index 766f5fa1f..0adb568c8 100644
--- a/provisioning/roles/geerlingguy.php-redis/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php-redis/tasks/main.yml
@@ -12,7 +12,7 @@
 - name: Install PhpRedis extension (RedHat).
   yum:
     name: "{{ php_redis_package }}"
-    state: installed
+    state: present
     enablerepo: "{{ php_enablerepo }}"
   notify:
     - restart webserver
@@ -20,7 +20,7 @@
   when: (php_redis_install_from_source == false) and (ansible_os_family == 'RedHat')
 
 - name: Install PhpRedis extension (Debian).
-  apt: "name={{ php_redis_package }} state=installed"
+  apt: "name={{ php_redis_package }} state=present"
   notify:
     - restart webserver
     - restart php-fpm
diff --git a/provisioning/roles/geerlingguy.php-redis/tests/README.md b/provisioning/roles/geerlingguy.php-redis/tests/README.md
new file mode 100644
index 000000000..6fb211721
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-redis/tests/README.md
@@ -0,0 +1,11 @@
+# Ansible Role tests
+
+To run the test playbook(s) in this directory:
+
+  1. Install and start Docker.
+  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
+    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
+  1. Make the test shim executable: `chmod +x tests/test.sh`.
+  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
+
+If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.php-tideways/.travis.yml b/provisioning/roles/geerlingguy.php-tideways/.travis.yml
index 53a55e084..93f994a87 100644
--- a/provisioning/roles/geerlingguy.php-tideways/.travis.yml
+++ b/provisioning/roles/geerlingguy.php-tideways/.travis.yml
@@ -4,7 +4,7 @@ services: docker
 env:
   - distro: centos7
   - distro: ubuntu1604
-  - distro: debian8
+  - distro: debian9
 
 script:
   # Configure test script so we can run extra tests after playbook is run.
diff --git a/provisioning/roles/geerlingguy.php-tideways/tasks/main.yml b/provisioning/roles/geerlingguy.php-tideways/tasks/main.yml
index 5061a0b50..fc54be489 100644
--- a/provisioning/roles/geerlingguy.php-tideways/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php-tideways/tasks/main.yml
@@ -14,7 +14,7 @@
 
 # Setup/install tasks.
 - name: Ensure dependencies for installing Tideways are present.
-  package: "name={{ item }} state=installed"
+  package: "name={{ item }} state=present"
   with_items:
     - make
     - gcc
diff --git a/provisioning/roles/geerlingguy.php-tideways/tasks/xhprof.yml b/provisioning/roles/geerlingguy.php-tideways/tasks/xhprof.yml
index 919b3d5d6..a71c60159 100644
--- a/provisioning/roles/geerlingguy.php-tideways/tasks/xhprof.yml
+++ b/provisioning/roles/geerlingguy.php-tideways/tasks/xhprof.yml
@@ -19,7 +19,7 @@
   when: php_xhprof_html_dir is not defined
 
 - name: Ensure dependencies for the XHProf UI are present.
-  package: "name={{ item }} state=installed"
+  package: "name={{ item }} state=present"
   with_items:
     - graphviz
 
diff --git a/provisioning/roles/geerlingguy.php-xhprof/.gitignore b/provisioning/roles/geerlingguy.php-xhprof/.gitignore
index e43b0f988..c9b2377e3 100644
--- a/provisioning/roles/geerlingguy.php-xhprof/.gitignore
+++ b/provisioning/roles/geerlingguy.php-xhprof/.gitignore
@@ -1 +1,2 @@
-.DS_Store
+*.retry
+tests/test.sh
diff --git a/provisioning/roles/geerlingguy.php-xhprof/.travis.yml b/provisioning/roles/geerlingguy.php-xhprof/.travis.yml
index d0014ec41..475350045 100644
--- a/provisioning/roles/geerlingguy.php-xhprof/.travis.yml
+++ b/provisioning/roles/geerlingguy.php-xhprof/.travis.yml
@@ -3,44 +3,23 @@ services: docker
 
 env:
   - distro: centos7
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
   - distro: ubuntu1604
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
   - distro: debian8
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-
-before_install:
-  # Pull container.
-  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
 
 script:
-  - container_id=$(mktemp)
-  # Run container in detached state.
-  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
-
-  # Install dependencies.
-  - 'docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
-
-  # Ansible syntax check.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+  # Configure test script so we can run extra tests after playbook is run.
+  - export container_id=$(date +%s)
+  - export cleanup=false
 
-  # Test role.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+  # Download test shim.
+  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
+  - chmod +x ${PWD}/tests/test.sh
 
-  # Test role idempotence.
-  - idempotence=$(mktemp)
-  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
-  - >
-    tail ${idempotence}
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
+  # Run tests.
+  - ${PWD}/tests/test.sh
 
   # Run script to test if XHProf is available and working.
-  - 'docker exec "$(cat ${container_id})" env TERM=xterm php /etc/ansible/roles/role_under_test/tests/xhprof-test.php'
+  - 'docker exec ${container_id} env TERM=xterm php /etc/ansible/roles/role_under_test/tests/xhprof-test.php'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.php-xhprof/LICENSE b/provisioning/roles/geerlingguy.php-xhprof/LICENSE
new file mode 100644
index 000000000..4275cf3c1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xhprof/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Jeff Geerling
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/provisioning/roles/geerlingguy.php-xhprof/README.md b/provisioning/roles/geerlingguy.php-xhprof/README.md
index 72a79e100..58ee2739f 100644
--- a/provisioning/roles/geerlingguy.php-xhprof/README.md
+++ b/provisioning/roles/geerlingguy.php-xhprof/README.md
@@ -51,4 +51,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.php-xhprof/tasks/main.yml b/provisioning/roles/geerlingguy.php-xhprof/tasks/main.yml
index 3cad6d729..2c7884da1 100644
--- a/provisioning/roles/geerlingguy.php-xhprof/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php-xhprof/tasks/main.yml
@@ -14,7 +14,7 @@
 
 # Setup/install tasks.
 - name: Ensure dependencies for installing XHProf are present.
-  package: "name={{ item }} state=installed"
+  package: "name={{ item }} state=present"
   with_items:
     - make
     - gcc
diff --git a/provisioning/roles/geerlingguy.php-xhprof/tests/README.md b/provisioning/roles/geerlingguy.php-xhprof/tests/README.md
new file mode 100644
index 000000000..6fb211721
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xhprof/tests/README.md
@@ -0,0 +1,11 @@
+# Ansible Role tests
+
+To run the test playbook(s) in this directory:
+
+  1. Install and start Docker.
+  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
+    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
+  1. Make the test shim executable: `chmod +x tests/test.sh`.
+  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
+
+If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.php/README.md b/provisioning/roles/geerlingguy.php/README.md
index 6c9bbb89d..a3659b7a0 100644
--- a/provisioning/roles/geerlingguy.php/README.md
+++ b/provisioning/roles/geerlingguy.php/README.md
@@ -34,7 +34,7 @@ The default values for the HTTP server deamon are `httpd` (used by Apache) for R
 
 (RedHat/CentOS only) If you have enabled any additional repositories (might I suggest [geerlingguy.repo-epel](https://github.com/geerlingguy/ansible-role-repo-epel) or [geerlingguy.repo-remi](https://github.com/geerlingguy/ansible-role-repo-remi)), those repositories can be listed under this variable (e.g. `remi-php70,epel`). This can be handy, as an example, if you want to install the latest version of PHP 7.0, which is in the Remi repository.
 
-    php_packages_state: "installed"
+    php_packages_state: "present"
 
 If you have enabled any additional repositories such as [geerlingguy.repo-epel](https://github.com/geerlingguy/ansible-role-repo-epel) or [geerlingguy.repo-remi](https://github.com/geerlingguy/ansible-role-repo-remi), you may want an easy way to swap PHP versions on the fly. By default, this is set to 'installed'. You can now override this variable to 'latest'. Combined with php_enablerepo, a user now doesn't need to manually uninstall the existing PHP packages before installing them from a different repository.
 
diff --git a/provisioning/roles/geerlingguy.php/defaults/main.yml b/provisioning/roles/geerlingguy.php/defaults/main.yml
index dc3a058a7..d73a6dc13 100644
--- a/provisioning/roles/geerlingguy.php/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.php/defaults/main.yml
@@ -3,9 +3,9 @@
 # for RHEL/CentOS.
 php_enablerepo: ""
 
-# PHP package state; use 'installed' to make sure it's installed, or 'latest' if
+# PHP package state; use 'present' to make sure it's installed, or 'latest' if
 # you want to upgrade or switch versions using a new repo.
-php_packages_state: installed
+php_packages_state: present
 
 # Whether to install recommended packages. Used only for Debian/Ubuntu.
 php_install_recommends: yes
diff --git a/provisioning/roles/geerlingguy.php/tasks/install-from-source.yml b/provisioning/roles/geerlingguy.php/tasks/install-from-source.yml
index c277d3d0a..03cc2ed90 100644
--- a/provisioning/roles/geerlingguy.php/tasks/install-from-source.yml
+++ b/provisioning/roles/geerlingguy.php/tasks/install-from-source.yml
@@ -1,6 +1,6 @@
 ---
 - name: Ensure dependencies for building from source are installed (RedHat).
-  package: "name={{ item }} state=installed"
+  package: "name={{ item }} state=present"
   with_items:
     - autoconf
     - automake
@@ -30,7 +30,7 @@
   when: ansible_os_family == 'Debian'
 
 - name: Ensure dependencies for building from source are installed (Debian).
-  apt: "pkg={{ item }} state=installed"
+  apt: "pkg={{ item }} state=present"
   with_items:
     - build-essential
     - autoconf
diff --git a/provisioning/tasks/extras.yml b/provisioning/tasks/extras.yml
index b82c71f23..1975a1baf 100644
--- a/provisioning/tasks/extras.yml
+++ b/provisioning/tasks/extras.yml
@@ -1,10 +1,10 @@
 ---
 - name: Install extra apt packages (if any are configured).
-  apt: "name={{ item }} state=installed"
+  apt: "name={{ item }} state=present"
   with_items: "{{ extra_packages | list }}"
   when: ansible_os_family == 'Debian' and extra_packages | length
 
 - name: Install extra yum packages (if any are configured).
-  yum: "name={{ item }} state=installed"
+  yum: "name={{ item }} state=present"
   with_items: "{{ extra_packages | list }}"
   when: ansible_os_family == 'RedHat' and extra_packages | length
diff --git a/provisioning/tasks/init-Debian.yml b/provisioning/tasks/init-Debian.yml
index cfaa159e2..240950e2b 100644
--- a/provisioning/tasks/init-Debian.yml
+++ b/provisioning/tasks/init-Debian.yml
@@ -3,7 +3,7 @@
   apt: update_cache=yes cache_valid_time=86400
 
 - name: Install required dependencies.
-  apt: "name={{ item }} state=installed"
+  apt: "name={{ item }} state=present"
   with_items:
     - curl
     - python-apt
diff --git a/provisioning/tasks/init-RedHat.yml b/provisioning/tasks/init-RedHat.yml
index 50e1ce6d9..3b231a9f2 100644
--- a/provisioning/tasks/init-RedHat.yml
+++ b/provisioning/tasks/init-RedHat.yml
@@ -1,6 +1,6 @@
 ---
 - name: Install required dependencies.
-  yum: "name={{ item }} state=installed"
+  yum: "name={{ item }} state=present"
   with_items:
     - curl
     - python-pycurl

From 20a3f9fdcddec938ad1b203a251a7bd03403e016 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 26 Apr 2018 12:26:29 -0500
Subject: [PATCH 0979/1273] Issue #1553: Update to latest Java role version.

---
 provisioning/requirements.yml                      | 2 +-
 provisioning/roles/geerlingguy.java/meta/main.yml  | 2 +-
 provisioning/roles/geerlingguy.java/tasks/main.yml | 9 +++------
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index ed53ee025..12eb63b37 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -30,7 +30,7 @@
 - src: geerlingguy.git
   version: 2.0.2
 - src: geerlingguy.java
-  version: 1.7.7
+  version: 1.8.0
 - src: geerlingguy.mailhog
   version: 2.1.4
 - src: geerlingguy.memcached
diff --git a/provisioning/roles/geerlingguy.java/meta/main.yml b/provisioning/roles/geerlingguy.java/meta/main.yml
index a10555cee..2406cc491 100644
--- a/provisioning/roles/geerlingguy.java/meta/main.yml
+++ b/provisioning/roles/geerlingguy.java/meta/main.yml
@@ -6,7 +6,7 @@ galaxy_info:
   description: Java for Linux
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 2.0
+  min_ansible_version: 2.4
   platforms:
     - name: EL
       versions:
diff --git a/provisioning/roles/geerlingguy.java/tasks/main.yml b/provisioning/roles/geerlingguy.java/tasks/main.yml
index d620f595b..4d9e7d7a6 100644
--- a/provisioning/roles/geerlingguy.java/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.java/tasks/main.yml
@@ -19,17 +19,14 @@
   when: java_packages is not defined
 
 # Setup/install tasks.
-- include: setup-RedHat.yml
+- include_tasks: setup-RedHat.yml
   when: ansible_os_family == 'RedHat'
-  static: no
 
-- include: setup-Debian.yml
+- include_tasks: setup-Debian.yml
   when: ansible_os_family == 'Debian'
-  static: no
 
-- include: setup-FreeBSD.yml
+- include_tasks: setup-FreeBSD.yml
   when: ansible_os_family == 'FreeBSD'
-  static: no
 
 # Environment setup.
 - name: Set JAVA_HOME if configured.

From 1436f328e9c050172bb3f1da6ea11d998cc853dc Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 26 Apr 2018 13:03:19 -0500
Subject: [PATCH 0980/1273] Issue #1553: Update to latest Composer role
 version.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.composer/.travis.yml    | 45 +++++--------------
 .../roles/geerlingguy.composer/meta/main.yml  |  2 +-
 .../roles/geerlingguy.composer/tasks/main.yml |  4 +-
 4 files changed, 15 insertions(+), 38 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 12eb63b37..66b0a62cf 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -14,7 +14,7 @@
 - src: geerlingguy.blackfire
   version: 1.0.0
 - src: geerlingguy.composer
-  version: 1.6.1
+  version: 1.7.0
 - src: geerlingguy.daemonize
   version: 1.2.0
 - src: geerlingguy.drupal
diff --git a/provisioning/roles/geerlingguy.composer/.travis.yml b/provisioning/roles/geerlingguy.composer/.travis.yml
index a31937acd..fcf6057db 100644
--- a/provisioning/roles/geerlingguy.composer/.travis.yml
+++ b/provisioning/roles/geerlingguy.composer/.travis.yml
@@ -3,47 +3,24 @@ services: docker
 
 env:
   - distro: centos7
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-  - distro: fedora24
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+  - distro: fedora27
   - distro: ubuntu1604
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-  - distro: debian8
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-
-before_install:
-  # Pull container.
-  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
+  - distro: debian9
 
 script:
-  - container_id=$(mktemp)
-  # Run container in detached state.
-  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
-
-  # Install dependencies.
-  - 'docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
-
-  # Ansible syntax check.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+  # Configure test script so we can run extra tests after playbook is run.
+  - export container_id=$(date +%s)
+  - export cleanup=false
 
-  # Test role.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+  # Download test shim.
+  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
+  - chmod +x ${PWD}/tests/test.sh
 
-  # Test role idempotence.
-  - idempotence=$(mktemp)
-  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
-  - >
-    tail ${idempotence}
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
+  # Run tests.
+  - ${PWD}/tests/test.sh
 
   # Ensure Composer is installed and working.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm composer || true'
+  - 'docker exec --tty ${container_id} env TERM=xterm composer || true'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.composer/meta/main.yml b/provisioning/roles/geerlingguy.composer/meta/main.yml
index c4b0b3130..125e3b5cc 100644
--- a/provisioning/roles/geerlingguy.composer/meta/main.yml
+++ b/provisioning/roles/geerlingguy.composer/meta/main.yml
@@ -6,7 +6,7 @@ galaxy_info:
   description: Composer PHP Dependency Manager
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 1.9
+  min_ansible_version: 2.4
   platforms:
     - name: EL
       versions:
diff --git a/provisioning/roles/geerlingguy.composer/tasks/main.yml b/provisioning/roles/geerlingguy.composer/tasks/main.yml
index 0a19deb3a..28a718ac7 100644
--- a/provisioning/roles/geerlingguy.composer/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.composer/tasks/main.yml
@@ -51,8 +51,8 @@
     group: "{{ composer_home_group }}"
   when: composer_github_oauth_token != ''
 
-- include: global-require.yml
+- include_tasks: global-require.yml
   when: composer_global_packages|length > 0
 
-- include: project-bin.yml
+- include_tasks: project-bin.yml
   when: composer_add_project_to_path

From 6b03efedebc56765f27092a4f0dd80b6611ad3ec Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 26 Apr 2018 14:56:34 -0500
Subject: [PATCH 0981/1273] Issue #1553: Add a few missing Composer role files.
 [ci skip]

---
 .../roles/geerlingguy.composer/.gitignore     |  2 ++
 .../roles/geerlingguy.composer/LICENSE        | 20 +++++++++++++++++++
 .../geerlingguy.composer/tests/README.md      | 11 ++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 provisioning/roles/geerlingguy.composer/.gitignore
 create mode 100644 provisioning/roles/geerlingguy.composer/LICENSE
 create mode 100644 provisioning/roles/geerlingguy.composer/tests/README.md

diff --git a/provisioning/roles/geerlingguy.composer/.gitignore b/provisioning/roles/geerlingguy.composer/.gitignore
new file mode 100644
index 000000000..c9b2377e3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.composer/.gitignore
@@ -0,0 +1,2 @@
+*.retry
+tests/test.sh
diff --git a/provisioning/roles/geerlingguy.composer/LICENSE b/provisioning/roles/geerlingguy.composer/LICENSE
new file mode 100644
index 000000000..4275cf3c1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.composer/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Jeff Geerling
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/provisioning/roles/geerlingguy.composer/tests/README.md b/provisioning/roles/geerlingguy.composer/tests/README.md
new file mode 100644
index 000000000..6fb211721
--- /dev/null
+++ b/provisioning/roles/geerlingguy.composer/tests/README.md
@@ -0,0 +1,11 @@
+# Ansible Role tests
+
+To run the test playbook(s) in this directory:
+
+  1. Install and start Docker.
+  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
+    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
+  1. Make the test shim executable: `chmod +x tests/test.sh`.
+  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
+
+If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`

From e43629b81fe297c434b92180e25b1270b5d163c1 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 26 Apr 2018 14:57:18 -0500
Subject: [PATCH 0982/1273] Issue #1553: Update to latest PHP role version.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.php/.travis.yml         | 11 ++++++----
 provisioning/roles/geerlingguy.php/README.md  |  4 +++-
 .../roles/geerlingguy.php/meta/main.yml       |  3 ++-
 .../tasks/install-from-source.yml             |  2 +-
 .../roles/geerlingguy.php/tasks/main.yml      | 21 +++++++------------
 .../geerlingguy.php/tests/test-source.yml     |  2 +-
 7 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 66b0a62cf..53740dced 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -42,7 +42,7 @@
 - src: geerlingguy.nodejs
   version: 4.1.2
 - src: geerlingguy.php
-  version: 3.5.2
+  version: 3.6.0
 - src: geerlingguy.php-memcached
   version: 2.0.1
 - src: geerlingguy.php-mysql
diff --git a/provisioning/roles/geerlingguy.php/.travis.yml b/provisioning/roles/geerlingguy.php/.travis.yml
index 528306610..9bed9ab22 100644
--- a/provisioning/roles/geerlingguy.php/.travis.yml
+++ b/provisioning/roles/geerlingguy.php/.travis.yml
@@ -15,6 +15,9 @@ env:
   - distro: debian8
     playbook: test.yml
     php_version: 7.0
+  - distro: ubuntu1804
+    playbook: test.yml
+    php_version: 7.0
   - distro: ubuntu1604
     playbook: test.yml
     php_version: 7.0
@@ -25,10 +28,10 @@ env:
   # Only test source install on latest supported OSes.
   - distro: centos7
     playbook: test-source.yml
-    php_version: 7.1.9
-  - distro: ubuntu1604
+    php_version: 7.1.17
+  - distro: ubuntu1804
     playbook: test-source.yml
-    php_version: 7.1.9
+    php_version: 7.1.17
 
 script:
   # Configure test script so we can run extra tests after playbook is run.
@@ -60,7 +63,7 @@ script:
           docker exec --tty ${container_id} env TERM=xterm systemctl --no-pager status php-fpm status
           docker exec --tty ${container_id} env TERM=xterm systemctl --no-pager status php-fpm status | grep -qF "fpm.service; enabled"
           ;;
-        "debian8"|"ubuntu1604")
+        "debian8"|"ubuntu1604"|"ubuntu1804")
           docker exec --tty ${container_id} env TERM=xterm systemctl --no-pager status php${php_version}-fpm status
           docker exec --tty ${container_id} env TERM=xterm systemctl --no-pager status php${php_version}-fpm status | grep -qF "fpm.service; enabled"
           ;;
diff --git a/provisioning/roles/geerlingguy.php/README.md b/provisioning/roles/geerlingguy.php/README.md
index a3659b7a0..c463259cf 100644
--- a/provisioning/roles/geerlingguy.php/README.md
+++ b/provisioning/roles/geerlingguy.php/README.md
@@ -36,7 +36,9 @@ The default values for the HTTP server deamon are `httpd` (used by Apache) for R
 
     php_packages_state: "present"
 
-If you have enabled any additional repositories such as [geerlingguy.repo-epel](https://github.com/geerlingguy/ansible-role-repo-epel) or [geerlingguy.repo-remi](https://github.com/geerlingguy/ansible-role-repo-remi), you may want an easy way to swap PHP versions on the fly. By default, this is set to 'installed'. You can now override this variable to 'latest'. Combined with php_enablerepo, a user now doesn't need to manually uninstall the existing PHP packages before installing them from a different repository.
+If you have enabled any additional repositories such as [geerlingguy.repo-epel](https://github.com/geerlingguy/ansible-role-repo-epel) or [geerlingguy.repo-remi](https://github.com/geerlingguy/ansible-role-repo-remi), you may want an easy way to swap PHP versions on the fly. By default, this is set to `"present"`. You can override this variable to `"latest"` to upgrade to the latest available version. Combined with php_enablerepo`, a user now doesn't need to manually uninstall the existing PHP packages before installing them from a different repository.
+
+You can also use the [`geerlingguy.php-versions`](https://galaxy.ansible.com/geerlingguy/php-versions/) role to more easily switch between major PHP versions (e.g. 5.6, 7.0, 7.1, 7.2).
 
     php_install_recommends: yes
 
diff --git a/provisioning/roles/geerlingguy.php/meta/main.yml b/provisioning/roles/geerlingguy.php/meta/main.yml
index b7506327a..a9051e62c 100644
--- a/provisioning/roles/geerlingguy.php/meta/main.yml
+++ b/provisioning/roles/geerlingguy.php/meta/main.yml
@@ -6,7 +6,7 @@ galaxy_info:
   description: PHP for RedHat/CentOS/Fedora/Debian/Ubuntu.
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 2.0
+  min_ansible_version: 2.4
   platforms:
   - name: EL
     versions:
@@ -22,6 +22,7 @@ galaxy_info:
     versions:
     - trusty
     - xenial
+    - bionic
   galaxy_tags:
     - development
     - web
diff --git a/provisioning/roles/geerlingguy.php/tasks/install-from-source.yml b/provisioning/roles/geerlingguy.php/tasks/install-from-source.yml
index 03cc2ed90..3fefa039d 100644
--- a/provisioning/roles/geerlingguy.php/tasks/install-from-source.yml
+++ b/provisioning/roles/geerlingguy.php/tasks/install-from-source.yml
@@ -43,7 +43,7 @@
     - libcurl4-openssl-dev
     - libbz2-dev
     - libjpeg-dev
-    - libpng12-dev
+    - libpng-dev
     - libxpm-dev
     - libfreetype6-dev
     - libgmp3-dev
diff --git a/provisioning/roles/geerlingguy.php/tasks/main.yml b/provisioning/roles/geerlingguy.php/tasks/main.yml
index 5afcce871..3d6e66cc8 100644
--- a/provisioning/roles/geerlingguy.php/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php/tasks/main.yml
@@ -49,25 +49,18 @@
   when: php_fpm_conf_path is not defined
 
 # Setup/install tasks.
-- include: setup-RedHat.yml
+- include_tasks: setup-RedHat.yml
   when: (php_install_from_source == false) and (ansible_os_family == 'RedHat')
-  static: no
 
-- include: setup-Debian.yml
+- include_tasks: setup-Debian.yml
   when: (php_install_from_source == false) and (ansible_os_family == 'Debian')
-  static: no
 
 # Install PHP from source when php_install_from_source is true.
-- include: install-from-source.yml
+- include_tasks: install-from-source.yml
   when: php_install_from_source == true
-  static: no
 
 # Configure PHP.
-- include: configure.yml
-  static: no
-- include: configure-apcu.yml
-  static: no
-- include: configure-opcache.yml
-  static: no
-- include: configure-fpm.yml
-  static: no
+- include_tasks: configure.yml
+- include_tasks: configure-apcu.yml
+- include_tasks: configure-opcache.yml
+- include_tasks: configure-fpm.yml
diff --git a/provisioning/roles/geerlingguy.php/tests/test-source.yml b/provisioning/roles/geerlingguy.php/tests/test-source.yml
index f364cc09d..7c0d14323 100644
--- a/provisioning/roles/geerlingguy.php/tests/test-source.yml
+++ b/provisioning/roles/geerlingguy.php/tests/test-source.yml
@@ -6,7 +6,7 @@
     php_install_from_source: true
     php_source_clone_dir: /root/php-src
     php_source_make_command: "make --jobs=2"
-    php_source_version: "php-7.1.9"
+    php_source_version: "php-7.1.17"
     php_memory_limit: "192M"
 
   pre_tasks:

From c91833a0db9bd923b989feb951977ddc60f8e4ee Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 26 Apr 2018 15:52:08 -0500
Subject: [PATCH 0983/1273] Issue #1553: Update to latest MySQL and Blackfire
 role versions.

---
 provisioning/requirements.yml                 |  4 +-
 .../roles/geerlingguy.blackfire/.gitignore    |  2 +
 .../roles/geerlingguy.blackfire/.travis.yml   | 56 ++++---------------
 .../roles/geerlingguy.blackfire/LICENSE       | 20 +++++++
 .../roles/geerlingguy.blackfire/README.md     |  2 +-
 .../roles/geerlingguy.blackfire/meta/main.yml |  3 +-
 .../geerlingguy.blackfire/tasks/main.yml      |  4 +-
 .../tests/Dockerfile.centos-7                 | 27 ---------
 .../tests/Dockerfile.ubuntu-12.04             | 11 ----
 .../tests/Dockerfile.ubuntu-14.04             | 11 ----
 .../geerlingguy.blackfire/tests/README.md     | 11 ++++
 .../tests/requirements.yml                    |  2 +
 .../geerlingguy.blackfire/tests/test.yml      | 36 ++++++++++++
 .../roles/geerlingguy.mysql/tasks/main.yml    | 21 +++----
 .../tasks/setup-Archlinux.yml                 |  4 +-
 .../geerlingguy.mysql/tasks/setup-Debian.yml  |  6 +-
 16 files changed, 104 insertions(+), 116 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.blackfire/.gitignore
 create mode 100644 provisioning/roles/geerlingguy.blackfire/LICENSE
 delete mode 100644 provisioning/roles/geerlingguy.blackfire/tests/Dockerfile.centos-7
 delete mode 100644 provisioning/roles/geerlingguy.blackfire/tests/Dockerfile.ubuntu-12.04
 delete mode 100644 provisioning/roles/geerlingguy.blackfire/tests/Dockerfile.ubuntu-14.04
 create mode 100644 provisioning/roles/geerlingguy.blackfire/tests/README.md
 create mode 100644 provisioning/roles/geerlingguy.blackfire/tests/requirements.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 53740dced..42437a4c0 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -12,7 +12,7 @@
 - src: geerlingguy.apache-php-fpm
   version: 1.1.0
 - src: geerlingguy.blackfire
-  version: 1.0.0
+  version: 1.1.0
 - src: geerlingguy.composer
   version: 1.7.0
 - src: geerlingguy.daemonize
@@ -36,7 +36,7 @@
 - src: geerlingguy.memcached
   version: 1.0.8
 - src: geerlingguy.mysql
-  version: 2.8.3
+  version: 2.9.0
 - src: geerlingguy.nginx
   version: 2.6.0
 - src: geerlingguy.nodejs
diff --git a/provisioning/roles/geerlingguy.blackfire/.gitignore b/provisioning/roles/geerlingguy.blackfire/.gitignore
new file mode 100644
index 000000000..c9b2377e3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.blackfire/.gitignore
@@ -0,0 +1,2 @@
+*.retry
+tests/test.sh
diff --git a/provisioning/roles/geerlingguy.blackfire/.travis.yml b/provisioning/roles/geerlingguy.blackfire/.travis.yml
index 8f7ae13c7..d6aa370e8 100644
--- a/provisioning/roles/geerlingguy.blackfire/.travis.yml
+++ b/provisioning/roles/geerlingguy.blackfire/.travis.yml
@@ -1,55 +1,19 @@
 ---
-sudo: required
+services: docker
 
 env:
-  - distribution: centos
-    version: 7
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-  - distribution: ubuntu
-    version: 14.04
-    init: /sbin/init
-    run_opts: ""
-  - distribution: ubuntu
-    version: 12.04
-    init: /sbin/init
-    run_opts: ""
-
-services:
-  - docker
-
-before_install:
-  # Pull container
-  - 'sudo docker pull ${distribution}:${version}'
-  # Customize container
-  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+  - distro: centos7
+  - distro: ubuntu1804
+  - distro: ubuntu1604
+  - distro: debian9
 
 script:
-  - container_id=$(mktemp)
-  # Run container in detached state
-  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
-
-  # Install dependencies.
-  - 'sudo docker exec "$(cat ${container_id})" ansible-galaxy install geerlingguy.php'
-
-  # Ansible syntax check.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
-
-  # Test role.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
-
-  # Test role idempotence.
-  - >
-    sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
-
-  # Ensure Blackfire is installed.
-  #- 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm TODO'
+  # Download test shim.
+  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
+  - chmod +x ${PWD}/tests/test.sh
 
-  # Clean up
-  - 'sudo docker stop "$(cat ${container_id})"'
+  # Run tests.
+  - ${PWD}/tests/test.sh
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.blackfire/LICENSE b/provisioning/roles/geerlingguy.blackfire/LICENSE
new file mode 100644
index 000000000..4275cf3c1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.blackfire/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Jeff Geerling
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/provisioning/roles/geerlingguy.blackfire/README.md b/provisioning/roles/geerlingguy.blackfire/README.md
index b42dd7ba5..9af754def 100644
--- a/provisioning/roles/geerlingguy.blackfire/README.md
+++ b/provisioning/roles/geerlingguy.blackfire/README.md
@@ -38,4 +38,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2016 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
+This role was created in 2016 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.blackfire/meta/main.yml b/provisioning/roles/geerlingguy.blackfire/meta/main.yml
index 9d50ce884..13d1b9024 100644
--- a/provisioning/roles/geerlingguy.blackfire/meta/main.yml
+++ b/provisioning/roles/geerlingguy.blackfire/meta/main.yml
@@ -7,7 +7,7 @@ galaxy_info:
   description: Blackfire installation for Linux
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 2.0
+  min_ansible_version: 2.4
   platforms:
     - name: EL
       versions:
@@ -23,6 +23,7 @@ galaxy_info:
       - saucy
       - trusty
       - xenial
+      - bionic
   galaxy_tags:
     - development
     - web
diff --git a/provisioning/roles/geerlingguy.blackfire/tasks/main.yml b/provisioning/roles/geerlingguy.blackfire/tasks/main.yml
index 2dc893ece..d45192a1c 100644
--- a/provisioning/roles/geerlingguy.blackfire/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.blackfire/tasks/main.yml
@@ -1,8 +1,8 @@
 ---
-- include: setup-RedHat.yml
+- include_tasks: setup-RedHat.yml
   when: ansible_os_family == 'RedHat'
 
-- include: setup-Debian.yml
+- include_tasks: setup-Debian.yml
   when: ansible_os_family == 'Debian'
 
 - name: Ensure Blackfire packages are installed.
diff --git a/provisioning/roles/geerlingguy.blackfire/tests/Dockerfile.centos-7 b/provisioning/roles/geerlingguy.blackfire/tests/Dockerfile.centos-7
deleted file mode 100644
index 8aa065497..000000000
--- a/provisioning/roles/geerlingguy.blackfire/tests/Dockerfile.centos-7
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM centos:7
-
-# Install systemd -- See https://hub.docker.com/_/centos/
-RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
-RUN yum -y update; yum clean all; \
-(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
-rm -f /lib/systemd/system/multi-user.target.wants/*; \
-rm -f /etc/systemd/system/*.wants/*; \
-rm -f /lib/systemd/system/local-fs.target.wants/*; \
-rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
-rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
-rm -f /lib/systemd/system/basic.target.wants/*; \
-rm -f /lib/systemd/system/anaconda.target.wants/*;
-
-# Install Ansible
-RUN yum -y install epel-release
-RUN yum -y install git ansible sudo
-RUN yum clean all
-
-# Disable requiretty
-RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
-
-# Install Ansible inventory file
-RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
-
-VOLUME ["/sys/fs/cgroup"]
-CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.blackfire/tests/Dockerfile.ubuntu-12.04 b/provisioning/roles/geerlingguy.blackfire/tests/Dockerfile.ubuntu-12.04
deleted file mode 100644
index d0c130cdf..000000000
--- a/provisioning/roles/geerlingguy.blackfire/tests/Dockerfile.ubuntu-12.04
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM ubuntu:12.04
-RUN apt-get update
-
-# Install Ansible
-RUN apt-get install -y software-properties-common python-software-properties git
-RUN apt-add-repository -y ppa:ansible/ansible
-RUN apt-get update
-RUN apt-get install -y ansible
-
-# Install Ansible inventory file
-RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.blackfire/tests/Dockerfile.ubuntu-14.04 b/provisioning/roles/geerlingguy.blackfire/tests/Dockerfile.ubuntu-14.04
deleted file mode 100644
index ca332871f..000000000
--- a/provisioning/roles/geerlingguy.blackfire/tests/Dockerfile.ubuntu-14.04
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM ubuntu:14.04
-RUN apt-get update
-
-# Install Ansible
-RUN apt-get install -y software-properties-common git
-RUN apt-add-repository -y ppa:ansible/ansible
-RUN apt-get update
-RUN apt-get install -y ansible
-
-# Install Ansible inventory file
-RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
diff --git a/provisioning/roles/geerlingguy.blackfire/tests/README.md b/provisioning/roles/geerlingguy.blackfire/tests/README.md
new file mode 100644
index 000000000..6fb211721
--- /dev/null
+++ b/provisioning/roles/geerlingguy.blackfire/tests/README.md
@@ -0,0 +1,11 @@
+# Ansible Role tests
+
+To run the test playbook(s) in this directory:
+
+  1. Install and start Docker.
+  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
+    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
+  1. Make the test shim executable: `chmod +x tests/test.sh`.
+  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
+
+If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.blackfire/tests/requirements.yml b/provisioning/roles/geerlingguy.blackfire/tests/requirements.yml
new file mode 100644
index 000000000..de297a054
--- /dev/null
+++ b/provisioning/roles/geerlingguy.blackfire/tests/requirements.yml
@@ -0,0 +1,2 @@
+---
+- src: geerlingguy.php
diff --git a/provisioning/roles/geerlingguy.blackfire/tests/test.yml b/provisioning/roles/geerlingguy.blackfire/tests/test.yml
index 8e5a02d46..9e14360f3 100644
--- a/provisioning/roles/geerlingguy.blackfire/tests/test.yml
+++ b/provisioning/roles/geerlingguy.blackfire/tests/test.yml
@@ -5,6 +5,42 @@
     php_enable_webserver: false
     php_enable_php_fpm: true
 
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=yes cache_valid_time=600
+      when: ansible_os_family == 'Debian'
+
+    # Ubuntu-specific tasks.
+    - name: Add repository for PHP 7 (Ubuntu).
+      apt_repository: repo='ppa:ondrej/php'
+      when: ansible_distribution == 'Ubuntu'
+
+    # Debian-specific tasks.
+    - name: Add dependencies for PHP versions (Debian).
+      apt:
+        name: "{{ item }}"
+      with_items:
+        - apt-transport-https
+        - ca-certificates
+      when: ansible_distribution == "Debian"
+
+    - name: Add Ondrej Sury's apt key (Debian).
+      apt_key:
+        url: https://packages.sury.org/php/apt.gpg
+        state: present
+      when: ansible_distribution == "Debian"
+
+    - name: Add Ondrej Sury's repo (Debian).
+      apt_repository:
+        repo: "deb https://packages.sury.org/php/ {{ ansible_distribution_release }} main"
+        state: present
+      register: php_ondrej_debian_repo
+      when: ansible_distribution == "Debian"
+
+    - name: Update apt caches after repo is added (Debian).
+      apt: update_cache=yes
+      when: php_ondrej_debian_repo.changed and (ansible_distribution == "Debian")
+
   roles:
     - geerlingguy.php
     - role_under_test
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/main.yml b/provisioning/roles/geerlingguy.mysql/tasks/main.yml
index 125e9318e..47cefcdc4 100644
--- a/provisioning/roles/geerlingguy.mysql/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.mysql/tasks/main.yml
@@ -1,19 +1,16 @@
 ---
 # Variable configuration.
-- include: variables.yml
+- include_tasks: variables.yml
 
 # Setup/install tasks.
-- include: setup-RedHat.yml
+- include_tasks: setup-RedHat.yml
   when: ansible_os_family == 'RedHat'
-  static: no
 
-- include: setup-Debian.yml
+- include_tasks: setup-Debian.yml
   when: ansible_os_family == 'Debian'
-  static: no
 
-- include: setup-Archlinux.yml
+- include_tasks: setup-Archlinux.yml
   when: ansible_os_family == 'Archlinux'
-  static: no
 
 - name: Check if MySQL packages were installed.
   set_fact:
@@ -22,8 +19,8 @@
       or (arch_mysql_install_packages is defined and arch_mysql_install_packages.changed) }}"
 
 # Configure MySQL.
-- include: configure.yml
-- include: secure-installation.yml
-- include: databases.yml
-- include: users.yml
-- include: replication.yml
+- include_tasks: configure.yml
+- include_tasks: secure-installation.yml
+- include_tasks: databases.yml
+- include_tasks: users.yml
+- include_tasks: replication.yml
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/setup-Archlinux.yml b/provisioning/roles/geerlingguy.mysql/tasks/setup-Archlinux.yml
index e24377b9c..469a570a3 100644
--- a/provisioning/roles/geerlingguy.mysql/tasks/setup-Archlinux.yml
+++ b/provisioning/roles/geerlingguy.mysql/tasks/setup-Archlinux.yml
@@ -7,6 +7,6 @@
   with_items: "{{ mysql_packages }}"
   register: arch_mysql_install_packages
 
-# Init the database if mysql is newly installed
-- command: mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
+- name: Run mysql_install_db if MySQL packages were changed.
+  command: mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
   when: arch_mysql_install_packages.changed
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.mysql/tasks/setup-Debian.yml
index 6ed76b3a5..241a45c08 100644
--- a/provisioning/roles/geerlingguy.mysql/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.mysql/tasks/setup-Debian.yml
@@ -7,8 +7,12 @@
   apt: update_cache=yes
   when: mysql_installed.stat.exists == false
 
+- name: Determine required MySQL Python libraries.
+  set_fact:
+    deb_mysql_python_package: "{% if 'python3' in ansible_python_interpreter|default('') %}python3-mysqldb{% else %}python-mysqldb{% endif %}"
+
 - name: Ensure MySQL Python libraries are installed.
-  apt: "name=python-mysqldb state=present"
+  apt: "name={{ deb_mysql_python_package }} state=present"
 
 - name: Ensure MySQL packages are installed.
   apt: "name={{ item }} state=present"

From 99a0e37b0e6bee5b528abe69abf56abf60dd5abf Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 26 Apr 2018 15:59:59 -0500
Subject: [PATCH 0984/1273] Issue #1553: Update to latest Elasticsearch role
 version.

---
 provisioning/requirements.yml                               | 2 +-
 provisioning/roles/geerlingguy.elasticsearch/.travis.yml    | 1 -
 provisioning/roles/geerlingguy.elasticsearch/meta/main.yml  | 6 +++++-
 provisioning/roles/geerlingguy.elasticsearch/tasks/main.yml | 4 ++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 42437a4c0..c8877227c 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -24,7 +24,7 @@
 - src: geerlingguy.drush
   version: 3.0.0
 - src: geerlingguy.elasticsearch
-  version: 2.1.4
+  version: 2.2.0
 - src: geerlingguy.firewall
   version: 2.3.1
 - src: geerlingguy.git
diff --git a/provisioning/roles/geerlingguy.elasticsearch/.travis.yml b/provisioning/roles/geerlingguy.elasticsearch/.travis.yml
index 6082c46e4..ce93e90fa 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/.travis.yml
+++ b/provisioning/roles/geerlingguy.elasticsearch/.travis.yml
@@ -5,7 +5,6 @@ env:
   - distro: centos7
   - distro: ubuntu1604
   - distro: ubuntu1404
-  - distro: ubuntu1204
 
 script:
   # Configure test script so we can run extra tests after playbook is run.
diff --git a/provisioning/roles/geerlingguy.elasticsearch/meta/main.yml b/provisioning/roles/geerlingguy.elasticsearch/meta/main.yml
index 5be9d380b..a984d6993 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/meta/main.yml
+++ b/provisioning/roles/geerlingguy.elasticsearch/meta/main.yml
@@ -7,7 +7,7 @@ galaxy_info:
   description: Elasticsearch for Linux.
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 1.8
+  min_ansible_version: 2.4
   platforms:
   - name: EL
     versions:
@@ -22,3 +22,7 @@ galaxy_info:
     - web
     - system
     - monitoring
+    - logging
+    - lucene
+    - elk
+    - elasticsearch
diff --git a/provisioning/roles/geerlingguy.elasticsearch/tasks/main.yml b/provisioning/roles/geerlingguy.elasticsearch/tasks/main.yml
index a564983ae..a80e2cec1 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.elasticsearch/tasks/main.yml
@@ -1,8 +1,8 @@
 ---
-- include: setup-RedHat.yml
+- include_tasks: setup-RedHat.yml
   when: ansible_os_family == 'RedHat'
 
-- include: setup-Debian.yml
+- include_tasks: setup-Debian.yml
   when: ansible_os_family == 'Debian'
 
 - name: Configure Elasticsearch.

From 0f5cadf41f6a3d13de86b47b8482988817444178 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 26 Apr 2018 16:55:13 -0500
Subject: [PATCH 0985/1273] Issue #1553: Update to latest Drush and Firewall
 role versions.

---
 provisioning/requirements.yml                          | 4 ++--
 provisioning/roles/geerlingguy.drush/.travis.yml       | 4 ++--
 provisioning/roles/geerlingguy.drush/meta/main.yml     | 3 ++-
 provisioning/roles/geerlingguy.drush/tasks/main.yml    | 6 +++---
 provisioning/roles/geerlingguy.firewall/.travis.yml    | 1 -
 provisioning/roles/geerlingguy.firewall/meta/main.yml  | 5 ++++-
 provisioning/roles/geerlingguy.firewall/tasks/main.yml | 2 +-
 7 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index c8877227c..54f0627c1 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -22,11 +22,11 @@
 - src: geerlingguy.drupal-console
   version: 1.1.1
 - src: geerlingguy.drush
-  version: 3.0.0
+  version: 3.1.0
 - src: geerlingguy.elasticsearch
   version: 2.2.0
 - src: geerlingguy.firewall
-  version: 2.3.1
+  version: 2.4.0
 - src: geerlingguy.git
   version: 2.0.2
 - src: geerlingguy.java
diff --git a/provisioning/roles/geerlingguy.drush/.travis.yml b/provisioning/roles/geerlingguy.drush/.travis.yml
index 51f05fe8e..fc553676e 100644
--- a/provisioning/roles/geerlingguy.drush/.travis.yml
+++ b/provisioning/roles/geerlingguy.drush/.travis.yml
@@ -7,10 +7,10 @@ env:
     playbook: test.yml
   - distro: ubuntu1604
     playbook: test.yml
-  - distro: debian8
-    playbook: test.yml
   - distro: debian9
     playbook: test.yml
+  - distro: debian8
+    playbook: test.yml
   # Install from composer.
   - distro: centos7
     playbook: test-composer-install.yml
diff --git a/provisioning/roles/geerlingguy.drush/meta/main.yml b/provisioning/roles/geerlingguy.drush/meta/main.yml
index 8f188fac9..9c7dba08b 100644
--- a/provisioning/roles/geerlingguy.drush/meta/main.yml
+++ b/provisioning/roles/geerlingguy.drush/meta/main.yml
@@ -6,7 +6,7 @@ galaxy_info:
   description: Drush - command line shell for Drupal
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 2.0
+  min_ansible_version: 2.4
   platforms:
     - name: EL
       versions:
@@ -44,3 +44,4 @@ galaxy_info:
     - drush
     - drupal
     - command
+    - cli
diff --git a/provisioning/roles/geerlingguy.drush/tasks/main.yml b/provisioning/roles/geerlingguy.drush/tasks/main.yml
index f6c93b268..09a3a19dd 100644
--- a/provisioning/roles/geerlingguy.drush/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.drush/tasks/main.yml
@@ -1,9 +1,9 @@
 ---
-- include: install-drush-launcher.yml
+- include_tasks: install-drush-launcher.yml
   when: drush_launcher_install
 
-- include: install-drush-composer.yml
+- include_tasks: install-drush-composer.yml
   when: drush_composer_global_install
 
-- include: install-source.yml
+- include_tasks: install-source.yml
   when: drush_install_from_source
diff --git a/provisioning/roles/geerlingguy.firewall/.travis.yml b/provisioning/roles/geerlingguy.firewall/.travis.yml
index cab34e1fd..d6fbf5eb2 100644
--- a/provisioning/roles/geerlingguy.firewall/.travis.yml
+++ b/provisioning/roles/geerlingguy.firewall/.travis.yml
@@ -6,7 +6,6 @@ env:
   - distro: centos6
   - distro: ubuntu1604
   - distro: ubuntu1404
-  - distro: ubuntu1204
   - distro: debian8
 
 script:
diff --git a/provisioning/roles/geerlingguy.firewall/meta/main.yml b/provisioning/roles/geerlingguy.firewall/meta/main.yml
index 233866cf4..45ddaf2dd 100644
--- a/provisioning/roles/geerlingguy.firewall/meta/main.yml
+++ b/provisioning/roles/geerlingguy.firewall/meta/main.yml
@@ -6,7 +6,7 @@ galaxy_info:
   description: Simple iptables firewall for most Unix-like systems.
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 2.0
+  min_ansible_version: 2.4
   platforms:
   - name: EL
     versions:
@@ -21,3 +21,6 @@ galaxy_info:
     - networking
     - system
     - security
+    - firewall
+    - iptables
+    - tcp
diff --git a/provisioning/roles/geerlingguy.firewall/tasks/main.yml b/provisioning/roles/geerlingguy.firewall/tasks/main.yml
index 85b58765d..df1a631d1 100644
--- a/provisioning/roles/geerlingguy.firewall/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.firewall/tasks/main.yml
@@ -40,5 +40,5 @@
     state: "{{ firewall_state }}"
     enabled: "{{ firewall_enabled_at_boot }}"
 
-- include: disable-other-firewalls.yml
+- import_tasks: disable-other-firewalls.yml
   when: firewall_disable_firewalld or firewall_disable_ufw

From bcd1935a5d4a7725a81144875ff9bd3935f066c9 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 27 Apr 2018 09:18:16 -0500
Subject: [PATCH 0986/1273] Issue #1553: Update to latest Drupal role version.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.drupal/.travis.yml      |  4 ++--
 .../roles/geerlingguy.drupal/README.md        |  2 +-
 .../geerlingguy.drupal/defaults/main.yml      |  2 +-
 .../roles/geerlingguy.drupal/meta/main.yml    |  2 +-
 .../roles/geerlingguy.drupal/tasks/main.yml   | 22 +++++++------------
 .../geerlingguy.drupal/tests/test-deploy.yml  |  2 +-
 .../geerlingguy.drupal/tests/test-setup.yml   |  3 ++-
 .../roles/geerlingguy.drupal/tests/test.yml   |  2 +-
 9 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 54f0627c1..b951de328 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -18,7 +18,7 @@
 - src: geerlingguy.daemonize
   version: 1.2.0
 - src: geerlingguy.drupal
-  version: 2.4.0
+  version: 2.5.0
 - src: geerlingguy.drupal-console
   version: 1.1.1
 - src: geerlingguy.drush
diff --git a/provisioning/roles/geerlingguy.drupal/.travis.yml b/provisioning/roles/geerlingguy.drupal/.travis.yml
index a49f2bd52..5070acc22 100644
--- a/provisioning/roles/geerlingguy.drupal/.travis.yml
+++ b/provisioning/roles/geerlingguy.drupal/.travis.yml
@@ -5,7 +5,7 @@ env:
   # Composer-project-based Drupal 8 site setup.
   - distro: centos7
     playbook: test.yml
-  - distro: debian8
+  - distro: debian9
     playbook: test.yml
   - distro: ubuntu1604
     playbook: test.yml
@@ -28,7 +28,7 @@ script:
   - ${PWD}/tests/test.sh
 
   # Make sure Drupal is running.
-  - 'docker exec --tty ${container_id} env TERM=xterm curl http://drupaltest.dev/ | grep "Welcome to Drupal"'
+  - 'docker exec --tty ${container_id} env TERM=xterm curl http://localhost/ | grep "Welcome to Drupal"'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.drupal/README.md b/provisioning/roles/geerlingguy.drupal/README.md
index 49de79b9b..bce9d837d 100644
--- a/provisioning/roles/geerlingguy.drupal/README.md
+++ b/provisioning/roles/geerlingguy.drupal/README.md
@@ -85,7 +85,7 @@ Required Drupal settings. When used in a production or shared environment, you s
 
 Set this to `false` if you don't need to install Drupal (using the `drupal_*` settings below), but instead copy down a database (e.g. using `drush sql-sync`).
 
-    drupal_domain: "drupaltest.dev"
+    drupal_domain: "drupaltest.test"
     drupal_site_name: "Drupal"
     drupal_install_profile: standard
     drupal_site_install_extra_args: []
diff --git a/provisioning/roles/geerlingguy.drupal/defaults/main.yml b/provisioning/roles/geerlingguy.drupal/defaults/main.yml
index a114542ea..b43372fad 100644
--- a/provisioning/roles/geerlingguy.drupal/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.drupal/defaults/main.yml
@@ -44,7 +44,7 @@ drupal_db_host: "127.0.0.1"
 drupal_install_site: true
 
 # Settings for installing a Drupal site if 'drupal_install_site:' is 'true'.
-drupal_domain: "drupaltest.dev"
+drupal_domain: "drupaltest.test"
 drupal_site_name: "Drupal"
 drupal_install_profile: standard
 drupal_site_install_extra_args: []
diff --git a/provisioning/roles/geerlingguy.drupal/meta/main.yml b/provisioning/roles/geerlingguy.drupal/meta/main.yml
index 4e4e6b27d..a3e23aee3 100644
--- a/provisioning/roles/geerlingguy.drupal/meta/main.yml
+++ b/provisioning/roles/geerlingguy.drupal/meta/main.yml
@@ -6,7 +6,7 @@ galaxy_info:
   description: Deploy or install Drupal on your servers.
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 2.0
+  min_ansible_version: 2.4
   platforms:
     - name: EL
       versions:
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/main.yml b/provisioning/roles/geerlingguy.drupal/tasks/main.yml
index 02697fdc8..ea81133f6 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/main.yml
@@ -1,7 +1,6 @@
 ---
 - name: Add backwards-compatibility shims.
-  include: backwards-compatibility.yml
-  static: no
+  include_tasks: backwards-compatibility.yml
 
 - name: Check if Drupal is already set up.
   stat: "path={{ drupal_core_path }}/index.php"
@@ -18,32 +17,28 @@
     drupal_site_exists: "{{ drupal_site.stat.exists|default(false) }}"
 
 # Deploy Drupal if configured.
-- include: tasks/deploy.yml
+- include_tasks: tasks/deploy.yml
   when: drupal_deploy
 
 - name: Define drupal_deploy_updated
   set_fact:
-    drupal_deploy_updated: "{{ drupal_deploy_repo_updated.changed|default(false) }}"
+    drupal_deploy_updated: "{{ (drupal_deploy_repo_updated is defined and drupal_deploy_repo_updated.changed) | default(false) }}"
 
 # Run update tasks if Drupal was updated.
-- include: tasks/update.yml
+- include_tasks: tasks/update.yml
   when: drupal_deploy_updated and drupal_site_exists
-  static: no
 
 # Build makefile if configured.
-- include: tasks/build-makefile.yml
+- include_tasks: tasks/build-makefile.yml
   when: drupal_build_makefile
-  static: no
 
 # Build with composer if configured.
-- include: tasks/build-composer.yml
+- include_tasks: tasks/build-composer.yml
   when: drupal_build_composer
-  static: no
 
 # Build a composer project if configured.
-- include: tasks/build-composer-project.yml
+- include_tasks: tasks/build-composer-project.yml
   when: drupal_build_composer_project
-  static: no
 
 # Set Drush variables.
 - name: Check if a project specific Drush binary exists.
@@ -57,6 +52,5 @@
   when: drush_vendor_bin.stat.exists
 
 # Install site if configured.
-- include: tasks/install-site.yml
+- include_tasks: tasks/install-site.yml
   when: drupal_install_site
-  static: no
diff --git a/provisioning/roles/geerlingguy.drupal/tests/test-deploy.yml b/provisioning/roles/geerlingguy.drupal/tests/test-deploy.yml
index ac4fe7fe4..6c3cc566c 100644
--- a/provisioning/roles/geerlingguy.drupal/tests/test-deploy.yml
+++ b/provisioning/roles/geerlingguy.drupal/tests/test-deploy.yml
@@ -17,7 +17,7 @@
     drupal_composer_dependencies: []
 
   pre_tasks:
-    - include: test-setup.yml
+    - import_tasks: test-setup.yml
 
   roles:
     - name: geerlingguy.repo-remi
diff --git a/provisioning/roles/geerlingguy.drupal/tests/test-setup.yml b/provisioning/roles/geerlingguy.drupal/tests/test-setup.yml
index a6bd7b4d4..7d95ea5d0 100644
--- a/provisioning/roles/geerlingguy.drupal/tests/test-setup.yml
+++ b/provisioning/roles/geerlingguy.drupal/tests/test-setup.yml
@@ -18,11 +18,12 @@
   apt_repository: repo='ppa:ondrej/php'
   when: ansible_distribution == "Ubuntu" and ansible_distribution_version != "16.04"
 
-- name: Set php_packages for PHP 7.0 Debian 8 install.
+- name: Set php_packages for PHP 7.0 Debian install.
   set_fact:
     php_packages:
       - php7.0-common
       - php7.0-cli
+      - php7.0-curl
       - php7.0-dev
       - php7.0-fpm
       - libpcre3-dev
diff --git a/provisioning/roles/geerlingguy.drupal/tests/test.yml b/provisioning/roles/geerlingguy.drupal/tests/test.yml
index a52b535a5..73ae792da 100644
--- a/provisioning/roles/geerlingguy.drupal/tests/test.yml
+++ b/provisioning/roles/geerlingguy.drupal/tests/test.yml
@@ -5,7 +5,7 @@
     - test-vars.yml
 
   pre_tasks:
-    - include: test-setup.yml
+    - import_tasks: test-setup.yml
 
   roles:
     - name: geerlingguy.repo-remi

From 16045a01479a39014e8d7136a78e5d9861635452 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 27 Apr 2018 09:55:00 -0500
Subject: [PATCH 0987/1273] Issue #1553: Update to latest Node.js role version.

---
 provisioning/requirements.yml                             | 2 +-
 provisioning/roles/geerlingguy.nodejs/.travis.yml         | 2 +-
 provisioning/roles/geerlingguy.nodejs/defaults/main.yml   | 2 +-
 provisioning/roles/geerlingguy.nodejs/meta/main.yml       | 8 +++++++-
 provisioning/roles/geerlingguy.nodejs/tasks/main.yml      | 4 ++--
 .../roles/geerlingguy.nodejs/tests/test-latest.yml        | 4 ++--
 6 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index b951de328..ccf2e6c1a 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -40,7 +40,7 @@
 - src: geerlingguy.nginx
   version: 2.6.0
 - src: geerlingguy.nodejs
-  version: 4.1.2
+  version: 4.2.0
 - src: geerlingguy.php
   version: 3.6.0
 - src: geerlingguy.php-memcached
diff --git a/provisioning/roles/geerlingguy.nodejs/.travis.yml b/provisioning/roles/geerlingguy.nodejs/.travis.yml
index ad892bd4e..086189681 100644
--- a/provisioning/roles/geerlingguy.nodejs/.travis.yml
+++ b/provisioning/roles/geerlingguy.nodejs/.travis.yml
@@ -5,8 +5,8 @@ env:
   # Defaults.
   - distro: centos7
   - distro: centos6
+  - distro: ubuntu1804
   - distro: ubuntu1604
-  - distro: ubuntu1404
   - distro: debian9
   - distro: debian8
 
diff --git a/provisioning/roles/geerlingguy.nodejs/defaults/main.yml b/provisioning/roles/geerlingguy.nodejs/defaults/main.yml
index bb9391447..473274887 100644
--- a/provisioning/roles/geerlingguy.nodejs/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.nodejs/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-# Set the version of Node.js to install ("0.12", "4.x", "5.x", "6.x", "8.x").
+# Set the version of Node.js to install ("0.12", "4.x", "5.x", "6.x", "8.x", "9.x").
 # Version numbers from Nodesource: https://github.com/nodesource/distributions
 nodejs_version: "6.x"
 
diff --git a/provisioning/roles/geerlingguy.nodejs/meta/main.yml b/provisioning/roles/geerlingguy.nodejs/meta/main.yml
index 26bb728c5..b567a2f6a 100644
--- a/provisioning/roles/geerlingguy.nodejs/meta/main.yml
+++ b/provisioning/roles/geerlingguy.nodejs/meta/main.yml
@@ -6,7 +6,7 @@ galaxy_info:
   description: Node.js installation for Linux
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 1.9
+  min_ansible_version: 2.4
   platforms:
     - name: EL
       versions:
@@ -19,6 +19,12 @@ galaxy_info:
       versions:
       - trusty
       - xenial
+      - bionic
   galaxy_tags:
     - development
     - web
+    - javascript
+    - js
+    - node
+    - npm
+    - nodejs
diff --git a/provisioning/roles/geerlingguy.nodejs/tasks/main.yml b/provisioning/roles/geerlingguy.nodejs/tasks/main.yml
index c99d6f6ff..6b125c14f 100644
--- a/provisioning/roles/geerlingguy.nodejs/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.nodejs/tasks/main.yml
@@ -1,8 +1,8 @@
 ---
-- include: setup-RedHat.yml
+- import_tasks: setup-RedHat.yml
   when: ansible_os_family == 'RedHat'
 
-- include: setup-Debian.yml
+- import_tasks: setup-Debian.yml
   when: ansible_os_family == 'Debian'
 
 - name: Define nodejs_install_npm_user
diff --git a/provisioning/roles/geerlingguy.nodejs/tests/test-latest.yml b/provisioning/roles/geerlingguy.nodejs/tests/test-latest.yml
index 59044d851..8aee4138f 100644
--- a/provisioning/roles/geerlingguy.nodejs/tests/test-latest.yml
+++ b/provisioning/roles/geerlingguy.nodejs/tests/test-latest.yml
@@ -2,14 +2,14 @@
 - hosts: all
 
   vars:
-    nodejs_version: "8.x"
+    nodejs_version: "9.x"
     nodejs_install_npm_user: root
     npm_config_prefix: /root/.npm-global
     npm_config_unsafe_perm: "true"
     nodejs_npm_global_packages:
       - node-sass
       - name: jslint
-        version: 0.9.6
+        version: 0.12.0
       - name: yo
 
   pre_tasks:

From 51b65d04d1fb54ba308ed6cdbeb300a274d11f7b Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 27 Apr 2018 11:34:30 -0500
Subject: [PATCH 0988/1273] Issue #1553: Update to latest PHP redis, tideways,
 versions, and xhprof role versions.

---
 provisioning/requirements.yml                             | 8 ++++----
 provisioning/roles/geerlingguy.php-redis/meta/main.yml    | 4 +++-
 provisioning/roles/geerlingguy.php-redis/tasks/main.yml   | 2 +-
 provisioning/roles/geerlingguy.php-tideways/meta/main.yml | 8 +++++++-
 .../roles/geerlingguy.php-tideways/tasks/main.yml         | 4 ++--
 .../roles/geerlingguy.php-tideways/tasks/xhprof.yml       | 3 ++-
 provisioning/roles/geerlingguy.php-versions/meta/main.yml | 3 ++-
 .../roles/geerlingguy.php-versions/tasks/main.yml         | 3 +--
 provisioning/roles/geerlingguy.php-xhprof/.travis.yml     | 2 +-
 provisioning/roles/geerlingguy.php-xhprof/meta/main.yml   | 6 +++++-
 provisioning/roles/geerlingguy.php-xhprof/tasks/main.yml  | 2 +-
 11 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index ccf2e6c1a..4447e69eb 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -52,15 +52,15 @@
 - src: geerlingguy.php-pgsql
   version: 1.0.0
 - src: geerlingguy.php-redis
-  version: 3.1.1
+  version: 3.2.0
 - src: geerlingguy.php-tideways
-  version: 2.0.2
+  version: 2.1.0
 - src: geerlingguy.php-versions
-  version: 2.0.0
+  version: 2.1.0
 - src: geerlingguy.php-xdebug
   version: 2.5.0
 - src: geerlingguy.php-xhprof
-  version: 2.2.3
+  version: 2.3.0
 - src: geerlingguy.pimpmylog
   version: 1.0.2
 - src: geerlingguy.postfix
diff --git a/provisioning/roles/geerlingguy.php-redis/meta/main.yml b/provisioning/roles/geerlingguy.php-redis/meta/main.yml
index 810ac2ce1..dd94f9653 100644
--- a/provisioning/roles/geerlingguy.php-redis/meta/main.yml
+++ b/provisioning/roles/geerlingguy.php-redis/meta/main.yml
@@ -7,7 +7,7 @@ galaxy_info:
   description: PhpRedis support for Linux
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 1.8
+  min_ansible_version: 2.4
   platforms:
     - name: EL
       versions:
@@ -22,3 +22,5 @@ galaxy_info:
   galaxy_tags:
     - database
     - web
+    - php
+    - redis
diff --git a/provisioning/roles/geerlingguy.php-redis/tasks/main.yml b/provisioning/roles/geerlingguy.php-redis/tasks/main.yml
index 0adb568c8..f0d83d970 100644
--- a/provisioning/roles/geerlingguy.php-redis/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php-redis/tasks/main.yml
@@ -27,5 +27,5 @@
   when: (php_redis_install_from_source == false) and (ansible_os_family == 'Debian')
 
 # Install PhpRedis from source.
-- include: install-from-source.yml
+- include_tasks: install-from-source.yml
   when: php_redis_install_from_source == true
diff --git a/provisioning/roles/geerlingguy.php-tideways/meta/main.yml b/provisioning/roles/geerlingguy.php-tideways/meta/main.yml
index 4975eb3b6..9d4e3c947 100644
--- a/provisioning/roles/geerlingguy.php-tideways/meta/main.yml
+++ b/provisioning/roles/geerlingguy.php-tideways/meta/main.yml
@@ -7,7 +7,7 @@ galaxy_info:
   description: Tideways PHP Profiler Extension for Linux
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 2.0
+  min_ansible_version: 2.4
   platforms:
     - name: EL
       versions:
@@ -42,3 +42,9 @@ galaxy_info:
   galaxy_tags:
     - development
     - web
+    - php
+    - xhprof
+    - tideways
+    - profiler
+    - performance
+    - debug
diff --git a/provisioning/roles/geerlingguy.php-tideways/tasks/main.yml b/provisioning/roles/geerlingguy.php-tideways/tasks/main.yml
index fc54be489..65c256850 100644
--- a/provisioning/roles/geerlingguy.php-tideways/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php-tideways/tasks/main.yml
@@ -57,6 +57,6 @@
 # $ php -r 'echo ini_get("extension_dir")."\n";'
 # $ cp Tideways.php /path/to/php/lib
 
-- include: configure.yml
-- include: xhprof.yml
+- include_tasks: configure.yml
+- include_tasks: xhprof.yml
   when: tideways_install_xhprof_ui
diff --git a/provisioning/roles/geerlingguy.php-tideways/tasks/xhprof.yml b/provisioning/roles/geerlingguy.php-tideways/tasks/xhprof.yml
index a71c60159..7fb9357c7 100644
--- a/provisioning/roles/geerlingguy.php-tideways/tasks/xhprof.yml
+++ b/provisioning/roles/geerlingguy.php-tideways/tasks/xhprof.yml
@@ -39,4 +39,5 @@
   shell: >
     cp -r {{ workspace }}/{{ xhprof_download_folder_name }}/xhprof_html {{ php_xhprof_html_dir }}
     creates={{ php_xhprof_html_dir }}/index.php
-- include: configure.yml
+
+- include_tasks: configure.yml
diff --git a/provisioning/roles/geerlingguy.php-versions/meta/main.yml b/provisioning/roles/geerlingguy.php-versions/meta/main.yml
index 2d776bbe0..038667df7 100644
--- a/provisioning/roles/geerlingguy.php-versions/meta/main.yml
+++ b/provisioning/roles/geerlingguy.php-versions/meta/main.yml
@@ -7,7 +7,7 @@ galaxy_info:
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
   issue_tracker_url: https://github.com/geerlingguy/drupal-vm/issues
-  min_ansible_version: 2.2
+  min_ansible_version: 2.4
   platforms:
     - name: EL
       versions:
@@ -22,6 +22,7 @@ galaxy_info:
         - saucy
         - trusty
         - xenial
+        - bionic
   galaxy_tags:
     - php
     - web
diff --git a/provisioning/roles/geerlingguy.php-versions/tasks/main.yml b/provisioning/roles/geerlingguy.php-versions/tasks/main.yml
index f53afd1cf..53c38311f 100644
--- a/provisioning/roles/geerlingguy.php-versions/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php-versions/tasks/main.yml
@@ -27,8 +27,7 @@
     php_packages: __php_packages
 
 # Setup tasks.
-- include: "setup-{{ ansible_os_family }}.yml"
-  static: no
+- include_tasks: "setup-{{ ansible_os_family }}.yml"
 
 - name: Set the correct XHProf package when PHP 5.6 is used.
   set_fact:
diff --git a/provisioning/roles/geerlingguy.php-xhprof/.travis.yml b/provisioning/roles/geerlingguy.php-xhprof/.travis.yml
index 475350045..67b82cb6e 100644
--- a/provisioning/roles/geerlingguy.php-xhprof/.travis.yml
+++ b/provisioning/roles/geerlingguy.php-xhprof/.travis.yml
@@ -4,7 +4,7 @@ services: docker
 env:
   - distro: centos7
   - distro: ubuntu1604
-  - distro: debian8
+  - distro: debian9
 
 script:
   # Configure test script so we can run extra tests after playbook is run.
diff --git a/provisioning/roles/geerlingguy.php-xhprof/meta/main.yml b/provisioning/roles/geerlingguy.php-xhprof/meta/main.yml
index 6077e3b10..91d882305 100644
--- a/provisioning/roles/geerlingguy.php-xhprof/meta/main.yml
+++ b/provisioning/roles/geerlingguy.php-xhprof/meta/main.yml
@@ -7,7 +7,7 @@ galaxy_info:
   description: PHP XHProf for Linux
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 2.0
+  min_ansible_version: 2.4
   platforms:
     - name: EL
       versions:
@@ -42,3 +42,7 @@ galaxy_info:
   galaxy_tags:
     - development
     - web
+    - php
+    - xhprof
+    - profile
+    - debug
diff --git a/provisioning/roles/geerlingguy.php-xhprof/tasks/main.yml b/provisioning/roles/geerlingguy.php-xhprof/tasks/main.yml
index 2c7884da1..be1283262 100644
--- a/provisioning/roles/geerlingguy.php-xhprof/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php-xhprof/tasks/main.yml
@@ -63,7 +63,7 @@
     cp -r {{ workspace }}/{{ xhprof_download_folder_name }}/xhprof_html {{ php_xhprof_html_dir }}
     creates={{ php_xhprof_html_dir }}/index.php
 
-- include: configure.yml
+- include_tasks: configure.yml
 
 - name: Ensure XHProf output directory exists.
   file:

From 18de8ab2ec9507a6ee171c009db2f3804945dadb Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 27 Apr 2018 13:38:21 -0500
Subject: [PATCH 0989/1273] Issue #1553: Update to latest Redis and Security
 role versions.

---
 provisioning/requirements.yml                          |  6 +++---
 provisioning/roles/geerlingguy.redis/.travis.yml       |  4 ++--
 provisioning/roles/geerlingguy.redis/README.md         |  4 ++--
 provisioning/roles/geerlingguy.redis/meta/main.yml     |  5 ++++-
 provisioning/roles/geerlingguy.redis/tasks/main.yml    |  6 +++---
 provisioning/roles/geerlingguy.security/.travis.yml    |  2 +-
 provisioning/roles/geerlingguy.security/meta/main.yml  |  2 +-
 provisioning/roles/geerlingguy.security/tasks/main.yml | 10 +++++-----
 8 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 4447e69eb..ab7315a18 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -68,13 +68,13 @@
 - src: geerlingguy.postgresql
   version: 1.4.1
 - src: geerlingguy.redis
-  version: 1.5.1
+  version: 1.6.0
 - src: geerlingguy.repo-remi
   version: 1.2.0
 - src: geerlingguy.ruby
-  version: 2.4.4
+  version: 2.5.0
 - src: geerlingguy.security
-  version: 1.6.0
+  version: 1.7.0
 - src: geerlingguy.solr
   version: 4.1.0
 - src: geerlingguy.varnish
diff --git a/provisioning/roles/geerlingguy.redis/.travis.yml b/provisioning/roles/geerlingguy.redis/.travis.yml
index a745a785f..5c35da846 100644
--- a/provisioning/roles/geerlingguy.redis/.travis.yml
+++ b/provisioning/roles/geerlingguy.redis/.travis.yml
@@ -4,8 +4,8 @@ services: docker
 env:
   - distro: centos7
     redis_daemon: redis
-  # - distro: fedora24
-  #   redis_daemon: redis
+  - distro: fedora27
+    redis_daemon: redis
   - distro: ubuntu1604
     redis_daemon: redis-server
 
diff --git a/provisioning/roles/geerlingguy.redis/README.md b/provisioning/roles/geerlingguy.redis/README.md
index db87939ed..e8134ee7f 100644
--- a/provisioning/roles/geerlingguy.redis/README.md
+++ b/provisioning/roles/geerlingguy.redis/README.md
@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/geerlingguy/ansible-role-redis.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-redis)
 
-Installs [Redis](http://redis.io/) on RHEL/CentOS or Debian/Ubuntu.
+Installs [Redis](http://redis.io/) on Linux.
 
 ## Requirements
 
@@ -108,7 +108,7 @@ None.
 
     - hosts: all
       roles:
-        - { role: geerlingguy.redis }
+        - role: geerlingguy.redis
 
 ## License
 
diff --git a/provisioning/roles/geerlingguy.redis/meta/main.yml b/provisioning/roles/geerlingguy.redis/meta/main.yml
index d4f114176..ffccc6a41 100644
--- a/provisioning/roles/geerlingguy.redis/meta/main.yml
+++ b/provisioning/roles/geerlingguy.redis/meta/main.yml
@@ -6,7 +6,7 @@ galaxy_info:
   description: Redis for Linux
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 2.0
+  min_ansible_version: 2.4
   platforms:
     - name: EL
       versions:
@@ -28,3 +28,6 @@ galaxy_info:
     - database
     - development
     - web
+    - redis
+    - cache
+    - performance
diff --git a/provisioning/roles/geerlingguy.redis/tasks/main.yml b/provisioning/roles/geerlingguy.redis/tasks/main.yml
index cb8114a9f..c249de3d7 100644
--- a/provisioning/roles/geerlingguy.redis/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.redis/tasks/main.yml
@@ -9,13 +9,13 @@
   when: redis_package is not defined
 
 # Setup/install tasks.
-- include: setup-RedHat.yml
+- include_tasks: setup-RedHat.yml
   when: ansible_os_family == 'RedHat'
 
-- include: setup-Debian.yml
+- include_tasks: setup-Debian.yml
   when: ansible_os_family == 'Debian'
 
-- include: setup-Archlinux.yml
+- include_tasks: setup-Archlinux.yml
   when: ansible_os_family == 'Archlinux'
 
 - name: Ensure Redis is configured.
diff --git a/provisioning/roles/geerlingguy.security/.travis.yml b/provisioning/roles/geerlingguy.security/.travis.yml
index 0af68829e..1641294a2 100644
--- a/provisioning/roles/geerlingguy.security/.travis.yml
+++ b/provisioning/roles/geerlingguy.security/.travis.yml
@@ -7,7 +7,7 @@ env:
   - distro: ubuntu1604
   - distro: ubuntu1404
   - distro: debian8
-  - distro: fedora24
+  - distro: fedora27
 
 script:
   # Configure test script so we can run extra tests after playbook is run.
diff --git a/provisioning/roles/geerlingguy.security/meta/main.yml b/provisioning/roles/geerlingguy.security/meta/main.yml
index f80c938e7..f5616d234 100644
--- a/provisioning/roles/geerlingguy.security/meta/main.yml
+++ b/provisioning/roles/geerlingguy.security/meta/main.yml
@@ -6,7 +6,7 @@ galaxy_info:
   description: Security software installation and configuration.
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 2.0
+  min_ansible_version: 2.4
   platforms:
     - name: EL
       versions:
diff --git a/provisioning/roles/geerlingguy.security/tasks/main.yml b/provisioning/roles/geerlingguy.security/tasks/main.yml
index 31200f84c..84097cc35 100644
--- a/provisioning/roles/geerlingguy.security/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.security/tasks/main.yml
@@ -3,10 +3,10 @@
   include_vars: "{{ ansible_os_family }}.yml"
 
 # Fail2Ban
-- include: fail2ban-RedHat.yml
+- include_tasks: fail2ban-RedHat.yml
   when: ansible_os_family == 'RedHat' and security_fail2ban_enabled
 
-- include: fail2ban-Debian.yml
+- include_tasks: fail2ban-Debian.yml
   when: ansible_os_family == 'Debian' and security_fail2ban_enabled
 
 - name: Ensure fail2ban is running and enabled on boot.
@@ -14,11 +14,11 @@
   when: security_fail2ban_enabled
 
 # SSH
-- include: ssh.yml
+- include_tasks: ssh.yml
 
 # Autoupdate
-- include: autoupdate-RedHat.yml
+- include_tasks: autoupdate-RedHat.yml
   when: ansible_os_family == 'RedHat' and security_autoupdate_enabled
 
-- include: autoupdate-Debian.yml
+- include_tasks: autoupdate-Debian.yml
   when: ansible_os_family == 'Debian' and security_autoupdate_enabled

From cff87124fce552b02ab1dc169e71d7aec6965ecd Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 27 Apr 2018 14:10:19 -0500
Subject: [PATCH 0990/1273] Issue #1553: Update to latest Ruby role version.

---
 provisioning/roles/geerlingguy.ruby/.travis.yml    |  8 ++++----
 provisioning/roles/geerlingguy.ruby/README.md      | 14 +++++++-------
 .../roles/geerlingguy.ruby/defaults/main.yml       | 10 +++++-----
 provisioning/roles/geerlingguy.ruby/meta/main.yml  |  6 +++++-
 provisioning/roles/geerlingguy.ruby/tasks/main.yml |  6 +++---
 .../roles/geerlingguy.ruby/tests/test-source.yml   |  2 --
 6 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/provisioning/roles/geerlingguy.ruby/.travis.yml b/provisioning/roles/geerlingguy.ruby/.travis.yml
index b3c2f57aa..01d29c5df 100644
--- a/provisioning/roles/geerlingguy.ruby/.travis.yml
+++ b/provisioning/roles/geerlingguy.ruby/.travis.yml
@@ -15,19 +15,19 @@ env:
     playbook: test.yml
     ruby_version: 1.9.3
     ruby_path_prefix: /usr
-  - distro: debian8
+  - distro: debian9
     playbook: test.yml
-    ruby_version: 2.1.5
+    ruby_version: 2.3.3
     ruby_path_prefix: /usr
 
   # Source install on latest OSes.
   - distro: centos7
     playbook: test-source.yml
-    ruby_version: 2.3.0
+    ruby_version: 2.4.4
     ruby_path_prefix: /usr/local
   - distro: ubuntu1604
     playbook: test-source.yml
-    ruby_version: 2.3.0
+    ruby_version: 2.4.4
     ruby_path_prefix: /usr/local
 
 script:
diff --git a/provisioning/roles/geerlingguy.ruby/README.md b/provisioning/roles/geerlingguy.ruby/README.md
index a4ce38666..c74d549c1 100644
--- a/provisioning/roles/geerlingguy.ruby/README.md
+++ b/provisioning/roles/geerlingguy.ruby/README.md
@@ -16,7 +16,7 @@ Available variables are listed below, along with default values (see `defaults/m
 
 The location where temporary files will be downloaded in preparation for Ruby installation.
 
-    ruby_install_bundler: true
+    ruby_install_bundler: True
 
 Whether this role should install [Bundler](http://bundler.io/).
 
@@ -28,17 +28,17 @@ A list of Ruby gems to install (just the name of the gem to be installed). This
 
 The user account under which Ruby gems will be installed. Defaults to the `ansible_ssh_user` if not set.
 
-    ruby_install_from_source: false
+    ruby_install_from_source: False
 
 By default, this role will install whatever version of ruby is available through your system's package manager (`apt` or `yum`). You can install whatever version you like (including the latest release) by setting this to `true` and/or updating the `ruby_download_url` and `ruby_version`.
 
-    ruby_download_url: http://cache.ruby-lang.org/pub/ruby/2.2/ruby-2.2.1.tar.gz
+    ruby_download_url: http://cache.ruby-lang.org/pub/ruby/2.5/ruby-2.4.4.tar.gz
 
-The URL from which Ruby will be downloaded (only used if `ruby_install_from_source` is `true`).
+The URL from which Ruby will be downloaded (only used if `ruby_install_from_source` is `True`).
 
-    ruby_version: 2.2.1
+    ruby_version: 2.4.4
 
-The version of ruby that will be installed (only used if `ruby_install_from_source` is `true`).
+The version of ruby that will be installed (only used if `ruby_install_from_source` is `True`).
 
     ruby_rubygems_package_name: rubygems
 
@@ -52,7 +52,7 @@ None.
 
     - hosts: server
       roles:
-        - { role: geerlingguy.ruby }
+        - role: geerlingguy.ruby
 
 ## License
 
diff --git a/provisioning/roles/geerlingguy.ruby/defaults/main.yml b/provisioning/roles/geerlingguy.ruby/defaults/main.yml
index d057b400d..13c77b651 100644
--- a/provisioning/roles/geerlingguy.ruby/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.ruby/defaults/main.yml
@@ -2,7 +2,7 @@
 workspace: /root
 
 # Whether this role should install Bundler.
-ruby_install_bundler: true
+ruby_install_bundler: True
 
 # A list of Ruby gems to install.
 ruby_install_gems: []
@@ -10,11 +10,11 @@ ruby_install_gems: []
 # The user account under which Ruby gems will be installed.
 ruby_install_gems_user: "{{ ansible_user }}"
 
-# If set to TRUE, ruby will be installed from source, using the version set with
+# If set to True, ruby will be installed from source, using the version set with
 # the 'ruby_version' variable instead of using a package.
-ruby_install_from_source: false
-ruby_download_url: http://cache.ruby-lang.org/pub/ruby/2.4/ruby-2.4.1.tar.gz
-ruby_version: 2.4.1
+ruby_install_from_source: False
+ruby_download_url: http://cache.ruby-lang.org/pub/ruby/2.4/ruby-2.4.4.tar.gz
+ruby_version: 2.4.4
 
 # Default should usually work, but this will be overridden on Ubuntu 14.04.
 ruby_rubygems_package_name: rubygems
diff --git a/provisioning/roles/geerlingguy.ruby/meta/main.yml b/provisioning/roles/geerlingguy.ruby/meta/main.yml
index 3cb9fa82c..2218239ee 100644
--- a/provisioning/roles/geerlingguy.ruby/meta/main.yml
+++ b/provisioning/roles/geerlingguy.ruby/meta/main.yml
@@ -6,7 +6,7 @@ galaxy_info:
   description: Ruby installation for Linux.
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 2.0
+  min_ansible_version: 2.4
   platforms:
     - name: EL
       versions:
@@ -43,3 +43,7 @@ galaxy_info:
   galaxy_tags:
     - development
     - web
+    - ruby
+    - rails
+    - gem
+    - bundler
diff --git a/provisioning/roles/geerlingguy.ruby/tasks/main.yml b/provisioning/roles/geerlingguy.ruby/tasks/main.yml
index 513f1775b..a6a759670 100644
--- a/provisioning/roles/geerlingguy.ruby/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.ruby/tasks/main.yml
@@ -1,17 +1,17 @@
 ---
 # Include OS-specific installation tasks.
-- include: setup-RedHat.yml
+- include_tasks: setup-RedHat.yml
   when:
     - ruby_install_from_source == False
     - ansible_os_family == 'RedHat'
 
-- include: setup-Debian.yml
+- include_tasks: setup-Debian.yml
   when:
     - ruby_install_from_source == False
     - ansible_os_family == 'Debian'
 
 # Install ruby from source when ruby_install_from_source is true.
-- include: install-from-source.yml
+- include_tasks: install-from-source.yml
   when: ruby_install_from_source == True
 
 - name: Add user installed RubyGems bin directory to global $PATH.
diff --git a/provisioning/roles/geerlingguy.ruby/tests/test-source.yml b/provisioning/roles/geerlingguy.ruby/tests/test-source.yml
index 3c1e51bc0..083579338 100644
--- a/provisioning/roles/geerlingguy.ruby/tests/test-source.yml
+++ b/provisioning/roles/geerlingguy.ruby/tests/test-source.yml
@@ -3,8 +3,6 @@
 
   vars:
     ruby_install_from_source: true
-    ruby_download_url: http://cache.ruby-lang.org/pub/ruby/2.3/ruby-2.3.0.tar.gz
-    ruby_version: 2.3.0
     ruby_install_gems_user: root
     ruby_install_gems:
       - sass

From 3fdae89d504bafd1eb3b445766764c7e16bd5336 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 27 Apr 2018 14:45:11 -0500
Subject: [PATCH 0991/1273] Don't show a warning on the AppArmor detection
 task.

---
 provisioning/tasks/apparmor.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/provisioning/tasks/apparmor.yml b/provisioning/tasks/apparmor.yml
index fc8711da0..812388421 100644
--- a/provisioning/tasks/apparmor.yml
+++ b/provisioning/tasks/apparmor.yml
@@ -1,6 +1,8 @@
 ---
 - name: Detect if AppArmor is working.
   command: service apparmor status
+  args:
+    warn: no
   register: apparmor_status
   failed_when: false
   changed_when: false

From 6319cd5652600e1bb4ace702abb114a120f2be4e Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 7 May 2018 20:52:47 -0500
Subject: [PATCH 0992/1273] Update Drush role to the latest version for Drush
 Launcher 0.6.0.

---
 provisioning/requirements.yml                          | 2 +-
 provisioning/roles/geerlingguy.drush/defaults/main.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index ab7315a18..0cb5bbbbc 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -22,7 +22,7 @@
 - src: geerlingguy.drupal-console
   version: 1.1.1
 - src: geerlingguy.drush
-  version: 3.1.0
+  version: 3.1.1
 - src: geerlingguy.elasticsearch
   version: 2.2.0
 - src: geerlingguy.firewall
diff --git a/provisioning/roles/geerlingguy.drush/defaults/main.yml b/provisioning/roles/geerlingguy.drush/defaults/main.yml
index 00bbd33a2..60014178d 100644
--- a/provisioning/roles/geerlingguy.drush/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.drush/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
 # Install Drush Launcher.
 drush_launcher_install: yes
-drush_launcher_version: "0.5.1"
+drush_launcher_version: "0.6.0"
 drush_launcher_phar_url: https://github.com/drush-ops/drush-launcher/releases/download/{{ drush_launcher_version }}/drush.phar
 drush_launcher_path: /usr/local/bin/drush
 

From 851f30070307795e180c5bb0c07c3e01bdb5d8c9 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 9 May 2018 21:20:21 -0500
Subject: [PATCH 0993/1273] Update php-versions role to latest version to fix
 bug when installing PHP 5.6 on Ubuntu 16.04.

---
 provisioning/requirements.yml                                 | 2 +-
 provisioning/roles/geerlingguy.php-versions/README.md         | 4 ++++
 provisioning/roles/geerlingguy.php-versions/defaults/main.yml | 3 +++
 provisioning/roles/geerlingguy.php-versions/tasks/main.yml    | 4 ++++
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 0cb5bbbbc..19d029b56 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -56,7 +56,7 @@
 - src: geerlingguy.php-tideways
   version: 2.1.0
 - src: geerlingguy.php-versions
-  version: 2.1.0
+  version: 2.1.1
 - src: geerlingguy.php-xdebug
   version: 2.5.0
 - src: geerlingguy.php-xhprof
diff --git a/provisioning/roles/geerlingguy.php-versions/README.md b/provisioning/roles/geerlingguy.php-versions/README.md
index 14cd1ea80..0f5f0fe72 100644
--- a/provisioning/roles/geerlingguy.php-versions/README.md
+++ b/provisioning/roles/geerlingguy.php-versions/README.md
@@ -16,6 +16,10 @@ Available variables are listed below, along with default values (see `defaults/m
 
 The PHP version to be installed. Any [currently-supported PHP major version](http://php.net/supported-versions.php) is a valid option (e.g. `5.6`, `7.0`, `7.1`, etc.
 
+    php_versions_install_recommends: no
+
+(For Debian OSes only) Whether to install recommended packages. This is set to `no` by default because setting it to `yes` often leads to multiple PHP versions being installed (thus making a bit of a mess) when using repos like Ondrej's PHP PPA for Ubuntu.
+
 ## Dependencies
 
   - geerlingguy.php is a soft dependency as the `php_version` variable is required to be set.
diff --git a/provisioning/roles/geerlingguy.php-versions/defaults/main.yml b/provisioning/roles/geerlingguy.php-versions/defaults/main.yml
index ea9b3379b..4a8113d08 100644
--- a/provisioning/roles/geerlingguy.php-versions/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.php-versions/defaults/main.yml
@@ -1,3 +1,6 @@
 ---
 # The PHP version to be installed.
 php_version: '7.1'
+
+# For Debian OSes only.
+php_versions_install_recommends: no
diff --git a/provisioning/roles/geerlingguy.php-versions/tasks/main.yml b/provisioning/roles/geerlingguy.php-versions/tasks/main.yml
index 53c38311f..65fc3d4ce 100644
--- a/provisioning/roles/geerlingguy.php-versions/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php-versions/tasks/main.yml
@@ -26,6 +26,10 @@
     php_xhprof_module_path: __php_xhprof_module_path
     php_packages: __php_packages
 
+- name: Define php_install_recommends variable.
+  set_fact:
+    php_install_recommends: "{{ php_versions_install_recommends }}"
+
 # Setup tasks.
 - include_tasks: "setup-{{ ansible_os_family }}.yml"
 

From 773835ee36f2d3290018efa2bc080851d2fd8ac1 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 10 May 2018 12:24:25 -0500
Subject: [PATCH 0994/1273] Update java role to latest version.

---
 provisioning/requirements.yml                      | 2 +-
 provisioning/roles/geerlingguy.java/.travis.yml    | 1 +
 provisioning/roles/geerlingguy.java/meta/main.yml  | 5 ++++-
 provisioning/roles/geerlingguy.java/tasks/main.yml | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 19d029b56..175d9d51e 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -30,7 +30,7 @@
 - src: geerlingguy.git
   version: 2.0.2
 - src: geerlingguy.java
-  version: 1.8.0
+  version: 1.8.1
 - src: geerlingguy.mailhog
   version: 2.1.4
 - src: geerlingguy.memcached
diff --git a/provisioning/roles/geerlingguy.java/.travis.yml b/provisioning/roles/geerlingguy.java/.travis.yml
index 0222cdc8f..71426224f 100644
--- a/provisioning/roles/geerlingguy.java/.travis.yml
+++ b/provisioning/roles/geerlingguy.java/.travis.yml
@@ -5,6 +5,7 @@ env:
   - distro: centos7
   - distro: centos6
   - distro: fedora27
+  - distro: ubuntu1804
   - distro: ubuntu1604
   - distro: ubuntu1404
   - distro: ubuntu1204
diff --git a/provisioning/roles/geerlingguy.java/meta/main.yml b/provisioning/roles/geerlingguy.java/meta/main.yml
index 2406cc491..37d0abac8 100644
--- a/provisioning/roles/geerlingguy.java/meta/main.yml
+++ b/provisioning/roles/geerlingguy.java/meta/main.yml
@@ -22,7 +22,10 @@ galaxy_info:
       - stretch
     - name: Ubuntu
       versions:
-      - all
+      - precise
+      - trusty
+      - xenial
+      - bionic
     - name: FreeBSD
       versions:
       - 10.2
diff --git a/provisioning/roles/geerlingguy.java/tasks/main.yml b/provisioning/roles/geerlingguy.java/tasks/main.yml
index 4d9e7d7a6..205e4d5b8 100644
--- a/provisioning/roles/geerlingguy.java/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.java/tasks/main.yml
@@ -10,7 +10,7 @@
   when: ansible_distribution == 'Fedora'
 
 - name: Include version-specific variables for Debian.
-  include_vars: "{{ ansible_distribution }}-{{ ansible_distribution_version.split('.')[0] }}.yml"
+  include_vars: "{{ ansible_distribution|title }}-{{ ansible_distribution_version.split('.')[0] }}.yml"
   when: ansible_os_family == 'Debian'
 
 - name: Define java_packages.

From 0d0a878f0b8d5f4d4c41d8573fe8d0d4d3330796 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 10 May 2018 16:21:47 -0500
Subject: [PATCH 0995/1273] Upgrade postgresql role to latest version.

---
 provisioning/roles/geerlingguy.java/vars/Ubuntu-18.yml      | 6 ++++++
 provisioning/roles/geerlingguy.postgresql/README.md         | 2 ++
 provisioning/roles/geerlingguy.postgresql/defaults/main.yml | 2 ++
 provisioning/roles/geerlingguy.postgresql/tasks/users.yml   | 1 +
 4 files changed, 11 insertions(+)
 create mode 100644 provisioning/roles/geerlingguy.java/vars/Ubuntu-18.yml

diff --git a/provisioning/roles/geerlingguy.java/vars/Ubuntu-18.yml b/provisioning/roles/geerlingguy.java/vars/Ubuntu-18.yml
new file mode 100644
index 000000000..bd058c224
--- /dev/null
+++ b/provisioning/roles/geerlingguy.java/vars/Ubuntu-18.yml
@@ -0,0 +1,6 @@
+---
+# JDK version options include:
+#   - java
+#   - openjdk-11-jdk
+__java_packages:
+  - openjdk-11-jdk
diff --git a/provisioning/roles/geerlingguy.postgresql/README.md b/provisioning/roles/geerlingguy.postgresql/README.md
index 760262cd4..4f0bdbfcb 100644
--- a/provisioning/roles/geerlingguy.postgresql/README.md
+++ b/provisioning/roles/geerlingguy.postgresql/README.md
@@ -80,6 +80,7 @@ If overriding, make sure you copy all of the existing entries from `defaults/mai
         login_user: # defaults to 'postgresql_user'
         login_unix_socket: # defaults to 1st of postgresql_unix_socket_directories
         port: # defaults to not set
+        owner: # defaults to postgresql_user
         state: # defaults to 'present'
 
 A list of databases to ensure exist on the server. Only the `name` is required; all other properties are optional.
@@ -87,6 +88,7 @@ A list of databases to ensure exist on the server. Only the `name` is required;
     postgresql_users:
       - name: jdoe #required; the rest are optional
         password: # defaults to not set
+        encrypted: # defaults to not set
         priv: # defaults to not set
         role_attr_flags: # defaults to not set
         db: # defaults to not set
diff --git a/provisioning/roles/geerlingguy.postgresql/defaults/main.yml b/provisioning/roles/geerlingguy.postgresql/defaults/main.yml
index 25f2c2ff9..7453eb535 100644
--- a/provisioning/roles/geerlingguy.postgresql/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.postgresql/defaults/main.yml
@@ -42,12 +42,14 @@ postgresql_databases: []
   #   login_user: # defaults to '{{ postgresql_user }}'
   #   login_unix_socket: # defaults to 1st of postgresql_unix_socket_directories
   #   port: # defaults to not set
+  #   owner: # defaults to postgresql_user
   #   state: # defaults to 'present'
 
 # Users to ensure exist.
 postgresql_users: []
   # - name: jdoe #required; the rest are optional
   #   password: # defaults to not set
+  #   encrypted: # defaults to not set
   #   priv: # defaults to not set
   #   role_attr_flags: # defaults to not set
   #   db: # defaults to not set
diff --git a/provisioning/roles/geerlingguy.postgresql/tasks/users.yml b/provisioning/roles/geerlingguy.postgresql/tasks/users.yml
index 33e5ebdbb..fb7f5dea4 100644
--- a/provisioning/roles/geerlingguy.postgresql/tasks/users.yml
+++ b/provisioning/roles/geerlingguy.postgresql/tasks/users.yml
@@ -3,6 +3,7 @@
   postgresql_user:
     name: "{{ item.name }}"
     password: "{{ item.password | default(omit) }}"
+    encrypted: "{{ item.encrypted | default(omit) }}"
     priv: "{{ item.priv | default(omit) }}"
     role_attr_flags: "{{ item.role_attr_flags | default(omit) }}"
     db: "{{ item.db | default(omit) }}"

From ed1ddfe1ca352ac021a1b2be02f469601ae4cddf Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 10 May 2018 16:35:10 -0500
Subject: [PATCH 0996/1273] Update php-versions role to the latest version to
 support PHP 5.6 on Ubuntu 18.04.

---
 provisioning/requirements.yml                 |  2 +-
 .../geerlingguy.php-versions/.travis.yml      | 20 +++++++++++--------
 .../tasks/setup-Debian.yml                    |  5 ++++-
 .../tests/test-5.6.yml                        | 17 ++++++++++++++++
 4 files changed, 34 insertions(+), 10 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.php-versions/tests/test-5.6.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 175d9d51e..05fad54a6 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -56,7 +56,7 @@
 - src: geerlingguy.php-tideways
   version: 2.1.0
 - src: geerlingguy.php-versions
-  version: 2.1.1
+  version: 2.1.2
 - src: geerlingguy.php-xdebug
   version: 2.5.0
 - src: geerlingguy.php-xhprof
diff --git a/provisioning/roles/geerlingguy.php-versions/.travis.yml b/provisioning/roles/geerlingguy.php-versions/.travis.yml
index ab4fc3c92..72266dcc0 100644
--- a/provisioning/roles/geerlingguy.php-versions/.travis.yml
+++ b/provisioning/roles/geerlingguy.php-versions/.travis.yml
@@ -8,28 +8,32 @@ env:
   matrix:
     # Default - PHP 7.1
     - distro: centos7
-    - distro: centos6
-    - distro: debian8
+    - distro: debian9
+    - distro: ubuntu1804
     - distro: ubuntu1604
-    - distro: ubuntu1404
 
     # PHP 7.2
     - distro: centos7
       playbook: test-7.2.yml
       php_version: "7.2"
-    - distro: centos6
-      playbook: test-7.2.yml
-      php_version: "7.2"
-    - distro: debian8
+    - distro: ubuntu1804
       playbook: test-7.2.yml
       php_version: "7.2"
     - distro: ubuntu1604
       playbook: test-7.2.yml
       php_version: "7.2"
-    - distro: ubuntu1404
+    - distro: debian9
       playbook: test-7.2.yml
       php_version: "7.2"
 
+    # PHP 5.6
+    - distro: centos7
+      playbook: test-5.6.yml
+      php_version: "5.6"
+    - distro: ubuntu1804
+      playbook: test-5.6.yml
+      php_version: "5.6"
+
 script:
   # Configure test script so we can run extra tests after playbook is run.
   - export container_id=$(date +%s)
diff --git a/provisioning/roles/geerlingguy.php-versions/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.php-versions/tasks/setup-Debian.yml
index 8da592d6c..115dc6e27 100644
--- a/provisioning/roles/geerlingguy.php-versions/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.php-versions/tasks/setup-Debian.yml
@@ -9,7 +9,10 @@
 
 - name: Add repository for PHP 5 compatibility packages (Ubuntu).
   apt_repository: repo='ppa:ondrej/php5-compat'
-  when: php_version == "5.6" and ansible_distribution == "Ubuntu"
+  when:
+    - php_version == "5.6"
+    - ansible_distribution == "Ubuntu"
+    - ansible_distribution_release != "bionic"
 
 # Debian-specific tasks.
 - name: Add dependencies for PHP versions (Debian).
diff --git a/provisioning/roles/geerlingguy.php-versions/tests/test-5.6.yml b/provisioning/roles/geerlingguy.php-versions/tests/test-5.6.yml
new file mode 100644
index 000000000..10390d0e1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-versions/tests/test-5.6.yml
@@ -0,0 +1,17 @@
+---
+- hosts: all
+
+  vars:
+    php_enable_webserver: false
+    php_version: "5.6"
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=yes cache_valid_time=600
+      when: ansible_os_family == 'Debian'
+
+  roles:
+    - role: geerlingguy.repo-remi
+      when: ansible_os_family == 'RedHat'
+    - role_under_test
+    - geerlingguy.php

From 925862d1faf558ebbafe3baaa64331b34d442faa Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 11 May 2018 09:20:30 -0500
Subject: [PATCH 0997/1273] Upgrade postgresql role to latest version for
 Ubuntu 18.04 support.

---
 provisioning/requirements.yml                         | 2 +-
 provisioning/roles/geerlingguy.postgresql/.travis.yml | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 05fad54a6..709b1adff 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -66,7 +66,7 @@
 - src: geerlingguy.postfix
   version: 2.0.0
 - src: geerlingguy.postgresql
-  version: 1.4.1
+  version: 1.4.3
 - src: geerlingguy.redis
   version: 1.6.0
 - src: geerlingguy.repo-remi
diff --git a/provisioning/roles/geerlingguy.postgresql/.travis.yml b/provisioning/roles/geerlingguy.postgresql/.travis.yml
index b1978d198..75fb26b87 100644
--- a/provisioning/roles/geerlingguy.postgresql/.travis.yml
+++ b/provisioning/roles/geerlingguy.postgresql/.travis.yml
@@ -8,6 +8,9 @@ env:
   - distro: centos6
     postgresql_bin_dir: /usr/bin
     postgresql_data_dir: /var/lib/pgsql/data
+  - distro: ubuntu1804
+    postgresql_bin_dir: /usr/lib/postgresql/10/bin
+    postgresql_data_dir: /var/lib/postgresql/10/main
   - distro: ubuntu1604
     postgresql_bin_dir: /usr/lib/postgresql/9.5/bin
     postgresql_data_dir: /var/lib/postgresql/9.5/main

From c9411100f10008f5641b50ae075b451557398be5 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 18 May 2018 12:44:37 -0500
Subject: [PATCH 0998/1273] Add missing file in postgresql role.

---
 .../roles/geerlingguy.postgresql/vars/Ubuntu-18.yml    | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 provisioning/roles/geerlingguy.postgresql/vars/Ubuntu-18.yml

diff --git a/provisioning/roles/geerlingguy.postgresql/vars/Ubuntu-18.yml b/provisioning/roles/geerlingguy.postgresql/vars/Ubuntu-18.yml
new file mode 100644
index 000000000..201acc365
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/vars/Ubuntu-18.yml
@@ -0,0 +1,10 @@
+---
+__postgresql_version: "10"
+__postgresql_data_dir: "/var/lib/postgresql/{{ __postgresql_version }}/main"
+__postgresql_bin_path: "/usr/lib/postgresql/{{ __postgresql_version }}/bin"
+__postgresql_config_path: "/etc/postgresql/{{ __postgresql_version }}/main"
+__postgresql_daemon: postgresql
+__postgresql_packages:
+  - postgresql
+  - postgresql-contrib
+  - libpq-dev

From 75f90745968253792bba4e39b6cab097565b229c Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 18 May 2018 16:44:45 -0500
Subject: [PATCH 0999/1273] Fixes #1778: Remove Ansible 2.2 compatibility
 tasks.

---
 .../roles/drupalvm.www/tasks/main.yml         | 54 ++++---------------
 1 file changed, 10 insertions(+), 44 deletions(-)

diff --git a/provisioning/roles/drupalvm.www/tasks/main.yml b/provisioning/roles/drupalvm.www/tasks/main.yml
index aa5a2774e..d000bb42d 100644
--- a/provisioning/roles/drupalvm.www/tasks/main.yml
+++ b/provisioning/roles/drupalvm.www/tasks/main.yml
@@ -18,59 +18,25 @@
 # machine, but the groupname will differ or not exist. For the latter case
 # we create a group called `vagrant_group`.
 #
-# In Ansible 2.3+ the gr_name will be set if the GID is mapped to an existing
-# group. If the GID doesn't exist, gr_name will be undefined.
-- name: Ensure a group with the same GID as used to sync directories exist (Ansible 2.3+).
+# The gr_name will be set if the GID is mapped to an existing group. If the GID
+# doesn't exist, gr_name will be undefined.
+- name: Ensure a group with the same GID as used to sync directories exist.
   group:
     gid: "{{ vagrant_directory.stat.gid }}"
     name: vagrant_group
     state: present
-  when: >
-    ansible_version.full | version_compare('2.3', '>=') and
-    vagrant_directory.stat.exists and
-    vagrant_directory.stat.gr_name is undefined
+  when:
+    - vagrant_directory.stat.exists
+    - vagrant_directory.stat.gr_name is undefined
 
-- name: Ensure the webserver user is in the same group as the owner of synced directories (Ansible 2.3+).
+- name: Ensure the webserver user is in the same group as the owner of synced directories.
   user:
     name: "{{ drupalvm_webserver_user }}"
     append: yes
     groups: "{{ vagrant_directory.stat.gr_name|default('vagrant_group') }}"
-  when: >
-    ansible_version.full | version_compare('2.3', '>=') and
-    vagrant_directory.stat.exists and
-    not (vagrant_directory.stat.gr_name is defined and vagrant_directory.stat.gr_name == 'root')
-
-# With Ansible 2.2 or lower, the existance of gr_name is dependant on the
-# existance of UID as well, therefore we cannot rely on it.
-# TODO: Remove the version compares and the 2.2 tasks once we require Ansible
-# 2.3+
-- name: Detect if group used to sync directories already exist (Ansible 2.2).
-  shell: "getent group {{ vagrant_directory.stat.gid }} | cut -d':' -f1"
-  register: vagrant_directory_groupname
-  changed_when: false
-  when: >
-    ansible_version.full | version_compare('2.3', '<') and
-    vagrant_directory.stat.exists
-
-- name: Ensure a group with the same GID as used to sync directories exist (Ansible 2.2).
-  group:
-    gid: "{{ vagrant_directory.stat.gid }}"
-    name: vagrant_group
-    state: present
-  when: >
-    ansible_version.full | version_compare('2.3', '<') and
-    vagrant_directory.stat.exists and
-    vagrant_directory_groupname.stdout == ''
-
-- name: Ensure the webserver user is in the same group as the owner of synced directories (Ansible 2.2).
-  user:
-    name: "{{ drupalvm_webserver_user }}"
-    append: yes
-    groups: "{{ vagrant_directory_groupname.stdout|default('vagrant_group') }}"
-  when: >
-    ansible_version.full | version_compare('2.3', '<') and
-    vagrant_directory.stat.exists and
-    vagrant_directory_groupname.stdout != 'root'
+  when:
+    - vagrant_directory.stat.exists
+    - not (vagrant_directory.stat.gr_name is defined and vagrant_directory.stat.gr_name == 'root')
 
 - name: Ensure admin group exist.
   group: "name=admin state=present"

From 49f1a3d8f1c235081124b8b334102f8dbd8ae216 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 1 Jun 2018 10:02:49 -0500
Subject: [PATCH 1000/1273] Fixes #1518: Update Solr role to work better with
 really old Solr versions under systemd.

---
 provisioning/requirements.yml                     |  4 ++--
 .../roles/geerlingguy.php-versions/tasks/main.yml |  4 ++--
 provisioning/roles/geerlingguy.solr/.travis.yml   |  6 ++++--
 .../roles/geerlingguy.solr/tasks/install-pre5.yml | 14 +++++++-------
 .../geerlingguy.solr/templates/solr-pre5.unit.j2  | 13 +++++++++++++
 .../roles/geerlingguy.solr/templates/solr.unit.j2 | 14 --------------
 .../roles/geerlingguy.solr/tests/test-solr-3.yml  | 15 +++++++++++++--
 .../roles/geerlingguy.solr/tests/test-solr-4.yml  | 15 +++++++++++++--
 8 files changed, 54 insertions(+), 31 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.solr/templates/solr-pre5.unit.j2
 delete mode 100644 provisioning/roles/geerlingguy.solr/templates/solr.unit.j2

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 709b1adff..d8b2d9b5f 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -56,7 +56,7 @@
 - src: geerlingguy.php-tideways
   version: 2.1.0
 - src: geerlingguy.php-versions
-  version: 2.1.2
+  version: 2.1.3
 - src: geerlingguy.php-xdebug
   version: 2.5.0
 - src: geerlingguy.php-xhprof
@@ -76,6 +76,6 @@
 - src: geerlingguy.security
   version: 1.7.0
 - src: geerlingguy.solr
-  version: 4.1.0
+  version: 4.2.0
 - src: geerlingguy.varnish
   version: 2.3.0
diff --git a/provisioning/roles/geerlingguy.php-versions/tasks/main.yml b/provisioning/roles/geerlingguy.php-versions/tasks/main.yml
index 65fc3d4ce..0e72876b6 100644
--- a/provisioning/roles/geerlingguy.php-versions/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php-versions/tasks/main.yml
@@ -2,8 +2,8 @@
 - name: Include OS-specific variables.
   include_vars: "{{ item }}"
   with_fileglob:
-    - "../vars/{{ ansible_os_family }}.yml"
-    - "../vars/{{ ansible_os_family }}-php{{ php_version }}.yml"
+    - "{{ role_path }}/vars/{{ ansible_os_family }}.yml"
+    - "{{ role_path }}/vars/{{ ansible_os_family }}-php{{ php_version }}.yml"
 
 - name: Define PHP variables.
   set_fact: "{{ item.key }}={{ hostvars[inventory_hostname][item.value] }}"
diff --git a/provisioning/roles/geerlingguy.solr/.travis.yml b/provisioning/roles/geerlingguy.solr/.travis.yml
index 195144bdf..2ffe25e7e 100644
--- a/provisioning/roles/geerlingguy.solr/.travis.yml
+++ b/provisioning/roles/geerlingguy.solr/.travis.yml
@@ -17,10 +17,12 @@ env:
     playbook: test-solr-6.yml
   - distro: debian9
     playbook: test-solr-6.yml
+  - distro: ubuntu1604
+    playbook: test-solr-4.yml
+  - distro: ubuntu1604
+    playbook: test-solr-3.yml
   - distro: ubuntu1404
     playbook: test-solr-5.yml
-  - distro: ubuntu1204
-    playbook: test-solr-5.yml
   - distro: ubuntu1404
     playbook: test-solr-4.yml
   - distro: ubuntu1404
diff --git a/provisioning/roles/geerlingguy.solr/tasks/install-pre5.yml b/provisioning/roles/geerlingguy.solr/tasks/install-pre5.yml
index b2b3e1fcd..a1822a57c 100644
--- a/provisioning/roles/geerlingguy.solr/tasks/install-pre5.yml
+++ b/provisioning/roles/geerlingguy.solr/tasks/install-pre5.yml
@@ -58,26 +58,26 @@
     group: root
     mode: 0664
   changed_when: false
+  when: ansible_service_mgr != 'systemd'
 
 - name: Copy solr init script into place.
   template:
     src: "solr-init-{{ ansible_os_family }}-pre5.j2"
     dest: "/etc/init.d/{{ solr_service_name }}"
     mode: 0755
+  when: ansible_service_mgr != 'systemd'
 
 - name: Ensure daemon is installed (Debian).
   apt: name=daemon state=present
-  when: ansible_os_family == "Debian"
+  when:
+    - ansible_os_family == "Debian"
+    - ansible_service_mgr != 'systemd'
 
 - name: Copy solr systemd unit file into place (for systemd systems).
   template:
-    src: solr.unit.j2
+    src: solr-pre5.unit.j2
     dest: /etc/systemd/system/solr.service
     owner: root
     group: root
     mode: 0755
-  when: >
-    (ansible_distribution == 'Ubuntu' and ansible_distribution_version == '16.04') or
-    (ansible_distribution == 'Debian' and ansible_distribution_version|int >= 8) or
-    (ansible_distribution == 'CentOS' and ansible_distribution_major_version|int >= 7) or
-    (ansible_distribution == 'Fedora')
+  when: ansible_service_mgr == 'systemd'
diff --git a/provisioning/roles/geerlingguy.solr/templates/solr-pre5.unit.j2 b/provisioning/roles/geerlingguy.solr/templates/solr-pre5.unit.j2
new file mode 100644
index 000000000..0f840b57c
--- /dev/null
+++ b/provisioning/roles/geerlingguy.solr/templates/solr-pre5.unit.j2
@@ -0,0 +1,13 @@
+[Unit]
+Description=Apache SOLR
+After=syslog.target network.target remote-fs.target nss-lookup.target
+
+[Service]
+Type=simple
+WorkingDirectory={{ solr_install_path }}/example
+ExecStart=/usr/bin/java -jar -Dsolr.solr.home={{ solr_home }} -Djetty.host={{ solr_host }} -Djetty.port={{ solr_port }} -Xms{{ solr_xms }} -Xmx{{ solr_xmx }} start.jar
+Restart=on-failure
+User=solr
+
+[Install]
+WantedBy=multi-user.target
\ No newline at end of file
diff --git a/provisioning/roles/geerlingguy.solr/templates/solr.unit.j2 b/provisioning/roles/geerlingguy.solr/templates/solr.unit.j2
deleted file mode 100644
index 40ca34ab1..000000000
--- a/provisioning/roles/geerlingguy.solr/templates/solr.unit.j2
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Apache SOLR
-After=syslog.target network.target remote-fs.target nss-lookup.target
-
-[Service]
-PIDFile={{ solr_install_path }}/bin/solr-{{ solr_port }}.pid
-ExecStart={{ solr_install_path }}/bin/solr -e cloud -noprompt
-User=solr
-ExecReload=/bin/kill -s HUP $MAINPID
-ExecStop=/bin/kill -s QUIT $MAINPID
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target
diff --git a/provisioning/roles/geerlingguy.solr/tests/test-solr-3.yml b/provisioning/roles/geerlingguy.solr/tests/test-solr-3.yml
index adf1ca6bd..06e963adc 100644
--- a/provisioning/roles/geerlingguy.solr/tests/test-solr-3.yml
+++ b/provisioning/roles/geerlingguy.solr/tests/test-solr-3.yml
@@ -3,8 +3,19 @@
 
   vars:
     solr_version: "3.6.2"
-    java_packages:
-      - openjdk-7-jdk
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=yes cache_valid_time=600
+      when: ansible_os_family == "Debian"
+
+    - name: Set Java 8 package for Debian > 8.
+      set_fact:
+        java_packages:
+          - openjdk-8-jdk
+      when:
+        - ansible_distribution == "Debian"
+        - ansible_distribution_version|int > 8
 
   roles:
     - geerlingguy.java
diff --git a/provisioning/roles/geerlingguy.solr/tests/test-solr-4.yml b/provisioning/roles/geerlingguy.solr/tests/test-solr-4.yml
index 6bbc30d2f..b33609d35 100644
--- a/provisioning/roles/geerlingguy.solr/tests/test-solr-4.yml
+++ b/provisioning/roles/geerlingguy.solr/tests/test-solr-4.yml
@@ -4,8 +4,19 @@
   vars:
     solr_version: "4.10.4"
     solr_remove_cruft: true
-    java_packages:
-      - openjdk-7-jdk
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=yes cache_valid_time=600
+      when: ansible_os_family == "Debian"
+
+    - name: Set Java 8 package for Debian > 8.
+      set_fact:
+        java_packages:
+          - openjdk-8-jdk
+      when:
+        - ansible_distribution == "Debian"
+        - ansible_distribution_version|int > 8
 
   roles:
     - geerlingguy.java

From 4b420b34f95485b4f5c312271a43a3ad7a5120bd Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 1 Jun 2018 10:21:27 -0500
Subject: [PATCH 1001/1273] Issue #1783: Update CHANGELOG.md for 4.9.0 release.

---
 CHANGELOG.md | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31e41b98d..d6121aa6c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,34 @@
 # Drupal VM Changelog
 
+## 4.9.0 "Tower Music / Let Us Pray" (2018-06-01)
+
+This release improves compatibility with Ansible 2.4, 2.5 and beyond, and updates almost every Ansible role in Drupal VM.
+
+### Breaking Changes
+
+N/A
+
+### New/changed variables in default.config.yml
+
+  - Removed unused `php_xdebug_cli_enable` variable.
+  - Added `php_xdebug_cli_disable: yes`.
+
+### Improvements
+
+  * #619, #1720: Add documentation for using Eclipse and Visual Studio Code with xdebug.
+  * #1552: Better PHP 7.2 compatibility with XDebug.
+  * #1553: Fix use of deprecated 'include' syntax in Ansible playbooks.
+  * #1566: Remove unused `php_xdebug_cli_enable` variable.
+  * #1778: Remove Ansible 2.2 compatibility-related tasks.
+  * Updated roles: selenium, php-tideways, firewall, solr, nginx, drupal console, apache, varnish, postgres, new relic, java, composer, php, mysql, blackfire, elasticsearch, drush, drupal, node.js, php-redis, php-tideways, php-versions, xhprof, redis, security, ruby.
+
+### Bugfixes
+
+  * #1736: Better Ansible version parsing in Vagrantfile.
+  * #1654: Make sure Tideways can be installed.
+  * #1518: Improve use of old versions of Solr on newer OS releases.
+
+
 ## 4.8.1 (2018-03-10)
 
 ### Breaking Changes

From 4fc4a3a89231e8d4cea077e6541c771f1b46d66c Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 1 Jun 2018 10:22:19 -0500
Subject: [PATCH 1002/1273] Issue #1783: Use 'Creation of Tron' for 4.9.0
 release name. [ci skip]

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6121aa6c..63b23fd8d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Drupal VM Changelog
 
-## 4.9.0 "Tower Music / Let Us Pray" (2018-06-01)
+## 4.9.0 "Creation of Tron" (2018-06-01)
 
 This release improves compatibility with Ansible 2.4, 2.5 and beyond, and updates almost every Ansible role in Drupal VM.
 

From 99a7b47e9e848c9e05c252880fa21e1c4ff50437 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 19 Jun 2018 20:30:50 -0500
Subject: [PATCH 1003/1273] Update Solr role to latest version.

---
 provisioning/requirements.yml                       | 2 +-
 provisioning/roles/geerlingguy.solr/tasks/cores.yml | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index d8b2d9b5f..7a1e0a6dc 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -76,6 +76,6 @@
 - src: geerlingguy.security
   version: 1.7.0
 - src: geerlingguy.solr
-  version: 4.2.0
+  version: 4.2.1
 - src: geerlingguy.varnish
   version: 2.3.0
diff --git a/provisioning/roles/geerlingguy.solr/tasks/cores.yml b/provisioning/roles/geerlingguy.solr/tasks/cores.yml
index d7a052109..c460a6639 100644
--- a/provisioning/roles/geerlingguy.solr/tasks/cores.yml
+++ b/provisioning/roles/geerlingguy.solr/tasks/cores.yml
@@ -4,6 +4,7 @@
     url: http://{{ solr_connect_host }}:{{ solr_port }}/solr/admin/cores
     return_content: yes
   register: solr_cores_current
+  check_mode: no
 
 - name: Ensure Solr conf directories exist.
   file:
@@ -23,7 +24,7 @@
   become_user: "{{ solr_user }}"
 
 - name: Create configured cores.
-  shell: "{{ solr_install_path }}/bin/solr create -c {{ item }}"
+  shell: "{{ solr_install_path }}/bin/solr create -c {{ item }} -p {{ solr_port }}"
   when: "item not in solr_cores_current.content"
   with_items: "{{ solr_cores }}"
   become: yes

From 8efb97ac29aa288ceae3f31e8ca234e27b40a477 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 26 Jul 2018 11:24:20 -0500
Subject: [PATCH 1004/1273] Update Ruby role version to 2.5.1.

---
 provisioning/requirements.yml                          |  2 +-
 provisioning/roles/geerlingguy.ruby/.travis.yml        | 10 +++++++---
 provisioning/roles/geerlingguy.ruby/README.md          |  2 +-
 provisioning/roles/geerlingguy.ruby/defaults/main.yml  |  4 ++--
 provisioning/roles/geerlingguy.ruby/files/rubygems.sh  |  2 +-
 provisioning/roles/geerlingguy.ruby/meta/main.yml      |  1 +
 .../geerlingguy.ruby/tasks/install-from-source.yml     |  1 -
 7 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 7a1e0a6dc..36e5d9b1d 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -72,7 +72,7 @@
 - src: geerlingguy.repo-remi
   version: 1.2.0
 - src: geerlingguy.ruby
-  version: 2.5.0
+  version: 2.5.1
 - src: geerlingguy.security
   version: 1.7.0
 - src: geerlingguy.solr
diff --git a/provisioning/roles/geerlingguy.ruby/.travis.yml b/provisioning/roles/geerlingguy.ruby/.travis.yml
index 01d29c5df..35cd3f6cc 100644
--- a/provisioning/roles/geerlingguy.ruby/.travis.yml
+++ b/provisioning/roles/geerlingguy.ruby/.travis.yml
@@ -7,6 +7,10 @@ env:
     playbook: test.yml
     ruby_version: 2.0.0
     ruby_path_prefix: /usr
+  - distro: ubuntu1804
+    playbook: test.yml
+    ruby_version: 2.5.1
+    ruby_path_prefix: /usr
   - distro: ubuntu1604
     playbook: test.yml
     ruby_version: 2.3.1
@@ -23,11 +27,11 @@ env:
   # Source install on latest OSes.
   - distro: centos7
     playbook: test-source.yml
-    ruby_version: 2.4.4
+    ruby_version: 2.5.1
     ruby_path_prefix: /usr/local
-  - distro: ubuntu1604
+  - distro: ubuntu1804
     playbook: test-source.yml
-    ruby_version: 2.4.4
+    ruby_version: 2.5.1
     ruby_path_prefix: /usr/local
 
 script:
diff --git a/provisioning/roles/geerlingguy.ruby/README.md b/provisioning/roles/geerlingguy.ruby/README.md
index c74d549c1..43afd3837 100644
--- a/provisioning/roles/geerlingguy.ruby/README.md
+++ b/provisioning/roles/geerlingguy.ruby/README.md
@@ -36,7 +36,7 @@ By default, this role will install whatever version of ruby is available through
 
 The URL from which Ruby will be downloaded (only used if `ruby_install_from_source` is `True`).
 
-    ruby_version: 2.4.4
+    ruby_version: 2.5.1
 
 The version of ruby that will be installed (only used if `ruby_install_from_source` is `True`).
 
diff --git a/provisioning/roles/geerlingguy.ruby/defaults/main.yml b/provisioning/roles/geerlingguy.ruby/defaults/main.yml
index 13c77b651..aa85e69a1 100644
--- a/provisioning/roles/geerlingguy.ruby/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.ruby/defaults/main.yml
@@ -13,8 +13,8 @@ ruby_install_gems_user: "{{ ansible_user }}"
 # If set to True, ruby will be installed from source, using the version set with
 # the 'ruby_version' variable instead of using a package.
 ruby_install_from_source: False
-ruby_download_url: http://cache.ruby-lang.org/pub/ruby/2.4/ruby-2.4.4.tar.gz
-ruby_version: 2.4.4
+ruby_download_url: http://cache.ruby-lang.org/pub/ruby/2.5/ruby-2.5.1.tar.gz
+ruby_version: 2.5.1
 
 # Default should usually work, but this will be overridden on Ubuntu 14.04.
 ruby_rubygems_package_name: rubygems
diff --git a/provisioning/roles/geerlingguy.ruby/files/rubygems.sh b/provisioning/roles/geerlingguy.ruby/files/rubygems.sh
index dcac53f4a..755ecad29 100644
--- a/provisioning/roles/geerlingguy.ruby/files/rubygems.sh
+++ b/provisioning/roles/geerlingguy.ruby/files/rubygems.sh
@@ -1,3 +1,3 @@
 if which ruby >/dev/null && which gem >/dev/null; then
-    PATH="$(ruby -rubygems -e 'puts Gem.user_dir')/bin:$PATH"
+    PATH="$(ruby -e 'puts Gem.user_dir')/bin:$PATH"
 fi
diff --git a/provisioning/roles/geerlingguy.ruby/meta/main.yml b/provisioning/roles/geerlingguy.ruby/meta/main.yml
index 2218239ee..8c8914fe3 100644
--- a/provisioning/roles/geerlingguy.ruby/meta/main.yml
+++ b/provisioning/roles/geerlingguy.ruby/meta/main.yml
@@ -31,6 +31,7 @@ galaxy_info:
       - lucid
       - trusty
       - precise
+      - bionic
     - name: SLES
       versions:
       - all
diff --git a/provisioning/roles/geerlingguy.ruby/tasks/install-from-source.yml b/provisioning/roles/geerlingguy.ruby/tasks/install-from-source.yml
index e3f37f4d6..c5183a16d 100644
--- a/provisioning/roles/geerlingguy.ruby/tasks/install-from-source.yml
+++ b/provisioning/roles/geerlingguy.ruby/tasks/install-from-source.yml
@@ -22,7 +22,6 @@
     - zlib1g-dev
     - libncurses5-dev
     - libffi-dev
-    - libgdbm3
     - libgdbm-dev
   when: ansible_os_family == 'Debian'
 

From 47d75c1bee6f6e48d88682e31f8fe546f3e4751c Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 31 Jul 2018 10:54:35 -0500
Subject: [PATCH 1005/1273] Update geerlingguy.solr to latest version.

---
 provisioning/requirements.yml                                 | 2 +-
 provisioning/roles/geerlingguy.solr/README.md                 | 2 +-
 provisioning/roles/geerlingguy.solr/tasks/install-pre5.yml    | 2 +-
 .../roles/geerlingguy.solr/templates/solr-pre5.unit.j2        | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 36e5d9b1d..1f43a74c0 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -76,6 +76,6 @@
 - src: geerlingguy.security
   version: 1.7.0
 - src: geerlingguy.solr
-  version: 4.2.1
+  version: 4.2.2
 - src: geerlingguy.varnish
   version: 2.3.0
diff --git a/provisioning/roles/geerlingguy.solr/README.md b/provisioning/roles/geerlingguy.solr/README.md
index 3d1dd07f7..2218f0e1b 100644
--- a/provisioning/roles/geerlingguy.solr/README.md
+++ b/provisioning/roles/geerlingguy.solr/README.md
@@ -39,7 +39,7 @@ Whether to remove unneccessary documentation and examples from the solr director
     solr_service_name: solr
     solr_service_state: started
 
-By default, this role will manage the `solr` service, ensuring it is enabled at system boot and is running. You can ensure Solr is stopped by setting `solr_service_state: stopped`, or you can disable this role's management of the `solr` service entirely by setting `solr_service_manage: true`. You may also want to set `solr_restart_handler_enabled: false` (documented later) in this case.
+By default, this role will manage the `solr` service, ensuring it is enabled at system boot and is running. You can ensure Solr is stopped by setting `solr_service_state: stopped`, or you can disable this role's management of the `solr` service entirely by setting `solr_service_manage: false`. You may also want to set `solr_restart_handler_enabled: false` (documented later) in this case.
 
     solr_install_dir: /opt
     solr_install_path: /opt/solr
diff --git a/provisioning/roles/geerlingguy.solr/tasks/install-pre5.yml b/provisioning/roles/geerlingguy.solr/tasks/install-pre5.yml
index a1822a57c..e08dc7ff7 100644
--- a/provisioning/roles/geerlingguy.solr/tasks/install-pre5.yml
+++ b/provisioning/roles/geerlingguy.solr/tasks/install-pre5.yml
@@ -76,7 +76,7 @@
 - name: Copy solr systemd unit file into place (for systemd systems).
   template:
     src: solr-pre5.unit.j2
-    dest: /etc/systemd/system/solr.service
+    dest: /etc/systemd/system/{{ solr_service_name }}.service
     owner: root
     group: root
     mode: 0755
diff --git a/provisioning/roles/geerlingguy.solr/templates/solr-pre5.unit.j2 b/provisioning/roles/geerlingguy.solr/templates/solr-pre5.unit.j2
index 0f840b57c..edc46ef0b 100644
--- a/provisioning/roles/geerlingguy.solr/templates/solr-pre5.unit.j2
+++ b/provisioning/roles/geerlingguy.solr/templates/solr-pre5.unit.j2
@@ -7,7 +7,7 @@ Type=simple
 WorkingDirectory={{ solr_install_path }}/example
 ExecStart=/usr/bin/java -jar -Dsolr.solr.home={{ solr_home }} -Djetty.host={{ solr_host }} -Djetty.port={{ solr_port }} -Xms{{ solr_xms }} -Xmx{{ solr_xmx }} start.jar
 Restart=on-failure
-User=solr
+User={{ solr_user }}
 
 [Install]
-WantedBy=multi-user.target
\ No newline at end of file
+WantedBy=multi-user.target

From eb8deec031d2ae24e1ccfeff0e01ea4b1582d5b1 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 17 Aug 2018 14:13:04 -0500
Subject: [PATCH 1006/1273] Fix typo in PHP provisioning task file.

---
 provisioning/tasks/php.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/tasks/php.yml b/provisioning/tasks/php.yml
index df572a567..688e84f96 100644
--- a/provisioning/tasks/php.yml
+++ b/provisioning/tasks/php.yml
@@ -5,7 +5,7 @@
   when: drupalvm_webserver == 'nginx'
   tags: ['webserver', 'database', 'php']
 
-- name: Ensure PHP version -specific workspace directory exists.
+- name: Ensure PHP version-specific workspace directory exists.
   file:
     path: "/root/php{{ php_version }}"
     state: directory

From 779d183d81de78f21e394a061ee48811defa81c7 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 23 Aug 2018 13:53:10 -0500
Subject: [PATCH 1007/1273] Update geerlingguy.ruby role.

---
 provisioning/requirements.yml                 |  2 +-
 .../tasks/install-from-source.yml             | 22 +++++++++----------
 .../geerlingguy.ruby/tasks/setup-Debian.yml   | 19 ++++++++--------
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 1f43a74c0..6b8f163d7 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -72,7 +72,7 @@
 - src: geerlingguy.repo-remi
   version: 1.2.0
 - src: geerlingguy.ruby
-  version: 2.5.1
+  version: 2.5.2
 - src: geerlingguy.security
   version: 1.7.0
 - src: geerlingguy.solr
diff --git a/provisioning/roles/geerlingguy.ruby/tasks/install-from-source.yml b/provisioning/roles/geerlingguy.ruby/tasks/install-from-source.yml
index c5183a16d..9ed2ce371 100644
--- a/provisioning/roles/geerlingguy.ruby/tasks/install-from-source.yml
+++ b/provisioning/roles/geerlingguy.ruby/tasks/install-from-source.yml
@@ -12,17 +12,17 @@
   when: ansible_os_family == 'Debian'
 
 - name: Install packages required to build ruby (Debian).
-  apt: "name={{ item }} state=present"
-  with_items:
-    - build-essential
-    - zlib1g-dev
-    - libssl-dev
-    - libyaml-dev
-    - libreadline6-dev
-    - zlib1g-dev
-    - libncurses5-dev
-    - libffi-dev
-    - libgdbm-dev
+  apt:
+    name:
+      - build-essential
+      - zlib1g-dev
+      - libssl-dev
+      - libyaml-dev
+      - libreadline6-dev
+      - libncurses5-dev
+      - libffi-dev
+      - libgdbm-dev
+    state: present
   when: ansible_os_family == 'Debian'
 
 - name: Download ruby.
diff --git a/provisioning/roles/geerlingguy.ruby/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.ruby/tasks/setup-Debian.yml
index 04ab88d09..26aacd9b5 100644
--- a/provisioning/roles/geerlingguy.ruby/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.ruby/tasks/setup-Debian.yml
@@ -8,12 +8,13 @@
   when: ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'trusty'
 
 - name: Install ruby and other required dependencies.
-  apt: "name={{ item }} state=present"
-  with_items:
-    - ruby-full
-    - ruby-dev
-    - "{{ ruby_rubygems_package_name }}"
-    - build-essential
-    - autogen
-    - autoconf
-    - libtool
+  apt:
+    name:
+      - ruby-full
+      - ruby-dev
+      - "{{ ruby_rubygems_package_name }}"
+      - build-essential
+      - autogen
+      - autoconf
+      - libtool
+    state: present

From f63e7d2113784b44422f68079b91a66ca834f11f Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 29 Aug 2018 10:23:20 -0500
Subject: [PATCH 1008/1273] Update geerlingguy.varnish role for Python 3
 compatibility.

---
 provisioning/requirements.yml                                 | 2 +-
 .../roles/geerlingguy.varnish/templates/default.vcl.j2        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 6b8f163d7..598671979 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -78,4 +78,4 @@
 - src: geerlingguy.solr
   version: 4.2.2
 - src: geerlingguy.varnish
-  version: 2.3.0
+  version: 2.3.1
diff --git a/provisioning/roles/geerlingguy.varnish/templates/default.vcl.j2 b/provisioning/roles/geerlingguy.varnish/templates/default.vcl.j2
index 03201bd9e..652f86479 100644
--- a/provisioning/roles/geerlingguy.varnish/templates/default.vcl.j2
+++ b/provisioning/roles/geerlingguy.varnish/templates/default.vcl.j2
@@ -14,7 +14,7 @@ backend default {
 
 {% if varnish_backends is defined %}
 # Other backend servers.
-{% for backend, value in varnish_backends.iteritems() %}
+{% for backend, value in varnish_backends.items() | list %}
 backend {{ backend }} {
   .host = "{{ value.host }}";
   .port = "{{ value.port }}";
@@ -25,7 +25,7 @@ backend {{ backend }} {
 sub vcl_recv {
 {% if varnish_vhosts is defined %}
   # Varnish vhosts.
-{% for vhost, value in varnish_vhosts.iteritems() if varnish_vhosts is defined %}
+{% for vhost, value in varnish_vhosts.items() | list if varnish_vhosts is defined %}
   {% if loop.first %}
   if (req.http.host == "{{ vhost }}" || req.http.host == "www.{{ vhost }}") {
   {% else %}

From c6cc7b15106cb52a264cace97fe8c278c57fc39f Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 30 Aug 2018 11:35:12 -0500
Subject: [PATCH 1009/1273] Update geerlingguy.nodejs role to work with RHEL
 and 2-digit versions.

---
 provisioning/requirements.yml                                | 2 +-
 provisioning/roles/geerlingguy.nodejs/tasks/setup-RedHat.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 598671979..4352befde 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -40,7 +40,7 @@
 - src: geerlingguy.nginx
   version: 2.6.0
 - src: geerlingguy.nodejs
-  version: 4.2.0
+  version: 4.2.1
 - src: geerlingguy.php
   version: 3.6.0
 - src: geerlingguy.php-memcached
diff --git a/provisioning/roles/geerlingguy.nodejs/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.nodejs/tasks/setup-RedHat.yml
index ea6292b18..43582fa10 100644
--- a/provisioning/roles/geerlingguy.nodejs/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.nodejs/tasks/setup-RedHat.yml
@@ -34,4 +34,4 @@
   when: ansible_distribution_major_version|int >= 7
 
 - name: Ensure Node.js and npm are installed.
-  yum: "name=nodejs-{{ nodejs_version[0] }}.* state=present enablerepo='epel,nodesource'"
+  yum: "name=nodejs-{{ nodejs_version|regex_replace('x', '') }}* state=present enablerepo='epel,nodesource'"

From 1e03ad78ab99968be9f7505014db5fdc0545735d Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 30 Aug 2018 12:20:21 -0500
Subject: [PATCH 1010/1273] Update geerlingguy.java role to work better with
 CentOS 6/7.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.java/tasks/main.yml     | 25 +++++++++++++------
 .../roles/geerlingguy.java/tests/test.yml     | 12 ++++++++-
 .../vars/{RedHat.yml => RedHat-6.yml}         |  0
 .../roles/geerlingguy.java/vars/RedHat-7.yml  |  8 ++++++
 5 files changed, 37 insertions(+), 10 deletions(-)
 rename provisioning/roles/geerlingguy.java/vars/{RedHat.yml => RedHat-6.yml} (100%)
 create mode 100644 provisioning/roles/geerlingguy.java/vars/RedHat-7.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 4352befde..167c64327 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -30,7 +30,7 @@
 - src: geerlingguy.git
   version: 2.0.2
 - src: geerlingguy.java
-  version: 1.8.1
+  version: 1.9.0
 - src: geerlingguy.mailhog
   version: 2.1.4
 - src: geerlingguy.memcached
diff --git a/provisioning/roles/geerlingguy.java/tasks/main.yml b/provisioning/roles/geerlingguy.java/tasks/main.yml
index 205e4d5b8..dc12aad00 100644
--- a/provisioning/roles/geerlingguy.java/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.java/tasks/main.yml
@@ -1,13 +1,15 @@
 ---
-- name: Include OS-specific variables.
-  include_vars: "{{ ansible_os_family }}.yml"
-  when:
-    - ansible_os_family != 'Debian'
-    - ansible_distribution != 'Fedora'
-
-- name: Include OS-specific variables for Fedora.
+- name: Include OS-specific variables for Fedora or FreeBSD.
   include_vars: "{{ ansible_distribution }}.yml"
-  when: ansible_distribution == 'Fedora'
+  when: ansible_distribution == 'FreeBSD' or ansible_distribution == 'Fedora'
+
+- name: Include version-specific variables for CentOS/RHEL.
+  include_vars: "RedHat-{{ ansible_distribution_version.split('.')[0] }}.yml"
+  when: ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat Enterprise Linux'
+
+- name: Include version-specific variables for Ubuntu.
+  include_vars: "{{ ansible_distribution }}-{{ ansible_distribution_version.split('.')[0] }}.yml"
+  when: ansible_distribution == 'Ubuntu'
 
 - name: Include version-specific variables for Debian.
   include_vars: "{{ ansible_distribution|title }}-{{ ansible_distribution_version.split('.')[0] }}.yml"
@@ -35,3 +37,10 @@
     dest: /etc/profile.d/java_home.sh
     mode: 0644
   when: java_home is defined and java_home != ''
+
+- name: check java version
+  command: java -version
+  changed_when: false
+  register: javaversion
+
+- debug: var=javaversion
diff --git a/provisioning/roles/geerlingguy.java/tests/test.yml b/provisioning/roles/geerlingguy.java/tests/test.yml
index 8801ef8a8..05937715c 100644
--- a/provisioning/roles/geerlingguy.java/tests/test.yml
+++ b/provisioning/roles/geerlingguy.java/tests/test.yml
@@ -5,7 +5,17 @@
     - name: Update apt cache.
       apt: update_cache=yes cache_valid_time=600
       when: ansible_os_family == 'Debian'
-      changed_when: false
+      changed_when: False
+
+    # See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=863199
+    - name: Ensure 'man' directory exists.
+      file:
+        path: /usr/share/man/man1
+        state: directory
+        recurse: True
+      when:
+        - ansible_distribution == 'Ubuntu'
+        - ansible_distribution_version == '18.04'
 
   roles:
     - role_under_test
diff --git a/provisioning/roles/geerlingguy.java/vars/RedHat.yml b/provisioning/roles/geerlingguy.java/vars/RedHat-6.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.java/vars/RedHat.yml
rename to provisioning/roles/geerlingguy.java/vars/RedHat-6.yml
diff --git a/provisioning/roles/geerlingguy.java/vars/RedHat-7.yml b/provisioning/roles/geerlingguy.java/vars/RedHat-7.yml
new file mode 100644
index 000000000..64db5790f
--- /dev/null
+++ b/provisioning/roles/geerlingguy.java/vars/RedHat-7.yml
@@ -0,0 +1,8 @@
+---
+# JDK version options include:
+#   - java
+#   - java-1.6.0-openjdk
+#   - java-1.7.0-openjdk
+#   - java-1.8.0-openjdk
+__java_packages:
+  - java-1.8.0-openjdk

From 7fed80fdf1cb984d5ee3681428385ce1bf93665f Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 30 Aug 2018 12:20:59 -0500
Subject: [PATCH 1011/1273] Update geerlingguy.varnish role to latest version.

---
 provisioning/requirements.yml                                   | 2 +-
 .../roles/geerlingguy.varnish/templates/varnish.service.j2      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 167c64327..f2026a912 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -78,4 +78,4 @@
 - src: geerlingguy.solr
   version: 4.2.2
 - src: geerlingguy.varnish
-  version: 2.3.1
+  version: 2.3.2
diff --git a/provisioning/roles/geerlingguy.varnish/templates/varnish.service.j2 b/provisioning/roles/geerlingguy.varnish/templates/varnish.service.j2
index 80d0377a2..c5f81a0a9 100644
--- a/provisioning/roles/geerlingguy.varnish/templates/varnish.service.j2
+++ b/provisioning/roles/geerlingguy.varnish/templates/varnish.service.j2
@@ -10,6 +10,7 @@ LimitNOFILE={{ varnish_limit_nofile }}
 LimitMEMLOCK=82000
 ExecStart=/usr/sbin/varnishd -a :{{ varnish_listen_port }} -T {{ varnish_admin_listen_host }}:{{ varnish_admin_listen_port }}{% if varnish_pidfile %} -P {{ varnish_pidfile }}{% endif %} -f {{ varnish_config_path }}/default.vcl -S {{ varnish_config_path }}/secret -s {{ varnish_storage }} {{ varnishd_extra_options }}
 ExecReload=/usr/share/varnish/reload-vcl
+Restart=on-failure
 
 [Install]
 WantedBy=multi-user.target

From 4cf8c9fb4b9cab6680462d295b9b8e1fd1d959ca Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 31 Aug 2018 09:06:11 -0500
Subject: [PATCH 1012/1273] Update geerlingguy.java role.

---
 provisioning/requirements.yml                      | 2 +-
 provisioning/roles/geerlingguy.java/tasks/main.yml | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index f2026a912..612279538 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -30,7 +30,7 @@
 - src: geerlingguy.git
   version: 2.0.2
 - src: geerlingguy.java
-  version: 1.9.0
+  version: 1.9.1
 - src: geerlingguy.mailhog
   version: 2.1.4
 - src: geerlingguy.memcached
diff --git a/provisioning/roles/geerlingguy.java/tasks/main.yml b/provisioning/roles/geerlingguy.java/tasks/main.yml
index dc12aad00..f09ce51c0 100644
--- a/provisioning/roles/geerlingguy.java/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.java/tasks/main.yml
@@ -5,7 +5,9 @@
 
 - name: Include version-specific variables for CentOS/RHEL.
   include_vars: "RedHat-{{ ansible_distribution_version.split('.')[0] }}.yml"
-  when: ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat Enterprise Linux'
+  when: ansible_distribution == 'CentOS' or
+        ansible_distribution == 'Red Hat Enterprise Linux' or
+        ansible_distribution == 'RedHat'
 
 - name: Include version-specific variables for Ubuntu.
   include_vars: "{{ ansible_distribution }}-{{ ansible_distribution_version.split('.')[0] }}.yml"

From 32145d3f9deb70ac0522e2d08f3db09d22524a72 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 31 Aug 2018 09:20:37 -0500
Subject: [PATCH 1013/1273] Update geerlingguy.mysql role for MySQL 8.0
 compatibility.

---
 provisioning/requirements.yml                            | 2 +-
 provisioning/roles/geerlingguy.mysql/tasks/configure.yml | 5 +++++
 .../roles/geerlingguy.mysql/tasks/replication.yml        | 6 +++---
 .../geerlingguy.mysql/tasks/secure-installation.yml      | 9 ++-------
 provisioning/roles/geerlingguy.mysql/templates/my.cnf.j2 | 4 +++-
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 612279538..512236efa 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -36,7 +36,7 @@
 - src: geerlingguy.memcached
   version: 1.0.8
 - src: geerlingguy.mysql
-  version: 2.9.0
+  version: 2.9.1
 - src: geerlingguy.nginx
   version: 2.6.0
 - src: geerlingguy.nodejs
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/configure.yml b/provisioning/roles/geerlingguy.mysql/tasks/configure.yml
index 15185a3c3..04e2901ef 100644
--- a/provisioning/roles/geerlingguy.mysql/tasks/configure.yml
+++ b/provisioning/roles/geerlingguy.mysql/tasks/configure.yml
@@ -1,4 +1,9 @@
 ---
+- name: Get MySQL version.
+  command: 'mysql --version'
+  register: mysql_cli_version
+  changed_when: false
+
 - name: Copy my.cnf global MySQL configuration.
   template:
     src: my.cnf.j2
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/replication.yml b/provisioning/roles/geerlingguy.mysql/tasks/replication.yml
index 94894b1f8..e584587eb 100644
--- a/provisioning/roles/geerlingguy.mysql/tasks/replication.yml
+++ b/provisioning/roles/geerlingguy.mysql/tasks/replication.yml
@@ -27,7 +27,7 @@
   delegate_to: "{{ mysql_replication_master }}"
   register: master
   when: >
-    ((slave.Is_Slave is defined and not slave.Is_Slave) or (slave.Is_Slave is not defined and slave|failed))
+    ((slave.Is_Slave is defined and not slave.Is_Slave) or (slave.Is_Slave is not defined and slave is failed))
     and (mysql_replication_role == 'slave')
     and (mysql_replication_master != '')
 
@@ -41,7 +41,7 @@
     master_log_pos: "{{ master.Position }}"
   ignore_errors: True
   when: >
-    ((slave.Is_Slave is defined and not slave.Is_Slave) or (slave.Is_Slave is not defined and slave|failed))
+    ((slave.Is_Slave is defined and not slave.Is_Slave) or (slave.Is_Slave is not defined and slave is failed))
     and (mysql_replication_role == 'slave')
     and (mysql_replication_master != '')
     and mysql_replication_user
@@ -49,6 +49,6 @@
 - name: Start replication.
   mysql_replication: mode=startslave
   when: >
-    ((slave.Is_Slave is defined and not slave.Is_Slave) or (slave.Is_Slave is not defined and slave|failed))
+    ((slave.Is_Slave is defined and not slave.Is_Slave) or (slave.Is_Slave is not defined and slave is failed))
     and (mysql_replication_role == 'slave')
     and (mysql_replication_master != '')
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/secure-installation.yml b/provisioning/roles/geerlingguy.mysql/tasks/secure-installation.yml
index fc1e4eecf..78e85f3f0 100644
--- a/provisioning/roles/geerlingguy.mysql/tasks/secure-installation.yml
+++ b/provisioning/roles/geerlingguy.mysql/tasks/secure-installation.yml
@@ -1,9 +1,4 @@
 ---
-- name: Get MySQL version.
-  command: 'mysql --version'
-  register: mysql_cli_version
-  changed_when: false
-
 - name: Ensure default user is present.
   mysql_user:
     name: "{{ mysql_user_name }}"
@@ -43,7 +38,7 @@
     mysql -u root -NBe
     'ALTER USER "{{ mysql_root_username }}"@"{{ item }}" IDENTIFIED WITH mysql_native_password BY "{{ mysql_root_password }}";'
   with_items: "{{ mysql_root_hosts.stdout_lines|default([]) }}"
-  when: ((mysql_install_packages | bool) or mysql_root_password_update) and ('5.7.' in mysql_cli_version.stdout)
+  when: ((mysql_install_packages | bool) or mysql_root_password_update) and ('5.7.' in mysql_cli_version.stdout or '8.0.' in mysql_cli_version.stdout)
 
 # Set root password for MySQL < 5.7.x.
 - name: Update MySQL root password for localhost root account (< 5.7.x).
@@ -51,7 +46,7 @@
     mysql -NBe
     'SET PASSWORD FOR "{{ mysql_root_username }}"@"{{ item }}" = PASSWORD("{{ mysql_root_password }}");'
   with_items: "{{ mysql_root_hosts.stdout_lines|default([]) }}"
-  when: ((mysql_install_packages | bool) or mysql_root_password_update) and ('5.7.' not in mysql_cli_version.stdout)
+  when: ((mysql_install_packages | bool) or mysql_root_password_update) and ('5.7.' not in mysql_cli_version.stdout and '8.0.' not in mysql_cli_version.stdout)
 
 # Has to be after the root password assignment, for idempotency.
 - name: Copy .my.cnf file with root password credentials.
diff --git a/provisioning/roles/geerlingguy.mysql/templates/my.cnf.j2 b/provisioning/roles/geerlingguy.mysql/templates/my.cnf.j2
index b2ce8d386..91962a30a 100644
--- a/provisioning/roles/geerlingguy.mysql/templates/my.cnf.j2
+++ b/provisioning/roles/geerlingguy.mysql/templates/my.cnf.j2
@@ -81,9 +81,11 @@ read_buffer_size = {{ mysql_read_buffer_size }}
 read_rnd_buffer_size = {{ mysql_read_rnd_buffer_size }}
 myisam_sort_buffer_size = {{ mysql_myisam_sort_buffer_size }}
 thread_cache_size = {{ mysql_thread_cache_size }}
+{% if '8.0.' not in mysql_cli_version.stdout %}
 query_cache_type = {{ mysql_query_cache_type }}
 query_cache_size = {{ mysql_query_cache_size }}
 query_cache_limit = {{ mysql_query_cache_limit }}
+{% endif %}
 max_connections = {{ mysql_max_connections }}
 tmp_table_size = {{ mysql_tmp_table_size }}
 max_heap_table_size = {{ mysql_max_heap_table_size }}
@@ -96,7 +98,7 @@ lower_case_table_names = {{ mysql_lower_case_table_names }}
 event_scheduler = {{ mysql_event_scheduler_state }}
 
 # InnoDB settings.
-{% if mysql_supports_innodb_large_prefix %}
+{% if mysql_supports_innodb_large_prefix and '8.0.' not in mysql_cli_version.stdout %}
 innodb_large_prefix = {{ mysql_innodb_large_prefix }}
 innodb_file_format = {{ mysql_innodb_file_format }}
 {% endif %}

From d2fba4804aa08f7e9cd940177d3b5eea6ffbee34 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 4 Sep 2018 11:26:15 -0500
Subject: [PATCH 1014/1273] Update geerlingguy.nodejs role to latest version.

---
 provisioning/requirements.yml                                | 2 +-
 provisioning/roles/geerlingguy.nodejs/README.md              | 2 +-
 provisioning/roles/geerlingguy.nodejs/tasks/setup-RedHat.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 512236efa..50c8f7147 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -40,7 +40,7 @@
 - src: geerlingguy.nginx
   version: 2.6.0
 - src: geerlingguy.nodejs
-  version: 4.2.1
+  version: 4.2.2
 - src: geerlingguy.php
   version: 3.6.0
 - src: geerlingguy.php-memcached
diff --git a/provisioning/roles/geerlingguy.nodejs/README.md b/provisioning/roles/geerlingguy.nodejs/README.md
index 941427379..fa703d9ef 100644
--- a/provisioning/roles/geerlingguy.nodejs/README.md
+++ b/provisioning/roles/geerlingguy.nodejs/README.md
@@ -6,7 +6,7 @@ Installs Node.js on RHEL/CentOS or Debian/Ubuntu.
 
 ## Requirements
 
-Requires the EPEL repository on RedHat/CentOS (you can install it by simply adding the `geerlingguy.repo-epel` role to your playbook).
+None.
 
 ## Role Variables
 
diff --git a/provisioning/roles/geerlingguy.nodejs/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.nodejs/tasks/setup-RedHat.yml
index 43582fa10..f2b9ee77e 100644
--- a/provisioning/roles/geerlingguy.nodejs/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.nodejs/tasks/setup-RedHat.yml
@@ -34,4 +34,4 @@
   when: ansible_distribution_major_version|int >= 7
 
 - name: Ensure Node.js and npm are installed.
-  yum: "name=nodejs-{{ nodejs_version|regex_replace('x', '') }}* state=present enablerepo='epel,nodesource'"
+  yum: "name=nodejs-{{ nodejs_version|regex_replace('x', '') }}* state=present enablerepo='nodesource'"

From 0ecfc9cc9a17a72e7560ea62cf121b554a122389 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 4 Sep 2018 11:39:14 -0500
Subject: [PATCH 1015/1273] Update geerlingguy.composer role for better
 download security.

---
 provisioning/requirements.yml                          | 2 +-
 provisioning/roles/geerlingguy.composer/tasks/main.yml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 50c8f7147..300b12b7b 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -14,7 +14,7 @@
 - src: geerlingguy.blackfire
   version: 1.1.0
 - src: geerlingguy.composer
-  version: 1.7.0
+  version: 1.7.1
 - src: geerlingguy.daemonize
   version: 1.2.0
 - src: geerlingguy.drupal
diff --git a/provisioning/roles/geerlingguy.composer/tasks/main.yml b/provisioning/roles/geerlingguy.composer/tasks/main.yml
index 28a718ac7..bb21ae3cd 100644
--- a/provisioning/roles/geerlingguy.composer/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.composer/tasks/main.yml
@@ -13,6 +13,7 @@
     url: https://getcomposer.org/installer
     dest: /tmp/composer-installer.php
     mode: 0755
+    checksum: "sha384:{{ lookup('url', 'https://composer.github.io/installer.sig') }}"
   when: not composer_bin.stat.exists
 
 - name: Run Composer installer.

From 3e1f16b292df049baceba7cc1fcb21b75e1f1c1a Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 7 Sep 2018 15:52:43 -0500
Subject: [PATCH 1016/1273] Update geerlingguy.php role to latest version.

---
 provisioning/requirements.yml                             | 2 +-
 provisioning/roles/geerlingguy.php/README.md              | 2 ++
 provisioning/roles/geerlingguy.php/tasks/setup-Debian.yml | 3 +--
 provisioning/roles/geerlingguy.php/tasks/setup-RedHat.yml | 3 +--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 300b12b7b..c8e9ecdd1 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -42,7 +42,7 @@
 - src: geerlingguy.nodejs
   version: 4.2.2
 - src: geerlingguy.php
-  version: 3.6.0
+  version: 3.6.1
 - src: geerlingguy.php-memcached
   version: 2.0.1
 - src: geerlingguy.php-mysql
diff --git a/provisioning/roles/geerlingguy.php/README.md b/provisioning/roles/geerlingguy.php/README.md
index c463259cf..0c8b93874 100644
--- a/provisioning/roles/geerlingguy.php/README.md
+++ b/provisioning/roles/geerlingguy.php/README.md
@@ -73,6 +73,8 @@ Specific settings inside the default `www.conf` PHP-FPM pool. If you'd like to m
 
 By default, all the extra defaults below are applied through the php.ini included with this role. You can self-manage your php.ini file (if you need more flexility in its configuration) by setting this to `false` (in which case all the below variables will be ignored).
 
+    php_fpm_pool_user: "[apache|nginx|other]" # default varies by OS
+    php_fpm_pool_group: "[apache|nginx|other]" # default varies by OS
     php_memory_limit: "256M"
     php_max_execution_time: "60"
     php_max_input_time: "60"
diff --git a/provisioning/roles/geerlingguy.php/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.php/tasks/setup-Debian.yml
index 3b3d6d3b9..17402047c 100644
--- a/provisioning/roles/geerlingguy.php/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.php/tasks/setup-Debian.yml
@@ -4,10 +4,9 @@
 
 - name: Ensure PHP packages are installed.
   apt:
-    name: "{{ item }}"
+    name: "{{ php_packages }}"
     state: "{{ php_packages_state }}"
     install_recommends: "{{ php_install_recommends }}"
-  with_items: "{{ php_packages }}"
   register: php_package_install
   notify: restart webserver
 
diff --git a/provisioning/roles/geerlingguy.php/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.php/tasks/setup-RedHat.yml
index a51e1e7ca..68ca93143 100644
--- a/provisioning/roles/geerlingguy.php/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.php/tasks/setup-RedHat.yml
@@ -1,8 +1,7 @@
 ---
 - name: Ensure PHP packages are installed.
   package:
-    name: "{{ item }}"
+    name: "{{ php_packages }}"
     state: "{{ php_packages_state }}"
     enablerepo: "{{ php_enablerepo }}"
-  with_items: "{{ php_packages }}"
   notify: restart webserver

From f62b5cd55d52332830796ae330e68707522c2682 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 7 Sep 2018 23:01:42 -0500
Subject: [PATCH 1017/1273] Fixes #1822: Update composer role to fix CentOS 7
 Composer download bug.

---
 provisioning/requirements.yml                          | 2 +-
 provisioning/roles/geerlingguy.composer/tasks/main.yml | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index c8e9ecdd1..102e8c026 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -14,7 +14,7 @@
 - src: geerlingguy.blackfire
   version: 1.1.0
 - src: geerlingguy.composer
-  version: 1.7.1
+  version: 1.7.2
 - src: geerlingguy.daemonize
   version: 1.2.0
 - src: geerlingguy.drupal
diff --git a/provisioning/roles/geerlingguy.composer/tasks/main.yml b/provisioning/roles/geerlingguy.composer/tasks/main.yml
index bb21ae3cd..769ac448f 100644
--- a/provisioning/roles/geerlingguy.composer/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.composer/tasks/main.yml
@@ -8,12 +8,19 @@
   stat: "path={{ composer_path }}"
   register: composer_bin
 
+- name: Get Composer installer signature.
+  uri:
+    url: https://composer.github.io/installer.sig
+    return_content: yes
+  register: composer_installer_signature
+  when: not composer_bin.stat.exists
+
 - name: Download Composer installer.
   get_url:
     url: https://getcomposer.org/installer
     dest: /tmp/composer-installer.php
     mode: 0755
-    checksum: "sha384:{{ lookup('url', 'https://composer.github.io/installer.sig') }}"
+    checksum: "sha384:{{ composer_installer_signature.content }}"
   when: not composer_bin.stat.exists
 
 - name: Run Composer installer.

From a4a3ac85ddfc09f21756c8b3b23f81407dc5b8e5 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 10 Sep 2018 09:17:12 -0500
Subject: [PATCH 1018/1273] Update geerlingguy.mysql role to latest version.

---
 provisioning/requirements.yml                            | 2 +-
 provisioning/roles/geerlingguy.mysql/tasks/configure.yml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 102e8c026..facd4dad3 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -36,7 +36,7 @@
 - src: geerlingguy.memcached
   version: 1.0.8
 - src: geerlingguy.mysql
-  version: 2.9.1
+  version: 2.9.2
 - src: geerlingguy.nginx
   version: 2.6.0
 - src: geerlingguy.nodejs
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/configure.yml b/provisioning/roles/geerlingguy.mysql/tasks/configure.yml
index 04e2901ef..dca970f02 100644
--- a/provisioning/roles/geerlingguy.mysql/tasks/configure.yml
+++ b/provisioning/roles/geerlingguy.mysql/tasks/configure.yml
@@ -3,6 +3,7 @@
   command: 'mysql --version'
   register: mysql_cli_version
   changed_when: false
+  check_mode: no
 
 - name: Copy my.cnf global MySQL configuration.
   template:

From f49abf0fcd5689f5ba0286699ad6d71d158406cb Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 10 Sep 2018 09:53:57 -0500
Subject: [PATCH 1019/1273] Fix a rubocop sniff for empty line after returns.

---
 lib/drupalvm/vagrant.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/drupalvm/vagrant.rb b/lib/drupalvm/vagrant.rb
index 93d4d45ae..db88fe536 100644
--- a/lib/drupalvm/vagrant.rb
+++ b/lib/drupalvm/vagrant.rb
@@ -58,8 +58,10 @@ def ansible_version
 # Require that if installed, the ansible version meets the requirements.
 def require_ansible_version(requirement)
   return unless ansible_bin
+
   req = Gem::Requirement.new(requirement)
   return if req.satisfied_by?(Gem::Version.new(ansible_version))
+
   raise_message "You must install an Ansible version #{requirement} to use this version of Drupal VM."
 end
 

From 89c05b288f06db6dbfa00681d9fcb6a9820e45ee Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 10 Sep 2018 11:43:53 -0500
Subject: [PATCH 1020/1273] Fixes #1823: Remove Debian 8 CI test, Debian 9
 suffices.

---
 .travis.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cbd44873b..1ea127f9a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,9 +26,6 @@ env:
     # Defaults - Debian 9.
     - type: debian
       distro: debian9
-    # Defaults - Debian 8.
-    - type: debian
-      distro: debian8
     # Defaults - CentOS 7.
     - type: centos
       distro: centos7

From d9da6555254631c6a799d71e0f528f782d81457b Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 13 Sep 2018 09:35:16 -0500
Subject: [PATCH 1021/1273] Update geerlingguy.solr role version to latest.

---
 provisioning/requirements.yml                             | 2 +-
 provisioning/roles/geerlingguy.solr/README.md             | 2 +-
 provisioning/roles/geerlingguy.solr/defaults/main.yml     | 2 +-
 provisioning/roles/geerlingguy.solr/tests/test-solr-5.yml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index facd4dad3..589070972 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -76,6 +76,6 @@
 - src: geerlingguy.security
   version: 1.7.0
 - src: geerlingguy.solr
-  version: 4.2.2
+  version: 4.3.0
 - src: geerlingguy.varnish
   version: 2.3.2
diff --git a/provisioning/roles/geerlingguy.solr/README.md b/provisioning/roles/geerlingguy.solr/README.md
index 2218f0e1b..c2a841ca4 100644
--- a/provisioning/roles/geerlingguy.solr/README.md
+++ b/provisioning/roles/geerlingguy.solr/README.md
@@ -8,7 +8,7 @@ Installs [Apache Solr](http://lucene.apache.org/solr/) on Linux servers.
 
 Java must be available on the server. You can easily install Java using the `geerlingguy.java` role. Make sure the Java version installed meets the minimum requirements of Solr (e.g. Java 8 for Solr 6+).
 
-This role is currently tested and working with Solr 3.x, 4.x, 5.x and 6.x.
+This role is currently tested and working with Solr 3.x, 4.x, 5.x, 6.x and 7.x.
 
 ## Role Variables
 
diff --git a/provisioning/roles/geerlingguy.solr/defaults/main.yml b/provisioning/roles/geerlingguy.solr/defaults/main.yml
index 6bb5e1078..2af6e0cc6 100644
--- a/provisioning/roles/geerlingguy.solr/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.solr/defaults/main.yml
@@ -4,7 +4,7 @@ solr_workspace: /root
 solr_create_user: true
 solr_user: solr
 
-solr_version: "7.1.0"
+solr_version: "7.4.0"
 solr_mirror: "https://archive.apache.org/dist"
 solr_remove_cruft: false
 
diff --git a/provisioning/roles/geerlingguy.solr/tests/test-solr-5.yml b/provisioning/roles/geerlingguy.solr/tests/test-solr-5.yml
index d27b54087..8f5ee0622 100644
--- a/provisioning/roles/geerlingguy.solr/tests/test-solr-5.yml
+++ b/provisioning/roles/geerlingguy.solr/tests/test-solr-5.yml
@@ -2,7 +2,7 @@
 - hosts: all
 
   vars:
-    solr_version: "5.5.4"
+    solr_version: "5.5.5"
     solr_remove_cruft: true
     java_packages:
       - openjdk-7-jdk

From 17af28cdc1b1f4986ac11d5d944aff150f5bc372 Mon Sep 17 00:00:00 2001
From: Dane Powell <danepowell@users.noreply.github.com>
Date: Thu, 27 Sep 2018 12:28:12 -0700
Subject: [PATCH 1022/1273] Clean up Tideways documentation

---
 docs/extras/tideways.md | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/docs/extras/tideways.md b/docs/extras/tideways.md
index 8f42c83b9..2b4216ff2 100644
--- a/docs/extras/tideways.md
+++ b/docs/extras/tideways.md
@@ -1,17 +1,23 @@
-The Tideways PHP Extension is a well-maintained fork of the XHProf code and works with either the [XHProf](https://www.drupal.org/project/xhprof) or [Tideways](https://www.drupal.org/project/tideways) module to profile page views.
+The [Tideways XHProf Extension](https://github.com/tideways/php-xhprof-extension) is a well-maintained fork of the XHProf code and works with either the [XHProf](https://www.drupal.org/project/xhprof) or [Tideways](https://www.drupal.org/project/tideways) Drupal modules to profile page views. Results can be viewed with these modules or the native XHProf UI.
 
-To use Tideways make sure `tideways` is in the list of `installed_extras`.
+Note that the Tideways project [recently split](https://tideways.com/profiler/blog/releasing-new-tideways-xhprof-extension) into a proprietary extension and a stand-alone fork of XHProf. DrupalVM (and this document) specifically uses the latter (the "Tideways XHProf Extension").
+
+To use Tideways XHProf make sure `tideways` is in the list of `installed_extras`.
 
 **Note**: You should only enable one code profiler at a time—e.g. when using [Blackfire](blackfire.md), disable [XHProf](xhprof.md), [Tideways](tideways.md) and [XDebug](xdebug.md).
 
-### Profiling with the XHProf Module
+### Profiling with the XHProf Drupal Module
 
 To enable profiling of Drupal pages using the Tideways PHP Extension, follow the directions for [configuring the XHProf and the XHProf module](xhprof.md#xhprof-module), but choose the _Tideways_ extension under the _Profiling settings_ section.
 
-As with the XHProf extension, you can view callgraphs (and a listing of all stored runs) using Drupal VM's own XHProf UI installation by visiting [http://xhprof.drupalvm.test/](http://xhprof.drupalvm.test) and clicking on the relevant run, then clicking the _[View Full Callgraph]_ link.
-
 ### Profiling with the Tideways module
 
 Instructions for profiling with the Tideways module through the [tideways.io](https://tideways.io) service will be added after the following issue is resolved: [Can't install latest dev release on 8.x](https://www.drupal.org/node/2843481).
 
 For a list of available role variables, see the [`geerlingguy.php-tideways` Ansible role's README](https://github.com/geerlingguy/ansible-role-php-tideways#readme).
+
+### Viewing results
+
+As with the XHProf extension, you can view callgraphs (and a listing of all stored runs) using Drupal VM's own XHProf UI installation by visiting [http://xhprof.drupalvm.test/](http://xhprof.drupalvm.test) and clicking on the relevant run, then clicking the _[View Full Callgraph]_ link.
+
+Note that if you have overridden DrupalVM's [default set of Apache vHosts](https://github.com/geerlingguy/drupal-vm/blob/master/default.config.yml), you will need to specifically add a vHost for the XHProf dashboard.

From 0e70df700a73f389b4888188ff87badea4b56827 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 4 Oct 2018 13:15:34 -0500
Subject: [PATCH 1023/1273] Update geerlingguy.firewall role to latest version.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.firewall/.gitignore     |  3 +-
 .../roles/geerlingguy.firewall/.travis.yml    | 60 +++++++------------
 .../roles/geerlingguy.firewall/meta/main.yml  | 18 +++---
 .../molecule/default/molecule.yml             | 40 +++++++++++++
 .../default/playbook.yml}                     |  8 ++-
 .../molecule/default/tests/test_default.py    | 14 +++++
 .../molecule/default/yaml-lint.yml            |  6 ++
 .../tasks/disable-other-firewalls.yml         | 46 +++++++++-----
 .../geerlingguy.firewall/tests/README.md      | 11 ----
 10 files changed, 130 insertions(+), 78 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.firewall/molecule/default/molecule.yml
 rename provisioning/roles/geerlingguy.firewall/{tests/test.yml => molecule/default/playbook.yml} (58%)
 create mode 100644 provisioning/roles/geerlingguy.firewall/molecule/default/tests/test_default.py
 create mode 100644 provisioning/roles/geerlingguy.firewall/molecule/default/yaml-lint.yml
 delete mode 100644 provisioning/roles/geerlingguy.firewall/tests/README.md

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 589070972..c46b7081c 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -26,7 +26,7 @@
 - src: geerlingguy.elasticsearch
   version: 2.2.0
 - src: geerlingguy.firewall
-  version: 2.4.0
+  version: 2.4.1
 - src: geerlingguy.git
   version: 2.0.2
 - src: geerlingguy.java
diff --git a/provisioning/roles/geerlingguy.firewall/.gitignore b/provisioning/roles/geerlingguy.firewall/.gitignore
index c9b2377e3..f56f5b578 100644
--- a/provisioning/roles/geerlingguy.firewall/.gitignore
+++ b/provisioning/roles/geerlingguy.firewall/.gitignore
@@ -1,2 +1,3 @@
 *.retry
-tests/test.sh
+*/__pycache__
+*.pyc
diff --git a/provisioning/roles/geerlingguy.firewall/.travis.yml b/provisioning/roles/geerlingguy.firewall/.travis.yml
index d6fbf5eb2..ae164d97b 100644
--- a/provisioning/roles/geerlingguy.firewall/.travis.yml
+++ b/provisioning/roles/geerlingguy.firewall/.travis.yml
@@ -1,49 +1,31 @@
 ---
+language: python
 services: docker
 
 env:
-  - distro: centos7
-  - distro: centos6
-  - distro: ubuntu1604
-  - distro: ubuntu1404
-  - distro: debian8
+  global:
+    - ROLE_NAME: firewall
+  matrix:
+    - MOLECULE_DISTRO: centos7
+      MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
+    - MOLECULE_DISTRO: centos6
+    - MOLECULE_DISTRO: ubuntu1604
+    - MOLECULE_DISTRO: ubuntu1404
+    - MOLECULE_DISTRO: debian8
+
+install:
+  # Install test dependencies.
+  - pip install molecule docker
+
+before_script:
+  # Use actual Ansible Galaxy role name for the project directory.
+  - cd ../
+  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
+  - cd geerlingguy.$ROLE_NAME
 
 script:
-  # Download test shim.
-  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
-  - chmod +x ${PWD}/tests/test.sh
-
   # Run tests.
-  - ${PWD}/tests/test.sh
-
-  # # Check if TCP port 9123 is open.
-  # - >
-  #   sudo iptables -L -n
-  #   | grep -q "ACCEPT.*dpt:9123"
-  #   && (echo 'Port 9123 is open - pass' && exit 0)
-  #   || (echo 'Port 9123 is not open - fail' && exit 1)
-
-  # # Check running firewall has exit code 0
-  # - >
-  #   sudo service firewall status
-  #   && (echo 'Status of running firewall is 0 - pass' && exit 0)
-  #   || (echo 'Status of running firewall is not 0 - fail' && exit 1)
-
-  # # Stop firewall
-  # - >
-  #   sudo service firewall stop
-  #   && (echo 'Stopping firewall - pass' && exit 0)
-  #   || (echo 'Stopping firewall - fail' && exit 1)
-
-  # # Check stopped firewall has exit code 3
-  # - >
-  #   sudo service firewall status;
-  #   EXIT=$?;
-  #   if [ 3 -eq $EXIT ]; then
-  #     echo 'Status of stopped firewall is 3 - pass' && exit 0;
-  #   else
-  #     echo 'Status of stopped firewall is not 3 - fail' && exit 1;
-  #   fi
+  - molecule test
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.firewall/meta/main.yml b/provisioning/roles/geerlingguy.firewall/meta/main.yml
index 45ddaf2dd..2587263d9 100644
--- a/provisioning/roles/geerlingguy.firewall/meta/main.yml
+++ b/provisioning/roles/geerlingguy.firewall/meta/main.yml
@@ -8,15 +8,15 @@ galaxy_info:
   license: "license (BSD, MIT)"
   min_ansible_version: 2.4
   platforms:
-  - name: EL
-    versions:
-    - all
-  - name: Debian
-    versions:
-    - all
-  - name: Ubuntu
-    versions:
-    - all
+    - name: EL
+      versions:
+        - all
+    - name: Debian
+      versions:
+        - all
+    - name: Ubuntu
+      versions:
+        - all
   galaxy_tags:
     - networking
     - system
diff --git a/provisioning/roles/geerlingguy.firewall/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.firewall/molecule/default/molecule.yml
new file mode 100644
index 000000000..bf499d2b3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.firewall/molecule/default/molecule.yml
@@ -0,0 +1,40 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint:
+  name: yamllint
+  options:
+    config-file: molecule/default/yaml-lint.yml
+platforms:
+  - name: instance
+    image: geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible
+    command: ${MOLECULE_DOCKER_COMMAND:-"sleep infinity"}
+    privileged: true
+    pre_build_image: true
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+  playbooks:
+    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
+scenario:
+  name: default
+  test_sequence:
+    - lint
+    - destroy
+    - dependency
+    - syntax
+    - create
+    - prepare
+    - converge
+    - idempotence
+    - check
+    - side_effect
+    - verify
+    - destroy
+verifier:
+  name: testinfra
+  lint:
+    name: flake8
diff --git a/provisioning/roles/geerlingguy.firewall/tests/test.yml b/provisioning/roles/geerlingguy.firewall/molecule/default/playbook.yml
similarity index 58%
rename from provisioning/roles/geerlingguy.firewall/tests/test.yml
rename to provisioning/roles/geerlingguy.firewall/molecule/default/playbook.yml
index 5521003f9..a7cecd132 100644
--- a/provisioning/roles/geerlingguy.firewall/tests/test.yml
+++ b/provisioning/roles/geerlingguy.firewall/molecule/default/playbook.yml
@@ -1,5 +1,7 @@
 ---
-- hosts: all
+- name: Converge
+  hosts: all
+  become: true
 
   vars:
     firewall_allowed_tcp_ports:
@@ -7,9 +9,9 @@
 
   pre_tasks:
     - name: Update apt cache.
-      apt: update_cache=yes cache_valid_time=1200
+      apt: update_cache=true cache_valid_time=1200
       when: ansible_os_family == 'Debian'
       changed_when: false
 
   roles:
-    - role_under_test
+    - role: geerlingguy.firewall
diff --git a/provisioning/roles/geerlingguy.firewall/molecule/default/tests/test_default.py b/provisioning/roles/geerlingguy.firewall/molecule/default/tests/test_default.py
new file mode 100644
index 000000000..eedd64a1d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.firewall/molecule/default/tests/test_default.py
@@ -0,0 +1,14 @@
+import os
+
+import testinfra.utils.ansible_runner
+
+testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
+    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
+
+
+def test_hosts_file(host):
+    f = host.file('/etc/hosts')
+
+    assert f.exists
+    assert f.user == 'root'
+    assert f.group == 'root'
diff --git a/provisioning/roles/geerlingguy.firewall/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.firewall/molecule/default/yaml-lint.yml
new file mode 100644
index 000000000..a3dbc38ee
--- /dev/null
+++ b/provisioning/roles/geerlingguy.firewall/molecule/default/yaml-lint.yml
@@ -0,0 +1,6 @@
+---
+extends: default
+rules:
+  line-length:
+    max: 120
+    level: warning
diff --git a/provisioning/roles/geerlingguy.firewall/tasks/disable-other-firewalls.yml b/provisioning/roles/geerlingguy.firewall/tasks/disable-other-firewalls.yml
index 50e9b0e6c..509196a30 100644
--- a/provisioning/roles/geerlingguy.firewall/tasks/disable-other-firewalls.yml
+++ b/provisioning/roles/geerlingguy.firewall/tasks/disable-other-firewalls.yml
@@ -1,48 +1,66 @@
 ---
 - name: Check if firewalld package is installed (on RHEL).
-  shell: yum list installed firewalld
+  command: yum list installed firewalld
   args:
-    warn: no
+    warn: false
   register: firewalld_installed
   ignore_errors: true
   changed_when: false
-  when: ansible_os_family == "RedHat" and firewall_disable_firewalld
+  when:
+    - ansible_os_family == "RedHat"
+    - firewall_disable_firewalld
+  check_mode: false
 
 - name: Disable the firewalld service (on RHEL, if configured).
   service:
     name: firewalld
     state: stopped
-    enabled: no
-  when: ansible_os_family == "RedHat" and firewall_disable_firewalld and firewalld_installed.rc == 0
+    enabled: false
+  when:
+    - ansible_os_family == "RedHat"
+    - firewall_disable_firewalld
+    - firewalld_installed.rc == 0
 
 - name: Check if ufw package is installed (on Ubuntu).
-  shell: service ufw status
+  command: service ufw status
   args:
-    warn: no
+    warn: false
   register: ufw_installed
   ignore_errors: true
   changed_when: false
-  when: ansible_distribution == "Ubuntu" and firewall_disable_ufw
+  when:
+    - ansible_distribution == "Ubuntu"
+    - firewall_disable_ufw
+  check_mode: false
 
 - name: Disable the ufw firewall (on Ubuntu, if configured).
   service:
     name: ufw
     state: stopped
-    enabled: no
-  when: ansible_distribution == "Ubuntu" and firewall_disable_ufw and ufw_installed.rc == 0
+    enabled: false
+  when:
+    - ansible_distribution == "Ubuntu"
+    - firewall_disable_ufw
+    - ufw_installed.rc == 0
 
 - name: Check if ufw package is installed (on Archlinux).
   command: pacman -Q ufw
   args:
-    warn: no
+    warn: false
   register: ufw_installed
   ignore_errors: true
   changed_when: false
-  when: ansible_distribution == "Archlinux" and firewall_disable_ufw
+  when:
+    - ansible_distribution == "Archlinux"
+    - firewall_disable_ufw
+  check_mode: false
 
 - name: Disable the ufw firewall (on Archlinux, if configured).
   service:
     name: ufw
     state: stopped
-    enabled: no
-  when: ansible_distribution == "Archlinux" and firewall_disable_ufw and ufw_installed.rc == 0
+    enabled: false
+  when:
+    - ansible_distribution == "Archlinux"
+    - firewall_disable_ufw
+    - ufw_installed.rc == 0
diff --git a/provisioning/roles/geerlingguy.firewall/tests/README.md b/provisioning/roles/geerlingguy.firewall/tests/README.md
deleted file mode 100644
index 6fb211721..000000000
--- a/provisioning/roles/geerlingguy.firewall/tests/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Ansible Role tests
-
-To run the test playbook(s) in this directory:
-
-  1. Install and start Docker.
-  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
-    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
-  1. Make the test shim executable: `chmod +x tests/test.sh`.
-  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
-
-If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`

From 3f0a3e962ef0006989385471a645397ddb6fe6ed Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 5 Oct 2018 09:06:11 -0500
Subject: [PATCH 1024/1273] Upgrade to latest versions of php and apache roles.

---
 provisioning/requirements.yml                 |   4 +-
 .../roles/geerlingguy.apache/.gitignore       |   3 +-
 .../roles/geerlingguy.apache/.travis.yml      |  35 +++---
 .../geerlingguy.apache/defaults/main.yml      |  16 +--
 .../roles/geerlingguy.apache/meta/main.yml    |   2 +-
 .../molecule/default/molecule.yml             |  27 +++++
 .../molecule/default/playbook.yml             |  21 ++++
 .../molecule/default/tests/test_default.py    |  14 +++
 .../molecule/default/yaml-lint.yml            |   6 ++
 .../roles/geerlingguy.apache/tasks/main.yml   |  19 ++--
 .../geerlingguy.apache/tasks/setup-Debian.yml |   3 +-
 .../geerlingguy.apache/tasks/setup-RedHat.yml |   5 +-
 .../tasks/setup-Solaris.yml                   |   3 +-
 .../geerlingguy.apache/tasks/setup-Suse.yml   |   3 +-
 .../roles/geerlingguy.apache/tests/README.md  |  11 --
 .../roles/geerlingguy.apache/tests/test.yml   |  13 ---
 provisioning/roles/geerlingguy.php/.gitignore |   3 +-
 .../roles/geerlingguy.php/.travis.yml         |  90 +++++-----------
 provisioning/roles/geerlingguy.php/README.md  |   2 +-
 .../roles/geerlingguy.php/defaults/main.yml   |   2 +-
 .../roles/geerlingguy.php/meta/main.yml       |  30 +++---
 .../molecule/default/molecule.yml             |  27 +++++
 .../molecule/default/playbook-source.yml      |  32 ++++++
 .../default/playbook.yml}                     |  38 ++++---
 .../default}/requirements.yml                 |   0
 .../molecule/default/tests/test_default.py    |  14 +++
 .../molecule/default/yaml-lint.yml            |   6 ++
 .../geerlingguy.php/tasks/configure-apcu.yml  |   2 +-
 .../geerlingguy.php/tasks/configure-fpm.yml   |   6 +-
 .../tasks/configure-opcache.yml               |   2 +-
 .../tasks/install-from-source.yml             | 100 +++++++++---------
 .../geerlingguy.php/tasks/setup-RedHat.yml    |   2 +-
 .../roles/geerlingguy.php/tests/README.md     |  11 --
 .../geerlingguy.php/tests/test-source.yml     |  20 ----
 34 files changed, 327 insertions(+), 245 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.apache/molecule/default/molecule.yml
 create mode 100644 provisioning/roles/geerlingguy.apache/molecule/default/playbook.yml
 create mode 100644 provisioning/roles/geerlingguy.apache/molecule/default/tests/test_default.py
 create mode 100644 provisioning/roles/geerlingguy.apache/molecule/default/yaml-lint.yml
 delete mode 100644 provisioning/roles/geerlingguy.apache/tests/README.md
 delete mode 100644 provisioning/roles/geerlingguy.apache/tests/test.yml
 create mode 100644 provisioning/roles/geerlingguy.php/molecule/default/molecule.yml
 create mode 100644 provisioning/roles/geerlingguy.php/molecule/default/playbook-source.yml
 rename provisioning/roles/geerlingguy.php/{tests/test.yml => molecule/default/playbook.yml} (60%)
 rename provisioning/roles/geerlingguy.php/{tests => molecule/default}/requirements.yml (100%)
 create mode 100644 provisioning/roles/geerlingguy.php/molecule/default/tests/test_default.py
 create mode 100644 provisioning/roles/geerlingguy.php/molecule/default/yaml-lint.yml
 delete mode 100644 provisioning/roles/geerlingguy.php/tests/README.md
 delete mode 100644 provisioning/roles/geerlingguy.php/tests/test-source.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index c46b7081c..4f657842d 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -8,7 +8,7 @@
 - src: geerlingguy.adminer
   version: 1.2.0
 - src: geerlingguy.apache
-  version: 3.0.0
+  version: 3.0.1
 - src: geerlingguy.apache-php-fpm
   version: 1.1.0
 - src: geerlingguy.blackfire
@@ -42,7 +42,7 @@
 - src: geerlingguy.nodejs
   version: 4.2.2
 - src: geerlingguy.php
-  version: 3.6.1
+  version: 3.6.2
 - src: geerlingguy.php-memcached
   version: 2.0.1
 - src: geerlingguy.php-mysql
diff --git a/provisioning/roles/geerlingguy.apache/.gitignore b/provisioning/roles/geerlingguy.apache/.gitignore
index c9b2377e3..f56f5b578 100644
--- a/provisioning/roles/geerlingguy.apache/.gitignore
+++ b/provisioning/roles/geerlingguy.apache/.gitignore
@@ -1,2 +1,3 @@
 *.retry
-tests/test.sh
+*/__pycache__
+*.pyc
diff --git a/provisioning/roles/geerlingguy.apache/.travis.yml b/provisioning/roles/geerlingguy.apache/.travis.yml
index 2992c92cd..6cbee98f0 100644
--- a/provisioning/roles/geerlingguy.apache/.travis.yml
+++ b/provisioning/roles/geerlingguy.apache/.travis.yml
@@ -1,22 +1,33 @@
 ---
+language: python
 services: docker
 
 env:
-  - distro: centos7
-  - distro: centos6
-  - distro: ubuntu1804
-  - distro: ubuntu1604
-  - distro: ubuntu1404
-  - distro: debian9
-  - distro: debian8
+  global:
+    - ROLE_NAME: apache
+  matrix:
+    - MOLECULE_DISTRO: centos7
+      MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
+    - MOLECULE_DISTRO: centos6
+    - MOLECULE_DISTRO: ubuntu1804
+    - MOLECULE_DISTRO: ubuntu1604
+    - MOLECULE_DISTRO: ubuntu1404
+    - MOLECULE_DISTRO: debian9
+    - MOLECULE_DISTRO: debian8
 
-script:
-  # Download test shim.
-  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
-  - chmod +x ${PWD}/tests/test.sh
+install:
+  # Install test dependencies.
+  - pip install molecule docker
+
+before_script:
+  # Use actual Ansible Galaxy role name for the project directory.
+  - cd ../
+  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
+  - cd geerlingguy.$ROLE_NAME
 
+script:
   # Run tests.
-  - ${PWD}/tests/test.sh
+  - molecule test
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.apache/defaults/main.yml b/provisioning/roles/geerlingguy.apache/defaults/main.yml
index f325d0b38..941a57c3d 100644
--- a/provisioning/roles/geerlingguy.apache/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.apache/defaults/main.yml
@@ -26,14 +26,14 @@ apache_allow_override: "All"
 apache_options: "-Indexes +FollowSymLinks"
 
 apache_vhosts_ssl: []
-  # Additional properties:
-  # 'serveradmin, serveralias, allow_override, options, extra_parameters'.
-  # - servername: "local.dev",
-  #   documentroot: "/var/www/html",
-  #   certificate_file: "/path/to/certificate.crt",
-  #   certificate_key_file: "/path/to/certificate.key",
-  #   # Optional.
-  #   certificate_chain_file: "/path/to/certificate_chain.crt"
+# Additional properties:
+# 'serveradmin, serveralias, allow_override, options, extra_parameters'.
+# - servername: "local.dev",
+#   documentroot: "/var/www/html",
+#   certificate_file: "/path/to/certificate.crt",
+#   certificate_key_file: "/path/to/certificate.key",
+#   # Optional.
+#   certificate_chain_file: "/path/to/certificate_chain.crt"
 
 apache_ignore_missing_ssl_certificate: true
 
diff --git a/provisioning/roles/geerlingguy.apache/meta/main.yml b/provisioning/roles/geerlingguy.apache/meta/main.yml
index 2bd0b3387..bfdb7c234 100644
--- a/provisioning/roles/geerlingguy.apache/meta/main.yml
+++ b/provisioning/roles/geerlingguy.apache/meta/main.yml
@@ -34,4 +34,4 @@ galaxy_info:
     - webserver
     - html
 
-allow_duplicates: yes
+allow_duplicates: true
diff --git a/provisioning/roles/geerlingguy.apache/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.apache/molecule/default/molecule.yml
new file mode 100644
index 000000000..033970241
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache/molecule/default/molecule.yml
@@ -0,0 +1,27 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint:
+  name: yamllint
+  options:
+    config-file: molecule/default/yaml-lint.yml
+platforms:
+  - name: instance
+    image: geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible
+    command: ${MOLECULE_DOCKER_COMMAND:-"sleep infinity"}
+    privileged: true
+    pre_build_image: true
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+  playbooks:
+    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
+scenario:
+  name: default
+verifier:
+  name: testinfra
+  lint:
+    name: flake8
diff --git a/provisioning/roles/geerlingguy.apache/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.apache/molecule/default/playbook.yml
new file mode 100644
index 000000000..416a2b968
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache/molecule/default/playbook.yml
@@ -0,0 +1,21 @@
+---
+- name: Converge
+  hosts: all
+  become: true
+
+  vars:
+    apache_listen_port_ssl: 443
+    apache_create_vhosts: true
+    apache_vhosts_filename: "vhosts.conf"
+    apache_vhosts:
+      - servername: "example.com"
+        documentroot: "/var/www/vhosts/example_com"
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=yes cache_valid_time=600
+      when: ansible_os_family == 'Debian'
+      changed_when: false
+
+  roles:
+    - role: geerlingguy.apache
diff --git a/provisioning/roles/geerlingguy.apache/molecule/default/tests/test_default.py b/provisioning/roles/geerlingguy.apache/molecule/default/tests/test_default.py
new file mode 100644
index 000000000..eedd64a1d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache/molecule/default/tests/test_default.py
@@ -0,0 +1,14 @@
+import os
+
+import testinfra.utils.ansible_runner
+
+testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
+    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
+
+
+def test_hosts_file(host):
+    f = host.file('/etc/hosts')
+
+    assert f.exists
+    assert f.user == 'root'
+    assert f.group == 'root'
diff --git a/provisioning/roles/geerlingguy.apache/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.apache/molecule/default/yaml-lint.yml
new file mode 100644
index 000000000..a3dbc38ee
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache/molecule/default/yaml-lint.yml
@@ -0,0 +1,6 @@
+---
+extends: default
+rules:
+  line-length:
+    max: 120
+    level: warning
diff --git a/provisioning/roles/geerlingguy.apache/tasks/main.yml b/provisioning/roles/geerlingguy.apache/tasks/main.yml
index 0c9717533..cdbcb63d4 100644
--- a/provisioning/roles/geerlingguy.apache/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.apache/tasks/main.yml
@@ -5,7 +5,9 @@
 
 - name: Include variables for Amazon Linux.
   include_vars: "AmazonLinux.yml"
-  when: ansible_distribution == "Amazon" and ansible_distribution_major_version == "NA"
+  when:
+    - ansible_distribution == "Amazon"
+    - ansible_distribution_major_version == "NA"
 
 - name: Define apache_packages.
   set_fact:
@@ -17,26 +19,29 @@
 
 # Figure out what version of Apache is installed.
 - name: Get installed version of Apache.
-  shell: "{{ apache_daemon_path }}{{ apache_daemon }} -v"
+  command: "{{ apache_daemon_path }}{{ apache_daemon }} -v"
   changed_when: false
-  check_mode: no
+  check_mode: false
   register: _apache_version
 
 - name: Create apache_version variable.
   set_fact:
     apache_version: "{{ _apache_version.stdout.split()[2].split('/')[1] }}"
 
-- include_vars: apache-22.yml
+- name: Include Apache 2.2 variables.
+  include_vars: apache-22.yml
   when: "apache_version.split('.')[1] == '2'"
 
-- include_vars: apache-24.yml
+- name: Include Apache 2.4 variables.
+  include_vars: apache-24.yml
   when: "apache_version.split('.')[1] == '4'"
 
 # Configure Apache.
-- include_tasks: "configure-{{ ansible_os_family }}.yml"
+- name: Configure Apache.
+  include_tasks: "configure-{{ ansible_os_family }}.yml"
 
 - name: Ensure Apache has selected state and enabled on boot.
   service:
     name: "{{ apache_service }}"
     state: "{{ apache_state }}"
-    enabled: yes
+    enabled: true
diff --git a/provisioning/roles/geerlingguy.apache/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.apache/tasks/setup-Debian.yml
index 2918b92da..b5d141239 100644
--- a/provisioning/roles/geerlingguy.apache/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.apache/tasks/setup-Debian.yml
@@ -3,5 +3,4 @@
   apt: update_cache=yes cache_valid_time=3600
 
 - name: Ensure Apache is installed on Debian.
-  apt: "name={{ item }} state={{ apache_packages_state }}"
-  with_items: "{{ apache_packages }}"
+  apt: "name={{ apache_packages }} state={{ apache_packages_state }}"
diff --git a/provisioning/roles/geerlingguy.apache/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.apache/tasks/setup-RedHat.yml
index 6021b9f1b..0c39dbedb 100644
--- a/provisioning/roles/geerlingguy.apache/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.apache/tasks/setup-RedHat.yml
@@ -1,7 +1,6 @@
 ---
 - name: Ensure Apache is installed on RHEL.
   yum:
-    name: "{{ item }}"
+    name: "{{ apache_packages }}"
     state: "{{ apache_packages_state }}"
-    enablerepo: "{{ apache_enablerepo }}"
-  with_items: "{{ apache_packages }}"
+    enablerepo: "{{ apache_enablerepo | default(omit) }}"
diff --git a/provisioning/roles/geerlingguy.apache/tasks/setup-Solaris.yml b/provisioning/roles/geerlingguy.apache/tasks/setup-Solaris.yml
index 91b84ff4f..a4ae4504d 100644
--- a/provisioning/roles/geerlingguy.apache/tasks/setup-Solaris.yml
+++ b/provisioning/roles/geerlingguy.apache/tasks/setup-Solaris.yml
@@ -1,6 +1,5 @@
 ---
 - name: Ensure Apache is installed on Solaris.
   pkg5:
-    name: "{{ item }}"
+    name: "{{ apache_packages }}"
     state: "{{ apache_packages_state }}"
-  with_items: "{{ apache_packages }}"
diff --git a/provisioning/roles/geerlingguy.apache/tasks/setup-Suse.yml b/provisioning/roles/geerlingguy.apache/tasks/setup-Suse.yml
index d77ebb1f9..725266b1a 100644
--- a/provisioning/roles/geerlingguy.apache/tasks/setup-Suse.yml
+++ b/provisioning/roles/geerlingguy.apache/tasks/setup-Suse.yml
@@ -1,6 +1,5 @@
 ---
 - name: Ensure Apache is installed on Suse.
   zypper:
-    name: "{{ item }}"
+    name: "{{ apache_packages }}"
     state: "{{ apache_packages_state }}"
-  with_items: "{{ apache_packages }}"
diff --git a/provisioning/roles/geerlingguy.apache/tests/README.md b/provisioning/roles/geerlingguy.apache/tests/README.md
deleted file mode 100644
index 6fb211721..000000000
--- a/provisioning/roles/geerlingguy.apache/tests/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Ansible Role tests
-
-To run the test playbook(s) in this directory:
-
-  1. Install and start Docker.
-  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
-    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
-  1. Make the test shim executable: `chmod +x tests/test.sh`.
-  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
-
-If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.apache/tests/test.yml b/provisioning/roles/geerlingguy.apache/tests/test.yml
deleted file mode 100644
index f5c5ca6cb..000000000
--- a/provisioning/roles/geerlingguy.apache/tests/test.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- hosts: all
-
-  vars:
-    apache_listen_port_ssl: 443
-    apache_create_vhosts: true
-    apache_vhosts_filename: "vhosts.conf"
-    apache_vhosts:
-      - servername: "example.com"
-        documentroot: "/var/www/vhosts/example_com"
-
-  roles:
-    - role_under_test
diff --git a/provisioning/roles/geerlingguy.php/.gitignore b/provisioning/roles/geerlingguy.php/.gitignore
index c9b2377e3..f56f5b578 100644
--- a/provisioning/roles/geerlingguy.php/.gitignore
+++ b/provisioning/roles/geerlingguy.php/.gitignore
@@ -1,2 +1,3 @@
 *.retry
-tests/test.sh
+*/__pycache__
+*.pyc
diff --git a/provisioning/roles/geerlingguy.php/.travis.yml b/provisioning/roles/geerlingguy.php/.travis.yml
index 9bed9ab22..2cd644abf 100644
--- a/provisioning/roles/geerlingguy.php/.travis.yml
+++ b/provisioning/roles/geerlingguy.php/.travis.yml
@@ -1,74 +1,36 @@
 ---
+language: python
 services: docker
 
 env:
-  # Test package install on all supported OSes.
-  - distro: centos7
-    playbook: test.yml
-    php_version: 7.0
-  - distro: fedora27
-    playbook: test.yml
-    php_version: 7.1
-  - distro: debian9
-    playbook: test.yml
-    php_version: 7.0
-  - distro: debian8
-    playbook: test.yml
-    php_version: 7.0
-  - distro: ubuntu1804
-    playbook: test.yml
-    php_version: 7.0
-  - distro: ubuntu1604
-    playbook: test.yml
-    php_version: 7.0
-  - distro: ubuntu1404
-    playbook: test.yml
-    php_version: 7.0
-
-  # Only test source install on latest supported OSes.
-  - distro: centos7
-    playbook: test-source.yml
-    php_version: 7.1.17
-  - distro: ubuntu1804
-    playbook: test-source.yml
-    php_version: 7.1.17
+  global:
+    - ROLE_NAME: php
+  matrix:
+    - MOLECULE_DISTRO: centos7
+      MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
+    - MOLECULE_DISTRO: ubuntu1804
+    - MOLECULE_DISTRO: ubuntu1604
+    - MOLECULE_DISTRO: ubuntu1404
+      MOLECULE_DOCKER_COMMAND: /sbin/init
+    - MOLECULE_DISTRO: debian9
+
+    - MOLECULE_DISTRO: centos7
+      MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
+      MOLECULE_PLAYBOOK: playbook-source.yml
+
+install:
+  # Install test dependencies.
+  - pip install molecule docker
+
+before_script:
+  # Use actual Ansible Galaxy role name for the project directory.
+  - cd ../
+  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
+  - cd geerlingguy.$ROLE_NAME
 
 script:
-  # Configure test script so we can run extra tests after playbook is run.
-  - export container_id=$(date +%s)
-  - export cleanup=false
-
-  # Download test shim.
-  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
-  - chmod +x ${PWD}/tests/test.sh
-
   # Run tests.
-  - ${PWD}/tests/test.sh
-
-  # Ensure PHP is installed and at the right version.
-  - 'docker exec --tty ${container_id} env TERM=xterm which php'
-  - 'docker exec --tty ${container_id} env TERM=xterm test -x /usr/bin/php'
-
-  - 'docker exec --tty ${container_id} env TERM=xterm php --version'
-  - 'docker exec --tty ${container_id} env TERM=xterm /usr/bin/php --version | grep -qF "PHP ${php_version}"'
-
-  # Ensure PHP configurations have taken effect.
-  - docker exec --tty ${container_id} env TERM=xterm php -i | grep 'memory_limit.*192'
-
-  # Check the status of PHP-FPM.
-  - |
-    if [ "${playbook}" == "test.yml" ]; then
-      case "${distro}" in
-        "centos7"|"fedora24")
-          docker exec --tty ${container_id} env TERM=xterm systemctl --no-pager status php-fpm status
-          docker exec --tty ${container_id} env TERM=xterm systemctl --no-pager status php-fpm status | grep -qF "fpm.service; enabled"
-          ;;
-        "debian8"|"ubuntu1604"|"ubuntu1804")
-          docker exec --tty ${container_id} env TERM=xterm systemctl --no-pager status php${php_version}-fpm status
-          docker exec --tty ${container_id} env TERM=xterm systemctl --no-pager status php${php_version}-fpm status | grep -qF "fpm.service; enabled"
-          ;;
-      esac
-    fi
+  - molecule test
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.php/README.md b/provisioning/roles/geerlingguy.php/README.md
index 0c8b93874..adff28d65 100644
--- a/provisioning/roles/geerlingguy.php/README.md
+++ b/provisioning/roles/geerlingguy.php/README.md
@@ -40,7 +40,7 @@ If you have enabled any additional repositories such as [geerlingguy.repo-epel](
 
 You can also use the [`geerlingguy.php-versions`](https://galaxy.ansible.com/geerlingguy/php-versions/) role to more easily switch between major PHP versions (e.g. 5.6, 7.0, 7.1, 7.2).
 
-    php_install_recommends: yes
+    php_install_recommends: true
 
 (Debian/Ubuntu only) Whether to install recommended packages when installing `php_packages`; you might want to set this to `no` explicitly if you're installing a PPA that recommends certain packages you don't want (e.g. Ondrej's `php` PPA will install `php7.0-cli` if you install `php-pear` alongside `php5.6-cli`... which is often not desired!).
 
diff --git a/provisioning/roles/geerlingguy.php/defaults/main.yml b/provisioning/roles/geerlingguy.php/defaults/main.yml
index d73a6dc13..b2f42a251 100644
--- a/provisioning/roles/geerlingguy.php/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.php/defaults/main.yml
@@ -8,7 +8,7 @@ php_enablerepo: ""
 php_packages_state: present
 
 # Whether to install recommended packages. Used only for Debian/Ubuntu.
-php_install_recommends: yes
+php_install_recommends: true
 
 # Set this to false if you're not using PHP with Apache/Nginx/etc.
 php_enable_webserver: true
diff --git a/provisioning/roles/geerlingguy.php/meta/main.yml b/provisioning/roles/geerlingguy.php/meta/main.yml
index a9051e62c..0baef250c 100644
--- a/provisioning/roles/geerlingguy.php/meta/main.yml
+++ b/provisioning/roles/geerlingguy.php/meta/main.yml
@@ -8,21 +8,21 @@ galaxy_info:
   license: "license (BSD, MIT)"
   min_ansible_version: 2.4
   platforms:
-  - name: EL
-    versions:
-    - 6
-    - 7
-  - name: Fedora
-    versions:
-    - all
-  - name: Debian
-    versions:
-    - all
-  - name: Ubuntu
-    versions:
-    - trusty
-    - xenial
-    - bionic
+    - name: EL
+      versions:
+        - 6
+        - 7
+    - name: Fedora
+      versions:
+        - all
+    - name: Debian
+      versions:
+        - all
+    - name: Ubuntu
+      versions:
+        - trusty
+        - xenial
+        - bionic
   galaxy_tags:
     - development
     - web
diff --git a/provisioning/roles/geerlingguy.php/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.php/molecule/default/molecule.yml
new file mode 100644
index 000000000..033970241
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/molecule/default/molecule.yml
@@ -0,0 +1,27 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint:
+  name: yamllint
+  options:
+    config-file: molecule/default/yaml-lint.yml
+platforms:
+  - name: instance
+    image: geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible
+    command: ${MOLECULE_DOCKER_COMMAND:-"sleep infinity"}
+    privileged: true
+    pre_build_image: true
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+  playbooks:
+    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
+scenario:
+  name: default
+verifier:
+  name: testinfra
+  lint:
+    name: flake8
diff --git a/provisioning/roles/geerlingguy.php/molecule/default/playbook-source.yml b/provisioning/roles/geerlingguy.php/molecule/default/playbook-source.yml
new file mode 100644
index 000000000..1cc193d9e
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/molecule/default/playbook-source.yml
@@ -0,0 +1,32 @@
+---
+- name: Converge
+  hosts: all
+  become: true
+
+  vars:
+    php_enable_webserver: false
+    php_install_from_source: true
+    php_source_clone_dir: /root/php-src
+    php_source_make_command: "make --jobs=2"
+    php_version: "7.1.17"
+    php_source_version: "php-{{ php_version }}"
+    php_memory_limit: "192M"
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=true cache_valid_time=600
+      when: ansible_os_family == 'Debian'
+      changed_when: false
+
+  roles:
+    - role: geerlingguy.git
+    - role: geerlingguy.php
+
+  post_tasks:
+    - name: Confirm PHP configuration is correct.
+      shell: php -i | grep 'memory_limit.*192'
+      changed_when: false
+
+    - name: Check the installed PHP version.
+      shell: '/usr/bin/php --version | grep -qF "PHP {{ php_version }}"'
+      changed_when: false
diff --git a/provisioning/roles/geerlingguy.php/tests/test.yml b/provisioning/roles/geerlingguy.php/molecule/default/playbook.yml
similarity index 60%
rename from provisioning/roles/geerlingguy.php/tests/test.yml
rename to provisioning/roles/geerlingguy.php/molecule/default/playbook.yml
index ff72fc3dd..9ca50218d 100644
--- a/provisioning/roles/geerlingguy.php/tests/test.yml
+++ b/provisioning/roles/geerlingguy.php/molecule/default/playbook.yml
@@ -1,16 +1,23 @@
 ---
-- hosts: all
+- name: Converge
+  hosts: all
+  become: true
 
   vars:
     php_enable_webserver: false
     php_enable_php_fpm: true
     php_memory_limit: "192M"
     php_enablerepo: "remi,remi-php70"
-    php_install_recommends: no
+    php_install_recommends: false
+
+  handlers:
+    - name: update apt cache
+      apt: update_cache=true
+      when: ansible_os_family == 'Debian'
 
   pre_tasks:
     - name: Update apt cache.
-      apt: update_cache=yes cache_valid_time=600
+      apt: update_cache=true cache_valid_time=600
       when: ansible_os_family == 'Debian'
       changed_when: false
 
@@ -22,10 +29,10 @@
     # Debian-specific tasks.
     - name: Add dependencies for PHP versions (Debian).
       apt:
-        name: "{{ item }}"
-      with_items:
-        - apt-transport-https
-        - ca-certificates
+        name:
+          - apt-transport-https
+          - ca-certificates
+        state: present
       when: ansible_distribution == "Debian"
 
     - name: Add Ondrej Sury's apt key (Debian).
@@ -38,14 +45,19 @@
       apt_repository:
         repo: "deb https://packages.sury.org/php/ {{ ansible_distribution_release }} main"
         state: present
-      register: php_ondrej_debian_repo
       when: ansible_distribution == "Debian"
+      notify: update apt cache
 
-    - name: Update apt caches after repo is added (Debian).
-      apt: update_cache=yes
-      when: php_ondrej_debian_repo.changed and (ansible_distribution == "Debian")
+    - meta: flush_handlers
 
   roles:
     - role: geerlingguy.repo-remi
-      when: ansible_os_family == 'RedHat' and ansible_distribution != 'Fedora'
-    - role_under_test
+      when:
+        - ansible_os_family == 'RedHat'
+        - ansible_distribution != 'Fedora'
+    - role: geerlingguy.php
+
+  post_tasks:
+    - name: Confirm PHP configuration is correct.
+      shell: php -i | grep 'memory_limit.*192'
+      changed_when: false
diff --git a/provisioning/roles/geerlingguy.php/tests/requirements.yml b/provisioning/roles/geerlingguy.php/molecule/default/requirements.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.php/tests/requirements.yml
rename to provisioning/roles/geerlingguy.php/molecule/default/requirements.yml
diff --git a/provisioning/roles/geerlingguy.php/molecule/default/tests/test_default.py b/provisioning/roles/geerlingguy.php/molecule/default/tests/test_default.py
new file mode 100644
index 000000000..eedd64a1d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/molecule/default/tests/test_default.py
@@ -0,0 +1,14 @@
+import os
+
+import testinfra.utils.ansible_runner
+
+testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
+    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
+
+
+def test_hosts_file(host):
+    f = host.file('/etc/hosts')
+
+    assert f.exists
+    assert f.user == 'root'
+    assert f.group == 'root'
diff --git a/provisioning/roles/geerlingguy.php/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.php/molecule/default/yaml-lint.yml
new file mode 100644
index 000000000..a3dbc38ee
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/molecule/default/yaml-lint.yml
@@ -0,0 +1,6 @@
+---
+extends: default
+rules:
+  line-length:
+    max: 120
+    level: warning
diff --git a/provisioning/roles/geerlingguy.php/tasks/configure-apcu.yml b/provisioning/roles/geerlingguy.php/tasks/configure-apcu.yml
index 5a3badba2..a29f8d634 100644
--- a/provisioning/roles/geerlingguy.php/tasks/configure-apcu.yml
+++ b/provisioning/roles/geerlingguy.php/tasks/configure-apcu.yml
@@ -22,7 +22,7 @@
     dest: "{{ item }}/{{ php_apc_conf_filename }}"
     owner: root
     group: root
-    force: yes
+    force: true
     mode: 0644
   with_items: "{{ php_extension_conf_paths }}"
   when: php_enable_apc
diff --git a/provisioning/roles/geerlingguy.php/tasks/configure-fpm.yml b/provisioning/roles/geerlingguy.php/tasks/configure-fpm.yml
index c9c08bc32..66db2201d 100644
--- a/provisioning/roles/geerlingguy.php/tasks/configure-fpm.yml
+++ b/provisioning/roles/geerlingguy.php/tasks/configure-fpm.yml
@@ -40,7 +40,7 @@
     owner: root
     group: root
     mode: 0644
-    force: no
+    force: false
   when: php_enable_php_fpm
 
 - name: Configure php-fpm pool (if enabled).
@@ -73,7 +73,7 @@
   service:
     name: "{{ php_fpm_daemon }}"
     state: started
-    enabled: yes
+    enabled: true
   when: php_enable_php_fpm and ansible_distribution != "Debian"
 
 # See: https://github.com/ansible/ansible/issues/22303
@@ -81,6 +81,6 @@
   service:
     name: "{{ php_fpm_daemon }}"
     state: started
-    enabled: yes
+    enabled: true
     use: service
   when: php_enable_php_fpm and ansible_distribution == "Debian"
diff --git a/provisioning/roles/geerlingguy.php/tasks/configure-opcache.yml b/provisioning/roles/geerlingguy.php/tasks/configure-opcache.yml
index cd02e3f18..4ed13edad 100644
--- a/provisioning/roles/geerlingguy.php/tasks/configure-opcache.yml
+++ b/provisioning/roles/geerlingguy.php/tasks/configure-opcache.yml
@@ -22,7 +22,7 @@
     dest: "{{ item }}/{{ php_opcache_conf_filename }}"
     owner: root
     group: root
-    force: yes
+    force: true
     mode: 0644
   with_items: "{{ php_extension_conf_paths }}"
   when: php_opcache_enable
diff --git a/provisioning/roles/geerlingguy.php/tasks/install-from-source.yml b/provisioning/roles/geerlingguy.php/tasks/install-from-source.yml
index 3fefa039d..e999ba001 100644
--- a/provisioning/roles/geerlingguy.php/tasks/install-from-source.yml
+++ b/provisioning/roles/geerlingguy.php/tasks/install-from-source.yml
@@ -1,28 +1,29 @@
 ---
 - name: Ensure dependencies for building from source are installed (RedHat).
-  package: "name={{ item }} state=present"
-  with_items:
-    - autoconf
-    - automake
-    - libtool
-    - bison
-    - make
-    - curl-devel
-    - recode-devel
-    - aspell-devel
-    - libxml2-devel
-    - pkgconfig
-    - libmcrypt-devel
-    - t1lib-devel
-    - libXpm-devel
-    - libpng-devel
-    - libjpeg-turbo-devel
-    - bzip2-devel
-    - openssl-devel
-    - freetype-devel
-    - libicu-devel
-    - mariadb-devel
-    - gmp-devel
+  package:
+    name:
+      - autoconf
+      - automake
+      - libtool
+      - bison
+      - make
+      - curl-devel
+      - recode-devel
+      - aspell-devel
+      - libxml2-devel
+      - pkgconfig
+      - libmcrypt-devel
+      - t1lib-devel
+      - libXpm-devel
+      - libpng-devel
+      - libjpeg-turbo-devel
+      - bzip2-devel
+      - openssl-devel
+      - freetype-devel
+      - libicu-devel
+      - mariadb-devel
+      - gmp-devel
+    state: present
   when: ansible_os_family == 'RedHat'
 
 - name: Update apt cache (Debian).
@@ -30,28 +31,29 @@
   when: ansible_os_family == 'Debian'
 
 - name: Ensure dependencies for building from source are installed (Debian).
-  apt: "pkg={{ item }} state=present"
-  with_items:
-    - build-essential
-    - autoconf
-    - automake
-    - libtool
-    - bison
-    - pkg-config
-    - re2c
-    - libxml2-dev
-    - libcurl4-openssl-dev
-    - libbz2-dev
-    - libjpeg-dev
-    - libpng-dev
-    - libxpm-dev
-    - libfreetype6-dev
-    - libgmp3-dev
-    - libmcrypt-dev
-    - libmysqlclient-dev
-    - libpspell-dev
-    - librecode-dev
-    - libssl-dev
+  apt:
+    name:
+      - build-essential
+      - autoconf
+      - automake
+      - libtool
+      - bison
+      - pkg-config
+      - re2c
+      - libxml2-dev
+      - libcurl4-openssl-dev
+      - libbz2-dev
+      - libjpeg-dev
+      - libpng-dev
+      - libxpm-dev
+      - libfreetype6-dev
+      - libgmp3-dev
+      - libmcrypt-dev
+      - libmysqlclient-dev
+      - libpspell-dev
+      - librecode-dev
+      - libssl-dev
+    state: present
   when: ansible_os_family == 'Debian'
 
 - name: Define php_fpm_daemon (if not defined already).
@@ -81,7 +83,7 @@
     repo: "{{ php_source_repo }}"
     dest: "{{ php_source_clone_dir }}"
     version: "{{ php_source_version }}"
-    accept_hostkey: yes
+    accept_hostkey: true
     depth: "{{ php_source_clone_depth }}"
   when: php_installed.rc != 0
 
@@ -93,19 +95,19 @@
   when: php_installed.rc != 0
 
 - name: Build configure script.
-  shell: >
+  command: >
     ./buildconf --force
     chdir={{ php_source_clone_dir }}
   when: php_installed.rc != 0
 
 - name: Run configure script.
-  shell: >
+  command: >
     {{ php_source_configure_command }}
     chdir={{ php_source_clone_dir }}
   when: php_installed.rc != 0
 
 - name: Make and install PHP.
-  shell: >
+  command: >
     {{ item }}
     chdir={{ php_source_clone_dir }}
   with_items:
diff --git a/provisioning/roles/geerlingguy.php/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.php/tasks/setup-RedHat.yml
index 68ca93143..0ea1e333d 100644
--- a/provisioning/roles/geerlingguy.php/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.php/tasks/setup-RedHat.yml
@@ -3,5 +3,5 @@
   package:
     name: "{{ php_packages }}"
     state: "{{ php_packages_state }}"
-    enablerepo: "{{ php_enablerepo }}"
+    enablerepo: "{{ php_enablerepo | default(omit) }}"
   notify: restart webserver
diff --git a/provisioning/roles/geerlingguy.php/tests/README.md b/provisioning/roles/geerlingguy.php/tests/README.md
deleted file mode 100644
index 6fb211721..000000000
--- a/provisioning/roles/geerlingguy.php/tests/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Ansible Role tests
-
-To run the test playbook(s) in this directory:
-
-  1. Install and start Docker.
-  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
-    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
-  1. Make the test shim executable: `chmod +x tests/test.sh`.
-  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
-
-If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.php/tests/test-source.yml b/provisioning/roles/geerlingguy.php/tests/test-source.yml
deleted file mode 100644
index 7c0d14323..000000000
--- a/provisioning/roles/geerlingguy.php/tests/test-source.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-- hosts: all
-
-  vars:
-    php_enable_webserver: false
-    php_install_from_source: true
-    php_source_clone_dir: /root/php-src
-    php_source_make_command: "make --jobs=2"
-    php_source_version: "php-7.1.17"
-    php_memory_limit: "192M"
-
-  pre_tasks:
-    - name: Update apt cache.
-      apt: update_cache=yes cache_valid_time=600
-      when: ansible_os_family == 'Debian'
-      changed_when: false
-
-  roles:
-    - geerlingguy.git
-    - role_under_test

From 65e2999f161f295ddbbb478a4eda87c747342582 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 8 Oct 2018 17:15:53 -0500
Subject: [PATCH 1025/1273] Update many roles for Ansible 2.7.0 compatibility
 on CentOS.

---
 provisioning/requirements.yml                 | 18 +++---
 .../geerlingguy.apache/tasks/setup-RedHat.yml |  2 +-
 .../geerlingguy.daemonize/tests/test.yml      |  2 +-
 .../roles/geerlingguy.mysql/.gitignore        |  3 +-
 .../roles/geerlingguy.mysql/.travis.yml       | 64 ++++++-------------
 .../roles/geerlingguy.mysql/README.md         |  8 +--
 .../roles/geerlingguy.mysql/defaults/main.yml | 16 ++---
 .../roles/geerlingguy.mysql/meta/main.yml     | 16 +++--
 .../molecule/default/molecule.yml             | 27 ++++++++
 .../molecule/default/playbook.yml             | 16 +++++
 .../molecule/default/yaml-lint.yml            |  6 ++
 .../geerlingguy.mysql/tasks/configure.yml     |  8 +--
 .../geerlingguy.mysql/tasks/replication.yml   |  2 +-
 .../tasks/secure-installation.yml             | 22 ++++---
 .../geerlingguy.mysql/tasks/setup-Debian.yml  |  7 +-
 .../geerlingguy.mysql/tasks/setup-RedHat.yml  | 11 +++-
 .../geerlingguy.mysql/tasks/variables.yml     |  2 +-
 .../roles/geerlingguy.mysql/tests/README.md   | 11 ----
 .../geerlingguy.mysql/tests/centos-7-test.yml | 15 -----
 .../geerlingguy.mysql/tests/initctl_faker     | 23 -------
 .../roles/geerlingguy.mysql/tests/test.yml    | 15 -----
 .../roles/geerlingguy.nginx/.gitignore        |  3 +-
 .../roles/geerlingguy.nginx/.travis.yml       | 40 ++++++------
 .../roles/geerlingguy.nginx/README.md         |  4 +-
 .../roles/geerlingguy.nginx/defaults/main.yml |  7 +-
 .../roles/geerlingguy.nginx/handlers/main.yml |  2 +-
 .../roles/geerlingguy.nginx/meta/main.yml     | 26 ++++----
 .../molecule/default/molecule.yml             | 27 ++++++++
 .../default/playbook.yml}                     |  8 +--
 .../molecule/default/tests/test_default.py    |  0
 .../molecule/default/yaml-lint.yml            |  6 ++
 .../geerlingguy.nginx/tasks/setup-Ubuntu.yml  |  2 +-
 .../roles/geerlingguy.nginx/tasks/vhosts.yml  |  6 +-
 .../roles/geerlingguy.nginx/tests/README.md   | 11 ----
 .../geerlingguy.php-memcached/.gitignore      |  3 +-
 .../geerlingguy.php-memcached/.travis.yml     | 30 +++++----
 .../geerlingguy.php-memcached/meta/main.yml   | 12 ++--
 .../default}/memcached-test.php               |  0
 .../molecule/default/molecule.yml             | 27 ++++++++
 .../molecule/default/playbook.yml             | 19 ++++++
 .../default}/requirements.yml                 |  0
 .../molecule/default/tests/test_default.py    | 14 ++++
 .../molecule/default/yaml-lint.yml            |  6 ++
 .../geerlingguy.php-memcached/tasks/main.yml  |  2 +-
 .../geerlingguy.php-memcached/tests/README.md | 11 ----
 .../geerlingguy.php-memcached/tests/test.yml  | 10 ---
 .../roles/geerlingguy.php-mysql/.gitignore    |  3 +
 .../roles/geerlingguy.php-mysql/.travis.yml   | 53 ++++++---------
 .../roles/geerlingguy.php-mysql/LICENSE       | 20 ++++++
 .../roles/geerlingguy.php-mysql/README.md     |  2 +-
 .../roles/geerlingguy.php-mysql/meta/main.yml |  8 +--
 .../molecule/default/molecule.yml             | 27 ++++++++
 .../molecule/default/playbook.yml             | 25 ++++++++
 .../default}/requirements.yml                 |  0
 .../molecule/default/tests/test_default.py    | 14 ++++
 .../molecule/default/yaml-lint.yml            |  6 ++
 .../geerlingguy.php-mysql/tasks/main.yml      |  2 +-
 .../tests/centos7-vars.yml                    | 11 ----
 .../geerlingguy.php-mysql/tests/test.yml      | 22 -------
 .../roles/geerlingguy.php-pgsql/.gitignore    |  3 +
 .../roles/geerlingguy.php-pgsql/.travis.yml   | 56 ++++++----------
 .../roles/geerlingguy.php-pgsql/LICENSE       | 20 ++++++
 .../roles/geerlingguy.php-pgsql/README.md     |  2 +-
 .../roles/geerlingguy.php-pgsql/meta/main.yml |  8 +--
 .../molecule/default/molecule.yml             | 27 ++++++++
 .../molecule/default/playbook.yml             | 25 ++++++++
 .../default}/requirements.yml                 |  0
 .../molecule/default/tests/test_default.py    | 14 ++++
 .../molecule/default/yaml-lint.yml            |  6 ++
 .../geerlingguy.php-pgsql/tasks/main.yml      |  2 +-
 .../geerlingguy.php-pgsql/tests/test.yml      | 18 ------
 .../roles/geerlingguy.php-redis/.gitignore    |  3 +-
 .../roles/geerlingguy.php-redis/.travis.yml   | 30 +++++----
 .../roles/geerlingguy.php-redis/meta/main.yml | 11 ++--
 .../molecule/default/molecule.yml             | 27 ++++++++
 .../molecule/default/playbook.yml             | 27 ++++++++
 .../default}/redis-test.php                   |  0
 .../default}/requirements.yml                 |  0
 .../molecule/default/yaml-lint.yml            |  6 ++
 .../tasks/install-from-source.yml             |  2 +-
 .../geerlingguy.php-redis/tasks/main.yml      | 10 ++-
 .../geerlingguy.php-redis/tests/README.md     | 11 ----
 .../geerlingguy.php-redis/tests/test.yml      | 18 ------
 .../geerlingguy.php/tasks/setup-RedHat.yml    |  2 +-
 .../roles/geerlingguy.postgresql/.gitignore   |  3 +-
 .../roles/geerlingguy.postgresql/.travis.yml  | 58 ++++++-----------
 .../roles/geerlingguy.postgresql/README.md    |  5 ++
 .../geerlingguy.postgresql/defaults/main.yml  | 59 +++++++++--------
 .../geerlingguy.postgresql/meta/main.yml      |  8 +--
 .../molecule/default/molecule.yml             | 27 ++++++++
 .../default/playbook.yml}                     | 19 ++++--
 .../molecule/default/tests/test_default.py    | 14 ++++
 .../molecule/default/yaml-lint.yml            |  6 ++
 .../tasks/databases.yml                       |  2 +-
 .../tasks/initialize.yml                      |  2 +-
 .../geerlingguy.postgresql/tasks/main.yml     |  4 +-
 .../tasks/setup-RedHat.yml                    |  7 +-
 .../geerlingguy.postgresql/tasks/users.yml    |  2 +-
 .../geerlingguy.postgresql/tests/README.md    | 11 ----
 .../geerlingguy.postgresql/vars/Debian-7.yml  |  2 +-
 .../roles/geerlingguy.repo-dotdeb/.travis.yml | 44 -------------
 .../roles/geerlingguy.repo-dotdeb/README.md   | 38 -----------
 .../geerlingguy.repo-dotdeb/defaults/main.yml |  5 --
 .../geerlingguy.repo-dotdeb/meta/main.yml     | 15 -----
 .../geerlingguy.repo-dotdeb/tasks/main.yml    | 15 -----
 .../geerlingguy.repo-dotdeb/tests/test.yml    |  5 --
 106 files changed, 783 insertions(+), 659 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.mysql/molecule/default/molecule.yml
 create mode 100644 provisioning/roles/geerlingguy.mysql/molecule/default/playbook.yml
 create mode 100644 provisioning/roles/geerlingguy.mysql/molecule/default/yaml-lint.yml
 delete mode 100644 provisioning/roles/geerlingguy.mysql/tests/README.md
 delete mode 100644 provisioning/roles/geerlingguy.mysql/tests/centos-7-test.yml
 delete mode 100644 provisioning/roles/geerlingguy.mysql/tests/initctl_faker
 delete mode 100644 provisioning/roles/geerlingguy.mysql/tests/test.yml
 create mode 100644 provisioning/roles/geerlingguy.nginx/molecule/default/molecule.yml
 rename provisioning/roles/geerlingguy.nginx/{tests/test.yml => molecule/default/playbook.yml} (74%)
 rename provisioning/roles/{geerlingguy.apache => geerlingguy.nginx}/molecule/default/tests/test_default.py (100%)
 create mode 100644 provisioning/roles/geerlingguy.nginx/molecule/default/yaml-lint.yml
 delete mode 100644 provisioning/roles/geerlingguy.nginx/tests/README.md
 rename provisioning/roles/geerlingguy.php-memcached/{tests => molecule/default}/memcached-test.php (100%)
 create mode 100644 provisioning/roles/geerlingguy.php-memcached/molecule/default/molecule.yml
 create mode 100644 provisioning/roles/geerlingguy.php-memcached/molecule/default/playbook.yml
 rename provisioning/roles/geerlingguy.php-memcached/{tests => molecule/default}/requirements.yml (100%)
 create mode 100644 provisioning/roles/geerlingguy.php-memcached/molecule/default/tests/test_default.py
 create mode 100644 provisioning/roles/geerlingguy.php-memcached/molecule/default/yaml-lint.yml
 delete mode 100644 provisioning/roles/geerlingguy.php-memcached/tests/README.md
 delete mode 100644 provisioning/roles/geerlingguy.php-memcached/tests/test.yml
 create mode 100644 provisioning/roles/geerlingguy.php-mysql/.gitignore
 create mode 100644 provisioning/roles/geerlingguy.php-mysql/LICENSE
 create mode 100644 provisioning/roles/geerlingguy.php-mysql/molecule/default/molecule.yml
 create mode 100644 provisioning/roles/geerlingguy.php-mysql/molecule/default/playbook.yml
 rename provisioning/roles/geerlingguy.php-mysql/{tests => molecule/default}/requirements.yml (100%)
 create mode 100644 provisioning/roles/geerlingguy.php-mysql/molecule/default/tests/test_default.py
 create mode 100644 provisioning/roles/geerlingguy.php-mysql/molecule/default/yaml-lint.yml
 delete mode 100644 provisioning/roles/geerlingguy.php-mysql/tests/centos7-vars.yml
 delete mode 100644 provisioning/roles/geerlingguy.php-mysql/tests/test.yml
 create mode 100644 provisioning/roles/geerlingguy.php-pgsql/.gitignore
 create mode 100644 provisioning/roles/geerlingguy.php-pgsql/LICENSE
 create mode 100644 provisioning/roles/geerlingguy.php-pgsql/molecule/default/molecule.yml
 create mode 100644 provisioning/roles/geerlingguy.php-pgsql/molecule/default/playbook.yml
 rename provisioning/roles/geerlingguy.php-pgsql/{tests => molecule/default}/requirements.yml (100%)
 create mode 100644 provisioning/roles/geerlingguy.php-pgsql/molecule/default/tests/test_default.py
 create mode 100644 provisioning/roles/geerlingguy.php-pgsql/molecule/default/yaml-lint.yml
 delete mode 100644 provisioning/roles/geerlingguy.php-pgsql/tests/test.yml
 create mode 100644 provisioning/roles/geerlingguy.php-redis/molecule/default/molecule.yml
 create mode 100644 provisioning/roles/geerlingguy.php-redis/molecule/default/playbook.yml
 rename provisioning/roles/geerlingguy.php-redis/{tests => molecule/default}/redis-test.php (100%)
 rename provisioning/roles/geerlingguy.php-redis/{tests => molecule/default}/requirements.yml (100%)
 create mode 100644 provisioning/roles/geerlingguy.php-redis/molecule/default/yaml-lint.yml
 delete mode 100644 provisioning/roles/geerlingguy.php-redis/tests/README.md
 delete mode 100644 provisioning/roles/geerlingguy.php-redis/tests/test.yml
 create mode 100644 provisioning/roles/geerlingguy.postgresql/molecule/default/molecule.yml
 rename provisioning/roles/geerlingguy.postgresql/{tests/test.yml => molecule/default/playbook.yml} (50%)
 create mode 100644 provisioning/roles/geerlingguy.postgresql/molecule/default/tests/test_default.py
 create mode 100644 provisioning/roles/geerlingguy.postgresql/molecule/default/yaml-lint.yml
 delete mode 100644 provisioning/roles/geerlingguy.postgresql/tests/README.md
 delete mode 100644 provisioning/roles/geerlingguy.repo-dotdeb/.travis.yml
 delete mode 100644 provisioning/roles/geerlingguy.repo-dotdeb/README.md
 delete mode 100644 provisioning/roles/geerlingguy.repo-dotdeb/defaults/main.yml
 delete mode 100644 provisioning/roles/geerlingguy.repo-dotdeb/meta/main.yml
 delete mode 100644 provisioning/roles/geerlingguy.repo-dotdeb/tasks/main.yml
 delete mode 100644 provisioning/roles/geerlingguy.repo-dotdeb/tests/test.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 4f657842d..79a90cf4c 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -8,7 +8,7 @@
 - src: geerlingguy.adminer
   version: 1.2.0
 - src: geerlingguy.apache
-  version: 3.0.1
+  version: 3.0.2
 - src: geerlingguy.apache-php-fpm
   version: 1.1.0
 - src: geerlingguy.blackfire
@@ -36,23 +36,23 @@
 - src: geerlingguy.memcached
   version: 1.0.8
 - src: geerlingguy.mysql
-  version: 2.9.2
+  version: 2.9.4
 - src: geerlingguy.nginx
-  version: 2.6.0
+  version: 2.6.1
 - src: geerlingguy.nodejs
   version: 4.2.2
 - src: geerlingguy.php
-  version: 3.6.2
+  version: 3.6.3
 - src: geerlingguy.php-memcached
-  version: 2.0.1
+  version: 2.0.2
 - src: geerlingguy.php-mysql
-  version: 2.0.1
+  version: 2.0.2
 - src: geerlingguy.php-pecl
   version: 1.4.0
 - src: geerlingguy.php-pgsql
-  version: 1.0.0
+  version: 1.0.1
 - src: geerlingguy.php-redis
-  version: 3.2.0
+  version: 3.2.1
 - src: geerlingguy.php-tideways
   version: 2.1.0
 - src: geerlingguy.php-versions
@@ -66,7 +66,7 @@
 - src: geerlingguy.postfix
   version: 2.0.0
 - src: geerlingguy.postgresql
-  version: 1.4.3
+  version: 1.4.4
 - src: geerlingguy.redis
   version: 1.6.0
 - src: geerlingguy.repo-remi
diff --git a/provisioning/roles/geerlingguy.apache/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.apache/tasks/setup-RedHat.yml
index 0c39dbedb..f9c2fc683 100644
--- a/provisioning/roles/geerlingguy.apache/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.apache/tasks/setup-RedHat.yml
@@ -3,4 +3,4 @@
   yum:
     name: "{{ apache_packages }}"
     state: "{{ apache_packages_state }}"
-    enablerepo: "{{ apache_enablerepo | default(omit) }}"
+    enablerepo: "{{ apache_enablerepo | default(omit, true) }}"
diff --git a/provisioning/roles/geerlingguy.daemonize/tests/test.yml b/provisioning/roles/geerlingguy.daemonize/tests/test.yml
index 3b4e619d7..9d3720595 100644
--- a/provisioning/roles/geerlingguy.daemonize/tests/test.yml
+++ b/provisioning/roles/geerlingguy.daemonize/tests/test.yml
@@ -16,7 +16,7 @@
       changed_when: false
 
     - name: Ensure build dependencies are installed (Debian).
-      apt: 'name="{{ item }}" state=present'
+      apt: 'name="{{ item }}" state=installed'
       with_items:
         - build-essential
         - unzip
diff --git a/provisioning/roles/geerlingguy.mysql/.gitignore b/provisioning/roles/geerlingguy.mysql/.gitignore
index c9b2377e3..f56f5b578 100644
--- a/provisioning/roles/geerlingguy.mysql/.gitignore
+++ b/provisioning/roles/geerlingguy.mysql/.gitignore
@@ -1,2 +1,3 @@
 *.retry
-tests/test.sh
+*/__pycache__
+*.pyc
diff --git a/provisioning/roles/geerlingguy.mysql/.travis.yml b/provisioning/roles/geerlingguy.mysql/.travis.yml
index 04f1df2cb..2c8286ffe 100644
--- a/provisioning/roles/geerlingguy.mysql/.travis.yml
+++ b/provisioning/roles/geerlingguy.mysql/.travis.yml
@@ -1,54 +1,30 @@
 ---
+language: python
 services: docker
 
 env:
-  - distro: centos7
-    playbook: centos-7-test.yml
-  - distro: centos6
-    playbook: test.yml
-  - distro: debian8
-    playbook: test.yml
-  - distro: ubuntu1604
-    playbook: test.yml
-  - distro: ubuntu1404
-    playbook: test.yml
+  global:
+    - ROLE_NAME: mysql
+  matrix:
+    - MOLECULE_DISTRO: centos7
+      MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
+    - MOLECULE_DISTRO: centos6
+    - MOLECULE_DISTRO: ubuntu1604
+    - MOLECULE_DISTRO: debian8
+
+install:
+  # Install test dependencies.
+  - pip install molecule docker
+
+before_script:
+  # Use actual Ansible Galaxy role name for the project directory.
+  - cd ../
+  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
+  - cd geerlingguy.$ROLE_NAME
 
 script:
-  # Configure test script so we can run extra tests after playbook is run.
-  - export container_id=$(date +%s)
-  - export cleanup=false
-
-  # Download test shim.
-  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
-  - chmod +x ${PWD}/tests/test.sh
-
   # Run tests.
-  - ${PWD}/tests/test.sh
-
-  # Some MySQL debugging (show all the logs).
-  - docker exec --tty ${container_id} env TERM=xterm ls -lah /var/log
-  - docker exec --tty ${container_id} env TERM=xterm cat /var/log/mysql/error.log || true
-  - docker exec --tty ${container_id} env TERM=xterm cat /var/log/mysql.err || true
-
-  # Check to make sure we can connect to MySQL via Unix socket.
-  - >
-    sudo docker exec ${container_id} mysql -u root -proot -e 'show databases;'
-    | grep -q 'information_schema'
-    && (echo 'MySQL running normally' && exit 0)
-    || (echo 'MySQL not running' && exit 1)
-
-  # Check to make sure we can connect to MySQL via TCP.
-  - >
-    sudo docker exec ${container_id} mysql -u root -proot -h 127.0.0.1 -e 'show databases;'
-    | grep -q 'information_schema'
-    && (echo 'MySQL running normally' && exit 0)
-    || (echo 'MySQL not running' && exit 1)
-
-after_failure:
-  # Check MySQL settings.
-  - 'docker exec --tty ${container_id} env TERM=xterm cat /var/log/mysql/error.log'
-  - 'docker exec --tty ${container_id} env TERM=xterm cat /var/log/mysql.err'
-  - 'docker exec --tty ${container_id} env TERM=xterm cat /var/log/mysql.log'
+  - molecule test
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.mysql/README.md b/provisioning/roles/geerlingguy.mysql/README.md
index 53f3d182e..ad2cd00de 100644
--- a/provisioning/roles/geerlingguy.mysql/README.md
+++ b/provisioning/roles/geerlingguy.mysql/README.md
@@ -29,7 +29,7 @@ The home directory inside which Python MySQL settings will be stored, which Ansi
 
 The MySQL root user account details.
 
-    mysql_root_password_update: no
+    mysql_root_password_update: false
 
 Whether to force update the MySQL root user's password. By default, this role will only change the root user's password when MySQL is first configured. You can force an update by setting this to `yes`.
 
@@ -37,7 +37,7 @@ Whether to force update the MySQL root user's password. By default, this role wi
 
 > Note: If you get an error like `ERROR 1698 (28000): Access denied for user 'root'@'localhost' (using password: YES)` when trying to log in from the CLI you might need to run as root or sudoer.
 
-    mysql_enabled_on_startup: yes
+    mysql_enabled_on_startup: true
 
 Whether MySQL should be enabled on startup.
 
@@ -46,7 +46,7 @@ Whether MySQL should be enabled on startup.
     
 The main my.cnf configuration file and include directory.
 
-    overwrite_global_mycnf: yes
+    overwrite_global_mycnf: true
 
 Whether the global my.cnf should be overwritten each time this role is run. Setting this to `no` tells Ansible to only create the `my.cnf` file if it doesn't exist. This should be left at its default value (`yes`) if you'd like to use this role's variables to configure MySQL.
 
@@ -99,7 +99,7 @@ Default MySQL connection configuration.
 
 MySQL logging configuration. Setting `mysql_log` (the general query log) or `mysql_log_error` to `syslog` will make MySQL log to syslog using the `mysql_syslog_tag`.
 
-    mysql_slow_query_log_enabled: no
+    mysql_slow_query_log_enabled: false
     mysql_slow_query_log_file: *default value depends on OS*
     mysql_slow_query_time: 2
 
diff --git a/provisioning/roles/geerlingguy.mysql/defaults/main.yml b/provisioning/roles/geerlingguy.mysql/defaults/main.yml
index 28ff187f1..f79f82374 100644
--- a/provisioning/roles/geerlingguy.mysql/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.mysql/defaults/main.yml
@@ -10,14 +10,14 @@ mysql_root_home: /root
 mysql_root_username: root
 mysql_root_password: root
 
-# Set this to `yes` to forcibly update the root password.
-mysql_root_password_update: no
-mysql_user_password_update: no
+# Set this to `true` to forcibly update the root password.
+mysql_root_password_update: false
+mysql_user_password_update: false
 
-mysql_enabled_on_startup: yes
+mysql_enabled_on_startup: true
 
-# update my.cnf. each time role is run? yes | no
-overwrite_global_mycnf: yes
+# Whether my.cnf should be updated on every run.
+overwrite_global_mycnf: true
 
 # The following variables have a default value depending on operating system.
 # mysql_config_file: /etc/my.cnf
@@ -37,7 +37,7 @@ mysql_enablerepo: ""
 # MySQL connection settings.
 mysql_port: "3306"
 mysql_bind_address: '0.0.0.0'
-mysql_skip_name_resolve: no
+mysql_skip_name_resolve: false
 mysql_datadir: /var/lib/mysql
 mysql_sql_mode: ''
 # The following variables have a default value depending on operating system.
@@ -48,7 +48,7 @@ mysql_sql_mode: ''
 mysql_log_file_group: mysql
 
 # Slow query log settings.
-mysql_slow_query_log_enabled: no
+mysql_slow_query_log_enabled: false
 mysql_slow_query_time: "2"
 # The following variable has a default value depending on operating system.
 # mysql_slow_query_log_file: /var/log/mysql-slow.log
diff --git a/provisioning/roles/geerlingguy.mysql/meta/main.yml b/provisioning/roles/geerlingguy.mysql/meta/main.yml
index d87d8d2f2..d95f6cc3e 100644
--- a/provisioning/roles/geerlingguy.mysql/meta/main.yml
+++ b/provisioning/roles/geerlingguy.mysql/meta/main.yml
@@ -6,20 +6,24 @@ galaxy_info:
   description: MySQL server for RHEL/CentOS and Debian/Ubuntu.
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 2.2
+  min_ansible_version: 2.4
   platforms:
     - name: EL
       versions:
-      - 6
-      - 7
+        - 6
+        - 7
     - name: Ubuntu
       versions:
-      - all
+        - all
     - name: Debian
       versions:
-      - all
+        - all
     - name: Archlinux
       versions:
-      - all
+        - all
   galaxy_tags:
     - database
+    - mysql
+    - mariadb
+    - db
+    - sql
diff --git a/provisioning/roles/geerlingguy.mysql/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.mysql/molecule/default/molecule.yml
new file mode 100644
index 000000000..033970241
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/molecule/default/molecule.yml
@@ -0,0 +1,27 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint:
+  name: yamllint
+  options:
+    config-file: molecule/default/yaml-lint.yml
+platforms:
+  - name: instance
+    image: geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible
+    command: ${MOLECULE_DOCKER_COMMAND:-"sleep infinity"}
+    privileged: true
+    pre_build_image: true
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+  playbooks:
+    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
+scenario:
+  name: default
+verifier:
+  name: testinfra
+  lint:
+    name: flake8
diff --git a/provisioning/roles/geerlingguy.mysql/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.mysql/molecule/default/playbook.yml
new file mode 100644
index 000000000..c83b10216
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/molecule/default/playbook.yml
@@ -0,0 +1,16 @@
+---
+- name: Converge
+  hosts: all
+  become: true
+
+  roles:
+    - role: geerlingguy.mysql
+
+  post_tasks:
+    - name: Make sure we can connect to MySQL via Unix socket.
+      command: "mysql -u root -proot -e 'show databases;'"
+      changed_when: false
+
+    - name: Make sure we can connect to MySQL via TCP.
+      command: "mysql -u root -proot -h 127.0.0.1 -e 'show databases;'"
+      changed_when: false
diff --git a/provisioning/roles/geerlingguy.mysql/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.mysql/molecule/default/yaml-lint.yml
new file mode 100644
index 000000000..c9aab08bf
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/molecule/default/yaml-lint.yml
@@ -0,0 +1,6 @@
+---
+extends: default
+rules:
+  line-length:
+    max: 150
+    level: warning
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/configure.yml b/provisioning/roles/geerlingguy.mysql/tasks/configure.yml
index dca970f02..c9d106240 100644
--- a/provisioning/roles/geerlingguy.mysql/tasks/configure.yml
+++ b/provisioning/roles/geerlingguy.mysql/tasks/configure.yml
@@ -3,7 +3,7 @@
   command: 'mysql --version'
   register: mysql_cli_version
   changed_when: false
-  check_mode: no
+  check_mode: false
 
 - name: Copy my.cnf global MySQL configuration.
   template:
@@ -39,7 +39,7 @@
   command: "touch {{ mysql_slow_query_log_file }}"
   args:
     creates: "{{ mysql_slow_query_log_file }}"
-    warn: no
+    warn: false
   when: mysql_slow_query_log_enabled
 
 - name: Create datadir if it does not exist
@@ -48,7 +48,7 @@
     state: directory
     owner: mysql
     group: mysql
-    mode:  0755
+    mode: 0755
     setype: mysqld_db_t
 
 - name: Set ownership on slow query log file (if configured).
@@ -64,7 +64,7 @@
   command: "touch {{ mysql_log_error }}"
   args:
     creates: "{{ mysql_log_error }}"
-    warn: no
+    warn: false
   when: mysql_log == "" and mysql_log_error != ""
 
 - name: Set ownership on error log file (if configured).
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/replication.yml b/provisioning/roles/geerlingguy.mysql/tasks/replication.yml
index e584587eb..322546f80 100644
--- a/provisioning/roles/geerlingguy.mysql/tasks/replication.yml
+++ b/provisioning/roles/geerlingguy.mysql/tasks/replication.yml
@@ -39,7 +39,7 @@
     master_password: "{{ mysql_replication_user.password }}"
     master_log_file: "{{ master.File }}"
     master_log_pos: "{{ master.Position }}"
-  ignore_errors: True
+  ignore_errors: true
   when: >
     ((slave.Is_Slave is defined and not slave.Is_Slave) or (slave.Is_Slave is not defined and slave is failed))
     and (mysql_replication_role == 'slave')
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/secure-installation.yml b/provisioning/roles/geerlingguy.mysql/tasks/secure-installation.yml
index 78e85f3f0..66ee4d9de 100644
--- a/provisioning/roles/geerlingguy.mysql/tasks/secure-installation.yml
+++ b/provisioning/roles/geerlingguy.mysql/tasks/secure-installation.yml
@@ -15,7 +15,9 @@
     dest: "{{ mysql_user_home }}/.my.cnf"
     owner: "{{ mysql_user_name }}"
     mode: 0600
-  when: mysql_user_name != mysql_root_username and (mysql_install_packages | bool or mysql_user_password_update)
+  when: >
+    mysql_user_name != mysql_root_username
+    and (mysql_install_packages | bool or mysql_user_password_update)
 
 - name: Disallow root login remotely
   command: 'mysql -NBe "{{ item }}"'
@@ -27,7 +29,7 @@
   command: mysql -NBe "SELECT Host FROM mysql.user WHERE User = '{{ mysql_root_username }}' ORDER BY (Host='localhost') ASC"
   register: mysql_root_hosts
   changed_when: false
-  check_mode: no
+  check_mode: false
   when: mysql_install_packages | bool or mysql_root_password_update
 
 # Note: We do not use mysql_user for this operation, as it doesn't always update
@@ -38,7 +40,9 @@
     mysql -u root -NBe
     'ALTER USER "{{ mysql_root_username }}"@"{{ item }}" IDENTIFIED WITH mysql_native_password BY "{{ mysql_root_password }}";'
   with_items: "{{ mysql_root_hosts.stdout_lines|default([]) }}"
-  when: ((mysql_install_packages | bool) or mysql_root_password_update) and ('5.7.' in mysql_cli_version.stdout or '8.0.' in mysql_cli_version.stdout)
+  when: >
+    ((mysql_install_packages | bool) or mysql_root_password_update)
+    and ('5.7.' in mysql_cli_version.stdout or '8.0.' in mysql_cli_version.stdout)
 
 # Set root password for MySQL < 5.7.x.
 - name: Update MySQL root password for localhost root account (< 5.7.x).
@@ -46,7 +50,9 @@
     mysql -NBe
     'SET PASSWORD FOR "{{ mysql_root_username }}"@"{{ item }}" = PASSWORD("{{ mysql_root_password }}");'
   with_items: "{{ mysql_root_hosts.stdout_lines|default([]) }}"
-  when: ((mysql_install_packages | bool) or mysql_root_password_update) and ('5.7.' not in mysql_cli_version.stdout and '8.0.' not in mysql_cli_version.stdout)
+  when: >
+    ((mysql_install_packages | bool) or mysql_root_password_update)
+    and ('5.7.' not in mysql_cli_version.stdout and '8.0.' not in mysql_cli_version.stdout)
 
 # Has to be after the root password assignment, for idempotency.
 - name: Copy .my.cnf file with root password credentials.
@@ -62,13 +68,13 @@
   command: mysql -NBe 'SELECT Host FROM mysql.user WHERE User = ""'
   register: mysql_anonymous_hosts
   changed_when: false
-  check_mode: no
+  check_mode: false
 
 - name: Remove anonymous MySQL users.
   mysql_user:
-     name: ""
-     host: "{{ item }}"
-     state: absent
+    name: ""
+    host: "{{ item }}"
+    state: absent
   with_items: "{{ mysql_anonymous_hosts.stdout_lines|default([]) }}"
 
 - name: Remove MySQL test database.
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.mysql/tasks/setup-Debian.yml
index 241a45c08..a99b44b67 100644
--- a/provisioning/roles/geerlingguy.mysql/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.mysql/tasks/setup-Debian.yml
@@ -15,8 +15,7 @@
   apt: "name={{ deb_mysql_python_package }} state=present"
 
 - name: Ensure MySQL packages are installed.
-  apt: "name={{ item }} state=present"
-  with_items: "{{ mysql_packages }}"
+  apt: "name={{ mysql_packages }} state=present"
   register: deb_mysql_install_packages
 
 # Because Ubuntu starts MySQL as part of the install process, we need to stop
@@ -28,6 +27,6 @@
 - name: Delete innodb log files created by apt package after initial install.
   file: path={{ mysql_datadir }}/{{item}} state=absent
   with_items:
-          - "ib_logfile0"
-          - "ib_logfile1"
+    - "ib_logfile0"
+    - "ib_logfile1"
   when: mysql_installed.stat.exists == false
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.mysql/tasks/setup-RedHat.yml
index 2dadf2273..a80aae259 100644
--- a/provisioning/roles/geerlingguy.mysql/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.mysql/tasks/setup-RedHat.yml
@@ -1,8 +1,13 @@
 ---
 - name: Ensure MySQL packages are installed.
-  yum: "name={{ item }} state=present enablerepo={{ mysql_enablerepo }}"
-  with_items: "{{ mysql_packages }}"
+  yum:
+    name: "{{ mysql_packages }}"
+    state: present
+    enablerepo: "{{ mysql_enablerepo | default(omit, true) }}"
   register: rh_mysql_install_packages
 
 - name: Ensure MySQL Python libraries are installed.
-  yum: "name=MySQL-python state=present enablerepo={{ mysql_enablerepo }}"
+  yum:
+    name: MySQL-python
+    state: present
+    enablerepo: "{{ mysql_enablerepo | default(omit, true) }}"
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/variables.yml b/provisioning/roles/geerlingguy.mysql/tasks/variables.yml
index 00c5964e1..4f0d29855 100644
--- a/provisioning/roles/geerlingguy.mysql/tasks/variables.yml
+++ b/provisioning/roles/geerlingguy.mysql/tasks/variables.yml
@@ -4,7 +4,7 @@
   include_vars: "{{ item }}"
   with_first_found:
     - files:
-      - "vars/{{ ansible_os_family }}.yml"
+        - "vars/{{ ansible_os_family }}.yml"
       skip: true
   when: ansible_os_family != "RedHat"
 
diff --git a/provisioning/roles/geerlingguy.mysql/tests/README.md b/provisioning/roles/geerlingguy.mysql/tests/README.md
deleted file mode 100644
index 6fb211721..000000000
--- a/provisioning/roles/geerlingguy.mysql/tests/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Ansible Role tests
-
-To run the test playbook(s) in this directory:
-
-  1. Install and start Docker.
-  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
-    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
-  1. Make the test shim executable: `chmod +x tests/test.sh`.
-  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
-
-If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.mysql/tests/centos-7-test.yml b/provisioning/roles/geerlingguy.mysql/tests/centos-7-test.yml
deleted file mode 100644
index 57a617147..000000000
--- a/provisioning/roles/geerlingguy.mysql/tests/centos-7-test.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-- hosts: all
-  vars:
-    mysql_packages:
-      - mariadb
-      - mariadb-server
-      - mariadb-libs
-      - MySQL-python
-      - perl-DBD-MySQL
-    mysql_daemon: mariadb
-    mysql_log_error: /var/log/mariadb/mariadb.log
-    mysql_syslog_tag: mariadb
-    mysql_pid_file: /var/run/mariadb/mariadb.pid
-  roles:
-    - role_under_test
diff --git a/provisioning/roles/geerlingguy.mysql/tests/initctl_faker b/provisioning/roles/geerlingguy.mysql/tests/initctl_faker
deleted file mode 100644
index a2267f30d..000000000
--- a/provisioning/roles/geerlingguy.mysql/tests/initctl_faker
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-ALIAS_CMD="$(echo ""$0"" | sed -e 's?/sbin/??')"
-
-case "$ALIAS_CMD" in
-    start|stop|restart|reload|status)
-        exec service $1 $ALIAS_CMD
-        ;;
-esac
-
-case "$1" in
-    list )
-        exec service --status-all
-        ;;
-    reload-configuration )
-        exec service $2 restart
-        ;;
-    start|stop|restart|reload|status)
-        exec service $2 $1
-        ;;
-    \?)
-        exit 0
-        ;;
-esac
diff --git a/provisioning/roles/geerlingguy.mysql/tests/test.yml b/provisioning/roles/geerlingguy.mysql/tests/test.yml
deleted file mode 100644
index 97643828f..000000000
--- a/provisioning/roles/geerlingguy.mysql/tests/test.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-- hosts: all
-
-  pre_tasks:
-    - name: Copy initctl_faker into place for Ubuntu 14.04.
-      copy:
-        src: initctl_faker
-        dest: /sbin/initctl
-        mode: 0755
-        force: yes
-      when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '14.04'
-      changed_when: false
-
-  roles:
-    - role_under_test
diff --git a/provisioning/roles/geerlingguy.nginx/.gitignore b/provisioning/roles/geerlingguy.nginx/.gitignore
index c9b2377e3..f56f5b578 100644
--- a/provisioning/roles/geerlingguy.nginx/.gitignore
+++ b/provisioning/roles/geerlingguy.nginx/.gitignore
@@ -1,2 +1,3 @@
 *.retry
-tests/test.sh
+*/__pycache__
+*.pyc
diff --git a/provisioning/roles/geerlingguy.nginx/.travis.yml b/provisioning/roles/geerlingguy.nginx/.travis.yml
index 5d3b1bec7..063107887 100644
--- a/provisioning/roles/geerlingguy.nginx/.travis.yml
+++ b/provisioning/roles/geerlingguy.nginx/.travis.yml
@@ -1,31 +1,31 @@
 ---
+language: python
 services: docker
 
 env:
-  - distro: centos7
-  - distro: ubuntu1604
-  - distro: ubuntu1404
-  - distro: debian9
-  - distro: debian8
+  global:
+    - ROLE_NAME: nginx
+  matrix:
+    - MOLECULE_DISTRO: centos7
+      MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
+    - MOLECULE_DISTRO: ubuntu1604
+    - MOLECULE_DISTRO: ubuntu1404
+    - MOLECULE_DISTRO: debian9
+    - MOLECULE_DISTRO: debian8
 
-script:
-  # Configure test script so we can run extra tests after playbook is run.
-  - export container_id=$(date +%s)
-  - export cleanup=false
+install:
+  # Install test dependencies.
+  - pip install molecule docker
 
-  # Download test shim.
-  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
-  - chmod +x ${PWD}/tests/test.sh
+before_script:
+  # Use actual Ansible Galaxy role name for the project directory.
+  - cd ../
+  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
+  - cd geerlingguy.$ROLE_NAME
 
+script:
   # Run tests.
-  - ${PWD}/tests/test.sh
-
-  # Setup test site.
-  - 'docker exec ${container_id} mkdir -p /var/www/test'
-  - 'docker exec ${container_id} bash -c "echo Success >| /var/www/test/index.html"'
-
-  # Make sure virtualhost exists.
-  - 'docker exec --tty ${container_id} env TERM=xterm curl http://localhost/ | grep "Success"'
+  - molecule test
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.nginx/README.md b/provisioning/roles/geerlingguy.nginx/README.md
index 04223bff2..d8f45db2f 100644
--- a/provisioning/roles/geerlingguy.nginx/README.md
+++ b/provisioning/roles/geerlingguy.nginx/README.md
@@ -2,6 +2,8 @@
 
 [![Build Status](https://travis-ci.org/geerlingguy/ansible-role-nginx.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-nginx)
 
+**Note:** Please consider using the official [NGINX Ansible role](https://github.com/nginxinc/ansible-role-nginx) from NGINX, Inc.
+
 Installs Nginx on RedHat/CentOS, Debian/Ubuntu, Archlinux, FreeBSD or OpenBSD servers.
 
 This role installs and configures the latest version of Nginx from the Nginx yum repository (on RedHat-based systems), apt (on Debian-based systems), pacman (Archlinux), pkgng (on FreeBSD systems) or pkg_add (on OpenBSD systems). You will likely need to do extra setup work after this role has installed Nginx, like adding your own [virtualhost].conf file inside `/etc/nginx/conf.d/`, describing the location and options to use for your particular website.
@@ -128,7 +130,7 @@ Extra lines to be inserted in the top of `nginx.conf`. The value should be defin
 
 See the template in `templates/nginx.conf.j2` for more details on the placement.
 
-    nginx_log_format: |
+    nginx_log_format: |-
       '$remote_addr - $remote_user [$time_local] "$request" '
       '$status $body_bytes_sent "$http_referer" '
       '"$http_user_agent" "$http_x_forwarded_for"'
diff --git a/provisioning/roles/geerlingguy.nginx/defaults/main.yml b/provisioning/roles/geerlingguy.nginx/defaults/main.yml
index 73100c571..cbce58a35 100644
--- a/provisioning/roles/geerlingguy.nginx/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.nginx/defaults/main.yml
@@ -15,7 +15,8 @@ nginx_package_name: "nginx"
 nginx_conf_template: "nginx.conf.j2"
 nginx_vhost_template: "vhost.j2"
 
-nginx_worker_processes: "{{ ansible_processor_vcpus | default(ansible_processor_count) }}"
+nginx_worker_processes: >-
+  "{{ ansible_processor_vcpus | default(ansible_processor_count) }}"
 nginx_worker_connections: "1024"
 nginx_multi_accept: "off"
 
@@ -59,7 +60,7 @@ nginx_vhosts: []
 #   server_name: "example.com" # default: N/A
 #   root: "/var/www/example.com" # default: N/A
 #   index: "index.html index.htm" # default: "index.html index.htm"
-#   filename: "example.com.conf" # Can be used to set the filename of the vhost file.
+#   filename: "example.com.conf" # Can be used to set the vhost filename.
 #
 #   # Properties that are only added if defined:
 #   server_name_redirect: "www.example.com" # default: N/A
@@ -80,7 +81,7 @@ nginx_upstreams: []
 #     "srv3.example.com"
 #   }
 
-nginx_log_format: |
+nginx_log_format: |-
   '$remote_addr - $remote_user [$time_local] "$request" '
   '$status $body_bytes_sent "$http_referer" '
   '"$http_user_agent" "$http_x_forwarded_for"'
diff --git a/provisioning/roles/geerlingguy.nginx/handlers/main.yml b/provisioning/roles/geerlingguy.nginx/handlers/main.yml
index 3f6d02478..2db781ee4 100644
--- a/provisioning/roles/geerlingguy.nginx/handlers/main.yml
+++ b/provisioning/roles/geerlingguy.nginx/handlers/main.yml
@@ -4,7 +4,7 @@
 
 - name: validate nginx configuration
   command: nginx -t -c /etc/nginx/nginx.conf
-  changed_when: False
+  changed_when: false
 
 - name: reload nginx
   service: name=nginx state=reloaded
diff --git a/provisioning/roles/geerlingguy.nginx/meta/main.yml b/provisioning/roles/geerlingguy.nginx/meta/main.yml
index da5e3486f..b258974df 100644
--- a/provisioning/roles/geerlingguy.nginx/meta/main.yml
+++ b/provisioning/roles/geerlingguy.nginx/meta/main.yml
@@ -10,29 +10,29 @@ galaxy_info:
   platforms:
     - name: EL
       versions:
-      - 6
-      - 7
+        - 6
+        - 7
     - name: Debian
       versions:
-      - all
+        - all
     - name: Ubuntu
       versions:
-      - trusty
-      - xenial
+        - trusty
+        - xenial
     - name: Archlinux
       versions:
-      - all
+        - all
     - name: FreeBSD
       versions:
-      - 10.3
-      - 10.2
-      - 10.1
-      - 10.0
-      - 9.3
+        - 10.3
+        - 10.2
+        - 10.1
+        - 10.0
+        - 9.3
     - name: OpenBSD
       versions:
-      - 5.9
-      - 6.0
+        - 5.9
+        - 6.0
   galaxy_tags:
     - development
     - web
diff --git a/provisioning/roles/geerlingguy.nginx/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.nginx/molecule/default/molecule.yml
new file mode 100644
index 000000000..033970241
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nginx/molecule/default/molecule.yml
@@ -0,0 +1,27 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint:
+  name: yamllint
+  options:
+    config-file: molecule/default/yaml-lint.yml
+platforms:
+  - name: instance
+    image: geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible
+    command: ${MOLECULE_DOCKER_COMMAND:-"sleep infinity"}
+    privileged: true
+    pre_build_image: true
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+  playbooks:
+    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
+scenario:
+  name: default
+verifier:
+  name: testinfra
+  lint:
+    name: flake8
diff --git a/provisioning/roles/geerlingguy.nginx/tests/test.yml b/provisioning/roles/geerlingguy.nginx/molecule/default/playbook.yml
similarity index 74%
rename from provisioning/roles/geerlingguy.nginx/tests/test.yml
rename to provisioning/roles/geerlingguy.nginx/molecule/default/playbook.yml
index 9ae896045..ee651977b 100644
--- a/provisioning/roles/geerlingguy.nginx/tests/test.yml
+++ b/provisioning/roles/geerlingguy.nginx/molecule/default/playbook.yml
@@ -1,5 +1,6 @@
 ---
-- hosts: all
+- name: Converge
+  hosts: all
 
   vars:
     nginx_use_ppa: true
@@ -14,8 +15,5 @@
       when: ansible_os_family == 'Debian'
       changed_when: false
 
-    - name: Install dependencies.
-      package: name=curl state=present
-
   roles:
-    - role_under_test
+    - role: geerlingguy.nginx
diff --git a/provisioning/roles/geerlingguy.apache/molecule/default/tests/test_default.py b/provisioning/roles/geerlingguy.nginx/molecule/default/tests/test_default.py
similarity index 100%
rename from provisioning/roles/geerlingguy.apache/molecule/default/tests/test_default.py
rename to provisioning/roles/geerlingguy.nginx/molecule/default/tests/test_default.py
diff --git a/provisioning/roles/geerlingguy.nginx/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.nginx/molecule/default/yaml-lint.yml
new file mode 100644
index 000000000..a3dbc38ee
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nginx/molecule/default/yaml-lint.yml
@@ -0,0 +1,6 @@
+---
+extends: default
+rules:
+  line-length:
+    max: 120
+    level: warning
diff --git a/provisioning/roles/geerlingguy.nginx/tasks/setup-Ubuntu.yml b/provisioning/roles/geerlingguy.nginx/tasks/setup-Ubuntu.yml
index 920dc0b2b..e198062cf 100644
--- a/provisioning/roles/geerlingguy.nginx/tasks/setup-Ubuntu.yml
+++ b/provisioning/roles/geerlingguy.nginx/tasks/setup-Ubuntu.yml
@@ -3,7 +3,7 @@
   apt_repository:
     repo: 'ppa:nginx/{{ nginx_ppa_version }}'
     state: present
-    update_cache: yes
+    update_cache: true
   register: nginx_ppa_added
   when: nginx_ppa_use
 
diff --git a/provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml b/provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml
index 05af0373d..f49721648 100644
--- a/provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml
+++ b/provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml
@@ -16,13 +16,15 @@
   template:
     src: "{{ item.template|default(nginx_vhost_template) }}"
     dest: "{{ nginx_vhost_path }}/{{ item.filename|default(item.server_name.split(' ')[0] ~ '.conf') }}"
-    force: yes
+    force: true
     owner: root
     group: root
     mode: 0644
   when: item.state|default('present') != 'absent'
   with_items: "{{ nginx_vhosts }}"
   notify: reload nginx
+  tags:
+    - skip_ansible_lint
 
 - name: Remove managed vhost config files.
   file:
@@ -31,6 +33,8 @@
   when: item.state|default('present') == 'absent'
   with_items: "{{ nginx_vhosts }}"
   notify: reload nginx
+  tags:
+    - skip_ansible_lint
 
 - name: Remove legacy vhosts.conf file.
   file:
diff --git a/provisioning/roles/geerlingguy.nginx/tests/README.md b/provisioning/roles/geerlingguy.nginx/tests/README.md
deleted file mode 100644
index 6fb211721..000000000
--- a/provisioning/roles/geerlingguy.nginx/tests/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Ansible Role tests
-
-To run the test playbook(s) in this directory:
-
-  1. Install and start Docker.
-  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
-    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
-  1. Make the test shim executable: `chmod +x tests/test.sh`.
-  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
-
-If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.php-memcached/.gitignore b/provisioning/roles/geerlingguy.php-memcached/.gitignore
index c9b2377e3..f56f5b578 100644
--- a/provisioning/roles/geerlingguy.php-memcached/.gitignore
+++ b/provisioning/roles/geerlingguy.php-memcached/.gitignore
@@ -1,2 +1,3 @@
 *.retry
-tests/test.sh
+*/__pycache__
+*.pyc
diff --git a/provisioning/roles/geerlingguy.php-memcached/.travis.yml b/provisioning/roles/geerlingguy.php-memcached/.travis.yml
index f7463f310..f1d1693ab 100644
--- a/provisioning/roles/geerlingguy.php-memcached/.travis.yml
+++ b/provisioning/roles/geerlingguy.php-memcached/.travis.yml
@@ -1,24 +1,28 @@
 ---
+language: python
 services: docker
 
 env:
-  - distro: centos7
-  - distro: ubuntu1604
+  global:
+    - ROLE_NAME: php-memcached
+  matrix:
+    - MOLECULE_DISTRO: centos7
+      MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
+    - MOLECULE_DISTRO: ubuntu1604
 
-script:
-  # Configure test script so we can run extra tests after playbook is run.
-  - export container_id=$(date +%s)
-  - export cleanup=false
+install:
+  # Install test dependencies.
+  - pip install molecule docker
 
-  # Download test shim.
-  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
-  - chmod +x ${PWD}/tests/test.sh
+before_script:
+  # Use actual Ansible Galaxy role name for the project directory.
+  - cd ../
+  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
+  - cd geerlingguy.$ROLE_NAME
 
+script:
   # Run tests.
-  - ${PWD}/tests/test.sh
-
-  # Run script to test if Memcached is available and working.
-  - 'docker exec ${container_id} env TERM=xterm php /etc/ansible/roles/role_under_test/tests/memcached-test.php'
+  - molecule test
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.php-memcached/meta/main.yml b/provisioning/roles/geerlingguy.php-memcached/meta/main.yml
index 02d5e2087..8178ccadf 100644
--- a/provisioning/roles/geerlingguy.php-memcached/meta/main.yml
+++ b/provisioning/roles/geerlingguy.php-memcached/meta/main.yml
@@ -11,14 +11,18 @@ galaxy_info:
   platforms:
     - name: EL
       versions:
-      - 6
-      - 7
+        - 6
+        - 7
     - name: Debian
       versions:
-      - all
+        - all
     - name: Ubuntu
       versions:
-      - all
+        - all
   galaxy_tags:
     - database
     - web
+    - php
+    - memcached
+    - cache
+    - performance
diff --git a/provisioning/roles/geerlingguy.php-memcached/tests/memcached-test.php b/provisioning/roles/geerlingguy.php-memcached/molecule/default/memcached-test.php
similarity index 100%
rename from provisioning/roles/geerlingguy.php-memcached/tests/memcached-test.php
rename to provisioning/roles/geerlingguy.php-memcached/molecule/default/memcached-test.php
diff --git a/provisioning/roles/geerlingguy.php-memcached/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.php-memcached/molecule/default/molecule.yml
new file mode 100644
index 000000000..033970241
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-memcached/molecule/default/molecule.yml
@@ -0,0 +1,27 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint:
+  name: yamllint
+  options:
+    config-file: molecule/default/yaml-lint.yml
+platforms:
+  - name: instance
+    image: geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible
+    command: ${MOLECULE_DOCKER_COMMAND:-"sleep infinity"}
+    privileged: true
+    pre_build_image: true
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+  playbooks:
+    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
+scenario:
+  name: default
+verifier:
+  name: testinfra
+  lint:
+    name: flake8
diff --git a/provisioning/roles/geerlingguy.php-memcached/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.php-memcached/molecule/default/playbook.yml
new file mode 100644
index 000000000..b449f2fd0
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-memcached/molecule/default/playbook.yml
@@ -0,0 +1,19 @@
+---
+- name: Converge
+  hosts: all
+  become: true
+
+  vars:
+    php_enable_webserver: false
+
+  roles:
+    - role: geerlingguy.memcached
+    - role: geerlingguy.php
+    - role: geerlingguy.php-memcached
+
+  post_tasks:
+    - name: Run test script to confirm Memcached is reachable via PHP.
+      script: memcached-test.php
+      args:
+        executable: php
+      changed_when: false
diff --git a/provisioning/roles/geerlingguy.php-memcached/tests/requirements.yml b/provisioning/roles/geerlingguy.php-memcached/molecule/default/requirements.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.php-memcached/tests/requirements.yml
rename to provisioning/roles/geerlingguy.php-memcached/molecule/default/requirements.yml
diff --git a/provisioning/roles/geerlingguy.php-memcached/molecule/default/tests/test_default.py b/provisioning/roles/geerlingguy.php-memcached/molecule/default/tests/test_default.py
new file mode 100644
index 000000000..eedd64a1d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-memcached/molecule/default/tests/test_default.py
@@ -0,0 +1,14 @@
+import os
+
+import testinfra.utils.ansible_runner
+
+testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
+    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
+
+
+def test_hosts_file(host):
+    f = host.file('/etc/hosts')
+
+    assert f.exists
+    assert f.user == 'root'
+    assert f.group == 'root'
diff --git a/provisioning/roles/geerlingguy.php-memcached/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.php-memcached/molecule/default/yaml-lint.yml
new file mode 100644
index 000000000..a3dbc38ee
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-memcached/molecule/default/yaml-lint.yml
@@ -0,0 +1,6 @@
+---
+extends: default
+rules:
+  line-length:
+    max: 120
+    level: warning
diff --git a/provisioning/roles/geerlingguy.php-memcached/tasks/main.yml b/provisioning/roles/geerlingguy.php-memcached/tasks/main.yml
index f8cca0f51..ec9dd36ef 100644
--- a/provisioning/roles/geerlingguy.php-memcached/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php-memcached/tasks/main.yml
@@ -12,7 +12,7 @@
   yum:
     name: "{{ php_memcached_package }}"
     state: present
-    enablerepo: "{{ php_enablerepo }}"
+    enablerepo: "{{ php_enablerepo | default(omit, true) }}"
   notify:
     - restart webserver
     - restart php-fpm
diff --git a/provisioning/roles/geerlingguy.php-memcached/tests/README.md b/provisioning/roles/geerlingguy.php-memcached/tests/README.md
deleted file mode 100644
index 6fb211721..000000000
--- a/provisioning/roles/geerlingguy.php-memcached/tests/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Ansible Role tests
-
-To run the test playbook(s) in this directory:
-
-  1. Install and start Docker.
-  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
-    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
-  1. Make the test shim executable: `chmod +x tests/test.sh`.
-  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
-
-If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.php-memcached/tests/test.yml b/provisioning/roles/geerlingguy.php-memcached/tests/test.yml
deleted file mode 100644
index 19d4f6de8..000000000
--- a/provisioning/roles/geerlingguy.php-memcached/tests/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-- hosts: all
-
-  vars:
-    php_enable_webserver: false
-
-  roles:
-    - geerlingguy.memcached
-    - geerlingguy.php
-    - role_under_test
diff --git a/provisioning/roles/geerlingguy.php-mysql/.gitignore b/provisioning/roles/geerlingguy.php-mysql/.gitignore
new file mode 100644
index 000000000..f56f5b578
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-mysql/.gitignore
@@ -0,0 +1,3 @@
+*.retry
+*/__pycache__
+*.pyc
diff --git a/provisioning/roles/geerlingguy.php-mysql/.travis.yml b/provisioning/roles/geerlingguy.php-mysql/.travis.yml
index db654f869..e5b498ebe 100644
--- a/provisioning/roles/geerlingguy.php-mysql/.travis.yml
+++ b/provisioning/roles/geerlingguy.php-mysql/.travis.yml
@@ -1,43 +1,28 @@
 ---
+language: python
 services: docker
 
 env:
-  - distro: centos7
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-  - distro: ubuntu1604
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-
-before_install:
-  # Pull container.
-  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
+  global:
+    - ROLE_NAME: php-mysql
+  matrix:
+    - MOLECULE_DISTRO: centos7
+      MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
+    - MOLECULE_DISTRO: ubuntu1604
+
+install:
+  # Install test dependencies.
+  - pip install molecule docker
+
+before_script:
+  # Use actual Ansible Galaxy role name for the project directory.
+  - cd ../
+  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
+  - cd geerlingguy.$ROLE_NAME
 
 script:
-  - container_id=$(mktemp)
-  # Run container in detached state.
-  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
-
-  # Install dependencies.
-  - 'docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
-
-  # Ansible syntax check.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
-
-  # Test role.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
-
-  # Test role idempotence.
-  - idempotence=$(mktemp)
-  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
-  - >
-    tail ${idempotence}
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
-
-  # Ensure PHP MySQL support is enabled.
-  - docker exec --tty "$(cat ${container_id})" env TERM=xterm php -i | grep 'mysqlnd => enabled'
+  # Run tests.
+  - molecule test
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.php-mysql/LICENSE b/provisioning/roles/geerlingguy.php-mysql/LICENSE
new file mode 100644
index 000000000..4275cf3c1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-mysql/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Jeff Geerling
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/provisioning/roles/geerlingguy.php-mysql/README.md b/provisioning/roles/geerlingguy.php-mysql/README.md
index 3894f134b..85d9e271c 100644
--- a/provisioning/roles/geerlingguy.php-mysql/README.md
+++ b/provisioning/roles/geerlingguy.php-mysql/README.md
@@ -37,4 +37,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.php-mysql/meta/main.yml b/provisioning/roles/geerlingguy.php-mysql/meta/main.yml
index e8fa30bc8..5b8f61f36 100644
--- a/provisioning/roles/geerlingguy.php-mysql/meta/main.yml
+++ b/provisioning/roles/geerlingguy.php-mysql/meta/main.yml
@@ -7,17 +7,17 @@ galaxy_info:
   description: PHP MySQL support for Linux.
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 1.8
+  min_ansible_version: 2.0
   platforms:
     - name: EL
       versions:
-      - all
+        - all
     - name: Debian
       versions:
-      - all
+        - all
     - name: Ubuntu
       versions:
-      - all
+        - all
   galaxy_tags:
     - database
     - web
diff --git a/provisioning/roles/geerlingguy.php-mysql/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.php-mysql/molecule/default/molecule.yml
new file mode 100644
index 000000000..033970241
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-mysql/molecule/default/molecule.yml
@@ -0,0 +1,27 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint:
+  name: yamllint
+  options:
+    config-file: molecule/default/yaml-lint.yml
+platforms:
+  - name: instance
+    image: geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible
+    command: ${MOLECULE_DOCKER_COMMAND:-"sleep infinity"}
+    privileged: true
+    pre_build_image: true
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+  playbooks:
+    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
+scenario:
+  name: default
+verifier:
+  name: testinfra
+  lint:
+    name: flake8
diff --git a/provisioning/roles/geerlingguy.php-mysql/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.php-mysql/molecule/default/playbook.yml
new file mode 100644
index 000000000..c68913352
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-mysql/molecule/default/playbook.yml
@@ -0,0 +1,25 @@
+---
+- name: Converge
+  hosts: all
+  become: true
+
+  vars:
+    php_enablerepo: "remi,remi-php70"
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=true cache_valid_time=600
+      when: ansible_os_family == 'Debian'
+
+  roles:
+    - role: geerlingguy.repo-remi
+      when: ansible_os_family == 'RedHat'
+    - role: geerlingguy.apache
+    - role: geerlingguy.mysql
+    - role: geerlingguy.php
+    - role: geerlingguy.php-mysql
+
+  post_tasks:
+    - name: Make sure the PHP MySQL extension is present.
+      command: "php -i | grep 'mysqlnd => enabled'"
+      changed_when: false
diff --git a/provisioning/roles/geerlingguy.php-mysql/tests/requirements.yml b/provisioning/roles/geerlingguy.php-mysql/molecule/default/requirements.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.php-mysql/tests/requirements.yml
rename to provisioning/roles/geerlingguy.php-mysql/molecule/default/requirements.yml
diff --git a/provisioning/roles/geerlingguy.php-mysql/molecule/default/tests/test_default.py b/provisioning/roles/geerlingguy.php-mysql/molecule/default/tests/test_default.py
new file mode 100644
index 000000000..eedd64a1d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-mysql/molecule/default/tests/test_default.py
@@ -0,0 +1,14 @@
+import os
+
+import testinfra.utils.ansible_runner
+
+testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
+    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
+
+
+def test_hosts_file(host):
+    f = host.file('/etc/hosts')
+
+    assert f.exists
+    assert f.user == 'root'
+    assert f.group == 'root'
diff --git a/provisioning/roles/geerlingguy.php-mysql/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.php-mysql/molecule/default/yaml-lint.yml
new file mode 100644
index 000000000..a3dbc38ee
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-mysql/molecule/default/yaml-lint.yml
@@ -0,0 +1,6 @@
+---
+extends: default
+rules:
+  line-length:
+    max: 120
+    level: warning
diff --git a/provisioning/roles/geerlingguy.php-mysql/tasks/main.yml b/provisioning/roles/geerlingguy.php-mysql/tasks/main.yml
index bf5c8a07c..a389d1122 100644
--- a/provisioning/roles/geerlingguy.php-mysql/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php-mysql/tasks/main.yml
@@ -13,7 +13,7 @@
   yum:
     name: "{{ php_mysql_package }}"
     state: present
-    enablerepo: "{{ php_enablerepo }}"
+    enablerepo: "{{ php_enablerepo | default(omit, true) }}"
   notify:
     - restart webserver
     - restart php-fpm
diff --git a/provisioning/roles/geerlingguy.php-mysql/tests/centos7-vars.yml b/provisioning/roles/geerlingguy.php-mysql/tests/centos7-vars.yml
deleted file mode 100644
index 1b0b69304..000000000
--- a/provisioning/roles/geerlingguy.php-mysql/tests/centos7-vars.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-mysql_packages:
-  - mariadb
-  - mariadb-server
-  - mariadb-libs
-  - MySQL-python
-  - perl-DBD-MySQL
-mysql_daemon: mariadb
-mysql_log_error: /var/log/mariadb/mariadb.log
-mysql_syslog_tag: mariadb
-mysql_pid_file: /var/run/mariadb/mariadb.pid
diff --git a/provisioning/roles/geerlingguy.php-mysql/tests/test.yml b/provisioning/roles/geerlingguy.php-mysql/tests/test.yml
deleted file mode 100644
index 18be2d588..000000000
--- a/provisioning/roles/geerlingguy.php-mysql/tests/test.yml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-- hosts: all
-
-  vars:
-    php_enablerepo: "remi,remi-php70"
-
-  pre_tasks:
-    - name: Update apt cache.
-      apt: update_cache=yes
-      when: ansible_os_family == 'Debian'
-
-    - name: Include CentOS 7-specific vars.
-      include_vars: centos7-vars.yml
-      when: ansible_os_family == 'RedHat' and ansible_distribution_major_version == "7"
-
-  roles:
-    - role: geerlingguy.repo-remi
-      when: ansible_os_family == 'RedHat'
-    - geerlingguy.apache
-    - geerlingguy.mysql
-    - geerlingguy.php
-    - role_under_test
diff --git a/provisioning/roles/geerlingguy.php-pgsql/.gitignore b/provisioning/roles/geerlingguy.php-pgsql/.gitignore
new file mode 100644
index 000000000..f56f5b578
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-pgsql/.gitignore
@@ -0,0 +1,3 @@
+*.retry
+*/__pycache__
+*.pyc
diff --git a/provisioning/roles/geerlingguy.php-pgsql/.travis.yml b/provisioning/roles/geerlingguy.php-pgsql/.travis.yml
index 40a585f45..87abca118 100644
--- a/provisioning/roles/geerlingguy.php-pgsql/.travis.yml
+++ b/provisioning/roles/geerlingguy.php-pgsql/.travis.yml
@@ -1,46 +1,28 @@
 ---
+language: python
 services: docker
 
 env:
-  - distro: centos7
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-  - distro: ubuntu1604
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-
-before_install:
-  # Pull container.
-  - 'docker pull geerlingguy/docker-${distro}-ansible:latest'
+  global:
+    - ROLE_NAME: php-pgsql
+  matrix:
+    - MOLECULE_DISTRO: centos7
+      MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
+    - MOLECULE_DISTRO: ubuntu1604
+
+install:
+  # Install test dependencies.
+  - pip install molecule docker
+
+before_script:
+  # Use actual Ansible Galaxy role name for the project directory.
+  - cd ../
+  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
+  - cd geerlingguy.$ROLE_NAME
 
 script:
-  - container_id=$(mktemp)
-  # Run container in detached state.
-  - 'docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
-
-  # Install dependencies.
-  - 'docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
-
-  # Ansible syntax check.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
-
-  # Test role.
-  - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
-
-  # Test role idempotence.
-  - idempotence=$(mktemp)
-  - docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
-  - >
-    tail ${idempotence}
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
-
-  # Ensure PHP PostgreSQL support is enabled.
-  - docker exec --tty "$(cat ${container_id})" env TERM=xterm php -i | grep 'PostgreSQL Support => enabled'
-
-after_failure:
-  - docker exec --tty "$(cat ${container_id})" env TERM=xterm php -i
+  # Run tests.
+  - molecule test
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.php-pgsql/LICENSE b/provisioning/roles/geerlingguy.php-pgsql/LICENSE
new file mode 100644
index 000000000..4275cf3c1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-pgsql/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Jeff Geerling
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/provisioning/roles/geerlingguy.php-pgsql/README.md b/provisioning/roles/geerlingguy.php-pgsql/README.md
index eb2cccb91..4a8772ec3 100644
--- a/provisioning/roles/geerlingguy.php-pgsql/README.md
+++ b/provisioning/roles/geerlingguy.php-pgsql/README.md
@@ -39,4 +39,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2016 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
+This role was created in 2016 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.php-pgsql/meta/main.yml b/provisioning/roles/geerlingguy.php-pgsql/meta/main.yml
index b00b837cf..9be9a595d 100644
--- a/provisioning/roles/geerlingguy.php-pgsql/meta/main.yml
+++ b/provisioning/roles/geerlingguy.php-pgsql/meta/main.yml
@@ -7,17 +7,17 @@ galaxy_info:
   description: PHP PostgreSQL support for Linux.
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 1.8
+  min_ansible_version: 2.0
   platforms:
     - name: EL
       versions:
-      - all
+        - all
     - name: Debian
       versions:
-      - all
+        - all
     - name: Ubuntu
       versions:
-      - all
+        - all
   galaxy_tags:
     - database
     - web
diff --git a/provisioning/roles/geerlingguy.php-pgsql/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.php-pgsql/molecule/default/molecule.yml
new file mode 100644
index 000000000..033970241
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-pgsql/molecule/default/molecule.yml
@@ -0,0 +1,27 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint:
+  name: yamllint
+  options:
+    config-file: molecule/default/yaml-lint.yml
+platforms:
+  - name: instance
+    image: geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible
+    command: ${MOLECULE_DOCKER_COMMAND:-"sleep infinity"}
+    privileged: true
+    pre_build_image: true
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+  playbooks:
+    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
+scenario:
+  name: default
+verifier:
+  name: testinfra
+  lint:
+    name: flake8
diff --git a/provisioning/roles/geerlingguy.php-pgsql/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.php-pgsql/molecule/default/playbook.yml
new file mode 100644
index 000000000..96058e536
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-pgsql/molecule/default/playbook.yml
@@ -0,0 +1,25 @@
+---
+- name: Converge
+  hosts: all
+  become: true
+
+  vars:
+    php_enablerepo: "remi,remi-php70"
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=true cache_valid_time=600
+      when: ansible_os_family == 'Debian'
+
+  roles:
+    - role: geerlingguy.repo-remi
+      when: ansible_os_family == 'RedHat'
+    - role: geerlingguy.apache
+    - role: geerlingguy.postgresql
+    - role: geerlingguy.php
+    - role: geerlingguy.php-pgsql
+
+  post_tasks:
+    - name: Make sure PHP pgsql driver is enabled.
+      command: "php -i | grep 'PostgreSQL Support => enabled'"
+      changed_when: false
diff --git a/provisioning/roles/geerlingguy.php-pgsql/tests/requirements.yml b/provisioning/roles/geerlingguy.php-pgsql/molecule/default/requirements.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.php-pgsql/tests/requirements.yml
rename to provisioning/roles/geerlingguy.php-pgsql/molecule/default/requirements.yml
diff --git a/provisioning/roles/geerlingguy.php-pgsql/molecule/default/tests/test_default.py b/provisioning/roles/geerlingguy.php-pgsql/molecule/default/tests/test_default.py
new file mode 100644
index 000000000..eedd64a1d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-pgsql/molecule/default/tests/test_default.py
@@ -0,0 +1,14 @@
+import os
+
+import testinfra.utils.ansible_runner
+
+testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
+    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
+
+
+def test_hosts_file(host):
+    f = host.file('/etc/hosts')
+
+    assert f.exists
+    assert f.user == 'root'
+    assert f.group == 'root'
diff --git a/provisioning/roles/geerlingguy.php-pgsql/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.php-pgsql/molecule/default/yaml-lint.yml
new file mode 100644
index 000000000..a3dbc38ee
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-pgsql/molecule/default/yaml-lint.yml
@@ -0,0 +1,6 @@
+---
+extends: default
+rules:
+  line-length:
+    max: 120
+    level: warning
diff --git a/provisioning/roles/geerlingguy.php-pgsql/tasks/main.yml b/provisioning/roles/geerlingguy.php-pgsql/tasks/main.yml
index 3efa31c51..e35de3398 100644
--- a/provisioning/roles/geerlingguy.php-pgsql/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php-pgsql/tasks/main.yml
@@ -13,7 +13,7 @@
   yum:
     name: "{{ php_pgsql_package }}"
     state: present
-    enablerepo: "{{ php_enablerepo }}"
+    enablerepo: "{{ php_enablerepo | default(omit, true) }}"
   notify:
     - restart webserver
     - restart php-fpm
diff --git a/provisioning/roles/geerlingguy.php-pgsql/tests/test.yml b/provisioning/roles/geerlingguy.php-pgsql/tests/test.yml
deleted file mode 100644
index f703f78f7..000000000
--- a/provisioning/roles/geerlingguy.php-pgsql/tests/test.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- hosts: all
-
-  vars:
-    php_enablerepo: "remi,remi-php70"
-
-  pre_tasks:
-    - name: Update apt cache.
-      apt: update_cache=yes
-      when: ansible_os_family == 'Debian'
-
-  roles:
-    - role: geerlingguy.repo-remi
-      when: ansible_os_family == 'RedHat'
-    - geerlingguy.apache
-    - geerlingguy.postgresql
-    - geerlingguy.php
-    - role_under_test
diff --git a/provisioning/roles/geerlingguy.php-redis/.gitignore b/provisioning/roles/geerlingguy.php-redis/.gitignore
index c9b2377e3..f56f5b578 100644
--- a/provisioning/roles/geerlingguy.php-redis/.gitignore
+++ b/provisioning/roles/geerlingguy.php-redis/.gitignore
@@ -1,2 +1,3 @@
 *.retry
-tests/test.sh
+*/__pycache__
+*.pyc
diff --git a/provisioning/roles/geerlingguy.php-redis/.travis.yml b/provisioning/roles/geerlingguy.php-redis/.travis.yml
index f000e2fa3..0b1fec17e 100644
--- a/provisioning/roles/geerlingguy.php-redis/.travis.yml
+++ b/provisioning/roles/geerlingguy.php-redis/.travis.yml
@@ -1,24 +1,28 @@
 ---
+language: python
 services: docker
 
 env:
-  - distro: centos7
-  - distro: ubuntu1604
+  global:
+    - ROLE_NAME: php-redis
+  matrix:
+    - MOLECULE_DISTRO: centos7
+      MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
+    - MOLECULE_DISTRO: ubuntu1604
 
-script:
-  # Configure test script so we can run extra tests after playbook is run.
-  - export container_id=$(date +%s)
-  - export cleanup=false
+install:
+  # Install test dependencies.
+  - pip install molecule docker
 
-  # Download test shim.
-  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
-  - chmod +x ${PWD}/tests/test.sh
+before_script:
+  # Use actual Ansible Galaxy role name for the project directory.
+  - cd ../
+  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
+  - cd geerlingguy.$ROLE_NAME
 
+script:
   # Run tests.
-  - ${PWD}/tests/test.sh
-
-  # Run script to test if Memcached is available and working.
-  - 'docker exec ${container_id} env TERM=xterm php /etc/ansible/roles/role_under_test/tests/redis-test.php'
+  - molecule test
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.php-redis/meta/main.yml b/provisioning/roles/geerlingguy.php-redis/meta/main.yml
index dd94f9653..64f6132d1 100644
--- a/provisioning/roles/geerlingguy.php-redis/meta/main.yml
+++ b/provisioning/roles/geerlingguy.php-redis/meta/main.yml
@@ -11,16 +11,19 @@ galaxy_info:
   platforms:
     - name: EL
       versions:
-      - 6
-      - 7
+        - 6
+        - 7
     - name: Debian
       versions:
-      - all
+        - all
     - name: Ubuntu
       versions:
-      - all
+        - all
   galaxy_tags:
     - database
     - web
     - php
     - redis
+    - cache
+    - performance
+    - kv
diff --git a/provisioning/roles/geerlingguy.php-redis/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.php-redis/molecule/default/molecule.yml
new file mode 100644
index 000000000..033970241
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-redis/molecule/default/molecule.yml
@@ -0,0 +1,27 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint:
+  name: yamllint
+  options:
+    config-file: molecule/default/yaml-lint.yml
+platforms:
+  - name: instance
+    image: geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible
+    command: ${MOLECULE_DOCKER_COMMAND:-"sleep infinity"}
+    privileged: true
+    pre_build_image: true
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+  playbooks:
+    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
+scenario:
+  name: default
+verifier:
+  name: testinfra
+  lint:
+    name: flake8
diff --git a/provisioning/roles/geerlingguy.php-redis/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.php-redis/molecule/default/playbook.yml
new file mode 100644
index 000000000..8fb28ad08
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-redis/molecule/default/playbook.yml
@@ -0,0 +1,27 @@
+---
+- name: Converge
+  hosts: all
+  become: true
+
+  vars:
+    php_enable_webserver: false
+    php_enablerepo: "remi,remi-php70"
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=yes cache_valid_time=600
+      when: ansible_os_family == 'Debian'
+
+  roles:
+    - role: geerlingguy.repo-remi
+      when: ansible_os_family == 'RedHat'
+    - role: geerlingguy.redis
+    - role: geerlingguy.php
+    - role: geerlingguy.php-redis
+
+  post_tasks:
+    - name: Run test script to confirm Redis is reachable via PHP.
+      script: redis-test.php
+      args:
+        executable: php
+      changed_when: false
diff --git a/provisioning/roles/geerlingguy.php-redis/tests/redis-test.php b/provisioning/roles/geerlingguy.php-redis/molecule/default/redis-test.php
similarity index 100%
rename from provisioning/roles/geerlingguy.php-redis/tests/redis-test.php
rename to provisioning/roles/geerlingguy.php-redis/molecule/default/redis-test.php
diff --git a/provisioning/roles/geerlingguy.php-redis/tests/requirements.yml b/provisioning/roles/geerlingguy.php-redis/molecule/default/requirements.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.php-redis/tests/requirements.yml
rename to provisioning/roles/geerlingguy.php-redis/molecule/default/requirements.yml
diff --git a/provisioning/roles/geerlingguy.php-redis/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.php-redis/molecule/default/yaml-lint.yml
new file mode 100644
index 000000000..a3dbc38ee
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-redis/molecule/default/yaml-lint.yml
@@ -0,0 +1,6 @@
+---
+extends: default
+rules:
+  line-length:
+    max: 120
+    level: warning
diff --git a/provisioning/roles/geerlingguy.php-redis/tasks/install-from-source.yml b/provisioning/roles/geerlingguy.php-redis/tasks/install-from-source.yml
index 73c40fc7e..6243d0a80 100644
--- a/provisioning/roles/geerlingguy.php-redis/tasks/install-from-source.yml
+++ b/provisioning/roles/geerlingguy.php-redis/tasks/install-from-source.yml
@@ -4,7 +4,7 @@
     repo: "{{ php_redis_source_repo }}"
     dest: "{{ php_redis_source_clone_dir }}"
     version: "{{ php_redis_source_version }}"
-    accept_hostkey: yes
+    accept_hostkey: true
     depth: 1
 
 - name: Run phpize.
diff --git a/provisioning/roles/geerlingguy.php-redis/tasks/main.yml b/provisioning/roles/geerlingguy.php-redis/tasks/main.yml
index f0d83d970..2237b3f35 100644
--- a/provisioning/roles/geerlingguy.php-redis/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php-redis/tasks/main.yml
@@ -13,18 +13,22 @@
   yum:
     name: "{{ php_redis_package }}"
     state: present
-    enablerepo: "{{ php_enablerepo }}"
+    enablerepo: "{{ php_enablerepo | default(omit, true) }}"
   notify:
     - restart webserver
     - restart php-fpm
-  when: (php_redis_install_from_source == false) and (ansible_os_family == 'RedHat')
+  when:
+    - php_redis_install_from_source == false
+    - ansible_os_family == 'RedHat'
 
 - name: Install PhpRedis extension (Debian).
   apt: "name={{ php_redis_package }} state=present"
   notify:
     - restart webserver
     - restart php-fpm
-  when: (php_redis_install_from_source == false) and (ansible_os_family == 'Debian')
+  when:
+    - php_redis_install_from_source == false
+    - ansible_os_family == 'Debian'
 
 # Install PhpRedis from source.
 - include_tasks: install-from-source.yml
diff --git a/provisioning/roles/geerlingguy.php-redis/tests/README.md b/provisioning/roles/geerlingguy.php-redis/tests/README.md
deleted file mode 100644
index 6fb211721..000000000
--- a/provisioning/roles/geerlingguy.php-redis/tests/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Ansible Role tests
-
-To run the test playbook(s) in this directory:
-
-  1. Install and start Docker.
-  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
-    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
-  1. Make the test shim executable: `chmod +x tests/test.sh`.
-  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
-
-If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.php-redis/tests/test.yml b/provisioning/roles/geerlingguy.php-redis/tests/test.yml
deleted file mode 100644
index 442ba8676..000000000
--- a/provisioning/roles/geerlingguy.php-redis/tests/test.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- hosts: all
-
-  vars:
-    php_enable_webserver: false
-    php_enablerepo: "remi,remi-php70"
-
-  pre_tasks:
-    - name: Update apt cache.
-      apt: update_cache=yes cache_valid_time=600
-      when: ansible_os_family == 'Debian'
-
-  roles:
-    - role: geerlingguy.repo-remi
-      when: ansible_os_family == 'RedHat'
-    - geerlingguy.redis
-    - geerlingguy.php
-    - role_under_test
diff --git a/provisioning/roles/geerlingguy.php/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.php/tasks/setup-RedHat.yml
index 0ea1e333d..41db90789 100644
--- a/provisioning/roles/geerlingguy.php/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.php/tasks/setup-RedHat.yml
@@ -3,5 +3,5 @@
   package:
     name: "{{ php_packages }}"
     state: "{{ php_packages_state }}"
-    enablerepo: "{{ php_enablerepo | default(omit) }}"
+    enablerepo: "{{ php_enablerepo | default(omit, true) }}"
   notify: restart webserver
diff --git a/provisioning/roles/geerlingguy.postgresql/.gitignore b/provisioning/roles/geerlingguy.postgresql/.gitignore
index c9b2377e3..f56f5b578 100644
--- a/provisioning/roles/geerlingguy.postgresql/.gitignore
+++ b/provisioning/roles/geerlingguy.postgresql/.gitignore
@@ -1,2 +1,3 @@
 *.retry
-tests/test.sh
+*/__pycache__
+*.pyc
diff --git a/provisioning/roles/geerlingguy.postgresql/.travis.yml b/provisioning/roles/geerlingguy.postgresql/.travis.yml
index 75fb26b87..d6e345276 100644
--- a/provisioning/roles/geerlingguy.postgresql/.travis.yml
+++ b/provisioning/roles/geerlingguy.postgresql/.travis.yml
@@ -1,48 +1,32 @@
 ---
+language: python
 services: docker
 
 env:
-  - distro: centos7
-    postgresql_bin_dir: /usr/bin
-    postgresql_data_dir: /var/lib/pgsql/data
-  - distro: centos6
-    postgresql_bin_dir: /usr/bin
-    postgresql_data_dir: /var/lib/pgsql/data
-  - distro: ubuntu1804
-    postgresql_bin_dir: /usr/lib/postgresql/10/bin
-    postgresql_data_dir: /var/lib/postgresql/10/main
-  - distro: ubuntu1604
-    postgresql_bin_dir: /usr/lib/postgresql/9.5/bin
-    postgresql_data_dir: /var/lib/postgresql/9.5/main
-  - distro: ubuntu1404
-    postgresql_bin_dir: /usr/lib/postgresql/9.3/bin
-    postgresql_data_dir: /var/lib/postgresql/9.3/main
-  - distro: debian8
-    postgresql_bin_dir: /usr/lib/postgresql/9.4/bin
-    postgresql_data_dir: /var/lib/postgresql/9.4/main
-  - distro: debian9
-    postgresql_bin_dir: /usr/lib/postgresql/9.6/bin
-    postgresql_data_dir: /var/lib/postgresql/9.6/main
+  global:
+    - ROLE_NAME: postgresql
+  matrix:
+    - MOLECULE_DISTRO: centos7
+      MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
+    - MOLECULE_DISTRO: ubuntu1804
+    - MOLECULE_DISTRO: ubuntu1604
+    - MOLECULE_DISTRO: ubuntu1404
+    - MOLECULE_DISTRO: debian9
+    - MOLECULE_DISTRO: debian8
 
-script:
-  # Configure test script so we can run extra tests after playbook is run.
-  - export container_id=$(date +%s)
-  - export cleanup=false
+install:
+  # Install test dependencies.
+  - pip install molecule docker
 
-  # Download test shim.
-  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
-  - chmod +x ${PWD}/tests/test.sh
+before_script:
+  # Use actual Ansible Galaxy role name for the project directory.
+  - cd ../
+  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
+  - cd geerlingguy.$ROLE_NAME
 
+script:
   # Run tests.
-  - ${PWD}/tests/test.sh
-
-  # Check PostgreSQL status.
-  - 'docker exec -u postgres ${container_id} ${postgresql_bin_dir}/pg_ctl -D ${postgresql_data_dir} status'
-
-after_failure:
-  # Check what happened on systemd systems.
-  - 'docker exec --tty ${container_id} env TERM=xterm systemctl -l status postgresql.service'
-  - 'docker exec --tty ${container_id} env TERM=xterm journalctl -xe --no-pager'
+  - molecule test
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.postgresql/README.md b/provisioning/roles/geerlingguy.postgresql/README.md
index 4f0bdbfcb..6d81e4e9f 100644
--- a/provisioning/roles/geerlingguy.postgresql/README.md
+++ b/provisioning/roles/geerlingguy.postgresql/README.md
@@ -39,6 +39,11 @@ The user and group under which PostgreSQL will run.
 
 The directories (usually one, but can be multiple) where PostgreSQL's socket will be created.
 
+    postgresql_service_state: started
+    postgresql_service_enabled: true
+
+Control the state of the postgresql service and whether it should start at boot time.
+
     postgresql_global_config_options:
       - option: unix_socket_directories
         value: '{{ postgresql_unix_socket_directories | join(",") }}'
diff --git a/provisioning/roles/geerlingguy.postgresql/defaults/main.yml b/provisioning/roles/geerlingguy.postgresql/defaults/main.yml
index 7453eb535..fa6a87f1e 100644
--- a/provisioning/roles/geerlingguy.postgresql/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.postgresql/defaults/main.yml
@@ -13,6 +13,9 @@ postgresql_group: postgres
 postgresql_unix_socket_directories:
   - /var/run/postgresql
 
+postgresql_service_state: started
+postgresql_service_enabled: true
+
 # Global configuration options that will be set in postgresql.conf.
 postgresql_global_config_options:
   - option: unix_socket_directories
@@ -21,10 +24,10 @@ postgresql_global_config_options:
 # Host based authentication (hba) entries to be added to the pg_hba.conf. This
 # variable's defaults reflect the defaults that come with a fresh installation.
 postgresql_hba_entries:
-  - { type: local, database: all, user: postgres, auth_method: peer }
-  - { type: local, database: all, user: all, auth_method: peer }
-  - { type: host, database: all, user: all, address: '127.0.0.1/32', auth_method: md5 }
-  - { type: host, database: all, user: all, address: '::1/128', auth_method: md5 }
+  - {type: local, database: all, user: postgres, auth_method: peer}
+  - {type: local, database: all, user: all, auth_method: peer}
+  - {type: host, database: all, user: all, address: '127.0.0.1/32', auth_method: md5}
+  - {type: host, database: all, user: all, address: '::1/128', auth_method: md5}
 
 # Debian only. Used to generate the locales used by PostgreSQL databases.
 postgresql_locales:
@@ -32,30 +35,30 @@ postgresql_locales:
 
 # Databases to ensure exist.
 postgresql_databases: []
-  # - name: exampledb # required; the rest are optional
-  #   lc_collate: # defaults to 'en_US.UTF-8'
-  #   lc_ctype: # defaults to 'en_US.UTF-8'
-  #   encoding: # defaults to 'UTF-8'
-  #   template: # defaults to 'template0'
-  #   login_host: # defaults to 'localhost'
-  #   login_password: # defaults to not set
-  #   login_user: # defaults to '{{ postgresql_user }}'
-  #   login_unix_socket: # defaults to 1st of postgresql_unix_socket_directories
-  #   port: # defaults to not set
-  #   owner: # defaults to postgresql_user
-  #   state: # defaults to 'present'
+# - name: exampledb # required; the rest are optional
+#   lc_collate: # defaults to 'en_US.UTF-8'
+#   lc_ctype: # defaults to 'en_US.UTF-8'
+#   encoding: # defaults to 'UTF-8'
+#   template: # defaults to 'template0'
+#   login_host: # defaults to 'localhost'
+#   login_password: # defaults to not set
+#   login_user: # defaults to '{{ postgresql_user }}'
+#   login_unix_socket: # defaults to 1st of postgresql_unix_socket_directories
+#   port: # defaults to not set
+#   owner: # defaults to postgresql_user
+#   state: # defaults to 'present'
 
 # Users to ensure exist.
 postgresql_users: []
-  # - name: jdoe #required; the rest are optional
-  #   password: # defaults to not set
-  #   encrypted: # defaults to not set
-  #   priv: # defaults to not set
-  #   role_attr_flags: # defaults to not set
-  #   db: # defaults to not set
-  #   login_host: # defaults to 'localhost'
-  #   login_password: # defaults to not set
-  #   login_user: # defaults to '{{ postgresql_user }}'
-  #   login_unix_socket: # defaults to 1st of postgresql_unix_socket_directories
-  #   port: # defaults to not set
-  #   state: # defaults to 'present'
+# - name: jdoe #required; the rest are optional
+#   password: # defaults to not set
+#   encrypted: # defaults to not set
+#   priv: # defaults to not set
+#   role_attr_flags: # defaults to not set
+#   db: # defaults to not set
+#   login_host: # defaults to 'localhost'
+#   login_password: # defaults to not set
+#   login_user: # defaults to '{{ postgresql_user }}'
+#   login_unix_socket: # defaults to 1st of postgresql_unix_socket_directories
+#   port: # defaults to not set
+#   state: # defaults to 'present'
diff --git a/provisioning/roles/geerlingguy.postgresql/meta/main.yml b/provisioning/roles/geerlingguy.postgresql/meta/main.yml
index 8ed8f82fb..ccdd8577d 100644
--- a/provisioning/roles/geerlingguy.postgresql/meta/main.yml
+++ b/provisioning/roles/geerlingguy.postgresql/meta/main.yml
@@ -10,14 +10,14 @@ galaxy_info:
   platforms:
     - name: EL
       versions:
-      - 6
-      - 7
+        - 6
+        - 7
     - name: Ubuntu
       versions:
-      - all
+        - all
     - name: Debian
       versions:
-      - all
+        - all
   galaxy_tags:
     - database
     - postgresql
diff --git a/provisioning/roles/geerlingguy.postgresql/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.postgresql/molecule/default/molecule.yml
new file mode 100644
index 000000000..033970241
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/molecule/default/molecule.yml
@@ -0,0 +1,27 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint:
+  name: yamllint
+  options:
+    config-file: molecule/default/yaml-lint.yml
+platforms:
+  - name: instance
+    image: geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible
+    command: ${MOLECULE_DOCKER_COMMAND:-"sleep infinity"}
+    privileged: true
+    pre_build_image: true
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+  playbooks:
+    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
+scenario:
+  name: default
+verifier:
+  name: testinfra
+  lint:
+    name: flake8
diff --git a/provisioning/roles/geerlingguy.postgresql/tests/test.yml b/provisioning/roles/geerlingguy.postgresql/molecule/default/playbook.yml
similarity index 50%
rename from provisioning/roles/geerlingguy.postgresql/tests/test.yml
rename to provisioning/roles/geerlingguy.postgresql/molecule/default/playbook.yml
index 45dd9b554..5f152a6ca 100644
--- a/provisioning/roles/geerlingguy.postgresql/tests/test.yml
+++ b/provisioning/roles/geerlingguy.postgresql/molecule/default/playbook.yml
@@ -1,5 +1,7 @@
 ---
-- hosts: all
+- name: Converge
+  hosts: all
+  become: true
 
   vars:
     postgresql_databases:
@@ -9,7 +11,7 @@
 
   pre_tasks:
     - name: Update apt cache.
-      apt: update_cache=yes cache_valid_time=600
+      apt: update_cache=true cache_valid_time=600
       when: ansible_os_family == 'Debian'
 
     - name: Set custom variables for old CentOS 6 PostgreSQL install.
@@ -18,7 +20,16 @@
         postgresql_global_config_options:
           - option: unix_socket_directory
             value: '{{ postgresql_unix_socket_directories[0] }}'
-      when: ansible_os_family == 'RedHat' and ansible_distribution_version.split('.')[0] == '6'
+      when:
+        - ansible_os_family == 'RedHat'
+        - ansible_distribution_version.split('.')[0] == '6'
 
   roles:
-    - role_under_test
+    - role: geerlingguy.postgresql
+
+  post_tasks:
+    - name: Verify postgres is running.
+      command: "{{ postgresql_bin_path }}/pg_ctl -D {{ postgresql_data_dir }} status"
+      changed_when: false
+      become: true
+      become_user: postgres
diff --git a/provisioning/roles/geerlingguy.postgresql/molecule/default/tests/test_default.py b/provisioning/roles/geerlingguy.postgresql/molecule/default/tests/test_default.py
new file mode 100644
index 000000000..eedd64a1d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/molecule/default/tests/test_default.py
@@ -0,0 +1,14 @@
+import os
+
+import testinfra.utils.ansible_runner
+
+testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
+    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
+
+
+def test_hosts_file(host):
+    f = host.file('/etc/hosts')
+
+    assert f.exists
+    assert f.user == 'root'
+    assert f.group == 'root'
diff --git a/provisioning/roles/geerlingguy.postgresql/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.postgresql/molecule/default/yaml-lint.yml
new file mode 100644
index 000000000..a3dbc38ee
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/molecule/default/yaml-lint.yml
@@ -0,0 +1,6 @@
+---
+extends: default
+rules:
+  line-length:
+    max: 120
+    level: warning
diff --git a/provisioning/roles/geerlingguy.postgresql/tasks/databases.yml b/provisioning/roles/geerlingguy.postgresql/tasks/databases.yml
index fa782ea9f..e01d804d4 100644
--- a/provisioning/roles/geerlingguy.postgresql/tasks/databases.yml
+++ b/provisioning/roles/geerlingguy.postgresql/tasks/databases.yml
@@ -14,7 +14,7 @@
     owner: "{{ item.owner | default(postgresql_user) }}"
     state: "{{ item.state | default('present') }}"
   with_items: "{{ postgresql_databases }}"
-  become: yes
+  become: true
   become_user: "{{ postgresql_user }}"
   # See: https://github.com/ansible/ansible/issues/16048#issuecomment-229012509
   vars:
diff --git a/provisioning/roles/geerlingguy.postgresql/tasks/initialize.yml b/provisioning/roles/geerlingguy.postgresql/tasks/initialize.yml
index 44ffd9b31..018312114 100644
--- a/provisioning/roles/geerlingguy.postgresql/tasks/initialize.yml
+++ b/provisioning/roles/geerlingguy.postgresql/tasks/initialize.yml
@@ -22,7 +22,7 @@
 - name: Ensure PostgreSQL database is initialized.
   command: "{{ postgresql_bin_path }}/initdb -D {{ postgresql_data_dir }}"
   when: not pgdata_dir_version.stat.exists
-  become: yes
+  become: true
   become_user: "{{ postgresql_user }}"
   # See: https://github.com/ansible/ansible/issues/16048#issuecomment-229012509
   vars:
diff --git a/provisioning/roles/geerlingguy.postgresql/tasks/main.yml b/provisioning/roles/geerlingguy.postgresql/tasks/main.yml
index 6859c7395..fce7db840 100644
--- a/provisioning/roles/geerlingguy.postgresql/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.postgresql/tasks/main.yml
@@ -15,8 +15,8 @@
 - name: Ensure PostgreSQL is started and enabled on boot.
   service:
     name: "{{ postgresql_daemon }}"
-    state: started
-    enabled: yes
+    state: "{{ postgresql_service_state }}"
+    enabled: "{{ postgresql_service_enabled }}"
 
 # Configure PostgreSQL.
 - import_tasks: databases.yml
diff --git a/provisioning/roles/geerlingguy.postgresql/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.postgresql/tasks/setup-RedHat.yml
index da39ac151..9cd84ed01 100644
--- a/provisioning/roles/geerlingguy.postgresql/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.postgresql/tasks/setup-RedHat.yml
@@ -1,13 +1,12 @@
 ---
 - name: Ensure PostgreSQL packages are installed.
   package:
-    name: "{{ item }}"
+    name: "{{ postgresql_packages }}"
     state: present
-    enablerepo: "{{ postgresql_enablerepo }}"
-  with_items: "{{ postgresql_packages }}"
+    enablerepo: "{{ postgresql_enablerepo | default(omit, true) }}"
 
 - name: Ensure PostgreSQL Python libraries are installed.
   package:
     name: "{{ postgresql_python_library }}"
     state: present
-    enablerepo: "{{ postgresql_enablerepo }}"
+    enablerepo: "{{ postgresql_enablerepo | default(omit, true) }}"
diff --git a/provisioning/roles/geerlingguy.postgresql/tasks/users.yml b/provisioning/roles/geerlingguy.postgresql/tasks/users.yml
index fb7f5dea4..34746ebe9 100644
--- a/provisioning/roles/geerlingguy.postgresql/tasks/users.yml
+++ b/provisioning/roles/geerlingguy.postgresql/tasks/users.yml
@@ -15,7 +15,7 @@
     state: "{{ item.state | default('present') }}"
   with_items: "{{ postgresql_users }}"
   no_log: true
-  become: yes
+  become: true
   become_user: "{{ postgresql_user }}"
   # See: https://github.com/ansible/ansible/issues/16048#issuecomment-229012509
   vars:
diff --git a/provisioning/roles/geerlingguy.postgresql/tests/README.md b/provisioning/roles/geerlingguy.postgresql/tests/README.md
deleted file mode 100644
index 6fb211721..000000000
--- a/provisioning/roles/geerlingguy.postgresql/tests/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Ansible Role tests
-
-To run the test playbook(s) in this directory:
-
-  1. Install and start Docker.
-  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
-    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
-  1. Make the test shim executable: `chmod +x tests/test.sh`.
-  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
-
-If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.postgresql/vars/Debian-7.yml b/provisioning/roles/geerlingguy.postgresql/vars/Debian-7.yml
index 4d3a8ead0..6b933bbc0 100644
--- a/provisioning/roles/geerlingguy.postgresql/vars/Debian-7.yml
+++ b/provisioning/roles/geerlingguy.postgresql/vars/Debian-7.yml
@@ -7,4 +7,4 @@ __postgresql_daemon: postgresql
 __postgresql_packages:
   - postgresql
   - postgresql-contrib
-  - libpq-dev
\ No newline at end of file
+  - libpq-dev
diff --git a/provisioning/roles/geerlingguy.repo-dotdeb/.travis.yml b/provisioning/roles/geerlingguy.repo-dotdeb/.travis.yml
deleted file mode 100644
index 590ce0c36..000000000
--- a/provisioning/roles/geerlingguy.repo-dotdeb/.travis.yml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-sudo: required
-
-env:
-  - distro: debian8
-    init: /lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-
-services:
-  - docker
-
-before_install:
-  # Pull container.
-  - 'sudo docker pull geerlingguy/docker-${distro}-ansible:latest'
-
-script:
-  - container_id=$(mktemp)
-  # Run container in detached state.
-  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
-
-  # Install dependencies.
-  - 'sudo docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
-
-  # Ansible syntax check.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
-
-  # Test role.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
-
-  # Test role idempotence.
-  - idempotence=$(mktemp)
-  - sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml | tee -a ${idempotence}
-  - >
-    tail ${idempotence}
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
-
-after_success:
-  # Clean up.
-  - 'sudo docker stop "$(cat ${container_id})"'
-
-notifications:
-  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.repo-dotdeb/README.md b/provisioning/roles/geerlingguy.repo-dotdeb/README.md
deleted file mode 100644
index 09398001d..000000000
--- a/provisioning/roles/geerlingguy.repo-dotdeb/README.md
+++ /dev/null
@@ -1,38 +0,0 @@
-# Ansible Role: DotDeb Repository
-
-[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-repo-dotdeb.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-repo-dotdeb)
-
-Installs the [DotDeb repository](https://www.dotdeb.org/) for Debian.
-
-## Requirements
-
-This role only is needed/runs on Debian and its derivatives.
-
-## Role Variables
-
-Available variables are listed below, along with default values (see `defaults/main.yml`):
-
-    dotdeb_sources:
-      - "deb http://packages.dotdeb.org {{ ansible_distribution_release }} all"
-      - "deb-src http://packages.dotdeb.org {{ ansible_distribution_release }} all"
-    dotdeb_repo_gpg_key_url: https://www.dotdeb.org/dotdeb.gpg
-
-The DotDeb repos and GPG key URL. Generally, these should not be changed, but if this role is out of date, or if you need a very specific version, these can both be overridden.
-
-## Dependencies
-
-None.
-
-## Example Playbook
-
-    - hosts: servers
-      roles:
-        - geerlingguy.repo-dotdeb
-
-## License
-
-MIT / BSD
-
-## Author Information
-
-This role was created in 2016 by [Jeff Geerling](http://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.repo-dotdeb/defaults/main.yml b/provisioning/roles/geerlingguy.repo-dotdeb/defaults/main.yml
deleted file mode 100644
index 79c1c5854..000000000
--- a/provisioning/roles/geerlingguy.repo-dotdeb/defaults/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-dotdeb_sources:
-  - "deb http://packages.dotdeb.org {{ ansible_distribution_release }} all"
-  - "deb-src http://packages.dotdeb.org {{ ansible_distribution_release }} all"
-dotdeb_repo_gpg_key_url: https://www.dotdeb.org/dotdeb.gpg
diff --git a/provisioning/roles/geerlingguy.repo-dotdeb/meta/main.yml b/provisioning/roles/geerlingguy.repo-dotdeb/meta/main.yml
deleted file mode 100644
index 81267f676..000000000
--- a/provisioning/roles/geerlingguy.repo-dotdeb/meta/main.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-dependencies: []
-
-galaxy_info:
-  author: geerlingguy
-  description: DotDeb repository for Debian.
-  company: "Midwestern Mac, LLC"
-  license: "license (BSD, MIT)"
-  min_ansible_version: 2.0
-  platforms:
-    - name: Debian
-      versions:
-      - all
-  galaxy_tags:
-    - packaging
diff --git a/provisioning/roles/geerlingguy.repo-dotdeb/tasks/main.yml b/provisioning/roles/geerlingguy.repo-dotdeb/tasks/main.yml
deleted file mode 100644
index d56468425..000000000
--- a/provisioning/roles/geerlingguy.repo-dotdeb/tasks/main.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-- name: Install DotDeb repo.
-  apt_repository:
-    repo: "{{ item }}"
-  with_items: "{{ dotdeb_sources }}"
-  register: dotdeb_apt_repo_result
-
-- name: Import DotDeb GPG key.
-  apt_key:
-    url: "{{ dotdeb_repo_gpg_key_url }}"
-  register: dotdeb_apt_key_result
-
-- name: Update apt cache if repo or key added.
-  apt: update_cache=yes
-  when: dotdeb_apt_repo_result.changed or dotdeb_apt_key_result.changed
diff --git a/provisioning/roles/geerlingguy.repo-dotdeb/tests/test.yml b/provisioning/roles/geerlingguy.repo-dotdeb/tests/test.yml
deleted file mode 100644
index 3646ff420..000000000
--- a/provisioning/roles/geerlingguy.repo-dotdeb/tests/test.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- hosts: all
-
-  roles:
-    - role_under_test

From e8664798e08421db9fc85edfadaf7958750a8907 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 10 Oct 2018 09:21:51 -0500
Subject: [PATCH 1026/1273] Fixes #1743, #1831: Use stable version of Devel via
 Composer.

---
 default.config.yml                            |  2 +-
 example.drupal.composer.json                  |  4 +-
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.drupal/.gitignore       |  3 +-
 .../roles/geerlingguy.drupal/.travis.yml      | 44 +++++++++----------
 .../roles/geerlingguy.drupal/README.md        |  6 +--
 .../geerlingguy.drupal/defaults/main.yml      |  6 +--
 .../roles/geerlingguy.drupal/meta/main.yml    |  6 +--
 .../molecule/default/molecule.yml             | 27 ++++++++++++
 .../default/playbook-deploy.yml}              | 20 +++++----
 .../molecule/default/playbook.yml             | 23 ++++++++++
 .../default}/requirements.yml                 |  0
 .../default}/test-setup.yml                   |  2 +-
 .../{tests => molecule/default}/test-vars.yml |  0
 .../molecule/default/tests/test_default.py    | 14 ++++++
 .../molecule/default/yaml-lint.yml            |  6 +++
 .../tasks/build-composer-project.yml          |  8 ++--
 .../tasks/build-composer.yml                  | 12 ++---
 .../tasks/build-makefile.yml                  |  8 ++--
 .../roles/geerlingguy.drupal/tasks/deploy.yml |  6 +--
 .../geerlingguy.drupal/tasks/install-site.yml |  8 ++--
 .../roles/geerlingguy.drupal/tests/README.md  | 11 -----
 .../geerlingguy.drupal/tests/initctl_faker    | 23 ----------
 .../roles/geerlingguy.drupal/tests/test.yml   | 21 ---------
 24 files changed, 139 insertions(+), 123 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.drupal/molecule/default/molecule.yml
 rename provisioning/roles/geerlingguy.drupal/{tests/test-deploy.yml => molecule/default/playbook-deploy.yml} (69%)
 create mode 100644 provisioning/roles/geerlingguy.drupal/molecule/default/playbook.yml
 rename provisioning/roles/geerlingguy.drupal/{tests => molecule/default}/requirements.yml (100%)
 rename provisioning/roles/geerlingguy.drupal/{tests => molecule/default}/test-setup.yml (98%)
 rename provisioning/roles/geerlingguy.drupal/{tests => molecule/default}/test-vars.yml (100%)
 create mode 100644 provisioning/roles/geerlingguy.drupal/molecule/default/tests/test_default.py
 create mode 100644 provisioning/roles/geerlingguy.drupal/molecule/default/yaml-lint.yml
 delete mode 100644 provisioning/roles/geerlingguy.drupal/tests/README.md
 delete mode 100644 provisioning/roles/geerlingguy.drupal/tests/initctl_faker
 delete mode 100644 provisioning/roles/geerlingguy.drupal/tests/test.yml

diff --git a/default.config.yml b/default.config.yml
index 7a9c40e7a..2e64ac5e7 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -70,7 +70,7 @@ drupal_build_composer: false
 drupal_composer_path: "{{ config_dir }}/drupal.composer.json"
 drupal_composer_install_dir: "/var/www/drupalvm/drupal"
 drupal_composer_dependencies:
-  - "drupal/devel:1.x-dev"
+  - "drupal/devel:^1.2"
 
 # Set this to 'true' and 'drupal_build_makefile', 'drupal_build_composer' to 'false'
 # if you are using Composer's create-project as a site deployment strategy.
diff --git a/example.drupal.composer.json b/example.drupal.composer.json
index 58d433efc..8b4f3b261 100644
--- a/example.drupal.composer.json
+++ b/example.drupal.composer.json
@@ -18,8 +18,8 @@
     "require": {
         "composer/installers": "^1.0.20",
         "drupal-composer/drupal-scaffold": "^2.0.1",
-        "drupal/core": "~8.1",
-        "drupal/devel": "1.x-dev"
+        "drupal/core": "^8.6",
+        "drupal/devel": "^1.2"
     },
     "replace": {
         "drupal/drupal": "*"
diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 79a90cf4c..18b8b6b4d 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -18,7 +18,7 @@
 - src: geerlingguy.daemonize
   version: 1.2.0
 - src: geerlingguy.drupal
-  version: 2.5.0
+  version: 2.5.1
 - src: geerlingguy.drupal-console
   version: 1.1.1
 - src: geerlingguy.drush
diff --git a/provisioning/roles/geerlingguy.drupal/.gitignore b/provisioning/roles/geerlingguy.drupal/.gitignore
index c9b2377e3..f56f5b578 100644
--- a/provisioning/roles/geerlingguy.drupal/.gitignore
+++ b/provisioning/roles/geerlingguy.drupal/.gitignore
@@ -1,2 +1,3 @@
 *.retry
-tests/test.sh
+*/__pycache__
+*.pyc
diff --git a/provisioning/roles/geerlingguy.drupal/.travis.yml b/provisioning/roles/geerlingguy.drupal/.travis.yml
index 5070acc22..9f8c7a04d 100644
--- a/provisioning/roles/geerlingguy.drupal/.travis.yml
+++ b/provisioning/roles/geerlingguy.drupal/.travis.yml
@@ -1,34 +1,32 @@
 ---
+language: python
 services: docker
 
 env:
-  # Composer-project-based Drupal 8 site setup.
-  - distro: centos7
-    playbook: test.yml
-  - distro: debian9
-    playbook: test.yml
-  - distro: ubuntu1604
-    playbook: test.yml
-  - distro: ubuntu1404
-    playbook: test.yml
-  # Git-based Drupal 8 site setup.
-  - distro: centos7
-    playbook: test-deploy.yml
+  global:
+    - ROLE_NAME: drupal
+  matrix:
+    - MOLECULE_DISTRO: centos7
+      MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
+    - MOLECULE_DISTRO: ubuntu1604
+    - MOLECULE_DISTRO: debian9
+    - MOLECULE_DISTRO: centos7
+      MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
+      MOLECULE_PLAYBOOK: playbook-deploy.yml
 
-script:
-  # Configure test script so we can run extra tests after playbook is run.
-  - export container_id=$(date +%s)
-  - export cleanup=false
+install:
+  # Install test dependencies.
+  - pip install molecule docker
 
-  # Download test shim.
-  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
-  - chmod +x ${PWD}/tests/test.sh
+before_script:
+  # Use actual Ansible Galaxy role name for the project directory.
+  - cd ../
+  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
+  - cd geerlingguy.$ROLE_NAME
 
+script:
   # Run tests.
-  - ${PWD}/tests/test.sh
-
-  # Make sure Drupal is running.
-  - 'docker exec --tty ${container_id} env TERM=xterm curl http://localhost/ | grep "Welcome to Drupal"'
+  - molecule test
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.drupal/README.md b/provisioning/roles/geerlingguy.drupal/README.md
index bce9d837d..1b0262f3d 100644
--- a/provisioning/roles/geerlingguy.drupal/README.md
+++ b/provisioning/roles/geerlingguy.drupal/README.md
@@ -27,7 +27,7 @@ Available variables are listed below, along with default values (see `defaults/m
     drupal_deploy_version: master
     drupal_deploy_update: true
     drupal_deploy_dir: "/var/www/drupal"
-    drupal_deploy_accept_hostkey: no
+    drupal_deploy_accept_hostkey: false
 
 Set `drupal_deploy` to `true` and `drupal_build_composer*` to `false` if you would like to deploy Drupal to your server from an existing Git repository. The other options all apply to the Git checkout operation:
 
@@ -39,7 +39,7 @@ Set `drupal_deploy` to `true` and `drupal_build_composer*` to `false` if you wou
 
 You can also control whether a `composer install` is run after the git clone is finished using the following variable:
 
-    drupal_deploy_composer_install: yes
+    drupal_deploy_composer_install: true
 
 ### Build a project from a Drush Make file
 
@@ -55,7 +55,7 @@ Set this to `true` and `drupal_build_composer*` to `false` if you would like to
     drupal_composer_path: "/path/to/drupal.composer.json"
     drupal_composer_install_dir: "/var/www/drupal"
     drupal_composer_dependencies:
-      - "drupal/devel:1.x-dev"
+      - "drupal/devel:^1.2"
 
 Set `drupal_build_makefile` to `false` and this to `true` if you are using a Composer-based site deployment strategy.
 
diff --git a/provisioning/roles/geerlingguy.drupal/defaults/main.yml b/provisioning/roles/geerlingguy.drupal/defaults/main.yml
index b43372fad..08b907e3f 100644
--- a/provisioning/roles/geerlingguy.drupal/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.drupal/defaults/main.yml
@@ -6,8 +6,8 @@ drupal_deploy_repo: ""
 drupal_deploy_version: master
 drupal_deploy_update: true
 drupal_deploy_dir: "/var/www/drupal"
-drupal_deploy_accept_hostkey: no
-drupal_deploy_composer_install: yes
+drupal_deploy_accept_hostkey: false
+drupal_deploy_composer_install: true
 
 # Set this to 'true' and 'drupal_build_composer*' to 'false' if you would like
 # to build a Drupal make file with Drush.
@@ -21,7 +21,7 @@ drupal_build_composer: false
 drupal_composer_path: "/path/to/drupal.composer.json"
 drupal_composer_install_dir: "{{ drupal_deploy_dir }}"
 drupal_composer_dependencies:
-  - "drupal/devel:1.x-dev"
+  - "drupal/devel:^1.2"
 
 # Set this to 'true' and 'drupal_build_makefile', 'drupal_build_composer' to
 # 'false' if you are using Composer's create-project as a site deployment
diff --git a/provisioning/roles/geerlingguy.drupal/meta/main.yml b/provisioning/roles/geerlingguy.drupal/meta/main.yml
index a3e23aee3..839d99180 100644
--- a/provisioning/roles/geerlingguy.drupal/meta/main.yml
+++ b/provisioning/roles/geerlingguy.drupal/meta/main.yml
@@ -10,13 +10,13 @@ galaxy_info:
   platforms:
     - name: EL
       versions:
-      - all
+        - all
     - name: Ubuntu
       versions:
-      - all
+        - all
     - name: Debian
       versions:
-      - all
+        - all
   galaxy_tags:
     - development
     - web
diff --git a/provisioning/roles/geerlingguy.drupal/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.drupal/molecule/default/molecule.yml
new file mode 100644
index 000000000..033970241
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal/molecule/default/molecule.yml
@@ -0,0 +1,27 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint:
+  name: yamllint
+  options:
+    config-file: molecule/default/yaml-lint.yml
+platforms:
+  - name: instance
+    image: geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible
+    command: ${MOLECULE_DOCKER_COMMAND:-"sleep infinity"}
+    privileged: true
+    pre_build_image: true
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+  playbooks:
+    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
+scenario:
+  name: default
+verifier:
+  name: testinfra
+  lint:
+    name: flake8
diff --git a/provisioning/roles/geerlingguy.drupal/tests/test-deploy.yml b/provisioning/roles/geerlingguy.drupal/molecule/default/playbook-deploy.yml
similarity index 69%
rename from provisioning/roles/geerlingguy.drupal/tests/test-deploy.yml
rename to provisioning/roles/geerlingguy.drupal/molecule/default/playbook-deploy.yml
index 6c3cc566c..a819de955 100644
--- a/provisioning/roles/geerlingguy.drupal/tests/test-deploy.yml
+++ b/provisioning/roles/geerlingguy.drupal/molecule/default/playbook-deploy.yml
@@ -1,5 +1,7 @@
 ---
-- hosts: all
+- name: Converge
+  hosts: all
+  become: true
 
   vars_files:
     - test-vars.yml
@@ -24,11 +26,11 @@
       when: ansible_os_family == "RedHat"
     - role: geerlingguy.repo-dotdeb
       when: ansible_distribution == 'Debian'
-    - geerlingguy.apache
-    - geerlingguy.mysql
-    - geerlingguy.php
-    - geerlingguy.php-mysql
-    - geerlingguy.git
-    - geerlingguy.composer
-    - geerlingguy.drush
-    - role_under_test
+    - role: geerlingguy.apache
+    - role: geerlingguy.mysql
+    - role: geerlingguy.php
+    - role: geerlingguy.php-mysql
+    - role: geerlingguy.git
+    - role: geerlingguy.composer
+    - role: geerlingguy.drush
+    - role: geerlingguy.drupal
diff --git a/provisioning/roles/geerlingguy.drupal/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.drupal/molecule/default/playbook.yml
new file mode 100644
index 000000000..d3df1c657
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal/molecule/default/playbook.yml
@@ -0,0 +1,23 @@
+---
+- name: Converge
+  hosts: all
+  become: true
+
+  vars_files:
+    - test-vars.yml
+
+  pre_tasks:
+    - import_tasks: test-setup.yml
+
+  roles:
+    - name: geerlingguy.repo-remi
+      when: ansible_os_family == "RedHat"
+    - role: geerlingguy.repo-dotdeb
+      when: ansible_distribution == 'Debian'
+    - role: geerlingguy.apache
+    - role: geerlingguy.mysql
+    - role: geerlingguy.php
+    - role: geerlingguy.php-mysql
+    - role: geerlingguy.git
+    - role: geerlingguy.composer
+    - role: geerlingguy.drupal
diff --git a/provisioning/roles/geerlingguy.drupal/tests/requirements.yml b/provisioning/roles/geerlingguy.drupal/molecule/default/requirements.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.drupal/tests/requirements.yml
rename to provisioning/roles/geerlingguy.drupal/molecule/default/requirements.yml
diff --git a/provisioning/roles/geerlingguy.drupal/tests/test-setup.yml b/provisioning/roles/geerlingguy.drupal/molecule/default/test-setup.yml
similarity index 98%
rename from provisioning/roles/geerlingguy.drupal/tests/test-setup.yml
rename to provisioning/roles/geerlingguy.drupal/molecule/default/test-setup.yml
index 7d95ea5d0..fe8363f90 100644
--- a/provisioning/roles/geerlingguy.drupal/tests/test-setup.yml
+++ b/provisioning/roles/geerlingguy.drupal/molecule/default/test-setup.yml
@@ -41,6 +41,6 @@
     src: initctl_faker
     dest: /sbin/initctl
     mode: 0755
-    force: yes
+    force: true
   when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '14.04'
   changed_when: false
diff --git a/provisioning/roles/geerlingguy.drupal/tests/test-vars.yml b/provisioning/roles/geerlingguy.drupal/molecule/default/test-vars.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.drupal/tests/test-vars.yml
rename to provisioning/roles/geerlingguy.drupal/molecule/default/test-vars.yml
diff --git a/provisioning/roles/geerlingguy.drupal/molecule/default/tests/test_default.py b/provisioning/roles/geerlingguy.drupal/molecule/default/tests/test_default.py
new file mode 100644
index 000000000..eedd64a1d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal/molecule/default/tests/test_default.py
@@ -0,0 +1,14 @@
+import os
+
+import testinfra.utils.ansible_runner
+
+testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
+    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
+
+
+def test_hosts_file(host):
+    f = host.file('/etc/hosts')
+
+    assert f.exists
+    assert f.user == 'root'
+    assert f.group == 'root'
diff --git a/provisioning/roles/geerlingguy.drupal/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.drupal/molecule/default/yaml-lint.yml
new file mode 100644
index 000000000..db22c42ea
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal/molecule/default/yaml-lint.yml
@@ -0,0 +1,6 @@
+---
+extends: default
+rules:
+  line-length:
+    max: 160
+    level: warning
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/build-composer-project.yml b/provisioning/roles/geerlingguy.drupal/tasks/build-composer-project.yml
index 1d9cbe5d6..9b2f22fdc 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/build-composer-project.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/build-composer-project.yml
@@ -11,9 +11,9 @@
     {{ drupal_composer_project_package }} /tmp/composer-project
     {{ drupal_composer_project_options|default('--prefer-dist --no-interaction') }}
   when: not drupal_site_exists
-  become: no
+  become: false
   environment:
-      COMPOSER_PROCESS_TIMEOUT: 1200
+    COMPOSER_PROCESS_TIMEOUT: 1200
 
 - name: Ensure drupal_composer_install_dir directory has proper permissions.
   file:
@@ -29,7 +29,7 @@
   command: >
     cp -r /tmp/composer-project/. {{ drupal_composer_install_dir }}/
     creates={{ drupal_core_path }}/index.php
-  become: no
+  become: false
   when: not drupal_site_exists
 
 - name: Install dependencies with composer require (this may take a while).
@@ -38,4 +38,4 @@
     arguments: "{{ item }}"
     working_dir: "{{ drupal_composer_install_dir }}"
   with_items: "{{ drupal_composer_dependencies|default([]) }}"
-  become: no
+  become: false
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/build-composer.yml b/provisioning/roles/geerlingguy.drupal/tasks/build-composer.yml
index 508b0a969..1250af312 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/build-composer.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/build-composer.yml
@@ -4,7 +4,7 @@
     path: "{{ drupal_composer_install_dir }}"
     state: directory
     mode: 0775
-  become: no
+  become: false
   when: drupal_composer_path and not drupal_site_exists
 
 # Use copy-and-move to prevent issues in Windows with VirtualBox. See:
@@ -14,19 +14,19 @@
     src: "{{ drupal_composer_path }}"
     dest: "/tmp/drupalvm-composer.json"
   when: drupal_composer_path and not drupal_site_exists
-  become: no
+  become: false
 
 - name: Move composer.json into place.
   command: "mv /tmp/drupalvm-composer.json {{ drupal_composer_install_dir }}/composer.json"
   when: drupal_composer_path and not drupal_site_exists
-  become: no
+  become: false
 
 - name: Run composer install (this may take a while).
   composer:
     command: install
     working_dir: "{{ drupal_composer_install_dir }}"
-  when: not drupal_site_exists
-  become: no
+  when: falset drupal_site_exists
+  become: false
 
 - name: Install dependencies with composer require (this may take a while).
   composer:
@@ -34,4 +34,4 @@
     arguments: "{{ item }}"
     working_dir: "{{ drupal_composer_install_dir }}"
   with_items: "{{ drupal_composer_dependencies|default([]) }}"
-  become: no
+  become: false
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/build-makefile.yml b/provisioning/roles/geerlingguy.drupal/tasks/build-makefile.yml
index 2dc994c4a..2cf132c8a 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/build-makefile.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/build-makefile.yml
@@ -9,9 +9,9 @@
   file:
     path: "{{ drupal_core_path }}"
     state: directory
-    recurse: yes
+    recurse: true
     mode: 0775
-  become: no
+  become: false
   when: not drupal_site_exists
 
 - name: Generate Drupal site with drush makefile.
@@ -19,7 +19,7 @@
     {{ drush_path }} make -y /tmp/drupal.make.yml {{ drush_make_options }}
     chdir={{ drupal_core_path }}
   when: not drupal_site_exists
-  become: no
+  become: false
 
 - name: Check if a composer.json file is present.
   stat: "path={{ drupal_core_path }}/composer.json"
@@ -31,4 +31,4 @@
     composer install
     chdir={{ drupal_core_path }}
   when: not drupal_site_exists and drupal_core_composer_file.stat.exists
-  become: no
+  become: false
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/deploy.yml b/provisioning/roles/geerlingguy.drupal/tasks/deploy.yml
index b6bf53133..04cb3be2c 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/deploy.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/deploy.yml
@@ -13,12 +13,12 @@
     repo: "{{ drupal_deploy_repo }}"
     version: "{{ drupal_deploy_version }}"
     update: "{{ drupal_deploy_update }}"
-    force: yes
+    force: true
     dest: "{{ drupal_deploy_dir }}"
     accept_hostkey: "{{ drupal_deploy_accept_hostkey }}"
   register: drupal_deploy_repo_updated
   notify: clear opcache
-  become: no
+  become: false
 
 - name: Check if a composer.json file is present.
   stat: "path={{ drupal_deploy_dir }}/composer.json"
@@ -31,4 +31,4 @@
   when:
     - drupal_deploy_composer_file.stat.exists == true
     - drupal_deploy_composer_install == true
-  become: no
+  become: false
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/install-site.yml b/provisioning/roles/geerlingguy.drupal/tasks/install-site.yml
index 7a4f5b649..fbb72d0a7 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/install-site.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/install-site.yml
@@ -6,13 +6,13 @@
   register: drupal_site_installed
   failed_when: "drupal_site_installed.stdout is undefined"
   changed_when: false
-  become: no
+  become: false
 
 # See: https://www.drupal.org/node/2569365#comment-11680807
 - name: Configure database correctly if using PostgreSQL.
   command: psql -c "ALTER DATABASE {{ drupal_db_name }} SET bytea_output = 'escape';"
   when: "('Drupal bootstrap' not in drupal_site_installed.stdout) and (drupal_db_backend == 'pgsql')"
-  become: yes
+  become: true
   become_user: "{{ postgresql_user }}"
   # See: https://github.com/ansible/ansible/issues/16048#issuecomment-229012509
   vars:
@@ -31,7 +31,7 @@
     chdir: "{{ drupal_core_path }}"
   notify: clear opcache
   when: "'Drupal bootstrap' not in drupal_site_installed.stdout"
-  become: no
+  become: false
 
 - name: Install configured modules with drush.
   command: >
@@ -40,4 +40,4 @@
   args:
     chdir: "{{ drupal_core_path }}"
   when: ('Drupal bootstrap' not in drupal_site_installed.stdout) and drupal_enable_modules
-  become: no
+  become: false
diff --git a/provisioning/roles/geerlingguy.drupal/tests/README.md b/provisioning/roles/geerlingguy.drupal/tests/README.md
deleted file mode 100644
index 6fb211721..000000000
--- a/provisioning/roles/geerlingguy.drupal/tests/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Ansible Role tests
-
-To run the test playbook(s) in this directory:
-
-  1. Install and start Docker.
-  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
-    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
-  1. Make the test shim executable: `chmod +x tests/test.sh`.
-  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
-
-If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.drupal/tests/initctl_faker b/provisioning/roles/geerlingguy.drupal/tests/initctl_faker
deleted file mode 100644
index a2267f30d..000000000
--- a/provisioning/roles/geerlingguy.drupal/tests/initctl_faker
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-ALIAS_CMD="$(echo ""$0"" | sed -e 's?/sbin/??')"
-
-case "$ALIAS_CMD" in
-    start|stop|restart|reload|status)
-        exec service $1 $ALIAS_CMD
-        ;;
-esac
-
-case "$1" in
-    list )
-        exec service --status-all
-        ;;
-    reload-configuration )
-        exec service $2 restart
-        ;;
-    start|stop|restart|reload|status)
-        exec service $2 $1
-        ;;
-    \?)
-        exit 0
-        ;;
-esac
diff --git a/provisioning/roles/geerlingguy.drupal/tests/test.yml b/provisioning/roles/geerlingguy.drupal/tests/test.yml
deleted file mode 100644
index 73ae792da..000000000
--- a/provisioning/roles/geerlingguy.drupal/tests/test.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-- hosts: all
-
-  vars_files:
-    - test-vars.yml
-
-  pre_tasks:
-    - import_tasks: test-setup.yml
-
-  roles:
-    - name: geerlingguy.repo-remi
-      when: ansible_os_family == "RedHat"
-    - role: geerlingguy.repo-dotdeb
-      when: ansible_distribution == 'Debian'
-    - geerlingguy.apache
-    - geerlingguy.mysql
-    - geerlingguy.php
-    - geerlingguy.php-mysql
-    - geerlingguy.git
-    - geerlingguy.composer
-    - role_under_test

From 1661c3654a2ffb2d8d955f5643e6d6793f983203 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 10 Oct 2018 10:21:06 -0500
Subject: [PATCH 1027/1273] Fixes #1761: Fix more deprecation warnings in
 Ansible 2.7.0.

---
 Vagrantfile                                   |  1 +
 provisioning/requirements.yml                 |  6 +-
 provisioning/roles/geerlingguy.git/.gitignore |  3 +-
 .../roles/geerlingguy.git/.travis.yml         | 77 +++++++-----------
 .../roles/geerlingguy.git/meta/main.yml       | 24 +++---
 .../molecule/default/molecule.yml             | 27 +++++++
 .../default/playbook-source.yml}              |  8 +-
 .../default/playbook.yml}                     |  8 +-
 .../molecule/default/yaml-lint.yml            |  6 ++
 .../tasks/install-from-source.yml             |  6 +-
 .../roles/geerlingguy.git/tasks/main.yml      | 18 +++--
 .../roles/geerlingguy.git/tests/README.md     | 11 ---
 .../roles/geerlingguy.git/vars/Debian.yml     |  1 -
 .../roles/geerlingguy.git/vars/Fedora.yml     |  1 -
 .../roles/geerlingguy.git/vars/RedHat.yml     |  1 -
 .../roles/geerlingguy.git/vars/main.yml       |  1 -
 .../roles/geerlingguy.php-versions/.gitignore |  3 +-
 .../geerlingguy.php-versions/.travis.yml      | 78 +++++++++----------
 .../roles/geerlingguy.php-versions/README.md  |  2 +-
 .../defaults/main.yml                         |  2 +-
 .../molecule/default/molecule.yml             | 27 +++++++
 .../molecule/default/playbook-5.6.yml         | 24 ++++++
 .../molecule/default/playbook-7.2.yml         | 24 ++++++
 .../molecule/default/playbook.yml             | 24 ++++++
 .../default}/requirements.yml                 |  0
 .../molecule/default/tests/test_default.py    | 14 ++++
 .../molecule/default/yaml-lint.yml            |  6 ++
 .../tasks/setup-Debian.yml                    | 16 ++--
 .../geerlingguy.php-versions/tests/README.md  | 11 ---
 .../tests/test-5.6.yml                        | 17 ----
 .../tests/test-7.2.yml                        | 17 ----
 .../geerlingguy.php-versions/tests/test.yml   | 16 ----
 .../vars/Debian-php7.2.yml                    |  1 +
 .../geerlingguy.php-versions/vars/Debian.yml  |  2 +-
 .../roles/geerlingguy.php-xdebug/.gitignore   |  3 +-
 .../roles/geerlingguy.php-xdebug/.travis.yml  | 32 ++++----
 .../roles/geerlingguy.php-xdebug/README.md    |  2 +-
 .../geerlingguy.php-xdebug/defaults/main.yml  |  2 +-
 .../geerlingguy.php-xdebug/meta/main.yml      | 20 ++---
 .../molecule/default/molecule.yml             | 27 +++++++
 .../default/playbook.yml}                     | 17 +++-
 .../default}/requirements.yml                 |  0
 .../molecule/default/tests/test_default.py    | 14 ++++
 .../default}/xdebug-test.php                  |  0
 .../molecule/default/yaml-lint.yml            |  6 ++
 .../geerlingguy.php-xdebug/tasks/main.yml     | 18 ++---
 .../geerlingguy.php-xdebug/tests/README.md    | 11 ---
 provisioning/tasks/extras.yml                 | 14 ++--
 provisioning/tasks/init-Debian.yml            | 25 +++---
 49 files changed, 394 insertions(+), 280 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.git/molecule/default/molecule.yml
 rename provisioning/roles/geerlingguy.git/{tests/test-source.yml => molecule/default/playbook-source.yml} (66%)
 rename provisioning/roles/geerlingguy.git/{tests/test.yml => molecule/default/playbook.yml} (62%)
 create mode 100644 provisioning/roles/geerlingguy.git/molecule/default/yaml-lint.yml
 delete mode 100644 provisioning/roles/geerlingguy.git/tests/README.md
 create mode 100644 provisioning/roles/geerlingguy.php-versions/molecule/default/molecule.yml
 create mode 100644 provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-5.6.yml
 create mode 100644 provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-7.2.yml
 create mode 100644 provisioning/roles/geerlingguy.php-versions/molecule/default/playbook.yml
 rename provisioning/roles/geerlingguy.php-versions/{tests => molecule/default}/requirements.yml (100%)
 create mode 100644 provisioning/roles/geerlingguy.php-versions/molecule/default/tests/test_default.py
 create mode 100644 provisioning/roles/geerlingguy.php-versions/molecule/default/yaml-lint.yml
 delete mode 100644 provisioning/roles/geerlingguy.php-versions/tests/README.md
 delete mode 100644 provisioning/roles/geerlingguy.php-versions/tests/test-5.6.yml
 delete mode 100644 provisioning/roles/geerlingguy.php-versions/tests/test-7.2.yml
 delete mode 100644 provisioning/roles/geerlingguy.php-versions/tests/test.yml
 create mode 100644 provisioning/roles/geerlingguy.php-xdebug/molecule/default/molecule.yml
 rename provisioning/roles/geerlingguy.php-xdebug/{tests/test.yml => molecule/default/playbook.yml} (66%)
 rename provisioning/roles/geerlingguy.php-xdebug/{tests => molecule/default}/requirements.yml (100%)
 create mode 100644 provisioning/roles/geerlingguy.php-xdebug/molecule/default/tests/test_default.py
 rename provisioning/roles/geerlingguy.php-xdebug/{tests => molecule/default}/xdebug-test.php (100%)
 create mode 100644 provisioning/roles/geerlingguy.php-xdebug/molecule/default/yaml-lint.yml
 delete mode 100644 provisioning/roles/geerlingguy.php-xdebug/tests/README.md

diff --git a/Vagrantfile b/Vagrantfile
index f51da2653..7e8c177a6 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -105,6 +105,7 @@ Vagrant.configure('2') do |config|
   end
 
   config.vm.provision provisioner do |ansible|
+    ansible.compatibility_mode = "2.0"
     ansible.playbook = playbook
     ansible.extra_vars = {
       config_dir: config_dir,
diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 18b8b6b4d..8f1015ad8 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -28,7 +28,7 @@
 - src: geerlingguy.firewall
   version: 2.4.1
 - src: geerlingguy.git
-  version: 2.0.2
+  version: 2.0.3
 - src: geerlingguy.java
   version: 1.9.1
 - src: geerlingguy.mailhog
@@ -56,9 +56,9 @@
 - src: geerlingguy.php-tideways
   version: 2.1.0
 - src: geerlingguy.php-versions
-  version: 2.1.3
+  version: 2.1.4
 - src: geerlingguy.php-xdebug
-  version: 2.5.0
+  version: 2.5.1
 - src: geerlingguy.php-xhprof
   version: 2.3.0
 - src: geerlingguy.pimpmylog
diff --git a/provisioning/roles/geerlingguy.git/.gitignore b/provisioning/roles/geerlingguy.git/.gitignore
index c9b2377e3..f56f5b578 100644
--- a/provisioning/roles/geerlingguy.git/.gitignore
+++ b/provisioning/roles/geerlingguy.git/.gitignore
@@ -1,2 +1,3 @@
 *.retry
-tests/test.sh
+*/__pycache__
+*.pyc
diff --git a/provisioning/roles/geerlingguy.git/.travis.yml b/provisioning/roles/geerlingguy.git/.travis.yml
index ea385e7e0..a1c2ef1d1 100644
--- a/provisioning/roles/geerlingguy.git/.travis.yml
+++ b/provisioning/roles/geerlingguy.git/.travis.yml
@@ -1,59 +1,38 @@
 ---
+language: python
 services: docker
 
 env:
-  # Test source install on latest supported OSes.
-  - distro: centos7
-    playbook: test-source.yml
-    GIT_VERSION: 2.16.2
-  - distro: fedora27
-    playbook: test-source.yml
-    GIT_VERSION: 2.16.2
-  - distro: ubuntu1804
-    playbook: test-source.yml
-    GIT_VERSION: 2.16.2
-
-  # Test package install on all supported OSes.
-  - distro: centos7
-    playbook: test.yml
-    GIT_VERSION: 1.8.3.1
-  - distro: centos6
-    playbook: test.yml
-    GIT_VERSION: 1.7.1
-  - distro: fedora27
-    playbook: test.yml
-    GIT_VERSION: 2.14.3
-  - distro: ubuntu1804
-    playbook: test.yml
-    GIT_VERSION: 2.15.1
-  - distro: ubuntu1604
-    playbook: test.yml
-    GIT_VERSION: 2.7.4
-  - distro: ubuntu1404
-    playbook: test.yml
-    GIT_VERSION: 1.9.1
-  - distro: debian8
-    playbook: test.yml
-    GIT_VERSION: 2.1.4
+  global:
+    - ROLE_NAME: git
+  matrix:
+    - MOLECULE_DISTRO: centos7
+      MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
+      MOLECULE_PLAYBOOK: playbook-source.yml
+    - MOLECULE_DISTRO: fedora27
+      MOLECULE_PLAYBOOK: playbook-source.yml
+    - MOLECULE_DISTRO: ubuntu1804
+      MOLECULE_PLAYBOOK: playbook-source.yml
+    - MOLECULE_DISTRO: centos7
+      MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
+    - MOLECULE_DISTRO: centos6
+    - MOLECULE_DISTRO: ubuntu1804
+    - MOLECULE_DISTRO: ubuntu1604
+    - MOLECULE_DISTRO: debian9
+
+install:
+  # Install test dependencies.
+  - pip install molecule docker
+
+before_script:
+  # Use actual Ansible Galaxy role name for the project directory.
+  - cd ../
+  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
+  - cd geerlingguy.$ROLE_NAME
 
 script:
-  # Configure test script so we can run extra tests after playbook is run.
-  - export container_id=$(date +%s)
-  - export cleanup=false
-
-  # Download test shim.
-  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
-  - chmod +x ${PWD}/tests/test.sh
-
   # Run tests.
-  - ${PWD}/tests/test.sh
-
-  # Ensure Git is installed and at the right version.
-  - 'docker exec --tty ${container_id} env TERM=xterm which git'
-  - 'docker exec --tty ${container_id} env TERM=xterm test -x /usr/bin/git'
-
-  - 'docker exec --tty ${container_id} env TERM=xterm git --version'
-  - 'docker exec --tty ${container_id} env TERM=xterm /usr/bin/git --version | grep -qF "$GIT_VERSION"'
+  - molecule test
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.git/meta/main.yml b/provisioning/roles/geerlingguy.git/meta/main.yml
index 716e52633..4e1fd8f32 100644
--- a/provisioning/roles/geerlingguy.git/meta/main.yml
+++ b/provisioning/roles/geerlingguy.git/meta/main.yml
@@ -8,18 +8,18 @@ galaxy_info:
   license: "license (BSD, MIT)"
   min_ansible_version: 2.4
   platforms:
-  - name: EL
-    versions:
-    - all
-  - name: Fedora
-    versions:
-    - all
-  - name: Debian
-    versions:
-    - all
-  - name: Ubuntu
-    versions:
-    - all
+    - name: EL
+      versions:
+        - all
+    - name: Fedora
+      versions:
+        - all
+    - name: Debian
+      versions:
+        - all
+    - name: Ubuntu
+      versions:
+        - all
   galaxy_tags:
     - development
     - system
diff --git a/provisioning/roles/geerlingguy.git/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.git/molecule/default/molecule.yml
new file mode 100644
index 000000000..033970241
--- /dev/null
+++ b/provisioning/roles/geerlingguy.git/molecule/default/molecule.yml
@@ -0,0 +1,27 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint:
+  name: yamllint
+  options:
+    config-file: molecule/default/yaml-lint.yml
+platforms:
+  - name: instance
+    image: geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible
+    command: ${MOLECULE_DOCKER_COMMAND:-"sleep infinity"}
+    privileged: true
+    pre_build_image: true
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+  playbooks:
+    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
+scenario:
+  name: default
+verifier:
+  name: testinfra
+  lint:
+    name: flake8
diff --git a/provisioning/roles/geerlingguy.git/tests/test-source.yml b/provisioning/roles/geerlingguy.git/molecule/default/playbook-source.yml
similarity index 66%
rename from provisioning/roles/geerlingguy.git/tests/test-source.yml
rename to provisioning/roles/geerlingguy.git/molecule/default/playbook-source.yml
index 5e71ecda0..59743635c 100644
--- a/provisioning/roles/geerlingguy.git/tests/test-source.yml
+++ b/provisioning/roles/geerlingguy.git/molecule/default/playbook-source.yml
@@ -1,5 +1,7 @@
 ---
-- hosts: all
+- name: Converge
+  hosts: all
+  become: true
 
   vars:
     git_install_from_source: true
@@ -8,9 +10,9 @@
 
   pre_tasks:
     - name: Update apt cache.
-      apt: update_cache=yes cache_valid_time=600
+      apt: update_cache=true cache_valid_time=600
       when: ansible_os_family == 'Debian'
       changed_when: false
 
   roles:
-    - role_under_test
+    - role: geerlingguy.git
diff --git a/provisioning/roles/geerlingguy.git/tests/test.yml b/provisioning/roles/geerlingguy.git/molecule/default/playbook.yml
similarity index 62%
rename from provisioning/roles/geerlingguy.git/tests/test.yml
rename to provisioning/roles/geerlingguy.git/molecule/default/playbook.yml
index 728ac2425..2b5787499 100644
--- a/provisioning/roles/geerlingguy.git/tests/test.yml
+++ b/provisioning/roles/geerlingguy.git/molecule/default/playbook.yml
@@ -1,5 +1,7 @@
 ---
-- hosts: all
+- name: Converge
+  hosts: all
+  become: true
 
   vars:
     git_install_from_source: false
@@ -7,9 +9,9 @@
 
   pre_tasks:
     - name: Update apt cache.
-      apt: update_cache=yes cache_valid_time=600
+      apt: update_cache=true cache_valid_time=600
       when: ansible_os_family == 'Debian'
       changed_when: false
 
   roles:
-    - role_under_test
+    - role: geerlingguy.git
diff --git a/provisioning/roles/geerlingguy.git/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.git/molecule/default/yaml-lint.yml
new file mode 100644
index 000000000..db22c42ea
--- /dev/null
+++ b/provisioning/roles/geerlingguy.git/molecule/default/yaml-lint.yml
@@ -0,0 +1,6 @@
+---
+extends: default
+rules:
+  line-length:
+    max: 160
+    level: warning
diff --git a/provisioning/roles/geerlingguy.git/tasks/install-from-source.yml b/provisioning/roles/geerlingguy.git/tasks/install-from-source.yml
index 18c25e21e..008bf68c2 100644
--- a/provisioning/roles/geerlingguy.git/tasks/install-from-source.yml
+++ b/provisioning/roles/geerlingguy.git/tasks/install-from-source.yml
@@ -35,7 +35,7 @@
     warn=no
   changed_when: false
   failed_when: false
-  check_mode: no
+  check_mode: false
   register: git_installed_version
 
 - name: Force git install if the version numbers do not match.
@@ -56,7 +56,7 @@
     src: "{{ workspace }}/git-{{ git_version }}.tar.gz"
     dest: "{{ workspace }}"
     creates: "{{ workspace }}/git-{{ git_version }}/README"
-    copy: no
+    copy: false
   when: (git_installed_version.rc != 0) or git_reinstall_from_source
 
 - name: Build git.
@@ -67,4 +67,4 @@
     - all
     - install
   when: (git_installed_version.rc != 0) or git_reinstall_from_source
-  become: yes
+  become: true
diff --git a/provisioning/roles/geerlingguy.git/tasks/main.yml b/provisioning/roles/geerlingguy.git/tasks/main.yml
index 055b57e98..99cac22ea 100644
--- a/provisioning/roles/geerlingguy.git/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.git/tasks/main.yml
@@ -1,22 +1,24 @@
 ---
 - name: Ensure git is installed (RedHat).
   package:
-    name: "{{ item }}"
+    name: "{{ git_packages }}"
     state: present
-    enablerepo: "{{ git_enablerepo }}"
-  with_items: "{{ git_packages }}"
-  when: (git_install_from_source == false) and (ansible_os_family == 'RedHat')
+    enablerepo: "{{ git_enablerepo | default(omit, true) }}"
+  when:
+    - git_install_from_source == false
+    - ansible_os_family == 'RedHat'
 
 - name: Update apt cache (Debian).
-  apt: update_cache=yes cache_valid_time=86400
+  apt: update_cache=true cache_valid_time=86400
   when: ansible_os_family == 'Debian'
 
 - name: Ensure git is installed (Debian).
   apt:
-    name: "{{ item }}"
+    name: "{{ git_packages }}"
     state: present
-  with_items: "{{ git_packages }}"
-  when: (git_install_from_source == false) and (ansible_os_family == 'Debian')
+  when:
+    - git_install_from_source == false
+    - ansible_os_family == 'Debian'
 
 # Install git from source when git_install_from_source is true.
 - import_tasks: install-from-source.yml
diff --git a/provisioning/roles/geerlingguy.git/tests/README.md b/provisioning/roles/geerlingguy.git/tests/README.md
deleted file mode 100644
index 6fb211721..000000000
--- a/provisioning/roles/geerlingguy.git/tests/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Ansible Role tests
-
-To run the test playbook(s) in this directory:
-
-  1. Install and start Docker.
-  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
-    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
-  1. Make the test shim executable: `chmod +x tests/test.sh`.
-  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
-
-If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.git/vars/Debian.yml b/provisioning/roles/geerlingguy.git/vars/Debian.yml
index 66316d876..230e6740b 100644
--- a/provisioning/roles/geerlingguy.git/vars/Debian.yml
+++ b/provisioning/roles/geerlingguy.git/vars/Debian.yml
@@ -7,4 +7,3 @@ git_install_from_source_dependencies:
   - zlib1g-dev
   - build-essential
   - gcc
-
diff --git a/provisioning/roles/geerlingguy.git/vars/Fedora.yml b/provisioning/roles/geerlingguy.git/vars/Fedora.yml
index 5aeb81c0f..c0daee15d 100644
--- a/provisioning/roles/geerlingguy.git/vars/Fedora.yml
+++ b/provisioning/roles/geerlingguy.git/vars/Fedora.yml
@@ -10,4 +10,3 @@ git_install_from_source_dependencies:
   - make
   - gcc
   - tar
-
diff --git a/provisioning/roles/geerlingguy.git/vars/RedHat.yml b/provisioning/roles/geerlingguy.git/vars/RedHat.yml
index d3a8d1ad2..d54dc5b2b 100644
--- a/provisioning/roles/geerlingguy.git/vars/RedHat.yml
+++ b/provisioning/roles/geerlingguy.git/vars/RedHat.yml
@@ -9,4 +9,3 @@ git_install_from_source_dependencies:
   - subversion-perl
   - make
   - gcc
-
diff --git a/provisioning/roles/geerlingguy.git/vars/main.yml b/provisioning/roles/geerlingguy.git/vars/main.yml
index a4b7c64f8..10e268ab3 100644
--- a/provisioning/roles/geerlingguy.git/vars/main.yml
+++ b/provisioning/roles/geerlingguy.git/vars/main.yml
@@ -1,3 +1,2 @@
 ---
 # This space intentionally left blank.
-
diff --git a/provisioning/roles/geerlingguy.php-versions/.gitignore b/provisioning/roles/geerlingguy.php-versions/.gitignore
index c9b2377e3..f56f5b578 100644
--- a/provisioning/roles/geerlingguy.php-versions/.gitignore
+++ b/provisioning/roles/geerlingguy.php-versions/.gitignore
@@ -1,2 +1,3 @@
 *.retry
-tests/test.sh
+*/__pycache__
+*.pyc
diff --git a/provisioning/roles/geerlingguy.php-versions/.travis.yml b/provisioning/roles/geerlingguy.php-versions/.travis.yml
index 72266dcc0..35ade2e00 100644
--- a/provisioning/roles/geerlingguy.php-versions/.travis.yml
+++ b/provisioning/roles/geerlingguy.php-versions/.travis.yml
@@ -1,53 +1,49 @@
 ---
+language: python
 services: docker
 
 env:
   global:
-    php_version: "7.1"
-
+    - ROLE_NAME: php-versions
   matrix:
-    # Default - PHP 7.1
-    - distro: centos7
-    - distro: debian9
-    - distro: ubuntu1804
-    - distro: ubuntu1604
-
-    # PHP 7.2
-    - distro: centos7
-      playbook: test-7.2.yml
-      php_version: "7.2"
-    - distro: ubuntu1804
-      playbook: test-7.2.yml
-      php_version: "7.2"
-    - distro: ubuntu1604
-      playbook: test-7.2.yml
-      php_version: "7.2"
-    - distro: debian9
-      playbook: test-7.2.yml
-      php_version: "7.2"
-
-    # PHP 5.6
-    - distro: centos7
-      playbook: test-5.6.yml
-      php_version: "5.6"
-    - distro: ubuntu1804
-      playbook: test-5.6.yml
-      php_version: "5.6"
+    # Default PHP version.
+    - MOLECULE_DISTRO: centos7
+      MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
+    - MOLECULE_DISTRO: ubuntu1804
+    - MOLECULE_DISTRO: ubuntu1604
+    - MOLECULE_DISTRO: debian9
+
+    # PHP 7.2.
+    - MOLECULE_DISTRO: centos7
+      MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
+      MOLECULE_PLAYBOOK: playbook-7.2.yml
+    - MOLECULE_DISTRO: ubuntu1804
+      MOLECULE_PLAYBOOK: playbook-7.2.yml
+    - MOLECULE_DISTRO: ubuntu1604
+      MOLECULE_PLAYBOOK: playbook-7.2.yml
+    - MOLECULE_DISTRO: debian9
+      MOLECULE_PLAYBOOK: playbook-7.2.yml
+
+    # PHP 5.6.
+    - MOLECULE_DISTRO: centos7
+      MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
+      MOLECULE_PLAYBOOK: playbook-5.6.yml
+    - MOLECULE_DISTRO: ubuntu1804
+      MOLECULE_PLAYBOOK: playbook-5.6.yml
+
+install:
+  # Install test dependencies.
+  - pip install molecule docker
+
+before_script:
+  # Use actual Ansible Galaxy role name for the project directory.
+  - cd ../
+  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
+  - cd geerlingguy.$ROLE_NAME
 
 script:
-  # Configure test script so we can run extra tests after playbook is run.
-  - export container_id=$(date +%s)
-  - export cleanup=false
-
-  # Download test shim.
-  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
-  - chmod +x ${PWD}/tests/test.sh
-
   # Run tests.
-  - ${PWD}/tests/test.sh
-
-  # Run script to test PHP version.
-  - 'docker exec ${container_id} env TERM=xterm php -v | grep -F "${php_version}."'
+  - molecule test
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.php-versions/README.md b/provisioning/roles/geerlingguy.php-versions/README.md
index 0f5f0fe72..8318361d2 100644
--- a/provisioning/roles/geerlingguy.php-versions/README.md
+++ b/provisioning/roles/geerlingguy.php-versions/README.md
@@ -16,7 +16,7 @@ Available variables are listed below, along with default values (see `defaults/m
 
 The PHP version to be installed. Any [currently-supported PHP major version](http://php.net/supported-versions.php) is a valid option (e.g. `5.6`, `7.0`, `7.1`, etc.
 
-    php_versions_install_recommends: no
+    php_versions_install_recommends: false
 
 (For Debian OSes only) Whether to install recommended packages. This is set to `no` by default because setting it to `yes` often leads to multiple PHP versions being installed (thus making a bit of a mess) when using repos like Ondrej's PHP PPA for Ubuntu.
 
diff --git a/provisioning/roles/geerlingguy.php-versions/defaults/main.yml b/provisioning/roles/geerlingguy.php-versions/defaults/main.yml
index 4a8113d08..c2a10a0bd 100644
--- a/provisioning/roles/geerlingguy.php-versions/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.php-versions/defaults/main.yml
@@ -3,4 +3,4 @@
 php_version: '7.1'
 
 # For Debian OSes only.
-php_versions_install_recommends: no
+php_versions_install_recommends: false
diff --git a/provisioning/roles/geerlingguy.php-versions/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.php-versions/molecule/default/molecule.yml
new file mode 100644
index 000000000..033970241
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-versions/molecule/default/molecule.yml
@@ -0,0 +1,27 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint:
+  name: yamllint
+  options:
+    config-file: molecule/default/yaml-lint.yml
+platforms:
+  - name: instance
+    image: geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible
+    command: ${MOLECULE_DOCKER_COMMAND:-"sleep infinity"}
+    privileged: true
+    pre_build_image: true
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+  playbooks:
+    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
+scenario:
+  name: default
+verifier:
+  name: testinfra
+  lint:
+    name: flake8
diff --git a/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-5.6.yml b/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-5.6.yml
new file mode 100644
index 000000000..915c296b8
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-5.6.yml
@@ -0,0 +1,24 @@
+---
+- name: Converge
+  hosts: all
+  become: true
+
+  vars:
+    php_enable_webserver: false
+    php_version: '5.6'
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=true cache_valid_time=600
+      when: ansible_os_family == 'Debian'
+
+  roles:
+    - role: geerlingguy.repo-remi
+      when: ansible_os_family == 'RedHat'
+    - role: geerlingguy.php-versions
+    - role: geerlingguy.php
+
+  post_tasks:
+    - name: Confirm PHP version is correct.
+      shell: "php -v | grep -F '{{ php_version }}'"
+      changed_when: false
diff --git a/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-7.2.yml b/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-7.2.yml
new file mode 100644
index 000000000..ccef7323a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-7.2.yml
@@ -0,0 +1,24 @@
+---
+- name: Converge
+  hosts: all
+  become: true
+
+  vars:
+    php_enable_webserver: false
+    php_version: '7.2'
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=true cache_valid_time=600
+      when: ansible_os_family == 'Debian'
+
+  roles:
+    - role: geerlingguy.repo-remi
+      when: ansible_os_family == 'RedHat'
+    - role: geerlingguy.php-versions
+    - role: geerlingguy.php
+
+  post_tasks:
+    - name: Confirm PHP version is correct.
+      shell: "php -v | grep -F '{{ php_version }}'"
+      changed_when: false
diff --git a/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook.yml
new file mode 100644
index 000000000..d9b5f5aed
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook.yml
@@ -0,0 +1,24 @@
+---
+- name: Converge
+  hosts: all
+  become: true
+
+  vars:
+    php_enable_webserver: false
+    php_version: '7.1'
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=true cache_valid_time=600
+      when: ansible_os_family == 'Debian'
+
+  roles:
+    - role: geerlingguy.repo-remi
+      when: ansible_os_family == 'RedHat'
+    - role: geerlingguy.php-versions
+    - role: geerlingguy.php
+
+  post_tasks:
+    - name: Confirm PHP version is correct.
+      shell: "php -v | grep -F '{{ php_version }}'"
+      changed_when: false
diff --git a/provisioning/roles/geerlingguy.php-versions/tests/requirements.yml b/provisioning/roles/geerlingguy.php-versions/molecule/default/requirements.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.php-versions/tests/requirements.yml
rename to provisioning/roles/geerlingguy.php-versions/molecule/default/requirements.yml
diff --git a/provisioning/roles/geerlingguy.php-versions/molecule/default/tests/test_default.py b/provisioning/roles/geerlingguy.php-versions/molecule/default/tests/test_default.py
new file mode 100644
index 000000000..eedd64a1d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-versions/molecule/default/tests/test_default.py
@@ -0,0 +1,14 @@
+import os
+
+import testinfra.utils.ansible_runner
+
+testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
+    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
+
+
+def test_hosts_file(host):
+    f = host.file('/etc/hosts')
+
+    assert f.exists
+    assert f.user == 'root'
+    assert f.group == 'root'
diff --git a/provisioning/roles/geerlingguy.php-versions/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.php-versions/molecule/default/yaml-lint.yml
new file mode 100644
index 000000000..a3dbc38ee
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-versions/molecule/default/yaml-lint.yml
@@ -0,0 +1,6 @@
+---
+extends: default
+rules:
+  line-length:
+    max: 120
+    level: warning
diff --git a/provisioning/roles/geerlingguy.php-versions/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.php-versions/tasks/setup-Debian.yml
index 115dc6e27..55d8b702e 100644
--- a/provisioning/roles/geerlingguy.php-versions/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.php-versions/tasks/setup-Debian.yml
@@ -17,10 +17,10 @@
 # Debian-specific tasks.
 - name: Add dependencies for PHP versions (Debian).
   apt:
-    name: "{{ item }}"
-  with_items:
-    - apt-transport-https
-    - ca-certificates
+    name:
+      - apt-transport-https
+      - ca-certificates
+    state: present
   when: ansible_distribution == "Debian"
 
 - name: Add Ondrej Sury's apt key (Debian).
@@ -37,7 +37,7 @@
   when: ansible_distribution == "Debian"
 
 - name: Update apt caches after repo is added (Debian).
-  apt: update_cache=yes
+  apt: update_cache=true
   when: php_ondrej_debian_repo.changed and (ansible_distribution == "Debian")
 
 # PHP package purges.
@@ -45,11 +45,11 @@
   apt:
     name: "{{ item }}"
     state: absent
-    purge: yes
-    force: yes
-  when: "'php' + php_version not in item"
+    purge: true
+    force: true
   with_items:
     - php5.6-common
     - php7.0-common
     - php7.1-common
     - php7.2-common
+  when: "'php' + php_version not in item"
diff --git a/provisioning/roles/geerlingguy.php-versions/tests/README.md b/provisioning/roles/geerlingguy.php-versions/tests/README.md
deleted file mode 100644
index 6fb211721..000000000
--- a/provisioning/roles/geerlingguy.php-versions/tests/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Ansible Role tests
-
-To run the test playbook(s) in this directory:
-
-  1. Install and start Docker.
-  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
-    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
-  1. Make the test shim executable: `chmod +x tests/test.sh`.
-  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
-
-If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.php-versions/tests/test-5.6.yml b/provisioning/roles/geerlingguy.php-versions/tests/test-5.6.yml
deleted file mode 100644
index 10390d0e1..000000000
--- a/provisioning/roles/geerlingguy.php-versions/tests/test-5.6.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-- hosts: all
-
-  vars:
-    php_enable_webserver: false
-    php_version: "5.6"
-
-  pre_tasks:
-    - name: Update apt cache.
-      apt: update_cache=yes cache_valid_time=600
-      when: ansible_os_family == 'Debian'
-
-  roles:
-    - role: geerlingguy.repo-remi
-      when: ansible_os_family == 'RedHat'
-    - role_under_test
-    - geerlingguy.php
diff --git a/provisioning/roles/geerlingguy.php-versions/tests/test-7.2.yml b/provisioning/roles/geerlingguy.php-versions/tests/test-7.2.yml
deleted file mode 100644
index 5f7070f52..000000000
--- a/provisioning/roles/geerlingguy.php-versions/tests/test-7.2.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-- hosts: all
-
-  vars:
-    php_enable_webserver: false
-    php_version: "7.2"
-
-  pre_tasks:
-    - name: Update apt cache.
-      apt: update_cache=yes cache_valid_time=600
-      when: ansible_os_family == 'Debian'
-
-  roles:
-    - role: geerlingguy.repo-remi
-      when: ansible_os_family == 'RedHat'
-    - role_under_test
-    - geerlingguy.php
diff --git a/provisioning/roles/geerlingguy.php-versions/tests/test.yml b/provisioning/roles/geerlingguy.php-versions/tests/test.yml
deleted file mode 100644
index 0740bbf63..000000000
--- a/provisioning/roles/geerlingguy.php-versions/tests/test.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-- hosts: all
-
-  vars:
-    php_enable_webserver: false
-
-  pre_tasks:
-    - name: Update apt cache.
-      apt: update_cache=yes cache_valid_time=600
-      when: ansible_os_family == 'Debian'
-
-  roles:
-    - role: geerlingguy.repo-remi
-      when: ansible_os_family == 'RedHat'
-    - role_under_test
-    - geerlingguy.php
diff --git a/provisioning/roles/geerlingguy.php-versions/vars/Debian-php7.2.yml b/provisioning/roles/geerlingguy.php-versions/vars/Debian-php7.2.yml
index 7c6674e34..8bdf70ddb 100644
--- a/provisioning/roles/geerlingguy.php-versions/vars/Debian-php7.2.yml
+++ b/provisioning/roles/geerlingguy.php-versions/vars/Debian-php7.2.yml
@@ -1,3 +1,4 @@
+---
 __php_packages:
   - "php{{ php_version }}"
   - "php{{ php_version }}-apcu"
diff --git a/provisioning/roles/geerlingguy.php-versions/vars/Debian.yml b/provisioning/roles/geerlingguy.php-versions/vars/Debian.yml
index 3c7254780..8c6dbcaf4 100644
--- a/provisioning/roles/geerlingguy.php-versions/vars/Debian.yml
+++ b/provisioning/roles/geerlingguy.php-versions/vars/Debian.yml
@@ -1,5 +1,5 @@
 ---
-# Configure PHP paths and packages for PHP 5.6 and PHP 7.0.
+# Configure PHP paths and packages.
 __php_conf_paths:
   - "/etc/php/{{ php_version }}/fpm"
   - "/etc/php/{{ php_version }}/apache2"
diff --git a/provisioning/roles/geerlingguy.php-xdebug/.gitignore b/provisioning/roles/geerlingguy.php-xdebug/.gitignore
index c9b2377e3..f56f5b578 100644
--- a/provisioning/roles/geerlingguy.php-xdebug/.gitignore
+++ b/provisioning/roles/geerlingguy.php-xdebug/.gitignore
@@ -1,2 +1,3 @@
 *.retry
-tests/test.sh
+*/__pycache__
+*.pyc
diff --git a/provisioning/roles/geerlingguy.php-xdebug/.travis.yml b/provisioning/roles/geerlingguy.php-xdebug/.travis.yml
index 994c635dc..a05e4b230 100644
--- a/provisioning/roles/geerlingguy.php-xdebug/.travis.yml
+++ b/provisioning/roles/geerlingguy.php-xdebug/.travis.yml
@@ -1,25 +1,29 @@
 ---
+language: python
 services: docker
 
 env:
-  - distro: centos7
-  - distro: ubuntu1604
-  - distro: debian9
+  global:
+    - ROLE_NAME: php-xdebug
+  matrix:
+    - MOLECULE_DISTRO: centos7
+      MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
+    - MOLECULE_DISTRO: ubuntu1604
+    - MOLECULE_DISTRO: debian9
 
-script:
-  # Configure test script so we can run extra tests after playbook is run.
-  - export container_id=$(date +%s)
-  - export cleanup=false
+install:
+  # Install test dependencies.
+  - pip install molecule docker
 
-  # Download test shim.
-  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
-  - chmod +x ${PWD}/tests/test.sh
+before_script:
+  # Use actual Ansible Galaxy role name for the project directory.
+  - cd ../
+  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
+  - cd geerlingguy.$ROLE_NAME
 
+script:
   # Run tests.
-  - ${PWD}/tests/test.sh
-
-  # Run script to test if Xdebug is available and working.
-  - 'docker exec ${container_id} env TERM=xterm php /etc/ansible/roles/role_under_test/tests/xdebug-test.php'
+  - molecule test
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.php-xdebug/README.md b/provisioning/roles/geerlingguy.php-xdebug/README.md
index 5361cdbb3..8aad1de65 100644
--- a/provisioning/roles/geerlingguy.php-xdebug/README.md
+++ b/provisioning/roles/geerlingguy.php-xdebug/README.md
@@ -54,7 +54,7 @@ The IDE key to use in the URL when making Xdebug requests (e.g. `http://example.
 
 The maximimum function nesting level before Xdebug bails and throws a fatal exception.
 
-    php_xdebug_cli_disable: no
+    php_xdebug_cli_disable: false
 
 (Debian/Ubuntu ONLY) Disable xdebug for the CLI SAPI.
 
diff --git a/provisioning/roles/geerlingguy.php-xdebug/defaults/main.yml b/provisioning/roles/geerlingguy.php-xdebug/defaults/main.yml
index ac1d78ef5..04a40c46b 100644
--- a/provisioning/roles/geerlingguy.php-xdebug/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.php-xdebug/defaults/main.yml
@@ -18,4 +18,4 @@ php_xdebug_idekey: sublime.xdebug
 php_xdebug_max_nesting_level: 256
 
 # Only used on Debian/Ubuntu.
-php_xdebug_cli_disable: no
+php_xdebug_cli_disable: false
diff --git a/provisioning/roles/geerlingguy.php-xdebug/meta/main.yml b/provisioning/roles/geerlingguy.php-xdebug/meta/main.yml
index 5841bc200..9b43d070f 100644
--- a/provisioning/roles/geerlingguy.php-xdebug/meta/main.yml
+++ b/provisioning/roles/geerlingguy.php-xdebug/meta/main.yml
@@ -11,34 +11,34 @@ galaxy_info:
   platforms:
     - name: EL
       versions:
-      - all
+        - all
     - name: GenericUNIX
       versions:
-      - all
+        - all
     - name: Fedora
       versions:
-      - all
+        - all
     - name: opensuse
       versions:
-      - all
+        - all
     - name: GenericBSD
       versions:
-      - all
+        - all
     - name: FreeBSD
       versions:
-      - all
+        - all
     - name: Ubuntu
       versions:
-      - all
+        - all
     - name: SLES
       versions:
-      - all
+        - all
     - name: GenericLinux
       versions:
-      - all
+        - all
     - name: Debian
       versions:
-      - all
+        - all
   galaxy_tags:
     - development
     - web
diff --git a/provisioning/roles/geerlingguy.php-xdebug/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.php-xdebug/molecule/default/molecule.yml
new file mode 100644
index 000000000..033970241
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xdebug/molecule/default/molecule.yml
@@ -0,0 +1,27 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint:
+  name: yamllint
+  options:
+    config-file: molecule/default/yaml-lint.yml
+platforms:
+  - name: instance
+    image: geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible
+    command: ${MOLECULE_DOCKER_COMMAND:-"sleep infinity"}
+    privileged: true
+    pre_build_image: true
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+  playbooks:
+    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
+scenario:
+  name: default
+verifier:
+  name: testinfra
+  lint:
+    name: flake8
diff --git a/provisioning/roles/geerlingguy.php-xdebug/tests/test.yml b/provisioning/roles/geerlingguy.php-xdebug/molecule/default/playbook.yml
similarity index 66%
rename from provisioning/roles/geerlingguy.php-xdebug/tests/test.yml
rename to provisioning/roles/geerlingguy.php-xdebug/molecule/default/playbook.yml
index 942f6d7e6..16f88e582 100644
--- a/provisioning/roles/geerlingguy.php-xdebug/tests/test.yml
+++ b/provisioning/roles/geerlingguy.php-xdebug/molecule/default/playbook.yml
@@ -1,5 +1,7 @@
 ---
-- hosts: all
+- name: Converge
+  hosts: all
+  become: true
 
   vars:
     php_enable_webserver: false
@@ -7,7 +9,7 @@
 
   pre_tasks:
     - name: Update apt cache.
-      apt: update_cache=yes cache_valid_time=600
+      apt: update_cache=true cache_valid_time=600
       when: ansible_os_family == 'Debian'
 
     - name: Set php_packages for PHP 7.0 Debian 8 install.
@@ -27,5 +29,12 @@
       when: ansible_os_family == 'RedHat'
     - role: geerlingguy.repo-dotdeb
       when: ansible_distribution == 'Debian'
-    - geerlingguy.php
-    - role_under_test
+    - role: geerlingguy.php
+    - role: geerlingguy.php-xdebug
+
+  post_tasks:
+    - name: Run test script to confirm XDebug is working.
+      script: xdebug-test.php
+      args:
+        executable: php
+      changed_when: false
diff --git a/provisioning/roles/geerlingguy.php-xdebug/tests/requirements.yml b/provisioning/roles/geerlingguy.php-xdebug/molecule/default/requirements.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.php-xdebug/tests/requirements.yml
rename to provisioning/roles/geerlingguy.php-xdebug/molecule/default/requirements.yml
diff --git a/provisioning/roles/geerlingguy.php-xdebug/molecule/default/tests/test_default.py b/provisioning/roles/geerlingguy.php-xdebug/molecule/default/tests/test_default.py
new file mode 100644
index 000000000..eedd64a1d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xdebug/molecule/default/tests/test_default.py
@@ -0,0 +1,14 @@
+import os
+
+import testinfra.utils.ansible_runner
+
+testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
+    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
+
+
+def test_hosts_file(host):
+    f = host.file('/etc/hosts')
+
+    assert f.exists
+    assert f.user == 'root'
+    assert f.group == 'root'
diff --git a/provisioning/roles/geerlingguy.php-xdebug/tests/xdebug-test.php b/provisioning/roles/geerlingguy.php-xdebug/molecule/default/xdebug-test.php
similarity index 100%
rename from provisioning/roles/geerlingguy.php-xdebug/tests/xdebug-test.php
rename to provisioning/roles/geerlingguy.php-xdebug/molecule/default/xdebug-test.php
diff --git a/provisioning/roles/geerlingguy.php-xdebug/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.php-xdebug/molecule/default/yaml-lint.yml
new file mode 100644
index 000000000..a3dbc38ee
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xdebug/molecule/default/yaml-lint.yml
@@ -0,0 +1,6 @@
+---
+extends: default
+rules:
+  line-length:
+    max: 120
+    level: warning
diff --git a/provisioning/roles/geerlingguy.php-xdebug/tasks/main.yml b/provisioning/roles/geerlingguy.php-xdebug/tasks/main.yml
index 9366df443..6db48bcb3 100644
--- a/provisioning/roles/geerlingguy.php-xdebug/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php-xdebug/tasks/main.yml
@@ -13,15 +13,15 @@
   when: php_xdebug_config_filename is not defined
 
 - name: Ensure dependencies for building from source are installed (RedHat).
-  yum: "name={{ item }} state=present"
-  with_items:
-    - '@development'
+  yum:
+    name: '@development'
+    state: present
   when: ansible_os_family == 'RedHat'
 
 - name: Ensure dependencies for building from source are installed (Debian).
-  apt: "name={{ item }} state=present"
-  with_items:
-    - build-essential
+  apt:
+    name: build-essential
+    state: present
   when: ansible_os_family == 'Debian'
 
 - name: Untar Xdebug.
@@ -29,10 +29,10 @@
     src: "https://xdebug.org/files/xdebug-{{ php_xdebug_version }}.tgz"
     dest: "{{ workspace }}"
     creates: "{{ workspace }}/xdebug-{{ php_xdebug_version }}"
-    copy: no
+    copy: false
 
 - name: Build Xdebug.
-  shell: >
+  command: >
     {{ item }}
     chdir={{ workspace }}/xdebug-{{ php_xdebug_version }}
     creates={{ workspace }}/xdebug-{{ php_xdebug_version }}/modules/xdebug.so
@@ -53,7 +53,7 @@
   copy:
     src: "{{ workspace }}/xdebug-{{ php_xdebug_version }}/modules/xdebug.so"
     dest: "{{ php_xdebug_module_path }}/xdebug-{{ php_xdebug_version }}.so"
-    remote_src: True
+    remote_src: true
   notify: restart webserver
 
 - include_tasks: configure.yml
diff --git a/provisioning/roles/geerlingguy.php-xdebug/tests/README.md b/provisioning/roles/geerlingguy.php-xdebug/tests/README.md
deleted file mode 100644
index 6fb211721..000000000
--- a/provisioning/roles/geerlingguy.php-xdebug/tests/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Ansible Role tests
-
-To run the test playbook(s) in this directory:
-
-  1. Install and start Docker.
-  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
-    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
-  1. Make the test shim executable: `chmod +x tests/test.sh`.
-  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
-
-If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/tasks/extras.yml b/provisioning/tasks/extras.yml
index 1975a1baf..635d2c25b 100644
--- a/provisioning/tasks/extras.yml
+++ b/provisioning/tasks/extras.yml
@@ -1,10 +1,12 @@
 ---
 - name: Install extra apt packages (if any are configured).
-  apt: "name={{ item }} state=present"
-  with_items: "{{ extra_packages | list }}"
-  when: ansible_os_family == 'Debian' and extra_packages | length
+  apt: "name={{ extra_packages | list }} state=present"
+  when:
+    - ansible_os_family == 'Debian'
+    - extra_packages | length
 
 - name: Install extra yum packages (if any are configured).
-  yum: "name={{ item }} state=present"
-  with_items: "{{ extra_packages | list }}"
-  when: ansible_os_family == 'RedHat' and extra_packages | length
+  yum: "name={{ extra_packages | list }} state=present"
+  when:
+    - ansible_os_family == 'RedHat'
+    - extra_packages | length
diff --git a/provisioning/tasks/init-Debian.yml b/provisioning/tasks/init-Debian.yml
index 240950e2b..d707c2d72 100644
--- a/provisioning/tasks/init-Debian.yml
+++ b/provisioning/tasks/init-Debian.yml
@@ -1,23 +1,24 @@
 ---
 - name: Update apt cache if needed.
-  apt: update_cache=yes cache_valid_time=86400
+  apt: update_cache=true cache_valid_time=86400
 
 - name: Install required dependencies.
-  apt: "name={{ item }} state=present"
-  with_items:
-    - curl
-    - python-apt
-    - python-pycurl
-    - sudo
-    - unzip
-    - make
+  apt:
+    name:
+      - curl
+      - python-apt
+      - python-pycurl
+      - sudo
+      - unzip
+      - make
+    state: present
 
 # Ubuntu-specific tasks.
 - name: Add repository for Apache 2.4.9+ (Ubuntu 12/14).
   apt_repository: repo='ppa:ondrej/apache2'
-  when: >
-    (ansible_distribution_release == "precise" or ansible_distribution_release == "trusty") and
-    ansible_distribution == "Ubuntu"
+  when:
+    - ansible_distribution_release == "precise" or ansible_distribution_release == "trusty"
+    - ansible_distribution == "Ubuntu"
 
 - name: Define php_xhprof_html_dir.
   set_fact:

From 2d2439458a9d8ac330fb0651562b2ea58bc089f6 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 10 Oct 2018 10:37:42 -0500
Subject: [PATCH 1028/1273] Add Ansible Lint coverage, and update a couple more
 roles to fix lint issues.

---
 drupal.composer.json                          | 41 ++++++++++++++++
 provisioning/requirements.yml                 |  4 +-
 .../roles/drupalvm.hostname/tasks/main.yml    |  3 +-
 .../roles/geerlingguy.drupal/tasks/main.yml   | 12 ++---
 .../roles/geerlingguy.drush/.gitignore        |  3 +-
 .../roles/geerlingguy.drush/.travis.yml       | 48 +++++++++----------
 .../roles/geerlingguy.drush/README.md         | 20 ++++----
 .../roles/geerlingguy.drush/defaults/main.yml | 17 +++----
 .../roles/geerlingguy.drush/meta/main.yml     | 20 ++++----
 .../molecule/default/molecule.yml             | 27 +++++++++++
 .../default/playbook-composer.yml}            | 35 +++++++-------
 .../default/playbook-source.yml}              | 20 ++++----
 .../default/playbook.yml}                     | 29 +++++------
 .../default}/requirements.yml                 |  0
 .../molecule/default/tests/test_default.py    | 14 ++++++
 .../molecule/default/yaml-lint.yml            |  6 +++
 .../tasks/install-drush-composer.yml          |  4 +-
 .../tasks/install-source.yml                  |  9 ++--
 .../roles/geerlingguy.drush/tests/README.md   | 11 -----
 provisioning/tasks/apparmor.yml               |  5 +-
 tests/run-tests.sh                            |  4 ++
 21 files changed, 212 insertions(+), 120 deletions(-)
 create mode 100644 drupal.composer.json
 create mode 100644 provisioning/roles/geerlingguy.drush/molecule/default/molecule.yml
 rename provisioning/roles/geerlingguy.drush/{tests/test-composer-install.yml => molecule/default/playbook-composer.yml} (66%)
 rename provisioning/roles/geerlingguy.drush/{tests/test-source-install.yml => molecule/default/playbook-source.yml} (54%)
 rename provisioning/roles/geerlingguy.drush/{tests/test.yml => molecule/default/playbook.yml} (69%)
 rename provisioning/roles/geerlingguy.drush/{tests => molecule/default}/requirements.yml (100%)
 create mode 100644 provisioning/roles/geerlingguy.drush/molecule/default/tests/test_default.py
 create mode 100644 provisioning/roles/geerlingguy.drush/molecule/default/yaml-lint.yml
 delete mode 100644 provisioning/roles/geerlingguy.drush/tests/README.md

diff --git a/drupal.composer.json b/drupal.composer.json
new file mode 100644
index 000000000..8b4f3b261
--- /dev/null
+++ b/drupal.composer.json
@@ -0,0 +1,41 @@
+{
+    "name": "custom-project/drupal-vm",
+    "description": "",
+    "type": "project",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "",
+            "role": ""
+        }
+    ],
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "https://packages.drupal.org/8"
+        }
+    ],
+    "require": {
+        "composer/installers": "^1.0.20",
+        "drupal-composer/drupal-scaffold": "^2.0.1",
+        "drupal/core": "^8.6",
+        "drupal/devel": "^1.2"
+    },
+    "replace": {
+        "drupal/drupal": "*"
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true,
+    "extra": {
+        "installer-paths": {
+            "web/core": ["type:drupal-core"],
+            "web/modules/contrib/{$name}": ["type:drupal-module"],
+            "web/profiles/contrib/{$name}": ["type:drupal-profile"],
+            "web/themes/contrib/{$name}": ["type:drupal-theme"],
+            "drush/contrib/{$name}": ["type:drupal-drush"]
+        }
+    },
+    "config": {
+        "process-timeout": 1200
+    }
+}
diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 8f1015ad8..3b5d40100 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -18,11 +18,11 @@
 - src: geerlingguy.daemonize
   version: 1.2.0
 - src: geerlingguy.drupal
-  version: 2.5.1
+  version: 2.5.2
 - src: geerlingguy.drupal-console
   version: 1.1.1
 - src: geerlingguy.drush
-  version: 3.1.1
+  version: 3.1.2
 - src: geerlingguy.elasticsearch
   version: 2.2.0
 - src: geerlingguy.firewall
diff --git a/provisioning/roles/drupalvm.hostname/tasks/main.yml b/provisioning/roles/drupalvm.hostname/tasks/main.yml
index 5dcebbb7c..75c05d063 100644
--- a/provisioning/roles/drupalvm.hostname/tasks/main.yml
+++ b/provisioning/roles/drupalvm.hostname/tasks/main.yml
@@ -21,5 +21,6 @@
   register: set_hostname
 
 - name: Set the hostname for current session.
-  shell: hostname --file /etc/hostname
+  command: hostname --file /etc/hostname
   when: set_hostname.changed
+  tags: ['skip_ansible_lint']
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/main.yml b/provisioning/roles/geerlingguy.drupal/tasks/main.yml
index ea81133f6..7456bfb23 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/main.yml
@@ -17,7 +17,7 @@
     drupal_site_exists: "{{ drupal_site.stat.exists|default(false) }}"
 
 # Deploy Drupal if configured.
-- include_tasks: tasks/deploy.yml
+- include_tasks: deploy.yml
   when: drupal_deploy
 
 - name: Define drupal_deploy_updated
@@ -25,19 +25,19 @@
     drupal_deploy_updated: "{{ (drupal_deploy_repo_updated is defined and drupal_deploy_repo_updated.changed) | default(false) }}"
 
 # Run update tasks if Drupal was updated.
-- include_tasks: tasks/update.yml
+- include_tasks: update.yml
   when: drupal_deploy_updated and drupal_site_exists
 
 # Build makefile if configured.
-- include_tasks: tasks/build-makefile.yml
+- include_tasks: build-makefile.yml
   when: drupal_build_makefile
 
 # Build with composer if configured.
-- include_tasks: tasks/build-composer.yml
+- include_tasks: build-composer.yml
   when: drupal_build_composer
 
 # Build a composer project if configured.
-- include_tasks: tasks/build-composer-project.yml
+- include_tasks: build-composer-project.yml
   when: drupal_build_composer_project
 
 # Set Drush variables.
@@ -52,5 +52,5 @@
   when: drush_vendor_bin.stat.exists
 
 # Install site if configured.
-- include_tasks: tasks/install-site.yml
+- include_tasks: install-site.yml
   when: drupal_install_site
diff --git a/provisioning/roles/geerlingguy.drush/.gitignore b/provisioning/roles/geerlingguy.drush/.gitignore
index c9b2377e3..f56f5b578 100644
--- a/provisioning/roles/geerlingguy.drush/.gitignore
+++ b/provisioning/roles/geerlingguy.drush/.gitignore
@@ -1,2 +1,3 @@
 *.retry
-tests/test.sh
+*/__pycache__
+*.pyc
diff --git a/provisioning/roles/geerlingguy.drush/.travis.yml b/provisioning/roles/geerlingguy.drush/.travis.yml
index fc553676e..1e2fa6a51 100644
--- a/provisioning/roles/geerlingguy.drush/.travis.yml
+++ b/provisioning/roles/geerlingguy.drush/.travis.yml
@@ -1,37 +1,33 @@
 ---
+language: python
 services: docker
 
 env:
-  # Default installation.
-  - distro: centos7
-    playbook: test.yml
-  - distro: ubuntu1604
-    playbook: test.yml
-  - distro: debian9
-    playbook: test.yml
-  - distro: debian8
-    playbook: test.yml
-  # Install from composer.
-  - distro: centos7
-    playbook: test-composer-install.yml
-  # Install from source.
-  - distro: centos7
-    playbook: test-source-install.yml
+  global:
+    - ROLE_NAME: drush
+  matrix:
+    - MOLECULE_DISTRO: centos7
+      MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
+    - MOLECULE_DISTRO: ubuntu1604
+    - MOLECULE_DISTRO: debian9
+    - MOLECULE_DISTRO: centos7
+      MOLECULE_PLAYBOOK: playbook-composer.yml
+    - MOLECULE_DISTRO: centos7
+      MOLECULE_PLAYBOOK: playbook-source.yml
 
-script:
-  # Configure test script so we can run extra tests after playbook is run.
-  - export container_id=$(date +%s)
-  - export cleanup=false
+install:
+  # Install test dependencies.
+  - pip install molecule docker
 
-  # Download test shim.
-  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
-  - chmod +x ${PWD}/tests/test.sh
+before_script:
+  # Use actual Ansible Galaxy role name for the project directory.
+  - cd ../
+  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
+  - cd geerlingguy.$ROLE_NAME
 
+script:
   # Run tests.
-  - ${PWD}/tests/test.sh
-
-  # Test Drush.
-  - 'docker exec --tty ${container_id} env TERM=xterm drush --version || true'
+  - molecule test
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.drush/README.md b/provisioning/roles/geerlingguy.drush/README.md
index 8bc94d6f2..16214b1d7 100644
--- a/provisioning/roles/geerlingguy.drush/README.md
+++ b/provisioning/roles/geerlingguy.drush/README.md
@@ -22,11 +22,11 @@ Available variables are listed below, along with default values (see `defaults/m
 
 It is the recommended way to use `drush`, but there are some situations where you might wish to install and run Drush globally without using Drush Launcher. The following variables control Drush Launcher's installation:
 
-    drush_launcher_install: yes
+    drush_launcher_install: true
 
 Set to `no` if you don't want the launcher installed.
 
-    drush_launcher_version: "0.5.1"
+    drush_launcher_version: "0.6.0"
 
 The version of the Drush Launcher to install. This should exactly match an available [Drush Launcher release](https://github.com/drush-ops/drush-launcher/releases).
 
@@ -42,15 +42,15 @@ The path where drush will be installed and available to your system. Should be i
 
 Some people need to have the full power of `drush` available globally, and this role allows the global install of Drush via Composer. If using this option, make sure you have Composer installed!
 
-    drush_composer_global_install: no
+    drush_composer_global_install: false
 
-Set to `yes` (and set `drush_launcher_install` to `no`) if you want to install `drush` globally using Composer.
+Set to `yes` (and set `drush_launcher_install` to `false`) if you want to install `drush` globally using Composer.
 
     drush_composer_version: "~9.0"
 
 The version constraint for the global Drush installation.
 
-    drush_composer_update: no
+    drush_composer_update: false
 
 Whether to run `composer update drush/drush` to ensure the version of Drush installed globally is the latest version.
 
@@ -64,9 +64,9 @@ The path in which a symlink to the Drush binary installed via Composer should be
 
 You can also install Drush from source if you need a bleeding-edge release, or if you need a specific version which can't be installed via Composer.
 
-    drush_install_from_source: no
+    drush_install_from_source: false
 
-Set to `yes` (and set `drush_launcher_install` to `no`) if you want to install `drush` globally using the Drush source code.
+Set to `yes` (and set `drush_launcher_install` to `false`) if you want to install `drush` globally using the Drush source code.
 
     drush_source_install_bin_path: /usr/local/bin/drush
     drush_source_install_path: /usr/local/share/drush
@@ -77,12 +77,12 @@ The location of the entire drush installation (includes all the supporting files
 
 The version of Drush to install (examples: `"master"` for the bleeding edge, `"8.x"`, `"7.x"`, `"6.2.0"`). This should be a string as it refers to a git branch, tag, or commit hash.
 
-    drush_keep_updated: no
-    drush_force_update: no
+    drush_keep_updated: false
+    drush_force_update: false
 
 Whether to keep Drush up-to-date with the latest revision of the branch specified by `drush_version`, and whether to force the update (e.g. overwrite local modifications to the drush repository).
 
-    drush_force_composer_install: no
+    drush_force_composer_install: false
 
 Use this if you get an error message when provisioning like `Unable to load autoload.php. Run composer install to fetch dependencies and write this file`. It will force a `composer install` inside the Drush directory.
 
diff --git a/provisioning/roles/geerlingguy.drush/defaults/main.yml b/provisioning/roles/geerlingguy.drush/defaults/main.yml
index 60014178d..e8f3fa02d 100644
--- a/provisioning/roles/geerlingguy.drush/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.drush/defaults/main.yml
@@ -1,23 +1,24 @@
 ---
 # Install Drush Launcher.
-drush_launcher_install: yes
+drush_launcher_install: true
 drush_launcher_version: "0.6.0"
-drush_launcher_phar_url: https://github.com/drush-ops/drush-launcher/releases/download/{{ drush_launcher_version }}/drush.phar
+drush_launcher_phar_url: >-
+  https://github.com/drush-ops/drush-launcher/releases/download/{{ drush_launcher_version }}/drush.phar
 drush_launcher_path: /usr/local/bin/drush
 
 # Install Drush via Composer globally.
-drush_composer_global_install: no
+drush_composer_global_install: false
 drush_composer_version: "~9.0"
-drush_composer_update: no
+drush_composer_update: false
 drush_composer_path: /usr/local/bin/drush
 
 # Install from source (git clone + composer-based install).
-drush_install_from_source: no
+drush_install_from_source: false
 drush_source_install_bin_path: /usr/local/bin/drush
 drush_source_install_path: /usr/local/share/drush
 drush_source_install_version: "8.x"
-drush_keep_updated: no
-drush_force_update: no
-drush_force_composer_install: no
+drush_keep_updated: false
+drush_force_update: false
+drush_force_composer_install: false
 drush_composer_cli_options: "--prefer-dist --no-interaction"
 drush_clone_depth: 1
diff --git a/provisioning/roles/geerlingguy.drush/meta/main.yml b/provisioning/roles/geerlingguy.drush/meta/main.yml
index 9c7dba08b..45166d593 100644
--- a/provisioning/roles/geerlingguy.drush/meta/main.yml
+++ b/provisioning/roles/geerlingguy.drush/meta/main.yml
@@ -10,34 +10,34 @@ galaxy_info:
   platforms:
     - name: EL
       versions:
-      - all
+        - all
     - name: GenericUNIX
       versions:
-      - all
+        - all
     - name: Fedora
       versions:
-      - all
+        - all
     - name: opensuse
       versions:
-      - all
+        - all
     - name: GenericBSD
       versions:
-      - all
+        - all
     - name: FreeBSD
       versions:
-      - all
+        - all
     - name: Ubuntu
       versions:
-      - all
+        - all
     - name: SLES
       versions:
-      - all
+        - all
     - name: GenericLinux
       versions:
-      - all
+        - all
     - name: Debian
       versions:
-      - all
+        - all
   galaxy_tags:
     - development
     - web
diff --git a/provisioning/roles/geerlingguy.drush/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.drush/molecule/default/molecule.yml
new file mode 100644
index 000000000..033970241
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drush/molecule/default/molecule.yml
@@ -0,0 +1,27 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint:
+  name: yamllint
+  options:
+    config-file: molecule/default/yaml-lint.yml
+platforms:
+  - name: instance
+    image: geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible
+    command: ${MOLECULE_DOCKER_COMMAND:-"sleep infinity"}
+    privileged: true
+    pre_build_image: true
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+  playbooks:
+    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
+scenario:
+  name: default
+verifier:
+  name: testinfra
+  lint:
+    name: flake8
diff --git a/provisioning/roles/geerlingguy.drush/tests/test-composer-install.yml b/provisioning/roles/geerlingguy.drush/molecule/default/playbook-composer.yml
similarity index 66%
rename from provisioning/roles/geerlingguy.drush/tests/test-composer-install.yml
rename to provisioning/roles/geerlingguy.drush/molecule/default/playbook-composer.yml
index 942eed94c..946e6594a 100644
--- a/provisioning/roles/geerlingguy.drush/tests/test-composer-install.yml
+++ b/provisioning/roles/geerlingguy.drush/molecule/default/playbook-composer.yml
@@ -1,14 +1,20 @@
 ---
-- hosts: all
+- name: Converge
+  hosts: all
+  become: true
 
   vars:
     php_enable_webserver: false
     php_opcache_enable: "0"
 
     # Use Composer global install.
-    drush_launcher_install: no
-    drush_composer_global_install: yes
-    drush_composer_update: yes
+    drush_launcher_install: false
+    drush_composer_global_install: true
+    drush_composer_update: true
+
+  handlers:
+    - name: update apt cache
+      apt: update_cache=true
 
   pre_tasks:
     - name: Enable remi repo for PHP 7.0 (RedHat).
@@ -16,7 +22,7 @@
       when: ansible_os_family == 'RedHat'
 
     - name: Update apt cache.
-      apt: update_cache=yes cache_valid_time=600
+      apt: update_cache=true cache_valid_time=600
       when: ansible_os_family == 'Debian'
 
     - name: Ensure unzip is installed.
@@ -25,10 +31,9 @@
     # Debian-specific tasks.
     - name: Add dependencies for PHP versions (Debian).
       apt:
-        name: "{{ item }}"
-      with_items:
-        - apt-transport-https
-        - ca-certificates
+        name:
+          - apt-transport-https
+          - ca-certificates
       when: ansible_distribution == "Debian"
 
     - name: Add Ondrej Sury's apt key (Debian).
@@ -41,16 +46,14 @@
       apt_repository:
         repo: "deb https://packages.sury.org/php/ {{ ansible_distribution_release }} main"
         state: present
-      register: php_ondrej_debian_repo
       when: ansible_distribution == "Debian"
+      notify: update apt cache
 
-    - name: Update apt caches after repo is added (Debian).
-      apt: update_cache=yes
-      when: php_ondrej_debian_repo.changed and (ansible_distribution == "Debian")
+    - meta: flush_handlers
 
   roles:
     - role: geerlingguy.repo-remi
       when: ansible_os_family == 'RedHat'
-    - geerlingguy.php
-    - geerlingguy.composer
-    - role_under_test
+    - role: geerlingguy.php
+    - role: geerlingguy.composer
+    - role: geerlingguy.drush
diff --git a/provisioning/roles/geerlingguy.drush/tests/test-source-install.yml b/provisioning/roles/geerlingguy.drush/molecule/default/playbook-source.yml
similarity index 54%
rename from provisioning/roles/geerlingguy.drush/tests/test-source-install.yml
rename to provisioning/roles/geerlingguy.drush/molecule/default/playbook-source.yml
index 2fb7c4241..7a353fd0e 100644
--- a/provisioning/roles/geerlingguy.drush/tests/test-source-install.yml
+++ b/provisioning/roles/geerlingguy.drush/molecule/default/playbook-source.yml
@@ -1,12 +1,14 @@
 ---
-- hosts: all
+- name: Converge
+  hosts: all
+  become: true
 
   vars:
     php_enable_webserver: false
     php_opcache_enable: "0"
-    drush_launcher_install: no
-    drush_composer_global_install: no
-    drush_install_from_source: yes
+    drush_launcher_install: false
+    drush_composer_global_install: false
+    drush_install_from_source: true
 
   pre_tasks:
     - name: Enable remi repo for PHP 7.0 (RedHat).
@@ -14,13 +16,13 @@
       when: ansible_os_family == 'RedHat'
 
     - name: Update apt cache.
-      apt: update_cache=yes cache_valid_time=600
+      apt: update_cache=true cache_valid_time=600
       when: ansible_os_family == 'Debian'
 
   roles:
     - role: geerlingguy.repo-remi
       when: ansible_os_family == 'RedHat'
-    - geerlingguy.php
-    - geerlingguy.composer
-    - geerlingguy.git
-    - role_under_test
+    - role: geerlingguy.php
+    - role: geerlingguy.composer
+    - role: geerlingguy.git
+    - role: geerlingguy.drush
diff --git a/provisioning/roles/geerlingguy.drush/tests/test.yml b/provisioning/roles/geerlingguy.drush/molecule/default/playbook.yml
similarity index 69%
rename from provisioning/roles/geerlingguy.drush/tests/test.yml
rename to provisioning/roles/geerlingguy.drush/molecule/default/playbook.yml
index c486a27f7..be1b9ef11 100644
--- a/provisioning/roles/geerlingguy.drush/tests/test.yml
+++ b/provisioning/roles/geerlingguy.drush/molecule/default/playbook.yml
@@ -1,17 +1,23 @@
 ---
-- hosts: all
+- name: Converge
+  hosts: all
+  become: true
 
   vars:
     php_enable_webserver: false
     php_opcache_enable: "0"
 
+  handlers:
+    - name: update apt cache
+      apt: update_cache=true
+
   pre_tasks:
     - name: Enable remi repo for PHP 7.0 (RedHat).
       set_fact: php_enablerepo="remi,remi-php70"
       when: ansible_os_family == 'RedHat'
 
     - name: Update apt cache.
-      apt: update_cache=yes cache_valid_time=600
+      apt: update_cache=true cache_valid_time=600
       when: ansible_os_family == 'Debian'
 
     - name: Ensure unzip is installed.
@@ -20,10 +26,9 @@
     # Debian-specific tasks.
     - name: Add dependencies for PHP versions (Debian).
       apt:
-        name: "{{ item }}"
-      with_items:
-        - apt-transport-https
-        - ca-certificates
+        name:
+          - apt-transport-https
+          - ca-certificates
       when: ansible_distribution == "Debian"
 
     - name: Add Ondrej Sury's apt key (Debian).
@@ -36,16 +41,12 @@
       apt_repository:
         repo: "deb https://packages.sury.org/php/ {{ ansible_distribution_release }} main"
         state: present
-      register: php_ondrej_debian_repo
       when: ansible_distribution == "Debian"
-
-    - name: Update apt caches after repo is added (Debian).
-      apt: update_cache=yes
-      when: php_ondrej_debian_repo.changed and (ansible_distribution == "Debian")
+      notify: update apt cache
 
   roles:
     - role: geerlingguy.repo-remi
       when: ansible_os_family == 'RedHat'
-    - geerlingguy.php
-    - geerlingguy.composer
-    - role_under_test
+    - role: geerlingguy.php
+    - role: geerlingguy.composer
+    - role: geerlingguy.drush
diff --git a/provisioning/roles/geerlingguy.drush/tests/requirements.yml b/provisioning/roles/geerlingguy.drush/molecule/default/requirements.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.drush/tests/requirements.yml
rename to provisioning/roles/geerlingguy.drush/molecule/default/requirements.yml
diff --git a/provisioning/roles/geerlingguy.drush/molecule/default/tests/test_default.py b/provisioning/roles/geerlingguy.drush/molecule/default/tests/test_default.py
new file mode 100644
index 000000000..eedd64a1d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drush/molecule/default/tests/test_default.py
@@ -0,0 +1,14 @@
+import os
+
+import testinfra.utils.ansible_runner
+
+testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
+    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
+
+
+def test_hosts_file(host):
+    f = host.file('/etc/hosts')
+
+    assert f.exists
+    assert f.user == 'root'
+    assert f.group == 'root'
diff --git a/provisioning/roles/geerlingguy.drush/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.drush/molecule/default/yaml-lint.yml
new file mode 100644
index 000000000..a3dbc38ee
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drush/molecule/default/yaml-lint.yml
@@ -0,0 +1,6 @@
+---
+extends: default
+rules:
+  line-length:
+    max: 120
+    level: warning
diff --git a/provisioning/roles/geerlingguy.drush/tasks/install-drush-composer.yml b/provisioning/roles/geerlingguy.drush/tasks/install-drush-composer.yml
index ea7a934f0..2f4d5c5c6 100644
--- a/provisioning/roles/geerlingguy.drush/tasks/install-drush-composer.yml
+++ b/provisioning/roles/geerlingguy.drush/tasks/install-drush-composer.yml
@@ -2,14 +2,14 @@
 - name: Ensure Drush is installed globally via Composer.
   composer:
     command: require
-    global_command: yes
+    global_command: true
     arguments: "drush/drush:{{ drush_composer_version }}"
   register: drush_composer_require
 
 - name: Update global Drush install if configured.
   composer:
     command: update
-    global_command: yes
+    global_command: true
     arguments: "drush/drush --with-dependencies"
   when:
     - drush_composer_update
diff --git a/provisioning/roles/geerlingguy.drush/tasks/install-source.yml b/provisioning/roles/geerlingguy.drush/tasks/install-source.yml
index 0349fc97e..ae183bc56 100644
--- a/provisioning/roles/geerlingguy.drush/tasks/install-source.yml
+++ b/provisioning/roles/geerlingguy.drush/tasks/install-source.yml
@@ -18,7 +18,10 @@
   shell: >
     {{ composer_path }} update {{ drush_composer_cli_options }}
     chdir={{ drush_source_install_path }}
-  when: drush_clone.changed and ansible_distribution == "Debian" and ansible_distribution_release == "wheezy" and drush_composer.stat.exists
+  when:
+    - drush_clone.changed and ansible_distribution == "Debian"
+    - ansible_distribution_release == "wheezy"
+    - drush_composer.stat.exists
 
 - name: Install Drush dependencies with Composer.
   shell: >
@@ -31,10 +34,10 @@
     src: "{{ drush_source_install_path }}/drush"
     dest: "{{ drush_source_install_bin_path }}"
     state: link
-    force: yes
+    force: true
 
 - name: Run drush to finish setting it up.
   command: "{{ drush_source_install_bin_path }}"
   register: drush_result
   changed_when: "'Execute a drush command' not in drush_result.stdout"
-  become: no
+  become: false
diff --git a/provisioning/roles/geerlingguy.drush/tests/README.md b/provisioning/roles/geerlingguy.drush/tests/README.md
deleted file mode 100644
index 6fb211721..000000000
--- a/provisioning/roles/geerlingguy.drush/tests/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Ansible Role tests
-
-To run the test playbook(s) in this directory:
-
-  1. Install and start Docker.
-  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
-    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
-  1. Make the test shim executable: `chmod +x tests/test.sh`.
-  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
-
-If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/tasks/apparmor.yml b/provisioning/tasks/apparmor.yml
index 812388421..c9b6dd09d 100644
--- a/provisioning/tasks/apparmor.yml
+++ b/provisioning/tasks/apparmor.yml
@@ -13,8 +13,11 @@
     src: /etc/apparmor.d/usr.sbin.mysqld
     state: link
   register: mysql_apparmor
-  when: "mysql_slow_query_log_enabled and apparmor_status.rc == 0"
+  when:
+    - mysql_slow_query_log_enabled
+    - apparmor_status.rc == 0
 
 - name: Restart the AppArmor if necessary.
   service: name=apparmor state=restarted
   when: mysql_apparmor.changed
+  tags: ['skip_ansible_lint']
diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index d04e083a2..50cd7d80d 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -101,6 +101,10 @@ docker exec $CONTAINER_ID cp $DRUPALVM_DIR/$COMPOSERFILE ${config_dir:-$DRUPALVM
 printf "\n"${green}"Checking playbook syntax..."${neutral}"\n"
 docker exec --tty $CONTAINER_ID env TERM=xterm ansible-playbook $DRUPALVM_DIR/provisioning/playbook.yml --syntax-check
 
+# Run Ansible Lint.
+docker exec $CONTAINER_ID bash -c "easy_install ansible-lint"
+docker exec $CONTAINER_ID bash -c "cd $DRUPALVM_DIR/provisioning && ansible-lint playbook.yml" || true
+
 # Run the setup playbook.
 printf "\n"${green}"Running the setup playbook..."${neutral}"\n"
 docker exec --tty $CONTAINER_ID env TERM=xterm ansible-playbook /var/www/drupalvm/tests/test-setup.yml

From 93be910113cd68ef4277574a41fdfd2202063dba Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 10 Oct 2018 10:46:27 -0500
Subject: [PATCH 1029/1273] Fix rubocop linting error in Vagrantfile.

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

diff --git a/Vagrantfile b/Vagrantfile
index 7e8c177a6..c96980af2 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -105,7 +105,7 @@ Vagrant.configure('2') do |config|
   end
 
   config.vm.provision provisioner do |ansible|
-    ansible.compatibility_mode = "2.0"
+    ansible.compatibility_mode = '2.0'
     ansible.playbook = playbook
     ansible.extra_vars = {
       config_dir: config_dir,

From b382119700380dc511f3e14c865d8956a7e0906e Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 10 Oct 2018 14:34:18 -0500
Subject: [PATCH 1030/1273] Issue #1832: Update CHANGELOG for 4.9.1 release.

---
 CHANGELOG.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63b23fd8d..f54915a99 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,28 @@
 # Drupal VM Changelog
 
+## 4.9.1 (2018-10-10)
+
+### Breaking Changes
+
+N/A
+
+### New/changed variables in default.config.yml
+
+  * The Devel module dependency in `drupal_composer_dependencies` was changed from `1.x-dev` (which no longer seems to work) to `^1.2`.
+
+### Improvements
+
+  * #1827: Improve Tideways documentation.
+  * #1823: Remove Debian 8 CI test, Debian 9 suffices.
+  * Updated roles: solr, ruby, varnish, nodejs, java, mysql, composer, php, firewall, apache, and many others with fixes for Ansible 2.7+ and linting issues.
+
+### Bugfixes
+
+  * #1761: Fix deprecation warnings in Ansible 2.7.0.
+  * #1822: Update composer role to fix CentOS 7 Composer download bug.
+  * #1743, #1831: Use stable version of Devel via Composer.
+
+
 ## 4.9.0 "Creation of Tron" (2018-06-01)
 
 This release improves compatibility with Ansible 2.4, 2.5 and beyond, and updates almost every Ansible role in Drupal VM.

From 1b5014b41c765a476c4dc668b123e85668f4d86e Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 10 Oct 2018 14:35:25 -0500
Subject: [PATCH 1031/1273] One more CHANGELOG addition for 4.9.1. [ci skip]

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f54915a99..432b7bf16 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ N/A
 ### Improvements
 
   * #1827: Improve Tideways documentation.
+  * #1589: Add name to Ansible provisioner.
   * #1823: Remove Debian 8 CI test, Debian 9 suffices.
   * Updated roles: solr, ruby, varnish, nodejs, java, mysql, composer, php, firewall, apache, and many others with fixes for Ansible 2.7+ and linting issues.
 

From aba6b0da2dc12bcf8134f2f7ed46f9fd9f5e7f34 Mon Sep 17 00:00:00 2001
From: Logan Cox <lo5an@users.noreply.github.com>
Date: Thu, 11 Oct 2018 14:36:09 -0500
Subject: [PATCH 1032/1273] Change include_tasks to import_tasks for always
 tasks.

Tags don't seem to be inherited with `include_tasks` so switch to `import_tasks`.
---
 provisioning/playbook.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 7844eab70..84c62a2e1 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -7,10 +7,10 @@
     - ../default.config.yml
 
   pre_tasks:
-    - include_tasks: tasks/config.yml
+    - import_tasks: tasks/config.yml
       tags: ['always']
 
-    - include_tasks: tasks/backwards-compatibility.yml
+    - import_tasks: tasks/backwards-compatibility.yml
       tags: ['always']
 
     - include_tasks: "tasks/init-{{ ansible_os_family }}.yml"

From c47004e94c418d00399f6666e6884dde67367900 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 12 Oct 2018 09:38:47 -0500
Subject: [PATCH 1033/1273] Update geerlingguy.apache role to latest version.

---
 provisioning/requirements.yml                                | 2 +-
 provisioning/roles/geerlingguy.apache/meta/main.yml          | 4 ++++
 provisioning/roles/geerlingguy.apache/tasks/setup-RedHat.yml | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 3b5d40100..e156cbd32 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -8,7 +8,7 @@
 - src: geerlingguy.adminer
   version: 1.2.0
 - src: geerlingguy.apache
-  version: 3.0.2
+  version: 3.0.3
 - src: geerlingguy.apache-php-fpm
   version: 1.1.0
 - src: geerlingguy.blackfire
diff --git a/provisioning/roles/geerlingguy.apache/meta/main.yml b/provisioning/roles/geerlingguy.apache/meta/main.yml
index bfdb7c234..75ed4949e 100644
--- a/provisioning/roles/geerlingguy.apache/meta/main.yml
+++ b/provisioning/roles/geerlingguy.apache/meta/main.yml
@@ -11,6 +11,9 @@ galaxy_info:
     - name: EL
       versions:
         - all
+    - name: Fedora
+      versions:
+        - all
     - name: Amazon
       versions:
         - all
@@ -33,5 +36,6 @@ galaxy_info:
     - apache
     - webserver
     - html
+    - httpd
 
 allow_duplicates: true
diff --git a/provisioning/roles/geerlingguy.apache/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.apache/tasks/setup-RedHat.yml
index f9c2fc683..dfc901617 100644
--- a/provisioning/roles/geerlingguy.apache/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.apache/tasks/setup-RedHat.yml
@@ -1,6 +1,6 @@
 ---
 - name: Ensure Apache is installed on RHEL.
-  yum:
+  package:
     name: "{{ apache_packages }}"
     state: "{{ apache_packages_state }}"
     enablerepo: "{{ apache_enablerepo | default(omit, true) }}"

From b0a156d1e7458c273386c37497b2009b6541caa3 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 15 Oct 2018 15:56:53 -0500
Subject: [PATCH 1034/1273] Update geerlingguy.php-versions to latest version
 to help with PHP 7.3 compatibility.

---
 provisioning/requirements.yml                                   | 2 +-
 .../roles/geerlingguy.php-versions/tasks/setup-Debian.yml       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index e156cbd32..48d8506c8 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -56,7 +56,7 @@
 - src: geerlingguy.php-tideways
   version: 2.1.0
 - src: geerlingguy.php-versions
-  version: 2.1.4
+  version: 2.1.5
 - src: geerlingguy.php-xdebug
   version: 2.5.1
 - src: geerlingguy.php-xhprof
diff --git a/provisioning/roles/geerlingguy.php-versions/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.php-versions/tasks/setup-Debian.yml
index 55d8b702e..ee4cbcd4b 100644
--- a/provisioning/roles/geerlingguy.php-versions/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.php-versions/tasks/setup-Debian.yml
@@ -52,4 +52,5 @@
     - php7.0-common
     - php7.1-common
     - php7.2-common
+    - php7.3-common
   when: "'php' + php_version not in item"

From 607178fb0d9351d25c8b2dac50253b8d3b91ec07 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 15 Oct 2018 20:27:14 -0500
Subject: [PATCH 1035/1273] Update composer role to latest version.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.composer/.gitignore     |  3 +-
 .../roles/geerlingguy.composer/.travis.yml    | 33 ++++++++++---------
 .../geerlingguy.composer/defaults/main.yml    |  6 ++--
 .../roles/geerlingguy.composer/meta/main.yml  | 20 +++++------
 .../molecule/default/molecule.yml             | 27 +++++++++++++++
 .../default/playbook.yml}                     | 11 ++++---
 .../default}/requirements.yml                 |  0
 .../molecule/default/tests/test_default.py    | 14 ++++++++
 .../molecule/default/yaml-lint.yml            |  6 ++++
 .../tasks/global-require.yml                  |  2 +-
 .../roles/geerlingguy.composer/tasks/main.yml |  8 ++---
 .../geerlingguy.composer/tests/README.md      | 11 -------
 13 files changed, 92 insertions(+), 51 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.composer/molecule/default/molecule.yml
 rename provisioning/roles/geerlingguy.composer/{tests/test.yml => molecule/default/playbook.yml} (86%)
 rename provisioning/roles/geerlingguy.composer/{tests => molecule/default}/requirements.yml (100%)
 create mode 100644 provisioning/roles/geerlingguy.composer/molecule/default/tests/test_default.py
 create mode 100644 provisioning/roles/geerlingguy.composer/molecule/default/yaml-lint.yml
 delete mode 100644 provisioning/roles/geerlingguy.composer/tests/README.md

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 48d8506c8..d1a3ead07 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -14,7 +14,7 @@
 - src: geerlingguy.blackfire
   version: 1.1.0
 - src: geerlingguy.composer
-  version: 1.7.2
+  version: 1.7.3
 - src: geerlingguy.daemonize
   version: 1.2.0
 - src: geerlingguy.drupal
diff --git a/provisioning/roles/geerlingguy.composer/.gitignore b/provisioning/roles/geerlingguy.composer/.gitignore
index c9b2377e3..f56f5b578 100644
--- a/provisioning/roles/geerlingguy.composer/.gitignore
+++ b/provisioning/roles/geerlingguy.composer/.gitignore
@@ -1,2 +1,3 @@
 *.retry
-tests/test.sh
+*/__pycache__
+*.pyc
diff --git a/provisioning/roles/geerlingguy.composer/.travis.yml b/provisioning/roles/geerlingguy.composer/.travis.yml
index fcf6057db..956544678 100644
--- a/provisioning/roles/geerlingguy.composer/.travis.yml
+++ b/provisioning/roles/geerlingguy.composer/.travis.yml
@@ -1,26 +1,29 @@
 ---
+language: python
 services: docker
 
 env:
-  - distro: centos7
-  - distro: fedora27
-  - distro: ubuntu1604
-  - distro: debian9
+  global:
+    - ROLE_NAME: composer
+  matrix:
+    - MOLECULE_DISTRO: centos7
+    - MOLECULE_DISTRO: fedora27
+    - MOLECULE_DISTRO: ubuntu1604
+    - MOLECULE_DISTRO: debian9
 
-script:
-  # Configure test script so we can run extra tests after playbook is run.
-  - export container_id=$(date +%s)
-  - export cleanup=false
+install:
+  # Install test dependencies.
+  - pip install molecule docker
 
-  # Download test shim.
-  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
-  - chmod +x ${PWD}/tests/test.sh
+before_script:
+  # Use actual Ansible Galaxy role name for the project directory.
+  - cd ../
+  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
+  - cd geerlingguy.$ROLE_NAME
 
+script:
   # Run tests.
-  - ${PWD}/tests/test.sh
-
-  # Ensure Composer is installed and working.
-  - 'docker exec --tty ${container_id} env TERM=xterm composer || true'
+  - molecule test
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.composer/defaults/main.yml b/provisioning/roles/geerlingguy.composer/defaults/main.yml
index cf89087e0..d96a43768 100644
--- a/provisioning/roles/geerlingguy.composer/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.composer/defaults/main.yml
@@ -11,14 +11,14 @@ composer_home_group: root
 # A list of packages to install globally. See commented examples below for
 # usage; the 'release' is optional, and defaults to '@stable'.
 composer_global_packages: []
-  # - { name: phpunit/phpunit, release: "4.7.x" }
-  # - { name: phpunit/phpunit, release: "@stable" }
+# - { name: phpunit/phpunit, release: "4.7.x" }
+# - { name: phpunit/phpunit, release: "@stable" }
 
 composer_add_to_path: true
 
 # Add a project vendor/bin directory to the PATH
 composer_add_project_to_path: false
-#composer_project_path: /path/to/project/vendor/bin
+# composer_project_path: /path/to/project/vendor/bin
 
 # GitHub OAuth token (used to help overcome API rate limits).
 composer_github_oauth_token: ''
diff --git a/provisioning/roles/geerlingguy.composer/meta/main.yml b/provisioning/roles/geerlingguy.composer/meta/main.yml
index 125e3b5cc..4d3afbac9 100644
--- a/provisioning/roles/geerlingguy.composer/meta/main.yml
+++ b/provisioning/roles/geerlingguy.composer/meta/main.yml
@@ -10,34 +10,34 @@ galaxy_info:
   platforms:
     - name: EL
       versions:
-      - all
+        - all
     - name: GenericUNIX
       versions:
-      - all
+        - all
     - name: Fedora
       versions:
-      - all
+        - all
     - name: opensuse
       versions:
-      - all
+        - all
     - name: GenericBSD
       versions:
-      - all
+        - all
     - name: FreeBSD
       versions:
-      - all
+        - all
     - name: Ubuntu
       versions:
-      - all
+        - all
     - name: SLES
       versions:
-      - all
+        - all
     - name: GenericLinux
       versions:
-      - all
+        - all
     - name: Debian
       versions:
-      - all
+        - all
   galaxy_tags:
     - packaging
     - web
diff --git a/provisioning/roles/geerlingguy.composer/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.composer/molecule/default/molecule.yml
new file mode 100644
index 000000000..033970241
--- /dev/null
+++ b/provisioning/roles/geerlingguy.composer/molecule/default/molecule.yml
@@ -0,0 +1,27 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint:
+  name: yamllint
+  options:
+    config-file: molecule/default/yaml-lint.yml
+platforms:
+  - name: instance
+    image: geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible
+    command: ${MOLECULE_DOCKER_COMMAND:-"sleep infinity"}
+    privileged: true
+    pre_build_image: true
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+  playbooks:
+    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
+scenario:
+  name: default
+verifier:
+  name: testinfra
+  lint:
+    name: flake8
diff --git a/provisioning/roles/geerlingguy.composer/tests/test.yml b/provisioning/roles/geerlingguy.composer/molecule/default/playbook.yml
similarity index 86%
rename from provisioning/roles/geerlingguy.composer/tests/test.yml
rename to provisioning/roles/geerlingguy.composer/molecule/default/playbook.yml
index 19e8995cc..99b8497ce 100644
--- a/provisioning/roles/geerlingguy.composer/tests/test.yml
+++ b/provisioning/roles/geerlingguy.composer/molecule/default/playbook.yml
@@ -1,6 +1,7 @@
 ---
-- hosts: localhost
-  remote_user: root
+- name: Converge
+  hosts: all
+  become: true
 
   vars:
     php_enablerepo: "remi,remi-php70"
@@ -34,6 +35,6 @@
       when: ansible_os_family == 'RedHat' and ansible_distribution != 'Fedora'
     - role: geerlingguy.repo-dotdeb
       when: ansible_distribution == 'Debian'
-    - geerlingguy.git
-    - geerlingguy.php
-    - role_under_test
+    - role: geerlingguy.git
+    - role: geerlingguy.php
+    - role: geerlingguy.composer
diff --git a/provisioning/roles/geerlingguy.composer/tests/requirements.yml b/provisioning/roles/geerlingguy.composer/molecule/default/requirements.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.composer/tests/requirements.yml
rename to provisioning/roles/geerlingguy.composer/molecule/default/requirements.yml
diff --git a/provisioning/roles/geerlingguy.composer/molecule/default/tests/test_default.py b/provisioning/roles/geerlingguy.composer/molecule/default/tests/test_default.py
new file mode 100644
index 000000000..eedd64a1d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.composer/molecule/default/tests/test_default.py
@@ -0,0 +1,14 @@
+import os
+
+import testinfra.utils.ansible_runner
+
+testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
+    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
+
+
+def test_hosts_file(host):
+    f = host.file('/etc/hosts')
+
+    assert f.exists
+    assert f.user == 'root'
+    assert f.group == 'root'
diff --git a/provisioning/roles/geerlingguy.composer/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.composer/molecule/default/yaml-lint.yml
new file mode 100644
index 000000000..d43c30605
--- /dev/null
+++ b/provisioning/roles/geerlingguy.composer/molecule/default/yaml-lint.yml
@@ -0,0 +1,6 @@
+---
+extends: default
+rules:
+  line-length:
+    max: 140
+    level: warning
diff --git a/provisioning/roles/geerlingguy.composer/tasks/global-require.yml b/provisioning/roles/geerlingguy.composer/tasks/global-require.yml
index d3f2753f3..d817b9975 100644
--- a/provisioning/roles/geerlingguy.composer/tasks/global-require.yml
+++ b/provisioning/roles/geerlingguy.composer/tasks/global-require.yml
@@ -5,7 +5,7 @@
     creates={{ composer_home_path }}/vendor/{{ item.name }}
   environment:
     COMPOSER_HOME: "{{ composer_home_path }}"
-  become: yes
+  become: true
   become_user: "{{ composer_home_owner }}"
   register: composer_global_require_result
   with_items: "{{ composer_global_packages }}"
diff --git a/provisioning/roles/geerlingguy.composer/tasks/main.yml b/provisioning/roles/geerlingguy.composer/tasks/main.yml
index 769ac448f..cf384f2e1 100644
--- a/provisioning/roles/geerlingguy.composer/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.composer/tasks/main.yml
@@ -11,7 +11,7 @@
 - name: Get Composer installer signature.
   uri:
     url: https://composer.github.io/installer.sig
-    return_content: yes
+    return_content: true
   register: composer_installer_signature
   when: not composer_bin.stat.exists
 
@@ -30,13 +30,13 @@
   when: not composer_bin.stat.exists
 
 - name: Move Composer into globally-accessible location.
-  shell: >
+  command: >
     mv /tmp/composer.phar {{ composer_path }}
     creates={{ composer_path }}
   when: not composer_bin.stat.exists
 
 - name: Update Composer to latest version (if configured).
-  shell: >
+  command: >
     {{ php_executable }} {{ composer_path }} self-update
   register: composer_update
   changed_when: "'Updating to version' in composer_update.stdout"
@@ -50,7 +50,7 @@
     state: directory
 
 - name: Add GitHub OAuth token for Composer (if configured).
-  become: yes
+  become: true
   become_user: "{{ composer_home_owner }}"
   template:
     src: "auth.json.j2"
diff --git a/provisioning/roles/geerlingguy.composer/tests/README.md b/provisioning/roles/geerlingguy.composer/tests/README.md
deleted file mode 100644
index 6fb211721..000000000
--- a/provisioning/roles/geerlingguy.composer/tests/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Ansible Role tests
-
-To run the test playbook(s) in this directory:
-
-  1. Install and start Docker.
-  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
-    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
-  1. Make the test shim executable: `chmod +x tests/test.sh`.
-  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
-
-If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`

From a940f825badfac3a9e55a181e9ab734f272ffad8 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 16 Oct 2018 00:03:40 -0500
Subject: [PATCH 1036/1273] Fixes #1843: Drush 9.5.0 was breaking due to some
 pathing issues.

---
 provisioning/requirements.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index d1a3ead07..ac2d94086 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -18,7 +18,7 @@
 - src: geerlingguy.daemonize
   version: 1.2.0
 - src: geerlingguy.drupal
-  version: 2.5.2
+  version: 2.5.3
 - src: geerlingguy.drupal-console
   version: 1.1.1
 - src: geerlingguy.drush

From 725bc62f9a85c3a0b8945c04003c92475b49cdb9 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 16 Oct 2018 00:04:21 -0500
Subject: [PATCH 1037/1273] Fixes #1843: Drush 9.5.0 was breaking due to some
 pathing issues.

---
 .../roles/geerlingguy.drupal/handlers/main.yml     | 13 +++----------
 .../molecule/default/tests/test_default.py         | 14 --------------
 .../roles/geerlingguy.drupal/tasks/main.yml        |  4 ++--
 3 files changed, 5 insertions(+), 26 deletions(-)
 delete mode 100644 provisioning/roles/geerlingguy.drupal/molecule/default/tests/test_default.py

diff --git a/provisioning/roles/geerlingguy.drupal/handlers/main.yml b/provisioning/roles/geerlingguy.drupal/handlers/main.yml
index a27a5f878..dbf5e75f4 100644
--- a/provisioning/roles/geerlingguy.drupal/handlers/main.yml
+++ b/provisioning/roles/geerlingguy.drupal/handlers/main.yml
@@ -1,12 +1,5 @@
 ---
 - name: clear opcache
-  command: >
-    {{ drush_path }} eval
-      "if (function_exists('apc_clear_cache')) {
-        apc_clear_cache();
-      }
-      if (function_exists('opcache_reset')) {
-        opcache_reset();
-      }"
-  args:
-    chdir: "{{ drupal_core_path }}"
+  shell: >
+    cd {{ drupal_core_path }} &&
+    {{ drush_path }} eval "if (function_exists('apc_clear_cache')) { apc_clear_cache(); }; if (function_exists('opcache_reset')) { opcache_reset(); }"
diff --git a/provisioning/roles/geerlingguy.drupal/molecule/default/tests/test_default.py b/provisioning/roles/geerlingguy.drupal/molecule/default/tests/test_default.py
deleted file mode 100644
index eedd64a1d..000000000
--- a/provisioning/roles/geerlingguy.drupal/molecule/default/tests/test_default.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import os
-
-import testinfra.utils.ansible_runner
-
-testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
-    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
-
-
-def test_hosts_file(host):
-    f = host.file('/etc/hosts')
-
-    assert f.exists
-    assert f.user == 'root'
-    assert f.group == 'root'
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/main.yml b/provisioning/roles/geerlingguy.drupal/tasks/main.yml
index 7456bfb23..fb977e96f 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/main.yml
@@ -42,13 +42,13 @@
 
 # Set Drush variables.
 - name: Check if a project specific Drush binary exists.
-  stat: "path={{ drupal_composer_install_dir }}/vendor/drush/drush/drush"
+  stat: "path={{ drupal_composer_install_dir }}/vendor/bin/drush"
   register: drush_vendor_bin
   ignore_errors: true
 
 - name: Use project specific Drush if available.
   set_fact:
-    drush_path: "{{ drupal_composer_install_dir }}/vendor/drush/drush/drush"
+    drush_path: "{{ drupal_composer_install_dir }}/vendor/bin/drush"
   when: drush_vendor_bin.stat.exists
 
 # Install site if configured.

From 8db9081fd48ba96417d92bd776172f6da787a478 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 16 Oct 2018 10:04:02 -0500
Subject: [PATCH 1038/1273] Change directory into Drupal project to make sure
 Drush is working.

---
 tests/run-tests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index 50cd7d80d..10f935314 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -183,7 +183,7 @@ docker exec $CONTAINER_ID curl -sSi --header Host:$IP localhost \
 #   || (echo 'Drush install fail' && cat /tmp/dvm-test && exit 1)
 
 # Drush.
-docker exec $CONTAINER_ID $DRUSH_BIN status \
+docker exec $CONTAINER_ID bash -c "cd $DRUPALVM_DIR && $DRUSH_BIN status" \
   | tee /tmp/dvm-test \
   | grep -q 'Drush' \
   && (echo 'Drush install pass' && exit 0) \

From 21b5518e88e7ccea62d14429674e76c84153ee5e Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 16 Oct 2018 22:38:35 -0500
Subject: [PATCH 1039/1273] Attempt to fix failing build due to Drush issue.

---
 .travis.yml        | 4 ++--
 tests/run-tests.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1ea127f9a..b6ca725ca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,7 +35,7 @@ env:
     - type: defaults
       distro: ubuntu1604
       local_config: tests/ubuntu-16-php56.config.yml
-      DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/drush/drush/drush"
+      DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/bin/drush"
       TEST_INSTALLED_EXTRAS: false
 
     # Nginx and Drush make file test - Ubuntu 16.04.
@@ -50,7 +50,7 @@ env:
     #   distro: ubuntu1604
     #   local_config: tests/ubuntu-16-postgresql.config.yml
     #   config_dir: /var/www/drupalvm/config
-    #   DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/drush/drush/drush"
+    #   DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/bin/drush"
     #   TEST_INSTALLED_EXTRAS: false
 
 before_install:
diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index 10f935314..50cd7d80d 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -183,7 +183,7 @@ docker exec $CONTAINER_ID curl -sSi --header Host:$IP localhost \
 #   || (echo 'Drush install fail' && cat /tmp/dvm-test && exit 1)
 
 # Drush.
-docker exec $CONTAINER_ID bash -c "cd $DRUPALVM_DIR && $DRUSH_BIN status" \
+docker exec $CONTAINER_ID $DRUSH_BIN status \
   | tee /tmp/dvm-test \
   | grep -q 'Drush' \
   && (echo 'Drush install pass' && exit 0) \

From 35a277dc040babf4971814d10506570b4901302e Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 16 Oct 2018 23:13:31 -0500
Subject: [PATCH 1040/1273] Explicitly cd into Drupal working dir for Drush
 test.

---
 tests/run-tests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index 50cd7d80d..521ff6593 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -183,7 +183,7 @@ docker exec $CONTAINER_ID curl -sSi --header Host:$IP localhost \
 #   || (echo 'Drush install fail' && cat /tmp/dvm-test && exit 1)
 
 # Drush.
-docker exec $CONTAINER_ID $DRUSH_BIN status \
+docker exec $CONTAINER_ID bash -c "cd $DRUPALVM_DIR/drupal && $DRUSH_BIN status" \
   | tee /tmp/dvm-test \
   | grep -q 'Drush' \
   && (echo 'Drush install pass' && exit 0) \

From 15aeec681b34fbb8916c468981c9b0b2e17846f0 Mon Sep 17 00:00:00 2001
From: Clemens Mitterwallner <clemens.mitterwallner@mirumagency.com>
Date: Wed, 17 Oct 2018 14:50:38 +0100
Subject: [PATCH 1041/1273] Fixed typo in build-composer.yml that caused
 composer install to fail

---
 provisioning/roles/geerlingguy.drupal/tasks/build-composer.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/roles/geerlingguy.drupal/tasks/build-composer.yml b/provisioning/roles/geerlingguy.drupal/tasks/build-composer.yml
index 1250af312..bfec131fa 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/build-composer.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/build-composer.yml
@@ -25,7 +25,7 @@
   composer:
     command: install
     working_dir: "{{ drupal_composer_install_dir }}"
-  when: falset drupal_site_exists
+  when: not drupal_site_exists
   become: false
 
 - name: Install dependencies with composer require (this may take a while).

From a4e4243211563a4083e670bc85c815e5c715573a Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 23 Oct 2018 13:52:31 -0500
Subject: [PATCH 1042/1273] Update php role.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.php/.travis.yml         |  3 --
 provisioning/roles/geerlingguy.php/README.md  | 10 +++--
 .../roles/geerlingguy.php/defaults/main.yml   |  3 ++
 .../molecule/default/molecule.yml             |  6 ++-
 .../roles/geerlingguy.php/vars/Debian.yml     | 38 +++++++++----------
 6 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index ac2d94086..35a35eac2 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -42,7 +42,7 @@
 - src: geerlingguy.nodejs
   version: 4.2.2
 - src: geerlingguy.php
-  version: 3.6.3
+  version: 3.7.0
 - src: geerlingguy.php-memcached
   version: 2.0.2
 - src: geerlingguy.php-mysql
diff --git a/provisioning/roles/geerlingguy.php/.travis.yml b/provisioning/roles/geerlingguy.php/.travis.yml
index 2cd644abf..45999be8e 100644
--- a/provisioning/roles/geerlingguy.php/.travis.yml
+++ b/provisioning/roles/geerlingguy.php/.travis.yml
@@ -7,15 +7,12 @@ env:
     - ROLE_NAME: php
   matrix:
     - MOLECULE_DISTRO: centos7
-      MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
     - MOLECULE_DISTRO: ubuntu1804
     - MOLECULE_DISTRO: ubuntu1604
     - MOLECULE_DISTRO: ubuntu1404
-      MOLECULE_DOCKER_COMMAND: /sbin/init
     - MOLECULE_DISTRO: debian9
 
     - MOLECULE_DISTRO: centos7
-      MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
       MOLECULE_PLAYBOOK: playbook-source.yml
 
 install:
diff --git a/provisioning/roles/geerlingguy.php/README.md b/provisioning/roles/geerlingguy.php/README.md
index adff28d65..392234428 100644
--- a/provisioning/roles/geerlingguy.php/README.md
+++ b/provisioning/roles/geerlingguy.php/README.md
@@ -34,11 +34,15 @@ The default values for the HTTP server deamon are `httpd` (used by Apache) for R
 
 (RedHat/CentOS only) If you have enabled any additional repositories (might I suggest [geerlingguy.repo-epel](https://github.com/geerlingguy/ansible-role-repo-epel) or [geerlingguy.repo-remi](https://github.com/geerlingguy/ansible-role-repo-remi)), those repositories can be listed under this variable (e.g. `remi-php70,epel`). This can be handy, as an example, if you want to install the latest version of PHP 7.0, which is in the Remi repository.
 
-    php_packages_state: "present"
+    php_default_version_debian: "7.0"
+
+(Debian/Ubuntu only) The default version of PHP in the given OS version repositories. Defaults to the latest Ubuntu LTS release. Ubuntu 18.04 needs this to be set to `"7.2"` since PHP 7.0 is not available in the default bionic packages.
 
-If you have enabled any additional repositories such as [geerlingguy.repo-epel](https://github.com/geerlingguy/ansible-role-repo-epel) or [geerlingguy.repo-remi](https://github.com/geerlingguy/ansible-role-repo-remi), you may want an easy way to swap PHP versions on the fly. By default, this is set to `"present"`. You can override this variable to `"latest"` to upgrade to the latest available version. Combined with php_enablerepo`, a user now doesn't need to manually uninstall the existing PHP packages before installing them from a different repository.
+**If you'd like to be able to switch PHP versions easily, or use a version that's not available in system packages**: You can use the [`geerlingguy.php-versions`](https://galaxy.ansible.com/geerlingguy/php-versions/) role to more easily switch between major PHP versions (e.g. 5.6, 7.1, 7.2).
+
+    php_packages_state: "present"
 
-You can also use the [`geerlingguy.php-versions`](https://galaxy.ansible.com/geerlingguy/php-versions/) role to more easily switch between major PHP versions (e.g. 5.6, 7.0, 7.1, 7.2).
+If you have enabled any additional repositories such as [geerlingguy.repo-epel](https://github.com/geerlingguy/ansible-role-repo-epel) or [geerlingguy.repo-remi](https://github.com/geerlingguy/ansible-role-repo-remi), you may want an easy way to swap PHP versions on the fly. By default, this is set to `"present"`. You can override this variable to `"latest"` to upgrade to the latest available version. Combined with `php_enablerepo`, a user now doesn't need to manually uninstall the existing PHP packages before installing them from a different repository.
 
     php_install_recommends: true
 
diff --git a/provisioning/roles/geerlingguy.php/defaults/main.yml b/provisioning/roles/geerlingguy.php/defaults/main.yml
index b2f42a251..8b04351bc 100644
--- a/provisioning/roles/geerlingguy.php/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.php/defaults/main.yml
@@ -3,6 +3,9 @@
 # for RHEL/CentOS.
 php_enablerepo: ""
 
+# Default PHP version to install on Debian-based OSes.
+php_default_version_debian: "7.0"
+
 # PHP package state; use 'present' to make sure it's installed, or 'latest' if
 # you want to upgrade or switch versions using a new repo.
 php_packages_state: present
diff --git a/provisioning/roles/geerlingguy.php/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.php/molecule/default/molecule.yml
index 033970241..2ca6feaf9 100644
--- a/provisioning/roles/geerlingguy.php/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.php/molecule/default/molecule.yml
@@ -9,8 +9,10 @@ lint:
     config-file: molecule/default/yaml-lint.yml
 platforms:
   - name: instance
-    image: geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible
-    command: ${MOLECULE_DOCKER_COMMAND:-"sleep infinity"}
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
     privileged: true
     pre_build_image: true
 provisioner:
diff --git a/provisioning/roles/geerlingguy.php/vars/Debian.yml b/provisioning/roles/geerlingguy.php/vars/Debian.yml
index 2dba0149d..c5f90b573 100644
--- a/provisioning/roles/geerlingguy.php/vars/Debian.yml
+++ b/provisioning/roles/geerlingguy.php/vars/Debian.yml
@@ -1,36 +1,36 @@
 ---
 __php_packages:
-  - php7.0-common
-  - php7.0-cli
-  - php7.0-dev
-  - php7.0-fpm
+  - php{{ php_default_version_debian }}-common
+  - php{{ php_default_version_debian }}-cli
+  - php{{ php_default_version_debian }}-dev
+  - php{{ php_default_version_debian }}-fpm
   - libpcre3-dev
-  - php7.0-gd
-  - php7.0-curl
-  - php7.0-imap
-  - php7.0-json
-  - php7.0-opcache
-  - php7.0-xml
-  - php7.0-mbstring
+  - php{{ php_default_version_debian }}-gd
+  - php{{ php_default_version_debian }}-curl
+  - php{{ php_default_version_debian }}-imap
+  - php{{ php_default_version_debian }}-json
+  - php{{ php_default_version_debian }}-opcache
+  - php{{ php_default_version_debian }}-xml
+  - php{{ php_default_version_debian }}-mbstring
   - php-sqlite3
   - php-apcu
 __php_webserver_daemon: "apache2"
 
 # Vendor-specific configuration paths on Debian/Ubuntu make my brain asplode.
 __php_conf_paths:
-  - /etc/php/7.0/fpm
-  - /etc/php/7.0/apache2
-  - /etc/php/7.0/cli
+  - /etc/php/{{ php_default_version_debian }}/fpm
+  - /etc/php/{{ php_default_version_debian }}/apache2
+  - /etc/php/{{ php_default_version_debian }}/cli
 
 __php_extension_conf_paths:
-  - /etc/php/7.0/fpm/conf.d
-  - /etc/php/7.0/apache2/conf.d
-  - /etc/php/7.0/cli/conf.d
+  - /etc/php/{{ php_default_version_debian }}/fpm/conf.d
+  - /etc/php/{{ php_default_version_debian }}/apache2/conf.d
+  - /etc/php/{{ php_default_version_debian }}/cli/conf.d
 
 __php_apc_conf_filename: 20-apcu.ini
 __php_opcache_conf_filename: 10-opcache.ini
-__php_fpm_daemon: php7.0-fpm
-__php_fpm_conf_path: "/etc/php/7.0/fpm"
+__php_fpm_daemon: php{{ php_default_version_debian }}-fpm
+__php_fpm_conf_path: "/etc/php/{{ php_default_version_debian }}/fpm"
 __php_fpm_pool_conf_path: "{{ __php_fpm_conf_path }}/pool.d/www.conf"
 
 __php_fpm_pool_user: www-data

From bb0e506818b7af1678659de193c0d6c102867ac8 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 23 Oct 2018 14:28:42 -0500
Subject: [PATCH 1043/1273] Updated java role.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.java/.gitignore         |  3 +-
 .../roles/geerlingguy.java/.travis.yml        | 41 ++++++++++---------
 .../roles/geerlingguy.java/meta/main.yml      | 22 +++++-----
 .../molecule/default/molecule.yml             | 29 +++++++++++++
 .../default/playbook.yml}                     | 12 +++---
 .../molecule/default/tests/test_default.py    | 14 +++++++
 .../molecule/default/yaml-lint.yml            |  6 +++
 .../roles/geerlingguy.java/tasks/main.yml     |  9 ++--
 .../geerlingguy.java/tasks/setup-Debian.yml   |  5 ++-
 .../geerlingguy.java/tasks/setup-FreeBSD.yml  |  5 ++-
 .../geerlingguy.java/tasks/setup-RedHat.yml   |  5 ++-
 .../roles/geerlingguy.java/tests/README.md    | 11 -----
 13 files changed, 106 insertions(+), 58 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.java/molecule/default/molecule.yml
 rename provisioning/roles/geerlingguy.java/{tests/test.yml => molecule/default/playbook.yml} (69%)
 create mode 100644 provisioning/roles/geerlingguy.java/molecule/default/tests/test_default.py
 create mode 100644 provisioning/roles/geerlingguy.java/molecule/default/yaml-lint.yml
 delete mode 100644 provisioning/roles/geerlingguy.java/tests/README.md

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 35a35eac2..53e2dbe25 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -30,7 +30,7 @@
 - src: geerlingguy.git
   version: 2.0.3
 - src: geerlingguy.java
-  version: 1.9.1
+  version: 1.9.3
 - src: geerlingguy.mailhog
   version: 2.1.4
 - src: geerlingguy.memcached
diff --git a/provisioning/roles/geerlingguy.java/.gitignore b/provisioning/roles/geerlingguy.java/.gitignore
index c9b2377e3..f56f5b578 100644
--- a/provisioning/roles/geerlingguy.java/.gitignore
+++ b/provisioning/roles/geerlingguy.java/.gitignore
@@ -1,2 +1,3 @@
 *.retry
-tests/test.sh
+*/__pycache__
+*.pyc
diff --git a/provisioning/roles/geerlingguy.java/.travis.yml b/provisioning/roles/geerlingguy.java/.travis.yml
index 71426224f..4fb19f903 100644
--- a/provisioning/roles/geerlingguy.java/.travis.yml
+++ b/provisioning/roles/geerlingguy.java/.travis.yml
@@ -1,31 +1,32 @@
 ---
+language: python
 services: docker
 
 env:
-  - distro: centos7
-  - distro: centos6
-  - distro: fedora27
-  - distro: ubuntu1804
-  - distro: ubuntu1604
-  - distro: ubuntu1404
-  - distro: ubuntu1204
-  - distro: debian9
-  - distro: debian8
+  global:
+    - ROLE_NAME: java
+  matrix:
+    - MOLECULE_DISTRO: centos7
+    - MOLECULE_DISTRO: centos6
+    - MOLECULE_DISTRO: fedora27
+    - MOLECULE_DISTRO: ubuntu1804
+    - MOLECULE_DISTRO: ubuntu1604
+    - MOLECULE_DISTRO: debian9
+    - MOLECULE_DISTRO: debian8
 
-script:
-  # Configure test script so we can run extra tests after playbook is run.
-  - export container_id=$(date +%s)
-  - export cleanup=false
+install:
+  # Install test dependencies.
+  - pip install molecule docker
 
-  # Download test shim.
-  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
-  - chmod +x ${PWD}/tests/test.sh
+before_script:
+  # Use actual Ansible Galaxy role name for the project directory.
+  - cd ../
+  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
+  - cd geerlingguy.$ROLE_NAME
 
+script:
   # Run tests.
-  - ${PWD}/tests/test.sh
-
-  # Ensure Java is installed.
-  - 'docker exec --tty ${container_id} env TERM=xterm which java'
+  - molecule test
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.java/meta/main.yml b/provisioning/roles/geerlingguy.java/meta/main.yml
index 37d0abac8..57fec5605 100644
--- a/provisioning/roles/geerlingguy.java/meta/main.yml
+++ b/provisioning/roles/geerlingguy.java/meta/main.yml
@@ -10,25 +10,25 @@ galaxy_info:
   platforms:
     - name: EL
       versions:
-      - 6
-      - 7
+        - 6
+        - 7
     - name: Fedora
       versions:
-      - all
+        - all
     - name: Debian
       versions:
-      - wheezy
-      - jessie
-      - stretch
+        - wheezy
+        - jessie
+        - stretch
     - name: Ubuntu
       versions:
-      - precise
-      - trusty
-      - xenial
-      - bionic
+        - precise
+        - trusty
+        - xenial
+        - bionic
     - name: FreeBSD
       versions:
-      - 10.2
+        - 10.2
   galaxy_tags:
     - development
     - system
diff --git a/provisioning/roles/geerlingguy.java/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.java/molecule/default/molecule.yml
new file mode 100644
index 000000000..2ca6feaf9
--- /dev/null
+++ b/provisioning/roles/geerlingguy.java/molecule/default/molecule.yml
@@ -0,0 +1,29 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint:
+  name: yamllint
+  options:
+    config-file: molecule/default/yaml-lint.yml
+platforms:
+  - name: instance
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    privileged: true
+    pre_build_image: true
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+  playbooks:
+    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
+scenario:
+  name: default
+verifier:
+  name: testinfra
+  lint:
+    name: flake8
diff --git a/provisioning/roles/geerlingguy.java/tests/test.yml b/provisioning/roles/geerlingguy.java/molecule/default/playbook.yml
similarity index 69%
rename from provisioning/roles/geerlingguy.java/tests/test.yml
rename to provisioning/roles/geerlingguy.java/molecule/default/playbook.yml
index 05937715c..d27efa02e 100644
--- a/provisioning/roles/geerlingguy.java/tests/test.yml
+++ b/provisioning/roles/geerlingguy.java/molecule/default/playbook.yml
@@ -1,21 +1,23 @@
 ---
-- hosts: all
+- name: Converge
+  hosts: all
+  become: true
 
   pre_tasks:
     - name: Update apt cache.
-      apt: update_cache=yes cache_valid_time=600
+      apt: update_cache=true cache_valid_time=600
       when: ansible_os_family == 'Debian'
-      changed_when: False
+      changed_when: false
 
     # See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=863199
     - name: Ensure 'man' directory exists.
       file:
         path: /usr/share/man/man1
         state: directory
-        recurse: True
+        recurse: true
       when:
         - ansible_distribution == 'Ubuntu'
         - ansible_distribution_version == '18.04'
 
   roles:
-    - role_under_test
+    - role: geerlingguy.java
diff --git a/provisioning/roles/geerlingguy.java/molecule/default/tests/test_default.py b/provisioning/roles/geerlingguy.java/molecule/default/tests/test_default.py
new file mode 100644
index 000000000..eedd64a1d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.java/molecule/default/tests/test_default.py
@@ -0,0 +1,14 @@
+import os
+
+import testinfra.utils.ansible_runner
+
+testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
+    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
+
+
+def test_hosts_file(host):
+    f = host.file('/etc/hosts')
+
+    assert f.exists
+    assert f.user == 'root'
+    assert f.group == 'root'
diff --git a/provisioning/roles/geerlingguy.java/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.java/molecule/default/yaml-lint.yml
new file mode 100644
index 000000000..a3dbc38ee
--- /dev/null
+++ b/provisioning/roles/geerlingguy.java/molecule/default/yaml-lint.yml
@@ -0,0 +1,6 @@
+---
+extends: default
+rules:
+  line-length:
+    max: 120
+    level: warning
diff --git a/provisioning/roles/geerlingguy.java/tasks/main.yml b/provisioning/roles/geerlingguy.java/tasks/main.yml
index f09ce51c0..81b7af613 100644
--- a/provisioning/roles/geerlingguy.java/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.java/tasks/main.yml
@@ -40,9 +40,12 @@
     mode: 0644
   when: java_home is defined and java_home != ''
 
-- name: check java version
+- name: Check the Java version
   command: java -version
   changed_when: false
-  register: javaversion
+  register: java_version
 
-- debug: var=javaversion
+- name: Display the Java version.
+  debug:
+    var: java_version
+    verbosity: 2
diff --git a/provisioning/roles/geerlingguy.java/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.java/tasks/setup-Debian.yml
index dd9cc09d6..09eda86af 100644
--- a/provisioning/roles/geerlingguy.java/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.java/tasks/setup-Debian.yml
@@ -1,4 +1,5 @@
 ---
 - name: Ensure Java is installed.
-  apt: "name={{ item }} state=present"
-  with_items: "{{ java_packages }}"
+  apt:
+    name: "{{ java_packages }}"
+    state: present
diff --git a/provisioning/roles/geerlingguy.java/tasks/setup-FreeBSD.yml b/provisioning/roles/geerlingguy.java/tasks/setup-FreeBSD.yml
index f3d1fa310..ba668728f 100644
--- a/provisioning/roles/geerlingguy.java/tasks/setup-FreeBSD.yml
+++ b/provisioning/roles/geerlingguy.java/tasks/setup-FreeBSD.yml
@@ -1,7 +1,8 @@
 ---
 - name: Ensure Java is installed.
-  pkgng: "name={{ item }} state=present"
-  with_items: "{{ java_packages }}"
+  pkgng:
+    name: "{{ java_packages }}"
+    state: present
 
 - name: ensure proc is mounted
   mount: name=/proc fstype=procfs src=proc opts=rw state=mounted
diff --git a/provisioning/roles/geerlingguy.java/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.java/tasks/setup-RedHat.yml
index 4110f4d3b..130694520 100644
--- a/provisioning/roles/geerlingguy.java/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.java/tasks/setup-RedHat.yml
@@ -1,4 +1,5 @@
 ---
 - name: Ensure Java is installed.
-  package: "name={{ item }} state=present"
-  with_items: "{{ java_packages }}"
+  package:
+    name: "{{ java_packages }}"
+    state: present
diff --git a/provisioning/roles/geerlingguy.java/tests/README.md b/provisioning/roles/geerlingguy.java/tests/README.md
deleted file mode 100644
index 6fb211721..000000000
--- a/provisioning/roles/geerlingguy.java/tests/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Ansible Role tests
-
-To run the test playbook(s) in this directory:
-
-  1. Install and start Docker.
-  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
-    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
-  1. Make the test shim executable: `chmod +x tests/test.sh`.
-  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
-
-If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`

From 1a6a782a90852a4f007b6644e0af740a2298e4e3 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 23 Oct 2018 21:57:17 -0500
Subject: [PATCH 1044/1273] Update varnish and elasticsearch roles.

---
 provisioning/requirements.yml                 |  4 +-
 .../geerlingguy.elasticsearch/.gitignore      |  3 +-
 .../geerlingguy.elasticsearch/.travis.yml     | 31 +++++-----
 .../roles/geerlingguy.elasticsearch/README.md | 21 +++++--
 .../defaults/main.yml                         |  8 ++-
 .../files/elasticsearch.repo                  |  6 --
 .../geerlingguy.elasticsearch/meta/main.yml   | 19 +++---
 .../molecule/default/molecule.yml             | 29 ++++++++++
 .../molecule/default/playbook.yml             | 14 +++++
 .../default}/requirements.yml                 |  0
 .../molecule/default/tests/test_default.py    | 14 +++++
 .../molecule/default/yaml-lint.yml            |  6 ++
 .../geerlingguy.elasticsearch/tasks/main.yml  | 18 +++++-
 .../tasks/setup-Debian.yml                    | 14 +++--
 .../tasks/setup-RedHat.yml                    |  9 +--
 .../templates/elasticsearch.repo.j2           |  8 +++
 .../templates/elasticsearch.yml.j2            | 46 ++++++---------
 .../geerlingguy.elasticsearch/tests/README.md | 11 ----
 .../geerlingguy.elasticsearch/tests/test.yml  | 15 -----
 .../roles/geerlingguy.varnish/.gitignore      |  3 +-
 .../roles/geerlingguy.varnish/.travis.yml     | 58 ++++++++-----------
 .../roles/geerlingguy.varnish/README.md       | 10 +++-
 .../geerlingguy.varnish/defaults/main.yml     |  5 +-
 .../geerlingguy.varnish/handlers/main.yml     |  2 +-
 .../roles/geerlingguy.varnish/meta/main.yml   | 20 +++++--
 .../molecule/default/molecule.yml             | 29 ++++++++++
 .../molecule/default/playbook-41.yml          | 28 +++++++++
 .../molecule/default/playbook-setup.yml       | 25 ++++++++
 .../molecule/default/playbook.yml             | 33 +++++++++++
 .../molecule/default/tests/test_default.py    | 14 +++++
 .../molecule/default/yaml-lint.yml            |  6 ++
 .../roles/geerlingguy.varnish/tasks/main.yml  |  5 +-
 .../tasks/setup-RedHat.yml                    | 22 +++----
 .../templates/varnish.service.j2              | 22 ++++++-
 .../roles/geerlingguy.varnish/tests/README.md | 11 ----
 .../roles/geerlingguy.varnish/tests/debug.yml |  9 ---
 .../roles/geerlingguy.varnish/tests/setup.yml | 20 -------
 .../geerlingguy.varnish/tests/test-41.yml     | 14 -----
 .../roles/geerlingguy.varnish/tests/test.yml  | 10 ----
 .../roles/geerlingguy.varnish/vars/RedHat.yml |  1 +
 40 files changed, 391 insertions(+), 232 deletions(-)
 delete mode 100644 provisioning/roles/geerlingguy.elasticsearch/files/elasticsearch.repo
 create mode 100644 provisioning/roles/geerlingguy.elasticsearch/molecule/default/molecule.yml
 create mode 100644 provisioning/roles/geerlingguy.elasticsearch/molecule/default/playbook.yml
 rename provisioning/roles/geerlingguy.elasticsearch/{tests => molecule/default}/requirements.yml (100%)
 create mode 100644 provisioning/roles/geerlingguy.elasticsearch/molecule/default/tests/test_default.py
 create mode 100644 provisioning/roles/geerlingguy.elasticsearch/molecule/default/yaml-lint.yml
 create mode 100644 provisioning/roles/geerlingguy.elasticsearch/templates/elasticsearch.repo.j2
 delete mode 100644 provisioning/roles/geerlingguy.elasticsearch/tests/README.md
 delete mode 100644 provisioning/roles/geerlingguy.elasticsearch/tests/test.yml
 create mode 100644 provisioning/roles/geerlingguy.varnish/molecule/default/molecule.yml
 create mode 100644 provisioning/roles/geerlingguy.varnish/molecule/default/playbook-41.yml
 create mode 100644 provisioning/roles/geerlingguy.varnish/molecule/default/playbook-setup.yml
 create mode 100644 provisioning/roles/geerlingguy.varnish/molecule/default/playbook.yml
 create mode 100644 provisioning/roles/geerlingguy.varnish/molecule/default/tests/test_default.py
 create mode 100644 provisioning/roles/geerlingguy.varnish/molecule/default/yaml-lint.yml
 delete mode 100644 provisioning/roles/geerlingguy.varnish/tests/README.md
 delete mode 100644 provisioning/roles/geerlingguy.varnish/tests/debug.yml
 delete mode 100644 provisioning/roles/geerlingguy.varnish/tests/setup.yml
 delete mode 100644 provisioning/roles/geerlingguy.varnish/tests/test-41.yml
 delete mode 100644 provisioning/roles/geerlingguy.varnish/tests/test.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 53e2dbe25..652c0295a 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -24,7 +24,7 @@
 - src: geerlingguy.drush
   version: 3.1.2
 - src: geerlingguy.elasticsearch
-  version: 2.2.0
+  version: 3.0.0
 - src: geerlingguy.firewall
   version: 2.4.1
 - src: geerlingguy.git
@@ -78,4 +78,4 @@
 - src: geerlingguy.solr
   version: 4.3.0
 - src: geerlingguy.varnish
-  version: 2.3.2
+  version: 3.0.0
diff --git a/provisioning/roles/geerlingguy.elasticsearch/.gitignore b/provisioning/roles/geerlingguy.elasticsearch/.gitignore
index c9b2377e3..f56f5b578 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/.gitignore
+++ b/provisioning/roles/geerlingguy.elasticsearch/.gitignore
@@ -1,2 +1,3 @@
 *.retry
-tests/test.sh
+*/__pycache__
+*.pyc
diff --git a/provisioning/roles/geerlingguy.elasticsearch/.travis.yml b/provisioning/roles/geerlingguy.elasticsearch/.travis.yml
index ce93e90fa..40ecf8a98 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/.travis.yml
+++ b/provisioning/roles/geerlingguy.elasticsearch/.travis.yml
@@ -1,25 +1,28 @@
 ---
+language: python
 services: docker
 
 env:
-  - distro: centos7
-  - distro: ubuntu1604
-  - distro: ubuntu1404
+  global:
+    - ROLE_NAME: elasticsearch
+  matrix:
+    - MOLECULE_DISTRO: centos7
+    - MOLECULE_DISTRO: ubuntu1804
+    - MOLECULE_DISTRO: ubuntu1604
 
-script:
-  # Configure test script so we can run extra tests after playbook is run.
-  - export container_id=$(date +%s)
-  - export cleanup=false
+install:
+  # Install test dependencies.
+  - pip install molecule docker
 
-  # Download test shim.
-  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
-  - chmod +x ${PWD}/tests/test.sh
+before_script:
+  # Use actual Ansible Galaxy role name for the project directory.
+  - cd ../
+  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
+  - cd geerlingguy.$ROLE_NAME
 
+script:
   # Run tests.
-  - ${PWD}/tests/test.sh
-
-  # Test if Elasticsearch is working.
-  - 'docker exec --tty ${container_id} env TERM=xterm curl -XGET localhost:9200'
+  - molecule test
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.elasticsearch/README.md b/provisioning/roles/geerlingguy.elasticsearch/README.md
index 4fc5d121c..7efe03d8b 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/README.md
+++ b/provisioning/roles/geerlingguy.elasticsearch/README.md
@@ -6,11 +6,25 @@ An Ansible Role that installs Elasticsearch on RedHat/CentOS or Debian/Ubuntu.
 
 ## Requirements
 
-Requires at least Java 7 (Java 8+ preferred). See [`geerlingguy.java`](https://github.com/geerlingguy/ansible-role-java#example-playbook-install-openjdk-8) role instructions for installing OpenJDK 8.
+Requires at least Java 8. See [`geerlingguy.java`](https://github.com/geerlingguy/ansible-role-java#example-playbook-install-openjdk-8) role instructions for installing OpenJDK 8.
 
 ## Role Variables
+
 Available variables are listed below, along with default values (see `defaults/main.yml`):
 
+    elasticsearch_version: '6.x'
+
+The major version to use when installing Elasticsearch.
+
+    elasticsearch_package_state: present
+
+The `elasticsearch` package state; set to `latest` to upgrade or change versions.
+
+    elasticsearch_service_state: started
+    elasticsearch_service_enabled: true
+
+Controls the Elasticsearch service options.
+
     elasticsearch_network_host: localhost
 
 Network host to listen for incoming connections on. By default we only listen on the localhost interface. Change this to the IP address to listen on a specific interface, or `0.0.0.0` to listen on all interfaces.
@@ -19,11 +33,6 @@ Network host to listen for incoming connections on. By default we only listen on
 
 The port to listen for HTTP connections on.
 
-    elasticsearch_script_inline: true
-    elasticsearch_script_indexed: true
-
-Whether to allow inline scripting against ElasticSearch. You should read the following link as there are possible security implications for enabling these options: [Enable Dynamic Scripting](https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-scripting.html#enable-dynamic-scripting). Available options include: `true`, `false`, and `sandbox`.
-
 ## Dependencies
 
   - geerlingguy.java
diff --git a/provisioning/roles/geerlingguy.elasticsearch/defaults/main.yml b/provisioning/roles/geerlingguy.elasticsearch/defaults/main.yml
index 758877f5e..e04e8e93d 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.elasticsearch/defaults/main.yml
@@ -1,5 +1,9 @@
 ---
+elasticsearch_version: '6.x'
+elasticsearch_package_state: present
+
+elasticsearch_service_state: started
+elasticsearch_service_enabled: true
+
 elasticsearch_network_host: localhost
 elasticsearch_http_port: 9200
-elasticsearch_script_inline: true
-elasticsearch_script_indexed: true
diff --git a/provisioning/roles/geerlingguy.elasticsearch/files/elasticsearch.repo b/provisioning/roles/geerlingguy.elasticsearch/files/elasticsearch.repo
deleted file mode 100644
index e9d28a615..000000000
--- a/provisioning/roles/geerlingguy.elasticsearch/files/elasticsearch.repo
+++ /dev/null
@@ -1,6 +0,0 @@
-[elasticsearch-2.x]
-name=Elasticsearch repository for 2.x packages
-baseurl=http://packages.elastic.co/elasticsearch/2.x/centos
-gpgcheck=1
-gpgkey=http://packages.elastic.co/GPG-KEY-elasticsearch
-enabled=1
diff --git a/provisioning/roles/geerlingguy.elasticsearch/meta/main.yml b/provisioning/roles/geerlingguy.elasticsearch/meta/main.yml
index a984d6993..032fe021b 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/meta/main.yml
+++ b/provisioning/roles/geerlingguy.elasticsearch/meta/main.yml
@@ -9,15 +9,15 @@ galaxy_info:
   license: "license (BSD, MIT)"
   min_ansible_version: 2.4
   platforms:
-  - name: EL
-    versions:
-    - all
-  - name: Debian
-    versions:
-    - all
-  - name: Ubuntu
-    versions:
-    - all
+    - name: EL
+      versions:
+        - all
+    - name: Debian
+      versions:
+        - all
+    - name: Ubuntu
+      versions:
+        - all
   galaxy_tags:
     - web
     - system
@@ -25,4 +25,5 @@ galaxy_info:
     - logging
     - lucene
     - elk
+    - efk
     - elasticsearch
diff --git a/provisioning/roles/geerlingguy.elasticsearch/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.elasticsearch/molecule/default/molecule.yml
new file mode 100644
index 000000000..2ca6feaf9
--- /dev/null
+++ b/provisioning/roles/geerlingguy.elasticsearch/molecule/default/molecule.yml
@@ -0,0 +1,29 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint:
+  name: yamllint
+  options:
+    config-file: molecule/default/yaml-lint.yml
+platforms:
+  - name: instance
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    privileged: true
+    pre_build_image: true
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+  playbooks:
+    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
+scenario:
+  name: default
+verifier:
+  name: testinfra
+  lint:
+    name: flake8
diff --git a/provisioning/roles/geerlingguy.elasticsearch/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.elasticsearch/molecule/default/playbook.yml
new file mode 100644
index 000000000..d2848a9e3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.elasticsearch/molecule/default/playbook.yml
@@ -0,0 +1,14 @@
+---
+- name: Converge
+  hosts: all
+  become: true
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=true cache_valid_time=600
+      when: ansible_os_family == 'Debian'
+      changed_when: false
+
+  roles:
+    - role: geerlingguy.java
+    - role: geerlingguy.elasticsearch
diff --git a/provisioning/roles/geerlingguy.elasticsearch/tests/requirements.yml b/provisioning/roles/geerlingguy.elasticsearch/molecule/default/requirements.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.elasticsearch/tests/requirements.yml
rename to provisioning/roles/geerlingguy.elasticsearch/molecule/default/requirements.yml
diff --git a/provisioning/roles/geerlingguy.elasticsearch/molecule/default/tests/test_default.py b/provisioning/roles/geerlingguy.elasticsearch/molecule/default/tests/test_default.py
new file mode 100644
index 000000000..eedd64a1d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.elasticsearch/molecule/default/tests/test_default.py
@@ -0,0 +1,14 @@
+import os
+
+import testinfra.utils.ansible_runner
+
+testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
+    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
+
+
+def test_hosts_file(host):
+    f = host.file('/etc/hosts')
+
+    assert f.exists
+    assert f.user == 'root'
+    assert f.group == 'root'
diff --git a/provisioning/roles/geerlingguy.elasticsearch/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.elasticsearch/molecule/default/yaml-lint.yml
new file mode 100644
index 000000000..a3dbc38ee
--- /dev/null
+++ b/provisioning/roles/geerlingguy.elasticsearch/molecule/default/yaml-lint.yml
@@ -0,0 +1,6 @@
+---
+extends: default
+rules:
+  line-length:
+    max: 120
+    level: warning
diff --git a/provisioning/roles/geerlingguy.elasticsearch/tasks/main.yml b/provisioning/roles/geerlingguy.elasticsearch/tasks/main.yml
index a80e2cec1..ca86bc2d6 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.elasticsearch/tasks/main.yml
@@ -5,17 +5,29 @@
 - include_tasks: setup-Debian.yml
   when: ansible_os_family == 'Debian'
 
+- name: Install Elasticsearch.
+  package:
+    name: elasticsearch
+    state: "{{ elasticsearch_package_state }}"
+
 - name: Configure Elasticsearch.
   template:
     src: elasticsearch.yml.j2
     dest: /etc/elasticsearch/elasticsearch.yml
     owner: root
     group: elasticsearch
-    mode: 0750
+    mode: 0660
   notify: restart elasticsearch
 
 - name: Start Elasticsearch.
-  service: name=elasticsearch state=started enabled=yes
+  service:
+    name: elasticsearch
+    state: "{{ elasticsearch_service_state }}"
+    enabled: "{{ elasticsearch_service_enabled }}"
 
 - name: Make sure Elasticsearch is running before proceeding.
-  wait_for: host={{ elasticsearch_network_host }} port={{ elasticsearch_http_port }} delay=3 timeout=300
+  wait_for:
+    host: "{{ elasticsearch_network_host }}"
+    port: "{{ elasticsearch_http_port }}"
+    delay: 3
+    timeout: 300
diff --git a/provisioning/roles/geerlingguy.elasticsearch/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.elasticsearch/tasks/setup-Debian.yml
index bafa0d5a1..5fa254302 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.elasticsearch/tasks/setup-Debian.yml
@@ -1,14 +1,16 @@
 ---
+- name: HTTPS APT transport for Elasticsearch repository.
+  apt:
+    name: apt-transport-https
+    state: present
+
 - name: Add Elasticsearch apt key.
   apt_key:
-    url: https://packages.elastic.co/GPG-KEY-elasticsearch
+    url: https://artifacts.elastic.co/GPG-KEY-elasticsearch
     state: present
 
 - name: Add Elasticsearch repository.
   apt_repository:
-    repo: 'deb http://packages.elastic.co/elasticsearch/2.x/debian stable main'
+    repo: 'deb https://artifacts.elastic.co/packages/{{ elasticsearch_version }}/apt stable main'
     state: present
-    update_cache: yes
-
-- name: Install Elasticsearch.
-  apt: pkg=elasticsearch state=present
+    update_cache: true
diff --git a/provisioning/roles/geerlingguy.elasticsearch/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.elasticsearch/tasks/setup-RedHat.yml
index 8997f721a..3882cd237 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.elasticsearch/tasks/setup-RedHat.yml
@@ -1,14 +1,11 @@
 ---
 - name: Add Elasticsearch GPG key.
   rpm_key:
-    key: https://packages.elastic.co/GPG-KEY-elasticsearch
+    key: https://artifacts.elastic.co/GPG-KEY-elasticsearch
     state: present
 
 - name: Add Elasticsearch repository.
-  copy:
-    src: elasticsearch.repo
+  template:
+    src: elasticsearch.repo.j2
     dest: /etc/yum.repos.d/elasticsearch.repo
     mode: 0644
-
-- name: Install Elasticsearch.
-  yum: pkg=elasticsearch state=present
diff --git a/provisioning/roles/geerlingguy.elasticsearch/templates/elasticsearch.repo.j2 b/provisioning/roles/geerlingguy.elasticsearch/templates/elasticsearch.repo.j2
new file mode 100644
index 000000000..efdc65950
--- /dev/null
+++ b/provisioning/roles/geerlingguy.elasticsearch/templates/elasticsearch.repo.j2
@@ -0,0 +1,8 @@
+[elasticsearch-{{ elasticsearch_version }}]
+name=Elasticsearch repository for {{ elasticsearch_version }} packages
+baseurl=https://artifacts.elastic.co/packages/{{ elasticsearch_version }}/yum
+gpgcheck=1
+gpgkey=https://artifacts.elastic.co/GPG-KEY-elasticsearch
+enabled=1
+autorefresh=1
+type=rpm-md
diff --git a/provisioning/roles/geerlingguy.elasticsearch/templates/elasticsearch.yml.j2 b/provisioning/roles/geerlingguy.elasticsearch/templates/elasticsearch.yml.j2
index 58182a1f9..1ac4d3f58 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/templates/elasticsearch.yml.j2
+++ b/provisioning/roles/geerlingguy.elasticsearch/templates/elasticsearch.yml.j2
@@ -8,43 +8,44 @@
 # The primary way of configuring a node is via this file. This template lists
 # the most important settings you may want to configure for a production cluster.
 #
-# Please see the documentation for further information on configuration options:
-# <http://www.elastic.co/guide/en/elasticsearch/reference/current/setup-configuration.html>
+# Please consult the documentation for further information on configuration options:
+# https://www.elastic.co/guide/en/elasticsearch/reference/index.html
 #
 # ---------------------------------- Cluster -----------------------------------
 #
 # Use a descriptive name for your cluster:
 #
-# cluster.name: my-application
+#cluster.name: my-application
 #
 # ------------------------------------ Node ------------------------------------
 #
 # Use a descriptive name for the node:
 #
-# node.name: node-1
+#node.name: node-1
 #
 # Add custom attributes to the node:
 #
-# node.rack: r1
+#node.attr.rack: r1
 #
 # ----------------------------------- Paths ------------------------------------
 #
 # Path to directory where to store the data (separate multiple locations by comma):
 #
-# path.data: /path/to/data
+path.data: /var/lib/elasticsearch
 #
 # Path to log files:
 #
-# path.logs: /path/to/logs
+path.logs: /var/log/elasticsearch
 #
 # ----------------------------------- Memory -----------------------------------
 #
 # Lock the memory on startup:
 #
-# bootstrap.mlockall: true
+#bootstrap.memory_lock: true
 #
-# Make sure that the `ES_HEAP_SIZE` environment variable is set to about half the memory
-# available on the system and that the owner of the process is allowed to use this limit.
+# Make sure that the heap size is set to about half the memory available
+# on the system and that the owner of the process is allowed to use this
+# limit.
 #
 # Elasticsearch performs poorly when the system is swapping the memory.
 #
@@ -58,40 +59,31 @@ network.host: {{ elasticsearch_network_host }}
 #
 http.port: {{ elasticsearch_http_port }}
 #
-# For more information, see the documentation at:
-# <http://www.elastic.co/guide/en/elasticsearch/reference/current/modules-network.html>
+# For more information, consult the network module documentation.
 #
 # --------------------------------- Discovery ----------------------------------
 #
 # Pass an initial list of hosts to perform discovery when new node is started:
 # The default list of hosts is ["127.0.0.1", "[::1]"]
 #
-# discovery.zen.ping.unicast.hosts: ["host1", "host2"]
+#discovery.zen.ping.unicast.hosts: ["host1", "host2"]
 #
-# Prevent the "split brain" by configuring the majority of nodes (total number of nodes / 2 + 1):
+# Prevent the "split brain" by configuring the majority of nodes (total number of master-eligible nodes / 2 + 1):
 #
-# discovery.zen.minimum_master_nodes: 3
+#discovery.zen.minimum_master_nodes:
 #
-# For more information, see the documentation at:
-# <http://www.elastic.co/guide/en/elasticsearch/reference/current/modules-discovery.html>
+# For more information, consult the zen discovery module documentation.
 #
 # ---------------------------------- Gateway -----------------------------------
 #
 # Block initial recovery after a full cluster restart until N nodes are started:
 #
-# gateway.recover_after_nodes: 3
+#gateway.recover_after_nodes: 3
 #
-# For more information, see the documentation at:
-# <http://www.elastic.co/guide/en/elasticsearch/reference/current/modules-gateway.html>
+# For more information, consult the gateway module documentation.
 #
 # ---------------------------------- Various -----------------------------------
 #
-# Disable starting multiple nodes on a single system:
-#
-# node.max_local_storage_nodes: 1
-#
 # Require explicit names when deleting indices:
 #
-# action.destructive_requires_name: true
-script.inline: {{ elasticsearch_script_inline }}
-script.indexed: {{ elasticsearch_script_indexed }}
+#action.destructive_requires_name: true
diff --git a/provisioning/roles/geerlingguy.elasticsearch/tests/README.md b/provisioning/roles/geerlingguy.elasticsearch/tests/README.md
deleted file mode 100644
index 6fb211721..000000000
--- a/provisioning/roles/geerlingguy.elasticsearch/tests/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Ansible Role tests
-
-To run the test playbook(s) in this directory:
-
-  1. Install and start Docker.
-  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
-    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
-  1. Make the test shim executable: `chmod +x tests/test.sh`.
-  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
-
-If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.elasticsearch/tests/test.yml b/provisioning/roles/geerlingguy.elasticsearch/tests/test.yml
deleted file mode 100644
index 7e775aea9..000000000
--- a/provisioning/roles/geerlingguy.elasticsearch/tests/test.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-- hosts: all
-
-  pre_tasks:
-    - name: Update apt cache.
-      apt: update_cache=yes cache_valid_time=600
-      when: ansible_os_family == 'Debian'
-      changed_when: false
-
-    - name: Ensure build dependencies are installed.
-      package: name=curl state=present
-
-  roles:
-    - geerlingguy.java
-    - role_under_test
diff --git a/provisioning/roles/geerlingguy.varnish/.gitignore b/provisioning/roles/geerlingguy.varnish/.gitignore
index c9b2377e3..f56f5b578 100644
--- a/provisioning/roles/geerlingguy.varnish/.gitignore
+++ b/provisioning/roles/geerlingguy.varnish/.gitignore
@@ -1,2 +1,3 @@
 *.retry
-tests/test.sh
+*/__pycache__
+*.pyc
diff --git a/provisioning/roles/geerlingguy.varnish/.travis.yml b/provisioning/roles/geerlingguy.varnish/.travis.yml
index 75956f173..9076320bb 100644
--- a/provisioning/roles/geerlingguy.varnish/.travis.yml
+++ b/provisioning/roles/geerlingguy.varnish/.travis.yml
@@ -1,44 +1,34 @@
 ---
+language: python
 services: docker
 
 env:
-  - distro: centos7
-  - distro: centos6
-  - distro: ubuntu1604
-  - distro: ubuntu1404
-  - distro: debian9
-  - distro: debian8
-
-  # Also test installing older versions.
-  - distro: centos7
-    playbook: test-41.yml
-    varnish_version: "4.1"
-  - distro: ubuntu1604
-    varnish_version: "4.1"
-    playbook: test-41.yml
+  global:
+    - ROLE_NAME: varnish
+  matrix:
+    - MOLECULE_DISTRO: centos7
+    - MOLECULE_DISTRO: centos6
+    - MOLECULE_DISTRO: ubuntu1804
+    - MOLECULE_DISTRO: ubuntu1604
+    - MOLECULE_DISTRO: debian9
+    - MOLECULE_DISTRO: debian8
+
+    - MOLECULE_DISTRO: centos7
+      MOLECULE_PLAYBOOK: playbook-41.yml
+
+install:
+  # Install test dependencies.
+  - pip install molecule docker
+
+before_script:
+  # Use actual Ansible Galaxy role name for the project directory.
+  - cd ../
+  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
+  - cd geerlingguy.$ROLE_NAME
 
 script:
-  # Configure test script so we can run extra tests after playbook is run.
-  - export container_id=$(date +%s)
-  - export cleanup=false
-
-  # Download test shim.
-  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
-  - chmod +x ${PWD}/tests/test.sh
-
   # Run tests.
-  - ${PWD}/tests/test.sh
-
-  # Make sure Varnish is running.
-  - 'docker exec --tty ${container_id} env TERM=xterm varnishd -V'
-
-  # Test the version of Varnish installed (default to the main.yml default).
-  - |
-    varnish_version="${varnish_version:-5.1}"
-    docker exec --tty ${container_id} env TERM=xterm varnishd -V | grep "${varnish_version}"
-
-  # Test port 80.
-  - 'docker exec --tty ${container_id} env TERM=xterm curl -sI localhost:80 | grep -q "Via: .* varnish"'
+  - molecule test
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.varnish/README.md b/provisioning/roles/geerlingguy.varnish/README.md
index fd5b264a9..4eb52ba34 100644
--- a/provisioning/roles/geerlingguy.varnish/README.md
+++ b/provisioning/roles/geerlingguy.varnish/README.md
@@ -16,9 +16,9 @@ Available variables are listed below, along with default values (see `defaults/m
 
 Varnish package name you want to install. See `apt-cache policy varnish` or `yum list varnish` for a listing of available candidates.
 
-    varnish_version: "5.1"
+    varnish_version: "6.1"
 
-Varnish version that should be installed. See the [Varnish Cache packagecloud.io repositories](https://packagecloud.io/varnishcache) for a listing of available versions. Some examples include: `5.1`, `5.0`, `4.1`, `4.0`, `3.0`, and `2.1`.
+Varnish version that should be installed. See the [Varnish Cache packagecloud.io repositories](https://packagecloud.io/varnishcache) for a listing of available versions. Some examples include: `6.1`, `6.0`, `5.1`, `4.1`, `3.0`, and `2.1`.
 
     varnish_config_path: /etc/varnish
 
@@ -43,7 +43,7 @@ Some settings for the default "default.vcl" template that will be copied to the
 
     varnish_limit_nofile: 131072
 
-The `nofiles` PAM limit Varnish will attempt to set for open files. The normal default is ~1024 which is much too low for Varnish usage.
+The `nofiles` PAM limit Varnish will attempt to set for open files. The normal default is 1024 which is much too low for Varnish usage.
 
     varnish_secret: "14bac2e6-1e34-4770-8078-974373b76c90"
 
@@ -71,6 +71,10 @@ Extra options or flags to pass to the Varnish daemon when it starts (e.g. `-p ht
 
 Services that will be started at boot and should be running after this role is complete. You might need to add additional services if required, e.g. `varnishncsa` and `varnishlog`. If set to an empty array, no services will be enabled at startup.
 
+    varnish_packagecloud_repo_yum_repository_priority: "1"
+
+The `yum` priority for the Packagecloud repository used to install Varnish. Setting this explicitly forces yum to use the Packagecloud repositories to install Varnish even in environments (e.g. Amazon Linux) where other repositories may have higher priorities than the default.
+
     varnish_backends:
       apache:
         host: 10.0.2.2
diff --git a/provisioning/roles/geerlingguy.varnish/defaults/main.yml b/provisioning/roles/geerlingguy.varnish/defaults/main.yml
index 0faacc18d..52faf6bae 100644
--- a/provisioning/roles/geerlingguy.varnish/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.varnish/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
 varnish_package_name: "varnish"
-varnish_version: "5.1"
+varnish_version: "6.1"
 
 varnish_use_default_vcl: true
 varnish_default_vcl_template_path: default.vcl.j2
@@ -24,6 +24,9 @@ varnishd_extra_options: ""
 varnish_enabled_services:
   - varnish
 
+# Make sure Packagecloud repo is used on RHEL/CentOS.
+varnish_packagecloud_repo_yum_repository_priority: "1"
+
 # Optionally define additional backends.
 # varnish_backends:
 #   apache:
diff --git a/provisioning/roles/geerlingguy.varnish/handlers/main.yml b/provisioning/roles/geerlingguy.varnish/handlers/main.yml
index 409075088..93882f0d0 100644
--- a/provisioning/roles/geerlingguy.varnish/handlers/main.yml
+++ b/provisioning/roles/geerlingguy.varnish/handlers/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: reload systemd
-  command: systemctl daemon-reload
+  systemd: daemon-reload=true
 
 - name: restart varnish
   service: name=varnish state=restarted
diff --git a/provisioning/roles/geerlingguy.varnish/meta/main.yml b/provisioning/roles/geerlingguy.varnish/meta/main.yml
index b60f7a0a5..692d3794c 100644
--- a/provisioning/roles/geerlingguy.varnish/meta/main.yml
+++ b/provisioning/roles/geerlingguy.varnish/meta/main.yml
@@ -10,15 +10,23 @@ galaxy_info:
   platforms:
     - name: EL
       versions:
-      - 6
-      - 7
+        - 6
+        - 7
     - name: Ubuntu
       versions:
-      - precise
-      - trusty
-      - xenial
+        - precise
+        - trusty
+        - xenial
+        - bionic
     - name: Debian
       versions:
-      - all
+        - all
   galaxy_tags:
     - web
+    - varnish
+    - cache
+    - proxy
+    - reverse-proxy
+    - performance
+    - loadbalancer
+    - balancer
diff --git a/provisioning/roles/geerlingguy.varnish/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.varnish/molecule/default/molecule.yml
new file mode 100644
index 000000000..2ca6feaf9
--- /dev/null
+++ b/provisioning/roles/geerlingguy.varnish/molecule/default/molecule.yml
@@ -0,0 +1,29 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint:
+  name: yamllint
+  options:
+    config-file: molecule/default/yaml-lint.yml
+platforms:
+  - name: instance
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    privileged: true
+    pre_build_image: true
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+  playbooks:
+    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
+scenario:
+  name: default
+verifier:
+  name: testinfra
+  lint:
+    name: flake8
diff --git a/provisioning/roles/geerlingguy.varnish/molecule/default/playbook-41.yml b/provisioning/roles/geerlingguy.varnish/molecule/default/playbook-41.yml
new file mode 100644
index 000000000..0881e724b
--- /dev/null
+++ b/provisioning/roles/geerlingguy.varnish/molecule/default/playbook-41.yml
@@ -0,0 +1,28 @@
+---
+- name: Converge
+  hosts: all
+  become: true
+
+  vars:
+    varnish_version: "4.1"
+
+  pre_tasks:
+    - import_tasks: playbook-setup.yml
+
+  roles:
+    - role: geerlingguy.varnish
+
+  post_tasks:
+    - name: Check the installed Ansible version.
+      command: varnishd -V
+      register: varnish_version
+      failed_when: "'4.1' not in varnish_version.stderr"
+      changed_when: false
+      tags: ['skip_ansible_lint']
+
+    - name: Verify Varnish is running on port 80.
+      shell: 'curl -sI localhost:80 | grep -q "Via: .* varnish"'
+      args:
+        warn: false
+      changed_when: false
+      tags: ['skip_ansible_lint']
diff --git a/provisioning/roles/geerlingguy.varnish/molecule/default/playbook-setup.yml b/provisioning/roles/geerlingguy.varnish/molecule/default/playbook-setup.yml
new file mode 100644
index 000000000..fd85ccf42
--- /dev/null
+++ b/provisioning/roles/geerlingguy.varnish/molecule/default/playbook-setup.yml
@@ -0,0 +1,25 @@
+---
+- name: Update apt cache.
+  apt: update_cache=true cache_valid_time=600
+  when: ansible_os_family == 'Debian'
+
+- name: Ensure build dependencies are installed (RedHat 7+).
+  yum:
+    name:
+      - logrotate
+      - systemd-sysv
+    state: present
+  when:
+    - ansible_os_family == 'RedHat'
+    - ansible_distribution_major_version >= '7'
+
+- name: Ensure build dependencies are installed (RedHat < 7).
+  yum:
+    name: logrotate
+    state: present
+  when:
+    - ansible_os_family == 'RedHat'
+    - ansible_distribution_major_version < '7'
+
+- name: Ensure curl is installed.
+  package: name=curl state=present
diff --git a/provisioning/roles/geerlingguy.varnish/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.varnish/molecule/default/playbook.yml
new file mode 100644
index 000000000..34102ece4
--- /dev/null
+++ b/provisioning/roles/geerlingguy.varnish/molecule/default/playbook.yml
@@ -0,0 +1,33 @@
+---
+- name: Converge
+  hosts: all
+  become: true
+
+  pre_tasks:
+    - import_tasks: playbook-setup.yml
+
+    - name: Set older Varnish version for older OSes.
+      set_fact:
+        varnish_version: "5.1"
+      when: >
+        (ansible_os_family == 'RedHat' and ansible_distribution_major_version|int < 7) or
+        (ansible_distribution == 'Ubuntu' and ansible_distribution_major_version|int < 16) or
+        (ansible_distribution == 'Debian' and ansible_distribution_major_version|int < 9)
+
+  roles:
+    - role: geerlingguy.varnish
+
+  post_tasks:
+    - name: Check the installed Varnish version.
+      command: varnishd -V
+      register: varnish_version_output
+      failed_when: "varnish_version not in varnish_version_output.stderr"
+      changed_when: false
+      tags: ['skip_ansible_lint']
+
+    - name: Verify Varnish is running on port 80.
+      shell: 'curl -sI localhost:80 | grep -q "Via: .* varnish"'
+      args:
+        warn: false
+      changed_when: false
+      tags: ['skip_ansible_lint']
diff --git a/provisioning/roles/geerlingguy.varnish/molecule/default/tests/test_default.py b/provisioning/roles/geerlingguy.varnish/molecule/default/tests/test_default.py
new file mode 100644
index 000000000..eedd64a1d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.varnish/molecule/default/tests/test_default.py
@@ -0,0 +1,14 @@
+import os
+
+import testinfra.utils.ansible_runner
+
+testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
+    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
+
+
+def test_hosts_file(host):
+    f = host.file('/etc/hosts')
+
+    assert f.exists
+    assert f.user == 'root'
+    assert f.group == 'root'
diff --git a/provisioning/roles/geerlingguy.varnish/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.varnish/molecule/default/yaml-lint.yml
new file mode 100644
index 000000000..db22c42ea
--- /dev/null
+++ b/provisioning/roles/geerlingguy.varnish/molecule/default/yaml-lint.yml
@@ -0,0 +1,6 @@
+---
+extends: default
+rules:
+  line-length:
+    max: 160
+    level: warning
diff --git a/provisioning/roles/geerlingguy.varnish/tasks/main.yml b/provisioning/roles/geerlingguy.varnish/tasks/main.yml
index dda345589..65eebdd0e 100644
--- a/provisioning/roles/geerlingguy.varnish/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.varnish/tasks/main.yml
@@ -36,6 +36,7 @@
     group: root
     mode: 0644
   when: >
+    (ansible_os_family == 'RedHat' and ansible_distribution_major_version|int >= 7) or
     (ansible_distribution == 'Debian' and ansible_distribution_version|int >= 8) or
     (ansible_distribution == 'Ubuntu' and ansible_distribution_version.split(".")[0]|int >= 16)
   notify:
@@ -76,7 +77,7 @@
   service:
     name: "{{ item }}"
     state: started
-    enabled: yes
+    enabled: true
   with_items: "{{ varnish_enabled_services | default([]) }}"
   when: >
     varnish_enabled_services and
@@ -87,7 +88,7 @@
   service:
     name: "{{ item }}"
     state: started
-    enabled: yes
+    enabled: true
     use: "service"
   with_items: "{{ varnish_enabled_services | default([]) }}"
   when:
diff --git a/provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml
index fc06952c3..18a40bdbb 100644
--- a/provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml
@@ -1,27 +1,29 @@
 ---
 - name: Ensure Varnish dependencies are installed.
-  yum: name={{ item }} state=present
-  with_items:
-    - yum-utils
-    - pygpgme
+  yum:
+    name:
+      - yum-utils
+      - pygpgme
+    state: present
 
 - name: Add Varnish packagecloud.io yum repo.
   yum_repository:
     name: varnishcache_{{ varnish_packagecloud_repo }}
     description: Varnish Cache packagecloud.io repository.
     baseurl: https://packagecloud.io/varnishcache/{{ varnish_packagecloud_repo }}/el/{{ ansible_distribution_major_version|int }}/$basearch
-    repo_gpgcheck: no
-    gpgcheck: no
-    enabled: yes
+    repo_gpgcheck: false
+    gpgcheck: false
+    enabled: true
     gpgkey: https://packagecloud.io/varnishcache/{{ varnish_packagecloud_repo }}/gpgkey
     sslverify: 1
     sslcacert: /etc/pki/tls/certs/ca-bundle.crt
+    priority: "{{ varnish_packagecloud_repo_yum_repository_priority }}"
   register: varnish_packagecloud_repo_addition
 
 - name: Refresh yum metadata cache if repo changed.
-  command: >
-    yum clean metadata
-    warn=no
+  command: yum clean metadata
+  args:
+    warn: false
   when: varnish_packagecloud_repo_addition.changed
 
 - name: Ensure Varnish is installed.
diff --git a/provisioning/roles/geerlingguy.varnish/templates/varnish.service.j2 b/provisioning/roles/geerlingguy.varnish/templates/varnish.service.j2
index c5f81a0a9..e4e8e1649 100644
--- a/provisioning/roles/geerlingguy.varnish/templates/varnish.service.j2
+++ b/provisioning/roles/geerlingguy.varnish/templates/varnish.service.j2
@@ -1,15 +1,33 @@
 [Unit]
 Description=Varnish Cache, a high-performance HTTP accelerator
+After=network-online.target
 
 [Service]
 Type=forking
+KillMode=process
+
 {% if varnish_pidfile %}
 PIDFile={{ varnish_pidfile }}
 {% endif %}
+
+# Maximum number of open files (for ulimit -n)
 LimitNOFILE={{ varnish_limit_nofile }}
-LimitMEMLOCK=82000
+
+# Locked shared memory - should suffice to lock the shared memory log
+# (varnishd -l argument)
+# Default log size is 80MB vsl + 1M vsm + header -> 82MB
+# unit is bytes
+LimitMEMLOCK=85983232
+
+# Enable this to avoid "fork failed" on reload.
+TasksMax=infinity
+
+# Maximum size of the corefile.
+LimitCORE=infinity
+
 ExecStart=/usr/sbin/varnishd -a :{{ varnish_listen_port }} -T {{ varnish_admin_listen_host }}:{{ varnish_admin_listen_port }}{% if varnish_pidfile %} -P {{ varnish_pidfile }}{% endif %} -f {{ varnish_config_path }}/default.vcl -S {{ varnish_config_path }}/secret -s {{ varnish_storage }} {{ varnishd_extra_options }}
-ExecReload=/usr/share/varnish/reload-vcl
+ExecReload=/usr/sbin/varnishreload
+
 Restart=on-failure
 
 [Install]
diff --git a/provisioning/roles/geerlingguy.varnish/tests/README.md b/provisioning/roles/geerlingguy.varnish/tests/README.md
deleted file mode 100644
index 6fb211721..000000000
--- a/provisioning/roles/geerlingguy.varnish/tests/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Ansible Role tests
-
-To run the test playbook(s) in this directory:
-
-  1. Install and start Docker.
-  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
-    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
-  1. Make the test shim executable: `chmod +x tests/test.sh`.
-  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
-
-If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.varnish/tests/debug.yml b/provisioning/roles/geerlingguy.varnish/tests/debug.yml
deleted file mode 100644
index 9bea1b9e3..000000000
--- a/provisioning/roles/geerlingguy.varnish/tests/debug.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- name: Check what version of Varnish was installed.
-  command: varnishd -V
-  register: varnish_version
-  changed_when: no
-
-- name: Display the installed Varnish version.
-  debug: var=varnish_version
-  changed_when: no
diff --git a/provisioning/roles/geerlingguy.varnish/tests/setup.yml b/provisioning/roles/geerlingguy.varnish/tests/setup.yml
deleted file mode 100644
index 61f75d4f0..000000000
--- a/provisioning/roles/geerlingguy.varnish/tests/setup.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-- name: Update apt cache.
-  apt: update_cache=yes cache_valid_time=600
-  when: ansible_os_family == 'Debian'
-
-- name: Ensure build dependencies are installed (RedHat 7+).
-  yum: 'name="{{ item }}" state=present'
-  with_items:
-    - logrotate
-    - systemd-sysv
-  when: ansible_os_family == 'RedHat' and ansible_distribution_major_version >= '7'
-
-- name: Ensure build dependencies are installed (RedHat < 7).
-  yum: 'name="{{ item }}" state=present'
-  with_items:
-    - logrotate
-  when: ansible_os_family == 'RedHat' and ansible_distribution_major_version < '7'
-
-- name: Ensure curl is installed.
-  package: 'name=curl state=present'
diff --git a/provisioning/roles/geerlingguy.varnish/tests/test-41.yml b/provisioning/roles/geerlingguy.varnish/tests/test-41.yml
deleted file mode 100644
index 6500c3942..000000000
--- a/provisioning/roles/geerlingguy.varnish/tests/test-41.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- hosts: all
-
-  vars:
-    varnish_version: "4.1"
-
-  pre_tasks:
-    - import_tasks: setup.yml
-
-  roles:
-    - role_under_test
-
-  post_tasks:
-    - include_tasks: debug.yml
diff --git a/provisioning/roles/geerlingguy.varnish/tests/test.yml b/provisioning/roles/geerlingguy.varnish/tests/test.yml
deleted file mode 100644
index 175abdf47..000000000
--- a/provisioning/roles/geerlingguy.varnish/tests/test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-- hosts: all
-
-  pre_tasks:
-    - import_tasks: setup.yml
-
-  roles:
-    - role_under_test
-
-  post_tasks:
-    - include_tasks: debug.yml
diff --git a/provisioning/roles/geerlingguy.varnish/vars/RedHat.yml b/provisioning/roles/geerlingguy.varnish/vars/RedHat.yml
index 83b76ddde..686dbc634 100644
--- a/provisioning/roles/geerlingguy.varnish/vars/RedHat.yml
+++ b/provisioning/roles/geerlingguy.varnish/vars/RedHat.yml
@@ -1,2 +1,3 @@
 ---
 varnish_sysvinit_config_path: /etc/sysconfig
+varnish_systemd_config_path: /usr/lib/systemd/system

From 9291d33f524b5a0e3dd6055529106c8141f4e586 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 23 Oct 2018 22:52:13 -0500
Subject: [PATCH 1045/1273] Fixes #1851: Remove Ubuntu 14.04 from test suite as
 more upstreams are dropping support.

---
 .travis.yml        | 3 ---
 README.md          | 6 +++---
 default.config.yml | 2 +-
 tests/run-tests.sh | 8 --------
 4 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b6ca725ca..c06b029f0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,9 +20,6 @@ env:
     # Defaults - Ubuntu 16.04.
     - type: defaults
       distro: ubuntu1604
-    # Defaults - Ubuntu 14.04.
-    - type: defaults
-      distro: ubuntu1404
     # Defaults - Debian 9.
     - type: debian
       distro: debian9
diff --git a/README.md b/README.md
index 8b0f7dd97..dd15fae2e 100644
--- a/README.md
+++ b/README.md
@@ -22,10 +22,10 @@ Drupal VM installs the following on an Ubuntu 16.04 (by default) linux VM:
   - Optional:
     - Drupal Console
     - Drush
-    - Varnish 4.x (configurable)
-    - Apache Solr 4.10.x (configurable)
+    - Varnish
+    - Apache Solr
     - Elasticsearch
-    - Node.js 0.12 (configurable)
+    - Node.js
     - Selenium, for testing your sites via Behat
     - Ruby
     - Memcached
diff --git a/default.config.yml b/default.config.yml
index 2e64ac5e7..b40c25978 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -5,8 +5,8 @@
 #   - geerlingguy/centos6
 #   - geerlingguy/debian9
 #   - geerlingguy/debian8
+#   - geerlingguy/ubuntu1804
 #   - geerlingguy/ubuntu1604
-#   - geerlingguy/ubuntu1404
 vagrant_box: geerlingguy/ubuntu1604
 
 vagrant_user: vagrant
diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index 521ff6593..a0e0ccd0d 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -30,10 +30,6 @@ elif [ $distro = 'centos6' ]; then
 elif [ $distro = 'ubuntu1604' ]; then
   init="/lib/systemd/systemd"
   opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-# Ubuntu 14.04
-elif [ $distro = 'ubuntu1404' ]; then
-  init="/sbin/init"
-  opts="--privileged"
 # Debian 9
 elif [ $distro = 'debian9' ]; then
   init="/lib/systemd/systemd"
@@ -42,10 +38,6 @@ elif [ $distro = 'debian9' ]; then
 elif [ $distro = 'debian8' ]; then
   init="/lib/systemd/systemd"
   opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-# Fedora 24
-elif [ $distro = 'fedora24' ]; then
-  init="/usr/lib/systemd/systemd"
-  opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
 fi
 
 # Set OS-specific options.

From f26bf928b8631acf93462f7e75f9590dc7212c6a Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 25 Oct 2018 13:05:06 -0500
Subject: [PATCH 1046/1273] Add cgroup fs mount to docker compose example so
 systemd works.

---
 docs/other/docker.md       | 1 +
 example.docker-compose.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/docs/other/docker.md b/docs/other/docker.md
index 76f0af810..ad928e9f0 100644
--- a/docs/other/docker.md
+++ b/docs/other/docker.md
@@ -49,6 +49,7 @@ If you only need a container to run your site, and you want to package up the co
         volumes:
           - ./:/var/www/drupalvm/drupal/web/:rw,delegated
           - /var/lib/mysql
+          - /sys/fs/cgroup:/sys/fs/cgroup:ro
         command: /lib/systemd/systemd
     ```
 
diff --git a/example.docker-compose.yml b/example.docker-compose.yml
index a3a9fea7f..d11a14a43 100644
--- a/example.docker-compose.yml
+++ b/example.docker-compose.yml
@@ -27,6 +27,7 @@ services:
     volumes:
       - ./:/var/www/drupalvm/:rw,delegated
       - /var/lib/mysql
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
 
     privileged: true
     command: /lib/systemd/systemd

From 51010a845938ec5a019617a4daa4045657d0b255 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 1 Nov 2018 13:21:03 -0500
Subject: [PATCH 1047/1273] Issue #532: Update BigPipe docs slightly. [ci skip]

---
 docs/other/bigpipe.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/other/bigpipe.md b/docs/other/bigpipe.md
index fa3d89989..c582de022 100644
--- a/docs/other/bigpipe.md
+++ b/docs/other/bigpipe.md
@@ -2,7 +2,7 @@
 
 To do this, BigPipe requires an environment configured to allow the authenticated request response to be streamed from PHP all the way through to the client. All parts of the web stack that intermediate the connection have to have output buffering disabled so the response stream can flow through.
 
-Drupal VM's default configuration uses Apache with the `mod_proxy_fastcgi` module to connect to PHP-FPM, which isn't the most optimal configuration for BigPipe, and requires gzip compression to be disabled, so you should either switch to Nginx or consider further customizing the Apache configuration.
+Drupal VM's default configuration uses Apache with the `mod_proxy_fastcgi` module to connect to PHP-FPM, which isn't the most optimal configuration for BigPipe, so you should either switch to Nginx or consider further customizing the Apache configuration.
 
 Drupal VM's Varnish configuration works with BigPipe out of the box, as it allows the backend response to be streamed whenever BigPipe is enabled (it outputs a `Surrogate-Control: BigPipe/1.0` header to tell Varnish when to stream the response).
 

From dc70be9240cc30088767a5a11e503d8f2c39b01e Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 5 Nov 2018 14:23:10 -0600
Subject: [PATCH 1048/1273] Fixes #1854: Document older Varnish version
 requirement for CentOS 6.

---
 docs/configurations/base-os.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/configurations/base-os.md b/docs/configurations/base-os.md
index 26aaf6b83..6795b0e52 100644
--- a/docs/configurations/base-os.md
+++ b/docs/configurations/base-os.md
@@ -41,6 +41,12 @@ php_opcache_enabled_in_ini: false
 firewall_disable_firewalld: false
 ```
 
+- **Varnish**: Newer versions of Varnish are no longer available for CentOS 6, so you need to lock Varnish in at an older version, by adding something like the following in `config.yml`:
+
+```yaml
+varnish_version: 5.2
+```
+
 ## Debian 9 Stretch
 
 Everything should work out of the box with Debian 9.

From 2e427e94ac772df15109f63a356bbfc437b373ce Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 9 Nov 2018 14:13:44 -0600
Subject: [PATCH 1049/1273] Update PHP PECL role to latest version.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.php-pecl/.gitignore     |  3 +-
 .../roles/geerlingguy.php-pecl/.travis.yml    | 33 ++++++++++---------
 .../geerlingguy.php-pecl/defaults/main.yml    |  2 +-
 .../roles/geerlingguy.php-pecl/meta/main.yml  | 24 +++++++-------
 .../molecule/default/molecule.yml             | 29 ++++++++++++++++
 .../default/playbook.yml}                     | 20 ++++++++---
 .../default}/requirements.yml                 |  0
 .../molecule/default/tests/test_default.py    | 14 ++++++++
 .../molecule/default/yaml-lint.yml            |  6 ++++
 .../roles/geerlingguy.php-pecl/tasks/main.yml |  5 ++-
 .../geerlingguy.php-pecl/tests/README.md      | 11 -------
 .../geerlingguy.php-pecl/vars/Debian-9.yml    |  2 ++
 13 files changed, 104 insertions(+), 47 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.php-pecl/molecule/default/molecule.yml
 rename provisioning/roles/geerlingguy.php-pecl/{tests/test.yml => molecule/default/playbook.yml} (53%)
 rename provisioning/roles/geerlingguy.php-pecl/{tests => molecule/default}/requirements.yml (100%)
 create mode 100644 provisioning/roles/geerlingguy.php-pecl/molecule/default/tests/test_default.py
 create mode 100644 provisioning/roles/geerlingguy.php-pecl/molecule/default/yaml-lint.yml
 delete mode 100644 provisioning/roles/geerlingguy.php-pecl/tests/README.md
 create mode 100644 provisioning/roles/geerlingguy.php-pecl/vars/Debian-9.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 652c0295a..58359f387 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -48,7 +48,7 @@
 - src: geerlingguy.php-mysql
   version: 2.0.2
 - src: geerlingguy.php-pecl
-  version: 1.4.0
+  version: 1.4.1
 - src: geerlingguy.php-pgsql
   version: 1.0.1
 - src: geerlingguy.php-redis
diff --git a/provisioning/roles/geerlingguy.php-pecl/.gitignore b/provisioning/roles/geerlingguy.php-pecl/.gitignore
index c9b2377e3..f56f5b578 100644
--- a/provisioning/roles/geerlingguy.php-pecl/.gitignore
+++ b/provisioning/roles/geerlingguy.php-pecl/.gitignore
@@ -1,2 +1,3 @@
 *.retry
-tests/test.sh
+*/__pycache__
+*.pyc
diff --git a/provisioning/roles/geerlingguy.php-pecl/.travis.yml b/provisioning/roles/geerlingguy.php-pecl/.travis.yml
index b74454fd2..343783049 100644
--- a/provisioning/roles/geerlingguy.php-pecl/.travis.yml
+++ b/provisioning/roles/geerlingguy.php-pecl/.travis.yml
@@ -1,27 +1,28 @@
 ---
+language: python
 services: docker
 
 env:
-  - distro: centos7
-  - distro: ubuntu1604
+  global:
+    - ROLE_NAME: php-pecl
+  matrix:
+    - MOLECULE_DISTRO: centos7
+    - MOLECULE_DISTRO: ubuntu1804
+    - MOLECULE_DISTRO: debian9
 
-script:
-  # Configure test script so we can run extra tests after playbook is run.
-  - export container_id=$(date +%s)
-  - export cleanup=false
+install:
+  # Install test dependencies.
+  - pip install molecule docker
 
-  # Download test shim.
-  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
-  - chmod +x ${PWD}/tests/test.sh
+before_script:
+  # Use actual Ansible Galaxy role name for the project directory.
+  - cd ../
+  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
+  - cd geerlingguy.$ROLE_NAME
 
+script:
   # Run tests.
-  - ${PWD}/tests/test.sh
-
-  # Make sure Pecl is installed.
-  - >
-    sudo docker exec ${container_id} which pecl
-    && (echo 'Pecl is installed' && exit 0)
-    || (echo 'Pecl is not installed' && exit 1)
+  - molecule test
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.php-pecl/defaults/main.yml b/provisioning/roles/geerlingguy.php-pecl/defaults/main.yml
index 3138b59cd..f22442736 100644
--- a/provisioning/roles/geerlingguy.php-pecl/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.php-pecl/defaults/main.yml
@@ -5,4 +5,4 @@ php_pecl_install_command: "pecl install"
 
 # Add extensions to this list to have them installed with this role.
 php_pecl_extensions: []
-  # - xdebug
+# - xdebug
diff --git a/provisioning/roles/geerlingguy.php-pecl/meta/main.yml b/provisioning/roles/geerlingguy.php-pecl/meta/main.yml
index 06c138d81..8ff0cdc33 100644
--- a/provisioning/roles/geerlingguy.php-pecl/meta/main.yml
+++ b/provisioning/roles/geerlingguy.php-pecl/meta/main.yml
@@ -7,38 +7,40 @@ galaxy_info:
   description: PHP PECL extension installation.
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 1.9
+  min_ansible_version: 2.0
   platforms:
     - name: EL
       versions:
-      - all
+        - all
     - name: GenericUNIX
       versions:
-      - all
+        - all
     - name: Fedora
       versions:
-      - all
+        - all
     - name: opensuse
       versions:
-      - all
+        - all
     - name: GenericBSD
       versions:
-      - all
+        - all
     - name: FreeBSD
       versions:
-      - all
+        - all
     - name: Ubuntu
       versions:
-      - all
+        - all
     - name: SLES
       versions:
-      - all
+        - all
     - name: GenericLinux
       versions:
-      - all
+        - all
     - name: Debian
       versions:
-      - all
+        - all
   galaxy_tags:
     - development
     - web
+    - php
+    - pecl
diff --git a/provisioning/roles/geerlingguy.php-pecl/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.php-pecl/molecule/default/molecule.yml
new file mode 100644
index 000000000..2ca6feaf9
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-pecl/molecule/default/molecule.yml
@@ -0,0 +1,29 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint:
+  name: yamllint
+  options:
+    config-file: molecule/default/yaml-lint.yml
+platforms:
+  - name: instance
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    privileged: true
+    pre_build_image: true
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+  playbooks:
+    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
+scenario:
+  name: default
+verifier:
+  name: testinfra
+  lint:
+    name: flake8
diff --git a/provisioning/roles/geerlingguy.php-pecl/tests/test.yml b/provisioning/roles/geerlingguy.php-pecl/molecule/default/playbook.yml
similarity index 53%
rename from provisioning/roles/geerlingguy.php-pecl/tests/test.yml
rename to provisioning/roles/geerlingguy.php-pecl/molecule/default/playbook.yml
index 298f34d7f..efd36e965 100644
--- a/provisioning/roles/geerlingguy.php-pecl/tests/test.yml
+++ b/provisioning/roles/geerlingguy.php-pecl/molecule/default/playbook.yml
@@ -1,15 +1,18 @@
 ---
-- hosts: all
+- name: Converge
+  hosts: all
+  become: true
 
   vars:
     php_enable_webserver: false
-    php_enablerepo: "remi,remi-php70"
+    php_enablerepo: "remi,remi-php72"
+    php_default_version_debian: "7.2"
     php_pecl_extensions:
       - redis
 
   pre_tasks:
     - name: Update apt cache.
-      apt: update_cache=yes cache_valid_time=600
+      apt: update_cache=true cache_valid_time=600
       when: ansible_os_family == 'Debian'
 
     - name: Install development tools (Debian).
@@ -20,8 +23,15 @@
       yum: name="@Development tools" state=present
       when: ansible_os_family == 'RedHat'
 
+    - name: Set version to 7.0 on Debian 9 and enable pecl installation
+      set_fact:
+        php_default_version_debian: '7.0'
+      when:
+        - ansible_os_family == 'Debian'
+        - ansible_distribution_major_version == '9'
+
   roles:
     - role: geerlingguy.repo-remi
       when: ansible_os_family == 'RedHat'
-    - geerlingguy.php
-    - role_under_test
\ No newline at end of file
+    - role: geerlingguy.php
+    - role: geerlingguy.php-pecl
diff --git a/provisioning/roles/geerlingguy.php-pecl/tests/requirements.yml b/provisioning/roles/geerlingguy.php-pecl/molecule/default/requirements.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.php-pecl/tests/requirements.yml
rename to provisioning/roles/geerlingguy.php-pecl/molecule/default/requirements.yml
diff --git a/provisioning/roles/geerlingguy.php-pecl/molecule/default/tests/test_default.py b/provisioning/roles/geerlingguy.php-pecl/molecule/default/tests/test_default.py
new file mode 100644
index 000000000..eedd64a1d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-pecl/molecule/default/tests/test_default.py
@@ -0,0 +1,14 @@
+import os
+
+import testinfra.utils.ansible_runner
+
+testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
+    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
+
+
+def test_hosts_file(host):
+    f = host.file('/etc/hosts')
+
+    assert f.exists
+    assert f.user == 'root'
+    assert f.group == 'root'
diff --git a/provisioning/roles/geerlingguy.php-pecl/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.php-pecl/molecule/default/yaml-lint.yml
new file mode 100644
index 000000000..a3dbc38ee
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-pecl/molecule/default/yaml-lint.yml
@@ -0,0 +1,6 @@
+---
+extends: default
+rules:
+  line-length:
+    max: 120
+    level: warning
diff --git a/provisioning/roles/geerlingguy.php-pecl/tasks/main.yml b/provisioning/roles/geerlingguy.php-pecl/tasks/main.yml
index c9e500e1a..060f35ea5 100644
--- a/provisioning/roles/geerlingguy.php-pecl/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php-pecl/tasks/main.yml
@@ -1,6 +1,9 @@
 ---
 - name: Include OS-Specific variables.
-  include_vars: "{{ ansible_os_family }}.yml"
+  include_vars: "{{ item }}"
+  with_first_found:
+    - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
+    - "{{ ansible_os_family }}.yml"
 
 - name: Ensure pecl is installed (if configured).
   package:
diff --git a/provisioning/roles/geerlingguy.php-pecl/tests/README.md b/provisioning/roles/geerlingguy.php-pecl/tests/README.md
deleted file mode 100644
index 6fb211721..000000000
--- a/provisioning/roles/geerlingguy.php-pecl/tests/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Ansible Role tests
-
-To run the test playbook(s) in this directory:
-
-  1. Install and start Docker.
-  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
-    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
-  1. Make the test shim executable: `chmod +x tests/test.sh`.
-  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
-
-If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.php-pecl/vars/Debian-9.yml b/provisioning/roles/geerlingguy.php-pecl/vars/Debian-9.yml
new file mode 100644
index 000000000..fd71295b9
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-pecl/vars/Debian-9.yml
@@ -0,0 +1,2 @@
+---
+php_pecl_package: php-pear

From fbac0813accf39942b6b45738a57bb5331326357 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 21 Nov 2018 13:19:24 -0600
Subject: [PATCH 1050/1273] Issue #1774: Switch to default Drupal VM base box
 for faster provisioning.

---
 default.config.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/default.config.yml b/default.config.yml
index b40c25978..ab340eef8 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -1,13 +1,14 @@
 ---
 # Available `vagrant_box` values include:
 #   - beet/box (pre-provisioned, based on Ubuntu 16.04)
+#   - geerlingguy/drupal-vm (pre-provisioned, based on Ubuntu 16.04)
 #   - geerlingguy/centos7
 #   - geerlingguy/centos6
 #   - geerlingguy/debian9
 #   - geerlingguy/debian8
 #   - geerlingguy/ubuntu1804
 #   - geerlingguy/ubuntu1604
-vagrant_box: geerlingguy/ubuntu1604
+vagrant_box: geerlingguy/drupal-vm
 
 vagrant_user: vagrant
 vagrant_synced_folder_default_type: nfs

From 6aae52e452b4d637197d1a8db73009a1154132f9 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 21 Nov 2018 14:37:20 -0600
Subject: [PATCH 1051/1273] Issue #1774: Toggle Nginx, Apache, Postgres, and
 MySQL appropriately for new base box.

---
 provisioning/playbook.yml          |  3 ++
 provisioning/tasks/app-toggles.yml | 46 ++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 provisioning/tasks/app-toggles.yml

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 84c62a2e1..1dbd66144 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -10,6 +10,9 @@
     - import_tasks: tasks/config.yml
       tags: ['always']
 
+    - import_tasks: tasks/app-toggles.yml
+      tags: ['always']
+
     - import_tasks: tasks/backwards-compatibility.yml
       tags: ['always']
 
diff --git a/provisioning/tasks/app-toggles.yml b/provisioning/tasks/app-toggles.yml
new file mode 100644
index 000000000..d48193be2
--- /dev/null
+++ b/provisioning/tasks/app-toggles.yml
@@ -0,0 +1,46 @@
+---
+- name: Configure toggle vars for Debian/Ubuntu.
+  set_fact:
+    apache_service: apache2
+    mysql_daemon: mysql
+  when: ansible_os_family == 'Debian'
+
+- name: Configure toggle vars for CentOS.
+  set_fact:
+    apache_service: httpd
+    mysql_daemon: "{{ 'mysqld' if ansible_distribution_major_version == '6' else 'mariadb' }}"
+  when: ansible_os_family == 'RedHat'
+
+# Toggle for drupalvm_webserver.
+- name: Ensure Apache is stopped and disabled if Nginx is used.
+  service:
+    name: "{{ apache_service }}"
+    state: stopped
+    enabled: false
+  failed_when: false
+  when: drupalvm_webserver == 'nginx'
+
+- name: Ensure Nginx is stopped and disabled if Apache is used.
+  service:
+    name: nginx
+    state: stopped
+    enabled: false
+  failed_when: false
+  when: drupalvm_webserver == 'apache'
+
+# Toggle for drupal_db_backend.
+- name: Ensure MySQL is stopped and disabled if Postgres is used.
+  service:
+    name: "{{ mysql_daemon }}"
+    state: stopped
+    enabled: false
+  failed_when: false
+  when: drupal_db_backend == 'pgsql'
+
+- name: Ensure Postgres is stopped and disabled if MySQL is used.
+  service:
+    name: postgresql
+    state: stopped
+    enabled: false
+  failed_when: false
+  when: drupal_db_backend == 'mysql'

From 69a44233d2dbd7c4e08f859350d4e45498654c4c Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 21 Nov 2018 15:11:06 -0600
Subject: [PATCH 1052/1273] Issue #1774: Add docs for building a custom Vagrant
 base box.

---
 docs/other/custom-base-box.md | 11 +++++++++++
 mkdocs.yml                    |  1 +
 2 files changed, 12 insertions(+)
 create mode 100644 docs/other/custom-base-box.md

diff --git a/docs/other/custom-base-box.md b/docs/other/custom-base-box.md
new file mode 100644
index 000000000..40efbaf48
--- /dev/null
+++ b/docs/other/custom-base-box.md
@@ -0,0 +1,11 @@
+You can build a custom Vagrant base box to help speed up the provisioning time for Drupal VM for your project, or if you have other specilized requirements, like:
+
+  - You need larger virtual disk image size for your VM
+  - You need a base box for a provider not supported by the default Drupal VM boxes (e.g. Parallels, VMware Fusion, AWS, etc.)
+  - You need to inject certain software or configuration which is difficult to do using Drupal VM alone.
+
+By default, Drupal VM uses the [`geerlingguy/drupal-vm`](https://app.vagrantup.com/geerlingguy/boxes/drupal-vm) Vagrant base box, but you can use any base box which has at least a minimal OS installation supported by Drupal VM (e.g. CentOS, Ubuntu, Debian).
+
+This base box is built using the Packer configuration here: [Packer Build - Drupal VM](https://github.com/geerlingguy/packer-drupal-vm).
+
+In order to build your own custom base box, fork the Packer project linked above, then follow the instructions included in its README to install Packer and build the base box. Then update your `config.yml` to point to your own custom box by overriding the `vagrant_box` variable.
diff --git a/mkdocs.yml b/mkdocs.yml
index 2c9151873..1f2a3da0f 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -67,6 +67,7 @@ pages:
     - 'Vagrant LXC provider': 'other/vagrant-lxc.md'
     - 'Improving Performance': 'other/performance.md'
     - 'Docker': 'other/docker.md'
+    - 'Custom Vagrant Base Box': 'other/custom-base-box.md'
     - 'BigPipe with Drupal VM': 'other/bigpipe.md'
     - 'Drupal multisite': 'deployment/multisite.md'
     - 'Drupal 6 Notes': 'other/drupal-6.md'

From 961194e82d4cd127efb8bc5e6129698d3dc5902a Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 21 Nov 2018 20:18:01 -0600
Subject: [PATCH 1053/1273] Upgrade tideways role to latest version.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.php-tideways/.gitignore |  3 +-
 .../geerlingguy.php-tideways/.travis.yml      | 31 ++++++++++---------
 .../roles/geerlingguy.php-tideways/README.md  |  8 +++--
 .../defaults/main.yml                         |  3 +-
 .../geerlingguy.php-tideways/meta/main.yml    | 20 ++++++------
 .../molecule/default/molecule.yml             | 29 +++++++++++++++++
 .../molecule/default/playbook.yml             | 26 ++++++++++++++++
 .../default}/requirements.yml                 |  2 +-
 .../molecule/default/tests/test_default.py    | 14 +++++++++
 .../default}/tideways-test.php                |  0
 .../molecule/default/yaml-lint.yml            |  6 ++++
 .../geerlingguy.php-tideways/tasks/main.yml   | 13 ++++----
 .../geerlingguy.php-tideways/tasks/xhprof.yml |  3 +-
 .../templates/tideways.ini.j2                 |  2 +-
 .../geerlingguy.php-tideways/tests/README.md  | 11 -------
 .../geerlingguy.php-tideways/tests/test.yml   | 31 -------------------
 17 files changed, 124 insertions(+), 80 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.php-tideways/molecule/default/molecule.yml
 create mode 100644 provisioning/roles/geerlingguy.php-tideways/molecule/default/playbook.yml
 rename provisioning/roles/geerlingguy.php-tideways/{tests => molecule/default}/requirements.yml (63%)
 create mode 100644 provisioning/roles/geerlingguy.php-tideways/molecule/default/tests/test_default.py
 rename provisioning/roles/geerlingguy.php-tideways/{tests => molecule/default}/tideways-test.php (100%)
 create mode 100644 provisioning/roles/geerlingguy.php-tideways/molecule/default/yaml-lint.yml
 delete mode 100644 provisioning/roles/geerlingguy.php-tideways/tests/README.md
 delete mode 100644 provisioning/roles/geerlingguy.php-tideways/tests/test.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 58359f387..c73bf934f 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -54,7 +54,7 @@
 - src: geerlingguy.php-redis
   version: 3.2.1
 - src: geerlingguy.php-tideways
-  version: 2.1.0
+  version: 2.2.0
 - src: geerlingguy.php-versions
   version: 2.1.5
 - src: geerlingguy.php-xdebug
diff --git a/provisioning/roles/geerlingguy.php-tideways/.gitignore b/provisioning/roles/geerlingguy.php-tideways/.gitignore
index c9b2377e3..f56f5b578 100644
--- a/provisioning/roles/geerlingguy.php-tideways/.gitignore
+++ b/provisioning/roles/geerlingguy.php-tideways/.gitignore
@@ -1,2 +1,3 @@
 *.retry
-tests/test.sh
+*/__pycache__
+*.pyc
diff --git a/provisioning/roles/geerlingguy.php-tideways/.travis.yml b/provisioning/roles/geerlingguy.php-tideways/.travis.yml
index 93f994a87..08fc4bb87 100644
--- a/provisioning/roles/geerlingguy.php-tideways/.travis.yml
+++ b/provisioning/roles/geerlingguy.php-tideways/.travis.yml
@@ -1,25 +1,28 @@
 ---
+language: python
 services: docker
 
 env:
-  - distro: centos7
-  - distro: ubuntu1604
-  - distro: debian9
+  global:
+    - ROLE_NAME: php-tideways
+  matrix:
+    - MOLECULE_DISTRO: centos7
+    - MOLECULE_DISTRO: ubuntu1804
+    - MOLECULE_DISTRO: debian9
 
-script:
-  # Configure test script so we can run extra tests after playbook is run.
-  - export container_id=$(date +%s)
-  - export cleanup=false
+install:
+  # Install test dependencies.
+  - pip install molecule docker
 
-  # Download test shim.
-  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
-  - chmod +x ${PWD}/tests/test.sh
+before_script:
+  # Use actual Ansible Galaxy role name for the project directory.
+  - cd ../
+  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
+  - cd geerlingguy.$ROLE_NAME
 
+script:
   # Run tests.
-  - ${PWD}/tests/test.sh
-
-  # Run script to test if Tideways is available and working.
-  - 'docker exec ${container_id} env TERM=xterm php /etc/ansible/roles/role_under_test/tests/tideways-test.php'
+  - molecule test
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.php-tideways/README.md b/provisioning/roles/geerlingguy.php-tideways/README.md
index 102cb068d..9538b4dbe 100644
--- a/provisioning/roles/geerlingguy.php-tideways/README.md
+++ b/provisioning/roles/geerlingguy.php-tideways/README.md
@@ -19,13 +19,17 @@ Where Tideways setup files will be downloaded and built.
     tideways_download_url: https://github.com/tideways/php-xhprof-extension/archive/master.zip
     tideways_download_folder_name: php-xhprof-extension-master
 
-The URL from which Tideways will be downloaded.
+The URL from which Tideways will be downloaded, and the resulting folder into which it is downloaded.
+
+    tideways_extension_name: tideways_xhprof.so
+
+The extension name for the Tideways PHP extension.
 
     tideways_api_key: ''
 
 If you use the Tideways UI, set this variable to your API key. Otherwise the extension can be used along with the XHProf UI to view profiles.
 
-    tideways_install_xhprof_ui: yes
+    tideways_install_xhprof_ui: true
 
 Tideways data-format is 100% compatible with XHProf so you can use the XHProf UI to browse profiles reports and the `XHProfRuns_Default` class to write the profile data to disk. If you use the Tideways UI, set this variable to `no`.
 
diff --git a/provisioning/roles/geerlingguy.php-tideways/defaults/main.yml b/provisioning/roles/geerlingguy.php-tideways/defaults/main.yml
index d00c72d7f..48eb57dd5 100644
--- a/provisioning/roles/geerlingguy.php-tideways/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.php-tideways/defaults/main.yml
@@ -3,13 +3,14 @@ workspace: /root
 
 tideways_download_url: https://github.com/tideways/php-xhprof-extension/archive/master.zip
 tideways_download_folder_name: php-xhprof-extension-master
+tideways_extension_name: tideways_xhprof.so
 
 # If you use the Tideways UI, set this variable to your API key. Otherwise the
 # extension can be used along with the XHProf UI to view profiles.
 tideways_api_key: ''
 
 # XHProf UI
-tideways_install_xhprof_ui: yes
+tideways_install_xhprof_ui: true
 
 __tideways_xhprof_download_url: https://github.com/phacility/xhprof/archive/master.tar.gz
 __tideways_xhprof_download_folder_name: xhprof-master
diff --git a/provisioning/roles/geerlingguy.php-tideways/meta/main.yml b/provisioning/roles/geerlingguy.php-tideways/meta/main.yml
index 9d4e3c947..7b47be1fe 100644
--- a/provisioning/roles/geerlingguy.php-tideways/meta/main.yml
+++ b/provisioning/roles/geerlingguy.php-tideways/meta/main.yml
@@ -11,34 +11,34 @@ galaxy_info:
   platforms:
     - name: EL
       versions:
-      - all
+        - all
     - name: GenericUNIX
       versions:
-      - all
+        - all
     - name: Fedora
       versions:
-      - all
+        - all
     - name: opensuse
       versions:
-      - all
+        - all
     - name: GenericBSD
       versions:
-      - all
+        - all
     - name: FreeBSD
       versions:
-      - all
+        - all
     - name: Ubuntu
       versions:
-      - all
+        - all
     - name: SLES
       versions:
-      - all
+        - all
     - name: GenericLinux
       versions:
-      - all
+        - all
     - name: Debian
       versions:
-      - all
+        - all
   galaxy_tags:
     - development
     - web
diff --git a/provisioning/roles/geerlingguy.php-tideways/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.php-tideways/molecule/default/molecule.yml
new file mode 100644
index 000000000..2ca6feaf9
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-tideways/molecule/default/molecule.yml
@@ -0,0 +1,29 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint:
+  name: yamllint
+  options:
+    config-file: molecule/default/yaml-lint.yml
+platforms:
+  - name: instance
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    privileged: true
+    pre_build_image: true
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+  playbooks:
+    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
+scenario:
+  name: default
+verifier:
+  name: testinfra
+  lint:
+    name: flake8
diff --git a/provisioning/roles/geerlingguy.php-tideways/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.php-tideways/molecule/default/playbook.yml
new file mode 100644
index 000000000..81235ba01
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-tideways/molecule/default/playbook.yml
@@ -0,0 +1,26 @@
+---
+- name: Converge
+  hosts: all
+  become: true
+
+  vars:
+    php_enable_webserver: false
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=true cache_valid_time=600
+      when: ansible_os_family == 'Debian'
+
+  roles:
+    - role: geerlingguy.repo-remi
+      when: ansible_os_family == 'RedHat'
+    - role: geerlingguy.php-versions
+    - role: geerlingguy.php
+    - role: geerlingguy.php-tideways
+
+  post_tasks:
+    - name: Run test script to confirm Tideways is working.
+      script: tideways-test.php
+      args:
+        executable: php
+      changed_when: false
diff --git a/provisioning/roles/geerlingguy.php-tideways/tests/requirements.yml b/provisioning/roles/geerlingguy.php-tideways/molecule/default/requirements.yml
similarity index 63%
rename from provisioning/roles/geerlingguy.php-tideways/tests/requirements.yml
rename to provisioning/roles/geerlingguy.php-tideways/molecule/default/requirements.yml
index 51eedd6a9..908335edd 100644
--- a/provisioning/roles/geerlingguy.php-tideways/tests/requirements.yml
+++ b/provisioning/roles/geerlingguy.php-tideways/molecule/default/requirements.yml
@@ -1,4 +1,4 @@
 ---
 - src: geerlingguy.repo-remi
-- src: geerlingguy.repo-dotdeb
+- src: geerlingguy.php-versions
 - src: geerlingguy.php
diff --git a/provisioning/roles/geerlingguy.php-tideways/molecule/default/tests/test_default.py b/provisioning/roles/geerlingguy.php-tideways/molecule/default/tests/test_default.py
new file mode 100644
index 000000000..eedd64a1d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-tideways/molecule/default/tests/test_default.py
@@ -0,0 +1,14 @@
+import os
+
+import testinfra.utils.ansible_runner
+
+testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
+    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
+
+
+def test_hosts_file(host):
+    f = host.file('/etc/hosts')
+
+    assert f.exists
+    assert f.user == 'root'
+    assert f.group == 'root'
diff --git a/provisioning/roles/geerlingguy.php-tideways/tests/tideways-test.php b/provisioning/roles/geerlingguy.php-tideways/molecule/default/tideways-test.php
similarity index 100%
rename from provisioning/roles/geerlingguy.php-tideways/tests/tideways-test.php
rename to provisioning/roles/geerlingguy.php-tideways/molecule/default/tideways-test.php
diff --git a/provisioning/roles/geerlingguy.php-tideways/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.php-tideways/molecule/default/yaml-lint.yml
new file mode 100644
index 000000000..a3dbc38ee
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-tideways/molecule/default/yaml-lint.yml
@@ -0,0 +1,6 @@
+---
+extends: default
+rules:
+  line-length:
+    max: 120
+    level: warning
diff --git a/provisioning/roles/geerlingguy.php-tideways/tasks/main.yml b/provisioning/roles/geerlingguy.php-tideways/tasks/main.yml
index 65c256850..562fb8019 100644
--- a/provisioning/roles/geerlingguy.php-tideways/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php-tideways/tasks/main.yml
@@ -24,14 +24,14 @@
   unarchive:
     src: "{{ tideways_download_url }}"
     dest: "{{ workspace }}"
-    copy: no
+    copy: false
     creates: "{{ workspace }}/{{ tideways_download_folder_name }}"
 
 - name: Build Tideways.
-  shell: >
+  command: >
     {{ item }}
     chdir={{ workspace }}/{{ tideways_download_folder_name }}
-    creates={{ workspace }}/{{ tideways_download_folder_name }}/modules/tideways_xhprof.so
+    creates={{ workspace }}/{{ tideways_download_folder_name }}/modules/{{ tideways_extension_name }}
   with_items:
     - phpize
     - ./configure
@@ -48,9 +48,10 @@
     mode: 0755
 
 - name: Move Tideways module into place.
-  shell: >
-    cp {{ workspace }}/{{ tideways_download_folder_name }}/modules/tideways_xhprof.so {{ php_tideways_module_path }}/tideways_xhprof.so
-    creates={{ php_tideways_module_path }}/tideways_xhprof.so
+  command: >
+    cp {{ workspace }}/{{ tideways_download_folder_name }}/modules/{{ tideways_extension_name }}
+    {{ php_tideways_module_path }}/{{ tideways_extension_name }}
+    creates={{ php_tideways_module_path }}/{{ tideways_extension_name }}
   notify: restart webserver
 
 # TODO - Install the Tideways.php file for UI?
diff --git a/provisioning/roles/geerlingguy.php-tideways/tasks/xhprof.yml b/provisioning/roles/geerlingguy.php-tideways/tasks/xhprof.yml
index 7fb9357c7..c713dc220 100644
--- a/provisioning/roles/geerlingguy.php-tideways/tasks/xhprof.yml
+++ b/provisioning/roles/geerlingguy.php-tideways/tasks/xhprof.yml
@@ -1,3 +1,4 @@
+---
 - name: Define xhprof_download_url.
   set_fact:
     xhprof_download_url: "{{ __tideways_xhprof_download_url }}"
@@ -27,7 +28,7 @@
   unarchive:
     src: "{{ xhprof_download_url }}"
     dest: "{{ workspace }}"
-    copy: no
+    copy: false
     creates: "{{ workspace }}/{{ xhprof_download_folder_name }}"
 
 - name: Move XHProf PHP library into place.
diff --git a/provisioning/roles/geerlingguy.php-tideways/templates/tideways.ini.j2 b/provisioning/roles/geerlingguy.php-tideways/templates/tideways.ini.j2
index 67dd48b33..4d6d23335 100644
--- a/provisioning/roles/geerlingguy.php-tideways/templates/tideways.ini.j2
+++ b/provisioning/roles/geerlingguy.php-tideways/templates/tideways.ini.j2
@@ -1,5 +1,5 @@
 [tideways]
-extension="{{ php_tideways_module_path }}/tideways_xhprof.so"
+extension="{{ php_tideways_module_path }}/{{ tideways_extension_name }}"
 {% if tideways_api_key %}
 tideways.api_key={{ tideways_api_key }}
 {% else %}
diff --git a/provisioning/roles/geerlingguy.php-tideways/tests/README.md b/provisioning/roles/geerlingguy.php-tideways/tests/README.md
deleted file mode 100644
index 6fb211721..000000000
--- a/provisioning/roles/geerlingguy.php-tideways/tests/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Ansible Role tests
-
-To run the test playbook(s) in this directory:
-
-  1. Install and start Docker.
-  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
-    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
-  1. Make the test shim executable: `chmod +x tests/test.sh`.
-  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
-
-If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.php-tideways/tests/test.yml b/provisioning/roles/geerlingguy.php-tideways/tests/test.yml
deleted file mode 100644
index 942f6d7e6..000000000
--- a/provisioning/roles/geerlingguy.php-tideways/tests/test.yml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-- hosts: all
-
-  vars:
-    php_enable_webserver: false
-    php_enablerepo: "remi,remi-php70"
-
-  pre_tasks:
-    - name: Update apt cache.
-      apt: update_cache=yes cache_valid_time=600
-      when: ansible_os_family == 'Debian'
-
-    - name: Set php_packages for PHP 7.0 Debian 8 install.
-      set_fact:
-        php_packages:
-          - php7.0-common
-          - php7.0-cli
-          - php7.0-dev
-          - php7.0-fpm
-          - libpcre3-dev
-          - php7.0-opcache
-          - php7.0-apcu
-      when: ansible_distribution == 'Debian'
-
-  roles:
-    - role: geerlingguy.repo-remi
-      when: ansible_os_family == 'RedHat'
-    - role: geerlingguy.repo-dotdeb
-      when: ansible_distribution == 'Debian'
-    - geerlingguy.php
-    - role_under_test

From ac7d0db313162e97534172e06518497fedf7411d Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 21 Nov 2018 20:45:30 -0600
Subject: [PATCH 1054/1273] Update geerlingguy.nginx role to the latest
 version.

---
 provisioning/requirements.yml                               | 2 +-
 provisioning/roles/geerlingguy.nginx/.travis.yml            | 3 +--
 .../roles/geerlingguy.nginx/molecule/default/molecule.yml   | 6 ++++--
 provisioning/roles/geerlingguy.nginx/tasks/setup-RedHat.yml | 2 +-
 provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml       | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index c73bf934f..3d7086079 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -38,7 +38,7 @@
 - src: geerlingguy.mysql
   version: 2.9.4
 - src: geerlingguy.nginx
-  version: 2.6.1
+  version: 2.6.2
 - src: geerlingguy.nodejs
   version: 4.2.2
 - src: geerlingguy.php
diff --git a/provisioning/roles/geerlingguy.nginx/.travis.yml b/provisioning/roles/geerlingguy.nginx/.travis.yml
index 063107887..5ddff985f 100644
--- a/provisioning/roles/geerlingguy.nginx/.travis.yml
+++ b/provisioning/roles/geerlingguy.nginx/.travis.yml
@@ -7,9 +7,8 @@ env:
     - ROLE_NAME: nginx
   matrix:
     - MOLECULE_DISTRO: centos7
-      MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
+    - MOLECULE_DISTRO: ubuntu1804
     - MOLECULE_DISTRO: ubuntu1604
-    - MOLECULE_DISTRO: ubuntu1404
     - MOLECULE_DISTRO: debian9
     - MOLECULE_DISTRO: debian8
 
diff --git a/provisioning/roles/geerlingguy.nginx/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.nginx/molecule/default/molecule.yml
index 033970241..2ca6feaf9 100644
--- a/provisioning/roles/geerlingguy.nginx/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.nginx/molecule/default/molecule.yml
@@ -9,8 +9,10 @@ lint:
     config-file: molecule/default/yaml-lint.yml
 platforms:
   - name: instance
-    image: geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible
-    command: ${MOLECULE_DOCKER_COMMAND:-"sleep infinity"}
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
     privileged: true
     pre_build_image: true
 provisioner:
diff --git a/provisioning/roles/geerlingguy.nginx/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.nginx/tasks/setup-RedHat.yml
index cac0b4b2d..88194c8c3 100644
--- a/provisioning/roles/geerlingguy.nginx/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.nginx/tasks/setup-RedHat.yml
@@ -4,7 +4,7 @@
     src: nginx.repo.j2
     dest: /etc/yum.repos.d/nginx.repo
     owner: root
-    group: root
+    group: "{{ root_group }}"
     mode: 0644
   when: nginx_yum_repo_enabled
 
diff --git a/provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml b/provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml
index f49721648..61571fe12 100644
--- a/provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml
+++ b/provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml
@@ -18,7 +18,7 @@
     dest: "{{ nginx_vhost_path }}/{{ item.filename|default(item.server_name.split(' ')[0] ~ '.conf') }}"
     force: true
     owner: root
-    group: root
+    group: "{{ root_group }}"
     mode: 0644
   when: item.state|default('present') != 'absent'
   with_items: "{{ nginx_vhosts }}"

From d1f85909b16aaf6c9506fa714f1ccb16509fed7d Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 21 Nov 2018 21:23:31 -0600
Subject: [PATCH 1055/1273] Update security and postgresql roles to latest
 version.

---
 provisioning/requirements.yml                 |  4 +-
 .../roles/geerlingguy.postgresql/.travis.yml  |  2 -
 .../molecule/default/molecule.yml             |  6 ++-
 .../tasks/configure.yml                       |  2 +-
 .../tasks/setup-Debian.yml                    |  3 +-
 .../tasks/variables.yml                       | 10 ++---
 .../geerlingguy.postgresql/vars/Debian-8.yml  |  2 +-
 .../geerlingguy.postgresql/vars/Debian-9.yml  |  2 +-
 .../roles/geerlingguy.security/.gitignore     |  3 +-
 .../roles/geerlingguy.security/.travis.yml    | 39 +++++++++----------
 .../roles/geerlingguy.security/README.md      | 10 ++++-
 .../geerlingguy.security/defaults/main.yml    |  2 +
 .../roles/geerlingguy.security/meta/main.yml  | 11 +++---
 .../molecule/default/molecule.yml             | 29 ++++++++++++++
 .../default/playbook.yml}                     | 35 +++++++++--------
 .../molecule/default/tests/test_default.py    | 14 +++++++
 .../molecule/default/yaml-lint.yml            |  6 +++
 .../templates/50unattended-upgrades.j2        |  3 +-
 .../geerlingguy.security/tests/README.md      | 11 ------
 .../geerlingguy.security/vars/Debian.yml      |  2 +-
 20 files changed, 124 insertions(+), 72 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.security/molecule/default/molecule.yml
 rename provisioning/roles/geerlingguy.security/{tests/test.yml => molecule/default/playbook.yml} (55%)
 create mode 100644 provisioning/roles/geerlingguy.security/molecule/default/tests/test_default.py
 create mode 100644 provisioning/roles/geerlingguy.security/molecule/default/yaml-lint.yml
 delete mode 100644 provisioning/roles/geerlingguy.security/tests/README.md

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 3d7086079..2e88c0ec5 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -66,7 +66,7 @@
 - src: geerlingguy.postfix
   version: 2.0.0
 - src: geerlingguy.postgresql
-  version: 1.4.4
+  version: 1.4.5
 - src: geerlingguy.redis
   version: 1.6.0
 - src: geerlingguy.repo-remi
@@ -74,7 +74,7 @@
 - src: geerlingguy.ruby
   version: 2.5.2
 - src: geerlingguy.security
-  version: 1.7.0
+  version: 1.8.0
 - src: geerlingguy.solr
   version: 4.3.0
 - src: geerlingguy.varnish
diff --git a/provisioning/roles/geerlingguy.postgresql/.travis.yml b/provisioning/roles/geerlingguy.postgresql/.travis.yml
index d6e345276..2141e044d 100644
--- a/provisioning/roles/geerlingguy.postgresql/.travis.yml
+++ b/provisioning/roles/geerlingguy.postgresql/.travis.yml
@@ -7,10 +7,8 @@ env:
     - ROLE_NAME: postgresql
   matrix:
     - MOLECULE_DISTRO: centos7
-      MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
     - MOLECULE_DISTRO: ubuntu1804
     - MOLECULE_DISTRO: ubuntu1604
-    - MOLECULE_DISTRO: ubuntu1404
     - MOLECULE_DISTRO: debian9
     - MOLECULE_DISTRO: debian8
 
diff --git a/provisioning/roles/geerlingguy.postgresql/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.postgresql/molecule/default/molecule.yml
index 033970241..2ca6feaf9 100644
--- a/provisioning/roles/geerlingguy.postgresql/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.postgresql/molecule/default/molecule.yml
@@ -9,8 +9,10 @@ lint:
     config-file: molecule/default/yaml-lint.yml
 platforms:
   - name: instance
-    image: geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible
-    command: ${MOLECULE_DOCKER_COMMAND:-"sleep infinity"}
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
     privileged: true
     pre_build_image: true
 provisioner:
diff --git a/provisioning/roles/geerlingguy.postgresql/tasks/configure.yml b/provisioning/roles/geerlingguy.postgresql/tasks/configure.yml
index d69965b7b..26a6f68d4 100644
--- a/provisioning/roles/geerlingguy.postgresql/tasks/configure.yml
+++ b/provisioning/roles/geerlingguy.postgresql/tasks/configure.yml
@@ -10,7 +10,7 @@
 
 - name: Configure host based authentication (if entries are configured).
   template:
-    src: "templates/pg_hba.conf.j2"
+    src: "pg_hba.conf.j2"
     dest: "{{ postgresql_config_path }}/pg_hba.conf"
     owner: "{{ postgresql_user }}"
     group: "{{ postgresql_group }}"
diff --git a/provisioning/roles/geerlingguy.postgresql/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.postgresql/tasks/setup-Debian.yml
index fc47d0f02..1b540196f 100644
--- a/provisioning/roles/geerlingguy.postgresql/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.postgresql/tasks/setup-Debian.yml
@@ -6,9 +6,8 @@
 
 - name: Ensure PostgreSQL packages are installed.
   apt:
-    name: "{{ item }}"
+    name: "{{ postgresql_packages }}"
     state: present
-  with_items: "{{ postgresql_packages }}"
 
 - name: Ensure all configured locales are present.
   locale_gen: "name={{ item }} state=present"
diff --git a/provisioning/roles/geerlingguy.postgresql/tasks/variables.yml b/provisioning/roles/geerlingguy.postgresql/tasks/variables.yml
index 530990d7e..df3538b33 100644
--- a/provisioning/roles/geerlingguy.postgresql/tasks/variables.yml
+++ b/provisioning/roles/geerlingguy.postgresql/tasks/variables.yml
@@ -13,16 +13,16 @@
     postgresql_packages: "{{ __postgresql_packages | list }}"
   when: postgresql_packages is not defined
 
-- name: Define postgresql_daemon.
-  set_fact:
-    postgresql_daemon: "{{ __postgresql_daemon }}"
-  when: postgresql_daemon is not defined
-
 - name: Define postgresql_version.
   set_fact:
     postgresql_version: "{{ __postgresql_version }}"
   when: postgresql_version is not defined
 
+- name: Define postgresql_daemon.
+  set_fact:
+    postgresql_daemon: "{{ __postgresql_daemon }}"
+  when: postgresql_daemon is not defined
+
 - name: Define postgresql_data_dir.
   set_fact:
     postgresql_data_dir: "{{ __postgresql_data_dir }}"
diff --git a/provisioning/roles/geerlingguy.postgresql/vars/Debian-8.yml b/provisioning/roles/geerlingguy.postgresql/vars/Debian-8.yml
index f6ad232b5..ec86f938f 100644
--- a/provisioning/roles/geerlingguy.postgresql/vars/Debian-8.yml
+++ b/provisioning/roles/geerlingguy.postgresql/vars/Debian-8.yml
@@ -3,7 +3,7 @@ __postgresql_version: "9.4"
 __postgresql_data_dir: "/var/lib/postgresql/{{ __postgresql_version }}/main"
 __postgresql_bin_path: "/usr/lib/postgresql/{{ __postgresql_version }}/bin"
 __postgresql_config_path: "/etc/postgresql/{{ __postgresql_version }}/main"
-__postgresql_daemon: postgresql
+__postgresql_daemon: "postgresql@{{ postgresql_version }}-main"
 __postgresql_packages:
   - postgresql
   - postgresql-contrib
diff --git a/provisioning/roles/geerlingguy.postgresql/vars/Debian-9.yml b/provisioning/roles/geerlingguy.postgresql/vars/Debian-9.yml
index 7b57d5324..2afb9f42f 100644
--- a/provisioning/roles/geerlingguy.postgresql/vars/Debian-9.yml
+++ b/provisioning/roles/geerlingguy.postgresql/vars/Debian-9.yml
@@ -3,7 +3,7 @@ __postgresql_version: "9.6"
 __postgresql_data_dir: "/var/lib/postgresql/{{ __postgresql_version }}/main"
 __postgresql_bin_path: "/usr/lib/postgresql/{{ __postgresql_version }}/bin"
 __postgresql_config_path: "/etc/postgresql/{{ __postgresql_version }}/main"
-__postgresql_daemon: postgresql
+__postgresql_daemon: "postgresql@{{ postgresql_version }}-main"
 __postgresql_packages:
   - postgresql
   - postgresql-contrib
diff --git a/provisioning/roles/geerlingguy.security/.gitignore b/provisioning/roles/geerlingguy.security/.gitignore
index c9b2377e3..f56f5b578 100644
--- a/provisioning/roles/geerlingguy.security/.gitignore
+++ b/provisioning/roles/geerlingguy.security/.gitignore
@@ -1,2 +1,3 @@
 *.retry
-tests/test.sh
+*/__pycache__
+*.pyc
diff --git a/provisioning/roles/geerlingguy.security/.travis.yml b/provisioning/roles/geerlingguy.security/.travis.yml
index 1641294a2..015f1de78 100644
--- a/provisioning/roles/geerlingguy.security/.travis.yml
+++ b/provisioning/roles/geerlingguy.security/.travis.yml
@@ -1,31 +1,30 @@
 ---
+language: python
 services: docker
 
 env:
-  - distro: centos7
-  - distro: centos6
-  - distro: ubuntu1604
-  - distro: ubuntu1404
-  - distro: debian8
-  - distro: fedora27
+  global:
+    - ROLE_NAME: security
+  matrix:
+    - MOLECULE_DISTRO: centos7
+    - MOLECULE_DISTRO: centos6
+    - MOLECULE_DISTRO: ubuntu1804
+    - MOLECULE_DISTRO: debian9
+    - MOLECULE_DISTRO: debian8
 
-script:
-  # Configure test script so we can run extra tests after playbook is run.
-  - export container_id=$(date +%s)
-  - export cleanup=false
+install:
+  # Install test dependencies.
+  - pip install molecule docker
 
-  # Download test shim.
-  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
-  - chmod +x ${PWD}/tests/test.sh
+before_script:
+  # Use actual Ansible Galaxy role name for the project directory.
+  - cd ../
+  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
+  - cd geerlingguy.$ROLE_NAME
 
+script:
   # Run tests.
-  - ${PWD}/tests/test.sh
-
-  # Make sure fail2ban process is running.
-  - >
-    sudo docker exec ${container_id} ps -ax | grep -q 'fail2ban'
-    && (echo 'fail2ban is on: pass' && exit 0)
-    || (echo 'fail2ban is on: fail' && exit 1)
+  - molecule test
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.security/README.md b/provisioning/roles/geerlingguy.security/README.md
index 29084f14b..5ed2d4fd9 100644
--- a/provisioning/roles/geerlingguy.security/README.md
+++ b/provisioning/roles/geerlingguy.security/README.md
@@ -38,7 +38,7 @@ The port through which you'd like SSH to be accessible. The default is port 22,
     security_ssh_permit_root_login: "no"
     security_ssh_usedns: "no"
 
-Security settings for SSH authentication. It's best to leave these set to `"no"`, but there are times (especially during initial server configuration or when you don't have key-based authentication in place) when one or all may be safely set to `'yes'`.
+Security settings for SSH authentication. It's best to leave these set to `"no"`, but there are times (especially during initial server configuration or when you don't have key-based authentication in place) when one or all may be safely set to `'yes'`. **NOTE: It is _very_ important that you quote the 'yes' or 'no' values. Failure to do so may lock you out of your server.**
 
     security_sudoers_passwordless: []
     security_sudoers_passworded: []
@@ -53,6 +53,14 @@ Whether to install/enable `yum-cron` (RedHat-based systems) or `unattended-upgra
 
 (Debian/Ubuntu only) A listing of packages that should not be automatically updated.
 
+    security_autoupdate_reboot: false
+
+(Debian/Ubuntu only) Whether to reboot when needed during unattended upgrades.
+
+    security_autoupdate_reboot_time: "03:00"
+
+(Debian/Ubuntu only) The time to trigger a reboot, when needed, if `security_autoupdate_reboot` is set to `true`. In 24h "hh:mm" clock format.
+
     security_autoupdate_mail_to: ""
     security_autoupdate_mail_on_error: true
 
diff --git a/provisioning/roles/geerlingguy.security/defaults/main.yml b/provisioning/roles/geerlingguy.security/defaults/main.yml
index fade66770..b0693562b 100644
--- a/provisioning/roles/geerlingguy.security/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.security/defaults/main.yml
@@ -15,6 +15,8 @@ security_autoupdate_enabled: true
 security_autoupdate_blacklist: []
 
 # Autoupdate mail settings used on Debian/Ubuntu only.
+security_autoupdate_reboot: "false"
+security_autoupdate_reboot_time: "03:00"
 security_autoupdate_mail_to: ""
 security_autoupdate_mail_on_error: true
 
diff --git a/provisioning/roles/geerlingguy.security/meta/main.yml b/provisioning/roles/geerlingguy.security/meta/main.yml
index f5616d234..adf847b65 100644
--- a/provisioning/roles/geerlingguy.security/meta/main.yml
+++ b/provisioning/roles/geerlingguy.security/meta/main.yml
@@ -10,21 +10,22 @@ galaxy_info:
   platforms:
     - name: EL
       versions:
-      - all
+        - all
     - name: Fedora
       versions:
-      - all
+        - all
     - name: Debian
       versions:
-      - all
+        - all
     - name: Ubuntu
       versions:
-      - all
+        - all
   galaxy_tags:
     - system
     - security
     - fail2ban
-    - automatic-updates
+    - automatic
+    - updates
     - yum
     - apt
     - dnf
diff --git a/provisioning/roles/geerlingguy.security/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.security/molecule/default/molecule.yml
new file mode 100644
index 000000000..2ca6feaf9
--- /dev/null
+++ b/provisioning/roles/geerlingguy.security/molecule/default/molecule.yml
@@ -0,0 +1,29 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint:
+  name: yamllint
+  options:
+    config-file: molecule/default/yaml-lint.yml
+platforms:
+  - name: instance
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    privileged: true
+    pre_build_image: true
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+  playbooks:
+    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
+scenario:
+  name: default
+verifier:
+  name: testinfra
+  lint:
+    name: flake8
diff --git a/provisioning/roles/geerlingguy.security/tests/test.yml b/provisioning/roles/geerlingguy.security/molecule/default/playbook.yml
similarity index 55%
rename from provisioning/roles/geerlingguy.security/tests/test.yml
rename to provisioning/roles/geerlingguy.security/molecule/default/playbook.yml
index 7a290daed..0b8187715 100644
--- a/provisioning/roles/geerlingguy.security/tests/test.yml
+++ b/provisioning/roles/geerlingguy.security/molecule/default/playbook.yml
@@ -1,38 +1,41 @@
-- hosts: all
+---
+- name: Converge
+  hosts: all
+  become: true
 
   pre_tasks:
     - name: Update apt cache.
-      package: update_cache=yes cache_valid_time=600
+      package: update_cache=true cache_valid_time=600
       when: ansible_os_family == 'Debian'
 
     - name: Ensure build dependencies are installed (RedHat).
-      package: 'name="{{ item }}" state=present'
-      with_items:
-        - openssh-server
-        - openssh-clients
+      package:
+        name:
+          - openssh-server
+          - openssh-clients
+        state: present
       when: ansible_os_family == 'RedHat'
 
     - name: Ensure build dependencies are installed (Fedora).
-      package: 'name="{{ item }}" state=present'
-      with_items:
-        - procps
+      package: name=procps state=present
       when: ansible_distribution == 'Fedora'
 
     - name: Ensure build dependencies are installed (Debian).
-      package: 'name="{{ item }}" state=present'
-      with_items:
-        - openssh-server
-        - openssh-client
+      package:
+        name:
+          - openssh-server
+          - openssh-client
+        state: present
       when: ansible_os_family == 'Debian'
 
     - name: Ensure auth.log file is present.
       copy:
         dest: /var/log/auth.log
         content: ""
-        force: no
+        force: false
       when: >
         (ansible_distribution == 'Ubuntu' and ansible_distribution_version == '14.04') or
-        (ansible_distribution == 'Debian' and ansible_distribution_release == 'jessie')
+        (ansible_distribution == 'Debian')
 
   roles:
-    - role_under_test
+    - role: geerlingguy.security
diff --git a/provisioning/roles/geerlingguy.security/molecule/default/tests/test_default.py b/provisioning/roles/geerlingguy.security/molecule/default/tests/test_default.py
new file mode 100644
index 000000000..eedd64a1d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.security/molecule/default/tests/test_default.py
@@ -0,0 +1,14 @@
+import os
+
+import testinfra.utils.ansible_runner
+
+testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
+    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
+
+
+def test_hosts_file(host):
+    f = host.file('/etc/hosts')
+
+    assert f.exists
+    assert f.user == 'root'
+    assert f.group == 'root'
diff --git a/provisioning/roles/geerlingguy.security/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.security/molecule/default/yaml-lint.yml
new file mode 100644
index 000000000..a3dbc38ee
--- /dev/null
+++ b/provisioning/roles/geerlingguy.security/molecule/default/yaml-lint.yml
@@ -0,0 +1,6 @@
+---
+extends: default
+rules:
+  line-length:
+    max: 120
+    level: warning
diff --git a/provisioning/roles/geerlingguy.security/templates/50unattended-upgrades.j2 b/provisioning/roles/geerlingguy.security/templates/50unattended-upgrades.j2
index 7f217fb0a..297f6969b 100644
--- a/provisioning/roles/geerlingguy.security/templates/50unattended-upgrades.j2
+++ b/provisioning/roles/geerlingguy.security/templates/50unattended-upgrades.j2
@@ -1,4 +1,5 @@
-Unattended-Upgrade::Automatic-Reboot "false";
+Unattended-Upgrade::Automatic-Reboot "{{ security_autoupdate_reboot }}";
+Unattended-Upgrade::Automatic-Reboot-Time "{{ security_autoupdate_reboot_time }}";
 
 {% if security_autoupdate_mail_to %}
 Unattended-Upgrade::Mail "{{ security_autoupdate_mail_to }}";
diff --git a/provisioning/roles/geerlingguy.security/tests/README.md b/provisioning/roles/geerlingguy.security/tests/README.md
deleted file mode 100644
index 6fb211721..000000000
--- a/provisioning/roles/geerlingguy.security/tests/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Ansible Role tests
-
-To run the test playbook(s) in this directory:
-
-  1. Install and start Docker.
-  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
-    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
-  1. Make the test shim executable: `chmod +x tests/test.sh`.
-  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
-
-If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.security/vars/Debian.yml b/provisioning/roles/geerlingguy.security/vars/Debian.yml
index 40512bdaf..c66e186e8 100644
--- a/provisioning/roles/geerlingguy.security/vars/Debian.yml
+++ b/provisioning/roles/geerlingguy.security/vars/Debian.yml
@@ -1,3 +1,3 @@
 ---
 security_ssh_config_path: /etc/ssh/sshd_config
-security_sshd_name: ssh
\ No newline at end of file
+security_sshd_name: ssh

From 91a84f92968eaf8dff1369fd7f99f383de6951a5 Mon Sep 17 00:00:00 2001
From: tgroff <tgroff@users.noreply.github.com>
Date: Fri, 30 Nov 2018 17:42:33 -0600
Subject: [PATCH 1056/1273] fixed some language and typos

---
 docs/getting-started/installation-windows.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/getting-started/installation-windows.md b/docs/getting-started/installation-windows.md
index de896674a..f39e2b8cc 100644
--- a/docs/getting-started/installation-windows.md
+++ b/docs/getting-started/installation-windows.md
@@ -2,7 +2,7 @@ Please read through the [Quick Start Guide in the README](https://github.com/gee
 
 <iframe width="560" height="315" src="https://www.youtube.com/embed/mNio_aXMLos" frameborder="0" allowfullscreen></iframe>
 
-_In this video, Jeff Geerling walk you through getting a Drupal 8 website built on your Windows 10 laptop using Drupal VM 3._
+_In this video, Jeff Geerling walks through setting up a Drupal 8 website on Windows 10 using Drupal VM 3._
 
 There are a few caveats when using Drupal VM on Windows, and this page will try to identify the main gotchas or optimization tips for those wishing to use Drupal VM on a Windows host.
 
@@ -40,7 +40,7 @@ Creating symbolic links in a shared folder will fail with a permission or protoc
 
 There are two parts to this:
 
-  1. VirtualBox does not allow gets VMs to create symlinks in synced folders by default.
+  1. VirtualBox does not allow guest VMs to create symlinks in synced folders by default.
   2. Windows does not allow the creation of symlinks unless your local policy allows it; see [TechNet article](https://technet.microsoft.com/en-us/library/dn221947%28v=ws.10%29.aspx). Even if local policy allows it, many users experience problems in the creation of symlinks.
 
 Using Ubuntu bash under Windows 10 _can_ make this easier, but there are still issues when creating and managing symlinks between the bash environment and the guest Vagrant operating system.

From fe77b16df6961a5e5e2e511e42285843b33d731c Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 1 Dec 2018 15:11:34 -0600
Subject: [PATCH 1057/1273] Update java role version.

---
 provisioning/requirements.yml                        |  2 +-
 provisioning/roles/geerlingguy.java/README.md        |  3 ++-
 .../geerlingguy.java/molecule/default/playbook.yml   | 10 ----------
 provisioning/roles/geerlingguy.java/tasks/main.yml   | 12 +-----------
 .../roles/geerlingguy.java/tasks/setup-Debian.yml    | 11 +++++++++++
 5 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 2e88c0ec5..c43e45c12 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -30,7 +30,7 @@
 - src: geerlingguy.git
   version: 2.0.3
 - src: geerlingguy.java
-  version: 1.9.3
+  version: 1.9.5
 - src: geerlingguy.mailhog
   version: 2.1.4
 - src: geerlingguy.memcached
diff --git a/provisioning/roles/geerlingguy.java/README.md b/provisioning/roles/geerlingguy.java/README.md
index f970ea796..7bc991f3f 100644
--- a/provisioning/roles/geerlingguy.java/README.md
+++ b/provisioning/roles/geerlingguy.java/README.md
@@ -30,7 +30,8 @@ None.
 
     - hosts: servers
       roles:
-        - geerlingguy.java
+        - role: geerlingguy.java
+          become: yes
 
 ## Example Playbook (install OpenJDK 8)
 
diff --git a/provisioning/roles/geerlingguy.java/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.java/molecule/default/playbook.yml
index d27efa02e..c99558da7 100644
--- a/provisioning/roles/geerlingguy.java/molecule/default/playbook.yml
+++ b/provisioning/roles/geerlingguy.java/molecule/default/playbook.yml
@@ -9,15 +9,5 @@
       when: ansible_os_family == 'Debian'
       changed_when: false
 
-    # See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=863199
-    - name: Ensure 'man' directory exists.
-      file:
-        path: /usr/share/man/man1
-        state: directory
-        recurse: true
-      when:
-        - ansible_distribution == 'Ubuntu'
-        - ansible_distribution_version == '18.04'
-
   roles:
     - role: geerlingguy.java
diff --git a/provisioning/roles/geerlingguy.java/tasks/main.yml b/provisioning/roles/geerlingguy.java/tasks/main.yml
index 81b7af613..b2a6dedfc 100644
--- a/provisioning/roles/geerlingguy.java/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.java/tasks/main.yml
@@ -38,14 +38,4 @@
     src: java_home.sh.j2
     dest: /etc/profile.d/java_home.sh
     mode: 0644
-  when: java_home is defined and java_home != ''
-
-- name: Check the Java version
-  command: java -version
-  changed_when: false
-  register: java_version
-
-- name: Display the Java version.
-  debug:
-    var: java_version
-    verbosity: 2
+  when: java_home is defined and java_home
diff --git a/provisioning/roles/geerlingguy.java/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.java/tasks/setup-Debian.yml
index 09eda86af..cecbd4538 100644
--- a/provisioning/roles/geerlingguy.java/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.java/tasks/setup-Debian.yml
@@ -1,4 +1,15 @@
 ---
+# See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=863199 and
+# https://github.com/geerlingguy/ansible-role-java/issues/64
+- name: Ensure 'man' directory exists.
+  file:
+    path: /usr/share/man/man1
+    state: directory
+    recurse: true
+  when:
+    - ansible_distribution == 'Ubuntu'
+    - ansible_distribution_version == '18.04'
+
 - name: Ensure Java is installed.
   apt:
     name: "{{ java_packages }}"

From ebc6447927bc5659626975895858673ef4a73550 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 6 Dec 2018 16:13:35 -0600
Subject: [PATCH 1058/1273] Issue #1874: Update geerlingguy.php-versions role
 to prep for 7.3 update.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.php-versions/.gitignore |  2 --
 .../geerlingguy.php-versions/.travis.yml      | 20 +++++++++----------
 .../roles/geerlingguy.php-versions/README.md  |  6 +++---
 .../defaults/main.yml                         |  2 +-
 .../geerlingguy.php-versions/meta/main.yml    |  5 +----
 .../molecule/default/molecule.yml             |  6 ++++--
 .../{playbook-5.6.yml => playbook-7.1.yml}    |  2 +-
 .../{playbook-7.2.yml => playbook-7.3.yml}    |  2 +-
 .../molecule/default/playbook.yml             |  2 +-
 .../molecule/default/tests/test_default.py    | 14 -------------
 .../tasks/setup-RedHat.yml                    |  4 ++++
 .../vars/Debian-php7.2.yml                    | 17 ----------------
 .../geerlingguy.php-versions/vars/Debian.yml  |  1 -
 14 files changed, 26 insertions(+), 59 deletions(-)
 rename provisioning/roles/geerlingguy.php-versions/molecule/default/{playbook-5.6.yml => playbook-7.1.yml} (95%)
 rename provisioning/roles/geerlingguy.php-versions/molecule/default/{playbook-7.2.yml => playbook-7.3.yml} (95%)
 delete mode 100644 provisioning/roles/geerlingguy.php-versions/molecule/default/tests/test_default.py
 delete mode 100644 provisioning/roles/geerlingguy.php-versions/vars/Debian-php7.2.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index c43e45c12..ba64bc88f 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -56,7 +56,7 @@
 - src: geerlingguy.php-tideways
   version: 2.2.0
 - src: geerlingguy.php-versions
-  version: 2.1.5
+  version: 3.0.0
 - src: geerlingguy.php-xdebug
   version: 2.5.1
 - src: geerlingguy.php-xhprof
diff --git a/provisioning/roles/geerlingguy.php-versions/.gitignore b/provisioning/roles/geerlingguy.php-versions/.gitignore
index f56f5b578..a8b42eb6e 100644
--- a/provisioning/roles/geerlingguy.php-versions/.gitignore
+++ b/provisioning/roles/geerlingguy.php-versions/.gitignore
@@ -1,3 +1 @@
 *.retry
-*/__pycache__
-*.pyc
diff --git a/provisioning/roles/geerlingguy.php-versions/.travis.yml b/provisioning/roles/geerlingguy.php-versions/.travis.yml
index 35ade2e00..6997c1ade 100644
--- a/provisioning/roles/geerlingguy.php-versions/.travis.yml
+++ b/provisioning/roles/geerlingguy.php-versions/.travis.yml
@@ -6,30 +6,28 @@ env:
   global:
     - ROLE_NAME: php-versions
   matrix:
-    # Default PHP version.
+    # Default PHP version (7.2).
     - MOLECULE_DISTRO: centos7
-      MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
     - MOLECULE_DISTRO: ubuntu1804
     - MOLECULE_DISTRO: ubuntu1604
     - MOLECULE_DISTRO: debian9
 
-    # PHP 7.2.
+    # PHP 7.3.
     - MOLECULE_DISTRO: centos7
       MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
-      MOLECULE_PLAYBOOK: playbook-7.2.yml
+      MOLECULE_PLAYBOOK: playbook-7.3.yml
     - MOLECULE_DISTRO: ubuntu1804
-      MOLECULE_PLAYBOOK: playbook-7.2.yml
+      MOLECULE_PLAYBOOK: playbook-7.3.yml
     - MOLECULE_DISTRO: ubuntu1604
-      MOLECULE_PLAYBOOK: playbook-7.2.yml
+      MOLECULE_PLAYBOOK: playbook-7.3.yml
     - MOLECULE_DISTRO: debian9
-      MOLECULE_PLAYBOOK: playbook-7.2.yml
+      MOLECULE_PLAYBOOK: playbook-7.3.yml
 
-    # PHP 5.6.
+    # PHP 7.1.
     - MOLECULE_DISTRO: centos7
-      MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
-      MOLECULE_PLAYBOOK: playbook-5.6.yml
+      MOLECULE_PLAYBOOK: playbook-7.1.yml
     - MOLECULE_DISTRO: ubuntu1804
-      MOLECULE_PLAYBOOK: playbook-5.6.yml
+      MOLECULE_PLAYBOOK: playbook-7.1.yml
 
 install:
   # Install test dependencies.
diff --git a/provisioning/roles/geerlingguy.php-versions/README.md b/provisioning/roles/geerlingguy.php-versions/README.md
index 8318361d2..6e38be208 100644
--- a/provisioning/roles/geerlingguy.php-versions/README.md
+++ b/provisioning/roles/geerlingguy.php-versions/README.md
@@ -12,9 +12,9 @@ N/A
 
 Available variables are listed below, along with default values (see `defaults/main.yml`):
 
-    php_version: '7.1'
+    php_version: '7.7'
 
-The PHP version to be installed. Any [currently-supported PHP major version](http://php.net/supported-versions.php) is a valid option (e.g. `5.6`, `7.0`, `7.1`, etc.
+The PHP version to be installed. Any [currently-supported PHP major version](http://php.net/supported-versions.php) is a valid option (e.g. `5.6`, `7.1`, `7.2`, `7.3`, etc.).
 
     php_versions_install_recommends: false
 
@@ -30,7 +30,7 @@ The PHP version to be installed. Any [currently-supported PHP major version](htt
     - hosts: webservers
     
       vars:
-        php_version: '7.1'
+        php_version: '7.2'
     
       roles:
         - role: geerlingguy.repo-remi
diff --git a/provisioning/roles/geerlingguy.php-versions/defaults/main.yml b/provisioning/roles/geerlingguy.php-versions/defaults/main.yml
index c2a10a0bd..481414e06 100644
--- a/provisioning/roles/geerlingguy.php-versions/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.php-versions/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
 # The PHP version to be installed.
-php_version: '7.1'
+php_version: '7.2'
 
 # For Debian OSes only.
 php_versions_install_recommends: false
diff --git a/provisioning/roles/geerlingguy.php-versions/meta/main.yml b/provisioning/roles/geerlingguy.php-versions/meta/main.yml
index 038667df7..267f3b7fc 100644
--- a/provisioning/roles/geerlingguy.php-versions/meta/main.yml
+++ b/provisioning/roles/geerlingguy.php-versions/meta/main.yml
@@ -5,7 +5,7 @@ galaxy_info:
   author: geerlingguy
   description: Allows different PHP versions to be installed.
   company: "Midwestern Mac, LLC"
-  license: "license (BSD, MIT)"
+  license: "MIT"
   issue_tracker_url: https://github.com/geerlingguy/drupal-vm/issues
   min_ansible_version: 2.4
   platforms:
@@ -17,9 +17,6 @@ galaxy_info:
         - all
     - name: Ubuntu
       versions:
-        - precise
-        - raring
-        - saucy
         - trusty
         - xenial
         - bionic
diff --git a/provisioning/roles/geerlingguy.php-versions/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.php-versions/molecule/default/molecule.yml
index 033970241..2ca6feaf9 100644
--- a/provisioning/roles/geerlingguy.php-versions/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.php-versions/molecule/default/molecule.yml
@@ -9,8 +9,10 @@ lint:
     config-file: molecule/default/yaml-lint.yml
 platforms:
   - name: instance
-    image: geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible
-    command: ${MOLECULE_DOCKER_COMMAND:-"sleep infinity"}
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
     privileged: true
     pre_build_image: true
 provisioner:
diff --git a/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-5.6.yml b/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-7.1.yml
similarity index 95%
rename from provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-5.6.yml
rename to provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-7.1.yml
index 915c296b8..d9b5f5aed 100644
--- a/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-5.6.yml
+++ b/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-7.1.yml
@@ -5,7 +5,7 @@
 
   vars:
     php_enable_webserver: false
-    php_version: '5.6'
+    php_version: '7.1'
 
   pre_tasks:
     - name: Update apt cache.
diff --git a/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-7.2.yml b/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-7.3.yml
similarity index 95%
rename from provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-7.2.yml
rename to provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-7.3.yml
index ccef7323a..b16c47f82 100644
--- a/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-7.2.yml
+++ b/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-7.3.yml
@@ -5,7 +5,7 @@
 
   vars:
     php_enable_webserver: false
-    php_version: '7.2'
+    php_version: '7.3'
 
   pre_tasks:
     - name: Update apt cache.
diff --git a/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook.yml
index d9b5f5aed..ccef7323a 100644
--- a/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook.yml
+++ b/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook.yml
@@ -5,7 +5,7 @@
 
   vars:
     php_enable_webserver: false
-    php_version: '7.1'
+    php_version: '7.2'
 
   pre_tasks:
     - name: Update apt cache.
diff --git a/provisioning/roles/geerlingguy.php-versions/molecule/default/tests/test_default.py b/provisioning/roles/geerlingguy.php-versions/molecule/default/tests/test_default.py
deleted file mode 100644
index eedd64a1d..000000000
--- a/provisioning/roles/geerlingguy.php-versions/molecule/default/tests/test_default.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import os
-
-import testinfra.utils.ansible_runner
-
-testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
-    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
-
-
-def test_hosts_file(host):
-    f = host.file('/etc/hosts')
-
-    assert f.exists
-    assert f.user == 'root'
-    assert f.group == 'root'
diff --git a/provisioning/roles/geerlingguy.php-versions/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.php-versions/tasks/setup-RedHat.yml
index 7af8bf9e3..a0b094b6a 100644
--- a/provisioning/roles/geerlingguy.php-versions/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.php-versions/tasks/setup-RedHat.yml
@@ -14,3 +14,7 @@
 - name: Enable remi repo for PHP 7.2.
   set_fact: php_enablerepo="remi,remi-php72"
   when: php_version == "7.2"
+
+- name: Enable remi repo for PHP 7.3.
+  set_fact: php_enablerepo="remi,remi-php73"
+  when: php_version == "7.3"
diff --git a/provisioning/roles/geerlingguy.php-versions/vars/Debian-php7.2.yml b/provisioning/roles/geerlingguy.php-versions/vars/Debian-php7.2.yml
deleted file mode 100644
index 8bdf70ddb..000000000
--- a/provisioning/roles/geerlingguy.php-versions/vars/Debian-php7.2.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-__php_packages:
-  - "php{{ php_version }}"
-  - "php{{ php_version }}-apcu"
-  - "php{{ php_version }}-cli"
-  - "php{{ php_version }}-common"
-  - "php{{ php_version }}-curl"
-  - "php{{ php_version }}-dev"
-  - "php{{ php_version }}-fpm"
-  - "php{{ php_version }}-gd"
-  - "php{{ php_version }}-imap"
-  - "php{{ php_version }}-json"
-  - "php{{ php_version }}-mbstring"
-  - "php{{ php_version }}-opcache"
-  - "php{{ php_version }}-sqlite3"
-  - "php{{ php_version }}-xml"
-  - "php{{ php_version }}-yaml"
diff --git a/provisioning/roles/geerlingguy.php-versions/vars/Debian.yml b/provisioning/roles/geerlingguy.php-versions/vars/Debian.yml
index 8c6dbcaf4..5a7b475d1 100644
--- a/provisioning/roles/geerlingguy.php-versions/vars/Debian.yml
+++ b/provisioning/roles/geerlingguy.php-versions/vars/Debian.yml
@@ -33,7 +33,6 @@ __php_packages:
   - "php{{ php_version }}-imap"
   - "php{{ php_version }}-json"
   - "php{{ php_version }}-mbstring"
-  - "php{{ php_version }}-mcrypt"
   - "php{{ php_version }}-opcache"
   - "php{{ php_version }}-sqlite3"
   - "php{{ php_version }}-xml"

From 5f1f1e5bdcd96915f737ba5f29ab3ce7f8acec79 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 7 Dec 2018 09:41:44 -0600
Subject: [PATCH 1059/1273] Test profiling the composer require command.

---
 .../roles/geerlingguy.drupal/tasks/build-composer-project.yml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/roles/geerlingguy.drupal/tasks/build-composer-project.yml b/provisioning/roles/geerlingguy.drupal/tasks/build-composer-project.yml
index 9b2f22fdc..a98a86b27 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/build-composer-project.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/build-composer-project.yml
@@ -35,7 +35,7 @@
 - name: Install dependencies with composer require (this may take a while).
   composer:
     command: require
-    arguments: "{{ item }}"
+    arguments: "{{ item }} -vv --profile"
     working_dir: "{{ drupal_composer_install_dir }}"
   with_items: "{{ drupal_composer_dependencies|default([]) }}"
   become: false

From ce6113fecc41c4b52172a7b0c3b50b3c8e3528d2 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 7 Dec 2018 10:00:30 -0600
Subject: [PATCH 1060/1273] Issue #1875: Bump PHP memory limit to 4 GB.

---
 tests/ubuntu-16-php56.config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/ubuntu-16-php56.config.yml b/tests/ubuntu-16-php56.config.yml
index 81e5e3416..a78370dd5 100644
--- a/tests/ubuntu-16-php56.config.yml
+++ b/tests/ubuntu-16-php56.config.yml
@@ -1,5 +1,5 @@
 ---
 php_version: "5.6"
-php_memory_limit: "2G"
+php_memory_limit: "4G"
 php_sendmail_path: "/usr/sbin/sendmail -t -i"
 installed_extras: []

From 3ff9cb324404cd00a965577ac39aa376c32b574a Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 7 Dec 2018 10:10:00 -0600
Subject: [PATCH 1061/1273] Fixes #1875: Revert geerlingguy.drupal role to
 previous state so this branch is mergeable.

---
 .../roles/geerlingguy.drupal/tasks/build-composer-project.yml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/roles/geerlingguy.drupal/tasks/build-composer-project.yml b/provisioning/roles/geerlingguy.drupal/tasks/build-composer-project.yml
index a98a86b27..9b2f22fdc 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/build-composer-project.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/build-composer-project.yml
@@ -35,7 +35,7 @@
 - name: Install dependencies with composer require (this may take a while).
   composer:
     command: require
-    arguments: "{{ item }} -vv --profile"
+    arguments: "{{ item }}"
     working_dir: "{{ drupal_composer_install_dir }}"
   with_items: "{{ drupal_composer_dependencies|default([]) }}"
   become: false

From 008d426b9f082b4bad184d9222c0b297f6beab8e Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 28 Dec 2018 13:47:18 -0600
Subject: [PATCH 1062/1273] Fixes #1880: Disable audio driver in VirtualBox VM.

---
 Vagrantfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Vagrantfile b/Vagrantfile
index 7da7e0176..e5e41f637 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -135,6 +135,7 @@ Vagrant.configure('2') do |config|
     v.cpus = vconfig['vagrant_cpus']
     v.customize ['modifyvm', :id, '--natdnshostresolver1', 'on']
     v.customize ['modifyvm', :id, '--ioapic', 'on']
+    v.customize ["modifyvm", :id, '--audio', 'none']
     v.gui = vconfig['vagrant_gui']
   end
 

From 6b13815a47d5b19249ea97aebad31773450b4db5 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 28 Dec 2018 14:01:26 -0600
Subject: [PATCH 1063/1273] Fix rubocop ruby error.

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

diff --git a/Vagrantfile b/Vagrantfile
index e5e41f637..8ca0e9530 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -135,7 +135,7 @@ Vagrant.configure('2') do |config|
     v.cpus = vconfig['vagrant_cpus']
     v.customize ['modifyvm', :id, '--natdnshostresolver1', 'on']
     v.customize ['modifyvm', :id, '--ioapic', 'on']
-    v.customize ["modifyvm", :id, '--audio', 'none']
+    v.customize ['modifyvm', :id, '--audio', 'none']
     v.gui = vconfig['vagrant_gui']
   end
 

From cf02a9ec40b7c812b529c8b5c38181d8f75ea734 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 28 Dec 2018 14:22:46 -0600
Subject: [PATCH 1064/1273] Install ansible-lint via Pip.

---
 tests/run-tests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index a0e0ccd0d..0794a2ddb 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -94,7 +94,7 @@ printf "\n"${green}"Checking playbook syntax..."${neutral}"\n"
 docker exec --tty $CONTAINER_ID env TERM=xterm ansible-playbook $DRUPALVM_DIR/provisioning/playbook.yml --syntax-check
 
 # Run Ansible Lint.
-docker exec $CONTAINER_ID bash -c "easy_install ansible-lint"
+docker exec $CONTAINER_ID bash -c "pip install ansible-lint"
 docker exec $CONTAINER_ID bash -c "cd $DRUPALVM_DIR/provisioning && ansible-lint playbook.yml" || true
 
 # Run the setup playbook.

From fe796c22e259ff1a530b62424436032e11eb6a7e Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 27 Apr 2018 14:48:52 -0500
Subject: [PATCH 1065/1273] Issue #1760: Add test and support for Ubuntu 18.04
 Bionic Beaver.

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index c06b029f0..33b234b54 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,6 +17,9 @@ env:
       CONTAINER_ID: dvm-test
 
   matrix:
+    # Defaults - Ubuntu 18.04.
+    - type: defaults
+      distro: ubuntu1804
     # Defaults - Ubuntu 16.04.
     - type: defaults
       distro: ubuntu1604

From 71f2f80a3923eab03f63f3517e3c9f3f2856c372 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 21 Nov 2018 12:49:52 -0600
Subject: [PATCH 1066/1273] Issue #1760: Workaround for easy_install missing in
 Ubuntu 18.04.

---
 .travis.yml        | 2 ++
 tests/run-tests.sh | 1 +
 2 files changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 33b234b54..8e5d93128 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,8 @@ env:
     # Defaults - Ubuntu 18.04.
     - type: defaults
       distro: ubuntu1804
+      # https://bugs.launchpad.net/ubuntu/+source/python-setuptools/+bug/1774419
+      easy_install_cmd: python /usr/lib/python2.7/dist-packages/easy_install.py
     # Defaults - Ubuntu 16.04.
     - type: defaults
       distro: ubuntu1604
diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index 0794a2ddb..51895977b 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -16,6 +16,7 @@ CONTAINER_ID="${CONTAINER_ID:-dvm-test}"
 type="${type:-tests/defaults}"
 distro="${distro:-ubuntu1604}"
 cleanup="${cleanup:-true}"
+easy_install_cmd=${easy_install_cmd:-easy_install}
 
 ## Set up vars for Docker setup.
 # CentOS 7

From d2e4b9296625727172010f19f9912460af16f237 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 21 Nov 2018 13:00:23 -0600
Subject: [PATCH 1067/1273] Issue #1760: Don't use easy_install in Ubuntu 18.04
 for now.

---
 .travis.yml        | 2 --
 tests/run-tests.sh | 1 -
 2 files changed, 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8e5d93128..33b234b54 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,8 +20,6 @@ env:
     # Defaults - Ubuntu 18.04.
     - type: defaults
       distro: ubuntu1804
-      # https://bugs.launchpad.net/ubuntu/+source/python-setuptools/+bug/1774419
-      easy_install_cmd: python /usr/lib/python2.7/dist-packages/easy_install.py
     # Defaults - Ubuntu 16.04.
     - type: defaults
       distro: ubuntu1604
diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index 51895977b..0794a2ddb 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -16,7 +16,6 @@ CONTAINER_ID="${CONTAINER_ID:-dvm-test}"
 type="${type:-tests/defaults}"
 distro="${distro:-ubuntu1604}"
 cleanup="${cleanup:-true}"
-easy_install_cmd=${easy_install_cmd:-easy_install}
 
 ## Set up vars for Docker setup.
 # CentOS 7

From 5adbe282a51d977ffe7f9fb586fcfa345f4d18ec Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 28 Dec 2018 14:56:03 -0600
Subject: [PATCH 1068/1273] Issue #1760: Explicitly unset fqdn so hostname not
 set in Docker tests.

---
 tests/config.yml     |  3 +++
 tests/initctl_faker  | 23 -----------------------
 tests/test-setup.yml |  9 ---------
 3 files changed, 3 insertions(+), 32 deletions(-)
 delete mode 100644 tests/initctl_faker

diff --git a/tests/config.yml b/tests/config.yml
index 30a1a1ff5..2cf8c0109 100644
--- a/tests/config.yml
+++ b/tests/config.yml
@@ -5,3 +5,6 @@ composer_home_path: "/{{ drupalvm_user }}/.composer"
 # Don't run the 'disable firewall' tasks in tests.
 firewall_disable_firewalld: false
 firewall_disable_ufw: false
+
+# Don't set a hostname, because Docker doesn't easily allow hostname control.
+hostname_fqdn: ''
diff --git a/tests/initctl_faker b/tests/initctl_faker
deleted file mode 100644
index a2267f30d..000000000
--- a/tests/initctl_faker
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-ALIAS_CMD="$(echo ""$0"" | sed -e 's?/sbin/??')"
-
-case "$ALIAS_CMD" in
-    start|stop|restart|reload|status)
-        exec service $1 $ALIAS_CMD
-        ;;
-esac
-
-case "$1" in
-    list )
-        exec service --status-all
-        ;;
-    reload-configuration )
-        exec service $2 restart
-        ;;
-    start|stop|restart|reload|status)
-        exec service $2 $1
-        ;;
-    \?)
-        exit 0
-        ;;
-esac
diff --git a/tests/test-setup.yml b/tests/test-setup.yml
index 375c9cdd5..9ae3c099f 100644
--- a/tests/test-setup.yml
+++ b/tests/test-setup.yml
@@ -10,12 +10,3 @@
     - name: Install test dependencies (RedHat).
       package: name=logrotate state=present
       when: ansible_os_family == 'RedHat'
-
-    - name: Copy initctl_faker into place for Ubuntu 14.04.
-      copy:
-        src: initctl_faker
-        dest: /sbin/initctl
-        mode: 0755
-        force: yes
-      when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '14.04'
-      changed_when: false

From f27b0bc49ec9a7e726ec43dbe6d6c02886bb216b Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 28 Dec 2018 15:06:49 -0600
Subject: [PATCH 1069/1273] Issue #1760: Make hostname role actually do what
 its docs say it does.

---
 provisioning/roles/drupalvm.hostname/meta/main.yml  |  6 +-----
 provisioning/roles/drupalvm.hostname/tasks/main.yml | 10 ++++++++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/provisioning/roles/drupalvm.hostname/meta/main.yml b/provisioning/roles/drupalvm.hostname/meta/main.yml
index 2c249799e..f4669b3c9 100644
--- a/provisioning/roles/drupalvm.hostname/meta/main.yml
+++ b/provisioning/roles/drupalvm.hostname/meta/main.yml
@@ -16,11 +16,7 @@ galaxy_info:
         - all
     - name: Ubuntu
       versions:
-        - precise
-        - raring
-        - saucy
-        - trusty
-        - xenial
+        - all
 
   galaxy_tags:
     - drupal
diff --git a/provisioning/roles/drupalvm.hostname/tasks/main.yml b/provisioning/roles/drupalvm.hostname/tasks/main.yml
index 75c05d063..46e6f25aa 100644
--- a/provisioning/roles/drupalvm.hostname/tasks/main.yml
+++ b/provisioning/roles/drupalvm.hostname/tasks/main.yml
@@ -3,7 +3,9 @@
   copy:
     content: "{{ hostname_fqdn }}\n"
     dest: /etc/mailname
-  when: ansible_os_family == 'Debian'
+  when:
+    - ansible_os_family == 'Debian'
+    - hostname_fqdn
 
 - name: Add hostname to /etc/hosts.
   lineinfile:
@@ -12,6 +14,7 @@
     line: "127.0.0.1\t{{ hostname_fqdn }}\t{{ hostname_short }}"
     state: present
     unsafe_writes: "{{ hostname_unsafe_writes }}"
+  when: hostname_fqdn
 
 - name: Configure hostname.
   copy:
@@ -19,8 +22,11 @@
     dest: /etc/hostname
     unsafe_writes: "{{ hostname_unsafe_writes }}"
   register: set_hostname
+  when: hostname_fqdn
 
 - name: Set the hostname for current session.
   command: hostname --file /etc/hostname
-  when: set_hostname.changed
+  when:
+    - set_hostname is changed
+    - hostname_fqdn
   tags: ['skip_ansible_lint']

From e6aba11aeac4a568d3cee035b0b866cbfd267998 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 28 Dec 2018 15:11:46 -0600
Subject: [PATCH 1070/1273] Issue #1760: Actually do run the hostname stuff,
 use --privileged on Ubuntu 18.04 test.

---
 tests/config.yml   | 3 ---
 tests/run-tests.sh | 4 ++++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/config.yml b/tests/config.yml
index 2cf8c0109..30a1a1ff5 100644
--- a/tests/config.yml
+++ b/tests/config.yml
@@ -5,6 +5,3 @@ composer_home_path: "/{{ drupalvm_user }}/.composer"
 # Don't run the 'disable firewall' tasks in tests.
 firewall_disable_firewalld: false
 firewall_disable_ufw: false
-
-# Don't set a hostname, because Docker doesn't easily allow hostname control.
-hostname_fqdn: ''
diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index 0794a2ddb..2d5973f30 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -26,6 +26,10 @@ if [ $distro = 'centos7' ]; then
 elif [ $distro = 'centos6' ]; then
   init="/sbin/init"
   opts="--privileged"
+# Ubuntu 18.04
+elif [ $distro = 'ubuntu1804' ]; then
+  init="/lib/systemd/systemd"
+  opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
 # Ubuntu 16.04
 elif [ $distro = 'ubuntu1604' ]; then
   init="/lib/systemd/systemd"

From 1fc8ca7bf6ae0e5ae30e38619b0e6a4283bdba5b Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 28 Dec 2018 15:15:31 -0600
Subject: [PATCH 1071/1273] Issue #1760: Now fix the hostname stuff.

---
 provisioning/roles/drupalvm.hostname/tasks/main.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/provisioning/roles/drupalvm.hostname/tasks/main.yml b/provisioning/roles/drupalvm.hostname/tasks/main.yml
index 46e6f25aa..60a8da596 100644
--- a/provisioning/roles/drupalvm.hostname/tasks/main.yml
+++ b/provisioning/roles/drupalvm.hostname/tasks/main.yml
@@ -5,7 +5,7 @@
     dest: /etc/mailname
   when:
     - ansible_os_family == 'Debian'
-    - hostname_fqdn
+    - hostname_fqdn != ''
 
 - name: Add hostname to /etc/hosts.
   lineinfile:
@@ -14,7 +14,7 @@
     line: "127.0.0.1\t{{ hostname_fqdn }}\t{{ hostname_short }}"
     state: present
     unsafe_writes: "{{ hostname_unsafe_writes }}"
-  when: hostname_fqdn
+  when: hostname_fqdn != ''
 
 - name: Configure hostname.
   copy:
@@ -22,11 +22,11 @@
     dest: /etc/hostname
     unsafe_writes: "{{ hostname_unsafe_writes }}"
   register: set_hostname
-  when: hostname_fqdn
+  when: hostname_fqdn != ''
 
 - name: Set the hostname for current session.
   command: hostname --file /etc/hostname
   when:
     - set_hostname is changed
-    - hostname_fqdn
+    - hostname_fqdn != ''
   tags: ['skip_ansible_lint']

From f4c74c116b0503813e1f409487a3063bf567b4ea Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 28 Dec 2018 17:12:36 -0600
Subject: [PATCH 1072/1273] Fixes #1883: Drop 'official-ish' support for using
 Drupal VM for prod.

---
 .gitignore                               |  2 -
 docs/other/production.md                 | 14 ++++---
 examples/prod/README.md                  |  5 ---
 examples/prod/bootstrap/example.vars.yml | 15 --------
 examples/prod/bootstrap/init.yml         | 40 --------------------
 examples/prod/example.inventory          |  2 -
 examples/prod/prod.config.yml            | 47 ------------------------
 7 files changed, 9 insertions(+), 116 deletions(-)
 delete mode 100644 examples/prod/README.md
 delete mode 100644 examples/prod/bootstrap/example.vars.yml
 delete mode 100644 examples/prod/bootstrap/init.yml
 delete mode 100644 examples/prod/example.inventory
 delete mode 100644 examples/prod/prod.config.yml

diff --git a/.gitignore b/.gitignore
index 8cddce875..019808921 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,5 @@ Vagrantfile.local
 /config.yml
 /docker-compose.yml
 /drupal.make.yml
-/examples/prod/inventory
-/examples/prod/bootstrap/vars.yml
 /scripts/
 /drupal/
diff --git a/docs/other/production.md b/docs/other/production.md
index 31d8fe698..fac44e09b 100644
--- a/docs/other/production.md
+++ b/docs/other/production.md
@@ -1,7 +1,11 @@
-Drupal VM supports deploying Drupal VM to a production environment. The security of your servers is _your_ responsibility.
+Drupal VM can be made to manage a production environment. The security of your servers is _your_ responsibility, and **such usage should be considered experimental and unsupported**.
 
 (See companion blog post to this documentation: [Soup to Nuts: Using Drupal VM to build local and prod](https://www.jeffgeerling.com/blog/2017/soup-nuts-using-drupal-vm-build-local-and-prod).)
 
+If you want to try managing a production environment (or other non-local environments) with Drupal VM, please see the following suggestions for making these servers more secure and easier to manage.
+
+> Note: As of Drupal VM 5.0.0, the example production configuration files are no longer included with Drupal VM. You would need to download [Drupal VM 4.9.1](https://github.com/geerlingguy/drupal-vm/releases/tag/4.9.1) and copy the `examples/prod` directory into your Drupal VM codebase to make the example commands work with a newer version of Drupal VM.
+
 ## Production specific overrides.
 
 Drupal VM supports loading configuration files depending on the environment variable `DRUPALVM_ENV` and using this feature you can have different configurations between development and production environments.
@@ -57,7 +61,7 @@ And if you need to override one of the secrets stored in that file, you can do s
 
 ## Example: Drupal VM on DigitalOcean
 
-The [`examples/prod` directory](https://github.com/geerlingguy/drupal-vm/tree/master/examples/prod) contains an example production configuration for Drupal VM which can be used to deploy Drupal VM to a production environment on a cloud provider like DigitalOcean, Linode, or AWS.
+The [`examples/prod` directory](https://github.com/geerlingguy/drupal-vm/tree/4.9.1/examples/prod) contains an example production configuration for Drupal VM which can be used to deploy Drupal VM to a production environment on a cloud provider like DigitalOcean, Linode, or AWS.
 
 This guide contains instructions for how you can build a Drupal environment with Drupal VM on DigitalOcean.
 
@@ -70,7 +74,7 @@ Make sure you have an SSH key you can use to connect to your DigitalOcean drople
 Once you are logged into DigitalOcean and have added your SSH key, click the 'Create Droplet' button on your Droplets page. For the Droplet, choose the following options:
 
   - **Image**: Choose `Ubuntu 16.04.x x64`
-  - **Size**: 1 GB / 1 CPU (currently $10/month; you can choose a higher plan if needed)
+  - **Size**: 1 GB / 1 CPU (currently $5/month; you can choose a higher plan if needed)
   - **Region**: Choose whatever region is geographically nearest to you and your site visitors
   - **Settings**: (Nothing here affects how Drupal VM works, choose what you'd like)
   - **Add SSH Keys**: Select the SSH key you added to your account earlier.
@@ -88,9 +92,9 @@ Your DigitalOcean Droplet is booted and ready to have Drupal VM installed on it.
 
 ### Customize `config.yml` for production
 
-Copy [`examples/prod/prod.config.yml`](https://github.com/geerlingguy/drupal-vm/blob/master/examples/prod/prod.config.yml) to `config.yml`, and by looking at `default.config.yml` add any other overrides you'd like. Whatever variables you have set in `config.yml` will override the defaults set by `default.config.yml`.
+Copy [`examples/prod/prod.config.yml`](https://github.com/geerlingguy/drupal-vm/blob/4.9.1/examples/prod/prod.config.yml) to `config.yml`, and by looking at `default.config.yml` add any other overrides you'd like. Whatever variables you have set in `config.yml` will override the defaults set by `default.config.yml`.
 
-The changes outlined in the [example `prod.config.yml`](https://github.com/geerlingguy/drupal-vm/blob/master/examples/prod/prod.config.yml) disable development-environment tools (like Pimp My Log and Adminer) and add extra security hardening configuration (via the `extra_security_enabled` variable).
+The changes outlined in the [example `prod.config.yml`](https://github.com/geerlingguy/drupal-vm/blob/4.9.1/examples/prod/prod.config.yml) disable development-environment tools (like Pimp My Log and Adminer) and add extra security hardening configuration (via the `extra_security_enabled` variable).
 
 You now have Drupal VM configured for production by default. This is the recommended and safest way, so that you can't accidentally provision a production server with development tools. If desired you can also use the [environment variable `DRUPALVM_ENV`](#production-specific-overrides) to load an additional `<ENV>.config.yml` with production specific overrides. In most cases this is not needed though.
 
diff --git a/examples/prod/README.md b/examples/prod/README.md
deleted file mode 100644
index 113b0732c..000000000
--- a/examples/prod/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Drupal VM Production Configuration Example
-
-> **Important**: This feature is currently in 'experimental' status, and the security of your servers is _your_ responsibility.
-
-See [Deploying Drupal VM to a production environment](http://docs.drupalvm.com/en/latest/other/production/#example-drupal-vm-on-digitalocean) for a guide on how you can build a Drupal environment with Drupal VM on a cloud provider such as DigitalOcean.
diff --git a/examples/prod/bootstrap/example.vars.yml b/examples/prod/bootstrap/example.vars.yml
deleted file mode 100644
index d285c5dd7..000000000
--- a/examples/prod/bootstrap/example.vars.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-admin_user: my_admin_username
-
-# On RHEL/CentOS, 'wheel'; on Debian/Ubuntu, 'sudo'.
-admin_group: sudo
-
-# IMPORTANT: Configure your own password for the admin user account. To generate
-# a password hash, use either of the following commands:
-#   - `openssl passwd -1 [password]`
-#   - `mkpasswd --method=SHA-512`.
-admin_password: $1$HgT69GsW$qZ8FUJHafZZWD76KXgAZO/
-
-# Configuration for copying local public SSH key to admin's authorized_keys.
-admin_copy_ssh_pubkey: true
-admin_pubkey: ~/.ssh/id_rsa.pub
diff --git a/examples/prod/bootstrap/init.yml b/examples/prod/bootstrap/init.yml
deleted file mode 100644
index 1fd49cc48..000000000
--- a/examples/prod/bootstrap/init.yml
+++ /dev/null
@@ -1,40 +0,0 @@
----
-- hosts: drupalvm
-  gather_facts: no
-
-  vars_files:
-    - vars.yml
-
-  pre_tasks:
-    # See: https://github.com/geerlingguy/drupal-vm/issues/1245
-    - name: Install Python if it's not available.
-      raw: test -e /usr/bin/python || (apt -y update && apt install -y python-minimal)
-      register: output
-      changed_when: output.stdout != ""
-    - action: setup
-
-  tasks:
-    - name: Create admin user account.
-      user:
-        name: "{{ admin_user }}"
-        createhome: yes
-        home: "/home/{{ admin_user }}"
-        generate_ssh_key: yes
-        ssh_key_comment: "ansible-{{ inventory_hostname }}"
-        password: "{{ admin_password }}"
-        groups: "{{ admin_group }}"
-        shell: /bin/bash
-
-    - name: Add local SSH public key to admin account authorized_keys.
-      authorized_key:
-        user: "{{ admin_user }}"
-        key: "{{ lookup('file', admin_pubkey) }}"
-        manage_dir: yes
-      when: admin_copy_ssh_pubkey
-
-    - name: Disable requiretty.
-      lineinfile:
-        dest: /etc/sudoers
-        regexp: '^Defaults.+requiretty'
-        line: 'Defaults    !requiretty'
-        state: present
diff --git a/examples/prod/example.inventory b/examples/prod/example.inventory
deleted file mode 100644
index 9a10cfe60..000000000
--- a/examples/prod/example.inventory
+++ /dev/null
@@ -1,2 +0,0 @@
-[drupalvm]
-1.2.3.4 ansible_ssh_user=my_admin_username
diff --git a/examples/prod/prod.config.yml b/examples/prod/prod.config.yml
deleted file mode 100644
index a5cd12ec1..000000000
--- a/examples/prod/prod.config.yml
+++ /dev/null
@@ -1,47 +0,0 @@
----
-# Normally, this would be set to the hostname of your DigitalOcean Droplet.
-drupal_domain: "drupalvm.test"
-vagrant_hostname: "{{ drupal_domain }}"
-
-# Add only the `apache_vhosts` or `nginx_vhosts` you need. If installing a
-# single Drupal site, the variable should look like this (Apache):
-apache_vhosts:
-  - servername: "{{ drupal_domain }}"
-    documentroot: "{{ drupal_core_path }}"
-    extra_parameters: "{{ apache_vhost_php_fpm_parameters }}"
-
-# Since this will be a publicly-accessible instance of Drupal VM, make sure you
-# configure secure passwords, especially for Drupal and MySQL!
-drupal_account_pass: admin
-drupal_db_password: drupal
-mysql_root_password: root
-
-# Only install extras that you will need/use on your site, and don't install
-# development-related software on production environments!
-installed_extras:
-  - drush
-  # - memcached
-  # - redis
-  # - solr
-  - varnish
-
-# Disable Apache package upgrades.
-apache_packages_state: present
-
-# Disable the dashboard page. Also remove any unneeded virtualhosts.
-dashboard_install_dir: ''
-
-# Enable a more hardened security configuration.
-extra_security_enabled: true
-
-# Restrict the firewall to only ports that are required for external services.
-firewall_allowed_tcp_ports:
-  - "22"
-  - "80"
-  - "443"
-firewall_log_dropped_packets: true
-
-# Set Apache to listen on port 81 (internal only), and Varnish on 80.
-apache_listen_port: "81"
-varnish_listen_port: "80"
-varnish_default_backend_port: "81"

From b3fb327832e5d78c7889c1d1428e85ded1592a28 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 3 Jan 2019 10:19:18 -0600
Subject: [PATCH 1073/1273] Issue #1882: Update CHANGELOG for Drupal VM 4.9.2
 release.

---
 CHANGELOG.md | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 432b7bf16..f294c3a20 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,34 @@
 # Drupal VM Changelog
 
+
+## 4.9.2 (2019-01-03)
+
+### Breaking Changes
+
+  * Ubuntu 14.04 is still supported as long as the LTS release is receiving security updates, but some functionality may start breaking for Ubuntu 14.04, as more and more upstreams are dropping support for the old Ubuntu version.
+
+### New/changed variables in default.config.yml
+
+  * #1774: `vagrant_box` was changed to `geerlingguy/drupal-vm`. This box is faster to start in all cases, and should work fine even when switching between Apache/Nginx or MySQL/PostgreSQL. You can always override and switch back to `geerlingguy/ubuntu1604` or whatever base box you prefer.
+
+### Improvements
+
+  * #1760: Add test and support for Ubuntu 18.04 Bionic Beaver.
+  * #1883: Drop 'official-ish' support for using Drupal VM for prod.
+  * #1851: Remove Ubuntu 14.04 from test suite as more upstreams are dropping support.
+  * #1774: Switch to default Drupal VM base box for faster provisioning.
+  * #532: Update BigPipe docs slightly.
+  * #1619: Add an example of what to put in secrets.yml.
+  * Updated roles: apache, php-versions, composer, php, java, varnish, elasticsearch, php-pecl, tideways, nginx, security, postgresql
+
+### Bugfixes
+
+  * #1843: Drush 9.5.0 was breaking due to some pathing issues.
+  * #1846: Fixed typo in build-composer.yml that caused composer install to fail.
+  * #1854: Document older Varnish version requirement for CentOS 6.
+  * #1880: Disable audio driver in VirtualBox VM.
+
+
 ## 4.9.1 (2018-10-10)
 
 ### Breaking Changes

From f0a97a271e092ebfa72cb593f29626019fa253d4 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 14 Jan 2019 23:29:09 -0600
Subject: [PATCH 1074/1273] Update geerlingguy.blackfire role to latest
 version.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.blackfire/.gitignore    |  3 +-
 .../roles/geerlingguy.blackfire/.travis.yml   | 27 +++++++++++------
 .../roles/geerlingguy.blackfire/README.md     |  5 ++++
 .../geerlingguy.blackfire/defaults/main.yml   |  5 ++--
 .../roles/geerlingguy.blackfire/meta/main.yml | 18 ++++++------
 .../molecule/default/molecule.yml             | 29 +++++++++++++++++++
 .../default/playbook.yml}                     | 26 ++++++++++-------
 .../default}/requirements.yml                 |  0
 .../molecule/default/tests/test_default.py    | 14 +++++++++
 .../molecule/default/yaml-lint.yml            |  6 ++++
 .../tasks/setup-RedHat.yml                    | 17 +++++++----
 .../geerlingguy.blackfire/tests/README.md     | 11 -------
 13 files changed, 113 insertions(+), 50 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.blackfire/molecule/default/molecule.yml
 rename provisioning/roles/geerlingguy.blackfire/{tests/test.yml => molecule/default/playbook.yml} (69%)
 rename provisioning/roles/geerlingguy.blackfire/{tests => molecule/default}/requirements.yml (100%)
 create mode 100644 provisioning/roles/geerlingguy.blackfire/molecule/default/tests/test_default.py
 create mode 100644 provisioning/roles/geerlingguy.blackfire/molecule/default/yaml-lint.yml
 delete mode 100644 provisioning/roles/geerlingguy.blackfire/tests/README.md

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index ba64bc88f..55cec8b49 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -12,7 +12,7 @@
 - src: geerlingguy.apache-php-fpm
   version: 1.1.0
 - src: geerlingguy.blackfire
-  version: 1.1.0
+  version: 1.1.1
 - src: geerlingguy.composer
   version: 1.7.3
 - src: geerlingguy.daemonize
diff --git a/provisioning/roles/geerlingguy.blackfire/.gitignore b/provisioning/roles/geerlingguy.blackfire/.gitignore
index c9b2377e3..f56f5b578 100644
--- a/provisioning/roles/geerlingguy.blackfire/.gitignore
+++ b/provisioning/roles/geerlingguy.blackfire/.gitignore
@@ -1,2 +1,3 @@
 *.retry
-tests/test.sh
+*/__pycache__
+*.pyc
diff --git a/provisioning/roles/geerlingguy.blackfire/.travis.yml b/provisioning/roles/geerlingguy.blackfire/.travis.yml
index d6aa370e8..58cc4c729 100644
--- a/provisioning/roles/geerlingguy.blackfire/.travis.yml
+++ b/provisioning/roles/geerlingguy.blackfire/.travis.yml
@@ -1,19 +1,28 @@
 ---
+language: python
 services: docker
 
 env:
-  - distro: centos7
-  - distro: ubuntu1804
-  - distro: ubuntu1604
-  - distro: debian9
+  global:
+    - ROLE_NAME: blackfire
+  matrix:
+    - MOLECULE_DISTRO: centos7
+    - MOLECULE_DISTRO: ubuntu1804
+    - MOLECULE_DISTRO: debian9
 
-script:
-  # Download test shim.
-  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
-  - chmod +x ${PWD}/tests/test.sh
+install:
+  # Install test dependencies.
+  - pip install molecule docker
+
+before_script:
+  # Use actual Ansible Galaxy role name for the project directory.
+  - cd ../
+  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
+  - cd geerlingguy.$ROLE_NAME
 
+script:
   # Run tests.
-  - ${PWD}/tests/test.sh
+  - molecule test
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.blackfire/README.md b/provisioning/roles/geerlingguy.blackfire/README.md
index 9af754def..60999b04c 100644
--- a/provisioning/roles/geerlingguy.blackfire/README.md
+++ b/provisioning/roles/geerlingguy.blackfire/README.md
@@ -21,6 +21,11 @@ Available variables are listed below, along with default values (see `defaults/m
 
 The Blackfire packages this role will install on the server. Note that `blackfire-php` may not work well with XHProf and/or XDebug.
 
+    blackfire_gpg_key_url: https://packages.blackfire.io/gpg.key
+    blackfire_repo_url: http://packages.blackfire.io/fedora/blackfire.repo
+
+Variables used for Blackfire package setup and installation.
+
 ## Dependencies
 
 Requires the `geerlingguy.php` role.
diff --git a/provisioning/roles/geerlingguy.blackfire/defaults/main.yml b/provisioning/roles/geerlingguy.blackfire/defaults/main.yml
index 68e1bff63..e263820d9 100644
--- a/provisioning/roles/geerlingguy.blackfire/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.blackfire/defaults/main.yml
@@ -1,6 +1,7 @@
 ---
-blackfire_gpg_key_url: https://packagecloud.io/gpg.key
-
 blackfire_packages:
   - blackfire-agent
   - blackfire-php
+
+blackfire_gpg_key_url: https://packages.blackfire.io/gpg.key
+blackfire_repo_url: http://packages.blackfire.io/fedora/blackfire.repo
diff --git a/provisioning/roles/geerlingguy.blackfire/meta/main.yml b/provisioning/roles/geerlingguy.blackfire/meta/main.yml
index 13d1b9024..20bf33662 100644
--- a/provisioning/roles/geerlingguy.blackfire/meta/main.yml
+++ b/provisioning/roles/geerlingguy.blackfire/meta/main.yml
@@ -11,19 +11,19 @@ galaxy_info:
   platforms:
     - name: EL
       versions:
-      - 6
-      - 7
+        - 6
+        - 7
     - name: Debian
       versions:
-      - all
+        - all
     - name: Ubuntu
       versions:
-      - precise
-      - raring
-      - saucy
-      - trusty
-      - xenial
-      - bionic
+        - precise
+        - raring
+        - saucy
+        - trusty
+        - xenial
+        - bionic
   galaxy_tags:
     - development
     - web
diff --git a/provisioning/roles/geerlingguy.blackfire/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.blackfire/molecule/default/molecule.yml
new file mode 100644
index 000000000..2ca6feaf9
--- /dev/null
+++ b/provisioning/roles/geerlingguy.blackfire/molecule/default/molecule.yml
@@ -0,0 +1,29 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint:
+  name: yamllint
+  options:
+    config-file: molecule/default/yaml-lint.yml
+platforms:
+  - name: instance
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    privileged: true
+    pre_build_image: true
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+  playbooks:
+    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
+scenario:
+  name: default
+verifier:
+  name: testinfra
+  lint:
+    name: flake8
diff --git a/provisioning/roles/geerlingguy.blackfire/tests/test.yml b/provisioning/roles/geerlingguy.blackfire/molecule/default/playbook.yml
similarity index 69%
rename from provisioning/roles/geerlingguy.blackfire/tests/test.yml
rename to provisioning/roles/geerlingguy.blackfire/molecule/default/playbook.yml
index 9e14360f3..eb7e1e64c 100644
--- a/provisioning/roles/geerlingguy.blackfire/tests/test.yml
+++ b/provisioning/roles/geerlingguy.blackfire/molecule/default/playbook.yml
@@ -1,13 +1,19 @@
 ---
-- hosts: all
+- name: Converge
+  hosts: all
+  become: true
 
   vars:
     php_enable_webserver: false
     php_enable_php_fpm: true
 
+  handlers:
+    - name: update apt cache
+      apt: update_cache=true
+
   pre_tasks:
     - name: Update apt cache.
-      apt: update_cache=yes cache_valid_time=600
+      apt: update_cache=true cache_valid_time=600
       when: ansible_os_family == 'Debian'
 
     # Ubuntu-specific tasks.
@@ -18,10 +24,10 @@
     # Debian-specific tasks.
     - name: Add dependencies for PHP versions (Debian).
       apt:
-        name: "{{ item }}"
-      with_items:
-        - apt-transport-https
-        - ca-certificates
+        name:
+          - apt-transport-https
+          - ca-certificates
+        state: present
       when: ansible_distribution == "Debian"
 
     - name: Add Ondrej Sury's apt key (Debian).
@@ -34,13 +40,11 @@
       apt_repository:
         repo: "deb https://packages.sury.org/php/ {{ ansible_distribution_release }} main"
         state: present
-      register: php_ondrej_debian_repo
       when: ansible_distribution == "Debian"
+      notify: update apt cache
 
-    - name: Update apt caches after repo is added (Debian).
-      apt: update_cache=yes
-      when: php_ondrej_debian_repo.changed and (ansible_distribution == "Debian")
+    - meta: flush_handlers
 
   roles:
     - geerlingguy.php
-    - role_under_test
+    - geerlingguy.blackfire
diff --git a/provisioning/roles/geerlingguy.blackfire/tests/requirements.yml b/provisioning/roles/geerlingguy.blackfire/molecule/default/requirements.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.blackfire/tests/requirements.yml
rename to provisioning/roles/geerlingguy.blackfire/molecule/default/requirements.yml
diff --git a/provisioning/roles/geerlingguy.blackfire/molecule/default/tests/test_default.py b/provisioning/roles/geerlingguy.blackfire/molecule/default/tests/test_default.py
new file mode 100644
index 000000000..eedd64a1d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.blackfire/molecule/default/tests/test_default.py
@@ -0,0 +1,14 @@
+import os
+
+import testinfra.utils.ansible_runner
+
+testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
+    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
+
+
+def test_hosts_file(host):
+    f = host.file('/etc/hosts')
+
+    assert f.exists
+    assert f.user == 'root'
+    assert f.group == 'root'
diff --git a/provisioning/roles/geerlingguy.blackfire/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.blackfire/molecule/default/yaml-lint.yml
new file mode 100644
index 000000000..a3dbc38ee
--- /dev/null
+++ b/provisioning/roles/geerlingguy.blackfire/molecule/default/yaml-lint.yml
@@ -0,0 +1,6 @@
+---
+extends: default
+rules:
+  line-length:
+    max: 120
+    level: warning
diff --git a/provisioning/roles/geerlingguy.blackfire/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.blackfire/tasks/setup-RedHat.yml
index 9d5b515f6..e0172b24a 100644
--- a/provisioning/roles/geerlingguy.blackfire/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.blackfire/tasks/setup-RedHat.yml
@@ -4,15 +4,20 @@
     key: "{{ blackfire_gpg_key_url }}"
     state: present
 
+- name: Check if Blackfire repository file exists.
+  stat: path=/etc/yum.repos.d/blackfire.repo
+  register: repo_file_stat
+
 - name: Add Blackfire repository.
   get_url:
-    url: http://packages.blackfire.io/fedora/blackfire.repo
+    url: "{{ blackfire_repo_url }}"
     dest: /etc/yum.repos.d/blackfire.repo
     mode: 0644
+  when: not repo_file_stat.stat.exists
 
 - name: Disable gpg_repocheck for non-bleeding-edge CentOS.
-  lineinfile: >
-    dest=/etc/yum.repos.d/blackfire.repo
-    regexp="^repo_gpgcheck="
-    line="repo_gpgcheck=0"
-    state=present
+  lineinfile:
+    dest: /etc/yum.repos.d/blackfire.repo
+    regexp: "^repo_gpgcheck="
+    line: "repo_gpgcheck=0"
+    state: present
diff --git a/provisioning/roles/geerlingguy.blackfire/tests/README.md b/provisioning/roles/geerlingguy.blackfire/tests/README.md
deleted file mode 100644
index 6fb211721..000000000
--- a/provisioning/roles/geerlingguy.blackfire/tests/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Ansible Role tests
-
-To run the test playbook(s) in this directory:
-
-  1. Install and start Docker.
-  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
-    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
-  1. Make the test shim executable: `chmod +x tests/test.sh`.
-  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
-
-If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`

From 2a789539f7ad477be234d09e0d339d042ed7d281 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 14 Jan 2019 23:42:59 -0600
Subject: [PATCH 1075/1273] Update geerlingguy.blackfire again.

---
 provisioning/requirements.yml                      |  2 +-
 .../molecule/default/tests/test_default.py         | 14 --------------
 .../geerlingguy.blackfire/tasks/setup-RedHat.yml   |  5 -----
 3 files changed, 1 insertion(+), 20 deletions(-)
 delete mode 100644 provisioning/roles/geerlingguy.blackfire/molecule/default/tests/test_default.py

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 55cec8b49..c922dd166 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -12,7 +12,7 @@
 - src: geerlingguy.apache-php-fpm
   version: 1.1.0
 - src: geerlingguy.blackfire
-  version: 1.1.1
+  version: 1.1.2
 - src: geerlingguy.composer
   version: 1.7.3
 - src: geerlingguy.daemonize
diff --git a/provisioning/roles/geerlingguy.blackfire/molecule/default/tests/test_default.py b/provisioning/roles/geerlingguy.blackfire/molecule/default/tests/test_default.py
deleted file mode 100644
index eedd64a1d..000000000
--- a/provisioning/roles/geerlingguy.blackfire/molecule/default/tests/test_default.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import os
-
-import testinfra.utils.ansible_runner
-
-testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
-    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
-
-
-def test_hosts_file(host):
-    f = host.file('/etc/hosts')
-
-    assert f.exists
-    assert f.user == 'root'
-    assert f.group == 'root'
diff --git a/provisioning/roles/geerlingguy.blackfire/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.blackfire/tasks/setup-RedHat.yml
index e0172b24a..d2285352c 100644
--- a/provisioning/roles/geerlingguy.blackfire/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.blackfire/tasks/setup-RedHat.yml
@@ -1,9 +1,4 @@
 ---
-- name: Add packagecloud GPG key.
-  rpm_key:
-    key: "{{ blackfire_gpg_key_url }}"
-    state: present
-
 - name: Check if Blackfire repository file exists.
   stat: path=/etc/yum.repos.d/blackfire.repo
   register: repo_file_stat

From e0c2817acb0399349672223805041ed25b2bd76b Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 29 Jan 2019 11:24:22 -0600
Subject: [PATCH 1076/1273] A few tweaks to versions in README.

---
 README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index dd15fae2e..60cdddd93 100644
--- a/README.md
+++ b/README.md
@@ -15,9 +15,9 @@ The rest of this README assumes you're using Vagrant and VirtualBox (this is cur
 
 Drupal VM installs the following on an Ubuntu 16.04 (by default) linux VM:
 
-  - Apache 2.4.x (or Nginx)
-  - PHP 7.1.x (configurable)
-  - MySQL 5.7.x (or MariaDB, or PostgreSQL)
+  - Apache (or Nginx)
+  - PHP (configurable version)
+  - MySQL (or MariaDB, or PostgreSQL)
   - Drupal 7 or 8
   - Optional:
     - Drupal Console
@@ -81,7 +81,7 @@ Notes:
   - **For faster provisioning** (macOS/Linux only): *[Install Ansible](http://docs.ansible.com/intro_installation.html) on your host machine, so Drupal VM can run the provisioning steps locally instead of inside the VM.*
   - **For stability**: Because every version of VirtualBox introduces changes to networking, for the best stability, you should install Vagrant's `vbguest` plugin: `vagrant plugin install vagrant-vbguest`.
   - **NFS on Linux**: *If NFS is not already installed on your host, you will need to install it to use the default NFS synced folder configuration. See guides for [Debian/Ubuntu](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-ubuntu-14-04), [Arch](https://wiki.archlinux.org/index.php/NFS#Installation), and [RHEL/CentOS](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-centos-6).*
-  - **Versions**: *Make sure you're running the latest releases of Vagrant, VirtualBox, and Ansible—as of early 2018, Drupal VM recommends: Vagrant 2.0.x, VirtualBox 5.2.x, and Ansible 2.4.x*
+  - **Versions**: *Make sure you're running the latest releases of Vagrant, VirtualBox, and Ansible—as of early 2019, Drupal VM recommends: Vagrant 2.2.x, VirtualBox 6.0.x, and Ansible 2.7.x*
 
 ### 2 - Build the Virtual Machine
 
@@ -141,7 +141,7 @@ Drupal VM follows semantic versioning, which means your configuration should con
   2. Do a diff of your `config.yml` with the updated `default.config.yml` (e.g. `curl https://raw.githubusercontent.com/geerlingguy/drupal-vm/master/default.config.yml | git diff --no-index config.yml -`).
   3. Run `vagrant provision` to provision the VM, incorporating all the latest changes.
 
-For major version upgrades (e.g. 2.x.x to 3.x.x), it may be simpler to destroy the VM (`vagrant destroy`) then build a fresh new VM (`vagrant up`) using the new version of Drupal VM.
+For major version upgrades (e.g. 3.x.x to 4.x.x), it may be simpler to destroy the VM (`vagrant destroy`) then build a fresh new VM (`vagrant up`) using the new version of Drupal VM.
 
 ## System Requirements
 

From 3b140e9944b1389863daece9c12ccca90dde80e5 Mon Sep 17 00:00:00 2001
From: Michel Settembrino <info@ms-informatique.be>
Date: Thu, 7 Feb 2019 07:37:04 +0100
Subject: [PATCH 1077/1273] Drush instead of Drupal

Related to https://github.com/geerlingguy/drupal-vm/issues/1894.
---
 docs/extras/drush.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/extras/drush.md b/docs/extras/drush.md
index aac930a27..5994f2d51 100644
--- a/docs/extras/drush.md
+++ b/docs/extras/drush.md
@@ -35,7 +35,7 @@ $ drush @drupalvm.test status
  Staging config path    :  [...]
 ```
 
-Drupal VM automatically generates a drush alias file in `~/.drush/drupalvm.aliases.drushrc.php` (for Drush < 9.0.0) and `~/.drush/sites/drupalvm.site.yml` (for Drupal 9.0.0+) with an alias for every site you have defined in the `apache_vhosts` or `nginx_vhosts` variable.
+Drupal VM automatically generates a drush alias file in `~/.drush/drupalvm.aliases.drushrc.php` (for Drush < 9.0.0) and `~/.drush/sites/drupalvm.site.yml` (for Drush 9.0.0+) with an alias for every site you have defined in the `apache_vhosts` or `nginx_vhosts` variable.
 
 If you want to customize the generated alias file you can override the `drush_aliases_host_template` and `drush_aliases_guest_template` variables (or `_yml` variables for Drush 9.0.0+) in your `config.yml`.
 

From 49802714951c1b40a098bf91baba801eff57bfbb Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 4 Apr 2019 14:20:51 -0500
Subject: [PATCH 1078/1273] Fixes #1885: Update node.js role to 5.0.0, set
 default version to 10.x.

---
 default.config.yml                            |  4 +-
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.nodejs/.ansible-lint    |  3 +
 .../roles/geerlingguy.nodejs/.gitignore       |  3 +-
 .../roles/geerlingguy.nodejs/.travis.yml      | 55 ++++++++-----------
 .../roles/geerlingguy.nodejs/README.md        |  4 +-
 .../geerlingguy.nodejs/defaults/main.yml      |  7 ++-
 .../roles/geerlingguy.nodejs/meta/main.yml    | 12 ++--
 .../molecule/default/molecule.yml             | 29 ++++++++++
 .../default/playbook-latest.yml}              | 11 ++--
 .../default/playbook.yml}                     |  9 +--
 .../molecule/default/tests/test_default.py    | 14 +++++
 .../molecule/default/yaml-lint.yml            |  6 ++
 .../roles/geerlingguy.nodejs/tasks/main.yml   |  3 +-
 .../roles/geerlingguy.nodejs/tests/README.md  | 11 ----
 15 files changed, 107 insertions(+), 66 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.nodejs/.ansible-lint
 create mode 100644 provisioning/roles/geerlingguy.nodejs/molecule/default/molecule.yml
 rename provisioning/roles/geerlingguy.nodejs/{tests/test.yml => molecule/default/playbook-latest.yml} (63%)
 rename provisioning/roles/geerlingguy.nodejs/{tests/test-latest.yml => molecule/default/playbook.yml} (72%)
 create mode 100644 provisioning/roles/geerlingguy.nodejs/molecule/default/tests/test_default.py
 create mode 100644 provisioning/roles/geerlingguy.nodejs/molecule/default/yaml-lint.yml
 delete mode 100644 provisioning/roles/geerlingguy.nodejs/tests/README.md

diff --git a/default.config.yml b/default.config.yml
index ab340eef8..e62eb3961 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -298,8 +298,8 @@ mysql_wait_timeout: 300
 adminer_install_filename: index.php
 
 # Node.js configuration (if enabled above).
-# Valid examples: "0.10", "0.12", "4.x", "5.x", "6.x".
-nodejs_version: "6.x"
+# Valid examples: "6.x", "8.x", "10.x", etc.
+nodejs_version: "10.x"
 nodejs_npm_global_packages:
   - name: npm
 nodejs_install_npm_user: "{{ drupalvm_user }}"
diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index c922dd166..0b83d9b66 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -40,7 +40,7 @@
 - src: geerlingguy.nginx
   version: 2.6.2
 - src: geerlingguy.nodejs
-  version: 4.2.2
+  version: 5.0.0
 - src: geerlingguy.php
   version: 3.7.0
 - src: geerlingguy.php-memcached
diff --git a/provisioning/roles/geerlingguy.nodejs/.ansible-lint b/provisioning/roles/geerlingguy.nodejs/.ansible-lint
new file mode 100644
index 000000000..0af17d0d0
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nodejs/.ansible-lint
@@ -0,0 +1,3 @@
+skip_list:
+  - '405'
+  - '204'
diff --git a/provisioning/roles/geerlingguy.nodejs/.gitignore b/provisioning/roles/geerlingguy.nodejs/.gitignore
index c9b2377e3..f56f5b578 100644
--- a/provisioning/roles/geerlingguy.nodejs/.gitignore
+++ b/provisioning/roles/geerlingguy.nodejs/.gitignore
@@ -1,2 +1,3 @@
 *.retry
-tests/test.sh
+*/__pycache__
+*.pyc
diff --git a/provisioning/roles/geerlingguy.nodejs/.travis.yml b/provisioning/roles/geerlingguy.nodejs/.travis.yml
index 086189681..05cf095a7 100644
--- a/provisioning/roles/geerlingguy.nodejs/.travis.yml
+++ b/provisioning/roles/geerlingguy.nodejs/.travis.yml
@@ -1,41 +1,34 @@
 ---
+language: python
 services: docker
 
 env:
-  # Defaults.
-  - distro: centos7
-  - distro: centos6
-  - distro: ubuntu1804
-  - distro: ubuntu1604
-  - distro: debian9
-  - distro: debian8
-
-  # Latest release.
-  - distro: centos7
-    playbook: test-latest.yml
-  - distro: ubuntu1604
-    playbook: test-latest.yml
+  global:
+    - ROLE_NAME: nodejs
+  matrix:
+    - MOLECULE_DISTRO: centos7
+    - MOLECULE_DISTRO: centos6
+    - MOLECULE_DISTRO: ubuntu1804
+    - MOLECULE_DISTRO: ubuntu1604
+    - MOLECULE_DISTRO: debian9
+    - MOLECULE_DISTRO: debian8
+
+    - MOLECULE_DISTRO: centos7
+      MOLECULE_PLAYBOOK: playbook-latest.yml
+
+install:
+  # Install test dependencies.
+  - pip install molecule docker
+
+before_script:
+  # Use actual Ansible Galaxy role name for the project directory.
+  - cd ../
+  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
+  - cd geerlingguy.$ROLE_NAME
 
 script:
-  # Configure test script so we can run extra tests after playbook is run.
-  - export container_id=$(date +%s)
-  - export cleanup=false
-
-  # Download test shim.
-  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
-  - chmod +x ${PWD}/tests/test.sh
-
   # Run tests.
-  - ${PWD}/tests/test.sh
-
-  # Ensure Node.js is installed.
-  - 'docker exec --tty ${container_id} env TERM=xterm which node'
-  - 'docker exec --tty ${container_id} env TERM=xterm node -v'
-
-  # Ensure npm packages are installed globally.
-  - 'docker exec --tty ${container_id} env TERM=xterm bash --login -c "npm list -g --depth=0 jslint"'
-  - 'docker exec --tty ${container_id} env TERM=xterm bash --login -c "npm list -g --depth=0 node-sass"'
-  - 'docker exec --tty ${container_id} env TERM=xterm bash --login -c "npm list -g --depth=0 yo"'
+  - molecule test
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.nodejs/README.md b/provisioning/roles/geerlingguy.nodejs/README.md
index fa703d9ef..87f9c9684 100644
--- a/provisioning/roles/geerlingguy.nodejs/README.md
+++ b/provisioning/roles/geerlingguy.nodejs/README.md
@@ -12,9 +12,9 @@ None.
 
 Available variables are listed below, along with default values (see `defaults/main.yml`):
 
-    nodejs_version: "6.x"
+    nodejs_version: "10.x"
 
-The Node.js version to install. "6.x" is the default and works on most supported OSes. Other versions such as "0.12", "4.x", "5.x", "6.x", etc. should work on the latest versions of Debian/Ubuntu and RHEL/CentOS.
+The Node.js version to install. "10.x" is the default and works on most supported OSes. Other versions such as "0.12", "4.x", "5.x", "6.x", "8.x", "10.x" etc. should work on the latest versions of Debian/Ubuntu and RHEL/CentOS.
 
     nodejs_install_npm_user: "{{ ansible_ssh_user }}"
 
diff --git a/provisioning/roles/geerlingguy.nodejs/defaults/main.yml b/provisioning/roles/geerlingguy.nodejs/defaults/main.yml
index 473274887..7b76032b0 100644
--- a/provisioning/roles/geerlingguy.nodejs/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.nodejs/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
-# Set the version of Node.js to install ("0.12", "4.x", "5.x", "6.x", "8.x", "9.x").
+# Set the version of Node.js to install ("6.x", "8.x", "10.x", "11.x", etc.).
 # Version numbers from Nodesource: https://github.com/nodesource/distributions
-nodejs_version: "6.x"
+nodejs_version: "10.x"
 
 # The user for whom the npm packages will be installed.
 # nodejs_install_npm_user: username
@@ -9,7 +9,8 @@ nodejs_version: "6.x"
 # The directory for global installations.
 npm_config_prefix: "/usr/local/lib/npm"
 
-# Set to true to suppress the UID/GID switching when running package scripts. If set explicitly to false, then installing as a non-root user will fail.
+# Set to true to suppress the UID/GID switching when running package scripts. If
+# set explicitly to false, then installing as a non-root user will fail.
 npm_config_unsafe_perm: "false"
 
 # Define a list of global packages to be installed with NPM.
diff --git a/provisioning/roles/geerlingguy.nodejs/meta/main.yml b/provisioning/roles/geerlingguy.nodejs/meta/main.yml
index b567a2f6a..24dc3ee92 100644
--- a/provisioning/roles/geerlingguy.nodejs/meta/main.yml
+++ b/provisioning/roles/geerlingguy.nodejs/meta/main.yml
@@ -10,16 +10,16 @@ galaxy_info:
   platforms:
     - name: EL
       versions:
-      - 6
-      - 7
+        - 6
+        - 7
     - name: Debian
       versions:
-      - all
+        - all
     - name: Ubuntu
       versions:
-      - trusty
-      - xenial
-      - bionic
+        - trusty
+        - xenial
+        - bionic
   galaxy_tags:
     - development
     - web
diff --git a/provisioning/roles/geerlingguy.nodejs/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.nodejs/molecule/default/molecule.yml
new file mode 100644
index 000000000..2ca6feaf9
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nodejs/molecule/default/molecule.yml
@@ -0,0 +1,29 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint:
+  name: yamllint
+  options:
+    config-file: molecule/default/yaml-lint.yml
+platforms:
+  - name: instance
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    privileged: true
+    pre_build_image: true
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+  playbooks:
+    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
+scenario:
+  name: default
+verifier:
+  name: testinfra
+  lint:
+    name: flake8
diff --git a/provisioning/roles/geerlingguy.nodejs/tests/test.yml b/provisioning/roles/geerlingguy.nodejs/molecule/default/playbook-latest.yml
similarity index 63%
rename from provisioning/roles/geerlingguy.nodejs/tests/test.yml
rename to provisioning/roles/geerlingguy.nodejs/molecule/default/playbook-latest.yml
index 72832e0d8..7fca4281d 100644
--- a/provisioning/roles/geerlingguy.nodejs/tests/test.yml
+++ b/provisioning/roles/geerlingguy.nodejs/molecule/default/playbook-latest.yml
@@ -1,20 +1,23 @@
 ---
-- hosts: all
+- name: Converge
+  hosts: all
+  become: true
 
   vars:
+    nodejs_version: "11.x"
     nodejs_install_npm_user: root
     npm_config_prefix: /root/.npm-global
     npm_config_unsafe_perm: "true"
     nodejs_npm_global_packages:
       - node-sass
       - name: jslint
-        version: 0.9.6
+        version: 0.12.0
       - name: yo
 
   pre_tasks:
     - name: Update apt cache.
-      apt: update_cache=yes cache_valid_time=600
+      apt: update_cache=true cache_valid_time=600
       when: ansible_os_family == 'Debian'
 
   roles:
-    - role_under_test
+    - role: geerlingguy.nodejs
diff --git a/provisioning/roles/geerlingguy.nodejs/tests/test-latest.yml b/provisioning/roles/geerlingguy.nodejs/molecule/default/playbook.yml
similarity index 72%
rename from provisioning/roles/geerlingguy.nodejs/tests/test-latest.yml
rename to provisioning/roles/geerlingguy.nodejs/molecule/default/playbook.yml
index 8aee4138f..d1d586322 100644
--- a/provisioning/roles/geerlingguy.nodejs/tests/test-latest.yml
+++ b/provisioning/roles/geerlingguy.nodejs/molecule/default/playbook.yml
@@ -1,8 +1,9 @@
 ---
-- hosts: all
+- name: Converge
+  hosts: all
+  become: true
 
   vars:
-    nodejs_version: "9.x"
     nodejs_install_npm_user: root
     npm_config_prefix: /root/.npm-global
     npm_config_unsafe_perm: "true"
@@ -14,8 +15,8 @@
 
   pre_tasks:
     - name: Update apt cache.
-      apt: update_cache=yes cache_valid_time=600
+      apt: update_cache=true cache_valid_time=600
       when: ansible_os_family == 'Debian'
 
   roles:
-    - role_under_test
+    - role: geerlingguy.nodejs
diff --git a/provisioning/roles/geerlingguy.nodejs/molecule/default/tests/test_default.py b/provisioning/roles/geerlingguy.nodejs/molecule/default/tests/test_default.py
new file mode 100644
index 000000000..eedd64a1d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nodejs/molecule/default/tests/test_default.py
@@ -0,0 +1,14 @@
+import os
+
+import testinfra.utils.ansible_runner
+
+testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
+    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
+
+
+def test_hosts_file(host):
+    f = host.file('/etc/hosts')
+
+    assert f.exists
+    assert f.user == 'root'
+    assert f.group == 'root'
diff --git a/provisioning/roles/geerlingguy.nodejs/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.nodejs/molecule/default/yaml-lint.yml
new file mode 100644
index 000000000..76d14595e
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nodejs/molecule/default/yaml-lint.yml
@@ -0,0 +1,6 @@
+---
+extends: default
+rules:
+  line-length:
+    max: 220
+    level: warning
diff --git a/provisioning/roles/geerlingguy.nodejs/tasks/main.yml b/provisioning/roles/geerlingguy.nodejs/tasks/main.yml
index 6b125c14f..5622c3592 100644
--- a/provisioning/roles/geerlingguy.nodejs/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.nodejs/tasks/main.yml
@@ -27,13 +27,14 @@
   npm:
     name: "{{ item.name | default(item) }}"
     version: "{{ item.version | default('latest') }}"
-    global: yes
+    global: true
     state: latest
   environment:
     NPM_CONFIG_PREFIX: "{{ npm_config_prefix }}"
     NODE_PATH: "{{ npm_config_prefix }}/lib/node_modules"
     NPM_CONFIG_UNSAFE_PERM: "{{ npm_config_unsafe_perm }}"
   with_items: "{{ nodejs_npm_global_packages }}"
+  tags: ['skip_ansible_lint']
 
 - name: Install packages defined in a given package.json.
   npm:
diff --git a/provisioning/roles/geerlingguy.nodejs/tests/README.md b/provisioning/roles/geerlingguy.nodejs/tests/README.md
deleted file mode 100644
index 6fb211721..000000000
--- a/provisioning/roles/geerlingguy.nodejs/tests/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Ansible Role tests
-
-To run the test playbook(s) in this directory:
-
-  1. Install and start Docker.
-  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
-    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
-  1. Make the test shim executable: `chmod +x tests/test.sh`.
-  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
-
-If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`

From 1262ccf2b7751966ed833ded088a2b9c0962b5f9 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 4 Apr 2019 15:39:18 -0500
Subject: [PATCH 1079/1273] Issue #1874: Switch to PHP 7.2 by default,
 deprecate PHP 5.6.

---
 .travis.yml                                        |  8 ++++----
 Dockerfile                                         |  2 +-
 default.config.yml                                 |  4 ++--
 docs/configurations/php.md                         | 14 +++++++++-----
 docs/other/bigpipe.md                              |  2 +-
 ...php56.config.yml => ubuntu-18-php73.config.yml} |  3 +--
 6 files changed, 18 insertions(+), 15 deletions(-)
 rename tests/{ubuntu-16-php56.config.yml => ubuntu-18-php73.config.yml} (62%)

diff --git a/.travis.yml b/.travis.yml
index 33b234b54..aa962d9f0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 ---
 language: php
-php: '7.1'
+php: '7.2'
 services: docker
 
 env:
@@ -31,10 +31,10 @@ env:
       distro: centos7
       local_config: tests/centos-7.config.yml
 
-    # PHP 5.6 - Ubuntu 16.04.
+    # PHP 7.3 - Ubuntu 18.04.
     - type: defaults
-      distro: ubuntu1604
-      local_config: tests/ubuntu-16-php56.config.yml
+      distro: ubuntu1804
+      local_config: tests/ubuntu-18-php73.config.yml
       DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/bin/drush"
       TEST_INSTALLED_EXTRAS: false
 
diff --git a/Dockerfile b/Dockerfile
index cc8d19490..cfba89f48 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ COPY ./provisioning/docker/bin/* /usr/local/bin
 # Provision Drupal VM inside Docker.
 RUN ansible-playbook /etc/ansible/drupal-vm/provisioning/playbook.yml \
   # Enable FPM. See https://github.com/geerlingguy/drupal-vm/issues/1366.
-  && systemctl enable php7.1-fpm.service
+  && systemctl enable php7.2-fpm.service
 
 EXPOSE 80 443 3306 8025
 
diff --git a/default.config.yml b/default.config.yml
index e62eb3961..ee9206a7c 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -256,9 +256,9 @@ firewall_log_dropped_packets: false
 firewall_disable_firewalld: true
 firewall_disable_ufw: true
 
-# PHP Configuration. Currently-supported versions: 5.6, 7.0, 7.1, 7.2.
+# PHP Configuration. Currently-supported versions: 7.1, 7.2, 7.3.
 # See version-specific notes: http://docs.drupalvm.com/en/latest/configurations/php/
-php_version: "7.1"
+php_version: "7.2"
 php_install_recommends: no
 php_memory_limit: "192M"
 php_display_errors: "On"
diff --git a/docs/configurations/php.md b/docs/configurations/php.md
index b278de704..b8779bb21 100644
--- a/docs/configurations/php.md
+++ b/docs/configurations/php.md
@@ -1,19 +1,23 @@
-Drupal VM defaults to PHP 7.1, but you can also install and use 5.6, 7.0 or 7.2.
+Drupal VM defaults to PHP 7.2, but you can also install and use 7.1 or 7.3.
 
 ## Ubuntu
 
-Ondřej Surý's PPA for PHP is used to install PHP 7.1, but you can switch version by changing `php_version` inside `config.yml` to `"5.6"`, `"7.0"` or `"7.2"`.
+Ondřej Surý's PPA for PHP is used to install PHP 7.2, but you can switch versions by changing `php_version` inside `config.yml` to `"7.1"` or `"7.3"`.
 
-If you're using Apache with `mod_php` you should also add `libapache2-mod-php5.6` or `libapache2-mod-php7.0` to the `extra_packages` list.
+If you're using Apache with `mod_php` you should also add `libapache2-mod-php{{ php_version }}` to the `extra_packages` list.
 
 _Note: XHProf does currently not work with PHP 7.1+, make sure you don't have it listed in `installed_extras`._
 
 ## RedHat/CentOS 7
 
-Remi's RPM repository is included with Drupal VM, and you can make the following changes to use it to install a different version of PHP than 7.1:
+Remi's RPM repository is included with Drupal VM, and you can make the following changes to use it to install a different version of PHP than 7.2:
 
   1. Make sure you've followed the directions for switching to CentOS 7 in the [use a different base OS](base-os.md) guide.
-  2. Change `php_version` inside `config.yml` to `"5.6"`, `"7.0"` or `"7.2"`.
+  2. Change `php_version` inside `config.yml` to `"7.1"` or `"7.3"`.
+
+## PHP 5.6 EOL
+
+PHP 5.6 was end-of-lifed (meaning no more community support or security fixes) at the end of 2018. Drupal VM does not officially support PHP 5.6 anymore, though some package maintainers are still publishing packages for it. So you can try using `php_version: "5.6"` or using PHP's source installation at your own risk.
 
 ## Using default distribution packages
 
diff --git a/docs/other/bigpipe.md b/docs/other/bigpipe.md
index c582de022..bd69df378 100644
--- a/docs/other/bigpipe.md
+++ b/docs/other/bigpipe.md
@@ -37,7 +37,7 @@ This will disable the `mod_deflate` module for any requests inside that director
 
 If you want to switch Apache to use `mod_php` instead of proxying requests through PHP-FPM, you can make the following changes in `config.yml`:
 
-  1. Add `libapache2-mod-php7.1` to `extra_packages` in `config.yml`.
+  1. Add `libapache2-mod-php7.2` to `extra_packages` in `config.yml`.
   2. Delete the `extra_parameters` under any Drupal site in the list of `apache_vhosts` (so there is no `SetHandler` rule).
 
 You can also disable PHP-FPM and remove the two `proxy` entries from `apache_mods_enabled` if you don't want to use PHP-FPM with Apache at all, but that's optional; it won't break anything to run Apache with `mod_php` and `mod_proxy_fastcgi` at the same time.
diff --git a/tests/ubuntu-16-php56.config.yml b/tests/ubuntu-18-php73.config.yml
similarity index 62%
rename from tests/ubuntu-16-php56.config.yml
rename to tests/ubuntu-18-php73.config.yml
index a78370dd5..a4ce489c0 100644
--- a/tests/ubuntu-16-php56.config.yml
+++ b/tests/ubuntu-18-php73.config.yml
@@ -1,5 +1,4 @@
 ---
-php_version: "5.6"
-php_memory_limit: "4G"
+php_version: "7.3"
 php_sendmail_path: "/usr/sbin/sendmail -t -i"
 installed_extras: []

From b84c5105b5b8fd1ed7d6a33cb7e3f947c57f9062 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 4 Apr 2019 16:44:52 -0500
Subject: [PATCH 1080/1273] Fixes #1874: Remove broken drush make test for now.

---
 .travis.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index aa962d9f0..fcc3d0c88 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 ---
 language: php
-php: '7.2'
+php: 7.2
 services: docker
 
 env:
@@ -38,11 +38,12 @@ env:
       DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/bin/drush"
       TEST_INSTALLED_EXTRAS: false
 
+    # TODO: See https://github.com/geerlingguy/drupal-vm/issues/1874
     # Nginx and Drush make file test - Ubuntu 16.04.
-    - type: nginx-drush-make
-      distro: ubuntu1604
-      local_config: tests/ubuntu-16-nginx-drush-make.config.yml
-      config_dir: /var/www/drupalvm/config
+    # - type: nginx-drush-make
+    #   distro: ubuntu1604
+    #   local_config: tests/ubuntu-16-nginx-drush-make.config.yml
+    #   config_dir: /var/www/drupalvm/config
 
     # TODO: See https://github.com/geerlingguy/drupal-vm/issues/1675
     # PostgreSQL - Ubuntu 16.04.

From 1d14b9164546a0972a850bfb78a442ec84d086ef Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 8 Apr 2019 10:36:06 -0500
Subject: [PATCH 1081/1273] Issue #1881: Update defaults to Ubuntu 18.04.

---
 .travis.yml                              | 12 ++++--------
 README.md                                |  2 +-
 default.config.yml                       |  3 +--
 docs/configurations/base-os.md           | 17 ++++++-----------
 docs/configurations/databases-mariadb.md |  2 +-
 docs/extras/solr.md                      |  2 +-
 docs/other/performance.md                |  2 +-
 docs/other/production.md                 |  4 ++--
 provisioning/docker/bake.sh              |  2 +-
 tests/run-tests.sh                       |  5 -----
 10 files changed, 18 insertions(+), 33 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fcc3d0c88..fe34176ac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,9 +20,6 @@ env:
     # Defaults - Ubuntu 18.04.
     - type: defaults
       distro: ubuntu1804
-    # Defaults - Ubuntu 16.04.
-    - type: defaults
-      distro: ubuntu1604
     # Defaults - Debian 9.
     - type: debian
       distro: debian9
@@ -38,12 +35,11 @@ env:
       DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/bin/drush"
       TEST_INSTALLED_EXTRAS: false
 
-    # TODO: See https://github.com/geerlingguy/drupal-vm/issues/1874
     # Nginx and Drush make file test - Ubuntu 16.04.
-    # - type: nginx-drush-make
-    #   distro: ubuntu1604
-    #   local_config: tests/ubuntu-16-nginx-drush-make.config.yml
-    #   config_dir: /var/www/drupalvm/config
+    - type: nginx-drush-make
+      distro: ubuntu1604
+      local_config: tests/ubuntu-16-nginx-drush-make.config.yml
+      config_dir: /var/www/drupalvm/config
 
     # TODO: See https://github.com/geerlingguy/drupal-vm/issues/1675
     # PostgreSQL - Ubuntu 16.04.
diff --git a/README.md b/README.md
index 60cdddd93..444a201bf 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ There are two ways you can use Drupal VM:
 
 The rest of this README assumes you're using Vagrant and VirtualBox (this is currently the most flexible and widely-used method of using Drupal VM). If you'd like to use Drupal VM with Docker, please read the [Drupal VM Docker documentation](http://docs.drupalvm.com/en/latest/other/docker/).
 
-Drupal VM installs the following on an Ubuntu 16.04 (by default) linux VM:
+Drupal VM installs the following on an Ubuntu 18.04 (by default) linux VM:
 
   - Apache (or Nginx)
   - PHP (configurable version)
diff --git a/default.config.yml b/default.config.yml
index ee9206a7c..63d5815ec 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -1,7 +1,6 @@
 ---
 # Available `vagrant_box` values include:
-#   - beet/box (pre-provisioned, based on Ubuntu 16.04)
-#   - geerlingguy/drupal-vm (pre-provisioned, based on Ubuntu 16.04)
+#   - geerlingguy/drupal-vm (pre-provisioned, based on Ubuntu 18.04)
 #   - geerlingguy/centos7
 #   - geerlingguy/centos6
 #   - geerlingguy/debian9
diff --git a/docs/configurations/base-os.md b/docs/configurations/base-os.md
index 6795b0e52..bc7fb3459 100644
--- a/docs/configurations/base-os.md
+++ b/docs/configurations/base-os.md
@@ -2,24 +2,23 @@ Drupal VM's configuration is designed to work with RedHat and Debian-compatible
 
 Currently-supported OSes are:
 
-  - Ubuntu 16.04 'Xenial' (default)
-  - Ubuntu 14.04 'Precise'
+  - Ubuntu 18.04 'Bionic' (default)
+  - Ubuntu 16.04 'Xenial'
   - RedHat Enterprise Linux / CentOS 7
   - RedHat Enterprise Linux / CentOS 6 (limited support)
   - Debian 9 'Stretch'
-  - Debian 8 'Jessie'
 
 For certain OSes, there are a couple other caveats and tweaks you may need to perform to get things running smoothly—the main features and latest development is only guaranteed to work with the default OS as configured in `default.config.yml`.
 
-Some other OSes should work, but are not regularly tested with Drupal VM, including Debian 8/Jessie (`debian/jessie64`) and Debian 7/Wheezy (`debian/wheezy64`).
+Some other OSes should work, but are not regularly tested with Drupal VM, including Debian 8/Jessie (`debian/jessie64`).
 
-## Ubuntu 16.04 Xenial LTS
+## Ubuntu 18.04 Xenial LTS
 
 Everything should work out of the box with Ubuntu 16.04.
 
-## Ubuntu 14.04 Trusty LTS
+## Ubuntu 16.04 Xenial LTS
 
-Everything should work out of the box with Ubuntu 14.04.
+Everything should work out of the box with Ubuntu 16.04.
 
 ## RedHat Enterprise Linux / CentOS 7
 
@@ -50,7 +49,3 @@ varnish_version: 5.2
 ## Debian 9 Stretch
 
 Everything should work out of the box with Debian 9.
-
-## Debian 8 Jessie
-
-Everything should work out of the box with Debian 8.
diff --git a/docs/configurations/databases-mariadb.md b/docs/configurations/databases-mariadb.md
index b24a475be..77ba60ef8 100644
--- a/docs/configurations/databases-mariadb.md
+++ b/docs/configurations/databases-mariadb.md
@@ -9,7 +9,7 @@ mysql_packages:
   - python-mysqldb
 ```
 
-This set of packages works out of the box with Ubuntu 14.04 as well as the default Ubuntu 16.04 installation that comes with Drupal VM.
+This set of packages works out of the box with Ubuntu 16.04 as well as the default Ubuntu 18.04 installation that comes with Drupal VM.
 
 Alternatively, if you want to use RedHat 7 or CentOS 7 instead of Ubuntu, you can set the following variables to install and configure MariaDB instead of MySQL:
 
diff --git a/docs/extras/solr.md b/docs/extras/solr.md
index 6237f6d36..7b04f050d 100644
--- a/docs/extras/solr.md
+++ b/docs/extras/solr.md
@@ -12,7 +12,7 @@ This will connect to the default search core (`collection1`) set up by Solr. If
 
 Drupal VM installs Apache Solr 5.x by default, but you can use 6.x, 4.x, or other versions instead. To do this, [see the version-specific test examples](https://github.com/geerlingguy/ansible-role-solr/tree/master/tests) in the `geerlingguy.solr` role.
 
-One important note: If you use Solr 5.x or 6.x (or later), you need to make sure your VM has Java 8+. By default, many of the supported OSes only install Java 7. To install Java 8, see the `geerlingguy.java` role examples for [installing Java 8 on RHEL/CentOS or Ubuntu < 16.04](https://github.com/geerlingguy/ansible-role-java#example-playbook-install-openjdk-8).
+One important note: If you use Solr 6.x or later, you need to make sure your VM has Java 8+. Some older base OSes only install Java 7. To install Java 8, see the `geerlingguy.java` role examples for [installing Java 8 on RHEL/CentOS or Ubuntu < 16.04](https://github.com/geerlingguy/ansible-role-java#example-playbook-install-openjdk-8).
 
 ## Configuring the Solr search core for Drupal
 
diff --git a/docs/other/performance.md b/docs/other/performance.md
index 39750b581..9dfa72aa8 100644
--- a/docs/other/performance.md
+++ b/docs/other/performance.md
@@ -2,7 +2,7 @@
 
 Opting for composer based installs will most likely increase your VM's time to provision considerably.
 
-If you manage multiple VM's own your computer, you can use the [`vagrant-cachier` plugin](http://fgrehm.viewdocs.io/vagrant-cachier/) to share Composer's package cache across all VM's. The first build will be as slow as before but subsequent builds with the same `vagrant_box` (eg `geerlingguy/ubuntu1604`) will be much faster.
+If you manage multiple VM's own your computer, you can use the [`vagrant-cachier` plugin](http://fgrehm.viewdocs.io/vagrant-cachier/) to share Composer's package cache across all VM's. The first build will be as slow as before but subsequent builds with the same `vagrant_box` (eg `geerlingguy/ubuntu1804`) will be much faster.
 
 Install the plugin on your host computer: `vagrant plugin install vagrant-cachier`.
 
diff --git a/docs/other/production.md b/docs/other/production.md
index 6d91853d0..1962a1065 100644
--- a/docs/other/production.md
+++ b/docs/other/production.md
@@ -81,7 +81,7 @@ Make sure you have an SSH key you can use to connect to your DigitalOcean drople
 
 Once you are logged into DigitalOcean and have added your SSH key, click the 'Create Droplet' button on your Droplets page. For the Droplet, choose the following options:
 
-  - **Image**: Choose `Ubuntu 16.04.x x64`
+  - **Image**: Choose `Ubuntu 18.04.x x64`
   - **Size**: 1 GB / 1 CPU (currently $5/month; you can choose a higher plan if needed)
   - **Region**: Choose whatever region is geographically nearest to you and your site visitors
   - **Settings**: (Nothing here affects how Drupal VM works, choose what you'd like)
@@ -162,6 +162,6 @@ After a few minutes, your Drupal-VM-in-the-cloud Droplet should be fully configu
 
 ### Go Further
 
-You can use Ubuntu 14.04, Ubuntu 16.04, Debian 8, CentOS 6 or CentOS 7 when you build the DigitalOcean Droplet. Just like with Drupal VM running locally, you can customize almost every aspect of the server!
+You can use Ubuntu Ubuntu 18.04, Ubuntu 16.04, Debian 9, or CentOS 7 when you build the DigitalOcean Droplet. Just like with Drupal VM running locally, you can customize almost every aspect of the server!
 
 You may want to customize your configuration even further, to make sure Drupal VM is tuned for your specific Drupal site's needs, or you may want to change things and make the server configuration more flexible, etc. For all that, the book [Ansible for DevOps](http://ansiblefordevops.com/) will give you a great introduction to using Ansible to make Drupal VM and the included Ansible configuration do exactly what you need!
diff --git a/provisioning/docker/bake.sh b/provisioning/docker/bake.sh
index cf04f1fdb..36f60133f 100755
--- a/provisioning/docker/bake.sh
+++ b/provisioning/docker/bake.sh
@@ -14,7 +14,7 @@ DRUPALVM_PROJECT_ROOT="${DRUPALVM_PROJECT_ROOT:-/var/www/drupalvm}"
 DRUPALVM_HTTP_PORT="${DRUPALVM_HTTP_PORT:-80}"
 DRUPALVM_HTTPS_PORT="${DRUPALVM_HTTPS_PORT:-443}"
 
-DISTRO="${DISTRO:-ubuntu1604}"
+DISTRO="${DISTRO:-ubuntu1804}"
 OPTS="${OPTS:---privileged}"
 INIT="${INIT:-/lib/systemd/systemd}"
 
diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index 2d5973f30..317652ff8 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -38,11 +38,6 @@ elif [ $distro = 'ubuntu1604' ]; then
 elif [ $distro = 'debian9' ]; then
   init="/lib/systemd/systemd"
   opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-# Debian 8
-elif [ $distro = 'debian8' ]; then
-  init="/lib/systemd/systemd"
-  opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-fi
 
 # Set OS-specific options.
 if [[ "$OSTYPE" == "darwin"* ]]; then

From 4b19e34f49a05a1a908d5307e14a6c92c70213a7 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 8 Apr 2019 10:50:13 -0500
Subject: [PATCH 1082/1273] Issue #1881: Fix run-tests.sh.

---
 tests/run-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index 317652ff8..e9d81cf05 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -38,6 +38,7 @@ elif [ $distro = 'ubuntu1604' ]; then
 elif [ $distro = 'debian9' ]; then
   init="/lib/systemd/systemd"
   opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+fi
 
 # Set OS-specific options.
 if [[ "$OSTYPE" == "darwin"* ]]; then

From d305cb67c102d93917a912559e4d35bfa690b6b5 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 8 Apr 2019 11:05:14 -0500
Subject: [PATCH 1083/1273] Issue #1881: Disable failing drush make test again.

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fe34176ac..c43dbc250 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,10 +36,10 @@ env:
       TEST_INSTALLED_EXTRAS: false
 
     # Nginx and Drush make file test - Ubuntu 16.04.
-    - type: nginx-drush-make
-      distro: ubuntu1604
-      local_config: tests/ubuntu-16-nginx-drush-make.config.yml
-      config_dir: /var/www/drupalvm/config
+    # - type: nginx-drush-make
+    #   distro: ubuntu1604
+    #   local_config: tests/ubuntu-16-nginx-drush-make.config.yml
+    #   config_dir: /var/www/drupalvm/config
 
     # TODO: See https://github.com/geerlingguy/drupal-vm/issues/1675
     # PostgreSQL - Ubuntu 16.04.

From 2e91f3fb4c0dab7a88061815dbfea6c3439519af Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 9 Apr 2019 14:08:02 -0700
Subject: [PATCH 1084/1273] Issue #1918: Update CHANGELOG for 5.0.0 release.
 [ci skip]

---
 CHANGELOG.md | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f294c3a20..62f708577 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,33 @@
 # Drupal VM Changelog
 
 
+## 5.0.0 "Flynn Lives" (2019-04-09)
+
+There are no major architectural changes in this release, which speaks to the current maturity of the Drupal VM platform; instead, this release focuses on updating all the default versions—most especially of the base OS to Ubuntu 18.04 'Bionic'. If you need to remain on Ubuntu 16.04 for now, please make sure you explicitly set `vagrant_box: geerlingguy/ubuntu1604` in your `config.yml`, or use a version of the `geerlingguy/drupal-vm` Vagrant box _older than_ `2.0.0`.
+
+### Breaking Changes
+
+  * #1881: Ubuntu 18.04 is now the defaul.t OS version (and is used in the `geerlingguy/drupal-vm` base image `2.0.0` and later)
+    * Ubuntu 14.04 is no longer supported.
+  * #1874: PHP 7.2 is now the default PHP version
+    * PHP 5.6 is no longer supported (though you may be able to install it for some time).
+  * #1885: Node.js 10.x is now the default Node.js version.
+    * Node.js 0.10, 0.12, 4.x, and 5.x are no longer supported (though you may be able to install some of them for some time).
+
+### New/changed variables in default.config.yml
+
+  * `php_version` changed from `7.1` to `7.2`
+  * `nodejs_version` changed from `6.x` to `10.x`
+
+### Improvements
+
+  * #1919: Ran out of songs from original Tron soundtrack; releases shall now be named after Tron: Legacy tracks.
+
+### Bugfixes
+
+  * #1895: Fixed typo in Drush docs.
+
+
 ## 4.9.2 (2019-01-03)
 
 ### Breaking Changes

From 1ac01267a109f888c87c041562bc02f8d01bee04 Mon Sep 17 00:00:00 2001
From: Joe Stewart <joe.stewart@mediacurrent.com>
Date: Thu, 11 Apr 2019 09:54:17 -0500
Subject: [PATCH 1085/1273] Update sandbox url after drupal.org git change
 [ci-skip]

---
 examples/scripts/pareview.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/scripts/pareview.sh b/examples/scripts/pareview.sh
index a25911179..5c68414f8 100755
--- a/examples/scripts/pareview.sh
+++ b/examples/scripts/pareview.sh
@@ -7,11 +7,11 @@
 #     ```
 #     post_provision_scripts:
 #       - "../examples/scripts/pareview.sh"
-#    
+#
 #     composer_global_packages:
 #       - { name: hirak/prestissimo, release: '^0.3' }
 #       - { name: drupal/coder, release: '^' }
-#    
+#
 #     nodejs_version: "6.x"
 #     nodejs_npm_global_packages:
 #       - eslint
@@ -34,7 +34,7 @@ if [ ! -e "$PAREVIEW_SETUP_COMPLETE_FILE" ]; then
   $HOME_PATH/.composer/vendor/bin/phpcs --config-set installed_paths $HOME_PATH/.composer/vendor/drupal/coder/coder_sniffer
 
   # Download DrupalSecure.
-  git clone --branch master https://git.drupal.org/sandbox/coltrane/1921926.git /opt/drupalsecure_code_sniffs
+  git clone --branch master https://git.drupalcode.org/sandbox/coltrane-1921926.git /opt/drupalsecure_code_sniffs
 
   # Move the DrupalSecure directory into the PHPCS Standards.
   sudo ln -sv /opt/drupalsecure_code_sniffs/DrupalSecure $HOME_PATH/.composer/vendor/squizlabs/php_codesniffer/CodeSniffer/Standards

From 786d9de8bd2d52404f0c22ff81f9e0bf7f8102f1 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 18 Apr 2019 12:20:15 -0500
Subject: [PATCH 1086/1273] Update geerlingguy.drupal role to 2.5.4.

---
 provisioning/requirements.yml                               | 2 +-
 provisioning/roles/geerlingguy.drupal/.ansible-lint         | 2 ++
 provisioning/roles/geerlingguy.drupal/.travis.yml           | 4 +---
 .../roles/geerlingguy.drupal/molecule/default/molecule.yml  | 6 ++++--
 provisioning/roles/geerlingguy.drupal/tasks/deploy.yml      | 4 ++--
 provisioning/roles/geerlingguy.drupal/tasks/update.yml      | 3 +++
 6 files changed, 13 insertions(+), 8 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.drupal/.ansible-lint

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 0b83d9b66..18506a790 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -18,7 +18,7 @@
 - src: geerlingguy.daemonize
   version: 1.2.0
 - src: geerlingguy.drupal
-  version: 2.5.3
+  version: 2.5.4
 - src: geerlingguy.drupal-console
   version: 1.1.1
 - src: geerlingguy.drush
diff --git a/provisioning/roles/geerlingguy.drupal/.ansible-lint b/provisioning/roles/geerlingguy.drupal/.ansible-lint
new file mode 100644
index 000000000..1ae5e6ccf
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal/.ansible-lint
@@ -0,0 +1,2 @@
+skip_list:
+  - '204'
diff --git a/provisioning/roles/geerlingguy.drupal/.travis.yml b/provisioning/roles/geerlingguy.drupal/.travis.yml
index 9f8c7a04d..44ff15468 100644
--- a/provisioning/roles/geerlingguy.drupal/.travis.yml
+++ b/provisioning/roles/geerlingguy.drupal/.travis.yml
@@ -7,11 +7,9 @@ env:
     - ROLE_NAME: drupal
   matrix:
     - MOLECULE_DISTRO: centos7
-      MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
-    - MOLECULE_DISTRO: ubuntu1604
+    - MOLECULE_DISTRO: ubuntu1804
     - MOLECULE_DISTRO: debian9
     - MOLECULE_DISTRO: centos7
-      MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
       MOLECULE_PLAYBOOK: playbook-deploy.yml
 
 install:
diff --git a/provisioning/roles/geerlingguy.drupal/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.drupal/molecule/default/molecule.yml
index 033970241..2ca6feaf9 100644
--- a/provisioning/roles/geerlingguy.drupal/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.drupal/molecule/default/molecule.yml
@@ -9,8 +9,10 @@ lint:
     config-file: molecule/default/yaml-lint.yml
 platforms:
   - name: instance
-    image: geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible
-    command: ${MOLECULE_DOCKER_COMMAND:-"sleep infinity"}
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
     privileged: true
     pre_build_image: true
 provisioner:
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/deploy.yml b/provisioning/roles/geerlingguy.drupal/tasks/deploy.yml
index 04cb3be2c..4edaf492e 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/deploy.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/deploy.yml
@@ -29,6 +29,6 @@
     command: install
     working_dir: "{{ drupal_deploy_dir }}"
   when:
-    - drupal_deploy_composer_file.stat.exists == true
-    - drupal_deploy_composer_install == true
+    - drupal_deploy_composer_file.stat.exists
+    - drupal_deploy_composer_install
   become: false
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/update.yml b/provisioning/roles/geerlingguy.drupal/tasks/update.yml
index 8764028e7..fd6078343 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/update.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/update.yml
@@ -3,6 +3,8 @@
   command: "{{ drush_path }} updatedb -y"
   args:
     chdir: "{{ drupal_core_path }}"
+  register: drush_database_updates
+  changed_when: "'No database updates required.' not in drush_database_updates.stdout"
 
 # TODO: Import configuration if configured?
 # TODO: Other commands if configured?
@@ -11,3 +13,4 @@
   command: "{{ drush_path }} cache-rebuild --quiet"
   args:
     chdir: "{{ drupal_core_path }}"
+  tags: ['skip_ansible_lint']

From c46d02eb107b91af67694e17bb817155ca8506f9 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 18 Apr 2019 12:28:50 -0500
Subject: [PATCH 1087/1273] Update geerlingguy.php-versions role to 3.1.0.

---
 provisioning/requirements.yml                   |  2 +-
 .../geerlingguy.php-versions/.ansible-lint      |  3 +++
 .../roles/geerlingguy.php-versions/README.md    |  2 +-
 .../molecule/default/playbook-7.1.yml           |  2 +-
 .../molecule/default/playbook-7.3.yml           |  2 +-
 .../molecule/default/playbook.yml               |  2 +-
 .../tasks/setup-Debian.yml                      | 17 ++++++-----------
 .../geerlingguy.php-versions/vars/Debian.yml    |  7 +++++++
 8 files changed, 21 insertions(+), 16 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.php-versions/.ansible-lint

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 18506a790..f9cf3d664 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -56,7 +56,7 @@
 - src: geerlingguy.php-tideways
   version: 2.2.0
 - src: geerlingguy.php-versions
-  version: 3.0.0
+  version: 3.1.0
 - src: geerlingguy.php-xdebug
   version: 2.5.1
 - src: geerlingguy.php-xhprof
diff --git a/provisioning/roles/geerlingguy.php-versions/.ansible-lint b/provisioning/roles/geerlingguy.php-versions/.ansible-lint
new file mode 100644
index 000000000..f7ae1c6d1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-versions/.ansible-lint
@@ -0,0 +1,3 @@
+skip_list:
+  - '306'
+  - '503'
diff --git a/provisioning/roles/geerlingguy.php-versions/README.md b/provisioning/roles/geerlingguy.php-versions/README.md
index 6e38be208..f639b3509 100644
--- a/provisioning/roles/geerlingguy.php-versions/README.md
+++ b/provisioning/roles/geerlingguy.php-versions/README.md
@@ -12,7 +12,7 @@ N/A
 
 Available variables are listed below, along with default values (see `defaults/main.yml`):
 
-    php_version: '7.7'
+    php_version: '7.2'
 
 The PHP version to be installed. Any [currently-supported PHP major version](http://php.net/supported-versions.php) is a valid option (e.g. `5.6`, `7.1`, `7.2`, `7.3`, etc.).
 
diff --git a/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-7.1.yml b/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-7.1.yml
index d9b5f5aed..6cf74deb1 100644
--- a/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-7.1.yml
+++ b/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-7.1.yml
@@ -20,5 +20,5 @@
 
   post_tasks:
     - name: Confirm PHP version is correct.
-      shell: "php -v | grep -F '{{ php_version }}'"
+      shell: php -v | grep -F '{{ php_version }}'
       changed_when: false
diff --git a/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-7.3.yml b/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-7.3.yml
index b16c47f82..e6e55ca59 100644
--- a/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-7.3.yml
+++ b/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-7.3.yml
@@ -20,5 +20,5 @@
 
   post_tasks:
     - name: Confirm PHP version is correct.
-      shell: "php -v | grep -F '{{ php_version }}'"
+      shell: php -v | grep -F '{{ php_version }}'
       changed_when: false
diff --git a/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook.yml
index ccef7323a..6ae3076f8 100644
--- a/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook.yml
+++ b/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook.yml
@@ -20,5 +20,5 @@
 
   post_tasks:
     - name: Confirm PHP version is correct.
-      shell: "php -v | grep -F '{{ php_version }}'"
+      shell: php -v | grep -F '{{ php_version }}'
       changed_when: false
diff --git a/provisioning/roles/geerlingguy.php-versions/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.php-versions/tasks/setup-Debian.yml
index ee4cbcd4b..85b2a590e 100644
--- a/provisioning/roles/geerlingguy.php-versions/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.php-versions/tasks/setup-Debian.yml
@@ -38,19 +38,14 @@
 
 - name: Update apt caches after repo is added (Debian).
   apt: update_cache=true
-  when: php_ondrej_debian_repo.changed and (ansible_distribution == "Debian")
+  when:
+    - php_ondrej_debian_repo.changed
+    - ansible_distribution == "Debian"
+  tags: ['skip_ansible_lint']
 
-# PHP package purges.
-- name: Purge PHP version packages.
+- name: Purge PHP version packages (besides the currently chosen php_version).
   apt:
-    name: "{{ item }}"
+    name: "{{ php_versions_debian | reject('search', 'php' ~ php_version) | list }}"
     state: absent
     purge: true
     force: true
-  with_items:
-    - php5.6-common
-    - php7.0-common
-    - php7.1-common
-    - php7.2-common
-    - php7.3-common
-  when: "'php' + php_version not in item"
diff --git a/provisioning/roles/geerlingguy.php-versions/vars/Debian.yml b/provisioning/roles/geerlingguy.php-versions/vars/Debian.yml
index 5a7b475d1..fe4552029 100644
--- a/provisioning/roles/geerlingguy.php-versions/vars/Debian.yml
+++ b/provisioning/roles/geerlingguy.php-versions/vars/Debian.yml
@@ -37,3 +37,10 @@ __php_packages:
   - "php{{ php_version }}-sqlite3"
   - "php{{ php_version }}-xml"
   - "php{{ php_version }}-yaml"
+
+php_versions_debian:
+  - php5.6-common
+  - php7.0-common
+  - php7.1-common
+  - php7.2-common
+  - php7.3-common

From 09fe0383f1176364c35ff6c88bfad6db5be0bfb8 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 14 May 2019 15:59:59 -0500
Subject: [PATCH 1088/1273] Update geerlingguy.nginx role to latest version.

---
 provisioning/requirements.yml                                | 2 +-
 provisioning/roles/geerlingguy.nginx/.travis.yml             | 1 -
 provisioning/roles/geerlingguy.nginx/tasks/setup-FreeBSD.yml | 3 ++-
 provisioning/roles/geerlingguy.nginx/tasks/setup-RedHat.yml  | 2 +-
 provisioning/roles/geerlingguy.nginx/tasks/setup-Ubuntu.yml  | 1 +
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index f9cf3d664..16dab1113 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -38,7 +38,7 @@
 - src: geerlingguy.mysql
   version: 2.9.4
 - src: geerlingguy.nginx
-  version: 2.6.2
+  version: 2.6.3
 - src: geerlingguy.nodejs
   version: 5.0.0
 - src: geerlingguy.php
diff --git a/provisioning/roles/geerlingguy.nginx/.travis.yml b/provisioning/roles/geerlingguy.nginx/.travis.yml
index 5ddff985f..e6805d406 100644
--- a/provisioning/roles/geerlingguy.nginx/.travis.yml
+++ b/provisioning/roles/geerlingguy.nginx/.travis.yml
@@ -10,7 +10,6 @@ env:
     - MOLECULE_DISTRO: ubuntu1804
     - MOLECULE_DISTRO: ubuntu1604
     - MOLECULE_DISTRO: debian9
-    - MOLECULE_DISTRO: debian8
 
 install:
   # Install test dependencies.
diff --git a/provisioning/roles/geerlingguy.nginx/tasks/setup-FreeBSD.yml b/provisioning/roles/geerlingguy.nginx/tasks/setup-FreeBSD.yml
index 7aa883769..a624936e8 100644
--- a/provisioning/roles/geerlingguy.nginx/tasks/setup-FreeBSD.yml
+++ b/provisioning/roles/geerlingguy.nginx/tasks/setup-FreeBSD.yml
@@ -1,6 +1,7 @@
 ---
 - name: Update pkg cache.
-  shell: pkg update -f
+  command: pkg update -f
+  tags: ['skip_ansible_lint']
 
 - name: Ensure nginx is installed.
   pkgng:
diff --git a/provisioning/roles/geerlingguy.nginx/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.nginx/tasks/setup-RedHat.yml
index 88194c8c3..074f664ca 100644
--- a/provisioning/roles/geerlingguy.nginx/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.nginx/tasks/setup-RedHat.yml
@@ -9,6 +9,6 @@
   when: nginx_yum_repo_enabled
 
 - name: Ensure nginx is installed.
-  yum:
+  package:
     name: "{{ nginx_package_name }}"
     state: present
diff --git a/provisioning/roles/geerlingguy.nginx/tasks/setup-Ubuntu.yml b/provisioning/roles/geerlingguy.nginx/tasks/setup-Ubuntu.yml
index e198062cf..51631a4a7 100644
--- a/provisioning/roles/geerlingguy.nginx/tasks/setup-Ubuntu.yml
+++ b/provisioning/roles/geerlingguy.nginx/tasks/setup-Ubuntu.yml
@@ -12,3 +12,4 @@
     name: nginx
     state: absent
   when: nginx_ppa_added.changed
+  tags: ['skip_ansible_lint']

From 17086612ed9ce0a3e98313a2f7a2fd7a97b870f4 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 31 May 2019 22:05:11 -0500
Subject: [PATCH 1089/1273] Update geerlingguy.composer role.

---
 provisioning/requirements.yml                      |  2 +-
 .../roles/geerlingguy.composer/.travis.yml         |  1 -
 provisioning/roles/geerlingguy.composer/README.md  |  2 +-
 .../molecule/default/molecule.yml                  |  6 ++++--
 .../molecule/default/playbook.yml                  | 14 ++++++++++++++
 .../molecule/default/tests/test_default.py         | 14 --------------
 .../geerlingguy.composer/tasks/global-require.yml  |  2 +-
 .../roles/geerlingguy.composer/tasks/main.yml      |  8 ++++----
 8 files changed, 25 insertions(+), 24 deletions(-)
 delete mode 100644 provisioning/roles/geerlingguy.composer/molecule/default/tests/test_default.py

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 16dab1113..963e3ac50 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -14,7 +14,7 @@
 - src: geerlingguy.blackfire
   version: 1.1.2
 - src: geerlingguy.composer
-  version: 1.7.3
+  version: 1.7.4
 - src: geerlingguy.daemonize
   version: 1.2.0
 - src: geerlingguy.drupal
diff --git a/provisioning/roles/geerlingguy.composer/.travis.yml b/provisioning/roles/geerlingguy.composer/.travis.yml
index 956544678..5765c02af 100644
--- a/provisioning/roles/geerlingguy.composer/.travis.yml
+++ b/provisioning/roles/geerlingguy.composer/.travis.yml
@@ -7,7 +7,6 @@ env:
     - ROLE_NAME: composer
   matrix:
     - MOLECULE_DISTRO: centos7
-    - MOLECULE_DISTRO: fedora27
     - MOLECULE_DISTRO: ubuntu1604
     - MOLECULE_DISTRO: debian9
 
diff --git a/provisioning/roles/geerlingguy.composer/README.md b/provisioning/roles/geerlingguy.composer/README.md
index c0cb88fe5..b88175081 100644
--- a/provisioning/roles/geerlingguy.composer/README.md
+++ b/provisioning/roles/geerlingguy.composer/README.md
@@ -31,7 +31,7 @@ The `COMPOSER_HOME` path and directory ownership; this is the directory where gl
 
 You can install a specific release of Composer, e.g. `composer_version: '1.0.0-alpha11'`. If left empty the latest development version will be installed. Note that `composer_keep_updated` will override this variable, as it will always install the latest development version.
 
-    composer_global_packages: {}
+    composer_global_packages: []
 
 A list of packages to install globally (using `composer global require`). If you want to install any packages globally, add a list item with a dictionary with the `name` of the package and a `release`, e.g. `- { name: phpunit/phpunit, release: "4.7.*" }`. The 'release' is optional, and defaults to `@stable`.
 
diff --git a/provisioning/roles/geerlingguy.composer/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.composer/molecule/default/molecule.yml
index 033970241..2ca6feaf9 100644
--- a/provisioning/roles/geerlingguy.composer/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.composer/molecule/default/molecule.yml
@@ -9,8 +9,10 @@ lint:
     config-file: molecule/default/yaml-lint.yml
 platforms:
   - name: instance
-    image: geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible
-    command: ${MOLECULE_DOCKER_COMMAND:-"sleep infinity"}
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
     privileged: true
     pre_build_image: true
 provisioner:
diff --git a/provisioning/roles/geerlingguy.composer/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.composer/molecule/default/playbook.yml
index 99b8497ce..f6470f99a 100644
--- a/provisioning/roles/geerlingguy.composer/molecule/default/playbook.yml
+++ b/provisioning/roles/geerlingguy.composer/molecule/default/playbook.yml
@@ -30,6 +30,20 @@
           - php7.0-xml
       when: ansible_distribution == 'Debian'
 
+    - name: Set php_packages for Fedora install.
+      set_fact:
+        php_packages:
+          - php
+          - php-cli
+          - php-common
+          - php-devel
+          - php-mbstring
+          - php-opcache
+          - php-pecl-apcu
+          - php-xml
+          - php-json
+      when: ansible_distribution == 'Fedora'
+
   roles:
     - role: geerlingguy.repo-remi
       when: ansible_os_family == 'RedHat' and ansible_distribution != 'Fedora'
diff --git a/provisioning/roles/geerlingguy.composer/molecule/default/tests/test_default.py b/provisioning/roles/geerlingguy.composer/molecule/default/tests/test_default.py
deleted file mode 100644
index eedd64a1d..000000000
--- a/provisioning/roles/geerlingguy.composer/molecule/default/tests/test_default.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import os
-
-import testinfra.utils.ansible_runner
-
-testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
-    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
-
-
-def test_hosts_file(host):
-    f = host.file('/etc/hosts')
-
-    assert f.exists
-    assert f.user == 'root'
-    assert f.group == 'root'
diff --git a/provisioning/roles/geerlingguy.composer/tasks/global-require.yml b/provisioning/roles/geerlingguy.composer/tasks/global-require.yml
index d817b9975..300fd49b8 100644
--- a/provisioning/roles/geerlingguy.composer/tasks/global-require.yml
+++ b/provisioning/roles/geerlingguy.composer/tasks/global-require.yml
@@ -15,4 +15,4 @@
     src: composer.sh.j2
     dest: /etc/profile.d/composer.sh
     mode: 0644
-  when: composer_add_to_path
+  when: composer_add_to_path | bool
diff --git a/provisioning/roles/geerlingguy.composer/tasks/main.yml b/provisioning/roles/geerlingguy.composer/tasks/main.yml
index cf384f2e1..d65d8de6f 100644
--- a/provisioning/roles/geerlingguy.composer/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.composer/tasks/main.yml
@@ -25,7 +25,7 @@
 
 - name: Run Composer installer.
   command: >
-    {{ php_executable }} composer-installer.php {% if composer_version != '' %} --version={{ composer_version }}{% endif %}
+    {{ php_executable }} composer-installer.php {% if composer_version %} --version={{ composer_version }}{% endif %}
     chdir=/tmp
   when: not composer_bin.stat.exists
 
@@ -40,7 +40,7 @@
     {{ php_executable }} {{ composer_path }} self-update
   register: composer_update
   changed_when: "'Updating to version' in composer_update.stdout"
-  when: composer_keep_updated
+  when: composer_keep_updated | bool
 
 - name: Ensure composer directory exists.
   file:
@@ -57,10 +57,10 @@
     dest: "{{ composer_home_path }}/auth.json"
     owner: "{{ composer_home_owner }}"
     group: "{{ composer_home_group }}"
-  when: composer_github_oauth_token != ''
+  when: composer_github_oauth_token | bool
 
 - include_tasks: global-require.yml
   when: composer_global_packages|length > 0
 
 - include_tasks: project-bin.yml
-  when: composer_add_project_to_path
+  when: composer_add_project_to_path | bool

From 7c067fd5ddb1f4431cabbb1d1844edc7c5c74bd3 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 31 May 2019 22:34:02 -0500
Subject: [PATCH 1090/1273] Update geerlingguy.nginx role to latest version.

---
 provisioning/requirements.yml                      |  2 +-
 .../molecule/default/tests/test_default.py         | 14 --------------
 .../roles/geerlingguy.nginx/tasks/setup-RedHat.yml |  2 +-
 .../roles/geerlingguy.nginx/tasks/setup-Ubuntu.yml |  2 +-
 .../roles/geerlingguy.nginx/tasks/vhosts.yml       |  2 +-
 5 files changed, 4 insertions(+), 18 deletions(-)
 delete mode 100644 provisioning/roles/geerlingguy.nginx/molecule/default/tests/test_default.py

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 963e3ac50..f3ccd43b0 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -38,7 +38,7 @@
 - src: geerlingguy.mysql
   version: 2.9.4
 - src: geerlingguy.nginx
-  version: 2.6.3
+  version: 2.6.4
 - src: geerlingguy.nodejs
   version: 5.0.0
 - src: geerlingguy.php
diff --git a/provisioning/roles/geerlingguy.nginx/molecule/default/tests/test_default.py b/provisioning/roles/geerlingguy.nginx/molecule/default/tests/test_default.py
deleted file mode 100644
index eedd64a1d..000000000
--- a/provisioning/roles/geerlingguy.nginx/molecule/default/tests/test_default.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import os
-
-import testinfra.utils.ansible_runner
-
-testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
-    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
-
-
-def test_hosts_file(host):
-    f = host.file('/etc/hosts')
-
-    assert f.exists
-    assert f.user == 'root'
-    assert f.group == 'root'
diff --git a/provisioning/roles/geerlingguy.nginx/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.nginx/tasks/setup-RedHat.yml
index 074f664ca..250739784 100644
--- a/provisioning/roles/geerlingguy.nginx/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.nginx/tasks/setup-RedHat.yml
@@ -6,7 +6,7 @@
     owner: root
     group: "{{ root_group }}"
     mode: 0644
-  when: nginx_yum_repo_enabled
+  when: nginx_yum_repo_enabled | bool
 
 - name: Ensure nginx is installed.
   package:
diff --git a/provisioning/roles/geerlingguy.nginx/tasks/setup-Ubuntu.yml b/provisioning/roles/geerlingguy.nginx/tasks/setup-Ubuntu.yml
index 51631a4a7..2fba70ad7 100644
--- a/provisioning/roles/geerlingguy.nginx/tasks/setup-Ubuntu.yml
+++ b/provisioning/roles/geerlingguy.nginx/tasks/setup-Ubuntu.yml
@@ -5,7 +5,7 @@
     state: present
     update_cache: true
   register: nginx_ppa_added
-  when: nginx_ppa_use
+  when: nginx_ppa_use | bool
 
 - name: Ensure nginx will reinstall if the PPA was just added.
   apt:
diff --git a/provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml b/provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml
index 61571fe12..7e2995ecc 100644
--- a/provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml
+++ b/provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml
@@ -3,7 +3,7 @@
   file:
     path: "{{ nginx_default_vhost_path }}"
     state: absent
-  when: nginx_remove_default_vhost
+  when: nginx_remove_default_vhost | bool
   notify: restart nginx
 
 - name: Ensure nginx_vhost_path exists.

From 9009a56f2d6ad20b43cd266984d58d59ae7185c8 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 1 Jun 2019 13:12:08 -0500
Subject: [PATCH 1091/1273] Fix rubocop offenses.

---
 Vagrantfile             | 22 +++++++++++++---------
 lib/drupalvm/vagrant.rb |  2 ++
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 8ca0e9530..ae1596a44 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
@@ -20,12 +22,14 @@ unless File.exist?(default_config_file)
   raise_message "Configuration file not found! Expected in #{default_config_file}"
 end
 
-vconfig = load_config([
-  default_config_file,
-  "#{host_config_dir}/config.yml",
-  "#{host_config_dir}/#{drupalvm_env}.config.yml",
-  "#{host_config_dir}/local.config.yml"
-])
+vconfig = load_config(
+  [
+    default_config_file,
+    "#{host_config_dir}/config.yml",
+    "#{host_config_dir}/#{drupalvm_env}.config.yml",
+    "#{host_config_dir}/local.config.yml"
+  ]
+)
 
 provisioner = vconfig['force_ansible_local'] ? :ansible_local : vagrant_provisioner
 if provisioner == :ansible
@@ -51,12 +55,12 @@ Vagrant.configure('2') do |config|
   # Networking configuration.
   config.vm.hostname = vconfig['vagrant_hostname']
   config.vm.network :private_network,
-    ip: vconfig['vagrant_ip'],
-    auto_network: vconfig['vagrant_ip'] == '0.0.0.0' && Vagrant.has_plugin?('vagrant-auto_network')
+                    ip: vconfig['vagrant_ip'],
+                    auto_network: vconfig['vagrant_ip'] == '0.0.0.0' && Vagrant.has_plugin?('vagrant-auto_network')
 
   unless vconfig['vagrant_public_ip'].empty?
     config.vm.network :public_network,
-      ip: vconfig['vagrant_public_ip'] != '0.0.0.0' ? vconfig['vagrant_public_ip'] : nil
+                      ip: vconfig['vagrant_public_ip'] != '0.0.0.0' ? vconfig['vagrant_public_ip'] : nil
   end
 
   # SSH options.
diff --git a/lib/drupalvm/vagrant.rb b/lib/drupalvm/vagrant.rb
index db88fe536..96b8fa9a6 100644
--- a/lib/drupalvm/vagrant.rb
+++ b/lib/drupalvm/vagrant.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 
 # Cross-platform way of finding an executable in the $PATH.

From f2f22ddbc55bb05ef3bc7a9fda2db2fca698519a Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 1 Jun 2019 13:17:20 -0500
Subject: [PATCH 1092/1273] Fix bad rubocop command.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c43dbc250..05a2d3dfd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,7 +59,7 @@ before_install:
 
 script:
   # Vagrantfile syntax check.
-  - 'rubocop ./Vagrantfile ./lib/drupalvm --except LineLength,Eval,MutableConstant,BlockLength,MethodLength,ConditionalAssignment,IndentArray,AlignParameters'
+  - 'rubocop ./Vagrantfile ./lib/drupalvm --except LineLength,Eval,MutableConstant,BlockLength,MethodLength,ConditionalAssignment,AlignParameters'
 
   # Run tests.
   - composer run-tests

From 1a03eb56af92e071f5ed50228779995d158bbada Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 6 Jun 2019 11:47:53 -0500
Subject: [PATCH 1093/1273] Update geerlingguy.nginx role to latest version.

---
 provisioning/requirements.yml                          | 2 +-
 provisioning/roles/geerlingguy.nginx/README.md         | 5 +++++
 provisioning/roles/geerlingguy.nginx/defaults/main.yml | 3 +++
 provisioning/roles/geerlingguy.nginx/tasks/main.yml    | 7 +++++--
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index f3ccd43b0..2837f1b96 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -38,7 +38,7 @@
 - src: geerlingguy.mysql
   version: 2.9.4
 - src: geerlingguy.nginx
-  version: 2.6.4
+  version: 2.7.0
 - src: geerlingguy.nodejs
   version: 5.0.0
 - src: geerlingguy.php
diff --git a/provisioning/roles/geerlingguy.nginx/README.md b/provisioning/roles/geerlingguy.nginx/README.md
index d8f45db2f..e28557142 100644
--- a/provisioning/roles/geerlingguy.nginx/README.md
+++ b/provisioning/roles/geerlingguy.nginx/README.md
@@ -150,6 +150,11 @@ Configures Nginx's [`log_format`](http://nginx.org/en/docs/http/ngx_http_log_mod
 
 (For RedHat/CentOS only) Set this to `false` to disable the installation of the `nginx` yum repository. This could be necessary if you want the default OS stable packages, or if you use Satellite.
 
+    nginx_service_state: started
+    nginx_service_enabled: yes
+
+By default, this role will ensure Nginx is running and enabled at boot after Nginx is configured. You can use these variables to override this behavior if installing in a container or further control over the service state is required.
+
 ## Overriding configuration templates
 
 If you can't customize via variables because an option isn't exposed, you can override the template used to generate the virtualhost configuration files or the `nginx.conf` file.
diff --git a/provisioning/roles/geerlingguy.nginx/defaults/main.yml b/provisioning/roles/geerlingguy.nginx/defaults/main.yml
index cbce58a35..0509dbed5 100644
--- a/provisioning/roles/geerlingguy.nginx/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.nginx/defaults/main.yml
@@ -12,6 +12,9 @@ nginx_ppa_version: stable
 # The name of the nginx package to install.
 nginx_package_name: "nginx"
 
+nginx_service_state: started
+nginx_service_enabled: true
+
 nginx_conf_template: "nginx.conf.j2"
 nginx_vhost_template: "vhost.j2"
 
diff --git a/provisioning/roles/geerlingguy.nginx/tasks/main.yml b/provisioning/roles/geerlingguy.nginx/tasks/main.yml
index fd523d92e..bfb5fe404 100644
--- a/provisioning/roles/geerlingguy.nginx/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.nginx/tasks/main.yml
@@ -41,5 +41,8 @@
   notify:
     - reload nginx
 
-- name: Ensure nginx is started and enabled to start at boot.
-  service: name=nginx state=started enabled=yes
+- name: Ensure nginx service is running as configured.
+  service:
+    name: nginx
+    state: "{{ nginx_service_state }}"
+    enabled: "{{ nginx_service_enabled }}"

From 149aa49c1f5c337096090351b0ae94669ac122ac Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 10 Jun 2019 10:58:17 -0500
Subject: [PATCH 1094/1273] Update geerlingguy.composer Ansible role.

---
 provisioning/requirements.yml                          | 2 +-
 provisioning/roles/geerlingguy.composer/tasks/main.yml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 2837f1b96..1737a8af5 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -14,7 +14,7 @@
 - src: geerlingguy.blackfire
   version: 1.1.2
 - src: geerlingguy.composer
-  version: 1.7.4
+  version: 1.7.5
 - src: geerlingguy.daemonize
   version: 1.2.0
 - src: geerlingguy.drupal
diff --git a/provisioning/roles/geerlingguy.composer/tasks/main.yml b/provisioning/roles/geerlingguy.composer/tasks/main.yml
index d65d8de6f..cecbfa65b 100644
--- a/provisioning/roles/geerlingguy.composer/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.composer/tasks/main.yml
@@ -57,10 +57,10 @@
     dest: "{{ composer_home_path }}/auth.json"
     owner: "{{ composer_home_owner }}"
     group: "{{ composer_home_group }}"
-  when: composer_github_oauth_token | bool
+  when: composer_github_oauth_token | length > 0
 
 - include_tasks: global-require.yml
-  when: composer_global_packages|length > 0
+  when: composer_global_packages | length > 0
 
 - include_tasks: project-bin.yml
   when: composer_add_project_to_path | bool

From d0876413fc4bff4fb6b12fce55c858b3defa5096 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 11 Jun 2019 09:38:04 -0500
Subject: [PATCH 1095/1273] Update geerlingguy.postgresql to latest version.

---
 provisioning/requirements.yml                      |  2 +-
 .../roles/geerlingguy.postgresql/.ansible-lint     |  3 +++
 .../roles/geerlingguy.postgresql/.travis.yml       |  2 +-
 .../molecule/default/tests/test_default.py         | 14 --------------
 .../geerlingguy.postgresql/vars/Debian-10.yml      | 10 ++++++++++
 .../geerlingguy.postgresql/vars/Debian-NA.yml      |  1 +
 .../vars/Debian-buster/sid.yml                     |  1 +
 .../geerlingguy.postgresql/vars/Debian-testing.yml |  1 +
 8 files changed, 18 insertions(+), 16 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.postgresql/.ansible-lint
 delete mode 100644 provisioning/roles/geerlingguy.postgresql/molecule/default/tests/test_default.py
 create mode 100644 provisioning/roles/geerlingguy.postgresql/vars/Debian-10.yml
 create mode 120000 provisioning/roles/geerlingguy.postgresql/vars/Debian-NA.yml
 create mode 120000 provisioning/roles/geerlingguy.postgresql/vars/Debian-buster/sid.yml
 create mode 120000 provisioning/roles/geerlingguy.postgresql/vars/Debian-testing.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 1737a8af5..c3914483b 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -66,7 +66,7 @@
 - src: geerlingguy.postfix
   version: 2.0.0
 - src: geerlingguy.postgresql
-  version: 1.4.5
+  version: 1.4.6
 - src: geerlingguy.redis
   version: 1.6.0
 - src: geerlingguy.repo-remi
diff --git a/provisioning/roles/geerlingguy.postgresql/.ansible-lint b/provisioning/roles/geerlingguy.postgresql/.ansible-lint
new file mode 100644
index 000000000..f3c109091
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/.ansible-lint
@@ -0,0 +1,3 @@
+skip_list:
+  - '405'
+  - '503'
diff --git a/provisioning/roles/geerlingguy.postgresql/.travis.yml b/provisioning/roles/geerlingguy.postgresql/.travis.yml
index 2141e044d..22de53585 100644
--- a/provisioning/roles/geerlingguy.postgresql/.travis.yml
+++ b/provisioning/roles/geerlingguy.postgresql/.travis.yml
@@ -9,8 +9,8 @@ env:
     - MOLECULE_DISTRO: centos7
     - MOLECULE_DISTRO: ubuntu1804
     - MOLECULE_DISTRO: ubuntu1604
+    - MOLECULE_DISTRO: debian10
     - MOLECULE_DISTRO: debian9
-    - MOLECULE_DISTRO: debian8
 
 install:
   # Install test dependencies.
diff --git a/provisioning/roles/geerlingguy.postgresql/molecule/default/tests/test_default.py b/provisioning/roles/geerlingguy.postgresql/molecule/default/tests/test_default.py
deleted file mode 100644
index eedd64a1d..000000000
--- a/provisioning/roles/geerlingguy.postgresql/molecule/default/tests/test_default.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import os
-
-import testinfra.utils.ansible_runner
-
-testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
-    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
-
-
-def test_hosts_file(host):
-    f = host.file('/etc/hosts')
-
-    assert f.exists
-    assert f.user == 'root'
-    assert f.group == 'root'
diff --git a/provisioning/roles/geerlingguy.postgresql/vars/Debian-10.yml b/provisioning/roles/geerlingguy.postgresql/vars/Debian-10.yml
new file mode 100644
index 000000000..fe81ad790
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/vars/Debian-10.yml
@@ -0,0 +1,10 @@
+---
+__postgresql_version: "11"
+__postgresql_data_dir: "/var/lib/postgresql/{{ __postgresql_version }}/main"
+__postgresql_bin_path: "/usr/lib/postgresql/{{ __postgresql_version }}/bin"
+__postgresql_config_path: "/etc/postgresql/{{ __postgresql_version }}/main"
+__postgresql_daemon: "postgresql@{{ postgresql_version }}-main"
+__postgresql_packages:
+  - postgresql
+  - postgresql-contrib
+  - libpq-dev
diff --git a/provisioning/roles/geerlingguy.postgresql/vars/Debian-NA.yml b/provisioning/roles/geerlingguy.postgresql/vars/Debian-NA.yml
new file mode 120000
index 000000000..4b4ba67ef
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/vars/Debian-NA.yml
@@ -0,0 +1 @@
+Debian-10.yml
\ No newline at end of file
diff --git a/provisioning/roles/geerlingguy.postgresql/vars/Debian-buster/sid.yml b/provisioning/roles/geerlingguy.postgresql/vars/Debian-buster/sid.yml
new file mode 120000
index 000000000..896a2b197
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/vars/Debian-buster/sid.yml
@@ -0,0 +1 @@
+../Debian-10.yml
\ No newline at end of file
diff --git a/provisioning/roles/geerlingguy.postgresql/vars/Debian-testing.yml b/provisioning/roles/geerlingguy.postgresql/vars/Debian-testing.yml
new file mode 120000
index 000000000..4b4ba67ef
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/vars/Debian-testing.yml
@@ -0,0 +1 @@
+Debian-10.yml
\ No newline at end of file

From 018f5c256d6cd305b0cf3a1ba3a41a32ecb7c714 Mon Sep 17 00:00:00 2001
From: Harold <hjuarez20@gmail.com>
Date: Mon, 24 Jun 2019 15:09:43 -0600
Subject: [PATCH 1096/1273] [docs] Update drupal console remote sites

---
 docs/extras/drupal-console.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/extras/drupal-console.md b/docs/extras/drupal-console.md
index f45815e22..a671c829f 100644
--- a/docs/extras/drupal-console.md
+++ b/docs/extras/drupal-console.md
@@ -27,14 +27,19 @@ To run commands on your host computer but execute them on the VM, add a new site
 dev:
   root: /var/www/drupalvm/drupal
   host: 192.168.88.88
-  user: vagrant
   password: vagrant
+  type: ssh
+  extra-options: '-o PasswordAuthentication=no -i ~/.vagrant.d/insecure_private_key'
 ```
 
 Execute from host machine using the `--target` option.
 
     drupal --target=drupalvm.test site:status
 
+or
+
+    drupal @drupalvm.test site:status
+
 For more details, see [Drupal Console's documentation](https://docs.drupalconsole.com/en/alias/how-to-use-drupal-console-in-a-remote-installation.html)
 
 For a list of available role variables, see the [`geerlingguy.drupal-console` Ansible role's README](https://github.com/geerlingguy/ansible-role-drupal-console#readme).

From 0d5deccc9710591aef9ad59c1e91f003861b3439 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 18 Jul 2019 17:07:40 -0500
Subject: [PATCH 1097/1273] Update geerlingguy.git and geerlingguy.security
 roles.

---
 provisioning/requirements.yml                 |  4 ++--
 .../roles/geerlingguy.git/.ansible-lint       |  2 ++
 .../roles/geerlingguy.git/.travis.yml         |  4 ----
 .../molecule/default/molecule.yml             |  6 +++--
 .../tasks/install-from-source.yml             | 22 +++++++------------
 .../roles/geerlingguy.git/tasks/main.yml      |  7 +++---
 .../roles/geerlingguy.security/.travis.yml    |  1 -
 .../molecule/default/tests/test_default.py    | 14 ------------
 .../tasks/autoupdate-Debian.yml               |  2 +-
 .../roles/geerlingguy.security/tasks/main.yml | 18 ++++++++++-----
 10 files changed, 33 insertions(+), 47 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.git/.ansible-lint
 delete mode 100644 provisioning/roles/geerlingguy.security/molecule/default/tests/test_default.py

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index c3914483b..617646a77 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -28,7 +28,7 @@
 - src: geerlingguy.firewall
   version: 2.4.1
 - src: geerlingguy.git
-  version: 2.0.3
+  version: 2.0.5
 - src: geerlingguy.java
   version: 1.9.5
 - src: geerlingguy.mailhog
@@ -74,7 +74,7 @@
 - src: geerlingguy.ruby
   version: 2.5.2
 - src: geerlingguy.security
-  version: 1.8.0
+  version: 1.8.1
 - src: geerlingguy.solr
   version: 4.3.0
 - src: geerlingguy.varnish
diff --git a/provisioning/roles/geerlingguy.git/.ansible-lint b/provisioning/roles/geerlingguy.git/.ansible-lint
new file mode 100644
index 000000000..1ae5e6ccf
--- /dev/null
+++ b/provisioning/roles/geerlingguy.git/.ansible-lint
@@ -0,0 +1,2 @@
+skip_list:
+  - '204'
diff --git a/provisioning/roles/geerlingguy.git/.travis.yml b/provisioning/roles/geerlingguy.git/.travis.yml
index a1c2ef1d1..742ed3b71 100644
--- a/provisioning/roles/geerlingguy.git/.travis.yml
+++ b/provisioning/roles/geerlingguy.git/.travis.yml
@@ -7,14 +7,10 @@ env:
     - ROLE_NAME: git
   matrix:
     - MOLECULE_DISTRO: centos7
-      MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
-      MOLECULE_PLAYBOOK: playbook-source.yml
-    - MOLECULE_DISTRO: fedora27
       MOLECULE_PLAYBOOK: playbook-source.yml
     - MOLECULE_DISTRO: ubuntu1804
       MOLECULE_PLAYBOOK: playbook-source.yml
     - MOLECULE_DISTRO: centos7
-      MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
     - MOLECULE_DISTRO: centos6
     - MOLECULE_DISTRO: ubuntu1804
     - MOLECULE_DISTRO: ubuntu1604
diff --git a/provisioning/roles/geerlingguy.git/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.git/molecule/default/molecule.yml
index 033970241..2ca6feaf9 100644
--- a/provisioning/roles/geerlingguy.git/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.git/molecule/default/molecule.yml
@@ -9,8 +9,10 @@ lint:
     config-file: molecule/default/yaml-lint.yml
 platforms:
   - name: instance
-    image: geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible
-    command: ${MOLECULE_DOCKER_COMMAND:-"sleep infinity"}
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
     privileged: true
     pre_build_image: true
 provisioner:
diff --git a/provisioning/roles/geerlingguy.git/tasks/install-from-source.yml b/provisioning/roles/geerlingguy.git/tasks/install-from-source.yml
index 008bf68c2..a32af0ae4 100644
--- a/provisioning/roles/geerlingguy.git/tasks/install-from-source.yml
+++ b/provisioning/roles/geerlingguy.git/tasks/install-from-source.yml
@@ -1,5 +1,4 @@
 ---
-
 - name: Include OS-specific variables (RedHat).
   include_vars: "{{ ansible_os_family }}.yml"
   when:
@@ -19,15 +18,10 @@
     git_install_from_source_dependencies: "{{ __git_install_from_source_dependencies | list }}"
   when: git_install_from_source_dependencies is not defined
 
-- name: Ensure git's dependencies are installed (RedHat).
-  package: "name={{ item }} state=present"
-  with_items: "{{ git_install_from_source_dependencies }}"
-  when: ansible_os_family == 'RedHat'
-
-- name: Ensure git's dependencies are installed (Debian).
-  apt: "name={{ item }} state=present"
-  with_items: "{{ git_install_from_source_dependencies }}"
-  when: ansible_os_family == 'Debian'
+- name: Ensure git's dependencies are installed.
+  package:
+    name: "{{ git_install_from_source_dependencies }}"
+    state: present
 
 - name: Get installed version.
   command: >
@@ -42,14 +36,14 @@
   set_fact:
     git_reinstall_from_source: true
   when:
-    - git_install_from_source_force_update
+    - git_install_from_source_force_update | bool
     - (git_installed_version.rc == 0) and (git_installed_version.stdout | regex_replace("^.*?([0-9\.]+)$", "\\1") | version_compare(git_version, operator="!="))
 
 - name: Download git.
   get_url:
     url: "https://www.kernel.org/pub/software/scm/git/git-{{ git_version }}.tar.gz"
     dest: "{{ workspace }}/git-{{ git_version }}.tar.gz"
-  when: (git_installed_version.rc != 0) or git_reinstall_from_source
+  when: (git_installed_version.rc != 0) or (git_reinstall_from_source | bool)
 
 - name: Expand git archive.
   unarchive:
@@ -57,7 +51,7 @@
     dest: "{{ workspace }}"
     creates: "{{ workspace }}/git-{{ git_version }}/README"
     copy: false
-  when: (git_installed_version.rc != 0) or git_reinstall_from_source
+  when: (git_installed_version.rc != 0) or (git_reinstall_from_source | bool)
 
 - name: Build git.
   command: >
@@ -66,5 +60,5 @@
   with_items:
     - all
     - install
-  when: (git_installed_version.rc != 0) or git_reinstall_from_source
+  when: (git_installed_version.rc != 0) or (git_reinstall_from_source | bool)
   become: true
diff --git a/provisioning/roles/geerlingguy.git/tasks/main.yml b/provisioning/roles/geerlingguy.git/tasks/main.yml
index 99cac22ea..d7cc5811b 100644
--- a/provisioning/roles/geerlingguy.git/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.git/tasks/main.yml
@@ -5,7 +5,7 @@
     state: present
     enablerepo: "{{ git_enablerepo | default(omit, true) }}"
   when:
-    - git_install_from_source == false
+    - not git_install_from_source | bool
     - ansible_os_family == 'RedHat'
 
 - name: Update apt cache (Debian).
@@ -17,9 +17,8 @@
     name: "{{ git_packages }}"
     state: present
   when:
-    - git_install_from_source == false
+    - not git_install_from_source | bool
     - ansible_os_family == 'Debian'
 
-# Install git from source when git_install_from_source is true.
 - import_tasks: install-from-source.yml
-  when: git_install_from_source == true
+  when: git_install_from_source | bool
diff --git a/provisioning/roles/geerlingguy.security/.travis.yml b/provisioning/roles/geerlingguy.security/.travis.yml
index 015f1de78..243fe1c4b 100644
--- a/provisioning/roles/geerlingguy.security/.travis.yml
+++ b/provisioning/roles/geerlingguy.security/.travis.yml
@@ -10,7 +10,6 @@ env:
     - MOLECULE_DISTRO: centos6
     - MOLECULE_DISTRO: ubuntu1804
     - MOLECULE_DISTRO: debian9
-    - MOLECULE_DISTRO: debian8
 
 install:
   # Install test dependencies.
diff --git a/provisioning/roles/geerlingguy.security/molecule/default/tests/test_default.py b/provisioning/roles/geerlingguy.security/molecule/default/tests/test_default.py
deleted file mode 100644
index eedd64a1d..000000000
--- a/provisioning/roles/geerlingguy.security/molecule/default/tests/test_default.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import os
-
-import testinfra.utils.ansible_runner
-
-testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
-    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
-
-
-def test_hosts_file(host):
-    f = host.file('/etc/hosts')
-
-    assert f.exists
-    assert f.user == 'root'
-    assert f.group == 'root'
diff --git a/provisioning/roles/geerlingguy.security/tasks/autoupdate-Debian.yml b/provisioning/roles/geerlingguy.security/tasks/autoupdate-Debian.yml
index 4071475d9..e418e053b 100644
--- a/provisioning/roles/geerlingguy.security/tasks/autoupdate-Debian.yml
+++ b/provisioning/roles/geerlingguy.security/tasks/autoupdate-Debian.yml
@@ -4,7 +4,7 @@
 
 - name: Copy unattended-upgrades configuration files in place.
   template:
-    src: "../templates/{{ item }}.j2"
+    src: "{{ item }}.j2"
     dest: "/etc/apt/apt.conf.d/{{ item }}"
     owner: root
     group: root
diff --git a/provisioning/roles/geerlingguy.security/tasks/main.yml b/provisioning/roles/geerlingguy.security/tasks/main.yml
index 84097cc35..402404e3f 100644
--- a/provisioning/roles/geerlingguy.security/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.security/tasks/main.yml
@@ -4,21 +4,29 @@
 
 # Fail2Ban
 - include_tasks: fail2ban-RedHat.yml
-  when: ansible_os_family == 'RedHat' and security_fail2ban_enabled
+  when:
+    - ansible_os_family == 'RedHat'
+    - security_fail2ban_enabled | bool
 
 - include_tasks: fail2ban-Debian.yml
-  when: ansible_os_family == 'Debian' and security_fail2ban_enabled
+  when:
+    - ansible_os_family == 'Debian'
+    - security_fail2ban_enabled | bool
 
 - name: Ensure fail2ban is running and enabled on boot.
   service: name=fail2ban state=started enabled=yes
-  when: security_fail2ban_enabled
+  when: security_fail2ban_enabled | bool
 
 # SSH
 - include_tasks: ssh.yml
 
 # Autoupdate
 - include_tasks: autoupdate-RedHat.yml
-  when: ansible_os_family == 'RedHat' and security_autoupdate_enabled
+  when:
+    - ansible_os_family == 'RedHat'
+    - security_autoupdate_enabled | bool
 
 - include_tasks: autoupdate-Debian.yml
-  when: ansible_os_family == 'Debian' and security_autoupdate_enabled
+  when:
+    - ansible_os_family == 'Debian'
+    - security_autoupdate_enabled | bool

From ee42729b49c2eab7ca8d5c1aa1e95848c2fbc258 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 23 Jul 2019 16:40:53 -0500
Subject: [PATCH 1098/1273] Update geerlingguy.apache role to latest version.

---
 provisioning/requirements.yml                      |  2 +-
 provisioning/roles/geerlingguy.apache/.travis.yml  |  4 ++--
 .../roles/geerlingguy.apache/meta/main.yml         |  3 ---
 .../molecule/default/molecule.yml                  |  6 ++++--
 .../geerlingguy.apache/tasks/configure-Debian.yml  |  4 ++--
 .../geerlingguy.apache/tasks/configure-RedHat.yml  | 14 +++++++++++++-
 .../geerlingguy.apache/tasks/configure-Solaris.yml |  2 +-
 .../geerlingguy.apache/tasks/configure-Suse.yml    |  2 +-
 8 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 617646a77..8d6cef06b 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -8,7 +8,7 @@
 - src: geerlingguy.adminer
   version: 1.2.0
 - src: geerlingguy.apache
-  version: 3.0.3
+  version: 3.1.0
 - src: geerlingguy.apache-php-fpm
   version: 1.1.0
 - src: geerlingguy.blackfire
diff --git a/provisioning/roles/geerlingguy.apache/.travis.yml b/provisioning/roles/geerlingguy.apache/.travis.yml
index 6cbee98f0..57deda127 100644
--- a/provisioning/roles/geerlingguy.apache/.travis.yml
+++ b/provisioning/roles/geerlingguy.apache/.travis.yml
@@ -6,14 +6,14 @@ env:
   global:
     - ROLE_NAME: apache
   matrix:
+    - MOLECULE_DISTRO: ubi8
     - MOLECULE_DISTRO: centos7
-      MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
     - MOLECULE_DISTRO: centos6
     - MOLECULE_DISTRO: ubuntu1804
     - MOLECULE_DISTRO: ubuntu1604
     - MOLECULE_DISTRO: ubuntu1404
+    - MOLECULE_DISTRO: debian10
     - MOLECULE_DISTRO: debian9
-    - MOLECULE_DISTRO: debian8
 
 install:
   # Install test dependencies.
diff --git a/provisioning/roles/geerlingguy.apache/meta/main.yml b/provisioning/roles/geerlingguy.apache/meta/main.yml
index 75ed4949e..16cc210bd 100644
--- a/provisioning/roles/geerlingguy.apache/meta/main.yml
+++ b/provisioning/roles/geerlingguy.apache/meta/main.yml
@@ -25,9 +25,6 @@ galaxy_info:
         - trusty
         - xenial
         - bionic
-    - name: Suse
-      versions:
-        - all
     - name: Solaris
       versions:
         - 11.3
diff --git a/provisioning/roles/geerlingguy.apache/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.apache/molecule/default/molecule.yml
index 033970241..2ca6feaf9 100644
--- a/provisioning/roles/geerlingguy.apache/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.apache/molecule/default/molecule.yml
@@ -9,8 +9,10 @@ lint:
     config-file: molecule/default/yaml-lint.yml
 platforms:
   - name: instance
-    image: geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible
-    command: ${MOLECULE_DOCKER_COMMAND:-"sleep infinity"}
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
     privileged: true
     pre_build_image: true
 provisioner:
diff --git a/provisioning/roles/geerlingguy.apache/tasks/configure-Debian.yml b/provisioning/roles/geerlingguy.apache/tasks/configure-Debian.yml
index 2f2b29868..e115e61e4 100644
--- a/provisioning/roles/geerlingguy.apache/tasks/configure-Debian.yml
+++ b/provisioning/roles/geerlingguy.apache/tasks/configure-Debian.yml
@@ -36,7 +36,7 @@
     group: root
     mode: 0644
   notify: restart apache
-  when: apache_create_vhosts
+  when: apache_create_vhosts | bool
 
 - name: Add vhost symlink in sites-enabled.
   file:
@@ -44,7 +44,7 @@
     dest: "{{ apache_conf_path }}/sites-enabled/{{ apache_vhosts_filename }}"
     state: link
   notify: restart apache
-  when: apache_create_vhosts
+  when: apache_create_vhosts | bool
 
 - name: Remove default vhost in sites-enabled.
   file:
diff --git a/provisioning/roles/geerlingguy.apache/tasks/configure-RedHat.yml b/provisioning/roles/geerlingguy.apache/tasks/configure-RedHat.yml
index 1483e9bf6..95675e45c 100644
--- a/provisioning/roles/geerlingguy.apache/tasks/configure-RedHat.yml
+++ b/provisioning/roles/geerlingguy.apache/tasks/configure-RedHat.yml
@@ -21,4 +21,16 @@
     group: root
     mode: 0644
   notify: restart apache
-  when: apache_create_vhosts
+  when: apache_create_vhosts | bool
+
+- name: Check if localhost cert exists (RHEL 8 and later).
+  stat:
+    path: /etc/pki/tls/certs/localhost.crt
+  register: localhost_cert
+  when: ansible_distribution_major_version | int >= 8
+
+- name: Ensure httpd certs are installed (RHEL 8 and later).
+  command: /usr/libexec/httpd-ssl-gencerts
+  when:
+    - ansible_distribution_major_version | int >= 8
+    - not localhost_cert.stat.exists
diff --git a/provisioning/roles/geerlingguy.apache/tasks/configure-Solaris.yml b/provisioning/roles/geerlingguy.apache/tasks/configure-Solaris.yml
index 76d32e657..b6c121bae 100644
--- a/provisioning/roles/geerlingguy.apache/tasks/configure-Solaris.yml
+++ b/provisioning/roles/geerlingguy.apache/tasks/configure-Solaris.yml
@@ -16,4 +16,4 @@
     group: root
     mode: 0644
   notify: restart apache
-  when: apache_create_vhosts
+  when: apache_create_vhosts | bool
diff --git a/provisioning/roles/geerlingguy.apache/tasks/configure-Suse.yml b/provisioning/roles/geerlingguy.apache/tasks/configure-Suse.yml
index 77e11117e..54d4d1c1f 100644
--- a/provisioning/roles/geerlingguy.apache/tasks/configure-Suse.yml
+++ b/provisioning/roles/geerlingguy.apache/tasks/configure-Suse.yml
@@ -21,4 +21,4 @@
     group: root
     mode: 0644
   notify: restart apache
-  when: apache_create_vhosts
+  when: apache_create_vhosts | bool

From 282bdb8ef1f91978e97a560a23da16fb24494afc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Burak=20=C3=96zdemir?=
 <kburakozdemir@users.noreply.github.com>
Date: Sun, 4 Aug 2019 00:07:59 +0300
Subject: [PATCH 1099/1273] [docs] Fix typo in installation-linux.md

Guiden --> Guide in
---
 docs/getting-started/installation-linux.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/getting-started/installation-linux.md b/docs/getting-started/installation-linux.md
index fcc92e791..21f11e347 100644
--- a/docs/getting-started/installation-linux.md
+++ b/docs/getting-started/installation-linux.md
@@ -1,4 +1,4 @@
-Please read through the [Quick Start Guiden the README](https://github.com/geerlingguy/drupal-vm#quick-start-guide) to get started.
+Please read through the [Quick Start Guide in the README](https://github.com/geerlingguy/drupal-vm#quick-start-guide) to get started.
 
 For a quick introduction to setting up Drupal VM, the [macOS video tutorial](installation-macos.md) applies somwhat to Linux as well.
 

From 7caa7d5a96f027bcd8d2fd31194ca9d65013ecf3 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 26 Aug 2019 10:02:26 -0500
Subject: [PATCH 1100/1273] Update geerlingguy.mysql role to latest version.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.mysql/.ansible-lint     |  3 ++
 .../roles/geerlingguy.mysql/.travis.yml       |  4 +-
 .../roles/geerlingguy.mysql/README.md         |  6 ++-
 .../molecule/default/molecule.yml             |  6 ++-
 .../molecule/default/yaml-lint.yml            |  2 +-
 .../geerlingguy.mysql/tasks/configure.yml     | 10 ++++-
 .../geerlingguy.mysql/tasks/replication.yml   | 44 ++++++++++---------
 .../tasks/secure-installation.yml             |  9 +++-
 .../tasks/setup-Archlinux.yml                 |  4 +-
 .../geerlingguy.mysql/tasks/setup-Debian.yml  | 20 +++++----
 .../geerlingguy.mysql/tasks/variables.yml     |  6 +--
 .../geerlingguy.mysql/vars/Debian-10.yml      | 13 ++++++
 13 files changed, 82 insertions(+), 47 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.mysql/.ansible-lint
 create mode 100644 provisioning/roles/geerlingguy.mysql/vars/Debian-10.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 8d6cef06b..b00596265 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -36,7 +36,7 @@
 - src: geerlingguy.memcached
   version: 1.0.8
 - src: geerlingguy.mysql
-  version: 2.9.4
+  version: 2.9.5
 - src: geerlingguy.nginx
   version: 2.7.0
 - src: geerlingguy.nodejs
diff --git a/provisioning/roles/geerlingguy.mysql/.ansible-lint b/provisioning/roles/geerlingguy.mysql/.ansible-lint
new file mode 100644
index 000000000..5a3b624f8
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/.ansible-lint
@@ -0,0 +1,3 @@
+skip_list:
+  - '602'
+  - '204'
diff --git a/provisioning/roles/geerlingguy.mysql/.travis.yml b/provisioning/roles/geerlingguy.mysql/.travis.yml
index 2c8286ffe..db26840bc 100644
--- a/provisioning/roles/geerlingguy.mysql/.travis.yml
+++ b/provisioning/roles/geerlingguy.mysql/.travis.yml
@@ -7,10 +7,10 @@ env:
     - ROLE_NAME: mysql
   matrix:
     - MOLECULE_DISTRO: centos7
-      MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
     - MOLECULE_DISTRO: centos6
+    - MOLECULE_DISTRO: ubuntu1804
     - MOLECULE_DISTRO: ubuntu1604
-    - MOLECULE_DISTRO: debian8
+    - MOLECULE_DISTRO: debian10
 
 install:
   # Install test dependencies.
diff --git a/provisioning/roles/geerlingguy.mysql/README.md b/provisioning/roles/geerlingguy.mysql/README.md
index ad2cd00de..7436589fe 100644
--- a/provisioning/roles/geerlingguy.mysql/README.md
+++ b/provisioning/roles/geerlingguy.mysql/README.md
@@ -118,9 +118,11 @@ The rest of the settings in `defaults/main.yml` control MySQL's memory usage and
     mysql_expire_logs_days: "10"
     mysql_replication_role: ''
     mysql_replication_master: ''
-    mysql_replication_user: []
+    mysql_replication_user: {}
 
-Replication settings. Set `mysql_server_id` and `mysql_replication_role` by server (e.g. the master would be ID `1`, with the `mysql_replication_role` of `master`, and the slave would be ID `2`, with the `mysql_replication_role` of `slave`). The `mysql_replication_user` uses the same keys as `mysql_users`, and is created on master servers, and used to replicate on all the slaves.
+Replication settings. Set `mysql_server_id` and `mysql_replication_role` by server (e.g. the master would be ID `1`, with the `mysql_replication_role` of `master`, and the slave would be ID `2`, with the `mysql_replication_role` of `slave`). The `mysql_replication_user` uses the same keys as individual list items in `mysql_users`, and is created on master servers, and used to replicate on all the slaves.
+
+`mysql_replication_master` needs to resolve to an IP or a hostname which is accessable to the Slaves (this could be a `/etc/hosts` injection or some other means), otherwise the slaves cannot communicate to the master.
 
 ### Later versions of MySQL on CentOS 7
 
diff --git a/provisioning/roles/geerlingguy.mysql/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.mysql/molecule/default/molecule.yml
index 033970241..2ca6feaf9 100644
--- a/provisioning/roles/geerlingguy.mysql/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.mysql/molecule/default/molecule.yml
@@ -9,8 +9,10 @@ lint:
     config-file: molecule/default/yaml-lint.yml
 platforms:
   - name: instance
-    image: geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible
-    command: ${MOLECULE_DOCKER_COMMAND:-"sleep infinity"}
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
     privileged: true
     pre_build_image: true
 provisioner:
diff --git a/provisioning/roles/geerlingguy.mysql/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.mysql/molecule/default/yaml-lint.yml
index c9aab08bf..db22c42ea 100644
--- a/provisioning/roles/geerlingguy.mysql/molecule/default/yaml-lint.yml
+++ b/provisioning/roles/geerlingguy.mysql/molecule/default/yaml-lint.yml
@@ -2,5 +2,5 @@
 extends: default
 rules:
   line-length:
-    max: 150
+    max: 160
     level: warning
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/configure.yml b/provisioning/roles/geerlingguy.mysql/tasks/configure.yml
index c9d106240..49cb7ad23 100644
--- a/provisioning/roles/geerlingguy.mysql/tasks/configure.yml
+++ b/provisioning/roles/geerlingguy.mysql/tasks/configure.yml
@@ -65,7 +65,10 @@
   args:
     creates: "{{ mysql_log_error }}"
     warn: false
-  when: mysql_log == "" and mysql_log_error != ""
+  when:
+    - mysql_log == ""
+    - mysql_log_error != ""
+  tags: ['skip_ansible_galaxy']
 
 - name: Set ownership on error log file (if configured).
   file:
@@ -74,7 +77,10 @@
     owner: mysql
     group: "{{ mysql_log_file_group }}"
     mode: 0640
-  when: mysql_log == "" and mysql_log_error != ""
+  when:
+    - mysql_log == ""
+    - mysql_log_error != ""
+  tags: ['skip_ansible_galaxy']
 
 - name: Ensure MySQL is started and enabled on boot.
   service: "name={{ mysql_daemon }} state=started enabled={{ mysql_enabled_on_startup }}"
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/replication.yml b/provisioning/roles/geerlingguy.mysql/tasks/replication.yml
index 322546f80..e1cbeb54b 100644
--- a/provisioning/roles/geerlingguy.mysql/tasks/replication.yml
+++ b/provisioning/roles/geerlingguy.mysql/tasks/replication.yml
@@ -6,10 +6,11 @@
     password: "{{ mysql_replication_user.password }}"
     priv: "{{ mysql_replication_user.priv | default('*.*:REPLICATION SLAVE,REPLICATION CLIENT') }}"
     state: present
-  when: >
-    (mysql_replication_role == 'master')
-    and mysql_replication_user
-    and (mysql_replication_master != '')
+  when:
+    - mysql_replication_role == 'master'
+    - mysql_replication_user.name is defined
+    - mysql_replication_master != ''
+  tags: ['skip_ansible_galaxy']
 
 - name: Check slave replication status.
   mysql_replication:
@@ -18,18 +19,20 @@
     login_password: "{{ mysql_replication_user.password }}"
   ignore_errors: true
   register: slave
-  when: >
-    mysql_replication_role == 'slave'
-    and (mysql_replication_master != '')
+  when:
+    - mysql_replication_role == 'slave'
+    - mysql_replication_master != ''
+  tags: ['skip_ansible_galaxy']
 
 - name: Check master replication status.
   mysql_replication: mode=getmaster
   delegate_to: "{{ mysql_replication_master }}"
   register: master
-  when: >
-    ((slave.Is_Slave is defined and not slave.Is_Slave) or (slave.Is_Slave is not defined and slave is failed))
-    and (mysql_replication_role == 'slave')
-    and (mysql_replication_master != '')
+  when:
+    - (slave.Is_Slave is defined and not slave.Is_Slave) or (slave.Is_Slave is not defined and slave is failed)
+    - mysql_replication_role == 'slave'
+    - mysql_replication_master != ''
+  tags: ['skip_ansible_galaxy']
 
 - name: Configure replication on the slave.
   mysql_replication:
@@ -40,15 +43,16 @@
     master_log_file: "{{ master.File }}"
     master_log_pos: "{{ master.Position }}"
   ignore_errors: true
-  when: >
-    ((slave.Is_Slave is defined and not slave.Is_Slave) or (slave.Is_Slave is not defined and slave is failed))
-    and (mysql_replication_role == 'slave')
-    and (mysql_replication_master != '')
-    and mysql_replication_user
+  when:
+    - (slave.Is_Slave is defined and not slave.Is_Slave) or (slave.Is_Slave is not defined and slave is failed)
+    - mysql_replication_role == 'slave'
+    - mysql_replication_user.name is defined
+    - mysql_replication_master != ''
 
 - name: Start replication.
   mysql_replication: mode=startslave
-  when: >
-    ((slave.Is_Slave is defined and not slave.Is_Slave) or (slave.Is_Slave is not defined and slave is failed))
-    and (mysql_replication_role == 'slave')
-    and (mysql_replication_master != '')
+  when:
+    - (slave.Is_Slave is defined and not slave.Is_Slave) or (slave.Is_Slave is not defined and slave is failed)
+    - mysql_replication_role == 'slave'
+    - mysql_replication_master != ''
+  tags: ['skip_ansible_galaxy']
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/secure-installation.yml b/provisioning/roles/geerlingguy.mysql/tasks/secure-installation.yml
index 66ee4d9de..3e7251206 100644
--- a/provisioning/roles/geerlingguy.mysql/tasks/secure-installation.yml
+++ b/provisioning/roles/geerlingguy.mysql/tasks/secure-installation.yml
@@ -26,7 +26,11 @@
   changed_when: false
 
 - name: Get list of hosts for the root user.
-  command: mysql -NBe "SELECT Host FROM mysql.user WHERE User = '{{ mysql_root_username }}' ORDER BY (Host='localhost') ASC"
+  command: mysql -NBe
+    "SELECT Host
+    FROM mysql.user
+    WHERE User = '{{ mysql_root_username }}'
+    ORDER BY (Host='localhost') ASC"
   register: mysql_root_hosts
   changed_when: false
   check_mode: false
@@ -38,7 +42,8 @@
 - name: Update MySQL root password for localhost root account (5.7.x).
   shell: >
     mysql -u root -NBe
-    'ALTER USER "{{ mysql_root_username }}"@"{{ item }}" IDENTIFIED WITH mysql_native_password BY "{{ mysql_root_password }}";'
+    'ALTER USER "{{ mysql_root_username }}"@"{{ item }}"
+    IDENTIFIED WITH mysql_native_password BY "{{ mysql_root_password }}";'
   with_items: "{{ mysql_root_hosts.stdout_lines|default([]) }}"
   when: >
     ((mysql_install_packages | bool) or mysql_root_password_update)
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/setup-Archlinux.yml b/provisioning/roles/geerlingguy.mysql/tasks/setup-Archlinux.yml
index 469a570a3..e785290c5 100644
--- a/provisioning/roles/geerlingguy.mysql/tasks/setup-Archlinux.yml
+++ b/provisioning/roles/geerlingguy.mysql/tasks/setup-Archlinux.yml
@@ -3,10 +3,10 @@
   pacman: "name=mysql-python state=present"
 
 - name: Ensure MySQL packages are installed.
-  pacman: "name={{ item }} state=present"
-  with_items: "{{ mysql_packages }}"
+  pacman: "name={{ mysql_packages }} state=present"
   register: arch_mysql_install_packages
 
 - name: Run mysql_install_db if MySQL packages were changed.
   command: mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
   when: arch_mysql_install_packages.changed
+  tags: ['skip_ansible_lint']
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.mysql/tasks/setup-Debian.yml
index a99b44b67..325f25c52 100644
--- a/provisioning/roles/geerlingguy.mysql/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.mysql/tasks/setup-Debian.yml
@@ -5,28 +5,32 @@
 
 - name: Update apt cache if MySQL is not yet installed.
   apt: update_cache=yes
-  when: mysql_installed.stat.exists == false
+  when: not mysql_installed.stat.exists
 
 - name: Determine required MySQL Python libraries.
   set_fact:
     deb_mysql_python_package: "{% if 'python3' in ansible_python_interpreter|default('') %}python3-mysqldb{% else %}python-mysqldb{% endif %}"
 
 - name: Ensure MySQL Python libraries are installed.
-  apt: "name={{ deb_mysql_python_package }} state=present"
+  apt:
+    name: "{{ deb_mysql_python_package }}"
+    state: present
 
 - name: Ensure MySQL packages are installed.
-  apt: "name={{ mysql_packages }} state=present"
+  apt:
+    name: "{{ mysql_packages }}"
+    state: present
   register: deb_mysql_install_packages
 
 # Because Ubuntu starts MySQL as part of the install process, we need to stop
 # mysql and remove the logfiles in case the user set a custom log file size.
 - name: Ensure MySQL is stopped after initial install.
   service: "name={{ mysql_daemon }} state=stopped"
-  when: mysql_installed.stat.exists == false
+  when: not mysql_installed.stat.exists
 
 - name: Delete innodb log files created by apt package after initial install.
-  file: path={{ mysql_datadir }}/{{item}} state=absent
+  file: path={{ mysql_datadir }}/{{ item }} state=absent
   with_items:
-    - "ib_logfile0"
-    - "ib_logfile1"
-  when: mysql_installed.stat.exists == false
+    - ib_logfile0
+    - ib_logfile1
+  when: not mysql_installed.stat.exists
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/variables.yml b/provisioning/roles/geerlingguy.mysql/tasks/variables.yml
index 4f0d29855..6e3810673 100644
--- a/provisioning/roles/geerlingguy.mysql/tasks/variables.yml
+++ b/provisioning/roles/geerlingguy.mysql/tasks/variables.yml
@@ -4,13 +4,9 @@
   include_vars: "{{ item }}"
   with_first_found:
     - files:
+        - "vars/{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml"
         - "vars/{{ ansible_os_family }}.yml"
       skip: true
-  when: ansible_os_family != "RedHat"
-
-- name: Include OS-specific variables (RedHat).
-  include_vars: "{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml"
-  when: ansible_os_family == "RedHat"
 
 - name: Define mysql_packages.
   set_fact:
diff --git a/provisioning/roles/geerlingguy.mysql/vars/Debian-10.yml b/provisioning/roles/geerlingguy.mysql/vars/Debian-10.yml
new file mode 100644
index 000000000..a36993cd0
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/vars/Debian-10.yml
@@ -0,0 +1,13 @@
+---
+__mysql_daemon: mariadb
+__mysql_packages:
+  - default-mysql-server
+mysql_log_file_group: adm
+__mysql_slow_query_log_file: /var/log/mysql/mysql-slow.log
+__mysql_log_error: /var/log/mysql/mysql.log
+__mysql_syslog_tag: mariadb
+__mysql_pid_file: /var/run/mysql/mysql.pid
+__mysql_config_file: /etc/my.cnf
+__mysql_config_include_dir: /etc/my.cnf.d
+__mysql_socket: /var/lib/mysql/mysql.sock
+__mysql_supports_innodb_large_prefix: true

From 77ecde4bb92b4f84205961f92e05755210e77fe2 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 26 Aug 2019 14:35:37 -0500
Subject: [PATCH 1101/1273] Upgrade geerlingguy.solr and geerlingguy.java roles
 to latest versions.

---
 provisioning/requirements.yml                 |  4 +-
 .../roles/geerlingguy.java/.travis.yml        |  4 +-
 .../roles/geerlingguy.java/meta/main.yml      |  2 +
 .../molecule/default/tests/test_default.py    | 14 ----
 .../roles/geerlingguy.java/vars/Debian-10.yml |  6 ++
 .../roles/geerlingguy.solr/.gitignore         |  3 +-
 .../roles/geerlingguy.solr/.travis.yml        | 78 +++++++++----------
 provisioning/roles/geerlingguy.solr/README.md |  4 +-
 .../roles/geerlingguy.solr/defaults/main.yml  |  2 +-
 .../roles/geerlingguy.solr/meta/container.yml |  9 ---
 .../roles/geerlingguy.solr/meta/main.yml      |  9 ++-
 .../molecule/default/molecule.yml             | 29 +++++++
 .../molecule/default/playbook-solr-3.yml      | 16 ++++
 .../molecule/default/playbook-solr-4.yml      | 17 ++++
 .../default/playbook-solr-5.yml}              | 12 +--
 .../molecule/default/playbook-solr-6.yml      | 43 ++++++++++
 .../molecule/default/playbook-solr-7.yml      | 43 ++++++++++
 .../molecule/default/playbook.yml             | 40 ++++++++++
 .../default}/requirements.yml                 |  0
 .../molecule/default/yaml-lint.yml            |  6 ++
 .../geerlingguy.solr/tasks/configure.yml      |  2 +-
 .../roles/geerlingguy.solr/tasks/cores.yml    | 14 ++--
 .../geerlingguy.solr/tasks/install-pre5.yml   |  4 +-
 .../roles/geerlingguy.solr/tasks/install.yml  | 33 ++++----
 .../roles/geerlingguy.solr/tasks/main.yml     |  7 +-
 .../roles/geerlingguy.solr/tests/README.md    | 11 ---
 .../geerlingguy.solr/tests/test-solr-3.yml    | 22 ------
 .../geerlingguy.solr/tests/test-solr-4.yml    | 23 ------
 .../geerlingguy.solr/tests/test-solr-6.yml    | 47 -----------
 .../geerlingguy.solr/tests/test-solr-7.yml    | 47 -----------
 30 files changed, 294 insertions(+), 257 deletions(-)
 delete mode 100644 provisioning/roles/geerlingguy.java/molecule/default/tests/test_default.py
 create mode 100644 provisioning/roles/geerlingguy.java/vars/Debian-10.yml
 delete mode 100644 provisioning/roles/geerlingguy.solr/meta/container.yml
 create mode 100644 provisioning/roles/geerlingguy.solr/molecule/default/molecule.yml
 create mode 100644 provisioning/roles/geerlingguy.solr/molecule/default/playbook-solr-3.yml
 create mode 100644 provisioning/roles/geerlingguy.solr/molecule/default/playbook-solr-4.yml
 rename provisioning/roles/geerlingguy.solr/{tests/test-solr-5.yml => molecule/default/playbook-solr-5.yml} (50%)
 create mode 100644 provisioning/roles/geerlingguy.solr/molecule/default/playbook-solr-6.yml
 create mode 100644 provisioning/roles/geerlingguy.solr/molecule/default/playbook-solr-7.yml
 create mode 100644 provisioning/roles/geerlingguy.solr/molecule/default/playbook.yml
 rename provisioning/roles/geerlingguy.solr/{tests => molecule/default}/requirements.yml (100%)
 create mode 100644 provisioning/roles/geerlingguy.solr/molecule/default/yaml-lint.yml
 delete mode 100644 provisioning/roles/geerlingguy.solr/tests/README.md
 delete mode 100644 provisioning/roles/geerlingguy.solr/tests/test-solr-3.yml
 delete mode 100644 provisioning/roles/geerlingguy.solr/tests/test-solr-4.yml
 delete mode 100644 provisioning/roles/geerlingguy.solr/tests/test-solr-6.yml
 delete mode 100644 provisioning/roles/geerlingguy.solr/tests/test-solr-7.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index b00596265..a1f85ca49 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -30,7 +30,7 @@
 - src: geerlingguy.git
   version: 2.0.5
 - src: geerlingguy.java
-  version: 1.9.5
+  version: 1.9.6
 - src: geerlingguy.mailhog
   version: 2.1.4
 - src: geerlingguy.memcached
@@ -76,6 +76,6 @@
 - src: geerlingguy.security
   version: 1.8.1
 - src: geerlingguy.solr
-  version: 4.3.0
+  version: 5.0.0
 - src: geerlingguy.varnish
   version: 3.0.0
diff --git a/provisioning/roles/geerlingguy.java/.travis.yml b/provisioning/roles/geerlingguy.java/.travis.yml
index 4fb19f903..2dda913c7 100644
--- a/provisioning/roles/geerlingguy.java/.travis.yml
+++ b/provisioning/roles/geerlingguy.java/.travis.yml
@@ -8,11 +8,11 @@ env:
   matrix:
     - MOLECULE_DISTRO: centos7
     - MOLECULE_DISTRO: centos6
-    - MOLECULE_DISTRO: fedora27
+    - MOLECULE_DISTRO: fedora30
     - MOLECULE_DISTRO: ubuntu1804
     - MOLECULE_DISTRO: ubuntu1604
+    - MOLECULE_DISTRO: debian10
     - MOLECULE_DISTRO: debian9
-    - MOLECULE_DISTRO: debian8
 
 install:
   # Install test dependencies.
diff --git a/provisioning/roles/geerlingguy.java/meta/main.yml b/provisioning/roles/geerlingguy.java/meta/main.yml
index 57fec5605..b2d2eebfe 100644
--- a/provisioning/roles/geerlingguy.java/meta/main.yml
+++ b/provisioning/roles/geerlingguy.java/meta/main.yml
@@ -2,6 +2,7 @@
 dependencies: []
 
 galaxy_info:
+  role_name: java
   author: geerlingguy
   description: Java for Linux
   company: "Midwestern Mac, LLC"
@@ -20,6 +21,7 @@ galaxy_info:
         - wheezy
         - jessie
         - stretch
+        - buster
     - name: Ubuntu
       versions:
         - precise
diff --git a/provisioning/roles/geerlingguy.java/molecule/default/tests/test_default.py b/provisioning/roles/geerlingguy.java/molecule/default/tests/test_default.py
deleted file mode 100644
index eedd64a1d..000000000
--- a/provisioning/roles/geerlingguy.java/molecule/default/tests/test_default.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import os
-
-import testinfra.utils.ansible_runner
-
-testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
-    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
-
-
-def test_hosts_file(host):
-    f = host.file('/etc/hosts')
-
-    assert f.exists
-    assert f.user == 'root'
-    assert f.group == 'root'
diff --git a/provisioning/roles/geerlingguy.java/vars/Debian-10.yml b/provisioning/roles/geerlingguy.java/vars/Debian-10.yml
new file mode 100644
index 000000000..bd058c224
--- /dev/null
+++ b/provisioning/roles/geerlingguy.java/vars/Debian-10.yml
@@ -0,0 +1,6 @@
+---
+# JDK version options include:
+#   - java
+#   - openjdk-11-jdk
+__java_packages:
+  - openjdk-11-jdk
diff --git a/provisioning/roles/geerlingguy.solr/.gitignore b/provisioning/roles/geerlingguy.solr/.gitignore
index c9b2377e3..f56f5b578 100644
--- a/provisioning/roles/geerlingguy.solr/.gitignore
+++ b/provisioning/roles/geerlingguy.solr/.gitignore
@@ -1,2 +1,3 @@
 *.retry
-tests/test.sh
+*/__pycache__
+*.pyc
diff --git a/provisioning/roles/geerlingguy.solr/.travis.yml b/provisioning/roles/geerlingguy.solr/.travis.yml
index 2ffe25e7e..faa3dd6d0 100644
--- a/provisioning/roles/geerlingguy.solr/.travis.yml
+++ b/provisioning/roles/geerlingguy.solr/.travis.yml
@@ -1,50 +1,50 @@
 ---
+language: python
 services: docker
 
 env:
-  # Test current version of Solr on latest supported OSes.
-  - distro: centos7
-    playbook: test-solr-7.yml
-  - distro: ubuntu1604
-    playbook: test-solr-7.yml
-  - distro: debian8
-    playbook: test-solr-7.yml
-  - distro: debian9
-    playbook: test-solr-7.yml
-
-  # Test older versions of Solr / OSes.
-  - distro: centos7
-    playbook: test-solr-6.yml
-  - distro: debian9
-    playbook: test-solr-6.yml
-  - distro: ubuntu1604
-    playbook: test-solr-4.yml
-  - distro: ubuntu1604
-    playbook: test-solr-3.yml
-  - distro: ubuntu1404
-    playbook: test-solr-5.yml
-  - distro: ubuntu1404
-    playbook: test-solr-4.yml
-  - distro: ubuntu1404
-    playbook: test-solr-3.yml
+  global:
+    - ROLE_NAME: solr
+  matrix:
+    - MOLECULE_DISTRO: centos7
+    - MOLECULE_DISTRO: ubuntu1804
+    - MOLECULE_DISTRO: debian10
 
-script:
-  # Configure test script so we can run extra tests after playbook is run.
-  - export container_id=$(date +%s)
-  - export cleanup=false
+    # Solr 7.
+    - MOLECULE_DISTRO: centos7
+      MOLECULE_PLAYBOOK: playbook-solr-7.yml
+    - MOLECULE_DISTRO: debian10
+      MOLECULE_PLAYBOOK: playbook-solr-7.yml
 
-  # Download test shim.
-  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
-  - chmod +x ${PWD}/tests/test.sh
+    # Solr 6.
+    - MOLECULE_DISTRO: ubuntu1604
+      MOLECULE_PLAYBOOK: playbook-solr-6.yml
 
-  # Run tests.
-  - ${PWD}/tests/test.sh
+    # Solr 5.
+    - MOLECULE_DISTRO: ubuntu1604
+      MOLECULE_PLAYBOOK: playbook-solr-5.yml
+
+    # Solr 4.
+    - MOLECULE_DISTRO: ubuntu1604
+      MOLECULE_PLAYBOOK: playbook-solr-4.yml
+
+    # Solr 3.
+    - MOLECULE_DISTRO: ubuntu1604
+      MOLECULE_PLAYBOOK: playbook-solr-3.yml
 
-  # Make sure Solr is running.
-  - >
-    sudo docker exec ${container_id} ps -ax | grep -q 'solr'
-    && (echo 'solr is running: pass' && exit 0)
-    || (echo 'solr is running: fail' && exit 1)
+install:
+  # Install test dependencies.
+  - pip install molecule docker
+
+before_script:
+  # Use actual Ansible Galaxy role name for the project directory.
+  - cd ../
+  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
+  - cd geerlingguy.$ROLE_NAME
+
+script:
+  # Run tests.
+  - molecule test
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.solr/README.md b/provisioning/roles/geerlingguy.solr/README.md
index c2a841ca4..f7337cbe5 100644
--- a/provisioning/roles/geerlingguy.solr/README.md
+++ b/provisioning/roles/geerlingguy.solr/README.md
@@ -8,7 +8,7 @@ Installs [Apache Solr](http://lucene.apache.org/solr/) on Linux servers.
 
 Java must be available on the server. You can easily install Java using the `geerlingguy.java` role. Make sure the Java version installed meets the minimum requirements of Solr (e.g. Java 8 for Solr 6+).
 
-This role is currently tested and working with Solr 3.x, 4.x, 5.x, 6.x and 7.x.
+This role is currently tested and working with Solr 3.x, 4.x, 5.x, 6.x, 7.x, and 8.x.
 
 ## Role Variables
 
@@ -23,7 +23,7 @@ Files will be downloaded to this path on the remote server before being moved in
 
 Solr will be run under the `solr_user`. Set `solr_create_user` to `false` if `solr_user` is created before this role runs, or if you're using Solr 5+ and want Solr's own installation script to set up the user.
 
-    solr_version: "6.2.0"
+    solr_version: "8.2.0"
 
 The Apache Solr version to install. For a full list, see [available Apache Solr versions](http://archive.apache.org/dist/lucene/solr/).
 
diff --git a/provisioning/roles/geerlingguy.solr/defaults/main.yml b/provisioning/roles/geerlingguy.solr/defaults/main.yml
index 2af6e0cc6..b1d408e34 100644
--- a/provisioning/roles/geerlingguy.solr/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.solr/defaults/main.yml
@@ -4,7 +4,7 @@ solr_workspace: /root
 solr_create_user: true
 solr_user: solr
 
-solr_version: "7.4.0"
+solr_version: "8.2.0"
 solr_mirror: "https://archive.apache.org/dist"
 solr_remove_cruft: false
 
diff --git a/provisioning/roles/geerlingguy.solr/meta/container.yml b/provisioning/roles/geerlingguy.solr/meta/container.yml
deleted file mode 100644
index 63c2979fd..000000000
--- a/provisioning/roles/geerlingguy.solr/meta/container.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-# See: https://github.com/geerlingguy/solr-container
-solr:
-  from: "debian:9"
-  ports:
-    - "8983:8983"
-  command: ["/opt/solr/bin/solr", "start", "-f", "-force"]
-  roles:
-    - geerlingguy.java
-    - geerlingguy.solr
diff --git a/provisioning/roles/geerlingguy.solr/meta/main.yml b/provisioning/roles/geerlingguy.solr/meta/main.yml
index 402f07b57..b66209d8f 100644
--- a/provisioning/roles/geerlingguy.solr/meta/main.yml
+++ b/provisioning/roles/geerlingguy.solr/meta/main.yml
@@ -10,14 +10,15 @@ galaxy_info:
   platforms:
     - name: EL
       versions:
-      - 6
-      - 7
+        - 6
+        - 7
+        - 8
     - name: Debian
       versions:
-      - all
+        - all
     - name: Ubuntu
       versions:
-      - all
+        - all
   galaxy_tags:
     - development
     - solr
diff --git a/provisioning/roles/geerlingguy.solr/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.solr/molecule/default/molecule.yml
new file mode 100644
index 000000000..2ca6feaf9
--- /dev/null
+++ b/provisioning/roles/geerlingguy.solr/molecule/default/molecule.yml
@@ -0,0 +1,29 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint:
+  name: yamllint
+  options:
+    config-file: molecule/default/yaml-lint.yml
+platforms:
+  - name: instance
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    privileged: true
+    pre_build_image: true
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+  playbooks:
+    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
+scenario:
+  name: default
+verifier:
+  name: testinfra
+  lint:
+    name: flake8
diff --git a/provisioning/roles/geerlingguy.solr/molecule/default/playbook-solr-3.yml b/provisioning/roles/geerlingguy.solr/molecule/default/playbook-solr-3.yml
new file mode 100644
index 000000000..07fd927b2
--- /dev/null
+++ b/provisioning/roles/geerlingguy.solr/molecule/default/playbook-solr-3.yml
@@ -0,0 +1,16 @@
+---
+- name: Converge
+  hosts: all
+  become: true
+
+  vars:
+    solr_version: "3.6.2"
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=true cache_valid_time=600
+      when: ansible_os_family == "Debian"
+
+  roles:
+    - role: geerlingguy.java
+    - role: geerlingguy.solr
diff --git a/provisioning/roles/geerlingguy.solr/molecule/default/playbook-solr-4.yml b/provisioning/roles/geerlingguy.solr/molecule/default/playbook-solr-4.yml
new file mode 100644
index 000000000..954242bd2
--- /dev/null
+++ b/provisioning/roles/geerlingguy.solr/molecule/default/playbook-solr-4.yml
@@ -0,0 +1,17 @@
+---
+- name: Converge
+  hosts: all
+  become: true
+
+  vars:
+    solr_version: "4.10.4"
+    solr_remove_cruft: true
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=true cache_valid_time=600
+      when: ansible_os_family == "Debian"
+
+  roles:
+    - role: geerlingguy.java
+    - role: geerlingguy.solr
diff --git a/provisioning/roles/geerlingguy.solr/tests/test-solr-5.yml b/provisioning/roles/geerlingguy.solr/molecule/default/playbook-solr-5.yml
similarity index 50%
rename from provisioning/roles/geerlingguy.solr/tests/test-solr-5.yml
rename to provisioning/roles/geerlingguy.solr/molecule/default/playbook-solr-5.yml
index 8f5ee0622..96d753a0e 100644
--- a/provisioning/roles/geerlingguy.solr/tests/test-solr-5.yml
+++ b/provisioning/roles/geerlingguy.solr/molecule/default/playbook-solr-5.yml
@@ -1,17 +1,19 @@
 ---
-- hosts: all
+- name: Converge
+  hosts: all
+  become: true
 
   vars:
     solr_version: "5.5.5"
     solr_remove_cruft: true
     java_packages:
-      - openjdk-7-jdk
+      - openjdk-8-jdk
 
   pre_tasks:
     - name: Update apt cache.
-      apt: update_cache=yes cache_valid_time=600
+      apt: update_cache=true cache_valid_time=600
       when: ansible_os_family == "Debian"
 
   roles:
-    - geerlingguy.java
-    - role_under_test
+    - role: geerlingguy.java
+    - role: geerlingguy.solr
diff --git a/provisioning/roles/geerlingguy.solr/molecule/default/playbook-solr-6.yml b/provisioning/roles/geerlingguy.solr/molecule/default/playbook-solr-6.yml
new file mode 100644
index 000000000..435b4710a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.solr/molecule/default/playbook-solr-6.yml
@@ -0,0 +1,43 @@
+---
+- name: Converge
+  hosts: all
+  become: true
+
+  vars:
+    solr_version: "6.6.6"
+
+  pre_tasks:
+    - name: Set Java 8 package for RedHat.
+      set_fact:
+        java_packages:
+          - java-1.8.0-openjdk
+      when: ansible_os_family == "RedHat"
+
+    - name: Set Java 8 package for Ubuntu.
+      set_fact:
+        java_packages:
+          - openjdk-8-jdk
+      when: ansible_distribution == "Ubuntu"
+
+    - name: Set Java 11 package for Debian.
+      set_fact:
+        java_packages:
+          - openjdk-11-jdk
+      when: ansible_distribution == "Debian"
+
+    - name: Update apt cache.
+      apt: update_cache=true cache_valid_time=600
+      when: ansible_os_family == "Debian"
+
+    # See: http://unix.stackexchange.com/a/342469
+    - name: Install dependencies (Debian).
+      apt:
+        name:
+          - openjdk-11-jre-headless
+          - ca-certificates-java
+        state: present
+      when: ansible_distribution == "Debian"
+
+  roles:
+    - role: geerlingguy.java
+    - role: geerlingguy.solr
diff --git a/provisioning/roles/geerlingguy.solr/molecule/default/playbook-solr-7.yml b/provisioning/roles/geerlingguy.solr/molecule/default/playbook-solr-7.yml
new file mode 100644
index 000000000..835d0bbda
--- /dev/null
+++ b/provisioning/roles/geerlingguy.solr/molecule/default/playbook-solr-7.yml
@@ -0,0 +1,43 @@
+---
+- name: Converge
+  hosts: all
+  become: true
+
+  vars:
+    solr_version: "7.7.2"
+
+  pre_tasks:
+    - name: Set Java 8 package for RedHat.
+      set_fact:
+        java_packages:
+          - java-1.8.0-openjdk
+      when: ansible_os_family == "RedHat"
+
+    - name: Set Java 8 package for Ubuntu.
+      set_fact:
+        java_packages:
+          - openjdk-8-jdk
+      when: ansible_distribution == "Ubuntu"
+
+    - name: Set Java 11 package for Debian.
+      set_fact:
+        java_packages:
+          - openjdk-11-jdk
+      when: ansible_distribution == "Debian"
+
+    - name: Update apt cache.
+      apt: update_cache=true cache_valid_time=600
+      when: ansible_os_family == "Debian"
+
+    # See: http://unix.stackexchange.com/a/342469
+    - name: Install dependencies (Debian).
+      apt:
+        name:
+          - openjdk-11-jre-headless
+          - ca-certificates-java
+        state: present
+      when: ansible_distribution == "Debian"
+
+  roles:
+    - role: geerlingguy.java
+    - role: geerlingguy.solr
diff --git a/provisioning/roles/geerlingguy.solr/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.solr/molecule/default/playbook.yml
new file mode 100644
index 000000000..33a4f13f1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.solr/molecule/default/playbook.yml
@@ -0,0 +1,40 @@
+---
+- name: Converge
+  hosts: all
+  become: true
+
+  pre_tasks:
+    - name: Set Java 8 package for RedHat.
+      set_fact:
+        java_packages:
+          - java-1.8.0-openjdk
+      when: ansible_os_family == "RedHat"
+
+    - name: Set Java 8 package for Ubuntu.
+      set_fact:
+        java_packages:
+          - openjdk-8-jdk
+      when: ansible_os_family == "Ubuntu"
+
+    - name: Set Java 11 package for Debian.
+      set_fact:
+        java_packages:
+          - openjdk-11-jdk
+      when: ansible_os_family == "Debian"
+
+    - name: Update apt cache.
+      apt: update_cache=true cache_valid_time=600
+      when: ansible_os_family == "Debian"
+
+    # See: http://unix.stackexchange.com/a/342469
+    - name: Install dependencies (Debian).
+      apt:
+        name:
+          - openjdk-11-jre-headless
+          - ca-certificates-java
+        state: present
+      when: ansible_distribution == "Debian"
+
+  roles:
+    - role: geerlingguy.java
+    - role: geerlingguy.solr
diff --git a/provisioning/roles/geerlingguy.solr/tests/requirements.yml b/provisioning/roles/geerlingguy.solr/molecule/default/requirements.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.solr/tests/requirements.yml
rename to provisioning/roles/geerlingguy.solr/molecule/default/requirements.yml
diff --git a/provisioning/roles/geerlingguy.solr/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.solr/molecule/default/yaml-lint.yml
new file mode 100644
index 000000000..a3dbc38ee
--- /dev/null
+++ b/provisioning/roles/geerlingguy.solr/molecule/default/yaml-lint.yml
@@ -0,0 +1,6 @@
+---
+extends: default
+rules:
+  line-length:
+    max: 120
+    level: warning
diff --git a/provisioning/roles/geerlingguy.solr/tasks/configure.yml b/provisioning/roles/geerlingguy.solr/tasks/configure.yml
index 26b5f7a77..6123e2dd7 100644
--- a/provisioning/roles/geerlingguy.solr/tasks/configure.yml
+++ b/provisioning/roles/geerlingguy.solr/tasks/configure.yml
@@ -19,4 +19,4 @@
       line: 'SOLR_PORT="{{ solr_port }}"'
     - regexp: "^.?SOLR_TIMEZONE="
       line: 'SOLR_TIMEZONE="{{ solr_timezone }}"'
-  notify: restart solr
\ No newline at end of file
+  notify: restart solr
diff --git a/provisioning/roles/geerlingguy.solr/tasks/cores.yml b/provisioning/roles/geerlingguy.solr/tasks/cores.yml
index c460a6639..cd9481c9c 100644
--- a/provisioning/roles/geerlingguy.solr/tasks/cores.yml
+++ b/provisioning/roles/geerlingguy.solr/tasks/cores.yml
@@ -2,9 +2,9 @@
 - name: Check current list of Solr cores.
   uri:
     url: http://{{ solr_connect_host }}:{{ solr_port }}/solr/admin/cores
-    return_content: yes
+    return_content: true
   register: solr_cores_current
-  check_mode: no
+  check_mode: false
 
 - name: Ensure Solr conf directories exist.
   file:
@@ -12,20 +12,20 @@
     state: directory
     owner: "{{ solr_user }}"
     group: "{{ solr_user }}"
-    recurse: yes
+    recurse: true
   when: "item not in solr_cores_current.content"
   with_items: "{{ solr_cores }}"
 
 - name: Ensure core configuration directories exist.
-  shell: "cp -r {{ solr_install_path }}/example/files/conf/ {{ solr_home }}/data/{{ item }}/"
+  command: "cp -r {{ solr_install_path }}/example/files/conf/ {{ solr_home }}/data/{{ item }}/"
   when: "item not in solr_cores_current.content"
   with_items: "{{ solr_cores }}"
-  become: yes
+  become: true
   become_user: "{{ solr_user }}"
 
 - name: Create configured cores.
-  shell: "{{ solr_install_path }}/bin/solr create -c {{ item }} -p {{ solr_port }}"
+  command: "{{ solr_install_path }}/bin/solr create -c {{ item }} -p {{ solr_port }}"
   when: "item not in solr_cores_current.content"
   with_items: "{{ solr_cores }}"
-  become: yes
+  become: true
   become_user: "{{ solr_user }}"
diff --git a/provisioning/roles/geerlingguy.solr/tasks/install-pre5.yml b/provisioning/roles/geerlingguy.solr/tasks/install-pre5.yml
index e08dc7ff7..7ae567505 100644
--- a/provisioning/roles/geerlingguy.solr/tasks/install-pre5.yml
+++ b/provisioning/roles/geerlingguy.solr/tasks/install-pre5.yml
@@ -13,7 +13,7 @@
     path: "{{ solr_install_path }}"
     owner: "{{ solr_user }}"
     group: "{{ solr_user }}"
-    recurse: yes
+    recurse: true
   when: not solr_war_file.stat.exists
 
 # Set up solr_home.
@@ -46,7 +46,7 @@
     path: "{{ solr_home }}"
     owner: "{{ solr_user }}"
     group: "{{ solr_user }}"
-    recurse: yes
+    recurse: true
   when: not solr_example.stat.exists
 
 # Set up Solr init script.
diff --git a/provisioning/roles/geerlingguy.solr/tasks/install.yml b/provisioning/roles/geerlingguy.solr/tasks/install.yml
index 1efd5a4c2..388cb7be6 100644
--- a/provisioning/roles/geerlingguy.solr/tasks/install.yml
+++ b/provisioning/roles/geerlingguy.solr/tasks/install.yml
@@ -1,13 +1,14 @@
 ---
 - name: Ensure dependencies are installed.
-  package: name={{ item }} state=present
-  with_items:
-    - lsof
-    - acl
-    - sudo
+  package:
+    name:
+      - lsof
+      - acl
+      - sudo
+    state: present
 
 - name: Run Solr installation script.
-  shell: >
+  command: >
     {{ solr_workspace }}/{{ solr_filename }}/bin/install_solr_service.sh
     {{ solr_workspace }}/{{ solr_filename }}.tgz
     -i {{ solr_install_dir }}
@@ -21,17 +22,19 @@
 # Workaround for bug https://github.com/ansible/ansible-modules-core/issues/915.
 - name: Ensure solr is stopped (RHEL 7 workaround).
   command: service {{ solr_service_name }} stop
-  when: >
-    (ansible_os_family == 'RedHat')
-    and (ansible_distribution_version.split(".")[0] == '7')
-    and (solr_install_script_result.changed)
+  when:
+    - ansible_os_family == 'RedHat'
+    - ansible_distribution_version.split(".")[0] == '7'
+    - solr_install_script_result.changed
   failed_when: false
+  tags: ['skip_ansible_lint']
 
 - name: Run systemd daemon_reload (RHEL 7 workaround).
   systemd:
     name: solr
-    daemon_reload: yes
-  when: >
-    (ansible_os_family == 'RedHat')
-    and (ansible_distribution_version.split(".")[0] == '7')
-    and (solr_install_script_result.changed)
+    daemon_reload: true
+  when:
+    - ansible_os_family == 'RedHat'
+    - ansible_distribution_version.split(".")[0] == '7'
+    - solr_install_script_result.changed
+  tags: ['skip_ansible_lint']
diff --git a/provisioning/roles/geerlingguy.solr/tasks/main.yml b/provisioning/roles/geerlingguy.solr/tasks/main.yml
index 3c4ec6f11..bff4894f0 100644
--- a/provisioning/roles/geerlingguy.solr/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.solr/tasks/main.yml
@@ -21,7 +21,7 @@
   get_url:
     url: "{{ solr_mirror }}/lucene/solr/{{ solr_version }}/{{ solr_filename }}.tgz"
     dest: "{{ solr_workspace }}/{{ solr_filename }}.tgz"
-    force: no
+    force: false
   when: solr_install_path_status.stat.isdir is not defined
   register: solr_download_status
 
@@ -29,8 +29,9 @@
   unarchive:
     src: "{{ solr_workspace }}/{{ solr_filename }}.tgz"
     dest: "{{ solr_workspace }}"
-    copy: no
+    copy: false
   when: solr_download_status.changed
+  tags: ['skip_ansible_lint']
 
 # Install Solr < 5.
 - include_tasks: install-pre5.yml
@@ -44,7 +45,7 @@
   service:
     name: "{{ solr_service_name }}"
     state: "{{ solr_service_state }}"
-    enabled: yes
+    enabled: true
   when: solr_service_manage
 
 # Configure solr.
diff --git a/provisioning/roles/geerlingguy.solr/tests/README.md b/provisioning/roles/geerlingguy.solr/tests/README.md
deleted file mode 100644
index 6fb211721..000000000
--- a/provisioning/roles/geerlingguy.solr/tests/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Ansible Role tests
-
-To run the test playbook(s) in this directory:
-
-  1. Install and start Docker.
-  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
-    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
-  1. Make the test shim executable: `chmod +x tests/test.sh`.
-  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
-
-If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.solr/tests/test-solr-3.yml b/provisioning/roles/geerlingguy.solr/tests/test-solr-3.yml
deleted file mode 100644
index 06e963adc..000000000
--- a/provisioning/roles/geerlingguy.solr/tests/test-solr-3.yml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-- hosts: all
-
-  vars:
-    solr_version: "3.6.2"
-
-  pre_tasks:
-    - name: Update apt cache.
-      apt: update_cache=yes cache_valid_time=600
-      when: ansible_os_family == "Debian"
-
-    - name: Set Java 8 package for Debian > 8.
-      set_fact:
-        java_packages:
-          - openjdk-8-jdk
-      when:
-        - ansible_distribution == "Debian"
-        - ansible_distribution_version|int > 8
-
-  roles:
-    - geerlingguy.java
-    - role_under_test
diff --git a/provisioning/roles/geerlingguy.solr/tests/test-solr-4.yml b/provisioning/roles/geerlingguy.solr/tests/test-solr-4.yml
deleted file mode 100644
index b33609d35..000000000
--- a/provisioning/roles/geerlingguy.solr/tests/test-solr-4.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-- hosts: all
-
-  vars:
-    solr_version: "4.10.4"
-    solr_remove_cruft: true
-
-  pre_tasks:
-    - name: Update apt cache.
-      apt: update_cache=yes cache_valid_time=600
-      when: ansible_os_family == "Debian"
-
-    - name: Set Java 8 package for Debian > 8.
-      set_fact:
-        java_packages:
-          - openjdk-8-jdk
-      when:
-        - ansible_distribution == "Debian"
-        - ansible_distribution_version|int > 8
-
-  roles:
-    - geerlingguy.java
-    - role_under_test
diff --git a/provisioning/roles/geerlingguy.solr/tests/test-solr-6.yml b/provisioning/roles/geerlingguy.solr/tests/test-solr-6.yml
deleted file mode 100644
index e45dec076..000000000
--- a/provisioning/roles/geerlingguy.solr/tests/test-solr-6.yml
+++ /dev/null
@@ -1,47 +0,0 @@
----
-- hosts: all
-
-  pre_tasks:
-    - name: Set Java 8 package for RedHat.
-      set_fact:
-        java_packages:
-          - java-1.8.0-openjdk
-      when: ansible_os_family == "RedHat"
-
-    - name: Set Java 8 package for Debian/Ubuntu.
-      set_fact:
-        java_packages:
-          - openjdk-8-jdk
-      when: >
-        ansible_distribution == "Debian" or
-        (ansible_distribution == "Ubuntu" and ansible_distribution_version == "14.04")
-
-    - name: Add repository for OpenJDK 8 (Ubuntu 14.04).
-      apt_repository: repo='ppa:openjdk-r/ppa'
-      when: ansible_distribution == "Ubuntu" and ansible_distribution_version == "14.04"
-
-    - name: Enable Backports repository (Debian).
-      apt_repository:
-        repo: 'deb http://ftp.debian.org/debian {{ ansible_distribution_release }}-backports main'
-        state: present
-        filename: "{{ ansible_distribution_release }}_backports"
-      register: debian_backports
-      when: ansible_distribution == "Debian"
-
-    - name: Update apt cache.
-      apt: update_cache=yes cache_valid_time=600
-      when: ansible_os_family == "Debian"
-
-    # See: http://unix.stackexchange.com/a/342469
-    - name: Install dependencies (Debian).
-      apt:
-        default_release: "{{ ansible_distribution_release }}-backports"
-        name:
-          - openjdk-8-jre-headless
-          - ca-certificates-java
-        state: present
-      when: ansible_distribution == "Debian"
-
-  roles:
-    - geerlingguy.java
-    - role_under_test
diff --git a/provisioning/roles/geerlingguy.solr/tests/test-solr-7.yml b/provisioning/roles/geerlingguy.solr/tests/test-solr-7.yml
deleted file mode 100644
index e45dec076..000000000
--- a/provisioning/roles/geerlingguy.solr/tests/test-solr-7.yml
+++ /dev/null
@@ -1,47 +0,0 @@
----
-- hosts: all
-
-  pre_tasks:
-    - name: Set Java 8 package for RedHat.
-      set_fact:
-        java_packages:
-          - java-1.8.0-openjdk
-      when: ansible_os_family == "RedHat"
-
-    - name: Set Java 8 package for Debian/Ubuntu.
-      set_fact:
-        java_packages:
-          - openjdk-8-jdk
-      when: >
-        ansible_distribution == "Debian" or
-        (ansible_distribution == "Ubuntu" and ansible_distribution_version == "14.04")
-
-    - name: Add repository for OpenJDK 8 (Ubuntu 14.04).
-      apt_repository: repo='ppa:openjdk-r/ppa'
-      when: ansible_distribution == "Ubuntu" and ansible_distribution_version == "14.04"
-
-    - name: Enable Backports repository (Debian).
-      apt_repository:
-        repo: 'deb http://ftp.debian.org/debian {{ ansible_distribution_release }}-backports main'
-        state: present
-        filename: "{{ ansible_distribution_release }}_backports"
-      register: debian_backports
-      when: ansible_distribution == "Debian"
-
-    - name: Update apt cache.
-      apt: update_cache=yes cache_valid_time=600
-      when: ansible_os_family == "Debian"
-
-    # See: http://unix.stackexchange.com/a/342469
-    - name: Install dependencies (Debian).
-      apt:
-        default_release: "{{ ansible_distribution_release }}-backports"
-        name:
-          - openjdk-8-jre-headless
-          - ca-certificates-java
-        state: present
-      when: ansible_distribution == "Debian"
-
-  roles:
-    - geerlingguy.java
-    - role_under_test

From 4c070d67869b9752d9ff8f6e160397cd7c4b68d8 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 26 Aug 2019 15:00:54 -0500
Subject: [PATCH 1102/1273] Upgrade geerlingguy.composer role to latest
 version.

---
 provisioning/requirements.yml                                   | 2 +-
 .../roles/geerlingguy.composer/tasks/global-require.yml         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index a1f85ca49..b81ac43fa 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -14,7 +14,7 @@
 - src: geerlingguy.blackfire
   version: 1.1.2
 - src: geerlingguy.composer
-  version: 1.7.5
+  version: 1.7.6
 - src: geerlingguy.daemonize
   version: 1.2.0
 - src: geerlingguy.drupal
diff --git a/provisioning/roles/geerlingguy.composer/tasks/global-require.yml b/provisioning/roles/geerlingguy.composer/tasks/global-require.yml
index 300fd49b8..d9f3b0def 100644
--- a/provisioning/roles/geerlingguy.composer/tasks/global-require.yml
+++ b/provisioning/roles/geerlingguy.composer/tasks/global-require.yml
@@ -1,7 +1,7 @@
 ---
 - name: Install configured globally-required packages.
   command: >
-    {{ composer_path }} global require {{ item.name }}:{{ item.release | default('@stable') }} --no-progress
+    {{ composer_path }} global require {{ item.name }}:{{ item.release | default('@stable') }} --no-progress --no-interaction
     creates={{ composer_home_path }}/vendor/{{ item.name }}
   environment:
     COMPOSER_HOME: "{{ composer_home_path }}"

From 3b672b90228f2330b15153ec70ce12c95c8b679f Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 26 Aug 2019 16:08:42 -0500
Subject: [PATCH 1103/1273] Update geerlingguy.drupal role to latest version.

---
 provisioning/requirements.yml                         |  2 +-
 provisioning/roles/geerlingguy.drupal/.ansible-lint   |  2 ++
 provisioning/roles/geerlingguy.drupal/README.md       | 11 ++++++++++-
 .../roles/geerlingguy.drupal/defaults/main.yml        |  5 +++++
 .../roles/geerlingguy.drupal/tasks/deploy.yml         |  7 +++++--
 .../roles/geerlingguy.drupal/tasks/install-site.yml   |  2 +-
 provisioning/roles/geerlingguy.drupal/tasks/main.yml  |  4 ++--
 7 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index b81ac43fa..02f37a66d 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -18,7 +18,7 @@
 - src: geerlingguy.daemonize
   version: 1.2.0
 - src: geerlingguy.drupal
-  version: 2.5.4
+  version: 2.6.0
 - src: geerlingguy.drupal-console
   version: 1.1.1
 - src: geerlingguy.drush
diff --git a/provisioning/roles/geerlingguy.drupal/.ansible-lint b/provisioning/roles/geerlingguy.drupal/.ansible-lint
index 1ae5e6ccf..f85cf95f5 100644
--- a/provisioning/roles/geerlingguy.drupal/.ansible-lint
+++ b/provisioning/roles/geerlingguy.drupal/.ansible-lint
@@ -1,2 +1,4 @@
 skip_list:
   - '204'
+  - '602'
+  - '503'
diff --git a/provisioning/roles/geerlingguy.drupal/README.md b/provisioning/roles/geerlingguy.drupal/README.md
index 1b0262f3d..cea837c2b 100644
--- a/provisioning/roles/geerlingguy.drupal/README.md
+++ b/provisioning/roles/geerlingguy.drupal/README.md
@@ -54,10 +54,15 @@ Set this to `true` and `drupal_build_composer*` to `false` if you would like to
     drupal_build_composer: false
     drupal_composer_path: "/path/to/drupal.composer.json"
     drupal_composer_install_dir: "/var/www/drupal"
+    drupal_composer_no_dev: true
     drupal_composer_dependencies:
       - "drupal/devel:^1.2"
 
-Set `drupal_build_makefile` to `false` and this to `true` if you are using a Composer-based site deployment strategy.
+Set `drupal_build_makefile` to `false` and this to `true` if you are using a Composer-based site deployment strategy. The other options should be relatively straightforward.
+
+    drupal_composer_bin_dir: "vendor/bin"
+
+If you set the `bin-dir` in your project's `composer.json` file to a value other than `vendor/bin`, override this variable with the same directory path.
 
 ### Create a new project using `drupal-project` (Composer)
 
@@ -71,6 +76,10 @@ Set this to `true` and `drupal_build_makefile`, `drupal_build_composer` to `fals
 
     drupal_core_path: "{{ drupal_deploy_dir }}/web"
     drupal_core_owner: "{{ ansible_ssh_user | default(ansible_env.SUDO_USER, true) | default(ansible_env.USER, true) | default(ansible_user_id) }}"
+    drupal_core_owner_become: false
+
+The path to Drupal's root, along with the ownership properties. If you are not running Ansible as the user that should have ownership over the core path, specify the desired system user in `drupal_core_owner` and set `drupal_core_owner_become: true`.
+
     drupal_db_user: drupal
     drupal_db_password: drupal
     drupal_db_name: drupal
diff --git a/provisioning/roles/geerlingguy.drupal/defaults/main.yml b/provisioning/roles/geerlingguy.drupal/defaults/main.yml
index 08b907e3f..698610d10 100644
--- a/provisioning/roles/geerlingguy.drupal/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.drupal/defaults/main.yml
@@ -15,11 +15,15 @@ drupal_build_makefile: false
 drush_makefile_path: "/path/to/drupal.make.yml"
 drush_make_options: "--no-gitinfofile"
 
+# You can configure the `bin-dir` in your project's composer.json `config` key.
+drupal_composer_bin_dir: "vendor/bin"
+
 # Set 'drupal_build_makefile' to 'false' and this to 'true' if you are using a
 # Composer-based site deployment strategy.
 drupal_build_composer: false
 drupal_composer_path: "/path/to/drupal.composer.json"
 drupal_composer_install_dir: "{{ drupal_deploy_dir }}"
+drupal_composer_no_dev: true
 drupal_composer_dependencies:
   - "drupal/devel:^1.2"
 
@@ -33,6 +37,7 @@ drupal_composer_project_options: "--prefer-dist --stability dev --no-interaction
 # Required Drupal settings.
 drupal_core_path: "{{ drupal_deploy_dir }}/web"
 drupal_core_owner: "{{ ansible_ssh_user | default(ansible_env.SUDO_USER, true) | default(ansible_env.USER, true) | default(ansible_user_id) }}"
+drupal_core_owner_become: false
 drupal_db_user: drupal
 drupal_db_password: drupal
 drupal_db_name: drupal
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/deploy.yml b/provisioning/roles/geerlingguy.drupal/tasks/deploy.yml
index 4edaf492e..b036acd15 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/deploy.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/deploy.yml
@@ -18,7 +18,8 @@
     accept_hostkey: "{{ drupal_deploy_accept_hostkey }}"
   register: drupal_deploy_repo_updated
   notify: clear opcache
-  become: false
+  become: "{{ drupal_core_owner_become }}"
+  become_user: "{{ drupal_core_owner }}"
 
 - name: Check if a composer.json file is present.
   stat: "path={{ drupal_deploy_dir }}/composer.json"
@@ -28,7 +29,9 @@
   composer:
     command: install
     working_dir: "{{ drupal_deploy_dir }}"
+    no_dev: "{{ drupal_composer_no_dev }}"
   when:
     - drupal_deploy_composer_file.stat.exists
     - drupal_deploy_composer_install
-  become: false
+  become: "{{ drupal_core_owner_become }}"
+  become_user: "{{ drupal_core_owner }}"
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/install-site.yml b/provisioning/roles/geerlingguy.drupal/tasks/install-site.yml
index fbb72d0a7..a7be00777 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/install-site.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/install-site.yml
@@ -23,7 +23,7 @@
     {{ drush_path }} site-install {{ drupal_install_profile | default('standard') }} -y
     --root={{ drupal_core_path }}
     --site-name="{{ drupal_site_name }}"
-    --account-name={{ drupal_account_name }}
+    --account-name="{{ drupal_account_name }}"
     --account-pass={{ drupal_account_pass }}
     --db-url={{ drupal_db_backend }}://{{ drupal_db_user }}:{{ drupal_db_password }}@{{ drupal_db_host }}/{{ drupal_db_name }}
     {{ drupal_site_install_extra_args | join(" ") }}
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/main.yml b/provisioning/roles/geerlingguy.drupal/tasks/main.yml
index fb977e96f..b520649a9 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/main.yml
@@ -42,13 +42,13 @@
 
 # Set Drush variables.
 - name: Check if a project specific Drush binary exists.
-  stat: "path={{ drupal_composer_install_dir }}/vendor/bin/drush"
+  stat: "path={{ drupal_composer_install_dir }}/{{ drupal_composer_bin_dir }}/drush"
   register: drush_vendor_bin
   ignore_errors: true
 
 - name: Use project specific Drush if available.
   set_fact:
-    drush_path: "{{ drupal_composer_install_dir }}/vendor/bin/drush"
+    drush_path: "{{ drupal_composer_install_dir }}/{{ drupal_composer_bin_dir }}/drush"
   when: drush_vendor_bin.stat.exists
 
 # Install site if configured.

From 882959ec17907ce86f0bf7e68d70513fe88d449e Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 29 Aug 2019 14:54:11 -0500
Subject: [PATCH 1104/1273] Fixes #1963, #1903, #1962 (maybe), #1964: Purge
 php-common package when installing different PHP version.

---
 provisioning/requirements.yml                            | 2 +-
 .../geerlingguy.php-versions/tasks/setup-Debian.yml      | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 02f37a66d..e8fb4e634 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -56,7 +56,7 @@
 - src: geerlingguy.php-tideways
   version: 2.2.0
 - src: geerlingguy.php-versions
-  version: 3.1.0
+  version: 3.1.1
 - src: geerlingguy.php-xdebug
   version: 2.5.1
 - src: geerlingguy.php-xhprof
diff --git a/provisioning/roles/geerlingguy.php-versions/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.php-versions/tasks/setup-Debian.yml
index 85b2a590e..c43f64d6b 100644
--- a/provisioning/roles/geerlingguy.php-versions/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.php-versions/tasks/setup-Debian.yml
@@ -49,3 +49,12 @@
     state: absent
     purge: true
     force: true
+  register: php_version_purge
+
+- name: Also purge php-common package if any versions were just purged.
+  apt:
+    name: php-common
+    state: absent
+    purge: true
+    force: true
+  when: php_version_purge.changed | bool

From fa7bb2ae2de583014adf691086bb4f047f1eb7c5 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 29 Aug 2019 15:07:01 -0500
Subject: [PATCH 1105/1273] Issue #1966: Changelog updates for 5.0.1.

---
 CHANGELOG.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62f708577..a83e92b23 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,26 @@
 # Drupal VM Changelog
 
+## 5.0.1 (2019-08-29)
+
+### Breaking Changes
+
+N/A
+
+### New/changed variables in default.config.yml
+
+N/A
+
+### Improvements
+
+  * #1943: Update drupal console remote site example.
+  * Updated roles: php-versions, nginx, composer, postgresql, apache, git, mysql, solr, drupal.
+
+### Bugfixes
+
+  * #1920: Update git sandbox URL for pareview script.
+  * #1953: Fix typo in Linux installation guide.
+  * #1963, #1903, #1962, #1964: Fix PHP version mismatch when switching versions from 7.2 to 7.1.
+
 
 ## 5.0.0 "Flynn Lives" (2019-04-09)
 

From 11310f1b3311b30dd9390fd9a07acf7e8c6e0349 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Burak=20=C3=96zdemir?=
 <kburakozdemir@users.noreply.github.com>
Date: Tue, 10 Sep 2019 14:31:51 +0300
Subject: [PATCH 1106/1273] [docs] Fix typo in installation-linux.md

somwhat --> somewhat
---
 docs/getting-started/installation-linux.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/getting-started/installation-linux.md b/docs/getting-started/installation-linux.md
index 21f11e347..70f115309 100644
--- a/docs/getting-started/installation-linux.md
+++ b/docs/getting-started/installation-linux.md
@@ -1,6 +1,6 @@
 Please read through the [Quick Start Guide in the README](https://github.com/geerlingguy/drupal-vm#quick-start-guide) to get started.
 
-For a quick introduction to setting up Drupal VM, the [macOS video tutorial](installation-macos.md) applies somwhat to Linux as well.
+For a quick introduction to setting up Drupal VM, the [macOS video tutorial](installation-macos.md) applies somewhat to Linux as well.
 
 There are a few caveats when using Drupal VM on Linux, and this page will try to identify the main gotchas or optimization tips for those wishing to use Drupal VM on a Linux host.
 

From b8c3cfd099b0c12c53a764b3ded7997244dfa3b5 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 17 Sep 2019 15:18:38 -0500
Subject: [PATCH 1107/1273] Update geerlingguy.postgresql role to latest
 version.

---
 provisioning/requirements.yml                       |  2 +-
 .../roles/geerlingguy.postgresql/.travis.yml        |  1 +
 .../roles/geerlingguy.postgresql/meta/main.yml      | 12 ++++++++++--
 .../molecule/default/playbook.yml                   | 11 +++++++++++
 .../geerlingguy.postgresql/tasks/configure.yml      |  2 +-
 .../roles/geerlingguy.postgresql/tasks/main.yml     |  2 +-
 .../geerlingguy.postgresql/tasks/setup-RedHat.yml   |  8 ++++++--
 .../geerlingguy.postgresql/tasks/variables.yml      |  8 +++++++-
 .../roles/geerlingguy.postgresql/vars/Debian-NA.yml |  1 -
 .../vars/Debian-buster/sid.yml                      |  1 -
 .../geerlingguy.postgresql/vars/Debian-testing.yml  |  1 -
 .../roles/geerlingguy.postgresql/vars/Fedora-29.yml | 12 ++++++++++++
 .../roles/geerlingguy.postgresql/vars/Fedora-30.yml | 13 +++++++++++++
 .../roles/geerlingguy.postgresql/vars/Ubuntu-14.yml | 10 ----------
 14 files changed, 63 insertions(+), 21 deletions(-)
 delete mode 120000 provisioning/roles/geerlingguy.postgresql/vars/Debian-NA.yml
 delete mode 120000 provisioning/roles/geerlingguy.postgresql/vars/Debian-buster/sid.yml
 delete mode 120000 provisioning/roles/geerlingguy.postgresql/vars/Debian-testing.yml
 create mode 100644 provisioning/roles/geerlingguy.postgresql/vars/Fedora-29.yml
 create mode 100644 provisioning/roles/geerlingguy.postgresql/vars/Fedora-30.yml
 delete mode 100644 provisioning/roles/geerlingguy.postgresql/vars/Ubuntu-14.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index e8fb4e634..cbc8dd29c 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -66,7 +66,7 @@
 - src: geerlingguy.postfix
   version: 2.0.0
 - src: geerlingguy.postgresql
-  version: 1.4.6
+  version: 2.0.0
 - src: geerlingguy.redis
   version: 1.6.0
 - src: geerlingguy.repo-remi
diff --git a/provisioning/roles/geerlingguy.postgresql/.travis.yml b/provisioning/roles/geerlingguy.postgresql/.travis.yml
index 22de53585..7aab231c6 100644
--- a/provisioning/roles/geerlingguy.postgresql/.travis.yml
+++ b/provisioning/roles/geerlingguy.postgresql/.travis.yml
@@ -7,6 +7,7 @@ env:
     - ROLE_NAME: postgresql
   matrix:
     - MOLECULE_DISTRO: centos7
+    - MOLECULE_DISTRO: fedora30
     - MOLECULE_DISTRO: ubuntu1804
     - MOLECULE_DISTRO: ubuntu1604
     - MOLECULE_DISTRO: debian10
diff --git a/provisioning/roles/geerlingguy.postgresql/meta/main.yml b/provisioning/roles/geerlingguy.postgresql/meta/main.yml
index ccdd8577d..2c962a6fe 100644
--- a/provisioning/roles/geerlingguy.postgresql/meta/main.yml
+++ b/provisioning/roles/geerlingguy.postgresql/meta/main.yml
@@ -12,12 +12,20 @@ galaxy_info:
       versions:
         - 6
         - 7
+    - name: Fedora
+      versions:
+        - 29
+        - 30
     - name: Ubuntu
       versions:
-        - all
+        - xenial
+        - bionic
     - name: Debian
       versions:
-        - all
+        - wheezy
+        - jessie
+        - stretch
+        - buster
   galaxy_tags:
     - database
     - postgresql
diff --git a/provisioning/roles/geerlingguy.postgresql/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.postgresql/molecule/default/playbook.yml
index 5f152a6ca..a437c5186 100644
--- a/provisioning/roles/geerlingguy.postgresql/molecule/default/playbook.yml
+++ b/provisioning/roles/geerlingguy.postgresql/molecule/default/playbook.yml
@@ -10,6 +10,17 @@
       - name: jdoe
 
   pre_tasks:
+    # The Fedora 30+ container images have only C.UTF-8 installed
+    - name: Set database locale if using Fedora 30+
+      set_fact:
+        postgresql_databases:
+          - name: example
+            lc_collate: 'C.UTF-8'
+            lc_ctype: 'C.UTF-8'
+      when:
+        - ansible_distribution == 'Fedora'
+        - ansible_distribution_major_version >= '30'
+
     - name: Update apt cache.
       apt: update_cache=true cache_valid_time=600
       when: ansible_os_family == 'Debian'
diff --git a/provisioning/roles/geerlingguy.postgresql/tasks/configure.yml b/provisioning/roles/geerlingguy.postgresql/tasks/configure.yml
index 26a6f68d4..28504a5ef 100644
--- a/provisioning/roles/geerlingguy.postgresql/tasks/configure.yml
+++ b/provisioning/roles/geerlingguy.postgresql/tasks/configure.yml
@@ -16,7 +16,7 @@
     group: "{{ postgresql_group }}"
     mode: 0600
   notify: restart postgresql
-  when: postgresql_hba_entries
+  when: postgresql_hba_entries | length > 0
 
 - name: Ensure PostgreSQL unix socket dirs exist.
   file:
diff --git a/provisioning/roles/geerlingguy.postgresql/tasks/main.yml b/provisioning/roles/geerlingguy.postgresql/tasks/main.yml
index fce7db840..5d4f5fe9c 100644
--- a/provisioning/roles/geerlingguy.postgresql/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.postgresql/tasks/main.yml
@@ -19,5 +19,5 @@
     enabled: "{{ postgresql_service_enabled }}"
 
 # Configure PostgreSQL.
-- import_tasks: databases.yml
 - import_tasks: users.yml
+- import_tasks: databases.yml
diff --git a/provisioning/roles/geerlingguy.postgresql/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.postgresql/tasks/setup-RedHat.yml
index 9cd84ed01..d536bcb01 100644
--- a/provisioning/roles/geerlingguy.postgresql/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.postgresql/tasks/setup-RedHat.yml
@@ -1,12 +1,16 @@
 ---
 - name: Ensure PostgreSQL packages are installed.
-  package:
+  yum:
     name: "{{ postgresql_packages }}"
     state: present
     enablerepo: "{{ postgresql_enablerepo | default(omit, true) }}"
+    # Don't let postgresql-contrib cause the /usr/bin/python symlink
+    # to be installed, which breaks later Ansible runs on Fedora 30,
+    # and affects system behavior in multiple ways.
+    exclude: python-unversioned-command
 
 - name: Ensure PostgreSQL Python libraries are installed.
-  package:
+  yum:
     name: "{{ postgresql_python_library }}"
     state: present
     enablerepo: "{{ postgresql_enablerepo | default(omit, true) }}"
diff --git a/provisioning/roles/geerlingguy.postgresql/tasks/variables.yml b/provisioning/roles/geerlingguy.postgresql/tasks/variables.yml
index df3538b33..7f4515494 100644
--- a/provisioning/roles/geerlingguy.postgresql/tasks/variables.yml
+++ b/provisioning/roles/geerlingguy.postgresql/tasks/variables.yml
@@ -6,7 +6,13 @@
 
 - name: Include OS-specific variables (RedHat).
   include_vars: "{{ ansible_os_family }}-{{ ansible_distribution_version.split('.')[0] }}.yml"
-  when: ansible_os_family == 'RedHat'
+  when:
+  - ansible_os_family == 'RedHat'
+  - ansible_distribution != 'Fedora'
+
+- name: Include OS-specific variables (Fedora).
+  include_vars: "{{ ansible_distribution }}-{{ ansible_distribution_version.split('.')[0] }}.yml"
+  when: ansible_distribution == 'Fedora'
 
 - name: Define postgresql_packages.
   set_fact:
diff --git a/provisioning/roles/geerlingguy.postgresql/vars/Debian-NA.yml b/provisioning/roles/geerlingguy.postgresql/vars/Debian-NA.yml
deleted file mode 120000
index 4b4ba67ef..000000000
--- a/provisioning/roles/geerlingguy.postgresql/vars/Debian-NA.yml
+++ /dev/null
@@ -1 +0,0 @@
-Debian-10.yml
\ No newline at end of file
diff --git a/provisioning/roles/geerlingguy.postgresql/vars/Debian-buster/sid.yml b/provisioning/roles/geerlingguy.postgresql/vars/Debian-buster/sid.yml
deleted file mode 120000
index 896a2b197..000000000
--- a/provisioning/roles/geerlingguy.postgresql/vars/Debian-buster/sid.yml
+++ /dev/null
@@ -1 +0,0 @@
-../Debian-10.yml
\ No newline at end of file
diff --git a/provisioning/roles/geerlingguy.postgresql/vars/Debian-testing.yml b/provisioning/roles/geerlingguy.postgresql/vars/Debian-testing.yml
deleted file mode 120000
index 4b4ba67ef..000000000
--- a/provisioning/roles/geerlingguy.postgresql/vars/Debian-testing.yml
+++ /dev/null
@@ -1 +0,0 @@
-Debian-10.yml
\ No newline at end of file
diff --git a/provisioning/roles/geerlingguy.postgresql/vars/Fedora-29.yml b/provisioning/roles/geerlingguy.postgresql/vars/Fedora-29.yml
new file mode 100644
index 000000000..4e099324b
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/vars/Fedora-29.yml
@@ -0,0 +1,12 @@
+---
+__postgresql_version: "10.5"
+__postgresql_data_dir: "/var/lib/pgsql/data"
+__postgresql_bin_path: "/usr/bin"
+__postgresql_config_path: "/var/lib/pgsql/data"
+__postgresql_daemon: postgresql
+__postgresql_packages:
+  - postgresql
+  - postgresql-server
+  - postgresql-contrib
+  - postgresql-libs
+postgresql_python_library: python2-psycopg2
diff --git a/provisioning/roles/geerlingguy.postgresql/vars/Fedora-30.yml b/provisioning/roles/geerlingguy.postgresql/vars/Fedora-30.yml
new file mode 100644
index 000000000..d07f14b7b
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/vars/Fedora-30.yml
@@ -0,0 +1,13 @@
+---
+__postgresql_version: "11.2"
+__postgresql_data_dir: "/var/lib/pgsql/data"
+__postgresql_bin_path: "/usr/bin"
+__postgresql_config_path: "/var/lib/pgsql/data"
+__postgresql_daemon: postgresql
+__postgresql_packages:
+  - postgresql
+  - postgresql-server
+  - postgresql-contrib
+  - postgresql-libs
+# Fedora 30 containers only have python3 by default
+postgresql_python_library: python3-psycopg2
diff --git a/provisioning/roles/geerlingguy.postgresql/vars/Ubuntu-14.yml b/provisioning/roles/geerlingguy.postgresql/vars/Ubuntu-14.yml
deleted file mode 100644
index bd6c17475..000000000
--- a/provisioning/roles/geerlingguy.postgresql/vars/Ubuntu-14.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-__postgresql_version: "9.3"
-__postgresql_data_dir: "/var/lib/postgresql/{{ __postgresql_version }}/main"
-__postgresql_bin_path: "/usr/lib/postgresql/{{ __postgresql_version }}/bin"
-__postgresql_config_path: "/etc/postgresql/{{ __postgresql_version }}/main"
-__postgresql_daemon: postgresql
-__postgresql_packages:
-  - postgresql
-  - postgresql-contrib
-  - libpq-dev

From 896cde9158e60dac1d36e1cb8c9289bf297fb074 Mon Sep 17 00:00:00 2001
From: Parami Gunasekara <parami@live.ca>
Date: Thu, 19 Sep 2019 17:38:46 -0400
Subject: [PATCH 1108/1273] Fixes site-install error.

Error: `In SiteInstallCommands.php line 367: Failed to drop or create the database:`
This is due because the `systemctl start mysql` command failed due to missing volume. Fix was to add the missing volume to the command.
Also, resolves #1856
---
 docs/other/docker.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/other/docker.md b/docs/other/docker.md
index ad928e9f0..5b3027d55 100644
--- a/docs/other/docker.md
+++ b/docs/other/docker.md
@@ -27,7 +27,7 @@ You can also add other subdomains if you're using other built-in services, e.g.
 
 If you just want a quick, easy Drupal site for testing, you can run an instance of Drupal VM and install Drupal inside using the provided script.
 
-  1. Run an instance of Drupal VM: `docker run -d -p 80:80 -p 443:443 --name=drupalvm --privileged geerlingguy/drupal-vm`
+  1. Run an instance of Drupal VM: `docker run -d -v /sys/fs/cgroup:/sys/fs/cgroup:ro -p 80:80 -p 443:443 --name=drupalvm --privileged geerlingguy/drupal-vm`
   2. Install Drupal on this instance: `docker exec drupalvm install-drupal` (you can choose a version using `install-drupal [version]`, using versions like `8.x-dev` or `7.x-dev`).
 
 You should be able to access the Drupal site at `http://localhost`. If you need to share a host directory into the VM, you can do so by adding another `-v` parameter, like `-v /path/on/host:/path/in/container.

From 4b2e6a687c9f38dd749a50848aaee72502f30ce4 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 8 Oct 2019 11:15:55 -0500
Subject: [PATCH 1109/1273] Update geerlingguy.firewall role.

---
 provisioning/requirements.yml                      |  2 +-
 .../roles/geerlingguy.firewall/.travis.yml         |  5 ++---
 provisioning/roles/geerlingguy.firewall/README.md  |  4 ++++
 .../roles/geerlingguy.firewall/defaults/main.yml   |  1 +
 .../molecule/default/molecule.yml                  |  6 ++++--
 .../molecule/default/playbook.yml                  |  1 +
 .../molecule/default/tests/test_default.py         | 14 --------------
 .../templates/firewall.bash.j2                     |  3 ++-
 8 files changed, 15 insertions(+), 21 deletions(-)
 delete mode 100644 provisioning/roles/geerlingguy.firewall/molecule/default/tests/test_default.py

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index cbc8dd29c..2b05a94ca 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -26,7 +26,7 @@
 - src: geerlingguy.elasticsearch
   version: 3.0.0
 - src: geerlingguy.firewall
-  version: 2.4.1
+  version: 2.4.2
 - src: geerlingguy.git
   version: 2.0.5
 - src: geerlingguy.java
diff --git a/provisioning/roles/geerlingguy.firewall/.travis.yml b/provisioning/roles/geerlingguy.firewall/.travis.yml
index ae164d97b..25675a7c9 100644
--- a/provisioning/roles/geerlingguy.firewall/.travis.yml
+++ b/provisioning/roles/geerlingguy.firewall/.travis.yml
@@ -7,11 +7,10 @@ env:
     - ROLE_NAME: firewall
   matrix:
     - MOLECULE_DISTRO: centos7
-      MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
     - MOLECULE_DISTRO: centos6
+    - MOLECULE_DISTRO: ubuntu1804
     - MOLECULE_DISTRO: ubuntu1604
-    - MOLECULE_DISTRO: ubuntu1404
-    - MOLECULE_DISTRO: debian8
+    - MOLECULE_DISTRO: debian9
 
 install:
   # Install test dependencies.
diff --git a/provisioning/roles/geerlingguy.firewall/README.md b/provisioning/roles/geerlingguy.firewall/README.md
index 541daf1c2..e69302ebd 100644
--- a/provisioning/roles/geerlingguy.firewall/README.md
+++ b/provisioning/roles/geerlingguy.firewall/README.md
@@ -60,6 +60,10 @@ Whether to log dropped packets to syslog (messages will be prefixed with "Droppe
 
 Set to `true` to disable firewalld (installed by default on RHEL/CentOS) or ufw (installed by default on Ubuntu), respectively.
 
+    firewall_enable_ipv6: true
+
+Set to `false` to disable configuration of ip6tables (for example, if your `GRUB_CMDLINE_LINUX` contains `ipv6.disable=1`).
+
 ## Dependencies
 
 None.
diff --git a/provisioning/roles/geerlingguy.firewall/defaults/main.yml b/provisioning/roles/geerlingguy.firewall/defaults/main.yml
index 3d3cceba4..decf51503 100644
--- a/provisioning/roles/geerlingguy.firewall/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.firewall/defaults/main.yml
@@ -11,6 +11,7 @@ firewall_allowed_udp_ports: []
 firewall_forwarded_tcp_ports: []
 firewall_forwarded_udp_ports: []
 firewall_additional_rules: []
+firewall_enable_ipv6: true
 firewall_ip6_additional_rules: []
 firewall_log_dropped_packets: true
 
diff --git a/provisioning/roles/geerlingguy.firewall/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.firewall/molecule/default/molecule.yml
index bf499d2b3..eac4b0efb 100644
--- a/provisioning/roles/geerlingguy.firewall/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.firewall/molecule/default/molecule.yml
@@ -9,8 +9,10 @@ lint:
     config-file: molecule/default/yaml-lint.yml
 platforms:
   - name: instance
-    image: geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible
-    command: ${MOLECULE_DOCKER_COMMAND:-"sleep infinity"}
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
     privileged: true
     pre_build_image: true
 provisioner:
diff --git a/provisioning/roles/geerlingguy.firewall/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.firewall/molecule/default/playbook.yml
index a7cecd132..635661bbb 100644
--- a/provisioning/roles/geerlingguy.firewall/molecule/default/playbook.yml
+++ b/provisioning/roles/geerlingguy.firewall/molecule/default/playbook.yml
@@ -4,6 +4,7 @@
   become: true
 
   vars:
+    firewall_enable_ipv6: false
     firewall_allowed_tcp_ports:
       - "9123"
 
diff --git a/provisioning/roles/geerlingguy.firewall/molecule/default/tests/test_default.py b/provisioning/roles/geerlingguy.firewall/molecule/default/tests/test_default.py
deleted file mode 100644
index eedd64a1d..000000000
--- a/provisioning/roles/geerlingguy.firewall/molecule/default/tests/test_default.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import os
-
-import testinfra.utils.ansible_runner
-
-testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
-    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
-
-
-def test_hosts_file(host):
-    f = host.file('/etc/hosts')
-
-    assert f.exists
-    assert f.user == 'root'
-    assert f.group == 'root'
diff --git a/provisioning/roles/geerlingguy.firewall/templates/firewall.bash.j2 b/provisioning/roles/geerlingguy.firewall/templates/firewall.bash.j2
index f355e6846..ab0bcb461 100755
--- a/provisioning/roles/geerlingguy.firewall/templates/firewall.bash.j2
+++ b/provisioning/roles/geerlingguy.firewall/templates/firewall.bash.j2
@@ -87,7 +87,7 @@ iptables -A INPUT -m limit --limit 15/minute -j LOG --log-level 7 --log-prefix "
 # Drop all other traffic.
 iptables -A INPUT -j DROP
 
-
+{% if firewall_enable_ipv6 %}
 # Configure IPv6 if ip6tables is present.
 if [ -x "$(which ip6tables 2>/dev/null)" ]; then
 
@@ -134,3 +134,4 @@ if [ -x "$(which ip6tables 2>/dev/null)" ]; then
   ip6tables -A INPUT -j DROP
 
 fi
+{% endif %}

From 1369b9d2766f7b60c107b3122b4a7c95d6fc5e0e Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 8 Oct 2019 11:24:54 -0500
Subject: [PATCH 1110/1273] Disable IPv6 in CI tests to prevent firewall
 failures.

---
 tests/test-setup.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/test-setup.yml b/tests/test-setup.yml
index 9ae3c099f..4da21626d 100644
--- a/tests/test-setup.yml
+++ b/tests/test-setup.yml
@@ -2,6 +2,10 @@
 - hosts: all
   become: yes
 
+  vars:
+    # Added to prevent test failures in CI.
+    firewall_enable_ipv6: false
+
   tasks:
     - name: Update apt cache.
       apt: update_cache=yes

From bf5003007b9096938520905de5713bb336b78556 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 8 Oct 2019 11:37:01 -0500
Subject: [PATCH 1111/1273] Actually fix IPv6 testing issues in CI.

---
 tests/config.yml     | 3 +++
 tests/run-tests.sh   | 8 ++++++++
 tests/test-setup.yml | 4 ----
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/tests/config.yml b/tests/config.yml
index 30a1a1ff5..442f4f19c 100644
--- a/tests/config.yml
+++ b/tests/config.yml
@@ -5,3 +5,6 @@ composer_home_path: "/{{ drupalvm_user }}/.composer"
 # Don't run the 'disable firewall' tasks in tests.
 firewall_disable_firewalld: false
 firewall_disable_ufw: false
+
+# Added to prevent test failures in CI.
+firewall_enable_ipv6: false
diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index e9d81cf05..72a583d8b 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -22,6 +22,10 @@ cleanup="${cleanup:-true}"
 if [ $distro = 'centos7' ]; then
   init="/usr/lib/systemd/systemd"
   opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+# CentOS 8
+elif [ $distro = 'centos8' ]; then
+  init="/usr/lib/systemd/systemd"
+  opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
 # CentOS 6
 elif [ $distro = 'centos6' ]; then
   init="/sbin/init"
@@ -34,6 +38,10 @@ elif [ $distro = 'ubuntu1804' ]; then
 elif [ $distro = 'ubuntu1604' ]; then
   init="/lib/systemd/systemd"
   opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+# Debian 10
+elif [ $distro = 'debian10' ]; then
+  init="/lib/systemd/systemd"
+  opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
 # Debian 9
 elif [ $distro = 'debian9' ]; then
   init="/lib/systemd/systemd"
diff --git a/tests/test-setup.yml b/tests/test-setup.yml
index 4da21626d..9ae3c099f 100644
--- a/tests/test-setup.yml
+++ b/tests/test-setup.yml
@@ -2,10 +2,6 @@
 - hosts: all
   become: yes
 
-  vars:
-    # Added to prevent test failures in CI.
-    firewall_enable_ipv6: false
-
   tasks:
     - name: Update apt cache.
       apt: update_cache=yes

From 57585f0b24560c966512c85e5ecbeb88253d026b Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 8 Oct 2019 13:08:13 -0500
Subject: [PATCH 1112/1273] Fix new Rubocop-induced test failures.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 05a2d3dfd..0c245da08 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,7 +59,7 @@ before_install:
 
 script:
   # Vagrantfile syntax check.
-  - 'rubocop ./Vagrantfile ./lib/drupalvm --except LineLength,Eval,MutableConstant,BlockLength,MethodLength,ConditionalAssignment,AlignParameters'
+  - 'rubocop ./Vagrantfile ./lib/drupalvm --except LineLength,Eval,MutableConstant,BlockLength,MethodLength,ConditionalAssignment,AlignParameters,IfUnlessModifier'
 
   # Run tests.
   - composer run-tests

From 9fc2ddefdc0eef00c8a5dc0c634e7f34de47e4cf Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 31 Oct 2019 21:15:58 -0500
Subject: [PATCH 1113/1273] Update git role to latest version.

---
 provisioning/requirements.yml                                   | 2 +-
 provisioning/roles/geerlingguy.git/meta/main.yml                | 2 +-
 .../roles/geerlingguy.git/tasks/install-from-source.yml         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 2b05a94ca..de05b39ef 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -28,7 +28,7 @@
 - src: geerlingguy.firewall
   version: 2.4.2
 - src: geerlingguy.git
-  version: 2.0.5
+  version: 2.1.0
 - src: geerlingguy.java
   version: 1.9.6
 - src: geerlingguy.mailhog
diff --git a/provisioning/roles/geerlingguy.git/meta/main.yml b/provisioning/roles/geerlingguy.git/meta/main.yml
index 4e1fd8f32..e06b1c528 100644
--- a/provisioning/roles/geerlingguy.git/meta/main.yml
+++ b/provisioning/roles/geerlingguy.git/meta/main.yml
@@ -6,7 +6,7 @@ galaxy_info:
   description: Git version control software
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 2.4
+  min_ansible_version: 2.5
   platforms:
     - name: EL
       versions:
diff --git a/provisioning/roles/geerlingguy.git/tasks/install-from-source.yml b/provisioning/roles/geerlingguy.git/tasks/install-from-source.yml
index a32af0ae4..0d420f450 100644
--- a/provisioning/roles/geerlingguy.git/tasks/install-from-source.yml
+++ b/provisioning/roles/geerlingguy.git/tasks/install-from-source.yml
@@ -37,7 +37,7 @@
     git_reinstall_from_source: true
   when:
     - git_install_from_source_force_update | bool
-    - (git_installed_version.rc == 0) and (git_installed_version.stdout | regex_replace("^.*?([0-9\.]+)$", "\\1") | version_compare(git_version, operator="!="))
+    - (git_installed_version.rc == 0) and (git_installed_version.stdout | regex_replace("^.*?([0-9\.]+)$", "\\1") is version(git_version, operator="!="))
 
 - name: Download git.
   get_url:

From 02536238202e608806f3209f59d3899a846736de Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 1 Nov 2019 10:40:43 -0500
Subject: [PATCH 1114/1273] Update geerlingguy.php-versions role to latest
 version, fix Ansible 2.9.0 bug.

---
 provisioning/requirements.yml                              | 2 +-
 provisioning/roles/geerlingguy.php-versions/tasks/main.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index de05b39ef..5793470de 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -56,7 +56,7 @@
 - src: geerlingguy.php-tideways
   version: 2.2.0
 - src: geerlingguy.php-versions
-  version: 3.1.1
+  version: 3.1.2
 - src: geerlingguy.php-xdebug
   version: 2.5.1
 - src: geerlingguy.php-xhprof
diff --git a/provisioning/roles/geerlingguy.php-versions/tasks/main.yml b/provisioning/roles/geerlingguy.php-versions/tasks/main.yml
index 0e72876b6..29273e4b4 100644
--- a/provisioning/roles/geerlingguy.php-versions/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php-versions/tasks/main.yml
@@ -6,7 +6,7 @@
     - "{{ role_path }}/vars/{{ ansible_os_family }}-php{{ php_version }}.yml"
 
 - name: Define PHP variables.
-  set_fact: "{{ item.key }}={{ hostvars[inventory_hostname][item.value] }}"
+  set_fact: "{{ item.key }}={{ lookup('vars', item.value) }}"
   when:
     - hostvars[inventory_hostname][item.key] is undefined
     - hostvars[inventory_hostname][item.value] is defined

From 5095f808729e4907f12de993cef2c06c4459c59e Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 1 Nov 2019 12:13:12 -0500
Subject: [PATCH 1115/1273] Update geerlingguy.php-versions role to latest
 version, fix another bug.

---
 provisioning/requirements.yml                               | 2 +-
 provisioning/roles/geerlingguy.php-versions/vars/Debian.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 5793470de..57af4fba6 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -56,7 +56,7 @@
 - src: geerlingguy.php-tideways
   version: 2.2.0
 - src: geerlingguy.php-versions
-  version: 3.1.2
+  version: 3.1.3
 - src: geerlingguy.php-xdebug
   version: 2.5.1
 - src: geerlingguy.php-xhprof
diff --git a/provisioning/roles/geerlingguy.php-versions/vars/Debian.yml b/provisioning/roles/geerlingguy.php-versions/vars/Debian.yml
index fe4552029..a1e76dbd3 100644
--- a/provisioning/roles/geerlingguy.php-versions/vars/Debian.yml
+++ b/provisioning/roles/geerlingguy.php-versions/vars/Debian.yml
@@ -10,7 +10,7 @@ __php_extension_conf_paths:
   - "/etc/php/{{ php_version }}/cli/conf.d"
 __php_fpm_daemon: "php{{ php_version }}-fpm"
 __php_fpm_conf_path: "/etc/php/{{ php_version }}/fpm"
-__php_fpm_pool_conf_path: "{{ php_fpm_conf_path }}/pool.d/www.conf"
+__php_fpm_pool_conf_path: "{{ __php_fpm_conf_path }}/pool.d/www.conf"
 __php_mysql_package: "php{{ php_version }}-mysql"
 __php_redis_package: "php{{ php_version }}-redis"
 __php_memcached_package: "php{{ php_version }}-memcached"

From b8a4c8a179071991fc8f0160576ee65a7512c07d Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 1 Nov 2019 13:52:41 -0500
Subject: [PATCH 1116/1273] Update geerlingguy.varnish role to latest version
 to resolve Ansible 2.9 incompatibility.

---
 provisioning/requirements.yml                      |  2 +-
 provisioning/roles/geerlingguy.varnish/.travis.yml |  1 -
 provisioning/roles/geerlingguy.varnish/README.md   | 10 +++++++++-
 .../roles/geerlingguy.varnish/defaults/main.yml    |  6 ++++++
 .../roles/geerlingguy.varnish/meta/main.yml        |  4 ++--
 .../molecule/default/tests/test_default.py         | 14 --------------
 .../molecule/default/yaml-lint.yml                 |  2 +-
 .../geerlingguy.varnish/tasks/setup-Debian.yml     |  2 +-
 .../geerlingguy.varnish/tasks/setup-RedHat.yml     |  3 ++-
 .../geerlingguy.varnish/templates/default.vcl.j2   |  2 +-
 .../roles/geerlingguy.varnish/templates/varnish.j2 |  2 +-
 11 files changed, 24 insertions(+), 24 deletions(-)
 delete mode 100644 provisioning/roles/geerlingguy.varnish/molecule/default/tests/test_default.py

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 57af4fba6..4f938e7ba 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -78,4 +78,4 @@
 - src: geerlingguy.solr
   version: 5.0.0
 - src: geerlingguy.varnish
-  version: 3.0.0
+  version: 3.0.1
diff --git a/provisioning/roles/geerlingguy.varnish/.travis.yml b/provisioning/roles/geerlingguy.varnish/.travis.yml
index 9076320bb..f04e37f69 100644
--- a/provisioning/roles/geerlingguy.varnish/.travis.yml
+++ b/provisioning/roles/geerlingguy.varnish/.travis.yml
@@ -11,7 +11,6 @@ env:
     - MOLECULE_DISTRO: ubuntu1804
     - MOLECULE_DISTRO: ubuntu1604
     - MOLECULE_DISTRO: debian9
-    - MOLECULE_DISTRO: debian8
 
     - MOLECULE_DISTRO: centos7
       MOLECULE_PLAYBOOK: playbook-41.yml
diff --git a/provisioning/roles/geerlingguy.varnish/README.md b/provisioning/roles/geerlingguy.varnish/README.md
index 4eb52ba34..2d15889c5 100644
--- a/provisioning/roles/geerlingguy.varnish/README.md
+++ b/provisioning/roles/geerlingguy.varnish/README.md
@@ -73,7 +73,15 @@ Services that will be started at boot and should be running after this role is c
 
     varnish_packagecloud_repo_yum_repository_priority: "1"
 
-The `yum` priority for the Packagecloud repository used to install Varnish. Setting this explicitly forces yum to use the Packagecloud repositories to install Varnish even in environments (e.g. Amazon Linux) where other repositories may have higher priorities than the default.
+(RedHat/CentOS only) The `yum` priority for the Packagecloud repository used to install Varnish. Setting this explicitly forces yum to use the Packagecloud repositories to install Varnish even in environments (e.g. Amazon Linux) where other repositories may have higher priorities than the default.
+
+    varnish_apt_repo: deb https://packagecloud.io/varnishcache/{{ varnish_packagecloud_repo }}/{{ ansible_distribution | lower }}/ {{ ansible_distribution_release }} main
+
+(Debian/Ubuntu only) The `repo` for the apt repository.
+
+    varnish_yum_repo_baseurl: https://packagecloud.io/varnishcache/{{ varnish_packagecloud_repo }}/el/{{ ansible_distribution_major_version|int }}/$basearch
+
+(RedHat/CentOS only) The `baseurl` for the yum repository.
 
     varnish_backends:
       apache:
diff --git a/provisioning/roles/geerlingguy.varnish/defaults/main.yml b/provisioning/roles/geerlingguy.varnish/defaults/main.yml
index 52faf6bae..f8b4bbc30 100644
--- a/provisioning/roles/geerlingguy.varnish/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.varnish/defaults/main.yml
@@ -27,6 +27,12 @@ varnish_enabled_services:
 # Make sure Packagecloud repo is used on RHEL/CentOS.
 varnish_packagecloud_repo_yum_repository_priority: "1"
 
+# Only used on RedHat / CentOS.
+varnish_yum_repo_baseurl: https://packagecloud.io/varnishcache/{{ varnish_packagecloud_repo }}/el/{{ ansible_distribution_major_version|int }}/$basearch
+
+# Only used on Debian / Ubuntu.
+varnish_apt_repo: deb https://packagecloud.io/varnishcache/{{ varnish_packagecloud_repo }}/{{ ansible_distribution | lower }}/ {{ ansible_distribution_release }} main
+
 # Optionally define additional backends.
 # varnish_backends:
 #   apache:
diff --git a/provisioning/roles/geerlingguy.varnish/meta/main.yml b/provisioning/roles/geerlingguy.varnish/meta/main.yml
index 692d3794c..b065305cb 100644
--- a/provisioning/roles/geerlingguy.varnish/meta/main.yml
+++ b/provisioning/roles/geerlingguy.varnish/meta/main.yml
@@ -6,7 +6,7 @@ galaxy_info:
   description: Varnish for Linux.
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 2.4
+  min_ansible_version: 2.5
   platforms:
     - name: EL
       versions:
@@ -26,7 +26,7 @@ galaxy_info:
     - varnish
     - cache
     - proxy
-    - reverse-proxy
+    - reverse
     - performance
     - loadbalancer
     - balancer
diff --git a/provisioning/roles/geerlingguy.varnish/molecule/default/tests/test_default.py b/provisioning/roles/geerlingguy.varnish/molecule/default/tests/test_default.py
deleted file mode 100644
index eedd64a1d..000000000
--- a/provisioning/roles/geerlingguy.varnish/molecule/default/tests/test_default.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import os
-
-import testinfra.utils.ansible_runner
-
-testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
-    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
-
-
-def test_hosts_file(host):
-    f = host.file('/etc/hosts')
-
-    assert f.exists
-    assert f.user == 'root'
-    assert f.group == 'root'
diff --git a/provisioning/roles/geerlingguy.varnish/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.varnish/molecule/default/yaml-lint.yml
index db22c42ea..f14ed57c4 100644
--- a/provisioning/roles/geerlingguy.varnish/molecule/default/yaml-lint.yml
+++ b/provisioning/roles/geerlingguy.varnish/molecule/default/yaml-lint.yml
@@ -2,5 +2,5 @@
 extends: default
 rules:
   line-length:
-    max: 160
+    max: 180
     level: warning
diff --git a/provisioning/roles/geerlingguy.varnish/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.varnish/tasks/setup-Debian.yml
index 6428d917e..60f426f47 100644
--- a/provisioning/roles/geerlingguy.varnish/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.varnish/tasks/setup-Debian.yml
@@ -11,7 +11,7 @@
 
 - name: Add packagecloud.io Varnish apt repository.
   apt_repository:
-    repo: "deb https://packagecloud.io/varnishcache/{{ varnish_packagecloud_repo }}/{{ ansible_distribution | lower }}/ {{ ansible_distribution_release }} main"
+    repo: "{{ varnish_apt_repo }}"
     state: present
 
 - name: Ensure Varnish is installed.
diff --git a/provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml
index 18a40bdbb..bcaa869aa 100644
--- a/provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml
@@ -10,7 +10,7 @@
   yum_repository:
     name: varnishcache_{{ varnish_packagecloud_repo }}
     description: Varnish Cache packagecloud.io repository.
-    baseurl: https://packagecloud.io/varnishcache/{{ varnish_packagecloud_repo }}/el/{{ ansible_distribution_major_version|int }}/$basearch
+    baseurl: "{{ varnish_yum_repo_baseurl }}"
     repo_gpgcheck: false
     gpgcheck: false
     enabled: true
@@ -25,6 +25,7 @@
   args:
     warn: false
   when: varnish_packagecloud_repo_addition.changed
+  tags: ['skip_ansible_lint']
 
 - name: Ensure Varnish is installed.
   yum:
diff --git a/provisioning/roles/geerlingguy.varnish/templates/default.vcl.j2 b/provisioning/roles/geerlingguy.varnish/templates/default.vcl.j2
index 652f86479..d46723287 100644
--- a/provisioning/roles/geerlingguy.varnish/templates/default.vcl.j2
+++ b/provisioning/roles/geerlingguy.varnish/templates/default.vcl.j2
@@ -1,4 +1,4 @@
-{% if varnish_version | version_compare('4.0', '>=') %}
+{% if varnish_version is version('4.0', '>=') %}
 vcl 4.0;
 {% endif %}
 
diff --git a/provisioning/roles/geerlingguy.varnish/templates/varnish.j2 b/provisioning/roles/geerlingguy.varnish/templates/varnish.j2
index b63fbb0ab..950b5603d 100644
--- a/provisioning/roles/geerlingguy.varnish/templates/varnish.j2
+++ b/provisioning/roles/geerlingguy.varnish/templates/varnish.j2
@@ -104,7 +104,7 @@ DAEMON_OPTS="-a ${VARNISH_LISTEN_ADDRESS}:${VARNISH_LISTEN_PORT} \
              -p thread_pool_min=${VARNISH_MIN_THREADS} \
              -p thread_pool_max=${VARNISH_MAX_THREADS} \
              -p thread_pool_timeout=${VARNISH_THREAD_TIMEOUT} \
-{% if varnish_version | version_compare('4.1', '<') %}
+{% if varnish_version is version('4.1', '<') %}
              -u varnish -g varnish \
 {% endif %}
 {% if varnishd_extra_options %}

From 6b5097dd15f9631bb539786d0d50b701039b738f Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 4 Nov 2019 10:33:55 -0600
Subject: [PATCH 1117/1273] Partially Fixes #1982: Upgrade to Boostrap 4,
 slightly improve A11y for Drupal VM Dashboard.

---
 provisioning/templates/dashboard.html.j2 | 46 ++++++++++++------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/provisioning/templates/dashboard.html.j2 b/provisioning/templates/dashboard.html.j2
index 5fae7e798..e134275ae 100644
--- a/provisioning/templates/dashboard.html.j2
+++ b/provisioning/templates/dashboard.html.j2
@@ -11,7 +11,7 @@
         margin: 0;
       }
       /* minor fallback styling for when loaded without an internet connection */
-      .panel, .jumbotron, .well {
+      .card, .jumbotron {
         margin-bottom: 20px;
       }
       td, th {
@@ -315,7 +315,7 @@
         <div class="col-md-12">
           <section class="jumbotron text-center">
             <a href="https://www.drupalvm.com/"><img src="http://docs.drupalvm.com/en/latest/images/drupal-vm-logo.png" alt="Drupal VM" title="Welcome to Drupal VM" class="img-responsive center-block"></a>
-            <p><a href="https://github.com/geerlingguy/drupal-vm">Drupal VM</a> is a VM for local Drupal development, built with Vagrant + Ansible.</p>
+            <p class="lead"><a href="https://github.com/geerlingguy/drupal-vm">Drupal VM</a> is a VM for local Drupal development, built with Vagrant + Ansible.</p>
             <p><small>Machine name: <strong>{{ vagrant_machine_name }}</strong></small></p>
             <p><a class="btn btn-primary btn-lg" href="http://docs.drupalvm.com/en/latest/" role="button">Read the documentation</a></p>
           </section>
@@ -324,18 +324,18 @@
 
       <div class="row">
         <div class="col-md-9">
-          <section class="panel panel-default">
-            <div class="panel-heading">Your sites</div>
-            <div class="panel-body">
+          <section class="card">
+            <div class="card-header">Your sites</div>
+            <div class="card-body">
               {{ sectionSiteList() }}
             </div>
           </section>
         </div>
 
         <div class="col-md-3">
-          <section class="panel panel-default">
-            <div class="panel-heading"> {{ SectionDatabaseListLabel() }}</div>
-            <div class="panel-body">
+          <section class="card">
+            <div class="card-header"> {{ SectionDatabaseListLabel() }}</div>
+            <div class="card-body">
               {{ sectionDatabaseList() }}
 
               {{ sectionDatabaseUserList() }}
@@ -346,39 +346,39 @@
 
       <div class="row">
         <div class="col-md-3">
-          <section class="panel panel-default">
-            <div class="panel-heading">PHP information</div>
-            <div class="panel-body">
+          <section class="card">
+            <div class="card-header">PHP information</div>
+            <div class="card-body">
               {{ sectionPhpInformation() }}
             </div>
           </section>
         </div>
 
         <div class="col-md-6">
-          <section class="panel panel-default">
-            <div class="panel-heading">MySQL connection information</div>
-            <div class="panel-body">
+          <section class="card">
+            <div class="card-header">MySQL connection information</div>
+            <div class="card-body">
               {{ sectionDatabaseConnection() }}
             </div>
           </section>
         </div>
 
         <div class="col-md-3">
-          <section class="panel panel-default">
-            <div class="panel-heading">Development tools</div>
-            <div class="panel-body">
+          <section class="card">
+            <div class="card-header">Development tools</div>
+            <div class="card-body">
               {{ sectionDevelopmentTools() }}
             </div>
           </section>
-        </div>  
+        </div>
       </div>
 
       <div class="row">
         <div class="col-md-12">
-          <section class="panel panel-default">
-            <div class="panel-heading">/etc/hosts</div>
-              <div class="panel-body">
-                <section class="well small">
+          <section class="card">
+            <div class="card-header">/etc/hosts</div>
+              <div class="card-body">
+                <section class="card small">
                   {{ sectionHost() }}
                 </section>
                 <small>Unless you're using the <a href="https://github.com/cogitatio/vagrant-hostsupdater" target="_blank">vagrant-hostsupdater</a> or <a href="https://github.com/smdahlen/vagrant-hostmanager" target="_blank">vagrant-hostmanager</a> plugin, add the lines above to your host machine's hosts file.</small>
@@ -388,6 +388,6 @@
       </div>
     </div>
 
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
   </body>
 </html>

From 3d3b36da9c37067872a3702e356b8edf135447a2 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 4 Nov 2019 11:05:33 -0600
Subject: [PATCH 1118/1273] Issue #1986: Update CHANGELOG for 5.0.2 release.

---
 CHANGELOG.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a83e92b23..85735b187 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,28 @@
 # Drupal VM Changelog
 
+## 5.0.2 (2019-11-04)
+
+### Breaking Changes
+
+N/A
+
+### New/changed variables in default.config.yml
+
+N/A
+
+### Improvements
+
+  * #1982: Updated Dashboard to Boostrap 4 for improved accessibility.
+  * Updated various roles to ensure Ansible 2.9 compatibility.
+  * Tested Drupal VM on macOS Catalina with latest versions of Vagrant and VirtualBox.
+  * Updated roles: postgresql, firewall, git, php-versions, varnish
+
+### Bugfixes
+
+  * #1969: Documentation typo fix for Linux installation.
+  * #1973: Fix site-install error in certain circumstances.
+
+
 ## 5.0.1 (2019-08-29)
 
 ### Breaking Changes

From 02af4d48e53a75a3cab0abd07de21398ae30e984 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 4 Nov 2019 11:09:48 -0600
Subject: [PATCH 1119/1273] Fixes #1987: Bump minimum Ansible required version
 to 2.5.

---
 default.config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.config.yml b/default.config.yml
index 63d5815ec..a1d86a901 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -47,7 +47,7 @@ vagrant_plugins:
 
 # Minimum required versions.
 drupalvm_vagrant_version_min: '1.8.6'
-drupalvm_ansible_version_min: '2.4'
+drupalvm_ansible_version_min: '2.5'
 
 # Force use of ansible_local provisioner, even if Ansible is installed on host.
 force_ansible_local: false

From 5be305fd82680a2ae2f7b673058df06c1c5b0350 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 7 Nov 2019 11:11:58 -0600
Subject: [PATCH 1120/1273] Update geerlingguy.mailhog to latest version.

---
 provisioning/requirements.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 4f938e7ba..3d6821a8d 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -32,7 +32,7 @@
 - src: geerlingguy.java
   version: 1.9.6
 - src: geerlingguy.mailhog
-  version: 2.1.4
+  version: 2.2.0
 - src: geerlingguy.memcached
   version: 1.0.8
 - src: geerlingguy.mysql

From b709601656c7f7339c635b2acce8a9d96b83d395 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 7 Nov 2019 11:12:57 -0600
Subject: [PATCH 1121/1273] Update geerlingguy.mailhog role to latest version.

---
 .../roles/geerlingguy.mailhog/.ansible-lint   |  2 +
 .../roles/geerlingguy.mailhog/.gitignore      |  3 +-
 .../roles/geerlingguy.mailhog/.travis.yml     | 34 ++++++------
 .../roles/geerlingguy.mailhog/README.md       | 12 ++++-
 .../geerlingguy.mailhog/defaults/main.yml     |  6 ++-
 .../roles/geerlingguy.mailhog/meta/main.yml   |  7 +--
 .../molecule/default/molecule.yml             | 29 ++++++++++
 .../molecule/default/playbook.yml             | 53 +++++++++++++++++++
 .../default}/requirements.yml                 |  0
 .../message => molecule/default/test-message} |  0
 .../molecule/default/yaml-lint.yml            |  6 +++
 .../roles/geerlingguy.mailhog/tests/README.md | 11 ----
 .../roles/geerlingguy.mailhog/tests/test.yml  | 30 -----------
 13 files changed, 127 insertions(+), 66 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.mailhog/.ansible-lint
 create mode 100644 provisioning/roles/geerlingguy.mailhog/molecule/default/molecule.yml
 create mode 100644 provisioning/roles/geerlingguy.mailhog/molecule/default/playbook.yml
 rename provisioning/roles/geerlingguy.mailhog/{tests => molecule/default}/requirements.yml (100%)
 rename provisioning/roles/geerlingguy.mailhog/{tests/message => molecule/default/test-message} (100%)
 create mode 100644 provisioning/roles/geerlingguy.mailhog/molecule/default/yaml-lint.yml
 delete mode 100644 provisioning/roles/geerlingguy.mailhog/tests/README.md
 delete mode 100644 provisioning/roles/geerlingguy.mailhog/tests/test.yml

diff --git a/provisioning/roles/geerlingguy.mailhog/.ansible-lint b/provisioning/roles/geerlingguy.mailhog/.ansible-lint
new file mode 100644
index 000000000..477856412
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mailhog/.ansible-lint
@@ -0,0 +1,2 @@
+skip_list:
+  - '306'
diff --git a/provisioning/roles/geerlingguy.mailhog/.gitignore b/provisioning/roles/geerlingguy.mailhog/.gitignore
index c9b2377e3..f56f5b578 100644
--- a/provisioning/roles/geerlingguy.mailhog/.gitignore
+++ b/provisioning/roles/geerlingguy.mailhog/.gitignore
@@ -1,2 +1,3 @@
 *.retry
-tests/test.sh
+*/__pycache__
+*.pyc
diff --git a/provisioning/roles/geerlingguy.mailhog/.travis.yml b/provisioning/roles/geerlingguy.mailhog/.travis.yml
index 41eb314af..491578b53 100644
--- a/provisioning/roles/geerlingguy.mailhog/.travis.yml
+++ b/provisioning/roles/geerlingguy.mailhog/.travis.yml
@@ -1,28 +1,28 @@
 ---
+language: python
 services: docker
 
 env:
-  - distro: centos7
-  - distro: ubuntu1604
-  - distro: debian9
+  global:
+    - ROLE_NAME: mailhog
+  matrix:
+    - MOLECULE_DISTRO: centos7
+    - MOLECULE_DISTRO: ubuntu1804
+    - MOLECULE_DISTRO: debian9
 
-script:
-  # Configure test script so we can run extra tests after playbook is run.
-  - export container_id=$(date +%s)
-  - export cleanup=false
+install:
+  # Install test dependencies.
+  - pip install molecule docker
 
-  # Download test shim.
-  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
-  - chmod +x ${PWD}/tests/test.sh
+before_script:
+  # Use actual Ansible Galaxy role name for the project directory.
+  - cd ../
+  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
+  - cd geerlingguy.$ROLE_NAME
 
+script:
   # Run tests.
-  - ${PWD}/tests/test.sh
-
-  # Send an email via mhsendmail.
-  - 'docker exec --tty ${container_id} env TERM=xterm sh -c "cat /etc/ansible/roles/role_under_test/tests/message | /opt/mailhog/mhsendmail johndoe@example.com"'
-
-  # Test retrieving messages via MailHog API.
-  - 'docker exec --tty ${container_id} env TERM=xterm sh -c "curl http://localhost:8025/api/v2/messages | grep id"'
+  - molecule test
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.mailhog/README.md b/provisioning/roles/geerlingguy.mailhog/README.md
index 21a59b460..174e4cdd1 100644
--- a/provisioning/roles/geerlingguy.mailhog/README.md
+++ b/provisioning/roles/geerlingguy.mailhog/README.md
@@ -24,7 +24,11 @@ Available variables are listed below, along with default values (see `defaults/m
 
 The directory into which the MailHog binary will be installed.
 
-    mailhog_binary_url: https://github.com/mailhog/MailHog/releases/download/v0.2.1/MailHog_linux_amd64
+    mailhog_version: 1.0.0
+
+The version of MailHog that will be installed. You can find the latest version by visiting the [MailHog project releases page](https://github.com/mailhog/MailHog/releases).
+
+    mailhog_binary_url: "https://github.com/mailhog/MailHog/releases/download/v{{ mailhog_version }}/MailHog_linux_amd64"
 
 The MailHog binary that will be installed. You can find the latest version or a 32-bit version by visiting the [MailHog project releases page](https://github.com/mailhog/MailHog/releases).
 
@@ -32,7 +36,11 @@ The MailHog binary that will be installed. You can find the latest version or a
 
 The path to `daemonize`, which is used to launch MailHog via init script.
 
-    mhsendmail_binary_url: https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64
+    mhsendmail_version: 0.2.0
+    
+The version of the mhsendmail binary that will be installed. You can find the latest version by visiting the [mhsendmail project releases page](https://github.com/mailhog/mhsendmail/releases).
+
+    mhsendmail_binary_url: "https://github.com/mailhog/mhsendmail/releases/download/v{{ mhsendmail_version }}/mhsendmail_linux_amd64"
 
 The mhsendmail binary that will be installed. You can find the latest version or a 32-bit version by visiting the [mhsendmail project releases page](https://github.com/mailhog/mhsendmail/releases).
 
diff --git a/provisioning/roles/geerlingguy.mailhog/defaults/main.yml b/provisioning/roles/geerlingguy.mailhog/defaults/main.yml
index 91cf42e05..780cf2ad6 100644
--- a/provisioning/roles/geerlingguy.mailhog/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.mailhog/defaults/main.yml
@@ -1,7 +1,9 @@
 ---
 mailhog_install_dir: /opt/mailhog
-mailhog_binary_url: https://github.com/mailhog/MailHog/releases/download/v0.2.1/MailHog_linux_amd64
-mhsendmail_binary_url: https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64
+mailhog_version: 1.0.0
+mailhog_binary_url: "https://github.com/mailhog/MailHog/releases/download/v{{ mailhog_version }}/MailHog_linux_amd64"
+mhsendmail_version: 0.2.0
+mhsendmail_binary_url: "https://github.com/mailhog/mhsendmail/releases/download/v{{ mhsendmail_version }}/mhsendmail_linux_amd64"
 
 # Path to daemonize, which is used to launch MailHog via init script.
 mailhog_daemonize_bin_path: /usr/sbin/daemonize
diff --git a/provisioning/roles/geerlingguy.mailhog/meta/main.yml b/provisioning/roles/geerlingguy.mailhog/meta/main.yml
index 16a2c2b78..9acb172b1 100644
--- a/provisioning/roles/geerlingguy.mailhog/meta/main.yml
+++ b/provisioning/roles/geerlingguy.mailhog/meta/main.yml
@@ -11,15 +11,16 @@ galaxy_info:
   platforms:
     - name: EL
       versions:
-      - all
+        - all
     - name: Ubuntu
       versions:
-      - all
+        - all
     - name: Debian
       versions:
-      - all
+        - all
   galaxy_tags:
     - development
     - web
     - system
     - mail
+    - mailhog
diff --git a/provisioning/roles/geerlingguy.mailhog/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.mailhog/molecule/default/molecule.yml
new file mode 100644
index 000000000..2ca6feaf9
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mailhog/molecule/default/molecule.yml
@@ -0,0 +1,29 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint:
+  name: yamllint
+  options:
+    config-file: molecule/default/yaml-lint.yml
+platforms:
+  - name: instance
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    privileged: true
+    pre_build_image: true
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+  playbooks:
+    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
+scenario:
+  name: default
+verifier:
+  name: testinfra
+  lint:
+    name: flake8
diff --git a/provisioning/roles/geerlingguy.mailhog/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.mailhog/molecule/default/playbook.yml
new file mode 100644
index 000000000..1a3da6b9f
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mailhog/molecule/default/playbook.yml
@@ -0,0 +1,53 @@
+---
+- name: Converge
+  hosts: all
+  become: true
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=true cache_valid_time=600
+      when: ansible_os_family == 'Debian'
+
+    - name: Ensure build dependencies are installed (RedHat).
+      package:
+        name:
+          - "@Development tools"
+          - tar
+          - unzip
+          - net-tools
+          - curl
+        state: present
+      when: ansible_os_family == 'RedHat'
+
+    - name: Ensure build dependencies are installed (Debian).
+      apt:
+        name:
+          - build-essential
+          - tar
+          - unzip
+          - net-tools
+          - curl
+        state: present
+      when: ansible_os_family == 'Debian'
+
+  roles:
+    - geerlingguy.daemonize
+    - geerlingguy.mailhog
+
+  post_tasks:
+    - name: Copy test message into place.
+      copy:
+        src: test-message
+        dest: /tmp/test-message
+
+    - name: Send an email via mhsendmail.
+      shell: cat /tmp/test-message | /opt/mailhog/mhsendmail johndoe@example.com
+      changed_when: false
+
+    - name: Test retrieiving messages from the MailHog API.
+      uri:
+        url: http://localhost:8025/api/v2/messages
+      register: result
+      until: result.status == 200
+      retries: 60
+      delay: 1
diff --git a/provisioning/roles/geerlingguy.mailhog/tests/requirements.yml b/provisioning/roles/geerlingguy.mailhog/molecule/default/requirements.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.mailhog/tests/requirements.yml
rename to provisioning/roles/geerlingguy.mailhog/molecule/default/requirements.yml
diff --git a/provisioning/roles/geerlingguy.mailhog/tests/message b/provisioning/roles/geerlingguy.mailhog/molecule/default/test-message
similarity index 100%
rename from provisioning/roles/geerlingguy.mailhog/tests/message
rename to provisioning/roles/geerlingguy.mailhog/molecule/default/test-message
diff --git a/provisioning/roles/geerlingguy.mailhog/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.mailhog/molecule/default/yaml-lint.yml
new file mode 100644
index 000000000..db22c42ea
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mailhog/molecule/default/yaml-lint.yml
@@ -0,0 +1,6 @@
+---
+extends: default
+rules:
+  line-length:
+    max: 160
+    level: warning
diff --git a/provisioning/roles/geerlingguy.mailhog/tests/README.md b/provisioning/roles/geerlingguy.mailhog/tests/README.md
deleted file mode 100644
index 6fb211721..000000000
--- a/provisioning/roles/geerlingguy.mailhog/tests/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Ansible Role tests
-
-To run the test playbook(s) in this directory:
-
-  1. Install and start Docker.
-  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
-    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
-  1. Make the test shim executable: `chmod +x tests/test.sh`.
-  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
-
-If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.mailhog/tests/test.yml b/provisioning/roles/geerlingguy.mailhog/tests/test.yml
deleted file mode 100644
index e6b944666..000000000
--- a/provisioning/roles/geerlingguy.mailhog/tests/test.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-- hosts: all
-
-  pre_tasks:
-    - name: Update apt cache.
-      apt: update_cache=yes cache_valid_time=600
-      when: ansible_os_family == 'Debian'
-
-    - name: Ensure build dependencies are installed (RedHat).
-      package: 'name="{{ item }}" state=present'
-      with_items:
-        - "@Development tools"
-        - tar
-        - unzip
-        - net-tools
-        - curl
-      when: ansible_os_family == 'RedHat'
-
-    - name: Ensure build dependencies are installed (Debian).
-      apt: 'name="{{ item }}" state=present'
-      with_items:
-        - build-essential
-        - tar
-        - unzip
-        - net-tools
-        - curl
-      when: ansible_os_family == 'Debian'
-
-  roles:
-    - geerlingguy.daemonize
-    - role_under_test

From 80cc96f416592a0cfe25b4cdfa1688d3bf858bd1 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 8 Nov 2019 16:23:58 -0600
Subject: [PATCH 1122/1273] Update geerlingguy.postgresql role to latest
 version.

---
 provisioning/requirements.yml                       |  2 +-
 .../roles/geerlingguy.postgresql/.travis.yml        |  2 +-
 .../roles/geerlingguy.postgresql/meta/main.yml      |  1 +
 .../roles/geerlingguy.postgresql/vars/Fedora-31.yml | 13 +++++++++++++
 4 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.postgresql/vars/Fedora-31.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 3d6821a8d..2e2f82fb4 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -66,7 +66,7 @@
 - src: geerlingguy.postfix
   version: 2.0.0
 - src: geerlingguy.postgresql
-  version: 2.0.0
+  version: 2.0.1
 - src: geerlingguy.redis
   version: 1.6.0
 - src: geerlingguy.repo-remi
diff --git a/provisioning/roles/geerlingguy.postgresql/.travis.yml b/provisioning/roles/geerlingguy.postgresql/.travis.yml
index 7aab231c6..06604ced1 100644
--- a/provisioning/roles/geerlingguy.postgresql/.travis.yml
+++ b/provisioning/roles/geerlingguy.postgresql/.travis.yml
@@ -7,7 +7,7 @@ env:
     - ROLE_NAME: postgresql
   matrix:
     - MOLECULE_DISTRO: centos7
-    - MOLECULE_DISTRO: fedora30
+    - MOLECULE_DISTRO: fedora31
     - MOLECULE_DISTRO: ubuntu1804
     - MOLECULE_DISTRO: ubuntu1604
     - MOLECULE_DISTRO: debian10
diff --git a/provisioning/roles/geerlingguy.postgresql/meta/main.yml b/provisioning/roles/geerlingguy.postgresql/meta/main.yml
index 2c962a6fe..4e8170845 100644
--- a/provisioning/roles/geerlingguy.postgresql/meta/main.yml
+++ b/provisioning/roles/geerlingguy.postgresql/meta/main.yml
@@ -16,6 +16,7 @@ galaxy_info:
       versions:
         - 29
         - 30
+        - 31
     - name: Ubuntu
       versions:
         - xenial
diff --git a/provisioning/roles/geerlingguy.postgresql/vars/Fedora-31.yml b/provisioning/roles/geerlingguy.postgresql/vars/Fedora-31.yml
new file mode 100644
index 000000000..1638a6a81
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/vars/Fedora-31.yml
@@ -0,0 +1,13 @@
+---
+__postgresql_version: "11.5"
+__postgresql_data_dir: "/var/lib/pgsql/data"
+__postgresql_bin_path: "/usr/bin"
+__postgresql_config_path: "/var/lib/pgsql/data"
+__postgresql_daemon: postgresql
+__postgresql_packages:
+  - postgresql
+  - postgresql-server
+  - postgresql-contrib
+  - postgresql-libs
+# Fedora 31 containers only have python3 by default
+postgresql_python_library: python3-psycopg2

From 4a7c7d2475f9412d443d5af737f15e74c8788156 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 2 Dec 2019 14:22:16 -0600
Subject: [PATCH 1123/1273] Update docs for config.yml example. [ci skip]

---
 docs/getting-started/configure-drupalvm.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/getting-started/configure-drupalvm.md b/docs/getting-started/configure-drupalvm.md
index 57cbcfcc4..8fb40f4f9 100644
--- a/docs/getting-started/configure-drupalvm.md
+++ b/docs/getting-started/configure-drupalvm.md
@@ -17,7 +17,7 @@ vagrant_box: geerlingguy/centos7
 vagrant_hostname: my-custom-site.dev
 vagrant_machine_name: my_custom_site
 
-php_version: "5.6"
+php_version: "7.2"
 ```
 
 #### 3. vagrant.config.yml

From ac77e1e1cd7f1526f457bf3c14fe42558ccf8538 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 2 Dec 2019 14:28:27 -0600
Subject: [PATCH 1124/1273] Fixes #1993: Add PHP 7.4 support.

---
 default.config.yml                            |  2 +-
 docs/configurations/php.md                    | 10 ++---
 provisioning/requirements.yml                 |  2 +-
 .../geerlingguy.php-versions/.travis.yml      | 27 +++++++-------
 .../roles/geerlingguy.php-versions/README.md  |  6 +--
 .../defaults/main.yml                         |  2 +-
 .../geerlingguy.php-versions/meta/main.yml    |  2 +-
 .../{playbook-7.1.yml => playbook-7.2.yml}    |  2 +-
 .../{playbook-7.3.yml => playbook-7.4.yml}    |  2 +-
 .../molecule/default/playbook.yml             |  1 -
 .../geerlingguy.php-versions/tasks/main.yml   |  6 ---
 .../tasks/setup-Debian.yml                    |  7 ----
 .../tasks/setup-RedHat.yml                    | 37 +++++++++++++------
 .../geerlingguy.php-versions/vars/Debian.yml  |  3 --
 ....config.yml => ubuntu-18-php74.config.yml} |  2 +-
 15 files changed, 53 insertions(+), 58 deletions(-)
 rename provisioning/roles/geerlingguy.php-versions/molecule/default/{playbook-7.1.yml => playbook-7.2.yml} (95%)
 rename provisioning/roles/geerlingguy.php-versions/molecule/default/{playbook-7.3.yml => playbook-7.4.yml} (95%)
 rename tests/{ubuntu-18-php73.config.yml => ubuntu-18-php74.config.yml} (78%)

diff --git a/default.config.yml b/default.config.yml
index a1d86a901..1e7c4c77d 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -255,7 +255,7 @@ firewall_log_dropped_packets: false
 firewall_disable_firewalld: true
 firewall_disable_ufw: true
 
-# PHP Configuration. Currently-supported versions: 7.1, 7.2, 7.3.
+# PHP Configuration. Currently-supported versions: 7.2, 7.3, 7.4.
 # See version-specific notes: http://docs.drupalvm.com/en/latest/configurations/php/
 php_version: "7.2"
 php_install_recommends: no
diff --git a/docs/configurations/php.md b/docs/configurations/php.md
index b8779bb21..50592e9c6 100644
--- a/docs/configurations/php.md
+++ b/docs/configurations/php.md
@@ -1,23 +1,23 @@
-Drupal VM defaults to PHP 7.2, but you can also install and use 7.1 or 7.3.
+Drupal VM defaults to PHP 7.2, but you can also install and use 7.3 or 7.4.
 
 ## Ubuntu
 
-Ondřej Surý's PPA for PHP is used to install PHP 7.2, but you can switch versions by changing `php_version` inside `config.yml` to `"7.1"` or `"7.3"`.
+Ondřej Surý's PPA for PHP is used to install PHP 7.2, but you can switch versions by changing `php_version` inside `config.yml` to `"7.3"` or `"7.4"`.
 
 If you're using Apache with `mod_php` you should also add `libapache2-mod-php{{ php_version }}` to the `extra_packages` list.
 
 _Note: XHProf does currently not work with PHP 7.1+, make sure you don't have it listed in `installed_extras`._
 
-## RedHat/CentOS 7
+## RedHat/CentOS 7 or 8
 
 Remi's RPM repository is included with Drupal VM, and you can make the following changes to use it to install a different version of PHP than 7.2:
 
   1. Make sure you've followed the directions for switching to CentOS 7 in the [use a different base OS](base-os.md) guide.
-  2. Change `php_version` inside `config.yml` to `"7.1"` or `"7.3"`.
+  2. Change `php_version` inside `config.yml` to `"7.3"` or `"7.4"`.
 
 ## PHP 5.6 EOL
 
-PHP 5.6 was end-of-lifed (meaning no more community support or security fixes) at the end of 2018. Drupal VM does not officially support PHP 5.6 anymore, though some package maintainers are still publishing packages for it. So you can try using `php_version: "5.6"` or using PHP's source installation at your own risk.
+PHP 5.6 was end-of-lifed (meaning no more community support or security fixes) at the end of 2018, and is not supported by Drupal VM.
 
 ## Using default distribution packages
 
diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 2e2f82fb4..74d3149af 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -56,7 +56,7 @@
 - src: geerlingguy.php-tideways
   version: 2.2.0
 - src: geerlingguy.php-versions
-  version: 3.1.3
+  version: 4.0.0
 - src: geerlingguy.php-xdebug
   version: 2.5.1
 - src: geerlingguy.php-xhprof
diff --git a/provisioning/roles/geerlingguy.php-versions/.travis.yml b/provisioning/roles/geerlingguy.php-versions/.travis.yml
index 6997c1ade..7a8158001 100644
--- a/provisioning/roles/geerlingguy.php-versions/.travis.yml
+++ b/provisioning/roles/geerlingguy.php-versions/.travis.yml
@@ -6,28 +6,27 @@ env:
   global:
     - ROLE_NAME: php-versions
   matrix:
-    # Default PHP version (7.2).
+    # Default PHP version (7.3).
+    - MOLECULE_DISTRO: centos8
     - MOLECULE_DISTRO: centos7
     - MOLECULE_DISTRO: ubuntu1804
     - MOLECULE_DISTRO: ubuntu1604
-    - MOLECULE_DISTRO: debian9
+    - MOLECULE_DISTRO: debian10
 
-    # PHP 7.3.
-    - MOLECULE_DISTRO: centos7
+    # PHP 7.4.
+    - MOLECULE_DISTRO: centos8
       MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
-      MOLECULE_PLAYBOOK: playbook-7.3.yml
+      MOLECULE_PLAYBOOK: playbook-7.4.yml
     - MOLECULE_DISTRO: ubuntu1804
-      MOLECULE_PLAYBOOK: playbook-7.3.yml
-    - MOLECULE_DISTRO: ubuntu1604
-      MOLECULE_PLAYBOOK: playbook-7.3.yml
-    - MOLECULE_DISTRO: debian9
-      MOLECULE_PLAYBOOK: playbook-7.3.yml
+      MOLECULE_PLAYBOOK: playbook-7.4.yml
+    - MOLECULE_DISTRO: debian10
+      MOLECULE_PLAYBOOK: playbook-7.4.yml
 
-    # PHP 7.1.
-    - MOLECULE_DISTRO: centos7
-      MOLECULE_PLAYBOOK: playbook-7.1.yml
+    # PHP 7.2.
+    - MOLECULE_DISTRO: centos8
+      MOLECULE_PLAYBOOK: playbook-7.2.yml
     - MOLECULE_DISTRO: ubuntu1804
-      MOLECULE_PLAYBOOK: playbook-7.1.yml
+      MOLECULE_PLAYBOOK: playbook-7.2.yml
 
 install:
   # Install test dependencies.
diff --git a/provisioning/roles/geerlingguy.php-versions/README.md b/provisioning/roles/geerlingguy.php-versions/README.md
index f639b3509..c11d9b308 100644
--- a/provisioning/roles/geerlingguy.php-versions/README.md
+++ b/provisioning/roles/geerlingguy.php-versions/README.md
@@ -12,9 +12,9 @@ N/A
 
 Available variables are listed below, along with default values (see `defaults/main.yml`):
 
-    php_version: '7.2'
+    php_version: '7.3'
 
-The PHP version to be installed. Any [currently-supported PHP major version](http://php.net/supported-versions.php) is a valid option (e.g. `5.6`, `7.1`, `7.2`, `7.3`, etc.).
+The PHP version to be installed. Any [currently-supported PHP major version](http://php.net/supported-versions.php) is a valid option (e.g. `7.2`, `7.3`, `7.4` etc.).
 
     php_versions_install_recommends: false
 
@@ -30,7 +30,7 @@ The PHP version to be installed. Any [currently-supported PHP major version](htt
     - hosts: webservers
     
       vars:
-        php_version: '7.2'
+        php_version: '7.3'
     
       roles:
         - role: geerlingguy.repo-remi
diff --git a/provisioning/roles/geerlingguy.php-versions/defaults/main.yml b/provisioning/roles/geerlingguy.php-versions/defaults/main.yml
index 481414e06..289b1bac1 100644
--- a/provisioning/roles/geerlingguy.php-versions/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.php-versions/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
 # The PHP version to be installed.
-php_version: '7.2'
+php_version: '7.3'
 
 # For Debian OSes only.
 php_versions_install_recommends: false
diff --git a/provisioning/roles/geerlingguy.php-versions/meta/main.yml b/provisioning/roles/geerlingguy.php-versions/meta/main.yml
index 267f3b7fc..059eeebe0 100644
--- a/provisioning/roles/geerlingguy.php-versions/meta/main.yml
+++ b/provisioning/roles/geerlingguy.php-versions/meta/main.yml
@@ -6,7 +6,7 @@ galaxy_info:
   description: Allows different PHP versions to be installed.
   company: "Midwestern Mac, LLC"
   license: "MIT"
-  issue_tracker_url: https://github.com/geerlingguy/drupal-vm/issues
+  issue_tracker_url: https://github.com/geerlingguy/ansible-role-php-versions/issues
   min_ansible_version: 2.4
   platforms:
     - name: EL
diff --git a/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-7.1.yml b/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-7.2.yml
similarity index 95%
rename from provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-7.1.yml
rename to provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-7.2.yml
index 6cf74deb1..6ae3076f8 100644
--- a/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-7.1.yml
+++ b/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-7.2.yml
@@ -5,7 +5,7 @@
 
   vars:
     php_enable_webserver: false
-    php_version: '7.1'
+    php_version: '7.2'
 
   pre_tasks:
     - name: Update apt cache.
diff --git a/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-7.3.yml b/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-7.4.yml
similarity index 95%
rename from provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-7.3.yml
rename to provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-7.4.yml
index e6e55ca59..f42e56467 100644
--- a/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-7.3.yml
+++ b/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-7.4.yml
@@ -5,7 +5,7 @@
 
   vars:
     php_enable_webserver: false
-    php_version: '7.3'
+    php_version: '7.4'
 
   pre_tasks:
     - name: Update apt cache.
diff --git a/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook.yml
index 6ae3076f8..ab338668e 100644
--- a/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook.yml
+++ b/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook.yml
@@ -5,7 +5,6 @@
 
   vars:
     php_enable_webserver: false
-    php_version: '7.2'
 
   pre_tasks:
     - name: Update apt cache.
diff --git a/provisioning/roles/geerlingguy.php-versions/tasks/main.yml b/provisioning/roles/geerlingguy.php-versions/tasks/main.yml
index 29273e4b4..7820086e2 100644
--- a/provisioning/roles/geerlingguy.php-versions/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php-versions/tasks/main.yml
@@ -32,9 +32,3 @@
 
 # Setup tasks.
 - include_tasks: "setup-{{ ansible_os_family }}.yml"
-
-- name: Set the correct XHProf package when PHP 5.6 is used.
-  set_fact:
-    xhprof_download_url: https://github.com/phacility/xhprof/archive/master.tar.gz
-    xhprof_download_folder_name: xhprof-master
-  when: php_version == '5.6'
diff --git a/provisioning/roles/geerlingguy.php-versions/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.php-versions/tasks/setup-Debian.yml
index c43f64d6b..dda60bb5d 100644
--- a/provisioning/roles/geerlingguy.php-versions/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.php-versions/tasks/setup-Debian.yml
@@ -7,13 +7,6 @@
   apt_repository: repo='ppa:ondrej/php'
   when: ansible_distribution == "Ubuntu"
 
-- name: Add repository for PHP 5 compatibility packages (Ubuntu).
-  apt_repository: repo='ppa:ondrej/php5-compat'
-  when:
-    - php_version == "5.6"
-    - ansible_distribution == "Ubuntu"
-    - ansible_distribution_release != "bionic"
-
 # Debian-specific tasks.
 - name: Add dependencies for PHP versions (Debian).
   apt:
diff --git a/provisioning/roles/geerlingguy.php-versions/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.php-versions/tasks/setup-RedHat.yml
index a0b094b6a..3ab4bdad3 100644
--- a/provisioning/roles/geerlingguy.php-versions/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.php-versions/tasks/setup-RedHat.yml
@@ -1,16 +1,4 @@
 ---
-- name: Enable remi repo for PHP 5.6.
-  set_fact: php_enablerepo="remi,remi-php56"
-  when: php_version == "5.6"
-
-- name: Enable remi repo for PHP 7.0.
-  set_fact: php_enablerepo="remi,remi-php70"
-  when: php_version == "7.0"
-
-- name: Enable remi repo for PHP 7.1.
-  set_fact: php_enablerepo="remi,remi-php71"
-  when: php_version == "7.1"
-
 - name: Enable remi repo for PHP 7.2.
   set_fact: php_enablerepo="remi,remi-php72"
   when: php_version == "7.2"
@@ -18,3 +6,28 @@
 - name: Enable remi repo for PHP 7.3.
   set_fact: php_enablerepo="remi,remi-php73"
   when: php_version == "7.3"
+
+- name: Enable remi repo for PHP 7.4.
+  set_fact: php_enablerepo="remi,remi-php74"
+  when: php_version == "7.4"
+
+# See: https://github.com/ansible/ansible/issues/64852
+- block:
+  - name: Ensure dnf-plugins are installed on CentOS 8+.
+    yum:
+      name: dnf-plugins-core
+      state: present
+
+  - name: Enable DNF module for CentOS 8+.
+    shell: |
+      dnf config-manager --set-enabled PowerTools
+      dnf module enable -y php:remi-{{ php_version }}
+    args:
+      warn: false
+    register: dnf_module_enable
+    changed_when: "'Nothing to do' not in dnf_module_enable.stdout"
+
+  - debug: var=dnf_module_enable
+  when:
+    - ansible_os_family == 'RedHat'
+    - ansible_distribution_major_version | int >= 8
diff --git a/provisioning/roles/geerlingguy.php-versions/vars/Debian.yml b/provisioning/roles/geerlingguy.php-versions/vars/Debian.yml
index a1e76dbd3..678b29c3b 100644
--- a/provisioning/roles/geerlingguy.php-versions/vars/Debian.yml
+++ b/provisioning/roles/geerlingguy.php-versions/vars/Debian.yml
@@ -39,8 +39,5 @@ __php_packages:
   - "php{{ php_version }}-yaml"
 
 php_versions_debian:
-  - php5.6-common
-  - php7.0-common
-  - php7.1-common
   - php7.2-common
   - php7.3-common
diff --git a/tests/ubuntu-18-php73.config.yml b/tests/ubuntu-18-php74.config.yml
similarity index 78%
rename from tests/ubuntu-18-php73.config.yml
rename to tests/ubuntu-18-php74.config.yml
index a4ce489c0..736d0e6a8 100644
--- a/tests/ubuntu-18-php73.config.yml
+++ b/tests/ubuntu-18-php74.config.yml
@@ -1,4 +1,4 @@
 ---
-php_version: "7.3"
+php_version: "7.4"
 php_sendmail_path: "/usr/sbin/sendmail -t -i"
 installed_extras: []

From 660998dd6bd05d408af47b9f9ac689fb209c55b2 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 2 Dec 2019 14:43:57 -0600
Subject: [PATCH 1125/1273] Fix rubocop issues.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 0c245da08..a192d0c95 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,7 +59,7 @@ before_install:
 
 script:
   # Vagrantfile syntax check.
-  - 'rubocop ./Vagrantfile ./lib/drupalvm --except LineLength,Eval,MutableConstant,BlockLength,MethodLength,ConditionalAssignment,AlignParameters,IfUnlessModifier'
+  - 'rubocop ./Vagrantfile ./lib/drupalvm --except Metrics/LineLength,Security/Eval,Style/MutableConstant,Metrics/BlockLength,Metrics/MethodLength,Style/ConditionalAssignment,Style/IfUnlessModifier'
 
   # Run tests.
   - composer run-tests

From 9869396373b2c7a0c31fcba3dbbdc85269ea3230 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 3 Dec 2019 10:02:27 -0600
Subject: [PATCH 1126/1273] Issue #1994: Update CHANGELOG for 5.1.0 release [ci
 skip].

---
 CHANGELOG.md | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85735b187..390103a84 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,30 @@
 # Drupal VM Changelog
 
+## 5.1.0 "Recognizer" (2019-12-03)
+
+This release adds support for PHP 7.4, and completely drops PHP 5.6 support (in the past, brave and daring souls could attempt to run 5.6—it is almost impossible to do so in Drupal VM as of this release).
+
+### Breaking Changes
+
+  * #1987: Minimum required Ansible version is now 2.5.
+  * #1993: Dropped support for old unsupported PHP versions: 5.6, 7.0, 7.1.
+
+### New/changed variables in default.config.yml
+
+  * `drupalvm_ansible_version_min: '2.5'` (was `'2.4'`)
+  * `php_version` supports `"7.2"`, `"7.3"`, or `"7.4"` (5.6, 7.0, and 7.1 dropped)
+
+### Improvements
+
+  * #1993: Add PHP 7.4 support. Drop 5.6, 7.0, and 7.1 support.
+  * Updated roles: mailhog, postgresql, php-versions.
+  * Update `config.yml` documentation to use modern PHP version.
+
+### Bugfixes
+
+  * TODO
+
+
 ## 5.0.2 (2019-11-04)
 
 ### Breaking Changes
@@ -51,7 +76,7 @@ There are no major architectural changes in this release, which speaks to the cu
 
 ### Breaking Changes
 
-  * #1881: Ubuntu 18.04 is now the defaul.t OS version (and is used in the `geerlingguy/drupal-vm` base image `2.0.0` and later)
+  * #1881: Ubuntu 18.04 is now the default OS version (and is used in the `geerlingguy/drupal-vm` base image `2.0.0` and later)
     * Ubuntu 14.04 is no longer supported.
   * #1874: PHP 7.2 is now the default PHP version
     * PHP 5.6 is no longer supported (though you may be able to install it for some time).

From 3f4d5db5661430878419dbd4e58a757b88de646d Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 3 Dec 2019 13:48:21 -0600
Subject: [PATCH 1127/1273] Update geerlingguy.php-versions role.

---
 provisioning/requirements.yml                                | 2 +-
 .../roles/geerlingguy.php-versions/tasks/setup-RedHat.yml    | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 74d3149af..5fd6e8a48 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -56,7 +56,7 @@
 - src: geerlingguy.php-tideways
   version: 2.2.0
 - src: geerlingguy.php-versions
-  version: 4.0.0
+  version: 4.0.1
 - src: geerlingguy.php-xdebug
   version: 2.5.1
 - src: geerlingguy.php-xhprof
diff --git a/provisioning/roles/geerlingguy.php-versions/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.php-versions/tasks/setup-RedHat.yml
index 3ab4bdad3..d111cc181 100644
--- a/provisioning/roles/geerlingguy.php-versions/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.php-versions/tasks/setup-RedHat.yml
@@ -26,8 +26,3 @@
       warn: false
     register: dnf_module_enable
     changed_when: "'Nothing to do' not in dnf_module_enable.stdout"
-
-  - debug: var=dnf_module_enable
-  when:
-    - ansible_os_family == 'RedHat'
-    - ansible_distribution_major_version | int >= 8

From 6ce8f3ff31fffea9ebd465f6b49562d71c1a953e Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 3 Dec 2019 14:20:07 -0600
Subject: [PATCH 1128/1273] Update geerlingguy.php-versions role to fix bug in
 previous update.

---
 provisioning/requirements.yml                                | 2 +-
 .../roles/geerlingguy.php-versions/tasks/setup-RedHat.yml    | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 5fd6e8a48..f7d620adc 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -56,7 +56,7 @@
 - src: geerlingguy.php-tideways
   version: 2.2.0
 - src: geerlingguy.php-versions
-  version: 4.0.1
+  version: 4.0.2
 - src: geerlingguy.php-xdebug
   version: 2.5.1
 - src: geerlingguy.php-xhprof
diff --git a/provisioning/roles/geerlingguy.php-versions/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.php-versions/tasks/setup-RedHat.yml
index d111cc181..714e24fa9 100644
--- a/provisioning/roles/geerlingguy.php-versions/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.php-versions/tasks/setup-RedHat.yml
@@ -13,6 +13,7 @@
 
 # See: https://github.com/ansible/ansible/issues/64852
 - block:
+
   - name: Ensure dnf-plugins are installed on CentOS 8+.
     yum:
       name: dnf-plugins-core
@@ -26,3 +27,7 @@
       warn: false
     register: dnf_module_enable
     changed_when: "'Nothing to do' not in dnf_module_enable.stdout"
+
+  when:
+    - ansible_os_family == 'RedHat'
+    - ansible_distribution_major_version | int >= 8

From 84ae7efc8a21632ee84c801ef11780df3367e312 Mon Sep 17 00:00:00 2001
From: Joel Travieso <joel.travieso86@gmail.com>
Date: Thu, 5 Dec 2019 11:43:35 -0500
Subject: [PATCH 1129/1273] Include php_xdebug_version option in
 default.config.yml

Include php_xdebug_version in default.config.yml to provide visibility to this option
---
 default.config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/default.config.yml b/default.config.yml
index 1e7c4c77d..2f860b3a0 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -319,6 +319,7 @@ pimpmylog_install_dir: /usr/share/php/pimpmylog
 pimpmylog_grant_all_privs: true
 
 # XDebug configuration. XDebug is disabled by default for better performance.
+# php_xdebug_version: 2.6.0
 php_xdebug_default_enable: 0
 php_xdebug_coverage_enable: 0
 php_xdebug_cli_disable: yes

From d7fe6c4a129d36ab4e5514eabfdb3238897556fd Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 6 Dec 2019 15:18:43 -0600
Subject: [PATCH 1130/1273] Fixes #1976: Update geerlingguy.drupal role to
 latest version, use drupal-recommended composer template.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.drupal/README.md        |  7 ++--
 .../geerlingguy.drupal/defaults/main.yml      |  4 +--
 .../molecule/default/playbook.yml             |  1 +
 .../molecule/default/requirements.yml         |  1 +
 .../molecule/default/test-setup.yml           | 35 -------------------
 .../molecule/default/test-vars.yml            |  1 +
 7 files changed, 10 insertions(+), 41 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index f7d620adc..c6788a183 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -18,7 +18,7 @@
 - src: geerlingguy.daemonize
   version: 1.2.0
 - src: geerlingguy.drupal
-  version: 2.6.0
+  version: 3.0.0
 - src: geerlingguy.drupal-console
   version: 1.1.1
 - src: geerlingguy.drush
diff --git a/provisioning/roles/geerlingguy.drupal/README.md b/provisioning/roles/geerlingguy.drupal/README.md
index cea837c2b..fe3842632 100644
--- a/provisioning/roles/geerlingguy.drupal/README.md
+++ b/provisioning/roles/geerlingguy.drupal/README.md
@@ -56,7 +56,7 @@ Set this to `true` and `drupal_build_composer*` to `false` if you would like to
     drupal_composer_install_dir: "/var/www/drupal"
     drupal_composer_no_dev: true
     drupal_composer_dependencies:
-      - "drupal/devel:^1.2"
+      - "drush/drush:^10.1"
 
 Set `drupal_build_makefile` to `false` and this to `true` if you are using a Composer-based site deployment strategy. The other options should be relatively straightforward.
 
@@ -64,10 +64,10 @@ Set `drupal_build_makefile` to `false` and this to `true` if you are using a Com
 
 If you set the `bin-dir` in your project's `composer.json` file to a value other than `vendor/bin`, override this variable with the same directory path.
 
-### Create a new project using `drupal-project` (Composer)
+### Create a new project using `composer create-project` (Composer)
 
     drupal_build_composer_project: true
-    drupal_composer_project_package: "drupal-composer/drupal-project:8.x-dev"
+    drupal_composer_project_package: "drupal/recommended-project:^8@dev"
     drupal_composer_project_options: "--prefer-dist --stability dev --no-interaction"
 
 Set this to `true` and `drupal_build_makefile`, `drupal_build_composer` to `false` if you are using Composer's `create-project` as a site deployment strategy.
@@ -118,6 +118,7 @@ See the example playbooks used for Travis CI tests (`tests/test.yml` and `tests/
       roles:
         - geerlingguy.apache
         - geerlingguy.mysql
+        - geerlingguy.php-versions
         - geerlingguy.php
         - geerlingguy.php-mysql
         - geerlingguy.composer
diff --git a/provisioning/roles/geerlingguy.drupal/defaults/main.yml b/provisioning/roles/geerlingguy.drupal/defaults/main.yml
index 698610d10..215c4ed24 100644
--- a/provisioning/roles/geerlingguy.drupal/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.drupal/defaults/main.yml
@@ -25,13 +25,13 @@ drupal_composer_path: "/path/to/drupal.composer.json"
 drupal_composer_install_dir: "{{ drupal_deploy_dir }}"
 drupal_composer_no_dev: true
 drupal_composer_dependencies:
-  - "drupal/devel:^1.2"
+  - "drush/drush:^10.1"
 
 # Set this to 'true' and 'drupal_build_makefile', 'drupal_build_composer' to
 # 'false' if you are using Composer's create-project as a site deployment
 # strategy.
 drupal_build_composer_project: true
-drupal_composer_project_package: "drupal-composer/drupal-project:8.x-dev"
+drupal_composer_project_package: "drupal/recommended-project:^8@dev"
 drupal_composer_project_options: "--prefer-dist --stability dev --no-interaction"
 
 # Required Drupal settings.
diff --git a/provisioning/roles/geerlingguy.drupal/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.drupal/molecule/default/playbook.yml
index d3df1c657..3c30ac414 100644
--- a/provisioning/roles/geerlingguy.drupal/molecule/default/playbook.yml
+++ b/provisioning/roles/geerlingguy.drupal/molecule/default/playbook.yml
@@ -16,6 +16,7 @@
       when: ansible_distribution == 'Debian'
     - role: geerlingguy.apache
     - role: geerlingguy.mysql
+    - role: geerlingguy.php-versions
     - role: geerlingguy.php
     - role: geerlingguy.php-mysql
     - role: geerlingguy.git
diff --git a/provisioning/roles/geerlingguy.drupal/molecule/default/requirements.yml b/provisioning/roles/geerlingguy.drupal/molecule/default/requirements.yml
index 7b6b56cd2..c630c6cc5 100644
--- a/provisioning/roles/geerlingguy.drupal/molecule/default/requirements.yml
+++ b/provisioning/roles/geerlingguy.drupal/molecule/default/requirements.yml
@@ -6,6 +6,7 @@
 - src: geerlingguy.nginx
 - src: geerlingguy.mysql
 - src: geerlingguy.postgresql
+- src: geerlingguy.php-versions
 - src: geerlingguy.php
 - src: geerlingguy.php-mysql
 - src: geerlingguy.php-pgsql
diff --git a/provisioning/roles/geerlingguy.drupal/molecule/default/test-setup.yml b/provisioning/roles/geerlingguy.drupal/molecule/default/test-setup.yml
index fe8363f90..5427ef5e3 100644
--- a/provisioning/roles/geerlingguy.drupal/molecule/default/test-setup.yml
+++ b/provisioning/roles/geerlingguy.drupal/molecule/default/test-setup.yml
@@ -9,38 +9,3 @@
     - curl
     - unzip
     - sendmail
-
-- name: Add repository for Apache 2.4.9+ (Ubuntu 14).
-  apt_repository: repo='ppa:ondrej/apache2'
-  when: ansible_distribution == "Ubuntu" and ansible_distribution_release == "trusty"
-
-- name: Add repository for PHP 7.0 (Ubuntu).
-  apt_repository: repo='ppa:ondrej/php'
-  when: ansible_distribution == "Ubuntu" and ansible_distribution_version != "16.04"
-
-- name: Set php_packages for PHP 7.0 Debian install.
-  set_fact:
-    php_packages:
-      - php7.0-common
-      - php7.0-cli
-      - php7.0-curl
-      - php7.0-dev
-      - php7.0-fpm
-      - libpcre3-dev
-      - php7.0-opcache
-      - php7.0-apcu
-      - php7.0-xml
-      - php7.0-zip
-      - php7.0-mbstring
-      - php7.0-json
-      - php7.0-gd
-  when: ansible_distribution == 'Debian'
-
-- name: Copy initctl_faker into place for Ubuntu 14.04.
-  copy:
-    src: initctl_faker
-    dest: /sbin/initctl
-    mode: 0755
-    force: true
-  when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '14.04'
-  changed_when: false
diff --git a/provisioning/roles/geerlingguy.drupal/molecule/default/test-vars.yml b/provisioning/roles/geerlingguy.drupal/molecule/default/test-vars.yml
index bdfcd52b9..e53e73e39 100644
--- a/provisioning/roles/geerlingguy.drupal/molecule/default/test-vars.yml
+++ b/provisioning/roles/geerlingguy.drupal/molecule/default/test-vars.yml
@@ -1,4 +1,5 @@
 ---
+php_version: "7.3"
 php_enable_webserver: false
 php_enablerepo: "remi,remi-php71"
 php_enable_php_fpm: true

From 8102ab0f0842cd17930d51920d220c0d8ad824ae Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 9 Dec 2019 09:26:32 -0600
Subject: [PATCH 1131/1273] Fixes #1992: Update franklinkim.newrelic role to
 new weareinteractive namespace.

---
 docs/extras/newrelic.md                       |   2 +-
 provisioning/playbook.yml                     |   2 +-
 provisioning/requirements.yml                 |   4 +-
 .../roles/franklinkim.newrelic/Makefile       |  25 ---
 .../roles/franklinkim.newrelic/Vagrantfile    |  23 --
 .../roles/franklinkim.newrelic/meta/main.yml  | 199 ------------------
 .../roles/franklinkim.newrelic/tests/main.yml |   8 -
 .../weareinteractive.newrelic/.ansible-lint   |   2 +
 .../.clog.toml                                |   0
 .../.editorconfig                             |   0
 .../.gitignore                                |   0
 .../.travis.yml                               |  12 +-
 .../CHANGELOG.md                              |  14 ++
 .../LICENSE                                   |   0
 .../roles/weareinteractive.newrelic/Makefile  |  35 +++
 .../README.md                                 |  25 ++-
 .../defaults/main.yml                         |   0
 .../handlers/main.yml                         |   0
 .../weareinteractive.newrelic/meta/main.yml   | 142 +++++++++++++
 .../meta/readme.yml                           |   8 +-
 .../tasks/config.yml                          |   0
 .../tasks/install.yml                         |   0
 .../tasks/install_debian.yml                  |  10 +-
 .../tasks/install_redhat.yml                  |   4 +-
 .../tasks/main.yml                            |   2 +-
 .../tasks/service.yml                         |   0
 .../templates/etc/newrelic/nrsysmond.cfg.j2   |   0
 .../weareinteractive.newrelic/tests/main.yml  |  11 +
 28 files changed, 243 insertions(+), 285 deletions(-)
 delete mode 100644 provisioning/roles/franklinkim.newrelic/Makefile
 delete mode 100644 provisioning/roles/franklinkim.newrelic/Vagrantfile
 delete mode 100644 provisioning/roles/franklinkim.newrelic/meta/main.yml
 delete mode 100644 provisioning/roles/franklinkim.newrelic/tests/main.yml
 create mode 100644 provisioning/roles/weareinteractive.newrelic/.ansible-lint
 rename provisioning/roles/{franklinkim.newrelic => weareinteractive.newrelic}/.clog.toml (100%)
 rename provisioning/roles/{franklinkim.newrelic => weareinteractive.newrelic}/.editorconfig (100%)
 rename provisioning/roles/{franklinkim.newrelic => weareinteractive.newrelic}/.gitignore (100%)
 rename provisioning/roles/{franklinkim.newrelic => weareinteractive.newrelic}/.travis.yml (88%)
 rename provisioning/roles/{franklinkim.newrelic => weareinteractive.newrelic}/CHANGELOG.md (89%)
 rename provisioning/roles/{franklinkim.newrelic => weareinteractive.newrelic}/LICENSE (100%)
 create mode 100644 provisioning/roles/weareinteractive.newrelic/Makefile
 rename provisioning/roles/{franklinkim.newrelic => weareinteractive.newrelic}/README.md (79%)
 rename provisioning/roles/{franklinkim.newrelic => weareinteractive.newrelic}/defaults/main.yml (100%)
 rename provisioning/roles/{franklinkim.newrelic => weareinteractive.newrelic}/handlers/main.yml (100%)
 create mode 100644 provisioning/roles/weareinteractive.newrelic/meta/main.yml
 rename provisioning/roles/{franklinkim.newrelic => weareinteractive.newrelic}/meta/readme.yml (61%)
 rename provisioning/roles/{franklinkim.newrelic => weareinteractive.newrelic}/tasks/config.yml (100%)
 rename provisioning/roles/{franklinkim.newrelic => weareinteractive.newrelic}/tasks/install.yml (100%)
 rename provisioning/roles/{franklinkim.newrelic => weareinteractive.newrelic}/tasks/install_debian.yml (76%)
 rename provisioning/roles/{franklinkim.newrelic => weareinteractive.newrelic}/tasks/install_redhat.yml (77%)
 rename provisioning/roles/{franklinkim.newrelic => weareinteractive.newrelic}/tasks/main.yml (88%)
 rename provisioning/roles/{franklinkim.newrelic => weareinteractive.newrelic}/tasks/service.yml (100%)
 rename provisioning/roles/{franklinkim.newrelic => weareinteractive.newrelic}/templates/etc/newrelic/nrsysmond.cfg.j2 (100%)
 create mode 100644 provisioning/roles/weareinteractive.newrelic/tests/main.yml

diff --git a/docs/extras/newrelic.md b/docs/extras/newrelic.md
index 01a45b596..522e4c264 100644
--- a/docs/extras/newrelic.md
+++ b/docs/extras/newrelic.md
@@ -20,4 +20,4 @@ newrelic_license_key: yourkey
 
 See [New Relic for PHP](https://docs.newrelic.com/docs/agents/php-agent/getting-started/new-relic-php) for help getting started.
 
-For a list of available role variables, see the [`franklinkim.newrelic` Ansible role's README](https://github.com/weareinteractive/ansible-newrelic#readme).
+For a list of available role variables, see the [`weareinteractive.newrelic` Ansible role's README](https://github.com/weareinteractive/ansible-newrelic#readme).
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 1dbd66144..f16a160f2 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -80,7 +80,7 @@
     - { role: geerlingguy.pimpmylog, when: '"pimpmylog" in installed_extras' }
     - { role: geerlingguy.daemonize, when: '"mailhog" in installed_extras' }
     - { role: geerlingguy.mailhog, when: '"mailhog" in installed_extras' }
-    - { role: franklinkim.newrelic, when: '"newrelic" in installed_extras' }
+    - { role: weareinteractive.newrelic, when: '"newrelic" in installed_extras' }
     - { role: geerlingguy.nodejs, when: '"nodejs" in installed_extras' }
     - { role: geerlingguy.redis, when: '"redis" in installed_extras' }
     - { role: geerlingguy.php-redis, when: '"redis" in installed_extras', tags: ['php'] }
diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index c6788a183..fe8155bef 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -3,8 +3,8 @@
   version: 2.2.2
 - src: thom8.php-upload-progress
   version: 1.0.1
-- src: franklinkim.newrelic
-  version: 1.7.2
+- src: weareinteractive.newrelic
+  version: 1.8.0
 - src: geerlingguy.adminer
   version: 1.2.0
 - src: geerlingguy.apache
diff --git a/provisioning/roles/franklinkim.newrelic/Makefile b/provisioning/roles/franklinkim.newrelic/Makefile
deleted file mode 100644
index 458633e98..000000000
--- a/provisioning/roles/franklinkim.newrelic/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-PWD=$(shell pwd)
-ROLE_NAME=franklinkim.newrelic
-ROLE_PATH=/etc/ansible/roles/$(ROLE_NAME)
-TEST_VERSION=ansible --version
-TEST_SYNTAX=ansible-playbook -v -i 'localhost,' -c local $(ROLE_PATH)/tests/main.yml --syntax-check
-TEST_PLAYBOOK=ansible-playbook -vvvv -i 'localhost,' -c local $(ROLE_PATH)/tests/main.yml
-TEST_CMD=$(TEST_VERSION); $(TEST_SYNTAX); $(TEST_PLAYBOOK); $(TEST_PLAYBOOK)
-
-ubuntu16.04: dist=ubuntu-16.04
-ubuntu16.04: .run
-
-ubuntu14.04: dist=ubuntu-14.04
-ubuntu14.04: .run
-
-debian9: dist=debian-9
-debian9: .run
-
-debian8: dist=debian-8
-debian8: .run
-
-centos7: dist=el-7
-centos7: .run
-
-.run:
-	docker run -it --rm -v $(PWD):$(ROLE_PATH) ansiblecheck/ansiblecheck:$(dist) /bin/bash -c "$(TEST_CMD)"
diff --git a/provisioning/roles/franklinkim.newrelic/Vagrantfile b/provisioning/roles/franklinkim.newrelic/Vagrantfile
deleted file mode 100644
index 6898da7a4..000000000
--- a/provisioning/roles/franklinkim.newrelic/Vagrantfile
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.configure("2") do |config|
-  config.vbguest.no_remote = true
-  config.vbguest.auto_update = false
-
-  config.vm.define 'trusty' do |instance|
-    instance.vm.box = 'ubuntu/trusty64'
-  end
-
-  config.vm.define 'centos7' do |instance|
-    instance.vm.box = 'geerlingguy/centos7'
-  end
-
-  # View the documentation for the provider you're using for more
-  # information on available options.
-  config.vm.provision "ansible" do |ansible|
-    ansible.playbook = "tests/main.yml"
-    ansible.verbose = 'vv'
-    ansible.sudo = true
-  end
-end
diff --git a/provisioning/roles/franklinkim.newrelic/meta/main.yml b/provisioning/roles/franklinkim.newrelic/meta/main.yml
deleted file mode 100644
index efa4e96a0..000000000
--- a/provisioning/roles/franklinkim.newrelic/meta/main.yml
+++ /dev/null
@@ -1,199 +0,0 @@
----
-galaxy_info:
-  author: franklin
-  company: We Are Interactive
-  description: Installs and configure newrelic
-  min_ansible_version: 2.0
-  license: MIT
-  # Optionally specify the branch Galaxy will use when accessing the GitHub
-  # repo for this role. During role install, if no tags are available,
-  # Galaxy will use this branch. During import Galaxy will access files on
-  # this branch. If travis integration is cofigured, only notification for this
-  # branch will be accepted. Otherwise, in all cases, the repo's default branch
-  # (usually master) will be used.
-  github_branch: master
-  #
-  # List tags for your role here, one per line. A tag is
-  # a keyword that describes and categorizes the role.
-  # Users find roles by searching for tags. Be sure to
-  # remove the '[]' above if you add tags to this list.
-  #
-  # NOTE: A tag is limited to a single word comprised of
-  # alphanumeric characters. Maximum 20 tags per role.
-  #
-  galaxy_tags:
-    - monitoring
-    - newrelic
-  #
-  # Below are all platforms currently available. Just uncomment
-  # the ones that apply to your role. If you don't see your
-  # platform on this list, let us know and we'll get it added!
-  #
-  platforms:
-  #- name: OpenBSD
-  #  versions:
-  #    - all
-  #    - 5.6
-  #    - 5.7
-  #    - 5.8
-  #    - 5.9
-  #    - 6.0
-  #- name: Fedora
-  #  versions:
-  #    - all
-  #   - 16
-  #   - 17
-  #   - 18
-  #   - 19
-  #   - 20
-  #   - 21
-  #   - 22
-  #   - 23
-  #   - 24
-  #- name: DellOS
-  #  versions:
-  #    - all
-  #    - 10
-  #    - 6
-  #    - 9
-  #- name: MacOSX
-  #  versions:
-  #    - all
-  #    - 10.10
-  #    - 10.11
-  #    - 10.12
-  #    - 10.7
-  #    - 10.8
-  #    - 10.9
-  #- name: Junos
-  #  versions:
-  #    - all
-  #    - any
-  #- name: GenericBSD
-  #  versions:
-  #    - all
-  #    - any
-  #- name: Void Linux
-  #  versions:
-  #    - all
-  #    - any
-  #- name: GenericLinux
-  #  versions:
-  #    - all
-  #    - any
-  #- name: NXOS
-  #  versions:
-  #    - all
-  #    - any
-  #- name: IOS
-  #  versions:
-  #    - all
-  #    - any
-  #- name: Amazon
-  #  versions:
-  #    - all
-  #    - 2013.03
-  #    - 2013.09
-  #    - 2016.03
-  #- name: ArchLinux
-  #  versions:
-  #    - all
-  #    - any
-  #- name: FreeBSD
-  #  versions:
-  #    - all
-  #    - 10.0
-  #    - 10.1
-  #    - 10.2
-  #    - 10.3
-  #    - 8.0
-  #    - 8.1
-  #    - 8.2
-  #    - 8.3
-  #    - 8.4
-  #    - 9.0
-  #    - 9.1
-  #    - 9.1
-  #    - 9.2
-  #    - 9.3
-  - name: Ubuntu
-    versions:
-  #    - all
-  #    - lucid
-  #    - maverick
-  #    - natty
-  #    - oneiric
-  #    - precise
-  #    - quantal
-  #    - raring
-  #    - saucy
-      - trusty
-  #    - utopic
-  #    - vivid
-  #    - wily
-      - xenial
-  - name: Debian
-    versions:
-  #    - all
-  #    - etch
-      - jessie
-  #    - lenny
-  #    - sid
-  #    - squeeze
-      - stretch
-  #    - wheezy
-  - name: EL
-    versions:
-  #    - all
-  #    - 5
-  #    - 6
-      - 7
-  #- name: Windows
-  #  versions:
-  #    - all
-  #    - 2012R2
-  #- name: SmartOS
-  #  versions:
-  #    - all
-  #    - any
-  #- name: opensuse
-  #  versions:
-  #    - all
-  #    - 12.1
-  #    - 12.2
-  #    - 12.3
-  #    - 13.1
-  #    - 13.2
-  #- name: SLES
-  #  versions:
-  #    - all
-  #    - 10SP3
-  #    - 10SP4
-  #    - 11
-  #    - 11SP1
-  #    - 11SP2
-  #    - 11SP3
-  #    - 11SP4
-  #    - 12
-  #    - 12SP1
-  #- name: GenericUNIX
-  #  versions:
-  #    - all
-  #    - any
-  #- name: Solaris
-  #  versions:
-  #    - all
-  #    - 10
-  #    - 11.0
-  #    - 11.1
-  #    - 11.2
-  #    - 11.3
-  #- name: eos
-  #  versions:
-  #    - all
-  #    - Any
-# List your role dependencies here, one per line. Only
-# dependencies available via galaxy should be listed here.
-# Be sure to remove the '[]' above if you add dependencies
-# to this list.
-dependencies: []
diff --git a/provisioning/roles/franklinkim.newrelic/tests/main.yml b/provisioning/roles/franklinkim.newrelic/tests/main.yml
deleted file mode 100644
index e35a5b5a9..000000000
--- a/provisioning/roles/franklinkim.newrelic/tests/main.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-
-- hosts: all
-  roles:
-    - franklinkim.newrelic
-  vars:
-    newrelic_service_state: started
-    newrelic_license_key: ab2fa361cd4d0d373833cad619d7bcc424d27c16
diff --git a/provisioning/roles/weareinteractive.newrelic/.ansible-lint b/provisioning/roles/weareinteractive.newrelic/.ansible-lint
new file mode 100644
index 000000000..cf73c0ec5
--- /dev/null
+++ b/provisioning/roles/weareinteractive.newrelic/.ansible-lint
@@ -0,0 +1,2 @@
+exclude_paths:
+  - ./meta/readme.yml
diff --git a/provisioning/roles/franklinkim.newrelic/.clog.toml b/provisioning/roles/weareinteractive.newrelic/.clog.toml
similarity index 100%
rename from provisioning/roles/franklinkim.newrelic/.clog.toml
rename to provisioning/roles/weareinteractive.newrelic/.clog.toml
diff --git a/provisioning/roles/franklinkim.newrelic/.editorconfig b/provisioning/roles/weareinteractive.newrelic/.editorconfig
similarity index 100%
rename from provisioning/roles/franklinkim.newrelic/.editorconfig
rename to provisioning/roles/weareinteractive.newrelic/.editorconfig
diff --git a/provisioning/roles/franklinkim.newrelic/.gitignore b/provisioning/roles/weareinteractive.newrelic/.gitignore
similarity index 100%
rename from provisioning/roles/franklinkim.newrelic/.gitignore
rename to provisioning/roles/weareinteractive.newrelic/.gitignore
diff --git a/provisioning/roles/franklinkim.newrelic/.travis.yml b/provisioning/roles/weareinteractive.newrelic/.travis.yml
similarity index 88%
rename from provisioning/roles/franklinkim.newrelic/.travis.yml
rename to provisioning/roles/weareinteractive.newrelic/.travis.yml
index dc0ff1a4a..6aa123b45 100644
--- a/provisioning/roles/franklinkim.newrelic/.travis.yml
+++ b/provisioning/roles/weareinteractive.newrelic/.travis.yml
@@ -5,22 +5,22 @@ services:
   - docker
 env:
   global:
-    - role: franklinkim.newrelic
+    - role: weareinteractive.newrelic
   matrix:
     - distribution: Ubuntu
-      distribution_version: xenial
+      distribution_version: "18.04"
       init: /lib/systemd/systemd
       run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     - distribution: Ubuntu
-      distribution_version: trusty
+      distribution_version: "16.04"
       init: /sbin/init
-      run_opts: ""
+      run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     - distribution: Debian
-      distribution_version: stretch
+      distribution_version: "9"
       init: /lib/systemd/systemd
       run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     - distribution: Debian
-      distribution_version: jessie
+      distribution_version: "8"
       init: /lib/systemd/systemd
       run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
     - distribution: EL
diff --git a/provisioning/roles/franklinkim.newrelic/CHANGELOG.md b/provisioning/roles/weareinteractive.newrelic/CHANGELOG.md
similarity index 89%
rename from provisioning/roles/franklinkim.newrelic/CHANGELOG.md
rename to provisioning/roles/weareinteractive.newrelic/CHANGELOG.md
index 602d23980..6c4f4ae5b 100644
--- a/provisioning/roles/franklinkim.newrelic/CHANGELOG.md
+++ b/provisioning/roles/weareinteractive.newrelic/CHANGELOG.md
@@ -1,3 +1,17 @@
+<a name="1.8.0"></a>
+## 1.8.0 (2019-12-08)
+
+
+#### Features
+
+*   update role name ([5979af34](https://github.com/weareinteractive/ansible-newrelic/commit/5979af343fe2905660a3829705894ba05424cdca))
+
+#### Bug Fixes
+
+*   add gpg dependency and loop update syntax ([bd11a60b](https://github.com/weareinteractive/ansible-newrelic/commit/bd11a60b10be3bb945f87edc1a9d34d5773d5fa9))
+
+
+
 <a name="1.7.2"></a>
 ### 1.7.2 (2018-04-25)
 
diff --git a/provisioning/roles/franklinkim.newrelic/LICENSE b/provisioning/roles/weareinteractive.newrelic/LICENSE
similarity index 100%
rename from provisioning/roles/franklinkim.newrelic/LICENSE
rename to provisioning/roles/weareinteractive.newrelic/LICENSE
diff --git a/provisioning/roles/weareinteractive.newrelic/Makefile b/provisioning/roles/weareinteractive.newrelic/Makefile
new file mode 100644
index 000000000..80d9e5fb8
--- /dev/null
+++ b/provisioning/roles/weareinteractive.newrelic/Makefile
@@ -0,0 +1,35 @@
+PWD=$(shell pwd)
+ROLE_NAME=weareinteractive.newrelic
+ROLE_PATH=/etc/ansible/roles/$(ROLE_NAME)
+TEST_VERSION=ansible --version
+TEST_SYNTAX=ansible-playbook -v -i 'localhost,' -c local $(ROLE_PATH)/tests/main.yml --syntax-check
+TEST_PLAYBOOK=ansible-playbook -vvvv -i 'localhost,' -c local $(ROLE_PATH)/tests/main.yml
+TEST_IDEMPOTENT=$(TEST_PLAYBOOK) | grep -q 'changed=0.*failed=0' && (echo 'Idempotence test: pass' && exit 0) || (echo 'Idempotence test: fail' && exit 1)
+TEST_CMD=$(TEST_VERSION); $(TEST_SYNTAX); $(TEST_PLAYBOOK); $(TEST_IDEMPOTENT)
+
+docs:
+	ansible-role docgen
+
+lint:
+	ansible-lint .
+
+ubuntu18.04: dist=ubuntu-18.04
+ubuntu18.04: .run
+
+ubuntu16.04: dist=ubuntu-16.04
+ubuntu16.04: .run
+
+debian9: dist=debian-9
+debian9: .run
+
+debian8: dist=debian-8
+debian8: .run
+
+centos7: dist=el-7
+centos7: .run
+
+.run:
+	@echo "RUN:"
+	@echo "	docker run -it --rm -v $(PWD):$(ROLE_PATH) ansiblecheck/ansiblecheck:$(dist) /bin/bash"
+	@echo "	$(TEST_CMD)"
+	@docker run -it --rm -v $(PWD):$(ROLE_PATH) ansiblecheck/ansiblecheck:$(dist) /bin/bash -c "$(TEST_CMD)"
diff --git a/provisioning/roles/franklinkim.newrelic/README.md b/provisioning/roles/weareinteractive.newrelic/README.md
similarity index 79%
rename from provisioning/roles/franklinkim.newrelic/README.md
rename to provisioning/roles/weareinteractive.newrelic/README.md
index 597470deb..e1258de51 100644
--- a/provisioning/roles/franklinkim.newrelic/README.md
+++ b/provisioning/roles/weareinteractive.newrelic/README.md
@@ -1,39 +1,43 @@
-# Ansible franklinkim.newrelic role
+# Ansible weareinteractive.newrelic role
 
 [![Build Status](https://img.shields.io/travis/weareinteractive/ansible-newrelic.svg)](https://travis-ci.org/weareinteractive/ansible-newrelic)
-[![Galaxy](http://img.shields.io/badge/galaxy-franklinkim.newrelic-blue.svg)](https://galaxy.ansible.com/franklinkim/newrelic/)
+[![Galaxy](http://img.shields.io/badge/galaxy-weareinteractive.newrelic-blue.svg)](https://galaxy.ansible.com/weareinteractive/newrelic/)
 [![GitHub Tags](https://img.shields.io/github/tag/weareinteractive/ansible-newrelic.svg)](https://github.com/weareinteractive/ansible-newrelic)
 [![GitHub Stars](https://img.shields.io/github/stars/weareinteractive/ansible-newrelic.svg)](https://github.com/weareinteractive/ansible-newrelic)
 
-> `franklinkim.newrelic` is an [Ansible](http://www.ansible.com) role which:
+> `weareinteractive.newrelic` is an [Ansible](http://www.ansible.com) role which:
 >
 > * installs newrelic
 > * configures newrelic
 > * configures service
 
+**Note:**
+
+> Since Ansible Galaxy supports [organization](https://www.ansible.com/blog/ansible-galaxy-2-release) now, this role has moved from `franklinkim.newrelic` to `weareinteractive.newrelic`!
+
 ## Installation
 
 Using `ansible-galaxy`:
 
 ```shell
-$ ansible-galaxy install franklinkim.newrelic
+$ ansible-galaxy install weareinteractive.newrelic
 ```
 
 Using `requirements.yml`:
 
 ```yaml
-- src: franklinkim.newrelic
+- src: weareinteractive.newrelic
 ```
 
 Using `git`:
 
 ```shell
-$ git clone https://github.com/weareinteractive/ansible-newrelic.git franklinkim.newrelic
+$ git clone https://github.com/weareinteractive/ansible-newrelic.git weareinteractive.newrelic
 ```
 
 ## Dependencies
 
-* Ansible >= 2.0
+* Ansible >= 2.4
 
 ## Variables
 
@@ -97,11 +101,14 @@ This is an example playbook:
 ---
 
 - hosts: all
+  become: yes
   roles:
-    - franklinkim.newrelic
+    - weareinteractive.newrelic
   vars:
-    newrelic_service_state: started
     newrelic_license_key: ab2fa361cd4d0d373833cad619d7bcc424d27c16
+    # not starting service in docker env
+    newrelic_service_state: stopped
+    newrelic_service_enabled: false
 
 ```
 
diff --git a/provisioning/roles/franklinkim.newrelic/defaults/main.yml b/provisioning/roles/weareinteractive.newrelic/defaults/main.yml
similarity index 100%
rename from provisioning/roles/franklinkim.newrelic/defaults/main.yml
rename to provisioning/roles/weareinteractive.newrelic/defaults/main.yml
diff --git a/provisioning/roles/franklinkim.newrelic/handlers/main.yml b/provisioning/roles/weareinteractive.newrelic/handlers/main.yml
similarity index 100%
rename from provisioning/roles/franklinkim.newrelic/handlers/main.yml
rename to provisioning/roles/weareinteractive.newrelic/handlers/main.yml
diff --git a/provisioning/roles/weareinteractive.newrelic/meta/main.yml b/provisioning/roles/weareinteractive.newrelic/meta/main.yml
new file mode 100644
index 000000000..91c86806c
--- /dev/null
+++ b/provisioning/roles/weareinteractive.newrelic/meta/main.yml
@@ -0,0 +1,142 @@
+---
+galaxy_info:
+  author: franklin
+  company: We Are Interactive
+  description: Installs and configure newrelic
+  min_ansible_version: 2.4
+  license: MIT
+  # Optionally specify the branch Galaxy will use when accessing the GitHub
+  # repo for this role. During role install, if no tags are available,
+  # Galaxy will use this branch. During import Galaxy will access files on
+  # this branch. If travis integration is cofigured, only notification for this
+  # branch will be accepted. Otherwise, in all cases, the repo's default branch
+  # (usually master) will be used.
+  github_branch: master
+  #
+  # Below are all platforms currently available. Just uncomment
+  # the ones that apply to your role. If you don't see your
+  # platform on this list, let us know and we'll get it added!
+  #
+  platforms:
+  - name: EL
+    versions:
+    - all
+  #  - 5
+  #  - 6
+  #  - 7
+  #- name: GenericUNIX
+  #  versions:
+  #  - all
+  #  - any
+  #- name: Solaris
+  #  versions:
+  #  - all
+  #  - 10
+  #  - 11.0
+  #  - 11.1
+  #  - 11.2
+  #  - 11.3
+  #- name: Fedora
+  #  versions:
+  #  - all
+  #  - 16
+  #  - 17
+  #  - 18
+  #  - 19
+  #  - 20
+  #  - 21
+  #  - 22
+  #  - 23
+  #- name: Windows
+  #  versions:
+  #  - all
+  #  - 2012R2
+  #- name: SmartOS
+  #  versions:
+  #  - all
+  #  - any
+  #- name: opensuse
+  #  versions:
+  #  - all
+  #  - 12.1
+  #  - 12.2
+  #  - 12.3
+  #  - 13.1
+  #  - 13.2
+  #- name: Amazon
+  #  versions:
+  #  - all
+  #  - 2013.03
+  #  - 2013.09
+  #- name: GenericBSD
+  #  versions:
+  #  - all
+  #  - any
+  #- name: FreeBSD
+  #  versions:
+  #  - all
+  #  - 10.0
+  #  - 10.1
+  #  - 10.2
+  #  - 8.0
+  #  - 8.1
+  #  - 8.2
+  #  - 8.3
+  #  - 8.4
+  #  - 9.0
+  #  - 9.1
+  #  - 9.1
+  #  - 9.2
+  #  - 9.3
+  - name: Ubuntu
+    versions:
+    - all
+  #  - lucid
+  #  - maverick
+  #  - natty
+  #  - oneiric
+  #  - precise
+  #  - quantal
+  #  - raring
+  #  - saucy
+  #  - trusty
+  #  - utopic
+  #  - vivid
+  #  - wily
+  #- name: SLES
+  #  versions:
+  #  - all
+  #  - 10SP3
+  #  - 10SP4
+  #  - 11
+  #  - 11SP1
+  #  - 11SP2
+  #  - 11SP3
+  #- name: GenericLinux
+  #  versions:
+  #  - all
+  #  - any
+  - name: Debian
+    versions:
+    - all
+  #  - etch
+  #  - jessie
+  #  - lenny
+  #  - squeeze
+  #  - wheezy
+  #
+  # List tags for your role here, one per line. A tag is
+  # a keyword that describes and categorizes the role.
+  # Users find roles by searching for tags. Be sure to
+  # remove the '[]' above if you add tags to this list.
+  #
+  # NOTE: A tag is limited to a single word comprised of
+  # alphanumeric characters. Maximum 20 tags per role.
+  galaxy_tags:
+    - monitoring
+    - newrelic
+# List your role dependencies here, one per line. Only
+# dependencies available via galaxy should be listed here.
+# Be sure to remove the '[]' above if you add dependencies
+# to this list.
+dependencies: []
diff --git a/provisioning/roles/franklinkim.newrelic/meta/readme.yml b/provisioning/roles/weareinteractive.newrelic/meta/readme.yml
similarity index 61%
rename from provisioning/roles/franklinkim.newrelic/meta/readme.yml
rename to provisioning/roles/weareinteractive.newrelic/meta/readme.yml
index 56aa1551c..74b51f080 100644
--- a/provisioning/roles/franklinkim.newrelic/meta/readme.yml
+++ b/provisioning/roles/weareinteractive.newrelic/meta/readme.yml
@@ -1,14 +1,18 @@
 ---
 
-galaxy_name: franklinkim.newrelic
+galaxy_name: weareinteractive.newrelic
 github_user: weareinteractive
 github_name: ansible-newrelic
 badges: |
   [![Build Status](https://img.shields.io/travis/weareinteractive/ansible-newrelic.svg)](https://travis-ci.org/weareinteractive/ansible-newrelic)
-  [![Galaxy](http://img.shields.io/badge/galaxy-franklinkim.newrelic-blue.svg)](https://galaxy.ansible.com/franklinkim/newrelic/)
+  [![Galaxy](http://img.shields.io/badge/galaxy-weareinteractive.newrelic-blue.svg)](https://galaxy.ansible.com/weareinteractive/newrelic/)
   [![GitHub Tags](https://img.shields.io/github/tag/weareinteractive/ansible-newrelic.svg)](https://github.com/weareinteractive/ansible-newrelic)
   [![GitHub Stars](https://img.shields.io/github/stars/weareinteractive/ansible-newrelic.svg)](https://github.com/weareinteractive/ansible-newrelic)
 description: |
   > * installs newrelic
   > * configures newrelic
   > * configures service
+
+  **Note:**
+
+  > Since Ansible Galaxy supports [organization](https://www.ansible.com/blog/ansible-galaxy-2-release) now, this role has moved from `franklinkim.newrelic` to `weareinteractive.newrelic`!
diff --git a/provisioning/roles/franklinkim.newrelic/tasks/config.yml b/provisioning/roles/weareinteractive.newrelic/tasks/config.yml
similarity index 100%
rename from provisioning/roles/franklinkim.newrelic/tasks/config.yml
rename to provisioning/roles/weareinteractive.newrelic/tasks/config.yml
diff --git a/provisioning/roles/franklinkim.newrelic/tasks/install.yml b/provisioning/roles/weareinteractive.newrelic/tasks/install.yml
similarity index 100%
rename from provisioning/roles/franklinkim.newrelic/tasks/install.yml
rename to provisioning/roles/weareinteractive.newrelic/tasks/install.yml
diff --git a/provisioning/roles/franklinkim.newrelic/tasks/install_debian.yml b/provisioning/roles/weareinteractive.newrelic/tasks/install_debian.yml
similarity index 76%
rename from provisioning/roles/franklinkim.newrelic/tasks/install_debian.yml
rename to provisioning/roles/weareinteractive.newrelic/tasks/install_debian.yml
index 18158de11..e65ac6cef 100644
--- a/provisioning/roles/franklinkim.newrelic/tasks/install_debian.yml
+++ b/provisioning/roles/weareinteractive.newrelic/tasks/install_debian.yml
@@ -2,8 +2,10 @@
 
 - name: Installing dependencies
   apt:
-    pkg: apt-transport-https
-    update_cache: yes
+    pkg:
+      - apt-transport-https
+      - ca-certificates
+      - gnupg2
     state: present
 
 - name: Adding APT key
@@ -18,7 +20,5 @@
 
 - name: Installing packages
   apt:
-    pkg: "{{ item }}"
+    pkg: newrelic-sysmond
     state: present
-  with_items:
-    - newrelic-sysmond
diff --git a/provisioning/roles/franklinkim.newrelic/tasks/install_redhat.yml b/provisioning/roles/weareinteractive.newrelic/tasks/install_redhat.yml
similarity index 77%
rename from provisioning/roles/franklinkim.newrelic/tasks/install_redhat.yml
rename to provisioning/roles/weareinteractive.newrelic/tasks/install_redhat.yml
index 38516fb94..c9e97fa37 100644
--- a/provisioning/roles/franklinkim.newrelic/tasks/install_redhat.yml
+++ b/provisioning/roles/weareinteractive.newrelic/tasks/install_redhat.yml
@@ -7,7 +7,5 @@
 
 - name: Installing packages
   yum:
-    name: "{{ item }}"
+    name: newrelic-sysmond
     state: present
-  with_items:
-    - newrelic-sysmond
diff --git a/provisioning/roles/franklinkim.newrelic/tasks/main.yml b/provisioning/roles/weareinteractive.newrelic/tasks/main.yml
similarity index 88%
rename from provisioning/roles/franklinkim.newrelic/tasks/main.yml
rename to provisioning/roles/weareinteractive.newrelic/tasks/main.yml
index 9f6b7fe87..11c5ba454 100644
--- a/provisioning/roles/franklinkim.newrelic/tasks/main.yml
+++ b/provisioning/roles/weareinteractive.newrelic/tasks/main.yml
@@ -3,7 +3,7 @@
 - name: Checking for key
   fail:
     msg: "newrelic_license_key has not been defined"
-  when: newrelic_license_key|default(False) == False
+  when: newrelic_license_key is not defined
 
 - import_tasks: install.yml
   tags:
diff --git a/provisioning/roles/franklinkim.newrelic/tasks/service.yml b/provisioning/roles/weareinteractive.newrelic/tasks/service.yml
similarity index 100%
rename from provisioning/roles/franklinkim.newrelic/tasks/service.yml
rename to provisioning/roles/weareinteractive.newrelic/tasks/service.yml
diff --git a/provisioning/roles/franklinkim.newrelic/templates/etc/newrelic/nrsysmond.cfg.j2 b/provisioning/roles/weareinteractive.newrelic/templates/etc/newrelic/nrsysmond.cfg.j2
similarity index 100%
rename from provisioning/roles/franklinkim.newrelic/templates/etc/newrelic/nrsysmond.cfg.j2
rename to provisioning/roles/weareinteractive.newrelic/templates/etc/newrelic/nrsysmond.cfg.j2
diff --git a/provisioning/roles/weareinteractive.newrelic/tests/main.yml b/provisioning/roles/weareinteractive.newrelic/tests/main.yml
new file mode 100644
index 000000000..e5b915df8
--- /dev/null
+++ b/provisioning/roles/weareinteractive.newrelic/tests/main.yml
@@ -0,0 +1,11 @@
+---
+
+- hosts: all
+  become: yes
+  roles:
+    - weareinteractive.newrelic
+  vars:
+    newrelic_license_key: ab2fa361cd4d0d373833cad619d7bcc424d27c16
+    # not starting service in docker env
+    newrelic_service_state: stopped
+    newrelic_service_enabled: false

From 9ec96833d37b140244f130c3db36d22ace70aec7 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 9 Dec 2019 09:58:02 -0600
Subject: [PATCH 1132/1273] Update geerlingguy.php-xdebug role to latest
 version - 2.9.0 installed.

---
 default.config.yml                               |  4 ++--
 provisioning/requirements.yml                    |  2 +-
 .../roles/geerlingguy.php-xdebug/.travis.yml     |  7 +++----
 .../roles/geerlingguy.php-xdebug/README.md       |  4 ++--
 .../geerlingguy.php-xdebug/defaults/main.yml     |  2 +-
 .../molecule/default/molecule.yml                |  6 ++++--
 .../molecule/default/playbook.yml                | 16 +---------------
 .../molecule/default/requirements.yml            |  2 +-
 .../molecule/default/tests/test_default.py       | 14 --------------
 9 files changed, 15 insertions(+), 42 deletions(-)
 delete mode 100644 provisioning/roles/geerlingguy.php-xdebug/molecule/default/tests/test_default.py

diff --git a/default.config.yml b/default.config.yml
index 1e7c4c77d..0590ba8bd 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -1,10 +1,10 @@
 ---
 # Available `vagrant_box` values include:
 #   - geerlingguy/drupal-vm (pre-provisioned, based on Ubuntu 18.04)
+#   - geerlingguy/centos8
 #   - geerlingguy/centos7
-#   - geerlingguy/centos6
+#   - geerlingguy/debian10
 #   - geerlingguy/debian9
-#   - geerlingguy/debian8
 #   - geerlingguy/ubuntu1804
 #   - geerlingguy/ubuntu1604
 vagrant_box: geerlingguy/drupal-vm
diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index fe8155bef..cfb5aa181 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -58,7 +58,7 @@
 - src: geerlingguy.php-versions
   version: 4.0.2
 - src: geerlingguy.php-xdebug
-  version: 2.5.1
+  version: 3.0.0
 - src: geerlingguy.php-xhprof
   version: 2.3.0
 - src: geerlingguy.pimpmylog
diff --git a/provisioning/roles/geerlingguy.php-xdebug/.travis.yml b/provisioning/roles/geerlingguy.php-xdebug/.travis.yml
index a05e4b230..05a66571b 100644
--- a/provisioning/roles/geerlingguy.php-xdebug/.travis.yml
+++ b/provisioning/roles/geerlingguy.php-xdebug/.travis.yml
@@ -6,10 +6,9 @@ env:
   global:
     - ROLE_NAME: php-xdebug
   matrix:
-    - MOLECULE_DISTRO: centos7
-      MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
-    - MOLECULE_DISTRO: ubuntu1604
-    - MOLECULE_DISTRO: debian9
+    - MOLECULE_DISTRO: centos8
+    - MOLECULE_DISTRO: ubuntu1804
+    - MOLECULE_DISTRO: debian10
 
 install:
   # Install test dependencies.
diff --git a/provisioning/roles/geerlingguy.php-xdebug/README.md b/provisioning/roles/geerlingguy.php-xdebug/README.md
index 8aad1de65..735585baf 100644
--- a/provisioning/roles/geerlingguy.php-xdebug/README.md
+++ b/provisioning/roles/geerlingguy.php-xdebug/README.md
@@ -16,9 +16,9 @@ Available variables are listed below, along with default values (see `defaults/m
 
 Where Xdebug setup files will be downloaded and built.
 
-    php_xdebug_version: 2.6.0
+    php_xdebug_version: 2.9.0
 
-The version of Xdebug to be installed (see [Updates](https://xdebug.org/updates.php) for a current listing). **If using PHP 5.6**: Set this to `2.5.0` or earlier, as starting with XDebug 2.6.0, PHP 5.x support has been dropped.
+The version of Xdebug to be installed (see [Updates](https://xdebug.org/updates.php) for a current listing).
 
     php_xdebug_default_enable: 1
     php_xdebug_coverage_enable: 1
diff --git a/provisioning/roles/geerlingguy.php-xdebug/defaults/main.yml b/provisioning/roles/geerlingguy.php-xdebug/defaults/main.yml
index 04a40c46b..0b7028551 100644
--- a/provisioning/roles/geerlingguy.php-xdebug/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.php-xdebug/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
 workspace: /root
 
-php_xdebug_version: 2.6.0
+php_xdebug_version: 2.9.0
 
 php_xdebug_coverage_enable: 1
 php_xdebug_default_enable: 1
diff --git a/provisioning/roles/geerlingguy.php-xdebug/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.php-xdebug/molecule/default/molecule.yml
index 033970241..2ca6feaf9 100644
--- a/provisioning/roles/geerlingguy.php-xdebug/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.php-xdebug/molecule/default/molecule.yml
@@ -9,8 +9,10 @@ lint:
     config-file: molecule/default/yaml-lint.yml
 platforms:
   - name: instance
-    image: geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible
-    command: ${MOLECULE_DOCKER_COMMAND:-"sleep infinity"}
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
     privileged: true
     pre_build_image: true
 provisioner:
diff --git a/provisioning/roles/geerlingguy.php-xdebug/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.php-xdebug/molecule/default/playbook.yml
index 16f88e582..faf6b0152 100644
--- a/provisioning/roles/geerlingguy.php-xdebug/molecule/default/playbook.yml
+++ b/provisioning/roles/geerlingguy.php-xdebug/molecule/default/playbook.yml
@@ -5,30 +5,16 @@
 
   vars:
     php_enable_webserver: false
-    php_enablerepo: "remi,remi-php70"
 
   pre_tasks:
     - name: Update apt cache.
       apt: update_cache=true cache_valid_time=600
       when: ansible_os_family == 'Debian'
 
-    - name: Set php_packages for PHP 7.0 Debian 8 install.
-      set_fact:
-        php_packages:
-          - php7.0-common
-          - php7.0-cli
-          - php7.0-dev
-          - php7.0-fpm
-          - libpcre3-dev
-          - php7.0-opcache
-          - php7.0-apcu
-      when: ansible_distribution == 'Debian'
-
   roles:
     - role: geerlingguy.repo-remi
       when: ansible_os_family == 'RedHat'
-    - role: geerlingguy.repo-dotdeb
-      when: ansible_distribution == 'Debian'
+    - role: geerlingguy.php-versions
     - role: geerlingguy.php
     - role: geerlingguy.php-xdebug
 
diff --git a/provisioning/roles/geerlingguy.php-xdebug/molecule/default/requirements.yml b/provisioning/roles/geerlingguy.php-xdebug/molecule/default/requirements.yml
index 51eedd6a9..908335edd 100644
--- a/provisioning/roles/geerlingguy.php-xdebug/molecule/default/requirements.yml
+++ b/provisioning/roles/geerlingguy.php-xdebug/molecule/default/requirements.yml
@@ -1,4 +1,4 @@
 ---
 - src: geerlingguy.repo-remi
-- src: geerlingguy.repo-dotdeb
+- src: geerlingguy.php-versions
 - src: geerlingguy.php
diff --git a/provisioning/roles/geerlingguy.php-xdebug/molecule/default/tests/test_default.py b/provisioning/roles/geerlingguy.php-xdebug/molecule/default/tests/test_default.py
deleted file mode 100644
index eedd64a1d..000000000
--- a/provisioning/roles/geerlingguy.php-xdebug/molecule/default/tests/test_default.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import os
-
-import testinfra.utils.ansible_runner
-
-testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
-    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
-
-
-def test_hosts_file(host):
-    f = host.file('/etc/hosts')
-
-    assert f.exists
-    assert f.user == 'root'
-    assert f.group == 'root'

From eaaaa3662933c833daf7959b29b868e5ec651892 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 9 Dec 2019 10:19:32 -0600
Subject: [PATCH 1133/1273] Update geerlingguy.php-xhprof role so new XHProf
 stable version 2.1.2 is used.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.php-xhprof/.gitignore   |  3 +-
 .../roles/geerlingguy.php-xhprof/.travis.yml  | 31 ++++++++++---------
 .../roles/geerlingguy.php-xhprof/README.md    | 14 ++++++---
 .../geerlingguy.php-xhprof/defaults/main.yml  | 10 +++---
 .../geerlingguy.php-xhprof/meta/main.yml      | 20 ++++++------
 .../molecule/default/molecule.yml             | 29 +++++++++++++++++
 .../molecule/default/playbook.yml             | 26 ++++++++++++++++
 .../default}/requirements.yml                 |  2 +-
 .../default}/xhprof-test.php                  |  0
 .../molecule/default/yaml-lint.yml            |  6 ++++
 .../geerlingguy.php-xhprof/tasks/main.yml     | 13 ++++----
 .../geerlingguy.php-xhprof/tests/README.md    | 11 -------
 .../geerlingguy.php-xhprof/tests/test.yml     | 31 -------------------
 14 files changed, 112 insertions(+), 86 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.php-xhprof/molecule/default/molecule.yml
 create mode 100644 provisioning/roles/geerlingguy.php-xhprof/molecule/default/playbook.yml
 rename provisioning/roles/geerlingguy.php-xhprof/{tests => molecule/default}/requirements.yml (63%)
 rename provisioning/roles/geerlingguy.php-xhprof/{tests => molecule/default}/xhprof-test.php (100%)
 create mode 100644 provisioning/roles/geerlingguy.php-xhprof/molecule/default/yaml-lint.yml
 delete mode 100644 provisioning/roles/geerlingguy.php-xhprof/tests/README.md
 delete mode 100644 provisioning/roles/geerlingguy.php-xhprof/tests/test.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index cfb5aa181..f21670c49 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -60,7 +60,7 @@
 - src: geerlingguy.php-xdebug
   version: 3.0.0
 - src: geerlingguy.php-xhprof
-  version: 2.3.0
+  version: 3.0.0
 - src: geerlingguy.pimpmylog
   version: 1.0.2
 - src: geerlingguy.postfix
diff --git a/provisioning/roles/geerlingguy.php-xhprof/.gitignore b/provisioning/roles/geerlingguy.php-xhprof/.gitignore
index c9b2377e3..f56f5b578 100644
--- a/provisioning/roles/geerlingguy.php-xhprof/.gitignore
+++ b/provisioning/roles/geerlingguy.php-xhprof/.gitignore
@@ -1,2 +1,3 @@
 *.retry
-tests/test.sh
+*/__pycache__
+*.pyc
diff --git a/provisioning/roles/geerlingguy.php-xhprof/.travis.yml b/provisioning/roles/geerlingguy.php-xhprof/.travis.yml
index 67b82cb6e..2f8688121 100644
--- a/provisioning/roles/geerlingguy.php-xhprof/.travis.yml
+++ b/provisioning/roles/geerlingguy.php-xhprof/.travis.yml
@@ -1,25 +1,28 @@
 ---
+language: python
 services: docker
 
 env:
-  - distro: centos7
-  - distro: ubuntu1604
-  - distro: debian9
+  global:
+    - ROLE_NAME: php-xhprof
+  matrix:
+    - MOLECULE_DISTRO: centos7
+    - MOLECULE_DISTRO: ubuntu1804
+    - MOLECULE_DISTRO: debian9
 
-script:
-  # Configure test script so we can run extra tests after playbook is run.
-  - export container_id=$(date +%s)
-  - export cleanup=false
+install:
+  # Install test dependencies.
+  - pip install molecule docker
 
-  # Download test shim.
-  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
-  - chmod +x ${PWD}/tests/test.sh
+before_script:
+  # Use actual Ansible Galaxy role name for the project directory.
+  - cd ../
+  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
+  - cd geerlingguy.$ROLE_NAME
 
+script:
   # Run tests.
-  - ${PWD}/tests/test.sh
-
-  # Run script to test if XHProf is available and working.
-  - 'docker exec ${container_id} env TERM=xterm php /etc/ansible/roles/role_under_test/tests/xhprof-test.php'
+  - molecule test
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.php-xhprof/README.md b/provisioning/roles/geerlingguy.php-xhprof/README.md
index 58ee2739f..67a4b24ac 100644
--- a/provisioning/roles/geerlingguy.php-xhprof/README.md
+++ b/provisioning/roles/geerlingguy.php-xhprof/README.md
@@ -4,7 +4,7 @@
 
 Installs PHP [XHProf](http://php.net/manual/en/book.xhprof.php) on Linux servers.
 
-> **Note**: The XHProf extension has been on life support since Facebook abandoned active development around 2015. There is a better-maintained fork that works on the latest PHP versions called Tideways, and there's an Ansible role for it—please check out [`geerlingguy.php-tideways`](https://github.com/geerlingguy/ansible-role-php-tideways) if you need to support PHP versions later than 7.0.
+> **Note**: The XHProf extension has been on life support since Facebook abandoned active development around 2015. There is a better-maintained fork that works on the latest PHP versions called Tideways, and there's an Ansible role for it—please check out [`geerlingguy.php-tideways`](https://github.com/geerlingguy/ansible-role-php-tideways) if you need to support modern PHP versions.
 
 ## Requirements
 
@@ -18,10 +18,14 @@ Available variables are listed below, along with default values (see `defaults/m
 
 Where XHProf setup files will be downloaded and built.
 
-    xhprof_download_url: https://github.com/RustJason/xhprof/archive/php7.zip
-    xhprof_download_folder_name: xhprof-php7
+    xhprof_version: "2.1.2"
 
-The URL from which XHProf will be downloaded. Note that this default is for the PHP 7-compatible version of XHProf. If you're using PHP 5.x, you should probably switch to the 'official' upstream source: `https://github.com/phacility/xhprof/archive/master.tar.gz`.
+The version of XHProf to download.
+
+    xhprof_download_url: https://github.com/longxinH/xhprof/archive/v{{ xhprof_version }}.zip
+    xhprof_download_folder_name: xhprof-{{ xhprof_version }}
+
+The URL from which XHProf will be downloaded.
 
     xhprof_output_dir: /tmp
 
@@ -43,7 +47,7 @@ Directory where the XHProf UI is stored.
 
     - hosts: webservers
       roles:
-        - { role: geerlingguy.php-xhprof }
+        - geerlingguy.php-xhprof
 
 ## License
 
diff --git a/provisioning/roles/geerlingguy.php-xhprof/defaults/main.yml b/provisioning/roles/geerlingguy.php-xhprof/defaults/main.yml
index 5466cdcfe..e239f5209 100644
--- a/provisioning/roles/geerlingguy.php-xhprof/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.php-xhprof/defaults/main.yml
@@ -1,12 +1,10 @@
 ---
 workspace: /root
 
-# Use the commented URL and folder below if you want to use the 'official'
-# XHProf project.
-xhprof_download_url: https://github.com/RustJason/xhprof/archive/php7.zip
-#xhprof_download_url: https://github.com/phacility/xhprof/archive/master.tar.gz
-xhprof_download_folder_name: xhprof-php7
-# xhprof_download_folder_name: xhprof-master
+xhprof_version: "2.1.2"
+
+xhprof_download_url: https://github.com/longxinH/xhprof/archive/v{{ xhprof_version }}.zip
+xhprof_download_folder_name: xhprof-{{ xhprof_version }}
 
 xhprof_output_dir: /tmp
 
diff --git a/provisioning/roles/geerlingguy.php-xhprof/meta/main.yml b/provisioning/roles/geerlingguy.php-xhprof/meta/main.yml
index 91d882305..d6610e75b 100644
--- a/provisioning/roles/geerlingguy.php-xhprof/meta/main.yml
+++ b/provisioning/roles/geerlingguy.php-xhprof/meta/main.yml
@@ -11,34 +11,34 @@ galaxy_info:
   platforms:
     - name: EL
       versions:
-      - all
+        - all
     - name: GenericUNIX
       versions:
-      - all
+        - all
     - name: Fedora
       versions:
-      - all
+        - all
     - name: opensuse
       versions:
-      - all
+        - all
     - name: GenericBSD
       versions:
-      - all
+        - all
     - name: FreeBSD
       versions:
-      - all
+        - all
     - name: Ubuntu
       versions:
-      - all
+        - all
     - name: SLES
       versions:
-      - all
+        - all
     - name: GenericLinux
       versions:
-      - all
+        - all
     - name: Debian
       versions:
-      - all
+        - all
   galaxy_tags:
     - development
     - web
diff --git a/provisioning/roles/geerlingguy.php-xhprof/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.php-xhprof/molecule/default/molecule.yml
new file mode 100644
index 000000000..2ca6feaf9
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xhprof/molecule/default/molecule.yml
@@ -0,0 +1,29 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint:
+  name: yamllint
+  options:
+    config-file: molecule/default/yaml-lint.yml
+platforms:
+  - name: instance
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    privileged: true
+    pre_build_image: true
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+  playbooks:
+    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
+scenario:
+  name: default
+verifier:
+  name: testinfra
+  lint:
+    name: flake8
diff --git a/provisioning/roles/geerlingguy.php-xhprof/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.php-xhprof/molecule/default/playbook.yml
new file mode 100644
index 000000000..846ec56ea
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xhprof/molecule/default/playbook.yml
@@ -0,0 +1,26 @@
+---
+- name: Converge
+  hosts: all
+  become: true
+
+  vars:
+    php_enable_webserver: false
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=true cache_valid_time=600
+      when: ansible_os_family == 'Debian'
+
+  roles:
+    - role: geerlingguy.repo-remi
+      when: ansible_os_family == 'RedHat'
+    - role: geerlingguy.php-versions
+    - role: geerlingguy.php
+    - role: geerlingguy.php-xhprof
+
+  post_tasks:
+    - name: Run test script to confirm XHProf is working.
+      script: xhprof-test.php
+      args:
+        executable: php
+      changed_when: false
diff --git a/provisioning/roles/geerlingguy.php-xhprof/tests/requirements.yml b/provisioning/roles/geerlingguy.php-xhprof/molecule/default/requirements.yml
similarity index 63%
rename from provisioning/roles/geerlingguy.php-xhprof/tests/requirements.yml
rename to provisioning/roles/geerlingguy.php-xhprof/molecule/default/requirements.yml
index 51eedd6a9..908335edd 100644
--- a/provisioning/roles/geerlingguy.php-xhprof/tests/requirements.yml
+++ b/provisioning/roles/geerlingguy.php-xhprof/molecule/default/requirements.yml
@@ -1,4 +1,4 @@
 ---
 - src: geerlingguy.repo-remi
-- src: geerlingguy.repo-dotdeb
+- src: geerlingguy.php-versions
 - src: geerlingguy.php
diff --git a/provisioning/roles/geerlingguy.php-xhprof/tests/xhprof-test.php b/provisioning/roles/geerlingguy.php-xhprof/molecule/default/xhprof-test.php
similarity index 100%
rename from provisioning/roles/geerlingguy.php-xhprof/tests/xhprof-test.php
rename to provisioning/roles/geerlingguy.php-xhprof/molecule/default/xhprof-test.php
diff --git a/provisioning/roles/geerlingguy.php-xhprof/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.php-xhprof/molecule/default/yaml-lint.yml
new file mode 100644
index 000000000..a3dbc38ee
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-xhprof/molecule/default/yaml-lint.yml
@@ -0,0 +1,6 @@
+---
+extends: default
+rules:
+  line-length:
+    max: 120
+    level: warning
diff --git a/provisioning/roles/geerlingguy.php-xhprof/tasks/main.yml b/provisioning/roles/geerlingguy.php-xhprof/tasks/main.yml
index be1283262..eb8bc5553 100644
--- a/provisioning/roles/geerlingguy.php-xhprof/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php-xhprof/tasks/main.yml
@@ -25,11 +25,11 @@
   unarchive:
     src: "{{ xhprof_download_url }}"
     dest: "{{ workspace }}"
-    copy: no
+    copy: false
     creates: "{{ workspace }}/{{ xhprof_download_folder_name }}"
 
 - name: Build XHProf.
-  shell: >
+  command: >
     {{ item }}
     chdir={{ workspace }}/{{ xhprof_download_folder_name }}/extension
     creates={{ workspace }}/{{ xhprof_download_folder_name }}/extension/modules/xhprof.so
@@ -48,18 +48,19 @@
     mode: 0755
 
 - name: Move XHProf module into place.
-  shell: >
-    cp {{ workspace }}/{{ xhprof_download_folder_name }}/extension/modules/xhprof.so {{ php_xhprof_module_path }}/xhprof.so
+  command: >
+    cp {{ workspace }}/{{ xhprof_download_folder_name }}/extension/modules/xhprof.so
+    {{ php_xhprof_module_path }}/xhprof.so
     creates={{ php_xhprof_module_path }}/xhprof.so
   notify: restart webserver
 
 - name: Move XHProf PHP library into place.
-  shell: >
+  command: >
     cp -r {{ workspace }}/{{ xhprof_download_folder_name }}/xhprof_lib {{ php_xhprof_lib_dir }}
     creates={{ php_xhprof_lib_dir }}/utils/xhprof_lib.php
 
 - name: Move XHProf UI into place.
-  shell: >
+  command: >
     cp -r {{ workspace }}/{{ xhprof_download_folder_name }}/xhprof_html {{ php_xhprof_html_dir }}
     creates={{ php_xhprof_html_dir }}/index.php
 
diff --git a/provisioning/roles/geerlingguy.php-xhprof/tests/README.md b/provisioning/roles/geerlingguy.php-xhprof/tests/README.md
deleted file mode 100644
index 6fb211721..000000000
--- a/provisioning/roles/geerlingguy.php-xhprof/tests/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Ansible Role tests
-
-To run the test playbook(s) in this directory:
-
-  1. Install and start Docker.
-  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
-    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
-  1. Make the test shim executable: `chmod +x tests/test.sh`.
-  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
-
-If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.php-xhprof/tests/test.yml b/provisioning/roles/geerlingguy.php-xhprof/tests/test.yml
deleted file mode 100644
index 942f6d7e6..000000000
--- a/provisioning/roles/geerlingguy.php-xhprof/tests/test.yml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-- hosts: all
-
-  vars:
-    php_enable_webserver: false
-    php_enablerepo: "remi,remi-php70"
-
-  pre_tasks:
-    - name: Update apt cache.
-      apt: update_cache=yes cache_valid_time=600
-      when: ansible_os_family == 'Debian'
-
-    - name: Set php_packages for PHP 7.0 Debian 8 install.
-      set_fact:
-        php_packages:
-          - php7.0-common
-          - php7.0-cli
-          - php7.0-dev
-          - php7.0-fpm
-          - libpcre3-dev
-          - php7.0-opcache
-          - php7.0-apcu
-      when: ansible_distribution == 'Debian'
-
-  roles:
-    - role: geerlingguy.repo-remi
-      when: ansible_os_family == 'RedHat'
-    - role: geerlingguy.repo-dotdeb
-      when: ansible_distribution == 'Debian'
-    - geerlingguy.php
-    - role_under_test

From 5e9490fd7b1893b6f80682ed35f1eb70ede8a20e Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 9 Dec 2019 17:10:17 -0600
Subject: [PATCH 1134/1273] Update geerlingguy.java role to latest version,
 supports CentOS 8.

---
 provisioning/requirements.yml                         | 2 +-
 provisioning/roles/geerlingguy.java/.travis.yml       | 3 ++-
 provisioning/roles/geerlingguy.java/README.md         | 4 ++--
 provisioning/roles/geerlingguy.java/defaults/main.yml | 2 +-
 provisioning/roles/geerlingguy.java/meta/main.yml     | 1 +
 provisioning/roles/geerlingguy.java/vars/RedHat-8.yml | 7 +++++++
 6 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.java/vars/RedHat-8.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index f21670c49..80ebb0042 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -30,7 +30,7 @@
 - src: geerlingguy.git
   version: 2.1.0
 - src: geerlingguy.java
-  version: 1.9.6
+  version: 1.9.7
 - src: geerlingguy.mailhog
   version: 2.2.0
 - src: geerlingguy.memcached
diff --git a/provisioning/roles/geerlingguy.java/.travis.yml b/provisioning/roles/geerlingguy.java/.travis.yml
index 2dda913c7..b650138a6 100644
--- a/provisioning/roles/geerlingguy.java/.travis.yml
+++ b/provisioning/roles/geerlingguy.java/.travis.yml
@@ -6,9 +6,10 @@ env:
   global:
     - ROLE_NAME: java
   matrix:
+    - MOLECULE_DISTRO: centos8
     - MOLECULE_DISTRO: centos7
     - MOLECULE_DISTRO: centos6
-    - MOLECULE_DISTRO: fedora30
+    - MOLECULE_DISTRO: fedora31
     - MOLECULE_DISTRO: ubuntu1804
     - MOLECULE_DISTRO: ubuntu1604
     - MOLECULE_DISTRO: debian10
diff --git a/provisioning/roles/geerlingguy.java/README.md b/provisioning/roles/geerlingguy.java/README.md
index 7bc991f3f..b35fde806 100644
--- a/provisioning/roles/geerlingguy.java/README.md
+++ b/provisioning/roles/geerlingguy.java/README.md
@@ -14,7 +14,7 @@ Available variables are listed below, along with default values:
 
     # The defaults provided by this role are specific to each distribution.
     java_packages:
-      - java-1.7.0-openjdk
+      - java-1.8.0-openjdk
 
 Set the version/development kit of Java to install, along with any other necessary Java packages. Some other options include are included in the distribution-specific files in this role's 'defaults' folder.
 
@@ -26,7 +26,7 @@ If set, the role will set the global environment variable `JAVA_HOME` to this va
 
 None.
 
-## Example Playbook (using default package, usually OpenJDK 7)
+## Example Playbook (using default package)
 
     - hosts: servers
       roles:
diff --git a/provisioning/roles/geerlingguy.java/defaults/main.yml b/provisioning/roles/geerlingguy.java/defaults/main.yml
index aaf519d84..3f51462e3 100644
--- a/provisioning/roles/geerlingguy.java/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.java/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
 # Set java_packages if you would like to use a different version than the
-# default (OpenJDK 1.7).
+# default for the OS (see defaults per OS in `vars` directory).
 # java_packages: []
 
 java_home: ""
diff --git a/provisioning/roles/geerlingguy.java/meta/main.yml b/provisioning/roles/geerlingguy.java/meta/main.yml
index b2d2eebfe..20b9f75ae 100644
--- a/provisioning/roles/geerlingguy.java/meta/main.yml
+++ b/provisioning/roles/geerlingguy.java/meta/main.yml
@@ -13,6 +13,7 @@ galaxy_info:
       versions:
         - 6
         - 7
+        - 8
     - name: Fedora
       versions:
         - all
diff --git a/provisioning/roles/geerlingguy.java/vars/RedHat-8.yml b/provisioning/roles/geerlingguy.java/vars/RedHat-8.yml
new file mode 100644
index 000000000..d49b6f4dc
--- /dev/null
+++ b/provisioning/roles/geerlingguy.java/vars/RedHat-8.yml
@@ -0,0 +1,7 @@
+---
+# JDK version options include:
+#   - java-1.8.0-openjdk
+#   - java-11-openjdk
+#   - java-latest-openjdk
+__java_packages:
+  - java-11-openjdk

From c88f09eca26cc4c9866a1c18c4af502d374ebd9e Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 11 Dec 2019 09:45:51 -0600
Subject: [PATCH 1135/1273] Create FUNDING.yml

---
 .github/FUNDING.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 000000000..af7a1e022
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+github: geerlingguy
+patreon: geerlingguy

From df4cb82d1c75399632b6cf02979ce1c9351bf615 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 15 Dec 2019 16:44:28 -0600
Subject: [PATCH 1136/1273] Update security role to latest version.

---
 provisioning/requirements.yml                             | 2 +-
 .../roles/geerlingguy.security/.github/FUNDING.yml        | 4 ++++
 provisioning/roles/geerlingguy.security/README.md         | 8 ++++++++
 provisioning/roles/geerlingguy.security/defaults/main.yml | 1 +
 provisioning/roles/geerlingguy.security/handlers/main.yml | 2 +-
 5 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.security/.github/FUNDING.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 80ebb0042..7177de590 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -74,7 +74,7 @@
 - src: geerlingguy.ruby
   version: 2.5.2
 - src: geerlingguy.security
-  version: 1.8.1
+  version: 1.8.2
 - src: geerlingguy.solr
   version: 5.0.0
 - src: geerlingguy.varnish
diff --git a/provisioning/roles/geerlingguy.security/.github/FUNDING.yml b/provisioning/roles/geerlingguy.security/.github/FUNDING.yml
new file mode 100644
index 000000000..96b493831
--- /dev/null
+++ b/provisioning/roles/geerlingguy.security/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+---
+github: geerlingguy
+patreon: geerlingguy
diff --git a/provisioning/roles/geerlingguy.security/README.md b/provisioning/roles/geerlingguy.security/README.md
index 5ed2d4fd9..ff626007a 100644
--- a/provisioning/roles/geerlingguy.security/README.md
+++ b/provisioning/roles/geerlingguy.security/README.md
@@ -37,9 +37,17 @@ The port through which you'd like SSH to be accessible. The default is port 22,
     security_ssh_password_authentication: "no"
     security_ssh_permit_root_login: "no"
     security_ssh_usedns: "no"
+    security_ssh_permit_empty_password: "no"
+    security_ssh_challenge_response_auth: "no"
+    security_ssh_gss_api_authentication: "no"
+    security_ssh_x11_forwarding: "no"
 
 Security settings for SSH authentication. It's best to leave these set to `"no"`, but there are times (especially during initial server configuration or when you don't have key-based authentication in place) when one or all may be safely set to `'yes'`. **NOTE: It is _very_ important that you quote the 'yes' or 'no' values. Failure to do so may lock you out of your server.**
 
+    security_ssh_restart_handler_state: restarted
+
+The state of the `restart ssh` handler. Typically this should remain `restarted`.
+
     security_sudoers_passwordless: []
     security_sudoers_passworded: []
 
diff --git a/provisioning/roles/geerlingguy.security/defaults/main.yml b/provisioning/roles/geerlingguy.security/defaults/main.yml
index b0693562b..83bccbdb8 100644
--- a/provisioning/roles/geerlingguy.security/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.security/defaults/main.yml
@@ -7,6 +7,7 @@ security_ssh_permit_empty_password: "no"
 security_ssh_challenge_response_auth: "no"
 security_ssh_gss_api_authentication: "no"
 security_ssh_x11_forwarding: "no"
+security_ssh_restart_handler_state: restarted
 
 security_sudoers_passwordless: []
 security_sudoers_passworded: []
diff --git a/provisioning/roles/geerlingguy.security/handlers/main.yml b/provisioning/roles/geerlingguy.security/handlers/main.yml
index f91988e3d..df9e852a5 100644
--- a/provisioning/roles/geerlingguy.security/handlers/main.yml
+++ b/provisioning/roles/geerlingguy.security/handlers/main.yml
@@ -1,3 +1,3 @@
 ---
 - name: restart ssh
-  service: "name={{ security_sshd_name }} state=restarted"
+  service: "name={{ security_sshd_name }} state={{ security_restart_handler_state }}"

From 393eebc2f019daad5579185b586eed88b2716ef3 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 15 Dec 2019 16:52:39 -0600
Subject: [PATCH 1137/1273] Update security role to latest version, again.

---
 provisioning/requirements.yml                             | 2 +-
 provisioning/roles/geerlingguy.security/handlers/main.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 7177de590..3a6b5c0d7 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -74,7 +74,7 @@
 - src: geerlingguy.ruby
   version: 2.5.2
 - src: geerlingguy.security
-  version: 1.8.2
+  version: 1.8.3
 - src: geerlingguy.solr
   version: 5.0.0
 - src: geerlingguy.varnish
diff --git a/provisioning/roles/geerlingguy.security/handlers/main.yml b/provisioning/roles/geerlingguy.security/handlers/main.yml
index df9e852a5..ca6f17641 100644
--- a/provisioning/roles/geerlingguy.security/handlers/main.yml
+++ b/provisioning/roles/geerlingguy.security/handlers/main.yml
@@ -1,3 +1,3 @@
 ---
 - name: restart ssh
-  service: "name={{ security_sshd_name }} state={{ security_restart_handler_state }}"
+  service: "name={{ security_sshd_name }} state={{ security_ssh_restart_handler_state }}"

From bab29e6baa51d4c4056abd0c1d650d4b9fd86267 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 17 Dec 2019 21:24:59 -0600
Subject: [PATCH 1138/1273] Update security role to latest version for CentOS 8
 compatibility.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.security/.travis.yml    |  4 +--
 .../tasks/autoupdate-RedHat.yml               | 35 +++++++++++++++----
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 3a6b5c0d7..a31c850d2 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -74,7 +74,7 @@
 - src: geerlingguy.ruby
   version: 2.5.2
 - src: geerlingguy.security
-  version: 1.8.3
+  version: 1.9.0
 - src: geerlingguy.solr
   version: 5.0.0
 - src: geerlingguy.varnish
diff --git a/provisioning/roles/geerlingguy.security/.travis.yml b/provisioning/roles/geerlingguy.security/.travis.yml
index 243fe1c4b..c8b034098 100644
--- a/provisioning/roles/geerlingguy.security/.travis.yml
+++ b/provisioning/roles/geerlingguy.security/.travis.yml
@@ -6,10 +6,10 @@ env:
   global:
     - ROLE_NAME: security
   matrix:
+    - MOLECULE_DISTRO: centos8
     - MOLECULE_DISTRO: centos7
-    - MOLECULE_DISTRO: centos6
     - MOLECULE_DISTRO: ubuntu1804
-    - MOLECULE_DISTRO: debian9
+    - MOLECULE_DISTRO: debian10
 
 install:
   # Install test dependencies.
diff --git a/provisioning/roles/geerlingguy.security/tasks/autoupdate-RedHat.yml b/provisioning/roles/geerlingguy.security/tasks/autoupdate-RedHat.yml
index c69f10565..bb4e615c2 100644
--- a/provisioning/roles/geerlingguy.security/tasks/autoupdate-RedHat.yml
+++ b/provisioning/roles/geerlingguy.security/tasks/autoupdate-RedHat.yml
@@ -1,13 +1,34 @@
 ---
-- name: Install yum-cron.
-  package: name=yum-cron state=present
+- name: Set correct automatic update utility vars (RHEL 8).
+  set_fact:
+    update_utility: dnf-automatic
+    update_service: dnf-automatic-install.timer
+    update_conf_path: /etc/dnf/automatic.conf
+  when: ansible_distribution_major_version | int == 8
 
-- name: Ensure yum-cron is running and enabled on boot.
-  service: name=yum-cron state=started enabled=yes
+- name: Set correct automatic update utility vars (RHEL <= 7).
+  set_fact:
+    update_utility: yum-cron
+    update_service: yum-cron
+    update_conf_path: /etc/yum/yum-cron.conf
+  when: ansible_distribution_major_version | int <= 7
 
-- name: Configure autoupdates (RHEL 7).
+- name: Install automatic update utility.
+  package:
+    name: '{{ update_utility }}'
+    state: present
+
+- name: Ensure automatic update utility is running and enabled on boot.
+  service:
+    name: '{{ update_service }}'
+    state: started
+    enabled: true
+
+- name: Configure autoupdates.
   lineinfile:
-    dest: "/etc/yum/yum-cron.conf"
+    dest: '{{ update_conf_path }}'
     regexp: '^apply_updates = .+'
     line: 'apply_updates = yes'
-  when: security_autoupdate_enabled and ansible_distribution_major_version | int == 7
+  when:
+    - security_autoupdate_enabled
+    - ansible_distribution_major_version | int in [7, 8]

From 70bcc38a547b1ebacb09aa3b3767372e61e1405b Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 16 Jan 2020 16:49:45 -0600
Subject: [PATCH 1139/1273] Update geerlingguy.nodejs role to latest version.

---
 provisioning/requirements.yml                 |  2 +-
 .../geerlingguy.nodejs/.github/FUNDING.yml    |  4 ++++
 .../roles/geerlingguy.nodejs/.travis.yml      |  3 +--
 .../roles/geerlingguy.nodejs/README.md        |  4 ++--
 .../geerlingguy.nodejs/defaults/main.yml      |  4 ++--
 .../roles/geerlingguy.nodejs/meta/main.yml    |  1 +
 .../molecule/default/playbook-latest.yml      |  2 +-
 .../molecule/default/tests/test_default.py    | 14 -----------
 .../geerlingguy.nodejs/tasks/setup-Debian.yml |  5 +++-
 .../geerlingguy.nodejs/tasks/setup-RedHat.yml | 23 +++++++++++--------
 .../geerlingguy.nodejs/templates/npm.sh.j2    |  2 +-
 11 files changed, 31 insertions(+), 33 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.nodejs/.github/FUNDING.yml
 delete mode 100644 provisioning/roles/geerlingguy.nodejs/molecule/default/tests/test_default.py

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index a31c850d2..a009e2c72 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -40,7 +40,7 @@
 - src: geerlingguy.nginx
   version: 2.7.0
 - src: geerlingguy.nodejs
-  version: 5.0.0
+  version: 5.1.0
 - src: geerlingguy.php
   version: 3.7.0
 - src: geerlingguy.php-memcached
diff --git a/provisioning/roles/geerlingguy.nodejs/.github/FUNDING.yml b/provisioning/roles/geerlingguy.nodejs/.github/FUNDING.yml
new file mode 100644
index 000000000..96b493831
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nodejs/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+---
+github: geerlingguy
+patreon: geerlingguy
diff --git a/provisioning/roles/geerlingguy.nodejs/.travis.yml b/provisioning/roles/geerlingguy.nodejs/.travis.yml
index 05cf095a7..5b6f821b8 100644
--- a/provisioning/roles/geerlingguy.nodejs/.travis.yml
+++ b/provisioning/roles/geerlingguy.nodejs/.travis.yml
@@ -6,12 +6,11 @@ env:
   global:
     - ROLE_NAME: nodejs
   matrix:
+    - MOLECULE_DISTRO: centos8
     - MOLECULE_DISTRO: centos7
-    - MOLECULE_DISTRO: centos6
     - MOLECULE_DISTRO: ubuntu1804
     - MOLECULE_DISTRO: ubuntu1604
     - MOLECULE_DISTRO: debian9
-    - MOLECULE_DISTRO: debian8
 
     - MOLECULE_DISTRO: centos7
       MOLECULE_PLAYBOOK: playbook-latest.yml
diff --git a/provisioning/roles/geerlingguy.nodejs/README.md b/provisioning/roles/geerlingguy.nodejs/README.md
index 87f9c9684..f8ffbaba9 100644
--- a/provisioning/roles/geerlingguy.nodejs/README.md
+++ b/provisioning/roles/geerlingguy.nodejs/README.md
@@ -12,9 +12,9 @@ None.
 
 Available variables are listed below, along with default values (see `defaults/main.yml`):
 
-    nodejs_version: "10.x"
+    nodejs_version: "12.x"
 
-The Node.js version to install. "10.x" is the default and works on most supported OSes. Other versions such as "0.12", "4.x", "5.x", "6.x", "8.x", "10.x" etc. should work on the latest versions of Debian/Ubuntu and RHEL/CentOS.
+The Node.js version to install. "12.x" is the default and works on most supported OSes. Other versions such as "8.x", "10.x", "13.x", etc. should work on the latest versions of Debian/Ubuntu and RHEL/CentOS.
 
     nodejs_install_npm_user: "{{ ansible_ssh_user }}"
 
diff --git a/provisioning/roles/geerlingguy.nodejs/defaults/main.yml b/provisioning/roles/geerlingguy.nodejs/defaults/main.yml
index 7b76032b0..301cfb5a5 100644
--- a/provisioning/roles/geerlingguy.nodejs/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.nodejs/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
-# Set the version of Node.js to install ("6.x", "8.x", "10.x", "11.x", etc.).
+# Set the version of Node.js to install (8.x", "10.x", "12.x", "13.x", etc.).
 # Version numbers from Nodesource: https://github.com/nodesource/distributions
-nodejs_version: "10.x"
+nodejs_version: "12.x"
 
 # The user for whom the npm packages will be installed.
 # nodejs_install_npm_user: username
diff --git a/provisioning/roles/geerlingguy.nodejs/meta/main.yml b/provisioning/roles/geerlingguy.nodejs/meta/main.yml
index 24dc3ee92..164f7dbd4 100644
--- a/provisioning/roles/geerlingguy.nodejs/meta/main.yml
+++ b/provisioning/roles/geerlingguy.nodejs/meta/main.yml
@@ -12,6 +12,7 @@ galaxy_info:
       versions:
         - 6
         - 7
+        - 8
     - name: Debian
       versions:
         - all
diff --git a/provisioning/roles/geerlingguy.nodejs/molecule/default/playbook-latest.yml b/provisioning/roles/geerlingguy.nodejs/molecule/default/playbook-latest.yml
index 7fca4281d..1213795f2 100644
--- a/provisioning/roles/geerlingguy.nodejs/molecule/default/playbook-latest.yml
+++ b/provisioning/roles/geerlingguy.nodejs/molecule/default/playbook-latest.yml
@@ -4,7 +4,7 @@
   become: true
 
   vars:
-    nodejs_version: "11.x"
+    nodejs_version: "13.x"
     nodejs_install_npm_user: root
     npm_config_prefix: /root/.npm-global
     npm_config_unsafe_perm: "true"
diff --git a/provisioning/roles/geerlingguy.nodejs/molecule/default/tests/test_default.py b/provisioning/roles/geerlingguy.nodejs/molecule/default/tests/test_default.py
deleted file mode 100644
index eedd64a1d..000000000
--- a/provisioning/roles/geerlingguy.nodejs/molecule/default/tests/test_default.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import os
-
-import testinfra.utils.ansible_runner
-
-testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
-    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
-
-
-def test_hosts_file(host):
-    f = host.file('/etc/hosts')
-
-    assert f.exists
-    assert f.user == 'root'
-    assert f.group == 'root'
diff --git a/provisioning/roles/geerlingguy.nodejs/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.nodejs/tasks/setup-Debian.yml
index c939617e4..5abd6baa1 100644
--- a/provisioning/roles/geerlingguy.nodejs/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.nodejs/tasks/setup-Debian.yml
@@ -20,6 +20,9 @@
 - name: Update apt cache if repo was added.
   apt: update_cache=yes
   when: node_repo.changed
+  tags: ['skip_ansible_lint']
 
 - name: Ensure Node.js and npm are installed.
-  apt: "name=nodejs={{ nodejs_version|regex_replace('x', '') }}* state=present"
+  apt:
+    name: "nodejs={{ nodejs_version|regex_replace('x', '') }}*"
+    state: present
diff --git a/provisioning/roles/geerlingguy.nodejs/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.nodejs/tasks/setup-RedHat.yml
index f2b9ee77e..e39771a4c 100644
--- a/provisioning/roles/geerlingguy.nodejs/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.nodejs/tasks/setup-RedHat.yml
@@ -1,13 +1,7 @@
 ---
-- name: Set up the Nodesource RPM directory for Node.js > 0.10.
+- name: Set up the Nodesource RPM directory.
   set_fact:
     nodejs_rhel_rpm_dir: "pub_{{ nodejs_version }}"
-  when: nodejs_version != '0.10'
-
-- name: Set up the Nodesource RPM variable for Node.js == 0.10.
-  set_fact:
-    nodejs_rhel_rpm_dir: "pub"
-  when: nodejs_version == '0.10'
 
 - name: Import Nodesource RPM key (CentOS < 7).
   rpm_key:
@@ -15,7 +9,7 @@
     state: present
   when: ansible_distribution_major_version|int < 7
 
-- name: Import Nodesource RPM key (CentOS 7+)..
+- name: Import Nodesource RPM key (CentOS 7+).
   rpm_key:
     key: https://rpm.nodesource.com/pub/el/NODESOURCE-GPG-SIGNING-KEY-EL
     state: present
@@ -33,5 +27,16 @@
     state: present
   when: ansible_distribution_major_version|int >= 7
 
+- name: Ensure Node.js AppStream module is disabled (CentOS 8+).
+  command: yum module disable -y nodejs
+  args:
+    warn: false
+  register: module_disable
+  changed_when: "'Nothing to do.' not in module_disable.stdout"
+  when: ansible_distribution_major_version|int >= 8
+
 - name: Ensure Node.js and npm are installed.
-  yum: "name=nodejs-{{ nodejs_version|regex_replace('x', '') }}* state=present enablerepo='nodesource'"
+  yum:
+    name: "nodejs-{{ nodejs_version|regex_replace('x', '') }}*"
+    state: present
+    enablerepo: nodesource
diff --git a/provisioning/roles/geerlingguy.nodejs/templates/npm.sh.j2 b/provisioning/roles/geerlingguy.nodejs/templates/npm.sh.j2
index 67caa7897..aaeecee51 100644
--- a/provisioning/roles/geerlingguy.nodejs/templates/npm.sh.j2
+++ b/provisioning/roles/geerlingguy.nodejs/templates/npm.sh.j2
@@ -1,3 +1,3 @@
-export PATH={{ npm_config_prefix }}/bin:$PATH
+export PATH=$PATH:{{ npm_config_prefix }}/bin
 export NPM_CONFIG_PREFIX={{ npm_config_prefix }}
 export NODE_PATH=$NODE_PATH:{{ npm_config_prefix }}/lib/node_modules

From fdd9ede23dbf11d9fcbfbe8ea69ece3e80b32135 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 16 Jan 2020 16:51:13 -0600
Subject: [PATCH 1140/1273] Update Elasticsearch role to latest version.

---
 provisioning/requirements.yml                 |   2 +-
 .../.github/FUNDING.yml                       |   4 +
 .../roles/geerlingguy.elasticsearch/README.md |  10 +-
 .../defaults/main.yml                         |   5 +-
 .../molecule/default/tests/test_default.py    |  14 ---
 .../geerlingguy.elasticsearch/tasks/main.yml  |  10 +-
 .../templates/jvm.options.j2                  | 111 ++++++++++++++++++
 7 files changed, 137 insertions(+), 19 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.elasticsearch/.github/FUNDING.yml
 delete mode 100644 provisioning/roles/geerlingguy.elasticsearch/molecule/default/tests/test_default.py
 create mode 100644 provisioning/roles/geerlingguy.elasticsearch/templates/jvm.options.j2

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index a009e2c72..e199962a5 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -24,7 +24,7 @@
 - src: geerlingguy.drush
   version: 3.1.2
 - src: geerlingguy.elasticsearch
-  version: 3.0.0
+  version: 4.1.0
 - src: geerlingguy.firewall
   version: 2.4.2
 - src: geerlingguy.git
diff --git a/provisioning/roles/geerlingguy.elasticsearch/.github/FUNDING.yml b/provisioning/roles/geerlingguy.elasticsearch/.github/FUNDING.yml
new file mode 100644
index 000000000..96b493831
--- /dev/null
+++ b/provisioning/roles/geerlingguy.elasticsearch/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+---
+github: geerlingguy
+patreon: geerlingguy
diff --git a/provisioning/roles/geerlingguy.elasticsearch/README.md b/provisioning/roles/geerlingguy.elasticsearch/README.md
index 7efe03d8b..f0fc08bbb 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/README.md
+++ b/provisioning/roles/geerlingguy.elasticsearch/README.md
@@ -12,7 +12,7 @@ Requires at least Java 8. See [`geerlingguy.java`](https://github.com/geerlinggu
 
 Available variables are listed below, along with default values (see `defaults/main.yml`):
 
-    elasticsearch_version: '6.x'
+    elasticsearch_version: '7.x'
 
 The major version to use when installing Elasticsearch.
 
@@ -33,6 +33,14 @@ Network host to listen for incoming connections on. By default we only listen on
 
 The port to listen for HTTP connections on.
 
+    elasticsearch_heap_size_min: 1g
+
+The minimum jvm heap size.
+
+    elasticsearch_heap_size_max: 2g
+
+The maximum jvm heap size.
+
 ## Dependencies
 
   - geerlingguy.java
diff --git a/provisioning/roles/geerlingguy.elasticsearch/defaults/main.yml b/provisioning/roles/geerlingguy.elasticsearch/defaults/main.yml
index e04e8e93d..dff60d9c5 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.elasticsearch/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-elasticsearch_version: '6.x'
+elasticsearch_version: '7.x'
 elasticsearch_package_state: present
 
 elasticsearch_service_state: started
@@ -7,3 +7,6 @@ elasticsearch_service_enabled: true
 
 elasticsearch_network_host: localhost
 elasticsearch_http_port: 9200
+
+elasticsearch_heap_size_min: 1g
+elasticsearch_heap_size_max: 2g
diff --git a/provisioning/roles/geerlingguy.elasticsearch/molecule/default/tests/test_default.py b/provisioning/roles/geerlingguy.elasticsearch/molecule/default/tests/test_default.py
deleted file mode 100644
index eedd64a1d..000000000
--- a/provisioning/roles/geerlingguy.elasticsearch/molecule/default/tests/test_default.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import os
-
-import testinfra.utils.ansible_runner
-
-testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
-    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
-
-
-def test_hosts_file(host):
-    f = host.file('/etc/hosts')
-
-    assert f.exists
-    assert f.user == 'root'
-    assert f.group == 'root'
diff --git a/provisioning/roles/geerlingguy.elasticsearch/tasks/main.yml b/provisioning/roles/geerlingguy.elasticsearch/tasks/main.yml
index ca86bc2d6..5ec66df4c 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.elasticsearch/tasks/main.yml
@@ -12,13 +12,19 @@
 
 - name: Configure Elasticsearch.
   template:
-    src: elasticsearch.yml.j2
-    dest: /etc/elasticsearch/elasticsearch.yml
+    src: "{{ item }}.j2"
+    dest: /etc/elasticsearch/{{ item }}
     owner: root
     group: elasticsearch
     mode: 0660
+  with_items:
+    - elasticsearch.yml
+    - jvm.options
   notify: restart elasticsearch
 
+- name: Force a restart if configuration has changed.
+  meta: flush_handlers
+
 - name: Start Elasticsearch.
   service:
     name: elasticsearch
diff --git a/provisioning/roles/geerlingguy.elasticsearch/templates/jvm.options.j2 b/provisioning/roles/geerlingguy.elasticsearch/templates/jvm.options.j2
new file mode 100644
index 000000000..7cb88c103
--- /dev/null
+++ b/provisioning/roles/geerlingguy.elasticsearch/templates/jvm.options.j2
@@ -0,0 +1,111 @@
+## JVM configuration
+
+################################################################
+## IMPORTANT: JVM heap size
+################################################################
+##
+## You should always set the min and max JVM heap
+## size to the same value. For example, to set
+## the heap to 4 GB, set:
+##
+## -Xms4g
+## -Xmx4g
+##
+## See https://www.elastic.co/guide/en/elasticsearch/reference/current/heap-size.html
+## for more information
+##
+################################################################
+
+# Xms represents the initial size of total heap space
+# Xmx represents the maximum size of total heap space
+
+-Xms{{ elasticsearch_heap_size_min }}
+-Xmx{{ elasticsearch_heap_size_max }}
+
+################################################################
+## Expert settings
+################################################################
+##
+## All settings below this section are considered
+## expert settings. Don't tamper with them unless
+## you understand what you are doing
+##
+################################################################
+
+## GC configuration
+-XX:+UseConcMarkSweepGC
+-XX:CMSInitiatingOccupancyFraction=75
+-XX:+UseCMSInitiatingOccupancyOnly
+
+## optimizations
+
+# pre-touch memory pages used by the JVM during initialization
+-XX:+AlwaysPreTouch
+
+## basic
+
+# force the server VM (remove on 32-bit client JVMs)
+-server
+
+# explicitly set the stack size (reduce to 320k on 32-bit client JVMs)
+-Xss1m
+
+# set to headless, just in case
+-Djava.awt.headless=true
+
+# ensure UTF-8 encoding by default (e.g. filenames)
+-Dfile.encoding=UTF-8
+
+# use our provided JNA always versus the system one
+-Djna.nosys=true
+
+# use old-style file permissions on JDK9
+-Djdk.io.permissionsUseCanonicalPath=true
+
+# flags to configure Netty
+-Dio.netty.noUnsafe=true
+-Dio.netty.noKeySetOptimization=true
+-Dio.netty.recycler.maxCapacityPerThread=0
+
+# log4j 2
+-Dlog4j.shutdownHookEnabled=false
+-Dlog4j2.disable.jmx=true
+-Dlog4j.skipJansi=true
+
+## heap dumps
+
+# generate a heap dump when an allocation from the Java heap fails
+# heap dumps are created in the working directory of the JVM
+-XX:+HeapDumpOnOutOfMemoryError
+
+# specify an alternative path for heap dumps
+# ensure the directory exists and has sufficient space
+#-XX:HeapDumpPath=${heap.dump.path}
+
+## GC logging
+
+#-XX:+PrintGCDetails
+#-XX:+PrintGCTimeStamps
+#-XX:+PrintGCDateStamps
+#-XX:+PrintClassHistogram
+#-XX:+PrintTenuringDistribution
+#-XX:+PrintGCApplicationStoppedTime
+
+# log GC status to a file with time stamps
+# ensure the directory exists
+#-Xloggc:${loggc}
+
+# By default, the GC log file will not rotate.
+# By uncommenting the lines below, the GC log file
+# will be rotated every 128MB at most 32 times.
+#-XX:+UseGCLogFileRotation
+#-XX:NumberOfGCLogFiles=32
+#-XX:GCLogFileSize=128M
+
+# Elasticsearch 5.0.0 will throw an exception on unquoted field names in JSON.
+# If documents were already indexed with unquoted fields in a previous version
+# of Elasticsearch, some operations may throw errors.
+#
+# WARNING: This option will be removed in Elasticsearch 6.0.0 and is provided
+# only for migration purposes.
+#-Delasticsearch.json.allow_unquoted_field_names=true

From 8788fe0621e1bcb8c6d54ff17197302763c507be Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 27 Jan 2020 11:39:37 -0600
Subject: [PATCH 1141/1273] Update geerlingguy.firewall role to latest version
 - fixes ipv6 ping rule.

---
 provisioning/requirements.yml                                  | 2 +-
 .../roles/geerlingguy.firewall/molecule/default/playbook.yml   | 3 +++
 .../roles/geerlingguy.firewall/templates/firewall.bash.j2      | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index e199962a5..5335830cf 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -26,7 +26,7 @@
 - src: geerlingguy.elasticsearch
   version: 4.1.0
 - src: geerlingguy.firewall
-  version: 2.4.2
+  version: 2.4.3
 - src: geerlingguy.git
   version: 2.1.0
 - src: geerlingguy.java
diff --git a/provisioning/roles/geerlingguy.firewall/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.firewall/molecule/default/playbook.yml
index 635661bbb..0c37558ff 100644
--- a/provisioning/roles/geerlingguy.firewall/molecule/default/playbook.yml
+++ b/provisioning/roles/geerlingguy.firewall/molecule/default/playbook.yml
@@ -4,7 +4,10 @@
   become: true
 
   vars:
+    # Added to prevent test failures in CI.
     firewall_enable_ipv6: false
+
+    # Added for a test.
     firewall_allowed_tcp_ports:
       - "9123"
 
diff --git a/provisioning/roles/geerlingguy.firewall/templates/firewall.bash.j2 b/provisioning/roles/geerlingguy.firewall/templates/firewall.bash.j2
index ab0bcb461..d816d0160 100755
--- a/provisioning/roles/geerlingguy.firewall/templates/firewall.bash.j2
+++ b/provisioning/roles/geerlingguy.firewall/templates/firewall.bash.j2
@@ -108,7 +108,7 @@ if [ -x "$(which ip6tables 2>/dev/null)" ]; then
   {% endfor %}
 
   # Accept icmp ping requests.
-  ip6tables -A INPUT -p icmp -j ACCEPT
+  ip6tables -A INPUT -p icmpv6 -j ACCEPT
 
   # Allow NTP traffic for time synchronization.
   ip6tables -A OUTPUT -p udp --dport 123 -j ACCEPT

From d1dcbd9655c1449a1d1b68097a8dbe1d77f744a0 Mon Sep 17 00:00:00 2001
From: Adrian Rollett <acrollet@gmail.com>
Date: Tue, 18 Feb 2020 12:48:04 -0700
Subject: [PATCH 1142/1273] Fix broken link in solr docs

---
 docs/extras/solr.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/extras/solr.md b/docs/extras/solr.md
index 7b04f050d..a1f8b6d56 100644
--- a/docs/extras/solr.md
+++ b/docs/extras/solr.md
@@ -10,7 +10,7 @@ This will connect to the default search core (`collection1`) set up by Solr. If
 
 ## Using Different Solr versions
 
-Drupal VM installs Apache Solr 5.x by default, but you can use 6.x, 4.x, or other versions instead. To do this, [see the version-specific test examples](https://github.com/geerlingguy/ansible-role-solr/tree/master/tests) in the `geerlingguy.solr` role.
+Drupal VM installs Apache Solr 5.x by default, but you can use 6.x, 4.x, or other versions instead. To do this, [see the version-specific playbook examples](https://github.com/geerlingguy/ansible-role-solr/tree/master/molecule/default) in the `geerlingguy.solr` role.
 
 One important note: If you use Solr 6.x or later, you need to make sure your VM has Java 8+. Some older base OSes only install Java 7. To install Java 8, see the `geerlingguy.java` role examples for [installing Java 8 on RHEL/CentOS or Ubuntu < 16.04](https://github.com/geerlingguy/ansible-role-java#example-playbook-install-openjdk-8).
 

From 1f02b53128d816b5a23123ca8c1728ce1017cb4b Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 18 Feb 2020 15:03:23 -0600
Subject: [PATCH 1143/1273] Issue #2012: Update Drupal and Varnish roles.

---
 provisioning/requirements.yml                             | 4 ++--
 provisioning/roles/geerlingguy.drupal/.ansible-lint       | 1 -
 provisioning/roles/geerlingguy.drupal/.github/FUNDING.yml | 4 ++++
 .../geerlingguy.drupal/molecule/default/playbook.yml      | 3 +++
 .../geerlingguy.drupal/tasks/build-composer-project.yml   | 1 +
 .../roles/geerlingguy.firewall/.github/FUNDING.yml        | 4 ++++
 .../roles/geerlingguy.varnish/.github/FUNDING.yml         | 4 ++++
 provisioning/roles/geerlingguy.varnish/tasks/main.yml     | 8 ++++----
 8 files changed, 22 insertions(+), 7 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.drupal/.github/FUNDING.yml
 create mode 100644 provisioning/roles/geerlingguy.firewall/.github/FUNDING.yml
 create mode 100644 provisioning/roles/geerlingguy.varnish/.github/FUNDING.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 5335830cf..5aeb6cf09 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -18,7 +18,7 @@
 - src: geerlingguy.daemonize
   version: 1.2.0
 - src: geerlingguy.drupal
-  version: 3.0.0
+  version: 3.0.1
 - src: geerlingguy.drupal-console
   version: 1.1.1
 - src: geerlingguy.drush
@@ -78,4 +78,4 @@
 - src: geerlingguy.solr
   version: 5.0.0
 - src: geerlingguy.varnish
-  version: 3.0.1
+  version: 3.0.2
diff --git a/provisioning/roles/geerlingguy.drupal/.ansible-lint b/provisioning/roles/geerlingguy.drupal/.ansible-lint
index f85cf95f5..a7564ce11 100644
--- a/provisioning/roles/geerlingguy.drupal/.ansible-lint
+++ b/provisioning/roles/geerlingguy.drupal/.ansible-lint
@@ -1,4 +1,3 @@
 skip_list:
   - '204'
-  - '602'
   - '503'
diff --git a/provisioning/roles/geerlingguy.drupal/.github/FUNDING.yml b/provisioning/roles/geerlingguy.drupal/.github/FUNDING.yml
new file mode 100644
index 000000000..96b493831
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+---
+github: geerlingguy
+patreon: geerlingguy
diff --git a/provisioning/roles/geerlingguy.drupal/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.drupal/molecule/default/playbook.yml
index 3c30ac414..8d63418cf 100644
--- a/provisioning/roles/geerlingguy.drupal/molecule/default/playbook.yml
+++ b/provisioning/roles/geerlingguy.drupal/molecule/default/playbook.yml
@@ -3,6 +3,9 @@
   hosts: all
   become: true
 
+  environment:
+    COMPOSER_MEMORY_LIMIT: '-1'
+
   vars_files:
     - test-vars.yml
 
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/build-composer-project.yml b/provisioning/roles/geerlingguy.drupal/tasks/build-composer-project.yml
index 9b2f22fdc..f682c02bf 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/build-composer-project.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/build-composer-project.yml
@@ -14,6 +14,7 @@
   become: false
   environment:
     COMPOSER_PROCESS_TIMEOUT: 1200
+    COMPOSER_MEMORY_LIMIT: '-1'
 
 - name: Ensure drupal_composer_install_dir directory has proper permissions.
   file:
diff --git a/provisioning/roles/geerlingguy.firewall/.github/FUNDING.yml b/provisioning/roles/geerlingguy.firewall/.github/FUNDING.yml
new file mode 100644
index 000000000..96b493831
--- /dev/null
+++ b/provisioning/roles/geerlingguy.firewall/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+---
+github: geerlingguy
+patreon: geerlingguy
diff --git a/provisioning/roles/geerlingguy.varnish/.github/FUNDING.yml b/provisioning/roles/geerlingguy.varnish/.github/FUNDING.yml
new file mode 100644
index 000000000..96b493831
--- /dev/null
+++ b/provisioning/roles/geerlingguy.varnish/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+---
+github: geerlingguy
+patreon: geerlingguy
diff --git a/provisioning/roles/geerlingguy.varnish/tasks/main.yml b/provisioning/roles/geerlingguy.varnish/tasks/main.yml
index 65eebdd0e..3736a0b34 100644
--- a/provisioning/roles/geerlingguy.varnish/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.varnish/tasks/main.yml
@@ -80,11 +80,11 @@
     enabled: true
   with_items: "{{ varnish_enabled_services | default([]) }}"
   when: >
-    varnish_enabled_services and
-    (ansible_os_family != 'Debian' and ansible_distribution_release != "xenial")
+    varnish_enabled_services and (ansible_os_family != 'Debian' or
+    (ansible_os_family != 'Debian' and ansible_distribution_release != "xenial"))
 
 # See: https://github.com/ansible/ansible/issues/22303
-- name: Ensure Varnish services are started enabled on startup (Xenial specific)
+- name: Ensure Varnish services are started and enabled on startup (Xenial specific)
   service:
     name: "{{ item }}"
     state: started
@@ -92,5 +92,5 @@
     use: "service"
   with_items: "{{ varnish_enabled_services | default([]) }}"
   when:
-    - varnish_enabled_services
+    - varnish_enabled_services | length > 0
     - (ansible_os_family == 'Debian' and ansible_distribution_release == "xenial")

From 55915f0e5c38805571e28ca1ed3b9785f978ee4e Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 21 Feb 2020 21:35:07 -0600
Subject: [PATCH 1144/1273] Update roles - blackfire, daemonize, elasticsearch,
 mysql, nodejs, php-versions, postgresql, ruby, php-pecl, varnish.

---
 provisioning/requirements.yml                 | 161 +++++++++---------
 .../roles/geerlingguy.blackfire/.ansible-lint |   2 +
 .../geerlingguy.blackfire/.github/FUNDING.yml |   4 +
 .../roles/geerlingguy.blackfire/.travis.yml   |   2 +-
 .../default/yaml-lint.yml => .yamllint}       |   0
 .../default/{playbook.yml => converge.yml}    |   6 +
 .../molecule/default/molecule.yml             |  17 +-
 .../tasks/setup-Debian.yml                    |   5 +
 .../geerlingguy.daemonize/tests/test.yml      |   2 +-
 .../geerlingguy.elasticsearch/.travis.yml     |   2 +-
 .../default/yaml-lint.yml => .yamllint}       |   0
 .../default/{playbook.yml => converge.yml}    |   0
 .../molecule/default/molecule.yml             |  17 +-
 .../tasks/setup-Debian.yml                    |   6 +-
 .../roles/geerlingguy.mysql/.ansible-lint     |   1 -
 .../geerlingguy.mysql/.github/FUNDING.yml     |   4 +
 .../roles/geerlingguy.mysql/.travis.yml       |   3 +-
 .../default/yaml-lint.yml => .yamllint}       |   0
 .../roles/geerlingguy.mysql/README.md         |   4 +
 .../roles/geerlingguy.mysql/meta/main.yml     |   1 +
 .../default/{playbook.yml => converge.yml}    |   3 +
 .../molecule/default/molecule.yml             |  17 +-
 .../geerlingguy.mysql/tasks/configure.yml     |   8 +-
 .../geerlingguy.mysql/tasks/replication.yml   |  10 +-
 .../geerlingguy.mysql/tasks/setup-Debian.yml  |   5 +-
 .../geerlingguy.mysql/tasks/setup-RedHat.yml  |   6 -
 .../geerlingguy.mysql/templates/my.cnf.j2     |   2 +-
 .../templates/root-my.cnf.j2                  |   2 +-
 .../templates/user-my.cnf.j2                  |   2 +-
 .../roles/geerlingguy.mysql/vars/RedHat-6.yml |   1 +
 .../roles/geerlingguy.mysql/vars/RedHat-8.yml |  18 ++
 .../roles/geerlingguy.nodejs/.travis.yml      |   2 +-
 .../default/yaml-lint.yml => .yamllint}       |   0
 .../default/{playbook.yml => converge.yml}    |   0
 .../molecule/default/molecule.yml             |  17 +-
 .../geerlingguy.nodejs/tasks/setup-Debian.yml |   8 +-
 .../roles/geerlingguy.php-pecl/.ansible-lint  |   2 +
 .../roles/geerlingguy.php-pecl/tasks/main.yml |   2 +-
 .../.github/FUNDING.yml                       |   4 +
 .../geerlingguy.php-versions/.travis.yml      |   2 +-
 .../default/yaml-lint.yml => .yamllint}       |   0
 .../default/{playbook.yml => converge.yml}    |   0
 .../molecule/default/molecule.yml             |  17 +-
 .../tasks/setup-Debian.yml                    |   5 +
 .../.github/FUNDING.yml                       |   4 +
 .../roles/geerlingguy.postgresql/.travis.yml  |   4 +-
 .../default/yaml-lint.yml => .yamllint}       |   0
 .../default/{playbook.yml => converge.yml}    |   0
 .../molecule/default/molecule.yml             |  17 +-
 .../geerlingguy.postgresql/vars/Debian-10.yml |   2 +
 .../geerlingguy.postgresql/vars/Ubuntu-18.yml |   1 +
 .../roles/geerlingguy.ruby/.ansible-lint      |   2 +
 .../roles/geerlingguy.ruby/.gitignore         |   3 +-
 .../roles/geerlingguy.ruby/.travis.yml        |  85 +++------
 provisioning/roles/geerlingguy.ruby/README.md |  12 +-
 .../roles/geerlingguy.ruby/defaults/main.yml  |   5 +-
 .../roles/geerlingguy.ruby/meta/main.yml      |  26 +--
 .../molecule/default/molecule.yml             |  29 ++++
 .../molecule/default/playbook-source.yml      |  23 +++
 .../molecule/default/playbook.yml             |  35 ++++
 .../molecule/default/tests/test_default.py    |   0
 .../molecule/default/yaml-lint.yml            |   6 +
 .../tasks/install-from-source.yml             |  33 ++--
 .../roles/geerlingguy.ruby/tasks/main.yml     |  16 +-
 .../geerlingguy.ruby/tasks/setup-Debian.yml   |  14 +-
 .../geerlingguy.ruby/tasks/setup-RedHat.yml   |   9 +-
 .../roles/geerlingguy.ruby/tests/README.md    |  11 --
 .../geerlingguy.ruby/tests/test-source.yml    |  16 --
 .../roles/geerlingguy.ruby/tests/test.yml     |  28 ---
 .../roles/geerlingguy.ruby/vars/Debian.yml    |  17 ++
 .../roles/geerlingguy.ruby/vars/RedHat.yml    |  10 ++
 .../roles/geerlingguy.varnish/.travis.yml     |   2 +-
 .../default/yaml-lint.yml => .yamllint}       |   0
 .../default/{playbook.yml => converge.yml}    |   0
 .../molecule/default/molecule.yml             |  17 +-
 .../tasks/setup-Debian.yml                    |   6 +-
 76 files changed, 421 insertions(+), 382 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.blackfire/.ansible-lint
 create mode 100644 provisioning/roles/geerlingguy.blackfire/.github/FUNDING.yml
 rename provisioning/roles/geerlingguy.blackfire/{molecule/default/yaml-lint.yml => .yamllint} (100%)
 rename provisioning/roles/geerlingguy.blackfire/molecule/default/{playbook.yml => converge.yml} (89%)
 rename provisioning/roles/geerlingguy.elasticsearch/{molecule/default/yaml-lint.yml => .yamllint} (100%)
 rename provisioning/roles/geerlingguy.elasticsearch/molecule/default/{playbook.yml => converge.yml} (100%)
 create mode 100644 provisioning/roles/geerlingguy.mysql/.github/FUNDING.yml
 rename provisioning/roles/geerlingguy.mysql/{molecule/default/yaml-lint.yml => .yamllint} (100%)
 rename provisioning/roles/geerlingguy.mysql/molecule/default/{playbook.yml => converge.yml} (87%)
 create mode 100644 provisioning/roles/geerlingguy.mysql/vars/RedHat-8.yml
 rename provisioning/roles/geerlingguy.nodejs/{molecule/default/yaml-lint.yml => .yamllint} (100%)
 rename provisioning/roles/geerlingguy.nodejs/molecule/default/{playbook.yml => converge.yml} (100%)
 create mode 100644 provisioning/roles/geerlingguy.php-pecl/.ansible-lint
 create mode 100644 provisioning/roles/geerlingguy.php-versions/.github/FUNDING.yml
 rename provisioning/roles/geerlingguy.php-versions/{molecule/default/yaml-lint.yml => .yamllint} (100%)
 rename provisioning/roles/geerlingguy.php-versions/molecule/default/{playbook.yml => converge.yml} (100%)
 create mode 100644 provisioning/roles/geerlingguy.postgresql/.github/FUNDING.yml
 rename provisioning/roles/geerlingguy.postgresql/{molecule/default/yaml-lint.yml => .yamllint} (100%)
 rename provisioning/roles/geerlingguy.postgresql/molecule/default/{playbook.yml => converge.yml} (100%)
 create mode 100644 provisioning/roles/geerlingguy.ruby/.ansible-lint
 create mode 100644 provisioning/roles/geerlingguy.ruby/molecule/default/molecule.yml
 create mode 100644 provisioning/roles/geerlingguy.ruby/molecule/default/playbook-source.yml
 create mode 100644 provisioning/roles/geerlingguy.ruby/molecule/default/playbook.yml
 rename provisioning/roles/{geerlingguy.php-pecl => geerlingguy.ruby}/molecule/default/tests/test_default.py (100%)
 create mode 100644 provisioning/roles/geerlingguy.ruby/molecule/default/yaml-lint.yml
 delete mode 100644 provisioning/roles/geerlingguy.ruby/tests/README.md
 delete mode 100644 provisioning/roles/geerlingguy.ruby/tests/test-source.yml
 delete mode 100644 provisioning/roles/geerlingguy.ruby/tests/test.yml
 create mode 100644 provisioning/roles/geerlingguy.ruby/vars/Debian.yml
 create mode 100644 provisioning/roles/geerlingguy.ruby/vars/RedHat.yml
 rename provisioning/roles/geerlingguy.varnish/{molecule/default/yaml-lint.yml => .yamllint} (100%)
 rename provisioning/roles/geerlingguy.varnish/molecule/default/{playbook.yml => converge.yml} (100%)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 5aeb6cf09..ab58f100d 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -1,81 +1,82 @@
 ---
-- src: arknoll.selenium
-  version: 2.2.2
-- src: thom8.php-upload-progress
-  version: 1.0.1
-- src: weareinteractive.newrelic
-  version: 1.8.0
-- src: geerlingguy.adminer
-  version: 1.2.0
-- src: geerlingguy.apache
-  version: 3.1.0
-- src: geerlingguy.apache-php-fpm
-  version: 1.1.0
-- src: geerlingguy.blackfire
-  version: 1.1.2
-- src: geerlingguy.composer
-  version: 1.7.6
-- src: geerlingguy.daemonize
-  version: 1.2.0
-- src: geerlingguy.drupal
-  version: 3.0.1
-- src: geerlingguy.drupal-console
-  version: 1.1.1
-- src: geerlingguy.drush
-  version: 3.1.2
-- src: geerlingguy.elasticsearch
-  version: 4.1.0
-- src: geerlingguy.firewall
-  version: 2.4.3
-- src: geerlingguy.git
-  version: 2.1.0
-- src: geerlingguy.java
-  version: 1.9.7
-- src: geerlingguy.mailhog
-  version: 2.2.0
-- src: geerlingguy.memcached
-  version: 1.0.8
-- src: geerlingguy.mysql
-  version: 2.9.5
-- src: geerlingguy.nginx
-  version: 2.7.0
-- src: geerlingguy.nodejs
-  version: 5.1.0
-- src: geerlingguy.php
-  version: 3.7.0
-- src: geerlingguy.php-memcached
-  version: 2.0.2
-- src: geerlingguy.php-mysql
-  version: 2.0.2
-- src: geerlingguy.php-pecl
-  version: 1.4.1
-- src: geerlingguy.php-pgsql
-  version: 1.0.1
-- src: geerlingguy.php-redis
-  version: 3.2.1
-- src: geerlingguy.php-tideways
-  version: 2.2.0
-- src: geerlingguy.php-versions
-  version: 4.0.2
-- src: geerlingguy.php-xdebug
-  version: 3.0.0
-- src: geerlingguy.php-xhprof
-  version: 3.0.0
-- src: geerlingguy.pimpmylog
-  version: 1.0.2
-- src: geerlingguy.postfix
-  version: 2.0.0
-- src: geerlingguy.postgresql
-  version: 2.0.1
-- src: geerlingguy.redis
-  version: 1.6.0
-- src: geerlingguy.repo-remi
-  version: 1.2.0
-- src: geerlingguy.ruby
-  version: 2.5.2
-- src: geerlingguy.security
-  version: 1.9.0
-- src: geerlingguy.solr
-  version: 5.0.0
-- src: geerlingguy.varnish
-  version: 3.0.2
+roles:
+  - name: arknoll.selenium
+    version: 2.2.2
+  - name: thom8.php-upload-progress
+    version: 1.0.1
+  - name: weareinteractive.newrelic
+    version: 1.8.0
+  - name: geerlingguy.adminer
+    version: 1.2.0
+  - name: geerlingguy.apache
+    version: 3.1.0
+  - name: geerlingguy.apache-php-fpm
+    version: 1.1.0
+  - name: geerlingguy.blackfire
+    version: 1.1.3
+  - name: geerlingguy.composer
+    version: 1.7.6
+  - name: geerlingguy.daemonize
+    version: 1.2.1
+  - name: geerlingguy.drupal
+    version: 3.0.1
+  - name: geerlingguy.drupal-console
+    version: 1.1.1
+  - name: geerlingguy.drush
+    version: 3.1.2
+  - name: geerlingguy.elasticsearch
+    version: 4.1.1
+  - name: geerlingguy.firewall
+    version: 2.4.3
+  - name: geerlingguy.git
+    version: 2.1.0
+  - name: geerlingguy.java
+    version: 1.9.7
+  - name: geerlingguy.mailhog
+    version: 2.2.0
+  - name: geerlingguy.memcached
+    version: 1.0.8
+  - name: geerlingguy.mysql
+    version: 3.0.0
+  - name: geerlingguy.nginx
+    version: 2.7.0
+  - name: geerlingguy.nodejs
+    version: 5.1.1
+  - name: geerlingguy.php
+    version: 3.7.0
+  - name: geerlingguy.php-memcached
+    version: 2.0.2
+  - name: geerlingguy.php-mysql
+    version: 2.0.2
+  - name: geerlingguy.php-pecl
+    version: 1.4.2
+  - name: geerlingguy.php-pgsql
+    version: 1.0.1
+  - name: geerlingguy.php-redis
+    version: 3.2.1
+  - name: geerlingguy.php-tideways
+    version: 2.2.0
+  - name: geerlingguy.php-versions
+    version: 4.0.3
+  - name: geerlingguy.php-xdebug
+    version: 3.0.0
+  - name: geerlingguy.php-xhprof
+    version: 3.0.0
+  - name: geerlingguy.pimpmylog
+    version: 1.0.2
+  - name: geerlingguy.postfix
+    version: 2.0.0
+  - name: geerlingguy.postgresql
+    version: 2.0.2
+  - name: geerlingguy.redis
+    version: 1.6.0
+  - name: geerlingguy.repo-remi
+    version: 1.2.0
+  - name: geerlingguy.ruby
+    version: 2.6.0
+  - name: geerlingguy.security
+    version: 1.9.0
+  - name: geerlingguy.solr
+    version: 5.0.0
+  - name: geerlingguy.varnish
+    version: 3.0.3
diff --git a/provisioning/roles/geerlingguy.blackfire/.ansible-lint b/provisioning/roles/geerlingguy.blackfire/.ansible-lint
new file mode 100644
index 000000000..d09fda886
--- /dev/null
+++ b/provisioning/roles/geerlingguy.blackfire/.ansible-lint
@@ -0,0 +1,2 @@
+skip_list:
+  - '503'
diff --git a/provisioning/roles/geerlingguy.blackfire/.github/FUNDING.yml b/provisioning/roles/geerlingguy.blackfire/.github/FUNDING.yml
new file mode 100644
index 000000000..96b493831
--- /dev/null
+++ b/provisioning/roles/geerlingguy.blackfire/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+---
+github: geerlingguy
+patreon: geerlingguy
diff --git a/provisioning/roles/geerlingguy.blackfire/.travis.yml b/provisioning/roles/geerlingguy.blackfire/.travis.yml
index 58cc4c729..dc43b419b 100644
--- a/provisioning/roles/geerlingguy.blackfire/.travis.yml
+++ b/provisioning/roles/geerlingguy.blackfire/.travis.yml
@@ -12,7 +12,7 @@ env:
 
 install:
   # Install test dependencies.
-  - pip install molecule docker
+  - pip install molecule yamllint ansible-lint docker
 
 before_script:
   # Use actual Ansible Galaxy role name for the project directory.
diff --git a/provisioning/roles/geerlingguy.blackfire/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.blackfire/.yamllint
similarity index 100%
rename from provisioning/roles/geerlingguy.blackfire/molecule/default/yaml-lint.yml
rename to provisioning/roles/geerlingguy.blackfire/.yamllint
diff --git a/provisioning/roles/geerlingguy.blackfire/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.blackfire/molecule/default/converge.yml
similarity index 89%
rename from provisioning/roles/geerlingguy.blackfire/molecule/default/playbook.yml
rename to provisioning/roles/geerlingguy.blackfire/molecule/default/converge.yml
index eb7e1e64c..97ed5e181 100644
--- a/provisioning/roles/geerlingguy.blackfire/molecule/default/playbook.yml
+++ b/provisioning/roles/geerlingguy.blackfire/molecule/default/converge.yml
@@ -17,6 +17,12 @@
       when: ansible_os_family == 'Debian'
 
     # Ubuntu-specific tasks.
+    - name: Add dependencies for apt key (Ubuntu).
+      apt:
+        name: dirmngr
+        state: present
+      when: ansible_distribution == 'Ubuntu'
+
     - name: Add repository for PHP 7 (Ubuntu).
       apt_repository: repo='ppa:ondrej/php'
       when: ansible_distribution == 'Ubuntu'
diff --git a/provisioning/roles/geerlingguy.blackfire/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.blackfire/molecule/default/molecule.yml
index 2ca6feaf9..38eb962bd 100644
--- a/provisioning/roles/geerlingguy.blackfire/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.blackfire/molecule/default/molecule.yml
@@ -3,10 +3,9 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
-  options:
-    config-file: molecule/default/yaml-lint.yml
+lint: |
+  yamllint .
+  ansible-lint
 platforms:
   - name: instance
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
@@ -17,13 +16,5 @@ platforms:
     pre_build_image: true
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
   playbooks:
-    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
-scenario:
-  name: default
-verifier:
-  name: testinfra
-  lint:
-    name: flake8
+    converge: ${MOLECULE_PLAYBOOK:-converge.yml}
diff --git a/provisioning/roles/geerlingguy.blackfire/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.blackfire/tasks/setup-Debian.yml
index e3bd66149..2dbf56a92 100644
--- a/provisioning/roles/geerlingguy.blackfire/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.blackfire/tasks/setup-Debian.yml
@@ -1,4 +1,9 @@
 ---
+- name: Ensure dirmngr is installed (gnupg dependency).
+  apt:
+    name: dirmngr
+    state: present
+
 - name: Add packagecloud apt key.
   apt_key:
     url: "{{ blackfire_gpg_key_url }}"
diff --git a/provisioning/roles/geerlingguy.daemonize/tests/test.yml b/provisioning/roles/geerlingguy.daemonize/tests/test.yml
index 9d3720595..3b4e619d7 100644
--- a/provisioning/roles/geerlingguy.daemonize/tests/test.yml
+++ b/provisioning/roles/geerlingguy.daemonize/tests/test.yml
@@ -16,7 +16,7 @@
       changed_when: false
 
     - name: Ensure build dependencies are installed (Debian).
-      apt: 'name="{{ item }}" state=installed'
+      apt: 'name="{{ item }}" state=present'
       with_items:
         - build-essential
         - unzip
diff --git a/provisioning/roles/geerlingguy.elasticsearch/.travis.yml b/provisioning/roles/geerlingguy.elasticsearch/.travis.yml
index 40ecf8a98..58ed78dfe 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/.travis.yml
+++ b/provisioning/roles/geerlingguy.elasticsearch/.travis.yml
@@ -12,7 +12,7 @@ env:
 
 install:
   # Install test dependencies.
-  - pip install molecule docker
+  - pip install molecule yamllint ansible-lint docker
 
 before_script:
   # Use actual Ansible Galaxy role name for the project directory.
diff --git a/provisioning/roles/geerlingguy.elasticsearch/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.elasticsearch/.yamllint
similarity index 100%
rename from provisioning/roles/geerlingguy.elasticsearch/molecule/default/yaml-lint.yml
rename to provisioning/roles/geerlingguy.elasticsearch/.yamllint
diff --git a/provisioning/roles/geerlingguy.elasticsearch/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.elasticsearch/molecule/default/converge.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.elasticsearch/molecule/default/playbook.yml
rename to provisioning/roles/geerlingguy.elasticsearch/molecule/default/converge.yml
diff --git a/provisioning/roles/geerlingguy.elasticsearch/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.elasticsearch/molecule/default/molecule.yml
index 2ca6feaf9..38eb962bd 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.elasticsearch/molecule/default/molecule.yml
@@ -3,10 +3,9 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
-  options:
-    config-file: molecule/default/yaml-lint.yml
+lint: |
+  yamllint .
+  ansible-lint
 platforms:
   - name: instance
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
@@ -17,13 +16,5 @@ platforms:
     pre_build_image: true
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
   playbooks:
-    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
-scenario:
-  name: default
-verifier:
-  name: testinfra
-  lint:
-    name: flake8
+    converge: ${MOLECULE_PLAYBOOK:-converge.yml}
diff --git a/provisioning/roles/geerlingguy.elasticsearch/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.elasticsearch/tasks/setup-Debian.yml
index 5fa254302..9fde3c9f2 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.elasticsearch/tasks/setup-Debian.yml
@@ -1,7 +1,9 @@
 ---
-- name: HTTPS APT transport for Elasticsearch repository.
+- name: Add required dependencies.
   apt:
-    name: apt-transport-https
+    name:
+      - apt-transport-https
+      - gnupg2
     state: present
 
 - name: Add Elasticsearch apt key.
diff --git a/provisioning/roles/geerlingguy.mysql/.ansible-lint b/provisioning/roles/geerlingguy.mysql/.ansible-lint
index 5a3b624f8..1ae5e6ccf 100644
--- a/provisioning/roles/geerlingguy.mysql/.ansible-lint
+++ b/provisioning/roles/geerlingguy.mysql/.ansible-lint
@@ -1,3 +1,2 @@
 skip_list:
-  - '602'
   - '204'
diff --git a/provisioning/roles/geerlingguy.mysql/.github/FUNDING.yml b/provisioning/roles/geerlingguy.mysql/.github/FUNDING.yml
new file mode 100644
index 000000000..96b493831
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+---
+github: geerlingguy
+patreon: geerlingguy
diff --git a/provisioning/roles/geerlingguy.mysql/.travis.yml b/provisioning/roles/geerlingguy.mysql/.travis.yml
index db26840bc..c82b59e5c 100644
--- a/provisioning/roles/geerlingguy.mysql/.travis.yml
+++ b/provisioning/roles/geerlingguy.mysql/.travis.yml
@@ -6,6 +6,7 @@ env:
   global:
     - ROLE_NAME: mysql
   matrix:
+    - MOLECULE_DISTRO: centos8
     - MOLECULE_DISTRO: centos7
     - MOLECULE_DISTRO: centos6
     - MOLECULE_DISTRO: ubuntu1804
@@ -14,7 +15,7 @@ env:
 
 install:
   # Install test dependencies.
-  - pip install molecule docker
+  - pip install molecule yamllint ansible-lint docker
 
 before_script:
   # Use actual Ansible Galaxy role name for the project directory.
diff --git a/provisioning/roles/geerlingguy.mysql/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.mysql/.yamllint
similarity index 100%
rename from provisioning/roles/geerlingguy.mysql/molecule/default/yaml-lint.yml
rename to provisioning/roles/geerlingguy.mysql/.yamllint
diff --git a/provisioning/roles/geerlingguy.mysql/README.md b/provisioning/roles/geerlingguy.mysql/README.md
index 7436589fe..21fe3dbf3 100644
--- a/provisioning/roles/geerlingguy.mysql/README.md
+++ b/provisioning/roles/geerlingguy.mysql/README.md
@@ -84,6 +84,10 @@ The formats of these are the same as in the `mysql_user` module.
 
 (RedHat/CentOS only) If you have enabled any additional repositories (might I suggest geerlingguy.repo-epel or geerlingguy.repo-remi), those repositories can be listed under this variable (e.g. `remi,epel`). This can be handy, as an example, if you want to install later versions of MySQL.
 
+    mysql_python_package_debian: ''
+
+(Ubuntu/Debian only) If you need to explicitly set the MySQL Python package, you can set it here. If not set, it will default to `python-mysqldb` for Python 2 and `python3-mysqldb` for Python 3.
+
     mysql_port: "3306"
     mysql_bind_address: '0.0.0.0'
     mysql_datadir: /var/lib/mysql
diff --git a/provisioning/roles/geerlingguy.mysql/meta/main.yml b/provisioning/roles/geerlingguy.mysql/meta/main.yml
index d95f6cc3e..aea8654d7 100644
--- a/provisioning/roles/geerlingguy.mysql/meta/main.yml
+++ b/provisioning/roles/geerlingguy.mysql/meta/main.yml
@@ -12,6 +12,7 @@ galaxy_info:
       versions:
         - 6
         - 7
+        - 8
     - name: Ubuntu
       versions:
         - all
diff --git a/provisioning/roles/geerlingguy.mysql/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.mysql/molecule/default/converge.yml
similarity index 87%
rename from provisioning/roles/geerlingguy.mysql/molecule/default/playbook.yml
rename to provisioning/roles/geerlingguy.mysql/molecule/default/converge.yml
index c83b10216..5e0213dcc 100644
--- a/provisioning/roles/geerlingguy.mysql/molecule/default/playbook.yml
+++ b/provisioning/roles/geerlingguy.mysql/molecule/default/converge.yml
@@ -3,6 +3,9 @@
   hosts: all
   become: true
 
+  vars:
+    mysql_python_package_debian: python3-mysqldb
+
   roles:
     - role: geerlingguy.mysql
 
diff --git a/provisioning/roles/geerlingguy.mysql/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.mysql/molecule/default/molecule.yml
index 2ca6feaf9..38eb962bd 100644
--- a/provisioning/roles/geerlingguy.mysql/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.mysql/molecule/default/molecule.yml
@@ -3,10 +3,9 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
-  options:
-    config-file: molecule/default/yaml-lint.yml
+lint: |
+  yamllint .
+  ansible-lint
 platforms:
   - name: instance
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
@@ -17,13 +16,5 @@ platforms:
     pre_build_image: true
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
   playbooks:
-    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
-scenario:
-  name: default
-verifier:
-  name: testinfra
-  lint:
-    name: flake8
+    converge: ${MOLECULE_PLAYBOOK:-converge.yml}
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/configure.yml b/provisioning/roles/geerlingguy.mysql/tasks/configure.yml
index 49cb7ad23..b1f004fa1 100644
--- a/provisioning/roles/geerlingguy.mysql/tasks/configure.yml
+++ b/provisioning/roles/geerlingguy.mysql/tasks/configure.yml
@@ -66,8 +66,8 @@
     creates: "{{ mysql_log_error }}"
     warn: false
   when:
-    - mysql_log == ""
-    - mysql_log_error != ""
+    - mysql_log | default(true)
+    - mysql_log_error | default(false)
   tags: ['skip_ansible_galaxy']
 
 - name: Set ownership on error log file (if configured).
@@ -78,8 +78,8 @@
     group: "{{ mysql_log_file_group }}"
     mode: 0640
   when:
-    - mysql_log == ""
-    - mysql_log_error != ""
+    - mysql_log | default(true)
+    - mysql_log_error | default(false)
   tags: ['skip_ansible_galaxy']
 
 - name: Ensure MySQL is started and enabled on boot.
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/replication.yml b/provisioning/roles/geerlingguy.mysql/tasks/replication.yml
index e1cbeb54b..2532b5539 100644
--- a/provisioning/roles/geerlingguy.mysql/tasks/replication.yml
+++ b/provisioning/roles/geerlingguy.mysql/tasks/replication.yml
@@ -9,7 +9,7 @@
   when:
     - mysql_replication_role == 'master'
     - mysql_replication_user.name is defined
-    - mysql_replication_master != ''
+    - mysql_replication_master | default(false)
   tags: ['skip_ansible_galaxy']
 
 - name: Check slave replication status.
@@ -21,7 +21,7 @@
   register: slave
   when:
     - mysql_replication_role == 'slave'
-    - mysql_replication_master != ''
+    - mysql_replication_master | default(false)
   tags: ['skip_ansible_galaxy']
 
 - name: Check master replication status.
@@ -31,7 +31,7 @@
   when:
     - (slave.Is_Slave is defined and not slave.Is_Slave) or (slave.Is_Slave is not defined and slave is failed)
     - mysql_replication_role == 'slave'
-    - mysql_replication_master != ''
+    - mysql_replication_master | default(false)
   tags: ['skip_ansible_galaxy']
 
 - name: Configure replication on the slave.
@@ -47,12 +47,12 @@
     - (slave.Is_Slave is defined and not slave.Is_Slave) or (slave.Is_Slave is not defined and slave is failed)
     - mysql_replication_role == 'slave'
     - mysql_replication_user.name is defined
-    - mysql_replication_master != ''
+    - mysql_replication_master | default(false)
 
 - name: Start replication.
   mysql_replication: mode=startslave
   when:
     - (slave.Is_Slave is defined and not slave.Is_Slave) or (slave.Is_Slave is not defined and slave is failed)
     - mysql_replication_role == 'slave'
-    - mysql_replication_master != ''
+    - mysql_replication_master | default(false)
   tags: ['skip_ansible_galaxy']
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.mysql/tasks/setup-Debian.yml
index 325f25c52..c3197d574 100644
--- a/provisioning/roles/geerlingguy.mysql/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.mysql/tasks/setup-Debian.yml
@@ -9,11 +9,12 @@
 
 - name: Determine required MySQL Python libraries.
   set_fact:
-    deb_mysql_python_package: "{% if 'python3' in ansible_python_interpreter|default('') %}python3-mysqldb{% else %}python-mysqldb{% endif %}"
+    mysql_python_package_debian: "{% if 'python3' in ansible_python_interpreter|default('') %}python3-mysqldb{% else %}python-mysqldb{% endif %}"
+  when: mysql_python_package_debian is not defined
 
 - name: Ensure MySQL Python libraries are installed.
   apt:
-    name: "{{ deb_mysql_python_package }}"
+    name: "{{ mysql_python_package_debian }}"
     state: present
 
 - name: Ensure MySQL packages are installed.
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.mysql/tasks/setup-RedHat.yml
index a80aae259..6835c0d6a 100644
--- a/provisioning/roles/geerlingguy.mysql/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.mysql/tasks/setup-RedHat.yml
@@ -5,9 +5,3 @@
     state: present
     enablerepo: "{{ mysql_enablerepo | default(omit, true) }}"
   register: rh_mysql_install_packages
-
-- name: Ensure MySQL Python libraries are installed.
-  yum:
-    name: MySQL-python
-    state: present
-    enablerepo: "{{ mysql_enablerepo | default(omit, true) }}"
diff --git a/provisioning/roles/geerlingguy.mysql/templates/my.cnf.j2 b/provisioning/roles/geerlingguy.mysql/templates/my.cnf.j2
index 91962a30a..479b93f22 100644
--- a/provisioning/roles/geerlingguy.mysql/templates/my.cnf.j2
+++ b/provisioning/roles/geerlingguy.mysql/templates/my.cnf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_managed | comment }}
 
 [client]
 #password = your_password
diff --git a/provisioning/roles/geerlingguy.mysql/templates/root-my.cnf.j2 b/provisioning/roles/geerlingguy.mysql/templates/root-my.cnf.j2
index 5d2ab5272..af13e810e 100644
--- a/provisioning/roles/geerlingguy.mysql/templates/root-my.cnf.j2
+++ b/provisioning/roles/geerlingguy.mysql/templates/root-my.cnf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_managed | comment }}
 
 [client]
 user="{{ mysql_root_username }}"
diff --git a/provisioning/roles/geerlingguy.mysql/templates/user-my.cnf.j2 b/provisioning/roles/geerlingguy.mysql/templates/user-my.cnf.j2
index 257a97349..62e3692ea 100644
--- a/provisioning/roles/geerlingguy.mysql/templates/user-my.cnf.j2
+++ b/provisioning/roles/geerlingguy.mysql/templates/user-my.cnf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_managed | comment }}
 
 [client]
 user="{{ mysql_user_name }}"
diff --git a/provisioning/roles/geerlingguy.mysql/vars/RedHat-6.yml b/provisioning/roles/geerlingguy.mysql/vars/RedHat-6.yml
index 96af1ff04..12e086f62 100644
--- a/provisioning/roles/geerlingguy.mysql/vars/RedHat-6.yml
+++ b/provisioning/roles/geerlingguy.mysql/vars/RedHat-6.yml
@@ -3,6 +3,7 @@ __mysql_daemon: mysqld
 __mysql_packages:
   - mysql
   - mysql-server
+  - MySQL-python
 __mysql_slow_query_log_file: /var/log/mysql-slow.log
 __mysql_log_error: /var/log/mysql.err
 __mysql_syslog_tag: mysql
diff --git a/provisioning/roles/geerlingguy.mysql/vars/RedHat-8.yml b/provisioning/roles/geerlingguy.mysql/vars/RedHat-8.yml
new file mode 100644
index 000000000..12484af47
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/vars/RedHat-8.yml
@@ -0,0 +1,18 @@
+---
+__mysql_daemon: mariadb
+__mysql_packages:
+  - mariadb
+  - mariadb-server
+  - mariadb-connector-c
+  - python3-PyMySQL
+  - perl-DBD-MySQL
+__mysql_slow_query_log_file: /var/log/mysql-slow.log
+__mysql_log_error: /var/log/mariadb/mariadb.log
+__mysql_syslog_tag: mariadb
+__mysql_pid_file: /var/run/mariadb/mariadb.pid
+__mysql_config_file: /etc/my.cnf
+__mysql_config_include_dir: /etc/my.cnf.d
+__mysql_socket: /var/lib/mysql/mysql.sock
+# The entries controlled by this value should not be used with MariaDB >= 10.2.2
+# See https://github.com/frappe/bench/issues/681#issuecomment-398984706
+__mysql_supports_innodb_large_prefix: false
diff --git a/provisioning/roles/geerlingguy.nodejs/.travis.yml b/provisioning/roles/geerlingguy.nodejs/.travis.yml
index 5b6f821b8..1fa9d69e2 100644
--- a/provisioning/roles/geerlingguy.nodejs/.travis.yml
+++ b/provisioning/roles/geerlingguy.nodejs/.travis.yml
@@ -17,7 +17,7 @@ env:
 
 install:
   # Install test dependencies.
-  - pip install molecule docker
+  - pip install molecule yamllint ansible-lint docker
 
 before_script:
   # Use actual Ansible Galaxy role name for the project directory.
diff --git a/provisioning/roles/geerlingguy.nodejs/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.nodejs/.yamllint
similarity index 100%
rename from provisioning/roles/geerlingguy.nodejs/molecule/default/yaml-lint.yml
rename to provisioning/roles/geerlingguy.nodejs/.yamllint
diff --git a/provisioning/roles/geerlingguy.nodejs/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.nodejs/molecule/default/converge.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.nodejs/molecule/default/playbook.yml
rename to provisioning/roles/geerlingguy.nodejs/molecule/default/converge.yml
diff --git a/provisioning/roles/geerlingguy.nodejs/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.nodejs/molecule/default/molecule.yml
index 2ca6feaf9..38eb962bd 100644
--- a/provisioning/roles/geerlingguy.nodejs/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.nodejs/molecule/default/molecule.yml
@@ -3,10 +3,9 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
-  options:
-    config-file: molecule/default/yaml-lint.yml
+lint: |
+  yamllint .
+  ansible-lint
 platforms:
   - name: instance
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
@@ -17,13 +16,5 @@ platforms:
     pre_build_image: true
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
   playbooks:
-    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
-scenario:
-  name: default
-verifier:
-  name: testinfra
-  lint:
-    name: flake8
+    converge: ${MOLECULE_PLAYBOOK:-converge.yml}
diff --git a/provisioning/roles/geerlingguy.nodejs/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.nodejs/tasks/setup-Debian.yml
index 5abd6baa1..442e134a3 100644
--- a/provisioning/roles/geerlingguy.nodejs/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.nodejs/tasks/setup-Debian.yml
@@ -1,6 +1,10 @@
 ---
-- name: Ensure apt-transport-https is installed.
-  apt: name=apt-transport-https state=present
+- name: Ensure dependencies are present.
+  apt:
+    name:
+      - apt-transport-https
+      - gnupg2
+    state: present
 
 - name: Add Nodesource apt key.
   apt_key:
diff --git a/provisioning/roles/geerlingguy.php-pecl/.ansible-lint b/provisioning/roles/geerlingguy.php-pecl/.ansible-lint
new file mode 100644
index 000000000..477856412
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-pecl/.ansible-lint
@@ -0,0 +1,2 @@
+skip_list:
+  - '306'
diff --git a/provisioning/roles/geerlingguy.php-pecl/tasks/main.yml b/provisioning/roles/geerlingguy.php-pecl/tasks/main.yml
index 060f35ea5..44a208a3c 100644
--- a/provisioning/roles/geerlingguy.php-pecl/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php-pecl/tasks/main.yml
@@ -14,6 +14,6 @@
 - name: Install PECL libaries.
   shell: "yes '' | {{ php_pecl_install_command }} {{ item }}"
   register: pecl_result
-  changed_when: "pecl_result.rc == 0"
+  changed_when: pecl_result is succeeded
   failed_when: "not (('already installed' in pecl_result.stdout) or ('install ok:' in pecl_result.stdout))"
   with_items: "{{ php_pecl_extensions }}"
diff --git a/provisioning/roles/geerlingguy.php-versions/.github/FUNDING.yml b/provisioning/roles/geerlingguy.php-versions/.github/FUNDING.yml
new file mode 100644
index 000000000..96b493831
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-versions/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+---
+github: geerlingguy
+patreon: geerlingguy
diff --git a/provisioning/roles/geerlingguy.php-versions/.travis.yml b/provisioning/roles/geerlingguy.php-versions/.travis.yml
index 7a8158001..694160a4a 100644
--- a/provisioning/roles/geerlingguy.php-versions/.travis.yml
+++ b/provisioning/roles/geerlingguy.php-versions/.travis.yml
@@ -30,7 +30,7 @@ env:
 
 install:
   # Install test dependencies.
-  - pip install molecule docker
+  - pip install molecule yamllint ansible-lint docker
 
 before_script:
   # Use actual Ansible Galaxy role name for the project directory.
diff --git a/provisioning/roles/geerlingguy.php-versions/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.php-versions/.yamllint
similarity index 100%
rename from provisioning/roles/geerlingguy.php-versions/molecule/default/yaml-lint.yml
rename to provisioning/roles/geerlingguy.php-versions/.yamllint
diff --git a/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.php-versions/molecule/default/converge.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.php-versions/molecule/default/playbook.yml
rename to provisioning/roles/geerlingguy.php-versions/molecule/default/converge.yml
diff --git a/provisioning/roles/geerlingguy.php-versions/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.php-versions/molecule/default/molecule.yml
index 2ca6feaf9..38eb962bd 100644
--- a/provisioning/roles/geerlingguy.php-versions/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.php-versions/molecule/default/molecule.yml
@@ -3,10 +3,9 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
-  options:
-    config-file: molecule/default/yaml-lint.yml
+lint: |
+  yamllint .
+  ansible-lint
 platforms:
   - name: instance
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
@@ -17,13 +16,5 @@ platforms:
     pre_build_image: true
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
   playbooks:
-    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
-scenario:
-  name: default
-verifier:
-  name: testinfra
-  lint:
-    name: flake8
+    converge: ${MOLECULE_PLAYBOOK:-converge.yml}
diff --git a/provisioning/roles/geerlingguy.php-versions/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.php-versions/tasks/setup-Debian.yml
index dda60bb5d..86b6be259 100644
--- a/provisioning/roles/geerlingguy.php-versions/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.php-versions/tasks/setup-Debian.yml
@@ -3,6 +3,11 @@
   set_fact:
     php_opcache_conf_filename: "10-opcache.ini"
 
+- name: Ensure dirmngr is installed (gnupg dependency).
+  apt:
+    name: dirmngr
+    state: present
+
 - name: Add repository for PHP versions (Ubuntu).
   apt_repository: repo='ppa:ondrej/php'
   when: ansible_distribution == "Ubuntu"
diff --git a/provisioning/roles/geerlingguy.postgresql/.github/FUNDING.yml b/provisioning/roles/geerlingguy.postgresql/.github/FUNDING.yml
new file mode 100644
index 000000000..96b493831
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+---
+github: geerlingguy
+patreon: geerlingguy
diff --git a/provisioning/roles/geerlingguy.postgresql/.travis.yml b/provisioning/roles/geerlingguy.postgresql/.travis.yml
index 06604ced1..e0fb59b37 100644
--- a/provisioning/roles/geerlingguy.postgresql/.travis.yml
+++ b/provisioning/roles/geerlingguy.postgresql/.travis.yml
@@ -9,13 +9,11 @@ env:
     - MOLECULE_DISTRO: centos7
     - MOLECULE_DISTRO: fedora31
     - MOLECULE_DISTRO: ubuntu1804
-    - MOLECULE_DISTRO: ubuntu1604
     - MOLECULE_DISTRO: debian10
-    - MOLECULE_DISTRO: debian9
 
 install:
   # Install test dependencies.
-  - pip install molecule docker
+  - pip install molecule yamllint ansible-lint docker
 
 before_script:
   # Use actual Ansible Galaxy role name for the project directory.
diff --git a/provisioning/roles/geerlingguy.postgresql/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.postgresql/.yamllint
similarity index 100%
rename from provisioning/roles/geerlingguy.postgresql/molecule/default/yaml-lint.yml
rename to provisioning/roles/geerlingguy.postgresql/.yamllint
diff --git a/provisioning/roles/geerlingguy.postgresql/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.postgresql/molecule/default/converge.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.postgresql/molecule/default/playbook.yml
rename to provisioning/roles/geerlingguy.postgresql/molecule/default/converge.yml
diff --git a/provisioning/roles/geerlingguy.postgresql/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.postgresql/molecule/default/molecule.yml
index 2ca6feaf9..38eb962bd 100644
--- a/provisioning/roles/geerlingguy.postgresql/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.postgresql/molecule/default/molecule.yml
@@ -3,10 +3,9 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
-  options:
-    config-file: molecule/default/yaml-lint.yml
+lint: |
+  yamllint .
+  ansible-lint
 platforms:
   - name: instance
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
@@ -17,13 +16,5 @@ platforms:
     pre_build_image: true
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
   playbooks:
-    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
-scenario:
-  name: default
-verifier:
-  name: testinfra
-  lint:
-    name: flake8
+    converge: ${MOLECULE_PLAYBOOK:-converge.yml}
diff --git a/provisioning/roles/geerlingguy.postgresql/vars/Debian-10.yml b/provisioning/roles/geerlingguy.postgresql/vars/Debian-10.yml
index fe81ad790..d8b5103b6 100644
--- a/provisioning/roles/geerlingguy.postgresql/vars/Debian-10.yml
+++ b/provisioning/roles/geerlingguy.postgresql/vars/Debian-10.yml
@@ -8,3 +8,5 @@ __postgresql_packages:
   - postgresql
   - postgresql-contrib
   - libpq-dev
+# Debian 10 uses Python 3 by default.
+postgresql_python_library: python3-psycopg2
diff --git a/provisioning/roles/geerlingguy.postgresql/vars/Ubuntu-18.yml b/provisioning/roles/geerlingguy.postgresql/vars/Ubuntu-18.yml
index 201acc365..8136224f2 100644
--- a/provisioning/roles/geerlingguy.postgresql/vars/Ubuntu-18.yml
+++ b/provisioning/roles/geerlingguy.postgresql/vars/Ubuntu-18.yml
@@ -8,3 +8,4 @@ __postgresql_packages:
   - postgresql
   - postgresql-contrib
   - libpq-dev
+postgresql_python_library: python3-psycopg2
diff --git a/provisioning/roles/geerlingguy.ruby/.ansible-lint b/provisioning/roles/geerlingguy.ruby/.ansible-lint
new file mode 100644
index 000000000..cb8e2acf5
--- /dev/null
+++ b/provisioning/roles/geerlingguy.ruby/.ansible-lint
@@ -0,0 +1,2 @@
+skip_list:
+  - '405'
diff --git a/provisioning/roles/geerlingguy.ruby/.gitignore b/provisioning/roles/geerlingguy.ruby/.gitignore
index c9b2377e3..f56f5b578 100644
--- a/provisioning/roles/geerlingguy.ruby/.gitignore
+++ b/provisioning/roles/geerlingguy.ruby/.gitignore
@@ -1,2 +1,3 @@
 *.retry
-tests/test.sh
+*/__pycache__
+*.pyc
diff --git a/provisioning/roles/geerlingguy.ruby/.travis.yml b/provisioning/roles/geerlingguy.ruby/.travis.yml
index 35cd3f6cc..05d43df15 100644
--- a/provisioning/roles/geerlingguy.ruby/.travis.yml
+++ b/provisioning/roles/geerlingguy.ruby/.travis.yml
@@ -1,71 +1,34 @@
 ---
+language: python
 services: docker
 
 env:
-  # Package install on all OSes.
-  - distro: centos7
-    playbook: test.yml
-    ruby_version: 2.0.0
-    ruby_path_prefix: /usr
-  - distro: ubuntu1804
-    playbook: test.yml
-    ruby_version: 2.5.1
-    ruby_path_prefix: /usr
-  - distro: ubuntu1604
-    playbook: test.yml
-    ruby_version: 2.3.1
-    ruby_path_prefix: /usr
-  - distro: ubuntu1404
-    playbook: test.yml
-    ruby_version: 1.9.3
-    ruby_path_prefix: /usr
-  - distro: debian9
-    playbook: test.yml
-    ruby_version: 2.3.3
-    ruby_path_prefix: /usr
-
-  # Source install on latest OSes.
-  - distro: centos7
-    playbook: test-source.yml
-    ruby_version: 2.5.1
-    ruby_path_prefix: /usr/local
-  - distro: ubuntu1804
-    playbook: test-source.yml
-    ruby_version: 2.5.1
-    ruby_path_prefix: /usr/local
+  global:
+    - ROLE_NAME: ruby
+  matrix:
+    - MOLECULE_DISTRO: centos7
+    - MOLECULE_DISTRO: ubuntu1804
+    - MOLECULE_DISTRO: ubuntu1604
+    - MOLECULE_DISTRO: debian9
+
+    - MOLECULE_DISTRO: centos7
+      MOLECULE_PLAYBOOK: playbook-source.yml
+    - MOLECULE_DISTRO: ubuntu1804
+      MOLECULE_PLAYBOOK: playbook-source.yml
+
+install:
+  # Install test dependencies.
+  - pip install molecule docker
+
+before_script:
+  # Use actual Ansible Galaxy role name for the project directory.
+  - cd ../
+  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
+  - cd geerlingguy.$ROLE_NAME
 
 script:
-  # Configure test script so we can run extra tests after playbook is run.
-  - export container_id=$(date +%s)
-  - export cleanup=false
-
-  # Download test shim.
-  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
-  - chmod +x ${PWD}/tests/test.sh
-
   # Run tests.
-  - ${PWD}/tests/test.sh
-
-  # Make sure ruby is installed and at the correct version.
-  - 'docker exec --tty ${container_id} env TERM=xterm which ruby'
-  - 'docker exec --tty ${container_id} env TERM=xterm test -x ${ruby_path_prefix}/bin/ruby'
-
-  - 'docker exec --tty ${container_id} env TERM=xterm ruby --version'
-  - 'docker exec --tty ${container_id} env TERM=xterm ${ruby_path_prefix}/bin/ruby --version | grep -qF ${ruby_version}'
-
-  # Make sure bundler is installed.
-  - 'docker exec --tty ${container_id} env TERM=xterm ls -lah /usr/local/bin'
-  - 'docker exec --tty ${container_id} env TERM=xterm which bundle'
-
-  # Make sure user installed gems are available.
-  - |
-    if [ "${distro}" != "ubuntu1404" ]; then
-      docker exec --tty ${container_id} env TERM=xterm bash --login -c "which sass"
-    fi
-
-after_failure:
-  - 'docker exec --tty ${container_id} env TERM=xterm which ruby'
-  - 'docker exec --tty ${container_id} env TERM=xterm ruby --version'
+  - molecule test
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.ruby/README.md b/provisioning/roles/geerlingguy.ruby/README.md
index 43afd3837..7a2f5d5ef 100644
--- a/provisioning/roles/geerlingguy.ruby/README.md
+++ b/provisioning/roles/geerlingguy.ruby/README.md
@@ -16,7 +16,7 @@ Available variables are listed below, along with default values (see `defaults/m
 
 The location where temporary files will be downloaded in preparation for Ruby installation.
 
-    ruby_install_bundler: True
+    ruby_install_bundler: true
 
 Whether this role should install [Bundler](http://bundler.io/).
 
@@ -28,17 +28,21 @@ A list of Ruby gems to install (just the name of the gem to be installed). This
 
 The user account under which Ruby gems will be installed. Defaults to the `ansible_ssh_user` if not set.
 
-    ruby_install_from_source: False
+    ruby_install_from_source: false
 
 By default, this role will install whatever version of ruby is available through your system's package manager (`apt` or `yum`). You can install whatever version you like (including the latest release) by setting this to `true` and/or updating the `ruby_download_url` and `ruby_version`.
 
     ruby_download_url: http://cache.ruby-lang.org/pub/ruby/2.5/ruby-2.4.4.tar.gz
 
-The URL from which Ruby will be downloaded (only used if `ruby_install_from_source` is `True`).
+The URL from which Ruby will be downloaded (only used if `ruby_install_from_source` is `true`).
 
     ruby_version: 2.5.1
 
-The version of ruby that will be installed (only used if `ruby_install_from_source` is `True`).
+The version of ruby that will be installed (only used if `ruby_install_from_source` is `true`).
+
+    ruby_source_configure_command: ./configure --enable-shared
+
+The `configure` command that will be run (only used if `ruby_install_from_source` is `true`).
 
     ruby_rubygems_package_name: rubygems
 
diff --git a/provisioning/roles/geerlingguy.ruby/defaults/main.yml b/provisioning/roles/geerlingguy.ruby/defaults/main.yml
index aa85e69a1..d9be6d672 100644
--- a/provisioning/roles/geerlingguy.ruby/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.ruby/defaults/main.yml
@@ -2,7 +2,7 @@
 workspace: /root
 
 # Whether this role should install Bundler.
-ruby_install_bundler: True
+ruby_install_bundler: true
 
 # A list of Ruby gems to install.
 ruby_install_gems: []
@@ -12,9 +12,10 @@ ruby_install_gems_user: "{{ ansible_user }}"
 
 # If set to True, ruby will be installed from source, using the version set with
 # the 'ruby_version' variable instead of using a package.
-ruby_install_from_source: False
+ruby_install_from_source: false
 ruby_download_url: http://cache.ruby-lang.org/pub/ruby/2.5/ruby-2.5.1.tar.gz
 ruby_version: 2.5.1
+ruby_source_configure_command: ./configure --enable-shared
 
 # Default should usually work, but this will be overridden on Ubuntu 14.04.
 ruby_rubygems_package_name: rubygems
diff --git a/provisioning/roles/geerlingguy.ruby/meta/main.yml b/provisioning/roles/geerlingguy.ruby/meta/main.yml
index 8c8914fe3..2920c6248 100644
--- a/provisioning/roles/geerlingguy.ruby/meta/main.yml
+++ b/provisioning/roles/geerlingguy.ruby/meta/main.yml
@@ -10,37 +10,37 @@ galaxy_info:
   platforms:
     - name: EL
       versions:
-      - all
+        - all
     - name: GenericUNIX
       versions:
-      - all
+        - all
     - name: Fedora
       versions:
-      - all
+        - all
     - name: opensuse
       versions:
-      - all
+        - all
     - name: GenericBSD
       versions:
-      - all
+        - all
     - name: FreeBSD
       versions:
-      - all
+        - all
     - name: Ubuntu
       versions:
-      - lucid
-      - trusty
-      - precise
-      - bionic
+        - lucid
+        - trusty
+        - precise
+        - bionic
     - name: SLES
       versions:
-      - all
+        - all
     - name: GenericLinux
       versions:
-      - all
+        - all
     - name: Debian
       versions:
-      - all
+        - all
   galaxy_tags:
     - development
     - web
diff --git a/provisioning/roles/geerlingguy.ruby/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.ruby/molecule/default/molecule.yml
new file mode 100644
index 000000000..2ca6feaf9
--- /dev/null
+++ b/provisioning/roles/geerlingguy.ruby/molecule/default/molecule.yml
@@ -0,0 +1,29 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint:
+  name: yamllint
+  options:
+    config-file: molecule/default/yaml-lint.yml
+platforms:
+  - name: instance
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    privileged: true
+    pre_build_image: true
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+  playbooks:
+    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
+scenario:
+  name: default
+verifier:
+  name: testinfra
+  lint:
+    name: flake8
diff --git a/provisioning/roles/geerlingguy.ruby/molecule/default/playbook-source.yml b/provisioning/roles/geerlingguy.ruby/molecule/default/playbook-source.yml
new file mode 100644
index 000000000..bbd832b5a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.ruby/molecule/default/playbook-source.yml
@@ -0,0 +1,23 @@
+---
+- name: Converge
+  hosts: all
+  become: true
+
+  vars:
+    ruby_install_from_source: true
+    ruby_install_gems_user: root
+    ruby_install_gems:
+      - sass
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=true cache_valid_time=600
+      when: ansible_os_family == 'Debian'
+
+  roles:
+    - role: geerlingguy.ruby
+
+  post_tasks:
+    - name: Verify Ruby is installed.
+      command: ruby --version
+      changed_when: false
diff --git a/provisioning/roles/geerlingguy.ruby/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.ruby/molecule/default/playbook.yml
new file mode 100644
index 000000000..7cc7ffb48
--- /dev/null
+++ b/provisioning/roles/geerlingguy.ruby/molecule/default/playbook.yml
@@ -0,0 +1,35 @@
+---
+- name: Converge
+  hosts: all
+  become: true
+
+  vars:
+    ruby_install_gems_user: root
+    ruby_install_gems:
+      - json
+    ruby_gems_bin_path: /root/.gem/ruby/bin
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=true cache_valid_time=600
+      when: ansible_os_family == 'Debian'
+
+    - name: Add rubygems bin dir to system-wide $PATH.
+      copy:
+        dest: /etc/profile.d/ruby.sh
+        content: 'PATH=$PATH:{{ ruby_gems_bin_path }}'
+
+    - name: Don't install Bundler on CentOS 7 because of old Ruby version.
+      set_fact:
+        ruby_install_bundler: false
+      when:
+        - ansible_os_family == 'RedHat'
+        - ansible_distribution_major_version == '7'
+
+  roles:
+    - role: geerlingguy.ruby
+
+  post_tasks:
+    - name: Verify Ruby is installed.
+      command: ruby --version
+      changed_when: false
diff --git a/provisioning/roles/geerlingguy.php-pecl/molecule/default/tests/test_default.py b/provisioning/roles/geerlingguy.ruby/molecule/default/tests/test_default.py
similarity index 100%
rename from provisioning/roles/geerlingguy.php-pecl/molecule/default/tests/test_default.py
rename to provisioning/roles/geerlingguy.ruby/molecule/default/tests/test_default.py
diff --git a/provisioning/roles/geerlingguy.ruby/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.ruby/molecule/default/yaml-lint.yml
new file mode 100644
index 000000000..a3dbc38ee
--- /dev/null
+++ b/provisioning/roles/geerlingguy.ruby/molecule/default/yaml-lint.yml
@@ -0,0 +1,6 @@
+---
+extends: default
+rules:
+  line-length:
+    max: 120
+    level: warning
diff --git a/provisioning/roles/geerlingguy.ruby/tasks/install-from-source.yml b/provisioning/roles/geerlingguy.ruby/tasks/install-from-source.yml
index 9ed2ce371..d65d895d0 100644
--- a/provisioning/roles/geerlingguy.ruby/tasks/install-from-source.yml
+++ b/provisioning/roles/geerlingguy.ruby/tasks/install-from-source.yml
@@ -1,27 +1,22 @@
 ---
-- name: Install packages required to build ruby (RedHat).
-  yum: "name={{ item }} state=present"
-  with_items:
-    - '@development'
-    - zlib-devel
-    - openssl-static
+- name: Define ruby_build_packages.
+  set_fact:
+    ruby_build_packages: "{{ __ruby_build_packages }}"
+  when: ruby_build_packages is not defined
+
+- name: Install packages required to build ruby.
+  yum:
+    name: "{{ ruby_build_packages }}"
+    state: present
   when: ansible_os_family == 'RedHat'
 
 - name: Update apt cache (Debian).
-  apt: update_cache=yes cache_valid_time=86400
+  apt: update_cache=true cache_valid_time=86400
   when: ansible_os_family == 'Debian'
 
 - name: Install packages required to build ruby (Debian).
   apt:
-    name:
-      - build-essential
-      - zlib1g-dev
-      - libssl-dev
-      - libyaml-dev
-      - libreadline6-dev
-      - libncurses5-dev
-      - libffi-dev
-      - libgdbm-dev
+    name: "{{ ruby_build_packages }}"
     state: present
   when: ansible_os_family == 'Debian'
 
@@ -34,7 +29,7 @@
   unarchive:
     src: "{{ workspace }}/ruby-{{ ruby_version }}.tar.gz"
     dest: "{{ workspace }}/"
-    copy: no
+    copy: false
 
 - name: Build ruby.
   command: >
@@ -42,7 +37,7 @@
     chdir={{ workspace }}/ruby-{{ ruby_version }}
     creates=/usr/local/bin/ruby
   with_items:
-    - ./configure --enable-shared
+    - "{{ ruby_source_configure_command }}"
     - make
     - make install
 
@@ -51,7 +46,7 @@
     src: "/usr/local/bin/{{ item }}"
     dest: "/usr/bin/{{ item }}"
     state: link
-    force: yes
+    force: true
   with_items:
     - erb
     - gem
diff --git a/provisioning/roles/geerlingguy.ruby/tasks/main.yml b/provisioning/roles/geerlingguy.ruby/tasks/main.yml
index a6a759670..4bd908a33 100644
--- a/provisioning/roles/geerlingguy.ruby/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.ruby/tasks/main.yml
@@ -1,18 +1,26 @@
 ---
+- name: Include OS-specific variables.
+  include_vars: "{{ ansible_os_family }}.yml"
+
+- name: Define ruby_packages.
+  set_fact:
+    ruby_packages: "{{ __ruby_packages }}"
+  when: ruby_packages is not defined
+
 # Include OS-specific installation tasks.
 - include_tasks: setup-RedHat.yml
   when:
-    - ruby_install_from_source == False
+    - not ruby_install_from_source
     - ansible_os_family == 'RedHat'
 
 - include_tasks: setup-Debian.yml
   when:
-    - ruby_install_from_source == False
+    - not ruby_install_from_source
     - ansible_os_family == 'Debian'
 
 # Install ruby from source when ruby_install_from_source is true.
 - include_tasks: install-from-source.yml
-  when: ruby_install_from_source == True
+  when: ruby_install_from_source
 
 - name: Add user installed RubyGems bin directory to global $PATH.
   copy:
@@ -29,6 +37,6 @@
   gem:
     name: "{{ item }}"
     state: present
-  become: yes
+  become: true
   become_user: "{{ ruby_install_gems_user }}"
   with_items: "{{ ruby_install_gems }}"
diff --git a/provisioning/roles/geerlingguy.ruby/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.ruby/tasks/setup-Debian.yml
index 26aacd9b5..1b1cbac81 100644
--- a/provisioning/roles/geerlingguy.ruby/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.ruby/tasks/setup-Debian.yml
@@ -9,12 +9,10 @@
 
 - name: Install ruby and other required dependencies.
   apt:
-    name:
-      - ruby-full
-      - ruby-dev
-      - "{{ ruby_rubygems_package_name }}"
-      - build-essential
-      - autogen
-      - autoconf
-      - libtool
+    name: "{{ ruby_packages }}"
+    state: present
+
+- name: Install rubygems.
+  apt:
+    name: "{{ ruby_rubygems_package_name }}"
     state: present
diff --git a/provisioning/roles/geerlingguy.ruby/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.ruby/tasks/setup-RedHat.yml
index 6e5df1cf4..86f84aea6 100644
--- a/provisioning/roles/geerlingguy.ruby/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.ruby/tasks/setup-RedHat.yml
@@ -1,8 +1,5 @@
 ---
 - name: Install ruby, rubygems, and development tools.
-  yum: "name={{ item }} state=present"
-  with_items:
-    - ruby
-    - ruby-devel
-    - "{{ ruby_rubygems_package_name }}"
-    - '@development'
+  yum:
+    name: "{{ ruby_packages }}"
+    state: present
diff --git a/provisioning/roles/geerlingguy.ruby/tests/README.md b/provisioning/roles/geerlingguy.ruby/tests/README.md
deleted file mode 100644
index 6fb211721..000000000
--- a/provisioning/roles/geerlingguy.ruby/tests/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Ansible Role tests
-
-To run the test playbook(s) in this directory:
-
-  1. Install and start Docker.
-  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
-    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
-  1. Make the test shim executable: `chmod +x tests/test.sh`.
-  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
-
-If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.ruby/tests/test-source.yml b/provisioning/roles/geerlingguy.ruby/tests/test-source.yml
deleted file mode 100644
index 083579338..000000000
--- a/provisioning/roles/geerlingguy.ruby/tests/test-source.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-- hosts: all
-
-  vars:
-    ruby_install_from_source: true
-    ruby_install_gems_user: root
-    ruby_install_gems:
-      - sass
-
-  pre_tasks:
-    - name: Update apt cache.
-      apt: update_cache=yes cache_valid_time=600
-      when: ansible_os_family == 'Debian'
-
-  roles:
-    - role_under_test
diff --git a/provisioning/roles/geerlingguy.ruby/tests/test.yml b/provisioning/roles/geerlingguy.ruby/tests/test.yml
deleted file mode 100644
index dbf3a888b..000000000
--- a/provisioning/roles/geerlingguy.ruby/tests/test.yml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-- hosts: all
-
-  vars:
-    ruby_install_gems_user: root
-    ruby_install_gems:
-      - sass
-    ruby_gems_bin_path: /root/.gem/ruby/bin
-
-  pre_tasks:
-    - name: Update apt cache.
-      apt: update_cache=yes cache_valid_time=600
-      when: ansible_os_family == 'Debian'
-
-    - name: Use different gems for older OSes (Ubuntu 14.04).
-      set_fact:
-        ruby_install_gems: ['json']
-      when:
-        - ansible_distribution == 'Ubuntu'
-        - ansible_distribution_version == '14.04'
-
-    - name: Add rubygems bin dir to system-wide $PATH.
-      copy:
-        dest: /etc/profile.d/ruby.sh
-        content: 'PATH=$PATH:{{ ruby_gems_bin_path }}'
-
-  roles:
-    - role_under_test
diff --git a/provisioning/roles/geerlingguy.ruby/vars/Debian.yml b/provisioning/roles/geerlingguy.ruby/vars/Debian.yml
new file mode 100644
index 000000000..3549cb1d8
--- /dev/null
+++ b/provisioning/roles/geerlingguy.ruby/vars/Debian.yml
@@ -0,0 +1,17 @@
+---
+__ruby_packages:
+  - ruby-full
+  - ruby-dev
+  - build-essential
+  - autogen
+  - autoconf
+  - libtool
+__ruby_build_packages:
+  - build-essential
+  - zlib1g-dev
+  - libssl-dev
+  - libyaml-dev
+  - libreadline6-dev
+  - libncurses5-dev
+  - libffi-dev
+  - libgdbm-dev
diff --git a/provisioning/roles/geerlingguy.ruby/vars/RedHat.yml b/provisioning/roles/geerlingguy.ruby/vars/RedHat.yml
new file mode 100644
index 000000000..47e9766ac
--- /dev/null
+++ b/provisioning/roles/geerlingguy.ruby/vars/RedHat.yml
@@ -0,0 +1,10 @@
+---
+__ruby_packages:
+  - ruby
+  - ruby-devel
+  - "{{ ruby_rubygems_package_name }}"
+  - '@development'
+__ruby_build_packages:
+  - '@development'
+  - zlib-devel
+  - openssl-static
diff --git a/provisioning/roles/geerlingguy.varnish/.travis.yml b/provisioning/roles/geerlingguy.varnish/.travis.yml
index f04e37f69..e3369247c 100644
--- a/provisioning/roles/geerlingguy.varnish/.travis.yml
+++ b/provisioning/roles/geerlingguy.varnish/.travis.yml
@@ -17,7 +17,7 @@ env:
 
 install:
   # Install test dependencies.
-  - pip install molecule docker
+  - pip install molecule yamllint ansible-lint docker
 
 before_script:
   # Use actual Ansible Galaxy role name for the project directory.
diff --git a/provisioning/roles/geerlingguy.varnish/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.varnish/.yamllint
similarity index 100%
rename from provisioning/roles/geerlingguy.varnish/molecule/default/yaml-lint.yml
rename to provisioning/roles/geerlingguy.varnish/.yamllint
diff --git a/provisioning/roles/geerlingguy.varnish/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.varnish/molecule/default/converge.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.varnish/molecule/default/playbook.yml
rename to provisioning/roles/geerlingguy.varnish/molecule/default/converge.yml
diff --git a/provisioning/roles/geerlingguy.varnish/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.varnish/molecule/default/molecule.yml
index 2ca6feaf9..38eb962bd 100644
--- a/provisioning/roles/geerlingguy.varnish/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.varnish/molecule/default/molecule.yml
@@ -3,10 +3,9 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
-  options:
-    config-file: molecule/default/yaml-lint.yml
+lint: |
+  yamllint .
+  ansible-lint
 platforms:
   - name: instance
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
@@ -17,13 +16,5 @@ platforms:
     pre_build_image: true
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
   playbooks:
-    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
-scenario:
-  name: default
-verifier:
-  name: testinfra
-  lint:
-    name: flake8
+    converge: ${MOLECULE_PLAYBOOK:-converge.yml}
diff --git a/provisioning/roles/geerlingguy.varnish/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.varnish/tasks/setup-Debian.yml
index 60f426f47..795d1f035 100644
--- a/provisioning/roles/geerlingguy.varnish/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.varnish/tasks/setup-Debian.yml
@@ -1,7 +1,9 @@
 ---
-- name: Ensure APT HTTPS Transport is installed.
+- name: Ensure dependencies are present.
   apt:
-    name: apt-transport-https
+    name:
+      - apt-transport-https
+      - gnupg2
     state: present
 
 - name: Add packagecloud.io Varnish apt key.

From 6ccbf56c8727f259ca83249a77e7a2aa2304dc1d Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 21 Feb 2020 21:57:56 -0600
Subject: [PATCH 1145/1273] Drop the ansible-lint test for now to avoid pip
 versioning issues.

---
 tests/run-tests.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index 72a583d8b..21f7b96e7 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -101,10 +101,6 @@ docker exec $CONTAINER_ID cp $DRUPALVM_DIR/$COMPOSERFILE ${config_dir:-$DRUPALVM
 printf "\n"${green}"Checking playbook syntax..."${neutral}"\n"
 docker exec --tty $CONTAINER_ID env TERM=xterm ansible-playbook $DRUPALVM_DIR/provisioning/playbook.yml --syntax-check
 
-# Run Ansible Lint.
-docker exec $CONTAINER_ID bash -c "pip install ansible-lint"
-docker exec $CONTAINER_ID bash -c "cd $DRUPALVM_DIR/provisioning && ansible-lint playbook.yml" || true
-
 # Run the setup playbook.
 printf "\n"${green}"Running the setup playbook..."${neutral}"\n"
 docker exec --tty $CONTAINER_ID env TERM=xterm ansible-playbook /var/www/drupalvm/tests/test-setup.yml

From a5acda95ff42ab130cfb24130547321acd2afa2a Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 21 Feb 2020 22:07:09 -0600
Subject: [PATCH 1146/1273] Default to python 2 still for backwards
 compatibility.

---
 .travis.yml                 | 6 +++---
 provisioning/docker/bake.sh | 3 ++-
 tests/run-tests.sh          | 3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a192d0c95..595ada624 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,17 +20,20 @@ env:
     # Defaults - Ubuntu 18.04.
     - type: defaults
       distro: ubuntu1804
+      tag: python2
     # Defaults - Debian 9.
     - type: debian
       distro: debian9
     # Defaults - CentOS 7.
     - type: centos
       distro: centos7
+      tag: python2
       local_config: tests/centos-7.config.yml
 
     # PHP 7.3 - Ubuntu 18.04.
     - type: defaults
       distro: ubuntu1804
+      tag: python2
       local_config: tests/ubuntu-18-php73.config.yml
       DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/bin/drush"
       TEST_INSTALLED_EXTRAS: false
@@ -51,9 +54,6 @@ env:
     #   TEST_INSTALLED_EXTRAS: false
 
 before_install:
-  # Pull container.
-  - docker pull geerlingguy/docker-${distro}-ansible:latest
-
   # Install lint tools.
   - gem install rubocop
 
diff --git a/provisioning/docker/bake.sh b/provisioning/docker/bake.sh
index 36f60133f..aa65098df 100755
--- a/provisioning/docker/bake.sh
+++ b/provisioning/docker/bake.sh
@@ -15,6 +15,7 @@ DRUPALVM_HTTP_PORT="${DRUPALVM_HTTP_PORT:-80}"
 DRUPALVM_HTTPS_PORT="${DRUPALVM_HTTPS_PORT:-443}"
 
 DISTRO="${DISTRO:-ubuntu1804}"
+TAG="${TAG:-python2}"
 OPTS="${OPTS:---privileged}"
 INIT="${INIT:-/lib/systemd/systemd}"
 
@@ -41,7 +42,7 @@ docker run --name=$DRUPALVM_MACHINE_NAME -d \
   -p $DRUPALVM_IP_ADDRESS:$DRUPALVM_HTTP_PORT:80 \
   -p $DRUPALVM_IP_ADDRESS:$DRUPALVM_HTTPS_PORT:443 \
   $OPTS \
-  geerlingguy/docker-$DISTRO-ansible:latest \
+  geerlingguy/docker-$DISTRO-ansible:$TAG \
   $INIT
 
 # Create Drupal directory.
diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index 21f7b96e7..0cc6a849f 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -15,6 +15,7 @@ TEST_INSTALLED_EXTRAS="${TEST_INSTALLED_EXTRAS:-true}"
 CONTAINER_ID="${CONTAINER_ID:-dvm-test}"
 type="${type:-tests/defaults}"
 distro="${distro:-ubuntu1604}"
+tag="${tag:-latest}"
 cleanup="${cleanup:-true}"
 
 ## Set up vars for Docker setup.
@@ -81,7 +82,7 @@ docker run --name=$CONTAINER_ID -d \
   --add-host "$HOSTNAME  drupalvm":127.0.0.1 \
   -v $PWD:/var/www/drupalvm/:$volume_opts \
   $opts \
-  geerlingguy/docker-$distro-ansible:latest \
+  geerlingguy/docker-$distro-ansible:$tag \
   $init
 
 # Set up directories.

From 8c7ea2ded52c57a707ce632eb79a6fa3bcb783a6 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 27 Feb 2020 11:21:18 -0600
Subject: [PATCH 1147/1273] Issue #2015: Prepare for 5.1.1 release, drop CentOS
 6 documentation.

---
 CHANGELOG.md                   | 20 ++++++++++++++++++++
 docs/configurations/base-os.md | 31 +++++++++----------------------
 tests/run-tests.sh             |  4 ----
 3 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 390103a84..52dc7300d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,25 @@
 # Drupal VM Changelog
 
+## 5.1.1 (2020-02-27)
+
+### Breaking Changes
+
+  - Removed 'official' support for CentOS 6 and Debian 8. These older OSes may still work, but [it would be extremely painful](https://www.youtube.com/watch?v=RZhp-Uctd-c) to keep using them.
+
+### New/changed variables in default.config.yml
+
+N/A
+
+### Improvements
+
+  * Improved CentOS 8 compatibility.
+  * Updated roles: drupal, php-xdebug, php-xhprof, php-versions, java, security, nodejs, elasticsearch, firewall, varnish, blackfire, daemonize, mysql, postgresql, ruby, php-pecl
+
+### Bugfixes
+
+  * #2011: Fix broken link in Solr documentation.
+
+
 ## 5.1.0 "Recognizer" (2019-12-03)
 
 This release adds support for PHP 7.4, and completely drops PHP 5.6 support (in the past, brave and daring souls could attempt to run 5.6—it is almost impossible to do so in Drupal VM as of this release).
diff --git a/docs/configurations/base-os.md b/docs/configurations/base-os.md
index bc7fb3459..1b96efddc 100644
--- a/docs/configurations/base-os.md
+++ b/docs/configurations/base-os.md
@@ -4,8 +4,9 @@ Currently-supported OSes are:
 
   - Ubuntu 18.04 'Bionic' (default)
   - Ubuntu 16.04 'Xenial'
+  - RedHat Enterprise Linux / CentOS 8
   - RedHat Enterprise Linux / CentOS 7
-  - RedHat Enterprise Linux / CentOS 6 (limited support)
+  - Debian 10 'Buster'
   - Debian 9 'Stretch'
 
 For certain OSes, there are a couple other caveats and tweaks you may need to perform to get things running smoothly—the main features and latest development is only guaranteed to work with the default OS as configured in `default.config.yml`.
@@ -20,32 +21,18 @@ Everything should work out of the box with Ubuntu 16.04.
 
 Everything should work out of the box with Ubuntu 16.04.
 
-## RedHat Enterprise Linux / CentOS 7
-
-Everything should work out of the box with RHEL 7.
-
-## RedHat Enterprise Linux / CentOS 6
+## RedHat Enterprise Linux / CentOS 8
 
-- **Apache without FastCGI**: If you want to use Apache with CentOS 6 on Drupal VM, you will need to modify the syntax of your `apache_vhosts` and remove the `extra_parameters: "{{ apache_vhost_php_fpm_parameters }}"` line from each one. Alternatively, you can use Nginx with the default configuration by setting `drupalvm_webserver: nginx` inside `config.yml`.
+Everything should work out of the box with RHEL 8.
 
-- **PHP OpCache**: PHP's OpCache (if you're using PHP > 5.5) requires the following setting to be configured in `config.yml` (see upstream bug: [CentOS (6) needs additional php-opcache package](https://github.com/geerlingguy/ansible-role-php/issues/39)):
-
-```yaml
-php_opcache_enabled_in_ini: false
-```
-
-- **Firewalld**: [Firewalld](http://www.firewalld.org/) is not available on CentOS 6, so the Drupal VM setting `firewall_disable_firewalld`, which defaults to `true`, must be overridden in `config.yml` and set to `false`:
+## RedHat Enterprise Linux / CentOS 7
 
-```yaml
-firewall_disable_firewalld: false
-```
+Everything should work out of the box with RHEL 7.
 
-- **Varnish**: Newer versions of Varnish are no longer available for CentOS 6, so you need to lock Varnish in at an older version, by adding something like the following in `config.yml`:
+## Debian 10 Buster
 
-```yaml
-varnish_version: 5.2
-```
+Everything should work out of the box with Debian 10.
 
 ## Debian 9 Stretch
 
-Everything should work out of the box with Debian 9.
+Everything should work out of the box with Debian 10.
diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index 0cc6a849f..3853feeff 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -27,10 +27,6 @@ if [ $distro = 'centos7' ]; then
 elif [ $distro = 'centos8' ]; then
   init="/usr/lib/systemd/systemd"
   opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-# CentOS 6
-elif [ $distro = 'centos6' ]; then
-  init="/sbin/init"
-  opts="--privileged"
 # Ubuntu 18.04
 elif [ $distro = 'ubuntu1804' ]; then
   init="/lib/systemd/systemd"

From f4a41e3cba44b2ea3d819afa4e53476721a878ce Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 3 Mar 2020 17:23:13 -0600
Subject: [PATCH 1148/1273] Update php-pecl role to latest version, helps with
 Debian 10 support.

---
 provisioning/requirements.yml                 |  2 +-
 .../geerlingguy.php-pecl/.github/FUNDING.yml  |  4 ++++
 .../roles/geerlingguy.php-pecl/.travis.yml    |  6 +++---
 .../default/yaml-lint.yml => .yamllint}       |  0
 .../roles/geerlingguy.php-pecl/meta/main.yml  |  2 +-
 .../default/{playbook.yml => converge.yml}    | 19 ++++++++++---------
 .../molecule/default/molecule.yml             | 18 +++++-------------
 .../molecule/default/pecl-test.php            | 19 +++++++++++++++++++
 .../molecule/default/requirements.yml         |  1 +
 .../roles/geerlingguy.php-pecl/tasks/main.yml |  1 +
 .../geerlingguy.php-pecl/vars/Debian-8.yml    |  2 ++
 .../geerlingguy.php-pecl/vars/Debian.yml      |  2 +-
 .../vars/{Debian-9.yml => Ubuntu.yml}         |  0
 13 files changed, 48 insertions(+), 28 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.php-pecl/.github/FUNDING.yml
 rename provisioning/roles/geerlingguy.php-pecl/{molecule/default/yaml-lint.yml => .yamllint} (100%)
 rename provisioning/roles/geerlingguy.php-pecl/molecule/default/{playbook.yml => converge.yml} (69%)
 create mode 100644 provisioning/roles/geerlingguy.php-pecl/molecule/default/pecl-test.php
 create mode 100644 provisioning/roles/geerlingguy.php-pecl/vars/Debian-8.yml
 rename provisioning/roles/geerlingguy.php-pecl/vars/{Debian-9.yml => Ubuntu.yml} (100%)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index ab58f100d..0ca56a5bf 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -49,7 +49,7 @@ roles:
   - name: geerlingguy.php-mysql
     version: 2.0.2
   - name: geerlingguy.php-pecl
-    version: 1.4.2
+    version: 2.0.0
   - name: geerlingguy.php-pgsql
     version: 1.0.1
   - name: geerlingguy.php-redis
diff --git a/provisioning/roles/geerlingguy.php-pecl/.github/FUNDING.yml b/provisioning/roles/geerlingguy.php-pecl/.github/FUNDING.yml
new file mode 100644
index 000000000..96b493831
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-pecl/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+---
+github: geerlingguy
+patreon: geerlingguy
diff --git a/provisioning/roles/geerlingguy.php-pecl/.travis.yml b/provisioning/roles/geerlingguy.php-pecl/.travis.yml
index 343783049..dee7ff6da 100644
--- a/provisioning/roles/geerlingguy.php-pecl/.travis.yml
+++ b/provisioning/roles/geerlingguy.php-pecl/.travis.yml
@@ -6,13 +6,13 @@ env:
   global:
     - ROLE_NAME: php-pecl
   matrix:
-    - MOLECULE_DISTRO: centos7
+    - MOLECULE_DISTRO: centos8
     - MOLECULE_DISTRO: ubuntu1804
-    - MOLECULE_DISTRO: debian9
+    - MOLECULE_DISTRO: debian10
 
 install:
   # Install test dependencies.
-  - pip install molecule docker
+  - pip install molecule yamllint ansible-lint docker
 
 before_script:
   # Use actual Ansible Galaxy role name for the project directory.
diff --git a/provisioning/roles/geerlingguy.php-pecl/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.php-pecl/.yamllint
similarity index 100%
rename from provisioning/roles/geerlingguy.php-pecl/molecule/default/yaml-lint.yml
rename to provisioning/roles/geerlingguy.php-pecl/.yamllint
diff --git a/provisioning/roles/geerlingguy.php-pecl/meta/main.yml b/provisioning/roles/geerlingguy.php-pecl/meta/main.yml
index 8ff0cdc33..f55cf64bd 100644
--- a/provisioning/roles/geerlingguy.php-pecl/meta/main.yml
+++ b/provisioning/roles/geerlingguy.php-pecl/meta/main.yml
@@ -7,7 +7,7 @@ galaxy_info:
   description: PHP PECL extension installation.
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 2.0
+  min_ansible_version: 2.4
   platforms:
     - name: EL
       versions:
diff --git a/provisioning/roles/geerlingguy.php-pecl/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.php-pecl/molecule/default/converge.yml
similarity index 69%
rename from provisioning/roles/geerlingguy.php-pecl/molecule/default/playbook.yml
rename to provisioning/roles/geerlingguy.php-pecl/molecule/default/converge.yml
index efd36e965..f6e38e2b2 100644
--- a/provisioning/roles/geerlingguy.php-pecl/molecule/default/playbook.yml
+++ b/provisioning/roles/geerlingguy.php-pecl/molecule/default/converge.yml
@@ -5,8 +5,8 @@
 
   vars:
     php_enable_webserver: false
-    php_enablerepo: "remi,remi-php72"
-    php_default_version_debian: "7.2"
+    php_default_version_debian: "7.3"
+    php_pecl_install_pecl: true
     php_pecl_extensions:
       - redis
 
@@ -23,15 +23,16 @@
       yum: name="@Development tools" state=present
       when: ansible_os_family == 'RedHat'
 
-    - name: Set version to 7.0 on Debian 9 and enable pecl installation
-      set_fact:
-        php_default_version_debian: '7.0'
-      when:
-        - ansible_os_family == 'Debian'
-        - ansible_distribution_major_version == '9'
-
   roles:
     - role: geerlingguy.repo-remi
       when: ansible_os_family == 'RedHat'
+    - role: geerlingguy.php-versions
     - role: geerlingguy.php
     - role: geerlingguy.php-pecl
+
+  post_tasks:
+    - name: Run test script to confirm Redis extension is available to PHP.
+      script: pecl-test.php
+      args:
+        executable: php
+      changed_when: false
diff --git a/provisioning/roles/geerlingguy.php-pecl/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.php-pecl/molecule/default/molecule.yml
index 2ca6feaf9..2da47dd1f 100644
--- a/provisioning/roles/geerlingguy.php-pecl/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.php-pecl/molecule/default/molecule.yml
@@ -3,10 +3,10 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
-  options:
-    config-file: molecule/default/yaml-lint.yml
+lint: |
+  set -e
+  yamllint .
+  ansible-lint
 platforms:
   - name: instance
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
@@ -17,13 +17,5 @@ platforms:
     pre_build_image: true
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
   playbooks:
-    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
-scenario:
-  name: default
-verifier:
-  name: testinfra
-  lint:
-    name: flake8
+    converge: ${MOLECULE_PLAYBOOK:-converge.yml}
diff --git a/provisioning/roles/geerlingguy.php-pecl/molecule/default/pecl-test.php b/provisioning/roles/geerlingguy.php-pecl/molecule/default/pecl-test.php
new file mode 100644
index 000000000..9bd5bf819
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-pecl/molecule/default/pecl-test.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * @file
+ * Test if pecl/pear is available and working.
+ */
+
+require_once 'System.php';
+
+$success = FALSE;
+
+if (class_exists('System', false)) {
+  $success = TRUE;
+}
+
+if (!$success) {
+  print "pecl/pear not found.\r\n";
+  exit(1);
+}
\ No newline at end of file
diff --git a/provisioning/roles/geerlingguy.php-pecl/molecule/default/requirements.yml b/provisioning/roles/geerlingguy.php-pecl/molecule/default/requirements.yml
index 80e765f13..908335edd 100644
--- a/provisioning/roles/geerlingguy.php-pecl/molecule/default/requirements.yml
+++ b/provisioning/roles/geerlingguy.php-pecl/molecule/default/requirements.yml
@@ -1,3 +1,4 @@
 ---
 - src: geerlingguy.repo-remi
+- src: geerlingguy.php-versions
 - src: geerlingguy.php
diff --git a/provisioning/roles/geerlingguy.php-pecl/tasks/main.yml b/provisioning/roles/geerlingguy.php-pecl/tasks/main.yml
index 44a208a3c..890a115c3 100644
--- a/provisioning/roles/geerlingguy.php-pecl/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php-pecl/tasks/main.yml
@@ -3,6 +3,7 @@
   include_vars: "{{ item }}"
   with_first_found:
     - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
+    - "{{ ansible_distribution }}.yml"
     - "{{ ansible_os_family }}.yml"
 
 - name: Ensure pecl is installed (if configured).
diff --git a/provisioning/roles/geerlingguy.php-pecl/vars/Debian-8.yml b/provisioning/roles/geerlingguy.php-pecl/vars/Debian-8.yml
new file mode 100644
index 000000000..47c282c72
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-pecl/vars/Debian-8.yml
@@ -0,0 +1,2 @@
+---
+php_pecl_package: php-pecl
diff --git a/provisioning/roles/geerlingguy.php-pecl/vars/Debian.yml b/provisioning/roles/geerlingguy.php-pecl/vars/Debian.yml
index 47c282c72..fd71295b9 100644
--- a/provisioning/roles/geerlingguy.php-pecl/vars/Debian.yml
+++ b/provisioning/roles/geerlingguy.php-pecl/vars/Debian.yml
@@ -1,2 +1,2 @@
 ---
-php_pecl_package: php-pecl
+php_pecl_package: php-pear
diff --git a/provisioning/roles/geerlingguy.php-pecl/vars/Debian-9.yml b/provisioning/roles/geerlingguy.php-pecl/vars/Ubuntu.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.php-pecl/vars/Debian-9.yml
rename to provisioning/roles/geerlingguy.php-pecl/vars/Ubuntu.yml

From f7380977cdee1e1486dc179a3a75641000b836e3 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 5 Mar 2020 07:59:56 -0600
Subject: [PATCH 1149/1273] Upgrade postgresql role for better CentOS 8
 compatibility.

---
 provisioning/requirements.yml                        |  2 +-
 .../roles/geerlingguy.postgresql/.travis.yml         |  1 +
 .../roles/geerlingguy.postgresql/meta/main.yml       |  1 +
 .../molecule/default/converge.yml                    |  6 +++---
 .../molecule/default/molecule.yml                    |  1 +
 .../roles/geerlingguy.postgresql/tasks/configure.yml |  2 +-
 .../roles/geerlingguy.postgresql/tasks/variables.yml |  6 ++++++
 .../roles/geerlingguy.postgresql/vars/Fedora-31.yml  |  1 +
 .../roles/geerlingguy.postgresql/vars/RedHat-8.yml   | 12 ++++++++++++
 9 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.postgresql/vars/RedHat-8.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 0ca56a5bf..aebe01ecd 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -67,7 +67,7 @@ roles:
   - name: geerlingguy.postfix
     version: 2.0.0
   - name: geerlingguy.postgresql
-    version: 2.0.2
+    version: 2.1.0
   - name: geerlingguy.redis
     version: 1.6.0
   - name: geerlingguy.repo-remi
diff --git a/provisioning/roles/geerlingguy.postgresql/.travis.yml b/provisioning/roles/geerlingguy.postgresql/.travis.yml
index e0fb59b37..61d923b3b 100644
--- a/provisioning/roles/geerlingguy.postgresql/.travis.yml
+++ b/provisioning/roles/geerlingguy.postgresql/.travis.yml
@@ -7,6 +7,7 @@ env:
     - ROLE_NAME: postgresql
   matrix:
     - MOLECULE_DISTRO: centos7
+    - MOLECULE_DISTRO: centos8
     - MOLECULE_DISTRO: fedora31
     - MOLECULE_DISTRO: ubuntu1804
     - MOLECULE_DISTRO: debian10
diff --git a/provisioning/roles/geerlingguy.postgresql/meta/main.yml b/provisioning/roles/geerlingguy.postgresql/meta/main.yml
index 4e8170845..5d3ae1f54 100644
--- a/provisioning/roles/geerlingguy.postgresql/meta/main.yml
+++ b/provisioning/roles/geerlingguy.postgresql/meta/main.yml
@@ -12,6 +12,7 @@ galaxy_info:
       versions:
         - 6
         - 7
+        - 8
     - name: Fedora
       versions:
         - 29
diff --git a/provisioning/roles/geerlingguy.postgresql/molecule/default/converge.yml b/provisioning/roles/geerlingguy.postgresql/molecule/default/converge.yml
index a437c5186..40348b7c5 100644
--- a/provisioning/roles/geerlingguy.postgresql/molecule/default/converge.yml
+++ b/provisioning/roles/geerlingguy.postgresql/molecule/default/converge.yml
@@ -11,15 +11,15 @@
 
   pre_tasks:
     # The Fedora 30+ container images have only C.UTF-8 installed
-    - name: Set database locale if using Fedora 30+
+    - name: Set database locale if using Fedora 30+ or RedHat 8+
       set_fact:
         postgresql_databases:
           - name: example
             lc_collate: 'C.UTF-8'
             lc_ctype: 'C.UTF-8'
       when:
-        - ansible_distribution == 'Fedora'
-        - ansible_distribution_major_version >= '30'
+        - ( ansible_distribution == 'Fedora' and ansible_distribution_major_version >= '30') or
+          ( ansible_os_family == 'RedHat' and ansible_distribution_major_version == '8')
 
     - name: Update apt cache.
       apt: update_cache=true cache_valid_time=600
diff --git a/provisioning/roles/geerlingguy.postgresql/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.postgresql/molecule/default/molecule.yml
index 38eb962bd..2da47dd1f 100644
--- a/provisioning/roles/geerlingguy.postgresql/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.postgresql/molecule/default/molecule.yml
@@ -4,6 +4,7 @@ dependency:
 driver:
   name: docker
 lint: |
+  set -e
   yamllint .
   ansible-lint
 platforms:
diff --git a/provisioning/roles/geerlingguy.postgresql/tasks/configure.yml b/provisioning/roles/geerlingguy.postgresql/tasks/configure.yml
index 28504a5ef..bcbc0fb47 100644
--- a/provisioning/roles/geerlingguy.postgresql/tasks/configure.yml
+++ b/provisioning/roles/geerlingguy.postgresql/tasks/configure.yml
@@ -24,5 +24,5 @@
     state: directory
     owner: "{{ postgresql_user }}"
     group: "{{ postgresql_group }}"
-    mode: 02775
+    mode: "{{ postgresql_unix_socket_directories_mode }}"
   with_items: "{{ postgresql_unix_socket_directories }}"
diff --git a/provisioning/roles/geerlingguy.postgresql/tasks/variables.yml b/provisioning/roles/geerlingguy.postgresql/tasks/variables.yml
index 7f4515494..575897207 100644
--- a/provisioning/roles/geerlingguy.postgresql/tasks/variables.yml
+++ b/provisioning/roles/geerlingguy.postgresql/tasks/variables.yml
@@ -43,3 +43,9 @@
   set_fact:
     postgresql_config_path: "{{ __postgresql_config_path }}"
   when: postgresql_config_path is not defined
+
+- name: Define postgresql_unix_socket_directories_mode.
+  set_fact:
+    postgresql_unix_socket_directories_mode: >-
+      {{ __postgresql_unix_socket_directories_mode | default('02775') }}
+  when: postgresql_unix_socket_directories_mode is not defined
diff --git a/provisioning/roles/geerlingguy.postgresql/vars/Fedora-31.yml b/provisioning/roles/geerlingguy.postgresql/vars/Fedora-31.yml
index 1638a6a81..27a023ecc 100644
--- a/provisioning/roles/geerlingguy.postgresql/vars/Fedora-31.yml
+++ b/provisioning/roles/geerlingguy.postgresql/vars/Fedora-31.yml
@@ -9,5 +9,6 @@ __postgresql_packages:
   - postgresql-server
   - postgresql-contrib
   - postgresql-libs
+__postgresql_unix_socket_directories_mode: '0755'
 # Fedora 31 containers only have python3 by default
 postgresql_python_library: python3-psycopg2
diff --git a/provisioning/roles/geerlingguy.postgresql/vars/RedHat-8.yml b/provisioning/roles/geerlingguy.postgresql/vars/RedHat-8.yml
new file mode 100644
index 000000000..e519ea9a0
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/vars/RedHat-8.yml
@@ -0,0 +1,12 @@
+---
+__postgresql_version: "10"
+__postgresql_data_dir: "/var/lib/pgsql/data"
+__postgresql_bin_path: "/usr/bin"
+__postgresql_config_path: "/var/lib/pgsql/data"
+__postgresql_daemon: postgresql
+__postgresql_packages:
+  - postgresql
+  - postgresql-server
+  - postgresql-contrib
+__postgresql_unix_socket_directories_mode: '0755'
+postgresql_python_library: python3-psycopg2

From 7436fb8e021645b9443b7239f5ef2c997ab8659a Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 5 Mar 2020 10:44:47 -0600
Subject: [PATCH 1150/1273] Add probot/stale configuration.

---
 .github/stale.yml | 56 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 .github/stale.yml

diff --git a/.github/stale.yml b/.github/stale.yml
new file mode 100644
index 000000000..c7ff12754
--- /dev/null
+++ b/.github/stale.yml
@@ -0,0 +1,56 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 90
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 30
+
+# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
+onlyLabels: []
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - pinned
+  - security
+  - planned
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: false
+
+# Label to use when marking as stale
+staleLabel: stale
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+pulls:
+  markComment: |-
+    This pull request has been marked 'stale' due to lack of recent activity. If there is no further activity, the PR will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark pull requests as stale.
+
+  unmarkComment: >-
+    This pull request is no longer marked for closure.
+
+  closeComment: >-
+    This pull request has been closed due to inactivity. If you feel this is in error, please reopen the pull request or file a new PR with the relevant details.
+
+issues:
+  markComment: |-
+    This issue has been marked 'stale' due to lack of recent activity. If there is no further activity, the issue will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark issues as stale.
+
+  unmarkComment: >-
+    This issue is no longer marked for closure.
+
+  closeComment: >-
+    This issue has been closed due to inactivity. If you feel this is in error, please reopen the issue or file a new issue with the relevant details.

From 9c398d127609956e24382a879e583e1ae7507af1 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 6 Mar 2020 10:24:44 -0600
Subject: [PATCH 1151/1273] Update php role to latest version.

---
 provisioning/requirements.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index aebe01ecd..1201ece7f 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -43,7 +43,7 @@ roles:
   - name: geerlingguy.nodejs
     version: 5.1.1
   - name: geerlingguy.php
-    version: 3.7.0
+    version: 4.0.0
   - name: geerlingguy.php-memcached
     version: 2.0.2
   - name: geerlingguy.php-mysql

From 37c684a748ccd06b2fcc229db2fe26ec3c58e62d Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 6 Mar 2020 14:16:43 -0600
Subject: [PATCH 1152/1273] Update php role to latest version.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.php/.ansible-lint       |  4 ++
 .../roles/geerlingguy.php/.github/FUNDING.yml |  4 ++
 .../roles/geerlingguy.php/.github/stale.yml   | 56 +++++++++++++++++++
 .../roles/geerlingguy.php/.travis.yml         |  4 +-
 .../default/yaml-lint.yml => .yamllint}       |  0
 provisioning/roles/geerlingguy.php/README.md  |  6 ++
 .../roles/geerlingguy.php/defaults/main.yml   |  6 ++
 .../roles/geerlingguy.php/handlers/main.yml   |  4 +-
 .../roles/geerlingguy.php/meta/main.yml       |  3 +-
 .../default/{playbook.yml => converge.yml}    |  6 ++
 .../molecule/default/molecule.yml             | 18 ++----
 .../molecule/default/tests/test_default.py    | 14 -----
 .../geerlingguy.php/tasks/configure-fpm.yml   | 13 +----
 .../tasks/configure-opcache.yml               |  4 +-
 .../tasks/install-from-source.yml             |  2 +-
 .../roles/geerlingguy.php/tasks/main.yml      | 15 +++--
 .../geerlingguy.php/tasks/setup-Debian.yml    |  4 +-
 .../geerlingguy.php/tasks/setup-RedHat.yml    |  2 +-
 .../geerlingguy.php/templates/php.ini.j2      |  6 +-
 .../roles/geerlingguy.php/vars/RedHat.yml     |  1 -
 21 files changed, 111 insertions(+), 63 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.php/.ansible-lint
 create mode 100644 provisioning/roles/geerlingguy.php/.github/FUNDING.yml
 create mode 100644 provisioning/roles/geerlingguy.php/.github/stale.yml
 rename provisioning/roles/geerlingguy.php/{molecule/default/yaml-lint.yml => .yamllint} (100%)
 rename provisioning/roles/geerlingguy.php/molecule/default/{playbook.yml => converge.yml} (91%)
 delete mode 100644 provisioning/roles/geerlingguy.php/molecule/default/tests/test_default.py

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 1201ece7f..3c732f135 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -43,7 +43,7 @@ roles:
   - name: geerlingguy.nodejs
     version: 5.1.1
   - name: geerlingguy.php
-    version: 4.0.0
+    version: 4.1.0
   - name: geerlingguy.php-memcached
     version: 2.0.2
   - name: geerlingguy.php-mysql
diff --git a/provisioning/roles/geerlingguy.php/.ansible-lint b/provisioning/roles/geerlingguy.php/.ansible-lint
new file mode 100644
index 000000000..195bd18ee
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/.ansible-lint
@@ -0,0 +1,4 @@
+skip_list:
+  - '306'
+  - '405'
+  - '503'
diff --git a/provisioning/roles/geerlingguy.php/.github/FUNDING.yml b/provisioning/roles/geerlingguy.php/.github/FUNDING.yml
new file mode 100644
index 000000000..96b493831
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+---
+github: geerlingguy
+patreon: geerlingguy
diff --git a/provisioning/roles/geerlingguy.php/.github/stale.yml b/provisioning/roles/geerlingguy.php/.github/stale.yml
new file mode 100644
index 000000000..c7ff12754
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/.github/stale.yml
@@ -0,0 +1,56 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 90
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 30
+
+# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
+onlyLabels: []
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - pinned
+  - security
+  - planned
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: false
+
+# Label to use when marking as stale
+staleLabel: stale
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+pulls:
+  markComment: |-
+    This pull request has been marked 'stale' due to lack of recent activity. If there is no further activity, the PR will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark pull requests as stale.
+
+  unmarkComment: >-
+    This pull request is no longer marked for closure.
+
+  closeComment: >-
+    This pull request has been closed due to inactivity. If you feel this is in error, please reopen the pull request or file a new PR with the relevant details.
+
+issues:
+  markComment: |-
+    This issue has been marked 'stale' due to lack of recent activity. If there is no further activity, the issue will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark issues as stale.
+
+  unmarkComment: >-
+    This issue is no longer marked for closure.
+
+  closeComment: >-
+    This issue has been closed due to inactivity. If you feel this is in error, please reopen the issue or file a new issue with the relevant details.
diff --git a/provisioning/roles/geerlingguy.php/.travis.yml b/provisioning/roles/geerlingguy.php/.travis.yml
index 45999be8e..ebcbe00f8 100644
--- a/provisioning/roles/geerlingguy.php/.travis.yml
+++ b/provisioning/roles/geerlingguy.php/.travis.yml
@@ -6,10 +6,10 @@ env:
   global:
     - ROLE_NAME: php
   matrix:
+    - MOLECULE_DISTRO: centos8
     - MOLECULE_DISTRO: centos7
     - MOLECULE_DISTRO: ubuntu1804
     - MOLECULE_DISTRO: ubuntu1604
-    - MOLECULE_DISTRO: ubuntu1404
     - MOLECULE_DISTRO: debian9
 
     - MOLECULE_DISTRO: centos7
@@ -17,7 +17,7 @@ env:
 
 install:
   # Install test dependencies.
-  - pip install molecule docker
+  - pip install molecule yamllint ansible-lint docker
 
 before_script:
   # Use actual Ansible Galaxy role name for the project directory.
diff --git a/provisioning/roles/geerlingguy.php/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.php/.yamllint
similarity index 100%
rename from provisioning/roles/geerlingguy.php/molecule/default/yaml-lint.yml
rename to provisioning/roles/geerlingguy.php/.yamllint
diff --git a/provisioning/roles/geerlingguy.php/README.md b/provisioning/roles/geerlingguy.php/README.md
index 392234428..0fb2305c8 100644
--- a/provisioning/roles/geerlingguy.php/README.md
+++ b/provisioning/roles/geerlingguy.php/README.md
@@ -62,6 +62,11 @@ When using this role with PHP running as `php-fpm` instead of as a process insid
 
 If you're using Apache, you can easily get it configured to work with PHP-FPM using the [geerlingguy.apache-php-fpm](https://github.com/geerlingguy/ansible-role-apache-php-fpm) role.
 
+    php_fpm_state: started
+    php_fpm_enabled_on_boot: true
+
+Control over the fpm daemon's state; set these to `stopped` and `false` if you want FPM to be installed and configured, but not running (e.g. when installing in a container).
+
     php_fpm_listen: "127.0.0.1:9000"
     php_fpm_listen_allowed_clients: "127.0.0.1"
     php_fpm_pm_max_children: 50
@@ -104,6 +109,7 @@ By default, all the extra defaults below are applied through the php.ini include
     php_session_save_handler: files
     php_session_save_path: ''
     php_disable_functions: []
+    php_precision: 14
 
 Various defaults for PHP. Only used if `php_use_managed_ini` is set to `true`.
 
diff --git a/provisioning/roles/geerlingguy.php/defaults/main.yml b/provisioning/roles/geerlingguy.php/defaults/main.yml
index 8b04351bc..469849b58 100644
--- a/provisioning/roles/geerlingguy.php/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.php/defaults/main.yml
@@ -3,6 +3,9 @@
 # for RHEL/CentOS.
 php_enablerepo: ""
 
+# Extra packages to install (in addition to distro-specific default lists).
+php_packages_extra: []
+
 # Default PHP version to install on Debian-based OSes.
 php_default_version_debian: "7.0"
 
@@ -18,6 +21,8 @@ php_enable_webserver: true
 
 # PHP-FPM configuration.
 php_enable_php_fpm: false
+php_fpm_state: started
+php_fpm_enabled_on_boot: true
 php_fpm_listen: "127.0.0.1:9000"
 php_fpm_listen_allowed_clients: "127.0.0.1"
 php_fpm_pm_max_children: 50
@@ -70,6 +75,7 @@ php_sendmail_path: "/usr/sbin/sendmail -t -i"
 php_output_buffering: "4096"
 php_short_open_tag: "Off"
 php_disable_functions: []
+php_precision: 14
 
 php_session_cookie_lifetime: 0
 php_session_gc_probability: 1
diff --git a/provisioning/roles/geerlingguy.php/handlers/main.yml b/provisioning/roles/geerlingguy.php/handlers/main.yml
index 454476dbc..468de7151 100644
--- a/provisioning/roles/geerlingguy.php/handlers/main.yml
+++ b/provisioning/roles/geerlingguy.php/handlers/main.yml
@@ -10,4 +10,6 @@
   service:
     name: "{{ php_fpm_daemon }}"
     state: restarted
-  when: php_enable_php_fpm
+  when:
+    - php_enable_php_fpm
+    - php_fpm_state == 'started'
diff --git a/provisioning/roles/geerlingguy.php/meta/main.yml b/provisioning/roles/geerlingguy.php/meta/main.yml
index 0baef250c..cd2fcdb74 100644
--- a/provisioning/roles/geerlingguy.php/meta/main.yml
+++ b/provisioning/roles/geerlingguy.php/meta/main.yml
@@ -6,12 +6,13 @@ galaxy_info:
   description: PHP for RedHat/CentOS/Fedora/Debian/Ubuntu.
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 2.4
+  min_ansible_version: 2.8
   platforms:
     - name: EL
       versions:
         - 6
         - 7
+        - 8
     - name: Fedora
       versions:
         - all
diff --git a/provisioning/roles/geerlingguy.php/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.php/molecule/default/converge.yml
similarity index 91%
rename from provisioning/roles/geerlingguy.php/molecule/default/playbook.yml
rename to provisioning/roles/geerlingguy.php/molecule/default/converge.yml
index 9ca50218d..f77853399 100644
--- a/provisioning/roles/geerlingguy.php/molecule/default/playbook.yml
+++ b/provisioning/roles/geerlingguy.php/molecule/default/converge.yml
@@ -22,6 +22,12 @@
       changed_when: false
 
     # Ubuntu-specific tasks.
+    - name: Ensure dirmngr is installed (gnupg dependency).
+      apt:
+        name: dirmngr
+        state: present
+      when: ansible_distribution == 'Ubuntu'
+
     - name: Add repository for PHP 7.
       apt_repository: repo='ppa:ondrej/php'
       when: ansible_distribution == 'Ubuntu'
diff --git a/provisioning/roles/geerlingguy.php/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.php/molecule/default/molecule.yml
index 2ca6feaf9..2da47dd1f 100644
--- a/provisioning/roles/geerlingguy.php/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.php/molecule/default/molecule.yml
@@ -3,10 +3,10 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
-  options:
-    config-file: molecule/default/yaml-lint.yml
+lint: |
+  set -e
+  yamllint .
+  ansible-lint
 platforms:
   - name: instance
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
@@ -17,13 +17,5 @@ platforms:
     pre_build_image: true
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
   playbooks:
-    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
-scenario:
-  name: default
-verifier:
-  name: testinfra
-  lint:
-    name: flake8
+    converge: ${MOLECULE_PLAYBOOK:-converge.yml}
diff --git a/provisioning/roles/geerlingguy.php/molecule/default/tests/test_default.py b/provisioning/roles/geerlingguy.php/molecule/default/tests/test_default.py
deleted file mode 100644
index eedd64a1d..000000000
--- a/provisioning/roles/geerlingguy.php/molecule/default/tests/test_default.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import os
-
-import testinfra.utils.ansible_runner
-
-testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
-    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
-
-
-def test_hosts_file(host):
-    f = host.file('/etc/hosts')
-
-    assert f.exists
-    assert f.user == 'root'
-    assert f.group == 'root'
diff --git a/provisioning/roles/geerlingguy.php/tasks/configure-fpm.yml b/provisioning/roles/geerlingguy.php/tasks/configure-fpm.yml
index 66db2201d..fa0dbc4a0 100644
--- a/provisioning/roles/geerlingguy.php/tasks/configure-fpm.yml
+++ b/provisioning/roles/geerlingguy.php/tasks/configure-fpm.yml
@@ -72,15 +72,6 @@
 - name: Ensure php-fpm is started and enabled at boot (if configured).
   service:
     name: "{{ php_fpm_daemon }}"
-    state: started
-    enabled: true
+    state: "{{ php_fpm_state }}"
+    enabled: "{{ php_fpm_enabled_on_boot }}"
   when: php_enable_php_fpm and ansible_distribution != "Debian"
-
-# See: https://github.com/ansible/ansible/issues/22303
-- name: Ensure php-fpm is started and enabled at boot (if configured, Debian).
-  service:
-    name: "{{ php_fpm_daemon }}"
-    state: started
-    enabled: true
-    use: service
-  when: php_enable_php_fpm and ansible_distribution == "Debian"
diff --git a/provisioning/roles/geerlingguy.php/tasks/configure-opcache.yml b/provisioning/roles/geerlingguy.php/tasks/configure-opcache.yml
index 4ed13edad..fc043d0c6 100644
--- a/provisioning/roles/geerlingguy.php/tasks/configure-opcache.yml
+++ b/provisioning/roles/geerlingguy.php/tasks/configure-opcache.yml
@@ -25,7 +25,7 @@
     force: true
     mode: 0644
   with_items: "{{ php_extension_conf_paths }}"
-  when: php_opcache_enable
+  when: php_opcache_enable | bool
   notify: restart webserver
 
 - name: Remove OpCache config file if OpCache is disabled.
@@ -33,5 +33,5 @@
     path: "{{ item }}/{{ php_opcache_conf_filename }}"
     state: absent
   with_items: "{{ php_extension_conf_paths }}"
-  when: not php_opcache_enable
+  when: not php_opcache_enable | bool
   notify: restart webserver
diff --git a/provisioning/roles/geerlingguy.php/tasks/install-from-source.yml b/provisioning/roles/geerlingguy.php/tasks/install-from-source.yml
index e999ba001..09ad4c3e5 100644
--- a/provisioning/roles/geerlingguy.php/tasks/install-from-source.yml
+++ b/provisioning/roles/geerlingguy.php/tasks/install-from-source.yml
@@ -70,7 +70,7 @@
     src: "{{ php_source_install_gmp_path }}"
     dest: /usr/include/gmp.h
     state: link
-  when: gmp_file.stat.exists == false
+  when: not gmp_file.stat.exists
 
 - name: Check if PHP is installed.
   command: which php
diff --git a/provisioning/roles/geerlingguy.php/tasks/main.yml b/provisioning/roles/geerlingguy.php/tasks/main.yml
index 3d6e66cc8..e794e8c70 100644
--- a/provisioning/roles/geerlingguy.php/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php/tasks/main.yml
@@ -8,11 +8,6 @@
     php_packages: "{{ __php_packages | list }}"
   when: php_packages is not defined
 
-- name: Define extra php_packages.
-  set_fact:
-    php_packages: "{{ php_packages | list + php_packages_extra | list }}"
-  when: php_packages_extra is defined
-
 - name: Define php_webserver_daemon.
   set_fact:
     php_webserver_daemon: "{{ __php_webserver_daemon }}"
@@ -50,14 +45,18 @@
 
 # Setup/install tasks.
 - include_tasks: setup-RedHat.yml
-  when: (php_install_from_source == false) and (ansible_os_family == 'RedHat')
+  when:
+    - not php_install_from_source
+    - ansible_os_family == 'RedHat'
 
 - include_tasks: setup-Debian.yml
-  when: (php_install_from_source == false) and (ansible_os_family == 'Debian')
+  when:
+    - not php_install_from_source
+    - ansible_os_family == 'Debian'
 
 # Install PHP from source when php_install_from_source is true.
 - include_tasks: install-from-source.yml
-  when: php_install_from_source == true
+  when: php_install_from_source
 
 # Configure PHP.
 - include_tasks: configure.yml
diff --git a/provisioning/roles/geerlingguy.php/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.php/tasks/setup-Debian.yml
index 17402047c..a6657be28 100644
--- a/provisioning/roles/geerlingguy.php/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.php/tasks/setup-Debian.yml
@@ -4,7 +4,7 @@
 
 - name: Ensure PHP packages are installed.
   apt:
-    name: "{{ php_packages }}"
+    name: "{{ php_packages + php_packages_extra }}"
     state: "{{ php_packages_state }}"
     install_recommends: "{{ php_install_recommends }}"
   register: php_package_install
@@ -23,5 +23,5 @@
     path: "{{ item }}/{{ php_opcache_conf_filename }}"
     state: absent
   with_items: "{{ php_extension_conf_paths }}"
-  when: php_opcache_enable and php_package_install.changed
+  when: php_opcache_enable | bool and php_package_install.changed
   notify: restart webserver
diff --git a/provisioning/roles/geerlingguy.php/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.php/tasks/setup-RedHat.yml
index 41db90789..1d76b331b 100644
--- a/provisioning/roles/geerlingguy.php/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.php/tasks/setup-RedHat.yml
@@ -1,7 +1,7 @@
 ---
 - name: Ensure PHP packages are installed.
   package:
-    name: "{{ php_packages }}"
+    name: "{{ php_packages + php_packages_extra }}"
     state: "{{ php_packages_state }}"
     enablerepo: "{{ php_enablerepo | default(omit, true) }}"
   notify: restart webserver
diff --git a/provisioning/roles/geerlingguy.php/templates/php.ini.j2 b/provisioning/roles/geerlingguy.php/templates/php.ini.j2
index b157df1de..f4393d507 100644
--- a/provisioning/roles/geerlingguy.php/templates/php.ini.j2
+++ b/provisioning/roles/geerlingguy.php/templates/php.ini.j2
@@ -6,8 +6,7 @@
 
 engine = On
 short_open_tag = {{ php_short_open_tag }}
-asp_tags = Off
-precision = 14
+precision = {{ php_precision }}
 output_buffering = {{ php_output_buffering }}
 
 zlib.output_compression = Off
@@ -64,7 +63,6 @@ auto_prepend_file =
 auto_append_file =
 
 default_mimetype = "text/html"
-always_populate_raw_post_data = -1
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Paths and Directories ;
@@ -189,8 +187,6 @@ session.gc_probability = {{ php_session_gc_probability }}
 session.gc_divisor = {{ php_session_gc_divisor }}
 session.gc_maxlifetime = {{ php_session_gc_maxlifetime }}
 
-session.bug_compat_42 = Off
-session.bug_compat_warn = Off
 session.referer_check =
 
 session.cache_limiter = nocache
diff --git a/provisioning/roles/geerlingguy.php/vars/RedHat.yml b/provisioning/roles/geerlingguy.php/vars/RedHat.yml
index f17b982ee..e1e4458d7 100644
--- a/provisioning/roles/geerlingguy.php/vars/RedHat.yml
+++ b/provisioning/roles/geerlingguy.php/vars/RedHat.yml
@@ -6,7 +6,6 @@ __php_packages:
   - php-devel
   - php-fpm
   - php-gd
-  - php-imap
   - php-ldap
   - php-mbstring
   - php-opcache

From d504df17e03d28c0a14966174b55aaac5ef17b2f Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 10 Mar 2020 14:31:22 -0500
Subject: [PATCH 1153/1273] Fix docs for composer-dependency use concerning
 drupal_enable_modules.

---
 docs/deployment/composer-dependency.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/deployment/composer-dependency.md b/docs/deployment/composer-dependency.md
index dd7d7b6b2..6450ea6ef 100644
--- a/docs/deployment/composer-dependency.md
+++ b/docs/deployment/composer-dependency.md
@@ -39,10 +39,10 @@ drupal_composer_install_dir: "/var/www/drupalvm"
 drupal_core_path: "{{ drupal_composer_install_dir }}/docroot"
 ```
 
-If you intend to use the devel module, it must be added as a requirement to your `composer.json` file. Alternatively, if you do not intend to use it remove it from `drupal_enabled_modules` in your `config.yml` file:
+If you intend to use the devel module, it must be added as a requirement to your `composer.json` file. Alternatively, if you do not intend to use it remove it from `drupal_enable_modules` in your `config.yml` file:
 
 ```yaml
-drupal_enabled_modules: []
+drupal_enable_modules: []
 ```
 
 ### Create a delegating `Vagrantfile`

From 480f85f50ebbf1ac869702b727f65dce8e1c3650 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 10 Mar 2020 15:07:11 -0500
Subject: [PATCH 1154/1273] Fixes #1960: Use newer Solr version and make sure
 correct Java package is installed.

---
 default.config.yml             | 8 ++++++--
 docs/configurations/base-os.md | 5 ++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/default.config.yml b/default.config.yml
index 0590ba8bd..633689e9e 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -328,8 +328,12 @@ php_xdebug_idekey: PHPSTORM
 php_xdebug_max_nesting_level: 256
 php_xdebug_remote_host: "{{ ansible_default_ipv4.gateway }}"
 
-# Solr Configuration (if enabled above).
-solr_version: "5.5.5"
+# Java configuration.
+java_packages:
+  - "{{ 'openjdk-8-jdk' if ansible_os_family == 'Debian' else 'java-1.8.0-openjdk' }}"
+
+# Solr configuration.
+solr_version: "7.7.2"
 solr_xms: "64M"
 solr_xmx: "128M"
 
diff --git a/docs/configurations/base-os.md b/docs/configurations/base-os.md
index 1b96efddc..2929b112a 100644
--- a/docs/configurations/base-os.md
+++ b/docs/configurations/base-os.md
@@ -31,7 +31,10 @@ Everything should work out of the box with RHEL 7.
 
 ## Debian 10 Buster
 
-Everything should work out of the box with Debian 10.
+Most everything should work out of the box with Debian 10. If you are installing `java` or `solr` in the `installed_extras`, you need to override the `java_packages` in your `config.yml`:
+
+    java_packages:
+      - openjdk-11-jdk
 
 ## Debian 9 Stretch
 

From ab8f3c655424de7847019ef2d23821bc8bbbeca6 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 10 Mar 2020 18:09:35 -0500
Subject: [PATCH 1155/1273] Update php role to latest version.

---
 provisioning/requirements.yml                            | 2 +-
 provisioning/roles/geerlingguy.php/templates/www.conf.j2 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 3c732f135..2a7f58ec5 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -43,7 +43,7 @@ roles:
   - name: geerlingguy.nodejs
     version: 5.1.1
   - name: geerlingguy.php
-    version: 4.1.0
+    version: 4.2.0
   - name: geerlingguy.php-memcached
     version: 2.0.2
   - name: geerlingguy.php-mysql
diff --git a/provisioning/roles/geerlingguy.php/templates/www.conf.j2 b/provisioning/roles/geerlingguy.php/templates/www.conf.j2
index aaab17aa4..da0921c3c 100644
--- a/provisioning/roles/geerlingguy.php/templates/www.conf.j2
+++ b/provisioning/roles/geerlingguy.php/templates/www.conf.j2
@@ -4,6 +4,9 @@ listen.allowed_clients = 127.0.0.1
 user = {{ php_fpm_pool_user }}
 group = {{ php_fpm_pool_group }}
 
+listen.owner = {{ php_fpm_pool_user }}
+listen.group = {{ php_fpm_pool_group }}
+
 pm = dynamic
 pm.max_children = 50
 pm.start_servers = 5

From 457f88ce257bf463c004c6e9d3d09c411ab0eee4 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 17 Mar 2020 14:28:37 -0500
Subject: [PATCH 1156/1273] Update mysql role to latest version.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.mysql/.github/stale.yml | 56 +++++++++++++++++++
 .../molecule/default/molecule.yml             |  1 +
 .../geerlingguy.mysql/vars/Debian-10.yml      |  8 +--
 4 files changed, 62 insertions(+), 5 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.mysql/.github/stale.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 2a7f58ec5..d65b810fd 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -37,7 +37,7 @@ roles:
   - name: geerlingguy.memcached
     version: 1.0.8
   - name: geerlingguy.mysql
-    version: 3.0.0
+    version: 3.1.0
   - name: geerlingguy.nginx
     version: 2.7.0
   - name: geerlingguy.nodejs
diff --git a/provisioning/roles/geerlingguy.mysql/.github/stale.yml b/provisioning/roles/geerlingguy.mysql/.github/stale.yml
new file mode 100644
index 000000000..c7ff12754
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/.github/stale.yml
@@ -0,0 +1,56 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 90
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 30
+
+# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
+onlyLabels: []
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - pinned
+  - security
+  - planned
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: false
+
+# Label to use when marking as stale
+staleLabel: stale
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+pulls:
+  markComment: |-
+    This pull request has been marked 'stale' due to lack of recent activity. If there is no further activity, the PR will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark pull requests as stale.
+
+  unmarkComment: >-
+    This pull request is no longer marked for closure.
+
+  closeComment: >-
+    This pull request has been closed due to inactivity. If you feel this is in error, please reopen the pull request or file a new PR with the relevant details.
+
+issues:
+  markComment: |-
+    This issue has been marked 'stale' due to lack of recent activity. If there is no further activity, the issue will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark issues as stale.
+
+  unmarkComment: >-
+    This issue is no longer marked for closure.
+
+  closeComment: >-
+    This issue has been closed due to inactivity. If you feel this is in error, please reopen the issue or file a new issue with the relevant details.
diff --git a/provisioning/roles/geerlingguy.mysql/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.mysql/molecule/default/molecule.yml
index 38eb962bd..2da47dd1f 100644
--- a/provisioning/roles/geerlingguy.mysql/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.mysql/molecule/default/molecule.yml
@@ -4,6 +4,7 @@ dependency:
 driver:
   name: docker
 lint: |
+  set -e
   yamllint .
   ansible-lint
 platforms:
diff --git a/provisioning/roles/geerlingguy.mysql/vars/Debian-10.yml b/provisioning/roles/geerlingguy.mysql/vars/Debian-10.yml
index a36993cd0..cb4935aeb 100644
--- a/provisioning/roles/geerlingguy.mysql/vars/Debian-10.yml
+++ b/provisioning/roles/geerlingguy.mysql/vars/Debian-10.yml
@@ -6,8 +6,8 @@ mysql_log_file_group: adm
 __mysql_slow_query_log_file: /var/log/mysql/mysql-slow.log
 __mysql_log_error: /var/log/mysql/mysql.log
 __mysql_syslog_tag: mariadb
-__mysql_pid_file: /var/run/mysql/mysql.pid
-__mysql_config_file: /etc/my.cnf
-__mysql_config_include_dir: /etc/my.cnf.d
-__mysql_socket: /var/lib/mysql/mysql.sock
+__mysql_pid_file: /run/mysqld/mysqld.pid
+__mysql_config_file: /etc/mysql/my.cnf
+__mysql_config_include_dir: /etc/mysql/conf.d
+__mysql_socket: /run/mysqld/mysqld.sock
 __mysql_supports_innodb_large_prefix: true

From 9400ee566a0ee1aceb1b89d57733111daf20ffc5 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 20 Mar 2020 11:36:35 -0500
Subject: [PATCH 1157/1273] Issue #2024: Update postgresql role to latest
 version.

---
 provisioning/requirements.yml                 |  2 +-
 .../geerlingguy.postgresql/.github/stale.yml  | 56 +++++++++++++++++++
 .../roles/geerlingguy.postgresql/.travis.yml  |  1 +
 .../roles/geerlingguy.postgresql/README.md    |  4 ++
 .../geerlingguy.postgresql/defaults/main.yml  |  3 +
 .../geerlingguy.postgresql/meta/main.yml      |  3 +-
 .../molecule/default/converge.yml             |  1 +
 .../geerlingguy.postgresql/tasks/users.yml    |  2 +-
 .../geerlingguy.postgresql/vars/Ubuntu-20.yml | 11 ++++
 9 files changed, 80 insertions(+), 3 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.postgresql/.github/stale.yml
 create mode 100644 provisioning/roles/geerlingguy.postgresql/vars/Ubuntu-20.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index d65b810fd..6b23a70f3 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -67,7 +67,7 @@ roles:
   - name: geerlingguy.postfix
     version: 2.0.0
   - name: geerlingguy.postgresql
-    version: 2.1.0
+    version: 2.2.0
   - name: geerlingguy.redis
     version: 1.6.0
   - name: geerlingguy.repo-remi
diff --git a/provisioning/roles/geerlingguy.postgresql/.github/stale.yml b/provisioning/roles/geerlingguy.postgresql/.github/stale.yml
new file mode 100644
index 000000000..c7ff12754
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/.github/stale.yml
@@ -0,0 +1,56 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 90
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 30
+
+# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
+onlyLabels: []
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - pinned
+  - security
+  - planned
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: false
+
+# Label to use when marking as stale
+staleLabel: stale
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+pulls:
+  markComment: |-
+    This pull request has been marked 'stale' due to lack of recent activity. If there is no further activity, the PR will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark pull requests as stale.
+
+  unmarkComment: >-
+    This pull request is no longer marked for closure.
+
+  closeComment: >-
+    This pull request has been closed due to inactivity. If you feel this is in error, please reopen the pull request or file a new PR with the relevant details.
+
+issues:
+  markComment: |-
+    This issue has been marked 'stale' due to lack of recent activity. If there is no further activity, the issue will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark issues as stale.
+
+  unmarkComment: >-
+    This issue is no longer marked for closure.
+
+  closeComment: >-
+    This issue has been closed due to inactivity. If you feel this is in error, please reopen the issue or file a new issue with the relevant details.
diff --git a/provisioning/roles/geerlingguy.postgresql/.travis.yml b/provisioning/roles/geerlingguy.postgresql/.travis.yml
index 61d923b3b..2591d4663 100644
--- a/provisioning/roles/geerlingguy.postgresql/.travis.yml
+++ b/provisioning/roles/geerlingguy.postgresql/.travis.yml
@@ -9,6 +9,7 @@ env:
     - MOLECULE_DISTRO: centos7
     - MOLECULE_DISTRO: centos8
     - MOLECULE_DISTRO: fedora31
+    - MOLECULE_DISTRO: ubuntu2004
     - MOLECULE_DISTRO: ubuntu1804
     - MOLECULE_DISTRO: debian10
 
diff --git a/provisioning/roles/geerlingguy.postgresql/README.md b/provisioning/roles/geerlingguy.postgresql/README.md
index 6d81e4e9f..d447a6e82 100644
--- a/provisioning/roles/geerlingguy.postgresql/README.md
+++ b/provisioning/roles/geerlingguy.postgresql/README.md
@@ -106,6 +106,10 @@ A list of databases to ensure exist on the server. Only the `name` is required;
 
 A list of users to ensure exist on the server. Only the `name` is required; all other properties are optional.
 
+    postgres_users_no_log: true
+
+Whether to output user data (which may contain sensitive information, like passwords) when managing users.
+
     postgresql_version: [OS-specific]
     postgresql_data_dir: [OS-specific]
     postgresql_bin_path: [OS-specific]
diff --git a/provisioning/roles/geerlingguy.postgresql/defaults/main.yml b/provisioning/roles/geerlingguy.postgresql/defaults/main.yml
index fa6a87f1e..0e2d50367 100644
--- a/provisioning/roles/geerlingguy.postgresql/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.postgresql/defaults/main.yml
@@ -62,3 +62,6 @@ postgresql_users: []
 #   login_unix_socket: # defaults to 1st of postgresql_unix_socket_directories
 #   port: # defaults to not set
 #   state: # defaults to 'present'
+
+# Whether to output user data when managing users.
+postgres_users_no_log: true
diff --git a/provisioning/roles/geerlingguy.postgresql/meta/main.yml b/provisioning/roles/geerlingguy.postgresql/meta/main.yml
index 5d3ae1f54..91af19f28 100644
--- a/provisioning/roles/geerlingguy.postgresql/meta/main.yml
+++ b/provisioning/roles/geerlingguy.postgresql/meta/main.yml
@@ -6,7 +6,7 @@ galaxy_info:
   description: PostgreSQL server for Linux.
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 2.4
+  min_ansible_version: 2.8
   platforms:
     - name: EL
       versions:
@@ -22,6 +22,7 @@ galaxy_info:
       versions:
         - xenial
         - bionic
+        - focal
     - name: Debian
       versions:
         - wheezy
diff --git a/provisioning/roles/geerlingguy.postgresql/molecule/default/converge.yml b/provisioning/roles/geerlingguy.postgresql/molecule/default/converge.yml
index 40348b7c5..bac2eb95f 100644
--- a/provisioning/roles/geerlingguy.postgresql/molecule/default/converge.yml
+++ b/provisioning/roles/geerlingguy.postgresql/molecule/default/converge.yml
@@ -23,6 +23,7 @@
 
     - name: Update apt cache.
       apt: update_cache=true cache_valid_time=600
+      changed_when: false
       when: ansible_os_family == 'Debian'
 
     - name: Set custom variables for old CentOS 6 PostgreSQL install.
diff --git a/provisioning/roles/geerlingguy.postgresql/tasks/users.yml b/provisioning/roles/geerlingguy.postgresql/tasks/users.yml
index 34746ebe9..a1ae8947a 100644
--- a/provisioning/roles/geerlingguy.postgresql/tasks/users.yml
+++ b/provisioning/roles/geerlingguy.postgresql/tasks/users.yml
@@ -14,7 +14,7 @@
     port: "{{ item.port | default(omit) }}"
     state: "{{ item.state | default('present') }}"
   with_items: "{{ postgresql_users }}"
-  no_log: true
+  no_log: "{{ postgres_users_no_log }}"
   become: true
   become_user: "{{ postgresql_user }}"
   # See: https://github.com/ansible/ansible/issues/16048#issuecomment-229012509
diff --git a/provisioning/roles/geerlingguy.postgresql/vars/Ubuntu-20.yml b/provisioning/roles/geerlingguy.postgresql/vars/Ubuntu-20.yml
new file mode 100644
index 000000000..9a9a065a2
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/vars/Ubuntu-20.yml
@@ -0,0 +1,11 @@
+---
+__postgresql_version: "12"
+__postgresql_data_dir: "/var/lib/postgresql/{{ __postgresql_version }}/main"
+__postgresql_bin_path: "/usr/lib/postgresql/{{ __postgresql_version }}/bin"
+__postgresql_config_path: "/etc/postgresql/{{ __postgresql_version }}/main"
+__postgresql_daemon: postgresql
+__postgresql_packages:
+  - postgresql
+  - postgresql-contrib
+  - libpq-dev
+postgresql_python_library: python3-psycopg2

From 59f28f2e65817db55ade0289a890482d4c4d6d58 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 20 Mar 2020 11:37:01 -0500
Subject: [PATCH 1158/1273] Fixes #2024: Fix chicken-and-egg ordering of
 postgresql database and user.

---
 Vagrantfile        |  3 ++-
 default.config.yml | 15 ++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index ae1596a44..c8689fafe 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -113,7 +113,8 @@ Vagrant.configure('2') do |config|
     ansible.playbook = playbook
     ansible.extra_vars = {
       config_dir: config_dir,
-      drupalvm_env: drupalvm_env
+      drupalvm_env: drupalvm_env,
+      ansible_python_interpreter: vconfig['ansible_python_interpreter']
     }
     ansible.raw_arguments = Shellwords.shellsplit(ENV['DRUPALVM_ANSIBLE_ARGS']) if ENV['DRUPALVM_ANSIBLE_ARGS']
     ansible.tags = ENV['DRUPALVM_ANSIBLE_TAGS']
diff --git a/default.config.yml b/default.config.yml
index 633689e9e..c105d318f 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -45,9 +45,11 @@ vagrant_plugins:
   - name: vagrant-vbguest
   - name: vagrant-hostsupdater
 
+ansible_python_interpreter: /usr/bin/python3
+
 # Minimum required versions.
-drupalvm_vagrant_version_min: '1.8.6'
-drupalvm_ansible_version_min: '2.5'
+drupalvm_vagrant_version_min: '2.2.0'
+drupalvm_ansible_version_min: '2.8'
 
 # Force use of ansible_local provisioner, even if Ansible is installed on host.
 force_ansible_local: false
@@ -198,14 +200,13 @@ mysql_users:
     priv: "{{ drupal_db_name }}.*:ALL"
 
 # PostgreSQL databases and users.
-postgresql_databases:
-  - name: "{{ drupal_db_name }}"
-
 postgresql_users:
   - name: "{{ drupal_db_user }}"
     password: "{{ drupal_db_password }}"
-    db: "{{ drupal_db_name }}"
-    priv: "ALL"
+
+postgresql_databases:
+  - name: "{{ drupal_db_name }}"
+    owner: "{{ drupal_db_user }}"
 
 # Comment out any extra utilities you don't want to install. If you don't want
 # to install *any* extras, set this value to an empty set, e.g. `[]`.

From 106da4939ee2e39667882112c7fcad88c046f416 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 20 Mar 2020 12:05:35 -0500
Subject: [PATCH 1159/1273] Follow-up to #2024: Fix failing tests due to python
 interpreter.

---
 .travis.yml                                 |  7 +------
 tests/centos-7.config.yml                   |  1 +
 tests/debian-9.config.yml                   |  3 +++
 tests/ubuntu-16-nginx-drush-make.config.yml | 10 ----------
 4 files changed, 5 insertions(+), 16 deletions(-)
 create mode 100644 tests/debian-9.config.yml
 delete mode 100644 tests/ubuntu-16-nginx-drush-make.config.yml

diff --git a/.travis.yml b/.travis.yml
index 595ada624..54ac4ea2b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,6 +24,7 @@ env:
     # Defaults - Debian 9.
     - type: debian
       distro: debian9
+      local_config: tests/debian-9.config.yml
     # Defaults - CentOS 7.
     - type: centos
       distro: centos7
@@ -38,12 +39,6 @@ env:
       DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/bin/drush"
       TEST_INSTALLED_EXTRAS: false
 
-    # Nginx and Drush make file test - Ubuntu 16.04.
-    # - type: nginx-drush-make
-    #   distro: ubuntu1604
-    #   local_config: tests/ubuntu-16-nginx-drush-make.config.yml
-    #   config_dir: /var/www/drupalvm/config
-
     # TODO: See https://github.com/geerlingguy/drupal-vm/issues/1675
     # PostgreSQL - Ubuntu 16.04.
     # - type: postgresql
diff --git a/tests/centos-7.config.yml b/tests/centos-7.config.yml
index c5b40e548..936f1a1e8 100644
--- a/tests/centos-7.config.yml
+++ b/tests/centos-7.config.yml
@@ -1,2 +1,3 @@
 ---
+ansible_python_interpreter: /usr/bin/python
 postfix_inet_protocols: ipv4
diff --git a/tests/debian-9.config.yml b/tests/debian-9.config.yml
new file mode 100644
index 000000000..936f1a1e8
--- /dev/null
+++ b/tests/debian-9.config.yml
@@ -0,0 +1,3 @@
+---
+ansible_python_interpreter: /usr/bin/python
+postfix_inet_protocols: ipv4
diff --git a/tests/ubuntu-16-nginx-drush-make.config.yml b/tests/ubuntu-16-nginx-drush-make.config.yml
deleted file mode 100644
index b50cf53ad..000000000
--- a/tests/ubuntu-16-nginx-drush-make.config.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-drupalvm_webserver: nginx
-
-# Test makefile based installation.
-drush_launcher_install: no
-drush_install_from_source: yes
-drush_source_install_version: "8.1.15"
-drupal_build_makefile: true
-drupal_build_composer_project: false
-drupal_core_path: "/var/www/drupalvm/drupal"

From 51e4f812b669a638d0ec7ada810566fa798a82e2 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 20 Mar 2020 12:09:17 -0500
Subject: [PATCH 1160/1273] Issue #2024 extra test fixes.

---
 .travis.yml        | 12 +++++-------
 tests/run-tests.sh |  1 +
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 54ac4ea2b..4ff5e354e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,32 +20,30 @@ env:
     # Defaults - Ubuntu 18.04.
     - type: defaults
       distro: ubuntu1804
-      tag: python2
     # Defaults - Debian 9.
     - type: debian
       distro: debian9
       local_config: tests/debian-9.config.yml
+      ANSIBLE_PYTHON_INTERPRETER: /usr/bin/python
     # Defaults - CentOS 7.
     - type: centos
       distro: centos7
-      tag: python2
       local_config: tests/centos-7.config.yml
+      ANSIBLE_PYTHON_INTERPRETER: /usr/bin/python
 
     # PHP 7.3 - Ubuntu 18.04.
     - type: defaults
       distro: ubuntu1804
-      tag: python2
       local_config: tests/ubuntu-18-php73.config.yml
       DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/bin/drush"
       TEST_INSTALLED_EXTRAS: false
 
     # TODO: See https://github.com/geerlingguy/drupal-vm/issues/1675
-    # PostgreSQL - Ubuntu 16.04.
+    # PostgreSQL - Ubuntu 18.04.
     # - type: postgresql
-    #   distro: ubuntu1604
-    #   local_config: tests/ubuntu-16-postgresql.config.yml
+    #   distro: ubuntu1804
+    #   local_config: tests/ubuntu-18-postgresql.config.yml
     #   config_dir: /var/www/drupalvm/config
-    #   DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/bin/drush"
     #   TEST_INSTALLED_EXTRAS: false
 
 before_install:
diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index 3853feeff..a990d68c3 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -11,6 +11,7 @@ MACHINE_NAME="${MACHINE_NAME:-drupalvm}"
 IP="${IP:-192.168.88.88}"
 DRUPALVM_DIR="${DRUPALVM_DIR:-/var/www/drupalvm}"
 DRUSH_BIN="${DRUSH_BIN:-drush}"
+ANSIBLE_PYTHON_INTERPRETER="${ANSIBLE_PYTHON_INTERPRETER}:-/usr/bin/python3}"
 TEST_INSTALLED_EXTRAS="${TEST_INSTALLED_EXTRAS:-true}"
 CONTAINER_ID="${CONTAINER_ID:-dvm-test}"
 type="${type:-tests/defaults}"

From 3a4838f7734a73d4365b320537951eb92c823b87 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 20 Mar 2020 12:22:19 -0500
Subject: [PATCH 1161/1273] More test follow-ups for python interpreter.

---
 tests/centos-7.config.yml | 1 -
 tests/debian-9.config.yml | 3 ---
 tests/run-tests.sh        | 5 +++--
 3 files changed, 3 insertions(+), 6 deletions(-)
 delete mode 100644 tests/debian-9.config.yml

diff --git a/tests/centos-7.config.yml b/tests/centos-7.config.yml
index 936f1a1e8..c5b40e548 100644
--- a/tests/centos-7.config.yml
+++ b/tests/centos-7.config.yml
@@ -1,3 +1,2 @@
 ---
-ansible_python_interpreter: /usr/bin/python
 postfix_inet_protocols: ipv4
diff --git a/tests/debian-9.config.yml b/tests/debian-9.config.yml
deleted file mode 100644
index 936f1a1e8..000000000
--- a/tests/debian-9.config.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-ansible_python_interpreter: /usr/bin/python
-postfix_inet_protocols: ipv4
diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index a990d68c3..5253cf586 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -109,11 +109,12 @@ if [ ! -z "${config_dir}" ]; then
   # Run with config_dir specified.
   docker exec $CONTAINER_ID env TERM=xterm ANSIBLE_FORCE_COLOR=true DRUPALVM_ENV=$DRUPALVM_ENV \
     ansible-playbook $DRUPALVM_DIR/provisioning/playbook.yml \
-    --extra-vars="config_dir=$config_dir";
+    --extra-vars="{config_dir:$config_dir,ansible_python_interpreter:$ANSIBLE_PYTHON_INTERPRETER}";
 else
   # Run without config_dir specified.
   docker exec $CONTAINER_ID env TERM=xterm ANSIBLE_FORCE_COLOR=true DRUPALVM_ENV=$DRUPALVM_ENV \
-    ansible-playbook $DRUPALVM_DIR/provisioning/playbook.yml;
+    ansible-playbook $DRUPALVM_DIR/provisioning/playbook.yml \
+    --extra-vars="{ansible_python_interpreter:$ANSIBLE_PYTHON_INTERPRETER}";;
 fi
 
 # Drupal.

From b4ed186c52b91e3fbc7eb13b3b602a32d369ff37 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 20 Mar 2020 12:27:00 -0500
Subject: [PATCH 1162/1273] Pesky semicolons.

---
 tests/run-tests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index 5253cf586..ddc6412c8 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -114,7 +114,7 @@ else
   # Run without config_dir specified.
   docker exec $CONTAINER_ID env TERM=xterm ANSIBLE_FORCE_COLOR=true DRUPALVM_ENV=$DRUPALVM_ENV \
     ansible-playbook $DRUPALVM_DIR/provisioning/playbook.yml \
-    --extra-vars="{ansible_python_interpreter:$ANSIBLE_PYTHON_INTERPRETER}";;
+    --extra-vars="{ansible_python_interpreter:$ANSIBLE_PYTHON_INTERPRETER}";
 fi
 
 # Drupal.

From 42fa15572c19214760cbe8d4128a90075df5c2a4 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 20 Mar 2020 12:32:29 -0500
Subject: [PATCH 1163/1273] Pesky quoting.

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

diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index ddc6412c8..e8502669e 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -109,12 +109,12 @@ if [ ! -z "${config_dir}" ]; then
   # Run with config_dir specified.
   docker exec $CONTAINER_ID env TERM=xterm ANSIBLE_FORCE_COLOR=true DRUPALVM_ENV=$DRUPALVM_ENV \
     ansible-playbook $DRUPALVM_DIR/provisioning/playbook.yml \
-    --extra-vars="{config_dir:$config_dir,ansible_python_interpreter:$ANSIBLE_PYTHON_INTERPRETER}";
+    --extra-vars="{'config_dir':'$config_dir','ansible_python_interpreter':'$ANSIBLE_PYTHON_INTERPRETER'}";
 else
   # Run without config_dir specified.
   docker exec $CONTAINER_ID env TERM=xterm ANSIBLE_FORCE_COLOR=true DRUPALVM_ENV=$DRUPALVM_ENV \
     ansible-playbook $DRUPALVM_DIR/provisioning/playbook.yml \
-    --extra-vars="{ansible_python_interpreter:$ANSIBLE_PYTHON_INTERPRETER}";
+    --extra-vars="{'ansible_python_interpreter':'$ANSIBLE_PYTHON_INTERPRETER'}";
 fi
 
 # Drupal.

From fa71aefb4b9bf546f1fd777c26b7a30ece40fe8f Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 20 Mar 2020 12:40:45 -0500
Subject: [PATCH 1164/1273] Finally get some python sanity.

---
 tests/run-tests.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index e8502669e..c0f53138d 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -11,11 +11,11 @@ MACHINE_NAME="${MACHINE_NAME:-drupalvm}"
 IP="${IP:-192.168.88.88}"
 DRUPALVM_DIR="${DRUPALVM_DIR:-/var/www/drupalvm}"
 DRUSH_BIN="${DRUSH_BIN:-drush}"
-ANSIBLE_PYTHON_INTERPRETER="${ANSIBLE_PYTHON_INTERPRETER}:-/usr/bin/python3}"
+ANSIBLE_PYTHON_INTERPRETER="${ANSIBLE_PYTHON_INTERPRETER:-/usr/bin/python3}"
 TEST_INSTALLED_EXTRAS="${TEST_INSTALLED_EXTRAS:-true}"
 CONTAINER_ID="${CONTAINER_ID:-dvm-test}"
 type="${type:-tests/defaults}"
-distro="${distro:-ubuntu1604}"
+distro="${distro:-ubuntu1804}"
 tag="${tag:-latest}"
 cleanup="${cleanup:-true}"
 
@@ -109,12 +109,11 @@ if [ ! -z "${config_dir}" ]; then
   # Run with config_dir specified.
   docker exec $CONTAINER_ID env TERM=xterm ANSIBLE_FORCE_COLOR=true DRUPALVM_ENV=$DRUPALVM_ENV \
     ansible-playbook $DRUPALVM_DIR/provisioning/playbook.yml \
-    --extra-vars="{'config_dir':'$config_dir','ansible_python_interpreter':'$ANSIBLE_PYTHON_INTERPRETER'}";
+    --extra-vars="config_dir=$config_dir";
 else
   # Run without config_dir specified.
   docker exec $CONTAINER_ID env TERM=xterm ANSIBLE_FORCE_COLOR=true DRUPALVM_ENV=$DRUPALVM_ENV \
-    ansible-playbook $DRUPALVM_DIR/provisioning/playbook.yml \
-    --extra-vars="{'ansible_python_interpreter':'$ANSIBLE_PYTHON_INTERPRETER'}";
+    ansible-playbook $DRUPALVM_DIR/provisioning/playbook.yml;
 fi
 
 # Drupal.

From f3c59b48ff1c9c296ce6f57e5d86525a15d40894 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 20 Mar 2020 12:55:03 -0500
Subject: [PATCH 1165/1273] Fixed structure for python interpreter override.

---
 .travis.yml        | 1 -
 tests/run-tests.sh | 9 ++++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4ff5e354e..095ea2d34 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,6 @@ env:
     # Defaults - Debian 9.
     - type: debian
       distro: debian9
-      local_config: tests/debian-9.config.yml
       ANSIBLE_PYTHON_INTERPRETER: /usr/bin/python
     # Defaults - CentOS 7.
     - type: centos
diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index c0f53138d..c691f02ec 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -101,7 +101,9 @@ docker exec --tty $CONTAINER_ID env TERM=xterm ansible-playbook $DRUPALVM_DIR/pr
 
 # Run the setup playbook.
 printf "\n"${green}"Running the setup playbook..."${neutral}"\n"
-docker exec --tty $CONTAINER_ID env TERM=xterm ansible-playbook /var/www/drupalvm/tests/test-setup.yml
+docker exec --tty $CONTAINER_ID env TERM=xterm \
+  ansible-playbook /var/www/drupalvm/tests/test-setup.yml \
+  -e "ansible_python_interpreter=$ANSIBLE_PYTHON_INTERPRETER";
 
 # Run the Drupal VM playbook.
 printf "\n"${green}"Running the Drupal VM playbook..."${neutral}"\n"
@@ -109,11 +111,12 @@ if [ ! -z "${config_dir}" ]; then
   # Run with config_dir specified.
   docker exec $CONTAINER_ID env TERM=xterm ANSIBLE_FORCE_COLOR=true DRUPALVM_ENV=$DRUPALVM_ENV \
     ansible-playbook $DRUPALVM_DIR/provisioning/playbook.yml \
-    --extra-vars="config_dir=$config_dir";
+    -e "config_dir=$config_dir" -e "ansible_python_interpreter=$ANSIBLE_PYTHON_INTERPRETER";
 else
   # Run without config_dir specified.
   docker exec $CONTAINER_ID env TERM=xterm ANSIBLE_FORCE_COLOR=true DRUPALVM_ENV=$DRUPALVM_ENV \
-    ansible-playbook $DRUPALVM_DIR/provisioning/playbook.yml;
+    ansible-playbook $DRUPALVM_DIR/provisioning/playbook.yml \
+    -e "ansible_python_interpreter=$ANSIBLE_PYTHON_INTERPRETER";
 fi
 
 # Drupal.

From c5d767d8d40d4d4ded6076a1ea2e9d31d2dd66b6 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 20 Mar 2020 13:27:31 -0500
Subject: [PATCH 1166/1273] Issue #1675: Test postgresql configuration again.

---
 .travis.yml                                           | 11 +++++------
 ...sql.config.yml => ubuntu-18-postgresql.config.yml} |  0
 2 files changed, 5 insertions(+), 6 deletions(-)
 rename tests/{ubuntu-16-postgresql.config.yml => ubuntu-18-postgresql.config.yml} (100%)

diff --git a/.travis.yml b/.travis.yml
index 095ea2d34..ac342ecf4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,13 +37,12 @@ env:
       DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/bin/drush"
       TEST_INSTALLED_EXTRAS: false
 
-    # TODO: See https://github.com/geerlingguy/drupal-vm/issues/1675
     # PostgreSQL - Ubuntu 18.04.
-    # - type: postgresql
-    #   distro: ubuntu1804
-    #   local_config: tests/ubuntu-18-postgresql.config.yml
-    #   config_dir: /var/www/drupalvm/config
-    #   TEST_INSTALLED_EXTRAS: false
+    - type: postgresql
+      distro: ubuntu1804
+      local_config: tests/ubuntu-18-postgresql.config.yml
+      config_dir: /var/www/drupalvm/config
+      TEST_INSTALLED_EXTRAS: false
 
 before_install:
   # Install lint tools.
diff --git a/tests/ubuntu-16-postgresql.config.yml b/tests/ubuntu-18-postgresql.config.yml
similarity index 100%
rename from tests/ubuntu-16-postgresql.config.yml
rename to tests/ubuntu-18-postgresql.config.yml

From f7ddbe8224038fef53a91d6461900c13085fe376 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 20 Mar 2020 13:40:05 -0500
Subject: [PATCH 1167/1273] Issue #1675: Use custom drush bin.

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index ac342ecf4..97127349f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,6 +41,7 @@ env:
     - type: postgresql
       distro: ubuntu1804
       local_config: tests/ubuntu-18-postgresql.config.yml
+      DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/bin/drush"
       config_dir: /var/www/drupalvm/config
       TEST_INSTALLED_EXTRAS: false
 

From 16bc8d4f0c41992e7e21f0d9d234d25ebba5ac56 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 20 Mar 2020 13:48:34 -0500
Subject: [PATCH 1168/1273] Issue #2025: Mention new var to override for older
 linux versions.

---
 docs/configurations/base-os.md | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/docs/configurations/base-os.md b/docs/configurations/base-os.md
index 2929b112a..1e382f3f7 100644
--- a/docs/configurations/base-os.md
+++ b/docs/configurations/base-os.md
@@ -13,13 +13,15 @@ For certain OSes, there are a couple other caveats and tweaks you may need to pe
 
 Some other OSes should work, but are not regularly tested with Drupal VM, including Debian 8/Jessie (`debian/jessie64`).
 
-## Ubuntu 18.04 Xenial LTS
+## Ubuntu 18.04 Bionic LTS
 
-Everything should work out of the box with Ubuntu 16.04.
+Everything should work out of the box with Ubuntu 18.04.
 
 ## Ubuntu 16.04 Xenial LTS
 
-Everything should work out of the box with Ubuntu 16.04.
+Most everything should work out of the box with Ubuntu 16.04. You will need to override one variable in your `config.yml` to use an older version of Python when provisioning:
+
+    ansible_python_interpreter: /usr/bin/python
 
 ## RedHat Enterprise Linux / CentOS 8
 
@@ -27,7 +29,9 @@ Everything should work out of the box with RHEL 8.
 
 ## RedHat Enterprise Linux / CentOS 7
 
-Everything should work out of the box with RHEL 7.
+Most everything should work out of the box with CentOS 7. You will need to override one variable in your `config.yml` to use an older version of Python when provisioning:
+
+    ansible_python_interpreter: /usr/bin/python
 
 ## Debian 10 Buster
 

From f8bb9218f068994f731647997c7ace195f6ee193 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 20 Mar 2020 14:32:20 -0500
Subject: [PATCH 1169/1273] Issue #2025: Update Changelog for 5.2.0 release.

---
 CHANGELOG.md | 37 +++++++++++++++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52dc7300d..c58b9e8e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,43 @@
 # Drupal VM Changelog
 
+## 5.2.0 "The Game Has Changed" (2020-03-20)
+
+This release defaults to Python 3 for all Ansible-related tasks, which means some older OSes require a new variable to be overridden to work correctly. For most users, no change is required, however. The release also updates the order in which Postgresql updates
+
+### Breaking Changes
+
+  * #2025: Ansible's Python interpreter now defaults to `python3` (was using default which was `python`).
+  * #2024: Postgresql database and user order of setup reversed, so users should not have 'db'/'priv' set, but database needs 'owner' set.
+  * #2025: Minimum required Ansible version is now 2.8.
+  * #2025: Minimum required Vagrant version is now 2.2.0.
+
+### New/changed variables in default.config.yml
+
+  * `ansible_python_interpreter`: defaults to `/usr/bin/python3`, override to `/usr/bin/python` if using CentOS 7, Ubuntu 16.04, or Debian 9.
+  * `drupalvm_vagrant_version_min`: was `'1.8.6'`, now `'2.2.0'`.
+  * `drupalvm_ansible_version_min`: was `'2.5'`, now `'2.8'`.
+  * `postgresql_databases`: added `owner` parameter, set to `"{{ drupal_db_user }}"`
+  * `postgresql_users`: removed `db` and `priv` parameters.
+  * `solr_version`: was `"5.5.5"`, now `"7.7.2"`.
+  * `java_packages`: new variable, set to `openjdk-8-jdk` for Debian/Ubuntu, `java-1.8.0-openjdk` for RHEL/CentOS.
+
+### Improvements
+
+  * #1960: Use latest Solr 7.x version for better install experience.
+  * #2025: Use Python 3 for Ansible on all the latest OSes.
+  * Updated roles: php-pecl, postgresql, php, mysql.
+
+### Bugfixes
+
+  * #2024: Fix chicken-and-egg ordering of postgresql database and user ownership.
+  * #1675: Get CI tests for Postgresql working again.
+
+
 ## 5.1.1 (2020-02-27)
 
 ### Breaking Changes
 
-  - Removed 'official' support for CentOS 6 and Debian 8. These older OSes may still work, but [it would be extremely painful](https://www.youtube.com/watch?v=RZhp-Uctd-c) to keep using them.
+  * Removed 'official' support for CentOS 6 and Debian 8. These older OSes may still work, but [it would be extremely painful](https://www.youtube.com/watch?v=RZhp-Uctd-c) to keep using them.
 
 ### New/changed variables in default.config.yml
 
@@ -42,7 +75,7 @@ This release adds support for PHP 7.4, and completely drops PHP 5.6 support (in
 
 ### Bugfixes
 
-  * TODO
+N/A
 
 
 ## 5.0.2 (2019-11-04)

From 6e60b3a562a4e18810ab70842c577bd79c7b8e32 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 20 Mar 2020 14:46:22 -0500
Subject: [PATCH 1170/1273] Some adjustments to the Drupal VM Docker setup.

---
 Dockerfile                                 |  1 +
 docs/getting-started/installation-linux.md | 10 +---------
 provisioning/docker/bake.sh                |  2 +-
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index cfba89f48..53f544fe7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,6 +8,7 @@ COPY ./provisioning/docker/bin/* /usr/local/bin
 
 # Provision Drupal VM inside Docker.
 RUN ansible-playbook /etc/ansible/drupal-vm/provisioning/playbook.yml \
+  -e "ansible_python_interpreter=/usr/bin/python" \
   # Enable FPM. See https://github.com/geerlingguy/drupal-vm/issues/1366.
   && systemctl enable php7.2-fpm.service
 
diff --git a/docs/getting-started/installation-linux.md b/docs/getting-started/installation-linux.md
index 70f115309..12e4c9fb9 100644
--- a/docs/getting-started/installation-linux.md
+++ b/docs/getting-started/installation-linux.md
@@ -10,7 +10,7 @@ Always make sure your workstation is up to date (e.g. `apt-get update && apt-get
 
 ### Ubuntu
 
-Ubuntu 15.10 for Desktop (and some other versions) doesn't include NFS support by default, so if you get a message like `It appears your machine doesn't support NFS`, then you should do the following to install NFS server: `sudo apt-get install -y nfs-server`.
+Some older Ubuntu Desktop installations don't include NFS support by default, so if you get a message like `It appears your machine doesn't support NFS`, then you should do the following to install NFS server: `sudo apt-get install -y nfs-server`.
 
 ### Fedora
 
@@ -31,14 +31,6 @@ In this case, you need to install your system's appropriate kernel module, and y
 
 Periodically, when you upgrade your system's Linux kernel, you might need to run steps 2 and 3 above again, or you can uninstall and reinstall VirtualBox (e.g. `sudo dnf remove VirtualBox && sudo dnf install VirtualBox`).
 
-### Arch Linux
-
-Arch Linux uses Python 3 as the default while Ansible requires Python 2. To get around parse errors you need to specify that the `python2` binary should be used instead of the default `python`. Add the following to your `config.yml`:
-
-```
-ansible_python_interpreter: "/usr/bin/env python2"
-```
-
 ## Troubleshooting Vagrant Synced Folders
 
 Most issues have to do synced folders. These are the most common ones:
diff --git a/provisioning/docker/bake.sh b/provisioning/docker/bake.sh
index aa65098df..53c5bf4ca 100755
--- a/provisioning/docker/bake.sh
+++ b/provisioning/docker/bake.sh
@@ -15,7 +15,7 @@ DRUPALVM_HTTP_PORT="${DRUPALVM_HTTP_PORT:-80}"
 DRUPALVM_HTTPS_PORT="${DRUPALVM_HTTPS_PORT:-443}"
 
 DISTRO="${DISTRO:-ubuntu1804}"
-TAG="${TAG:-python2}"
+TAG="${TAG:-latest}"
 OPTS="${OPTS:---privileged}"
 INIT="${INIT:-/lib/systemd/systemd}"
 

From 6a28de24106963d4a1973ac3a182ba1eca9e4075 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 5 Apr 2020 23:13:34 -0500
Subject: [PATCH 1171/1273] Update geerlingguy.varnish role to latest version.

---
 provisioning/requirements.yml                 |  2 +-
 .../geerlingguy.varnish/.github/stale.yml     | 56 +++++++++++++++++++
 .../roles/geerlingguy.varnish/README.md       |  3 +-
 .../geerlingguy.varnish/defaults/main.yml     |  1 +
 .../molecule/default/molecule.yml             |  1 +
 .../roles/geerlingguy.varnish/tasks/main.yml  |  1 +
 .../geerlingguy.varnish/templates/varnish.j2  |  2 +-
 .../templates/varnish.params.j2               |  2 +-
 .../templates/varnish.service.j2              |  2 +-
 9 files changed, 65 insertions(+), 5 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.varnish/.github/stale.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 6b23a70f3..f44c08714 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -79,4 +79,4 @@ roles:
   - name: geerlingguy.solr
     version: 5.0.0
   - name: geerlingguy.varnish
-    version: 3.0.3
+    version: 3.1.0
diff --git a/provisioning/roles/geerlingguy.varnish/.github/stale.yml b/provisioning/roles/geerlingguy.varnish/.github/stale.yml
new file mode 100644
index 000000000..c7ff12754
--- /dev/null
+++ b/provisioning/roles/geerlingguy.varnish/.github/stale.yml
@@ -0,0 +1,56 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 90
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 30
+
+# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
+onlyLabels: []
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - pinned
+  - security
+  - planned
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: false
+
+# Label to use when marking as stale
+staleLabel: stale
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+pulls:
+  markComment: |-
+    This pull request has been marked 'stale' due to lack of recent activity. If there is no further activity, the PR will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark pull requests as stale.
+
+  unmarkComment: >-
+    This pull request is no longer marked for closure.
+
+  closeComment: >-
+    This pull request has been closed due to inactivity. If you feel this is in error, please reopen the pull request or file a new PR with the relevant details.
+
+issues:
+  markComment: |-
+    This issue has been marked 'stale' due to lack of recent activity. If there is no further activity, the issue will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark issues as stale.
+
+  unmarkComment: >-
+    This issue is no longer marked for closure.
+
+  closeComment: >-
+    This issue has been closed due to inactivity. If you feel this is in error, please reopen the issue or file a new issue with the relevant details.
diff --git a/provisioning/roles/geerlingguy.varnish/README.md b/provisioning/roles/geerlingguy.varnish/README.md
index 2d15889c5..2b60e9a48 100644
--- a/provisioning/roles/geerlingguy.varnish/README.md
+++ b/provisioning/roles/geerlingguy.varnish/README.md
@@ -32,9 +32,10 @@ Whether to use the included (simplistic) default Varnish VCL, using the backend
 
 The default VCL file to be copied (if `varnish_use_default_vcl` is `true`). Defaults the the simple template inside `templates/default.vcl.j2`. This path should be relative to the directory from which you run your playbook.
 
+    varnish_listen_address: ""
     varnish_listen_port: "80"
 
-The port on which Varnish will listen (typically port 80).
+The address and port on which Varnish will listen. The defaults tell Varnish to listen on all interfaces on port 80, but you can specify an address and/or alternate port if desired.
 
     varnish_default_backend_host: "127.0.0.1"
     varnish_default_backend_port: "8080"
diff --git a/provisioning/roles/geerlingguy.varnish/defaults/main.yml b/provisioning/roles/geerlingguy.varnish/defaults/main.yml
index f8b4bbc30..7258733bd 100644
--- a/provisioning/roles/geerlingguy.varnish/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.varnish/defaults/main.yml
@@ -8,6 +8,7 @@ varnish_default_vcl_template_path: default.vcl.j2
 varnish_default_backend_host: "127.0.0.1"
 varnish_default_backend_port: "8080"
 
+varnish_listen_address: ""
 varnish_listen_port: "80"
 varnish_secret: "14bac2e6-1e34-4770-8078-974373b76c90"
 varnish_config_path: /etc/varnish
diff --git a/provisioning/roles/geerlingguy.varnish/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.varnish/molecule/default/molecule.yml
index 38eb962bd..2da47dd1f 100644
--- a/provisioning/roles/geerlingguy.varnish/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.varnish/molecule/default/molecule.yml
@@ -4,6 +4,7 @@ dependency:
 driver:
   name: docker
 lint: |
+  set -e
   yamllint .
   ansible-lint
 platforms:
diff --git a/provisioning/roles/geerlingguy.varnish/tasks/main.yml b/provisioning/roles/geerlingguy.varnish/tasks/main.yml
index 3736a0b34..92a7003b2 100644
--- a/provisioning/roles/geerlingguy.varnish/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.varnish/tasks/main.yml
@@ -27,6 +27,7 @@
   when: >
     (ansible_os_family == 'RedHat' and ansible_distribution_major_version|int < 7) or
     (ansible_os_family == 'Debian' and ansible_distribution_release != "xenial")
+  notify: restart varnish
 
 - name: Copy Debian Jessie/Xenial specific Varnish configs (systemd).
   template:
diff --git a/provisioning/roles/geerlingguy.varnish/templates/varnish.j2 b/provisioning/roles/geerlingguy.varnish/templates/varnish.j2
index 950b5603d..74269caff 100644
--- a/provisioning/roles/geerlingguy.varnish/templates/varnish.j2
+++ b/provisioning/roles/geerlingguy.varnish/templates/varnish.j2
@@ -70,7 +70,7 @@ VARNISH_VCL_CONF={{ varnish_config_path }}/default.vcl
 # # Default address and port to bind to
 # # Blank address means all IPv4 and IPv6 interfaces, otherwise specify
 # # a host name, an IPv4 dotted quad, or an IPv6 address in brackets.
-# VARNISH_LISTEN_ADDRESS=
+VARNISH_LISTEN_ADDRESS={{ varnish_listen_address }}
 VARNISH_LISTEN_PORT={{ varnish_listen_port }}
 #
 # # Telnet admin interface listen address and port
diff --git a/provisioning/roles/geerlingguy.varnish/templates/varnish.params.j2 b/provisioning/roles/geerlingguy.varnish/templates/varnish.params.j2
index e6c9cbcd0..a3567ccc5 100644
--- a/provisioning/roles/geerlingguy.varnish/templates/varnish.params.j2
+++ b/provisioning/roles/geerlingguy.varnish/templates/varnish.params.j2
@@ -10,7 +10,7 @@ VARNISH_VCL_CONF={{ varnish_config_path }}/default.vcl
 # Default address and port to bind to. Blank address means all IPv4
 # and IPv6 interfaces, otherwise specify a host name, an IPv4 dotted
 # quad, or an IPv6 address in brackets.
-# VARNISH_LISTEN_ADDRESS=192.168.1.5
+VARNISH_LISTEN_ADDRESS={{ varnish_listen_address }}
 VARNISH_LISTEN_PORT={{ varnish_listen_port }}
 
 # Admin interface listen address and port
diff --git a/provisioning/roles/geerlingguy.varnish/templates/varnish.service.j2 b/provisioning/roles/geerlingguy.varnish/templates/varnish.service.j2
index e4e8e1649..7c3466e8a 100644
--- a/provisioning/roles/geerlingguy.varnish/templates/varnish.service.j2
+++ b/provisioning/roles/geerlingguy.varnish/templates/varnish.service.j2
@@ -25,7 +25,7 @@ TasksMax=infinity
 # Maximum size of the corefile.
 LimitCORE=infinity
 
-ExecStart=/usr/sbin/varnishd -a :{{ varnish_listen_port }} -T {{ varnish_admin_listen_host }}:{{ varnish_admin_listen_port }}{% if varnish_pidfile %} -P {{ varnish_pidfile }}{% endif %} -f {{ varnish_config_path }}/default.vcl -S {{ varnish_config_path }}/secret -s {{ varnish_storage }} {{ varnishd_extra_options }}
+ExecStart=/usr/sbin/varnishd -a {{ varnish_listen_address }}:{{ varnish_listen_port }} -T {{ varnish_admin_listen_host }}:{{ varnish_admin_listen_port }}{% if varnish_pidfile %} -P {{ varnish_pidfile }}{% endif %} -f {{ varnish_config_path }}/default.vcl -S {{ varnish_config_path }}/secret -s {{ varnish_storage }} {{ varnishd_extra_options }}
 ExecReload=/usr/sbin/varnishreload
 
 Restart=on-failure

From 48fe0cd12f53f9896e44bbf6426a7700736a89bf Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 17 Apr 2020 16:46:37 -0500
Subject: [PATCH 1172/1273] Update geerlingguy.solr role to latest version.

---
 provisioning/requirements.yml                 |  2 +-
 .../geerlingguy.solr/.github/FUNDING.yml      |  4 ++
 .../roles/geerlingguy.solr/.github/stale.yml  | 56 +++++++++++++++++++
 .../roles/geerlingguy.solr/.travis.yml        |  2 +-
 .../default/yaml-lint.yml => .yamllint}       |  0
 provisioning/roles/geerlingguy.solr/README.md |  2 +-
 .../roles/geerlingguy.solr/defaults/main.yml  |  2 +-
 .../default/{playbook.yml => converge.yml}    |  0
 .../molecule/default/molecule.yml             | 18 ++----
 .../roles/geerlingguy.solr/tasks/install.yml  |  2 +
 10 files changed, 71 insertions(+), 17 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.solr/.github/FUNDING.yml
 create mode 100644 provisioning/roles/geerlingguy.solr/.github/stale.yml
 rename provisioning/roles/geerlingguy.solr/{molecule/default/yaml-lint.yml => .yamllint} (100%)
 rename provisioning/roles/geerlingguy.solr/molecule/default/{playbook.yml => converge.yml} (100%)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index f44c08714..eab745c54 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -77,6 +77,6 @@ roles:
   - name: geerlingguy.security
     version: 1.9.0
   - name: geerlingguy.solr
-    version: 5.0.0
+    version: 5.1.0
   - name: geerlingguy.varnish
     version: 3.1.0
diff --git a/provisioning/roles/geerlingguy.solr/.github/FUNDING.yml b/provisioning/roles/geerlingguy.solr/.github/FUNDING.yml
new file mode 100644
index 000000000..96b493831
--- /dev/null
+++ b/provisioning/roles/geerlingguy.solr/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+---
+github: geerlingguy
+patreon: geerlingguy
diff --git a/provisioning/roles/geerlingguy.solr/.github/stale.yml b/provisioning/roles/geerlingguy.solr/.github/stale.yml
new file mode 100644
index 000000000..c7ff12754
--- /dev/null
+++ b/provisioning/roles/geerlingguy.solr/.github/stale.yml
@@ -0,0 +1,56 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 90
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 30
+
+# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
+onlyLabels: []
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - pinned
+  - security
+  - planned
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: false
+
+# Label to use when marking as stale
+staleLabel: stale
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+pulls:
+  markComment: |-
+    This pull request has been marked 'stale' due to lack of recent activity. If there is no further activity, the PR will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark pull requests as stale.
+
+  unmarkComment: >-
+    This pull request is no longer marked for closure.
+
+  closeComment: >-
+    This pull request has been closed due to inactivity. If you feel this is in error, please reopen the pull request or file a new PR with the relevant details.
+
+issues:
+  markComment: |-
+    This issue has been marked 'stale' due to lack of recent activity. If there is no further activity, the issue will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark issues as stale.
+
+  unmarkComment: >-
+    This issue is no longer marked for closure.
+
+  closeComment: >-
+    This issue has been closed due to inactivity. If you feel this is in error, please reopen the issue or file a new issue with the relevant details.
diff --git a/provisioning/roles/geerlingguy.solr/.travis.yml b/provisioning/roles/geerlingguy.solr/.travis.yml
index faa3dd6d0..051ac2114 100644
--- a/provisioning/roles/geerlingguy.solr/.travis.yml
+++ b/provisioning/roles/geerlingguy.solr/.travis.yml
@@ -34,7 +34,7 @@ env:
 
 install:
   # Install test dependencies.
-  - pip install molecule docker
+  - pip install molecule yamllint ansible-lint docker
 
 before_script:
   # Use actual Ansible Galaxy role name for the project directory.
diff --git a/provisioning/roles/geerlingguy.solr/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.solr/.yamllint
similarity index 100%
rename from provisioning/roles/geerlingguy.solr/molecule/default/yaml-lint.yml
rename to provisioning/roles/geerlingguy.solr/.yamllint
diff --git a/provisioning/roles/geerlingguy.solr/README.md b/provisioning/roles/geerlingguy.solr/README.md
index f7337cbe5..3a8e00d00 100644
--- a/provisioning/roles/geerlingguy.solr/README.md
+++ b/provisioning/roles/geerlingguy.solr/README.md
@@ -23,7 +23,7 @@ Files will be downloaded to this path on the remote server before being moved in
 
 Solr will be run under the `solr_user`. Set `solr_create_user` to `false` if `solr_user` is created before this role runs, or if you're using Solr 5+ and want Solr's own installation script to set up the user.
 
-    solr_version: "8.2.0"
+    solr_version: "8.4.1"
 
 The Apache Solr version to install. For a full list, see [available Apache Solr versions](http://archive.apache.org/dist/lucene/solr/).
 
diff --git a/provisioning/roles/geerlingguy.solr/defaults/main.yml b/provisioning/roles/geerlingguy.solr/defaults/main.yml
index b1d408e34..ffd99ec92 100644
--- a/provisioning/roles/geerlingguy.solr/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.solr/defaults/main.yml
@@ -4,7 +4,7 @@ solr_workspace: /root
 solr_create_user: true
 solr_user: solr
 
-solr_version: "8.2.0"
+solr_version: "8.4.1"
 solr_mirror: "https://archive.apache.org/dist"
 solr_remove_cruft: false
 
diff --git a/provisioning/roles/geerlingguy.solr/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.solr/molecule/default/converge.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.solr/molecule/default/playbook.yml
rename to provisioning/roles/geerlingguy.solr/molecule/default/converge.yml
diff --git a/provisioning/roles/geerlingguy.solr/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.solr/molecule/default/molecule.yml
index 2ca6feaf9..2da47dd1f 100644
--- a/provisioning/roles/geerlingguy.solr/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.solr/molecule/default/molecule.yml
@@ -3,10 +3,10 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
-  options:
-    config-file: molecule/default/yaml-lint.yml
+lint: |
+  set -e
+  yamllint .
+  ansible-lint
 platforms:
   - name: instance
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
@@ -17,13 +17,5 @@ platforms:
     pre_build_image: true
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
   playbooks:
-    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
-scenario:
-  name: default
-verifier:
-  name: testinfra
-  lint:
-    name: flake8
+    converge: ${MOLECULE_PLAYBOOK:-converge.yml}
diff --git a/provisioning/roles/geerlingguy.solr/tasks/install.yml b/provisioning/roles/geerlingguy.solr/tasks/install.yml
index 388cb7be6..25974ebac 100644
--- a/provisioning/roles/geerlingguy.solr/tasks/install.yml
+++ b/provisioning/roles/geerlingguy.solr/tasks/install.yml
@@ -7,6 +7,7 @@
       - sudo
     state: present
 
+# We add '-n' to Solr versions beyond 6.3.0 to prevent autostart on install.
 - name: Run Solr installation script.
   command: >
     {{ solr_workspace }}/{{ solr_filename }}/bin/install_solr_service.sh
@@ -16,6 +17,7 @@
     -u {{ solr_user }}
     -s {{ solr_service_name }}
     -p {{ solr_port }}
+    {{ (solr_version is version('6.3.0', '>=')) | ternary('-n','') }}
     creates={{ solr_install_path }}/bin/solr
   register: solr_install_script_result
 

From 5c5f550acd2a893ae03c85d798019c1c240b6940 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 23 Apr 2020 16:45:28 -0500
Subject: [PATCH 1173/1273] Update elasticsearch role to latest version.

---
 provisioning/requirements.yml                 |  2 +-
 .../.github/stale.yml                         | 56 +++++++++++++++++++
 .../roles/geerlingguy.elasticsearch/README.md | 10 ++++
 .../defaults/main.yml                         |  2 +
 .../molecule/default/molecule.yml             |  1 +
 .../templates/elasticsearch.yml.j2            |  2 +
 6 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 provisioning/roles/geerlingguy.elasticsearch/.github/stale.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index eab745c54..addf80aac 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -25,7 +25,7 @@ roles:
   - name: geerlingguy.drush
     version: 3.1.2
   - name: geerlingguy.elasticsearch
-    version: 4.1.1
+    version: 4.2.0
   - name: geerlingguy.firewall
     version: 2.4.3
   - name: geerlingguy.git
diff --git a/provisioning/roles/geerlingguy.elasticsearch/.github/stale.yml b/provisioning/roles/geerlingguy.elasticsearch/.github/stale.yml
new file mode 100644
index 000000000..c7ff12754
--- /dev/null
+++ b/provisioning/roles/geerlingguy.elasticsearch/.github/stale.yml
@@ -0,0 +1,56 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 90
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 30
+
+# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
+onlyLabels: []
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - pinned
+  - security
+  - planned
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: false
+
+# Label to use when marking as stale
+staleLabel: stale
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+pulls:
+  markComment: |-
+    This pull request has been marked 'stale' due to lack of recent activity. If there is no further activity, the PR will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark pull requests as stale.
+
+  unmarkComment: >-
+    This pull request is no longer marked for closure.
+
+  closeComment: >-
+    This pull request has been closed due to inactivity. If you feel this is in error, please reopen the pull request or file a new PR with the relevant details.
+
+issues:
+  markComment: |-
+    This issue has been marked 'stale' due to lack of recent activity. If there is no further activity, the issue will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark issues as stale.
+
+  unmarkComment: >-
+    This issue is no longer marked for closure.
+
+  closeComment: >-
+    This issue has been closed due to inactivity. If you feel this is in error, please reopen the issue or file a new issue with the relevant details.
diff --git a/provisioning/roles/geerlingguy.elasticsearch/README.md b/provisioning/roles/geerlingguy.elasticsearch/README.md
index f0fc08bbb..9ad832eb7 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/README.md
+++ b/provisioning/roles/geerlingguy.elasticsearch/README.md
@@ -41,6 +41,16 @@ The minimum jvm heap size.
 
 The maximum jvm heap size.
 
+    elasticsearch_extra_options: ''
+
+A placeholder for arbitrary configuration options not exposed by the role. This will be appended as-is to the end of the `elasticsearch.yml` file, as long as your variable preserves formatting with a `|`. For example:
+
+```yaml
+elasticsearch_extra_options: |  # Dont forget the pipe!
+  some.option: true
+  another.option: false
+```
+
 ## Dependencies
 
   - geerlingguy.java
diff --git a/provisioning/roles/geerlingguy.elasticsearch/defaults/main.yml b/provisioning/roles/geerlingguy.elasticsearch/defaults/main.yml
index dff60d9c5..7b9bf118d 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.elasticsearch/defaults/main.yml
@@ -10,3 +10,5 @@ elasticsearch_http_port: 9200
 
 elasticsearch_heap_size_min: 1g
 elasticsearch_heap_size_max: 2g
+
+elasticsearch_extra_options: ''
diff --git a/provisioning/roles/geerlingguy.elasticsearch/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.elasticsearch/molecule/default/molecule.yml
index 38eb962bd..2da47dd1f 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.elasticsearch/molecule/default/molecule.yml
@@ -4,6 +4,7 @@ dependency:
 driver:
   name: docker
 lint: |
+  set -e
   yamllint .
   ansible-lint
 platforms:
diff --git a/provisioning/roles/geerlingguy.elasticsearch/templates/elasticsearch.yml.j2 b/provisioning/roles/geerlingguy.elasticsearch/templates/elasticsearch.yml.j2
index 1ac4d3f58..85b3a9e81 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/templates/elasticsearch.yml.j2
+++ b/provisioning/roles/geerlingguy.elasticsearch/templates/elasticsearch.yml.j2
@@ -87,3 +87,5 @@ http.port: {{ elasticsearch_http_port }}
 # Require explicit names when deleting indices:
 #
 #action.destructive_requires_name: true
+
+{{ elasticsearch_extra_options }}

From f6c09c5c5f9a824ba75614885570a5e9ba62ca08 Mon Sep 17 00:00:00 2001
From: Josh Austin <44976235+codextypes@users.noreply.github.com>
Date: Sat, 25 Apr 2020 18:52:27 -0500
Subject: [PATCH 1174/1273] =?UTF-8?q?=F0=9F=90=8D=20point=20to=20the=20Pyt?=
 =?UTF-8?q?hon=203=20interpreter=20in=20PATH?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For Mac developers using [Homebrew](https://brew.sh/), this edit will be helpful as most of them won't have Python 3 in `/usr/bin`
---
 default.config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.config.yml b/default.config.yml
index c105d318f..1001d9e37 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -45,7 +45,7 @@ vagrant_plugins:
   - name: vagrant-vbguest
   - name: vagrant-hostsupdater
 
-ansible_python_interpreter: /usr/bin/python3
+ansible_python_interpreter: python3
 
 # Minimum required versions.
 drupalvm_vagrant_version_min: '2.2.0'

From 40c20ae8731b63bdd5a76deab229fe217b53b8d4 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 25 Apr 2020 21:02:52 -0500
Subject: [PATCH 1175/1273] PR #1997 adjustment: Set default PHP Xdebug version
 to 2.9.5.

---
 default.config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.config.yml b/default.config.yml
index b17de2114..522580151 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -320,7 +320,7 @@ pimpmylog_install_dir: /usr/share/php/pimpmylog
 pimpmylog_grant_all_privs: true
 
 # XDebug configuration. XDebug is disabled by default for better performance.
-# php_xdebug_version: 2.6.0
+php_xdebug_version: 2.9.5
 php_xdebug_default_enable: 0
 php_xdebug_coverage_enable: 0
 php_xdebug_cli_disable: yes

From b2cc979599d374ce09a3b873307bb7faf3aef220 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 1 May 2020 14:26:58 -0500
Subject: [PATCH 1176/1273] Update Java role to latest version.

---
 provisioning/requirements.yml                 |  2 +-
 .../geerlingguy.java/.github/FUNDING.yml      |  4 ++
 .../roles/geerlingguy.java/.github/stale.yml  | 56 +++++++++++++++++++
 .../roles/geerlingguy.java/.travis.yml        |  3 +-
 .../default/yaml-lint.yml => .yamllint}       |  0
 .../roles/geerlingguy.java/meta/main.yml      |  1 +
 .../default/{playbook.yml => converge.yml}    |  0
 .../molecule/default/molecule.yml             | 18 ++----
 .../geerlingguy.java/tasks/setup-Debian.yml   |  2 +-
 .../roles/geerlingguy.java/vars/Ubuntu-20.yml |  6 ++
 10 files changed, 76 insertions(+), 16 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.java/.github/FUNDING.yml
 create mode 100644 provisioning/roles/geerlingguy.java/.github/stale.yml
 rename provisioning/roles/geerlingguy.java/{molecule/default/yaml-lint.yml => .yamllint} (100%)
 rename provisioning/roles/geerlingguy.java/molecule/default/{playbook.yml => converge.yml} (100%)
 create mode 100644 provisioning/roles/geerlingguy.java/vars/Ubuntu-20.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index addf80aac..cd8a68c13 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -31,7 +31,7 @@ roles:
   - name: geerlingguy.git
     version: 2.1.0
   - name: geerlingguy.java
-    version: 1.9.7
+    version: 1.10.0
   - name: geerlingguy.mailhog
     version: 2.2.0
   - name: geerlingguy.memcached
diff --git a/provisioning/roles/geerlingguy.java/.github/FUNDING.yml b/provisioning/roles/geerlingguy.java/.github/FUNDING.yml
new file mode 100644
index 000000000..96b493831
--- /dev/null
+++ b/provisioning/roles/geerlingguy.java/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+---
+github: geerlingguy
+patreon: geerlingguy
diff --git a/provisioning/roles/geerlingguy.java/.github/stale.yml b/provisioning/roles/geerlingguy.java/.github/stale.yml
new file mode 100644
index 000000000..c7ff12754
--- /dev/null
+++ b/provisioning/roles/geerlingguy.java/.github/stale.yml
@@ -0,0 +1,56 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 90
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 30
+
+# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
+onlyLabels: []
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - pinned
+  - security
+  - planned
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: false
+
+# Label to use when marking as stale
+staleLabel: stale
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+pulls:
+  markComment: |-
+    This pull request has been marked 'stale' due to lack of recent activity. If there is no further activity, the PR will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark pull requests as stale.
+
+  unmarkComment: >-
+    This pull request is no longer marked for closure.
+
+  closeComment: >-
+    This pull request has been closed due to inactivity. If you feel this is in error, please reopen the pull request or file a new PR with the relevant details.
+
+issues:
+  markComment: |-
+    This issue has been marked 'stale' due to lack of recent activity. If there is no further activity, the issue will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark issues as stale.
+
+  unmarkComment: >-
+    This issue is no longer marked for closure.
+
+  closeComment: >-
+    This issue has been closed due to inactivity. If you feel this is in error, please reopen the issue or file a new issue with the relevant details.
diff --git a/provisioning/roles/geerlingguy.java/.travis.yml b/provisioning/roles/geerlingguy.java/.travis.yml
index b650138a6..ad0738edd 100644
--- a/provisioning/roles/geerlingguy.java/.travis.yml
+++ b/provisioning/roles/geerlingguy.java/.travis.yml
@@ -10,6 +10,7 @@ env:
     - MOLECULE_DISTRO: centos7
     - MOLECULE_DISTRO: centos6
     - MOLECULE_DISTRO: fedora31
+    - MOLECULE_DISTRO: ubuntu2004
     - MOLECULE_DISTRO: ubuntu1804
     - MOLECULE_DISTRO: ubuntu1604
     - MOLECULE_DISTRO: debian10
@@ -17,7 +18,7 @@ env:
 
 install:
   # Install test dependencies.
-  - pip install molecule docker
+  - pip install molecule yamllint ansible-lint docker
 
 before_script:
   # Use actual Ansible Galaxy role name for the project directory.
diff --git a/provisioning/roles/geerlingguy.java/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.java/.yamllint
similarity index 100%
rename from provisioning/roles/geerlingguy.java/molecule/default/yaml-lint.yml
rename to provisioning/roles/geerlingguy.java/.yamllint
diff --git a/provisioning/roles/geerlingguy.java/meta/main.yml b/provisioning/roles/geerlingguy.java/meta/main.yml
index 20b9f75ae..085bd5741 100644
--- a/provisioning/roles/geerlingguy.java/meta/main.yml
+++ b/provisioning/roles/geerlingguy.java/meta/main.yml
@@ -29,6 +29,7 @@ galaxy_info:
         - trusty
         - xenial
         - bionic
+        - focal
     - name: FreeBSD
       versions:
         - 10.2
diff --git a/provisioning/roles/geerlingguy.java/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.java/molecule/default/converge.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.java/molecule/default/playbook.yml
rename to provisioning/roles/geerlingguy.java/molecule/default/converge.yml
diff --git a/provisioning/roles/geerlingguy.java/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.java/molecule/default/molecule.yml
index 2ca6feaf9..2da47dd1f 100644
--- a/provisioning/roles/geerlingguy.java/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.java/molecule/default/molecule.yml
@@ -3,10 +3,10 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
-  options:
-    config-file: molecule/default/yaml-lint.yml
+lint: |
+  set -e
+  yamllint .
+  ansible-lint
 platforms:
   - name: instance
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
@@ -17,13 +17,5 @@ platforms:
     pre_build_image: true
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
   playbooks:
-    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
-scenario:
-  name: default
-verifier:
-  name: testinfra
-  lint:
-    name: flake8
+    converge: ${MOLECULE_PLAYBOOK:-converge.yml}
diff --git a/provisioning/roles/geerlingguy.java/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.java/tasks/setup-Debian.yml
index cecbd4538..ffeb9acb3 100644
--- a/provisioning/roles/geerlingguy.java/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.java/tasks/setup-Debian.yml
@@ -8,7 +8,7 @@
     recurse: true
   when:
     - ansible_distribution == 'Ubuntu'
-    - ansible_distribution_version == '18.04'
+    - ansible_distribution_major_version | int >= 18
 
 - name: Ensure Java is installed.
   apt:
diff --git a/provisioning/roles/geerlingguy.java/vars/Ubuntu-20.yml b/provisioning/roles/geerlingguy.java/vars/Ubuntu-20.yml
new file mode 100644
index 000000000..bd058c224
--- /dev/null
+++ b/provisioning/roles/geerlingguy.java/vars/Ubuntu-20.yml
@@ -0,0 +1,6 @@
+---
+# JDK version options include:
+#   - java
+#   - openjdk-11-jdk
+__java_packages:
+  - openjdk-11-jdk

From 0cdc2596556dbe2f94afa2d6b1b6e207c0799d7d Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 24 May 2020 15:49:46 -0500
Subject: [PATCH 1177/1273] Update Memcached role to latest version.

---
 provisioning/requirements.yml                 |  2 +-
 .../geerlingguy.memcached/.github/FUNDING.yml |  4 ++
 .../geerlingguy.memcached/.github/stale.yml   | 56 +++++++++++++++++++
 .../roles/geerlingguy.memcached/.gitignore    |  3 +-
 .../roles/geerlingguy.memcached/.travis.yml   | 32 ++++++-----
 .../roles/geerlingguy.memcached/.yamllint     |  6 ++
 .../roles/geerlingguy.memcached/README.md     |  3 +-
 .../geerlingguy.memcached/defaults/main.yml   |  2 +
 .../roles/geerlingguy.memcached/meta/main.yml | 22 +++++---
 .../molecule/default/converge.yml             | 12 ++++
 .../molecule/default/molecule.yml             | 21 +++++++
 .../templates/memcached-Debian.conf.j2        |  2 +
 .../templates/memcached-RedHat.conf.j2        |  2 +-
 .../geerlingguy.memcached/tests/README.md     | 11 ----
 .../geerlingguy.memcached/tests/test.yml      |  5 --
 15 files changed, 141 insertions(+), 42 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.memcached/.github/FUNDING.yml
 create mode 100644 provisioning/roles/geerlingguy.memcached/.github/stale.yml
 create mode 100644 provisioning/roles/geerlingguy.memcached/.yamllint
 create mode 100644 provisioning/roles/geerlingguy.memcached/molecule/default/converge.yml
 create mode 100644 provisioning/roles/geerlingguy.memcached/molecule/default/molecule.yml
 delete mode 100644 provisioning/roles/geerlingguy.memcached/tests/README.md
 delete mode 100644 provisioning/roles/geerlingguy.memcached/tests/test.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index cd8a68c13..562c9b7bb 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -35,7 +35,7 @@ roles:
   - name: geerlingguy.mailhog
     version: 2.2.0
   - name: geerlingguy.memcached
-    version: 1.0.8
+    version: 1.1.0
   - name: geerlingguy.mysql
     version: 3.1.0
   - name: geerlingguy.nginx
diff --git a/provisioning/roles/geerlingguy.memcached/.github/FUNDING.yml b/provisioning/roles/geerlingguy.memcached/.github/FUNDING.yml
new file mode 100644
index 000000000..96b493831
--- /dev/null
+++ b/provisioning/roles/geerlingguy.memcached/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+---
+github: geerlingguy
+patreon: geerlingguy
diff --git a/provisioning/roles/geerlingguy.memcached/.github/stale.yml b/provisioning/roles/geerlingguy.memcached/.github/stale.yml
new file mode 100644
index 000000000..c7ff12754
--- /dev/null
+++ b/provisioning/roles/geerlingguy.memcached/.github/stale.yml
@@ -0,0 +1,56 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 90
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 30
+
+# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
+onlyLabels: []
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - pinned
+  - security
+  - planned
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: false
+
+# Label to use when marking as stale
+staleLabel: stale
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+pulls:
+  markComment: |-
+    This pull request has been marked 'stale' due to lack of recent activity. If there is no further activity, the PR will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark pull requests as stale.
+
+  unmarkComment: >-
+    This pull request is no longer marked for closure.
+
+  closeComment: >-
+    This pull request has been closed due to inactivity. If you feel this is in error, please reopen the pull request or file a new PR with the relevant details.
+
+issues:
+  markComment: |-
+    This issue has been marked 'stale' due to lack of recent activity. If there is no further activity, the issue will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark issues as stale.
+
+  unmarkComment: >-
+    This issue is no longer marked for closure.
+
+  closeComment: >-
+    This issue has been closed due to inactivity. If you feel this is in error, please reopen the issue or file a new issue with the relevant details.
diff --git a/provisioning/roles/geerlingguy.memcached/.gitignore b/provisioning/roles/geerlingguy.memcached/.gitignore
index c9b2377e3..f56f5b578 100644
--- a/provisioning/roles/geerlingguy.memcached/.gitignore
+++ b/provisioning/roles/geerlingguy.memcached/.gitignore
@@ -1,2 +1,3 @@
 *.retry
-tests/test.sh
+*/__pycache__
+*.pyc
diff --git a/provisioning/roles/geerlingguy.memcached/.travis.yml b/provisioning/roles/geerlingguy.memcached/.travis.yml
index 946894e2f..bc826755e 100644
--- a/provisioning/roles/geerlingguy.memcached/.travis.yml
+++ b/provisioning/roles/geerlingguy.memcached/.travis.yml
@@ -1,26 +1,28 @@
 ---
+language: python
 services: docker
 
 env:
-  - distro: centos7
-  - distro: ubuntu1604
-  - distro: ubuntu1404
-  - distro: ubuntu1204
+  global:
+    - ROLE_NAME: memcached
+  matrix:
+    - MOLECULE_DISTRO: centos7
+    - MOLECULE_DISTRO: ubuntu1804
+    - MOLECULE_DISTRO: ubuntu1604
 
-script:
-  # Configure test script so we can run extra tests after playbook is run.
-  - export container_id=$(date +%s)
-  - export cleanup=false
+install:
+  # Install test dependencies.
+  - pip install molecule yamllint ansible-lint docker
 
-  # Download test shim.
-  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
-  - chmod +x ${PWD}/tests/test.sh
+before_script:
+  # Use actual Ansible Galaxy role name for the project directory.
+  - cd ../
+  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
+  - cd geerlingguy.$ROLE_NAME
 
+script:
   # Run tests.
-  - ${PWD}/tests/test.sh
-
-  # Check if memcached is running.
-  - 'docker exec --tty ${container_id} env TERM=xterm memcached -h'
+  - molecule test
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.memcached/.yamllint b/provisioning/roles/geerlingguy.memcached/.yamllint
new file mode 100644
index 000000000..a3dbc38ee
--- /dev/null
+++ b/provisioning/roles/geerlingguy.memcached/.yamllint
@@ -0,0 +1,6 @@
+---
+extends: default
+rules:
+  line-length:
+    max: 120
+    level: warning
diff --git a/provisioning/roles/geerlingguy.memcached/README.md b/provisioning/roles/geerlingguy.memcached/README.md
index f0231ff26..77e8125cb 100644
--- a/provisioning/roles/geerlingguy.memcached/README.md
+++ b/provisioning/roles/geerlingguy.memcached/README.md
@@ -22,9 +22,10 @@ The user under which the Memcached daemon will run.
 The port and IP address (127.0.0.1 for localhost) on which Memcached will listen for requests.
 
     memcached_memory_limit: 64
+    memcached_max_item_size: 1m
     memcached_connections: 1024
 
-Memcached limits. The maximum amount of RAM `memcached` will consume (64MB is the default), and the maximum number of simultaneous connections memcached will handle.
+Memcached limits. The maximum amount of RAM `memcached` will consume (64MB is the default), the memory-limit of a single item and the maximum number of simultaneous connections memcached will handle.
 
     memcached_log_file: /var/log/memcached.log
 
diff --git a/provisioning/roles/geerlingguy.memcached/defaults/main.yml b/provisioning/roles/geerlingguy.memcached/defaults/main.yml
index 9f4768446..0af34e386 100644
--- a/provisioning/roles/geerlingguy.memcached/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.memcached/defaults/main.yml
@@ -7,3 +7,5 @@ memcached_connections: 1024
 
 memcached_log_file: /var/log/memcached.log
 memcached_log_verbosity: ""
+
+memcached_max_item_size: 1m
diff --git a/provisioning/roles/geerlingguy.memcached/meta/main.yml b/provisioning/roles/geerlingguy.memcached/meta/main.yml
index 8469ea699..21485862e 100644
--- a/provisioning/roles/geerlingguy.memcached/meta/main.yml
+++ b/provisioning/roles/geerlingguy.memcached/meta/main.yml
@@ -6,20 +6,28 @@ galaxy_info:
   description: Memcached for Linux
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 2.0
+  min_ansible_version: 2.4
   platforms:
     - name: EL
       versions:
-      - 6
-      - 7
+        - 6
+        - 7
+        - 8
     - name: Ubuntu
       versions:
-      - precise
-      - trusty
-      - xenial
+        - precise
+        - trusty
+        - xenial
+        - bionic
     - name: Debian
       versions:
-      - all
+        - all
   galaxy_tags:
     - web
     - database
+    - memcached
+    - keyvalue
+    - kv
+    - cache
+    - caching
+    - performance
diff --git a/provisioning/roles/geerlingguy.memcached/molecule/default/converge.yml b/provisioning/roles/geerlingguy.memcached/molecule/default/converge.yml
new file mode 100644
index 000000000..09bd3c324
--- /dev/null
+++ b/provisioning/roles/geerlingguy.memcached/molecule/default/converge.yml
@@ -0,0 +1,12 @@
+---
+- name: Converge
+  hosts: all
+  become: true
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=yes cache_valid_time=600
+      when: ansible_os_family == 'Debian'
+
+  roles:
+    - role: geerlingguy.memcached
diff --git a/provisioning/roles/geerlingguy.memcached/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.memcached/molecule/default/molecule.yml
new file mode 100644
index 000000000..2da47dd1f
--- /dev/null
+++ b/provisioning/roles/geerlingguy.memcached/molecule/default/molecule.yml
@@ -0,0 +1,21 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint: |
+  set -e
+  yamllint .
+  ansible-lint
+platforms:
+  - name: instance
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    privileged: true
+    pre_build_image: true
+provisioner:
+  name: ansible
+  playbooks:
+    converge: ${MOLECULE_PLAYBOOK:-converge.yml}
diff --git a/provisioning/roles/geerlingguy.memcached/templates/memcached-Debian.conf.j2 b/provisioning/roles/geerlingguy.memcached/templates/memcached-Debian.conf.j2
index 5ff4c84c1..c3941edfc 100644
--- a/provisioning/roles/geerlingguy.memcached/templates/memcached-Debian.conf.j2
+++ b/provisioning/roles/geerlingguy.memcached/templates/memcached-Debian.conf.j2
@@ -41,3 +41,5 @@ logfile {{ memcached_log_file }}
 
 # Maximize core file limit
 # -r
+
+-I {{ memcached_max_item_size }}
diff --git a/provisioning/roles/geerlingguy.memcached/templates/memcached-RedHat.conf.j2 b/provisioning/roles/geerlingguy.memcached/templates/memcached-RedHat.conf.j2
index c36f4f4ea..0bd877aa6 100644
--- a/provisioning/roles/geerlingguy.memcached/templates/memcached-RedHat.conf.j2
+++ b/provisioning/roles/geerlingguy.memcached/templates/memcached-RedHat.conf.j2
@@ -17,4 +17,4 @@ CACHESIZE="{{ memcached_memory_limit }}"
 # -l Specify which IP address to listen on. The default is to listen on all IP addresses
 #    This parameter is one of the only security measures that memcached has, so make sure
 #    it's listening on a firewalled interface.
-OPTIONS="-l {{ memcached_listen_ip }} {{ memcached_log_verbosity }} >> {{ memcached_log_file }} 2>&1"
+OPTIONS="-l {{ memcached_listen_ip }} -I {{ memcached_max_item_size }} {{ memcached_log_verbosity }} >> {{ memcached_log_file }} 2>&1"
diff --git a/provisioning/roles/geerlingguy.memcached/tests/README.md b/provisioning/roles/geerlingguy.memcached/tests/README.md
deleted file mode 100644
index 6fb211721..000000000
--- a/provisioning/roles/geerlingguy.memcached/tests/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Ansible Role tests
-
-To run the test playbook(s) in this directory:
-
-  1. Install and start Docker.
-  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
-    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
-  1. Make the test shim executable: `chmod +x tests/test.sh`.
-  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
-
-If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.memcached/tests/test.yml b/provisioning/roles/geerlingguy.memcached/tests/test.yml
deleted file mode 100644
index 3646ff420..000000000
--- a/provisioning/roles/geerlingguy.memcached/tests/test.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- hosts: all
-
-  roles:
-    - role_under_test

From 69ec81be68f2d79215b86e475bd34558bdf187d8 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 26 May 2020 20:30:46 -0500
Subject: [PATCH 1178/1273] Update geerlingguy.varnish role to latest version.

---
 provisioning/requirements.yml                            | 2 +-
 provisioning/roles/geerlingguy.varnish/.travis.yml       | 3 ++-
 provisioning/roles/geerlingguy.varnish/defaults/main.yml | 2 +-
 provisioning/roles/geerlingguy.varnish/meta/main.yml     | 2 ++
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 562c9b7bb..9b5ea3add 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -79,4 +79,4 @@ roles:
   - name: geerlingguy.solr
     version: 5.1.0
   - name: geerlingguy.varnish
-    version: 3.1.0
+    version: 3.2.0
diff --git a/provisioning/roles/geerlingguy.varnish/.travis.yml b/provisioning/roles/geerlingguy.varnish/.travis.yml
index e3369247c..b3a77c1af 100644
--- a/provisioning/roles/geerlingguy.varnish/.travis.yml
+++ b/provisioning/roles/geerlingguy.varnish/.travis.yml
@@ -6,10 +6,11 @@ env:
   global:
     - ROLE_NAME: varnish
   matrix:
+    # - MOLECULE_DISTRO: centos8
     - MOLECULE_DISTRO: centos7
-    - MOLECULE_DISTRO: centos6
     - MOLECULE_DISTRO: ubuntu1804
     - MOLECULE_DISTRO: ubuntu1604
+    - MOLECULE_DISTRO: debian10
     - MOLECULE_DISTRO: debian9
 
     - MOLECULE_DISTRO: centos7
diff --git a/provisioning/roles/geerlingguy.varnish/defaults/main.yml b/provisioning/roles/geerlingguy.varnish/defaults/main.yml
index 7258733bd..d0f5e7df9 100644
--- a/provisioning/roles/geerlingguy.varnish/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.varnish/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
 varnish_package_name: "varnish"
-varnish_version: "6.1"
+varnish_version: "6.4"
 
 varnish_use_default_vcl: true
 varnish_default_vcl_template_path: default.vcl.j2
diff --git a/provisioning/roles/geerlingguy.varnish/meta/main.yml b/provisioning/roles/geerlingguy.varnish/meta/main.yml
index b065305cb..77a6c1dfa 100644
--- a/provisioning/roles/geerlingguy.varnish/meta/main.yml
+++ b/provisioning/roles/geerlingguy.varnish/meta/main.yml
@@ -2,6 +2,7 @@
 dependencies: []
 
 galaxy_info:
+  role_name: varnish
   author: geerlingguy
   description: Varnish for Linux.
   company: "Midwestern Mac, LLC"
@@ -12,6 +13,7 @@ galaxy_info:
       versions:
         - 6
         - 7
+        # - 8
     - name: Ubuntu
       versions:
         - precise

From f3353ac97521458df08222baf674cc809375995c Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 4 Jun 2020 10:56:27 -0500
Subject: [PATCH 1179/1273] Update geerlingguy.postgresql to latest version.

---
 provisioning/requirements.yml                      |  2 +-
 .../roles/geerlingguy.postgresql/.travis.yml       |  2 +-
 .../roles/geerlingguy.postgresql/.yamllint         |  3 +++
 .../roles/geerlingguy.postgresql/meta/main.yml     |  2 ++
 .../geerlingguy.postgresql/vars/Fedora-32.yml      | 14 ++++++++++++++
 5 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.postgresql/vars/Fedora-32.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 9b5ea3add..de41313b1 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -67,7 +67,7 @@ roles:
   - name: geerlingguy.postfix
     version: 2.0.0
   - name: geerlingguy.postgresql
-    version: 2.2.0
+    version: 2.2.1
   - name: geerlingguy.redis
     version: 1.6.0
   - name: geerlingguy.repo-remi
diff --git a/provisioning/roles/geerlingguy.postgresql/.travis.yml b/provisioning/roles/geerlingguy.postgresql/.travis.yml
index 2591d4663..6f9a9aef2 100644
--- a/provisioning/roles/geerlingguy.postgresql/.travis.yml
+++ b/provisioning/roles/geerlingguy.postgresql/.travis.yml
@@ -8,7 +8,7 @@ env:
   matrix:
     - MOLECULE_DISTRO: centos7
     - MOLECULE_DISTRO: centos8
-    - MOLECULE_DISTRO: fedora31
+    - MOLECULE_DISTRO: fedora32
     - MOLECULE_DISTRO: ubuntu2004
     - MOLECULE_DISTRO: ubuntu1804
     - MOLECULE_DISTRO: debian10
diff --git a/provisioning/roles/geerlingguy.postgresql/.yamllint b/provisioning/roles/geerlingguy.postgresql/.yamllint
index a3dbc38ee..dff5082ff 100644
--- a/provisioning/roles/geerlingguy.postgresql/.yamllint
+++ b/provisioning/roles/geerlingguy.postgresql/.yamllint
@@ -4,3 +4,6 @@ rules:
   line-length:
     max: 120
     level: warning
+
+ignore: |
+  .github/stale.yml
diff --git a/provisioning/roles/geerlingguy.postgresql/meta/main.yml b/provisioning/roles/geerlingguy.postgresql/meta/main.yml
index 91af19f28..86577229b 100644
--- a/provisioning/roles/geerlingguy.postgresql/meta/main.yml
+++ b/provisioning/roles/geerlingguy.postgresql/meta/main.yml
@@ -2,6 +2,7 @@
 dependencies: []
 
 galaxy_info:
+  role_name: postgresql
   author: geerlingguy
   description: PostgreSQL server for Linux.
   company: "Midwestern Mac, LLC"
@@ -18,6 +19,7 @@ galaxy_info:
         - 29
         - 30
         - 31
+        - 32
     - name: Ubuntu
       versions:
         - xenial
diff --git a/provisioning/roles/geerlingguy.postgresql/vars/Fedora-32.yml b/provisioning/roles/geerlingguy.postgresql/vars/Fedora-32.yml
new file mode 100644
index 000000000..6ce9d9bfe
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/vars/Fedora-32.yml
@@ -0,0 +1,14 @@
+---
+__postgresql_version: "12.2"
+__postgresql_data_dir: "/var/lib/pgsql/data"
+__postgresql_bin_path: "/usr/bin"
+__postgresql_config_path: "/var/lib/pgsql/data"
+__postgresql_daemon: postgresql
+__postgresql_packages:
+  - postgresql
+  - postgresql-server
+  - postgresql-contrib
+  - postgresql-libs
+__postgresql_unix_socket_directories_mode: '0755'
+# Fedora 32 containers only have python3 by default
+postgresql_python_library: python3-psycopg2

From b40f51731a7fc3f3e6703a3fd8066dd0144dbd7b Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 9 Jun 2020 22:04:43 -0500
Subject: [PATCH 1180/1273] Update adminer role to latest version (supports
 themes).

---
 provisioning/requirements.yml                 |  2 +-
 .../geerlingguy.adminer/.github/FUNDING.yml   |  4 ++
 .../geerlingguy.adminer/.github/stale.yml     | 56 +++++++++++++++++++
 .../roles/geerlingguy.adminer/.gitignore      |  3 +-
 .../roles/geerlingguy.adminer/.travis.yml     | 39 +++++++------
 .../roles/geerlingguy.adminer/.yamllint       |  6 ++
 .../roles/geerlingguy.adminer/README.md       |  4 ++
 .../roles/geerlingguy.adminer/meta/main.yml   | 26 +++++----
 .../molecule/default/converge.yml             | 17 ++++++
 .../molecule/default/molecule.yml             | 21 +++++++
 .../molecule/default/playbook-standalone.yml  | 17 ++++++
 .../default}/requirements.yml                 |  0
 .../roles/geerlingguy.adminer/tasks/main.yml  | 38 ++++++++++++-
 .../roles/geerlingguy.adminer/tests/README.md | 11 ----
 .../geerlingguy.adminer/tests/test-apache.yml |  8 ---
 .../tests/test-standalone.yml                 |  8 ---
 16 files changed, 201 insertions(+), 59 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.adminer/.github/FUNDING.yml
 create mode 100644 provisioning/roles/geerlingguy.adminer/.github/stale.yml
 create mode 100644 provisioning/roles/geerlingguy.adminer/.yamllint
 create mode 100644 provisioning/roles/geerlingguy.adminer/molecule/default/converge.yml
 create mode 100644 provisioning/roles/geerlingguy.adminer/molecule/default/molecule.yml
 create mode 100644 provisioning/roles/geerlingguy.adminer/molecule/default/playbook-standalone.yml
 rename provisioning/roles/geerlingguy.adminer/{tests => molecule/default}/requirements.yml (100%)
 delete mode 100644 provisioning/roles/geerlingguy.adminer/tests/README.md
 delete mode 100644 provisioning/roles/geerlingguy.adminer/tests/test-apache.yml
 delete mode 100644 provisioning/roles/geerlingguy.adminer/tests/test-standalone.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index de41313b1..586427fdd 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -7,7 +7,7 @@ roles:
   - name: weareinteractive.newrelic
     version: 1.8.0
   - name: geerlingguy.adminer
-    version: 1.2.0
+    version: 1.3.0
   - name: geerlingguy.apache
     version: 3.1.0
   - name: geerlingguy.apache-php-fpm
diff --git a/provisioning/roles/geerlingguy.adminer/.github/FUNDING.yml b/provisioning/roles/geerlingguy.adminer/.github/FUNDING.yml
new file mode 100644
index 000000000..96b493831
--- /dev/null
+++ b/provisioning/roles/geerlingguy.adminer/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+---
+github: geerlingguy
+patreon: geerlingguy
diff --git a/provisioning/roles/geerlingguy.adminer/.github/stale.yml b/provisioning/roles/geerlingguy.adminer/.github/stale.yml
new file mode 100644
index 000000000..c7ff12754
--- /dev/null
+++ b/provisioning/roles/geerlingguy.adminer/.github/stale.yml
@@ -0,0 +1,56 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 90
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 30
+
+# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
+onlyLabels: []
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - pinned
+  - security
+  - planned
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: false
+
+# Label to use when marking as stale
+staleLabel: stale
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+pulls:
+  markComment: |-
+    This pull request has been marked 'stale' due to lack of recent activity. If there is no further activity, the PR will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark pull requests as stale.
+
+  unmarkComment: >-
+    This pull request is no longer marked for closure.
+
+  closeComment: >-
+    This pull request has been closed due to inactivity. If you feel this is in error, please reopen the pull request or file a new PR with the relevant details.
+
+issues:
+  markComment: |-
+    This issue has been marked 'stale' due to lack of recent activity. If there is no further activity, the issue will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark issues as stale.
+
+  unmarkComment: >-
+    This issue is no longer marked for closure.
+
+  closeComment: >-
+    This issue has been closed due to inactivity. If you feel this is in error, please reopen the issue or file a new issue with the relevant details.
diff --git a/provisioning/roles/geerlingguy.adminer/.gitignore b/provisioning/roles/geerlingguy.adminer/.gitignore
index c9b2377e3..f56f5b578 100644
--- a/provisioning/roles/geerlingguy.adminer/.gitignore
+++ b/provisioning/roles/geerlingguy.adminer/.gitignore
@@ -1,2 +1,3 @@
 *.retry
-tests/test.sh
+*/__pycache__
+*.pyc
diff --git a/provisioning/roles/geerlingguy.adminer/.travis.yml b/provisioning/roles/geerlingguy.adminer/.travis.yml
index b3c2a4c34..82b9aa658 100644
--- a/provisioning/roles/geerlingguy.adminer/.travis.yml
+++ b/provisioning/roles/geerlingguy.adminer/.travis.yml
@@ -1,27 +1,32 @@
 ---
+language: python
 services: docker
 
 env:
-  - distro: centos7
-    playbook: test-apache.yml
-  - distro: centos6
-    playbook: test-apache.yml
-  - distro: ubuntu1604
-    playbook: test-apache.yml
-  - distro: ubuntu1404
-    playbook: test-apache.yml
-  - distro: debian8
-    playbook: test-apache.yml
-  - distro: ubuntu1604
-    playbook: test-standalone.yml
+  global:
+    - ROLE_NAME: adminer
+  matrix:
+    - MOLECULE_DISTRO: centos7
+    - MOLECULE_DISTRO: centos6
+    - MOLECULE_DISTRO: ubuntu1804
+    - MOLECULE_DISTRO: ubuntu1604
+    - MOLECULE_DISTRO: debian9
+    - MOLECULE_DISTRO: ubuntu1804
+      MOLECULE_PLAYBOOK: playbook-standalone.yml
 
-script:
-  # Download test shim.
-  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
-  - chmod +x ${PWD}/tests/test.sh
+install:
+  # Install test dependencies.
+  - pip install molecule yamllint ansible-lint docker
+
+before_script:
+  # Use actual Ansible Galaxy role name for the project directory.
+  - cd ../
+  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
+  - cd geerlingguy.$ROLE_NAME
 
+script:
   # Run tests.
-  - ${PWD}/tests/test.sh
+  - molecule test
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.adminer/.yamllint b/provisioning/roles/geerlingguy.adminer/.yamllint
new file mode 100644
index 000000000..a3dbc38ee
--- /dev/null
+++ b/provisioning/roles/geerlingguy.adminer/.yamllint
@@ -0,0 +1,6 @@
+---
+extends: default
+rules:
+  line-length:
+    max: 120
+    level: warning
diff --git a/provisioning/roles/geerlingguy.adminer/README.md b/provisioning/roles/geerlingguy.adminer/README.md
index 41b7fd5b6..6670fde8d 100644
--- a/provisioning/roles/geerlingguy.adminer/README.md
+++ b/provisioning/roles/geerlingguy.adminer/README.md
@@ -28,6 +28,10 @@ Directories inside which you would like `adminer.php` symlinked. Can be useful i
 
 Set this to `true` to tell Adminer to add a config file to Apache so you can access it at `hostname/adminer` on any configured virtualhost, using an Apache `Alias` directive. The role will also restart Apache so this configuration takes effect immediately.
 
+    adminer_theme: ''
+
+You can use any theme from adminer library (for example `pappu687`). You can find the full list [here](https://www.adminer.org/en/#extras).
+
 ## Dependencies
 
 None. If `adminer_add_apache_config` is set to `true`, it will use some variables and handlers defined by the `geerlingguy.apache` role, so there's a soft dependency on that role.
diff --git a/provisioning/roles/geerlingguy.adminer/meta/main.yml b/provisioning/roles/geerlingguy.adminer/meta/main.yml
index 36278933b..dc888e041 100644
--- a/provisioning/roles/geerlingguy.adminer/meta/main.yml
+++ b/provisioning/roles/geerlingguy.adminer/meta/main.yml
@@ -6,39 +6,43 @@ galaxy_info:
   description: Installs Adminer for Database management.
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 1.9
+  min_ansible_version: 2.0
   platforms:
     - name: EL
       versions:
-      - all
+        - all
     - name: GenericUNIX
       versions:
-      - all
+        - all
     - name: Fedora
       versions:
-      - all
+        - all
     - name: opensuse
       versions:
-      - all
+        - all
     - name: GenericBSD
       versions:
-      - all
+        - all
     - name: FreeBSD
       versions:
-      - all
+        - all
     - name: Ubuntu
       versions:
-      - all
+        - all
     - name: SLES
       versions:
-      - all
+        - all
     - name: GenericLinux
       versions:
-      - all
+        - all
     - name: Debian
       versions:
-      - all
+        - all
   galaxy_tags:
     - system
     - database
     - development
+    - adminer
+    - mysql
+    - mariadb
+    - php
diff --git a/provisioning/roles/geerlingguy.adminer/molecule/default/converge.yml b/provisioning/roles/geerlingguy.adminer/molecule/default/converge.yml
new file mode 100644
index 000000000..32cfadaf8
--- /dev/null
+++ b/provisioning/roles/geerlingguy.adminer/molecule/default/converge.yml
@@ -0,0 +1,17 @@
+---
+- name: Converge
+  hosts: all
+  become: true
+
+  vars:
+    adminer_add_apache_config: true
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=yes cache_valid_time=600
+      when: ansible_os_family == 'Debian'
+      changed_when: false
+
+  roles:
+    - role: geerlingguy.apache
+    - role: geerlingguy.adminer
diff --git a/provisioning/roles/geerlingguy.adminer/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.adminer/molecule/default/molecule.yml
new file mode 100644
index 000000000..2da47dd1f
--- /dev/null
+++ b/provisioning/roles/geerlingguy.adminer/molecule/default/molecule.yml
@@ -0,0 +1,21 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint: |
+  set -e
+  yamllint .
+  ansible-lint
+platforms:
+  - name: instance
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    privileged: true
+    pre_build_image: true
+provisioner:
+  name: ansible
+  playbooks:
+    converge: ${MOLECULE_PLAYBOOK:-converge.yml}
diff --git a/provisioning/roles/geerlingguy.adminer/molecule/default/playbook-standalone.yml b/provisioning/roles/geerlingguy.adminer/molecule/default/playbook-standalone.yml
new file mode 100644
index 000000000..aaaa0c65d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.adminer/molecule/default/playbook-standalone.yml
@@ -0,0 +1,17 @@
+---
+- name: Converge
+  hosts: all
+  become: true
+
+  vars:
+    adminer_install_dir: /opt/adminer
+    adminer_add_apache_config: false
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=yes cache_valid_time=600
+      when: ansible_os_family == 'Debian'
+      changed_when: false
+
+  roles:
+    - role: geerlingguy.adminer
diff --git a/provisioning/roles/geerlingguy.adminer/tests/requirements.yml b/provisioning/roles/geerlingguy.adminer/molecule/default/requirements.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.adminer/tests/requirements.yml
rename to provisioning/roles/geerlingguy.adminer/molecule/default/requirements.yml
diff --git a/provisioning/roles/geerlingguy.adminer/tasks/main.yml b/provisioning/roles/geerlingguy.adminer/tasks/main.yml
index c943258a2..2c14fd8f8 100644
--- a/provisioning/roles/geerlingguy.adminer/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.adminer/tasks/main.yml
@@ -4,15 +4,30 @@
   file:
     path: "{{ adminer_install_dir }}"
     state: directory
-    recurse: yes
+    recurse: true
+
+- name: Testing if adminer is older then 1 day
+  find:
+    paths: "{{ adminer_install_dir }}"
+    patterns: "{{ adminer_install_filename }}"
+    age: "1d"
+  register: adminer_is_old
 
 - name: Download Adminer to configured directory.
   get_url:
     url: https://www.adminer.org/latest.php
     dest: "{{ adminer_install_dir }}/{{ adminer_install_filename }}"
+    force: "{{ (adminer_is_old.matched == 1) | ternary('yes','no') }}"
     mode: 0644
     timeout: 60
 
+- name: Ensure paths to place symlinks exist
+  file:
+    state: directory
+    path: "{{ item }}"
+  with_items:
+    - "{{ adminer_symlink_dirs }}"
+
 - name: Symlink Adminer into configured directories.
   file:
     src: "{{ adminer_install_dir }}/adminer.php"
@@ -20,10 +35,29 @@
     state: link
   with_items: "{{ adminer_symlink_dirs }}"
 
+# Install Adminer theme.
+- name: Download Adminer theme
+  get_url:
+    url: https://raw.githubusercontent.com/vrana/adminer/master/designs/{{ adminer_theme }}/adminer.css
+    dest: "{{ adminer_install_dir }}"
+    force: "{{ (adminer_is_old.matched == 1) | adminer_force_download }}"
+    mode: 0644
+    timeout: 60
+  when: adminer_theme is defined and adminer_theme != null
+
+- name: Symlink Adminer theme into configured directories.
+  file:
+    src: "{{ adminer_install_dir }}/adminer.css"
+    dest: "{{ item }}/adminer.css"
+    state: link
+  with_items: "{{ adminer_symlink_dirs }}"
+  when: adminer_theme is defined and adminer_theme != null
+
 # Add Apache configuration (if configured).
 - name: Set the proper Apache configuration directory (Debian).
   set_fact:
-    apache_extra_conf_dir: "{{ 'conf-enabled' if apache_vhosts_version == '2.4' else 'conf.d' }}"
+    apache_extra_conf_dir: >-
+      {{ 'conf-enabled' if apache_vhosts_version == '2.4' else 'conf.d' }}
   when: adminer_add_apache_config and ansible_os_family == 'Debian'
 
 - name: Add Apache configuration file for Adminer (Debian).
diff --git a/provisioning/roles/geerlingguy.adminer/tests/README.md b/provisioning/roles/geerlingguy.adminer/tests/README.md
deleted file mode 100644
index 6fb211721..000000000
--- a/provisioning/roles/geerlingguy.adminer/tests/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Ansible Role tests
-
-To run the test playbook(s) in this directory:
-
-  1. Install and start Docker.
-  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
-    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
-  1. Make the test shim executable: `chmod +x tests/test.sh`.
-  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
-
-If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.adminer/tests/test-apache.yml b/provisioning/roles/geerlingguy.adminer/tests/test-apache.yml
deleted file mode 100644
index b45153296..000000000
--- a/provisioning/roles/geerlingguy.adminer/tests/test-apache.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-- hosts: all
-
-  vars:
-    adminer_add_apache_config: true
-
-  roles:
-    - geerlingguy.apache
-    - role_under_test
diff --git a/provisioning/roles/geerlingguy.adminer/tests/test-standalone.yml b/provisioning/roles/geerlingguy.adminer/tests/test-standalone.yml
deleted file mode 100644
index 5a696a9a6..000000000
--- a/provisioning/roles/geerlingguy.adminer/tests/test-standalone.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-- hosts: all
-
-  vars:
-    adminer_install_dir: /opt/adminer
-    adminer_add_apache_config: false
-
-  roles:
-    - role_under_test

From b00f7e0a0d4ab89420a73b1a79809398b9e6ffea Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 16 Jun 2020 19:44:09 -0500
Subject: [PATCH 1181/1273] Update PHP role to latest version.

---
 provisioning/requirements.yml                        | 2 +-
 provisioning/roles/geerlingguy.php/README.md         | 4 ++++
 provisioning/roles/geerlingguy.php/defaults/main.yml | 1 +
 provisioning/roles/geerlingguy.php/handlers/main.yml | 2 +-
 provisioning/roles/geerlingguy.php/meta/main.yml     | 1 +
 5 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 586427fdd..7f9b01088 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -43,7 +43,7 @@ roles:
   - name: geerlingguy.nodejs
     version: 5.1.1
   - name: geerlingguy.php
-    version: 4.2.0
+    version: 4.3.0
   - name: geerlingguy.php-memcached
     version: 2.0.2
   - name: geerlingguy.php-mysql
diff --git a/provisioning/roles/geerlingguy.php/README.md b/provisioning/roles/geerlingguy.php/README.md
index 0fb2305c8..f316c1393 100644
--- a/provisioning/roles/geerlingguy.php/README.md
+++ b/provisioning/roles/geerlingguy.php/README.md
@@ -67,6 +67,10 @@ If you're using Apache, you can easily get it configured to work with PHP-FPM us
 
 Control over the fpm daemon's state; set these to `stopped` and `false` if you want FPM to be installed and configured, but not running (e.g. when installing in a container).
 
+    php_fpm_handler_state: restarted
+
+The handler restarts PHP-FPM by default. Setting the value to `reloaded` will reload the service, intead of restarting it.
+
     php_fpm_listen: "127.0.0.1:9000"
     php_fpm_listen_allowed_clients: "127.0.0.1"
     php_fpm_pm_max_children: 50
diff --git a/provisioning/roles/geerlingguy.php/defaults/main.yml b/provisioning/roles/geerlingguy.php/defaults/main.yml
index 469849b58..5c23b1528 100644
--- a/provisioning/roles/geerlingguy.php/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.php/defaults/main.yml
@@ -22,6 +22,7 @@ php_enable_webserver: true
 # PHP-FPM configuration.
 php_enable_php_fpm: false
 php_fpm_state: started
+php_fpm_handler_state: restarted
 php_fpm_enabled_on_boot: true
 php_fpm_listen: "127.0.0.1:9000"
 php_fpm_listen_allowed_clients: "127.0.0.1"
diff --git a/provisioning/roles/geerlingguy.php/handlers/main.yml b/provisioning/roles/geerlingguy.php/handlers/main.yml
index 468de7151..e0d0a292c 100644
--- a/provisioning/roles/geerlingguy.php/handlers/main.yml
+++ b/provisioning/roles/geerlingguy.php/handlers/main.yml
@@ -9,7 +9,7 @@
 - name: restart php-fpm
   service:
     name: "{{ php_fpm_daemon }}"
-    state: restarted
+    state: "{{ php_fpm_handler_state }}"
   when:
     - php_enable_php_fpm
     - php_fpm_state == 'started'
diff --git a/provisioning/roles/geerlingguy.php/meta/main.yml b/provisioning/roles/geerlingguy.php/meta/main.yml
index cd2fcdb74..821b9732c 100644
--- a/provisioning/roles/geerlingguy.php/meta/main.yml
+++ b/provisioning/roles/geerlingguy.php/meta/main.yml
@@ -2,6 +2,7 @@
 dependencies: []
 
 galaxy_info:
+  role_name: php
   author: geerlingguy
   description: PHP for RedHat/CentOS/Fedora/Debian/Ubuntu.
   company: "Midwestern Mac, LLC"

From f6cb4206b40cbaeb68a5841b441b15c23e6dccb8 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 2 Jul 2020 09:31:00 -0500
Subject: [PATCH 1182/1273] Update PHP role to latest version.

---
 provisioning/requirements.yml                           | 2 +-
 provisioning/roles/geerlingguy.php/README.md            | 1 +
 provisioning/roles/geerlingguy.php/defaults/main.yml    | 1 +
 provisioning/roles/geerlingguy.php/templates/php.ini.j2 | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 7f9b01088..0e07d3ed5 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -43,7 +43,7 @@ roles:
   - name: geerlingguy.nodejs
     version: 5.1.1
   - name: geerlingguy.php
-    version: 4.3.0
+    version: 4.3.1
   - name: geerlingguy.php-memcached
     version: 2.0.2
   - name: geerlingguy.php-mysql
diff --git a/provisioning/roles/geerlingguy.php/README.md b/provisioning/roles/geerlingguy.php/README.md
index f316c1393..10f36249f 100644
--- a/provisioning/roles/geerlingguy.php/README.md
+++ b/provisioning/roles/geerlingguy.php/README.md
@@ -114,6 +114,7 @@ By default, all the extra defaults below are applied through the php.ini include
     php_session_save_path: ''
     php_disable_functions: []
     php_precision: 14
+    php_serialize_precision: "-1"
 
 Various defaults for PHP. Only used if `php_use_managed_ini` is set to `true`.
 
diff --git a/provisioning/roles/geerlingguy.php/defaults/main.yml b/provisioning/roles/geerlingguy.php/defaults/main.yml
index 5c23b1528..e9d214b10 100644
--- a/provisioning/roles/geerlingguy.php/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.php/defaults/main.yml
@@ -77,6 +77,7 @@ php_output_buffering: "4096"
 php_short_open_tag: "Off"
 php_disable_functions: []
 php_precision: 14
+php_serialize_precision: "-1"
 
 php_session_cookie_lifetime: 0
 php_session_gc_probability: 1
diff --git a/provisioning/roles/geerlingguy.php/templates/php.ini.j2 b/provisioning/roles/geerlingguy.php/templates/php.ini.j2
index f4393d507..14b7eeb32 100644
--- a/provisioning/roles/geerlingguy.php/templates/php.ini.j2
+++ b/provisioning/roles/geerlingguy.php/templates/php.ini.j2
@@ -13,7 +13,7 @@ zlib.output_compression = Off
 
 implicit_flush = Off
 unserialize_callback_func =
-serialize_precision = 17
+serialize_precision = {{ php_serialize_precision }}
 disable_functions = {{ php_disable_functions|join(",") }}
 disable_classes =
 

From 1ae7c38efa73be8a1a4428cdaaa1ed1f54893fde Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 6 Jul 2020 08:19:32 -0500
Subject: [PATCH 1183/1273] Issue #2050: Update Drupal role to latest version.

---
 provisioning/requirements.yml                 |  2 +-
 .../geerlingguy.drupal/.github/stale.yml      | 56 +++++++++++++++++++
 .../roles/geerlingguy.drupal/.travis.yml      |  9 +--
 .../default/yaml-lint.yml => .yamllint}       |  0
 .../roles/geerlingguy.drupal/README.md        |  2 +-
 .../geerlingguy.drupal/defaults/main.yml      |  2 +-
 .../roles/geerlingguy.drupal/meta/main.yml    |  1 +
 .../default/{playbook.yml => converge.yml}    |  2 +-
 .../molecule/default/molecule.yml             | 18 ++----
 .../molecule/default/playbook-deploy.yml      |  1 +
 .../molecule/default/test-setup.yml           | 12 ++--
 .../molecule/default/test-vars.yml            |  1 +
 12 files changed, 79 insertions(+), 27 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.drupal/.github/stale.yml
 rename provisioning/roles/geerlingguy.drupal/{molecule/default/yaml-lint.yml => .yamllint} (100%)
 rename provisioning/roles/geerlingguy.drupal/molecule/default/{playbook.yml => converge.yml} (93%)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 0e07d3ed5..63909a24f 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -19,7 +19,7 @@ roles:
   - name: geerlingguy.daemonize
     version: 1.2.1
   - name: geerlingguy.drupal
-    version: 3.0.1
+    version: 4.0.0
   - name: geerlingguy.drupal-console
     version: 1.1.1
   - name: geerlingguy.drush
diff --git a/provisioning/roles/geerlingguy.drupal/.github/stale.yml b/provisioning/roles/geerlingguy.drupal/.github/stale.yml
new file mode 100644
index 000000000..c7ff12754
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal/.github/stale.yml
@@ -0,0 +1,56 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 90
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 30
+
+# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
+onlyLabels: []
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - pinned
+  - security
+  - planned
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: false
+
+# Label to use when marking as stale
+staleLabel: stale
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+pulls:
+  markComment: |-
+    This pull request has been marked 'stale' due to lack of recent activity. If there is no further activity, the PR will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark pull requests as stale.
+
+  unmarkComment: >-
+    This pull request is no longer marked for closure.
+
+  closeComment: >-
+    This pull request has been closed due to inactivity. If you feel this is in error, please reopen the pull request or file a new PR with the relevant details.
+
+issues:
+  markComment: |-
+    This issue has been marked 'stale' due to lack of recent activity. If there is no further activity, the issue will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark issues as stale.
+
+  unmarkComment: >-
+    This issue is no longer marked for closure.
+
+  closeComment: >-
+    This issue has been closed due to inactivity. If you feel this is in error, please reopen the issue or file a new issue with the relevant details.
diff --git a/provisioning/roles/geerlingguy.drupal/.travis.yml b/provisioning/roles/geerlingguy.drupal/.travis.yml
index 44ff15468..97f9381cb 100644
--- a/provisioning/roles/geerlingguy.drupal/.travis.yml
+++ b/provisioning/roles/geerlingguy.drupal/.travis.yml
@@ -6,15 +6,16 @@ env:
   global:
     - ROLE_NAME: drupal
   matrix:
-    - MOLECULE_DISTRO: centos7
+    - MOLECULE_DISTRO: centos8
     - MOLECULE_DISTRO: ubuntu1804
-    - MOLECULE_DISTRO: debian9
-    - MOLECULE_DISTRO: centos7
+    # See: https://github.com/geerlingguy/ansible-role-drupal/issues/77
+    # - MOLECULE_DISTRO: debian10
+    - MOLECULE_DISTRO: centos8
       MOLECULE_PLAYBOOK: playbook-deploy.yml
 
 install:
   # Install test dependencies.
-  - pip install molecule docker
+  - pip install molecule yamllint ansible-lint docker
 
 before_script:
   # Use actual Ansible Galaxy role name for the project directory.
diff --git a/provisioning/roles/geerlingguy.drupal/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.drupal/.yamllint
similarity index 100%
rename from provisioning/roles/geerlingguy.drupal/molecule/default/yaml-lint.yml
rename to provisioning/roles/geerlingguy.drupal/.yamllint
diff --git a/provisioning/roles/geerlingguy.drupal/README.md b/provisioning/roles/geerlingguy.drupal/README.md
index fe3842632..526632abf 100644
--- a/provisioning/roles/geerlingguy.drupal/README.md
+++ b/provisioning/roles/geerlingguy.drupal/README.md
@@ -67,7 +67,7 @@ If you set the `bin-dir` in your project's `composer.json` file to a value other
 ### Create a new project using `composer create-project` (Composer)
 
     drupal_build_composer_project: true
-    drupal_composer_project_package: "drupal/recommended-project:^8@dev"
+    drupal_composer_project_package: "drupal/recommended-project:^9@dev"
     drupal_composer_project_options: "--prefer-dist --stability dev --no-interaction"
 
 Set this to `true` and `drupal_build_makefile`, `drupal_build_composer` to `false` if you are using Composer's `create-project` as a site deployment strategy.
diff --git a/provisioning/roles/geerlingguy.drupal/defaults/main.yml b/provisioning/roles/geerlingguy.drupal/defaults/main.yml
index 215c4ed24..3ff8b21ff 100644
--- a/provisioning/roles/geerlingguy.drupal/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.drupal/defaults/main.yml
@@ -31,7 +31,7 @@ drupal_composer_dependencies:
 # 'false' if you are using Composer's create-project as a site deployment
 # strategy.
 drupal_build_composer_project: true
-drupal_composer_project_package: "drupal/recommended-project:^8@dev"
+drupal_composer_project_package: "drupal/recommended-project:^9@dev"
 drupal_composer_project_options: "--prefer-dist --stability dev --no-interaction"
 
 # Required Drupal settings.
diff --git a/provisioning/roles/geerlingguy.drupal/meta/main.yml b/provisioning/roles/geerlingguy.drupal/meta/main.yml
index 839d99180..937648335 100644
--- a/provisioning/roles/geerlingguy.drupal/meta/main.yml
+++ b/provisioning/roles/geerlingguy.drupal/meta/main.yml
@@ -2,6 +2,7 @@
 dependencies: []
 
 galaxy_info:
+  role_name: drupal
   author: geerlingguy
   description: Deploy or install Drupal on your servers.
   company: "Midwestern Mac, LLC"
diff --git a/provisioning/roles/geerlingguy.drupal/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.drupal/molecule/default/converge.yml
similarity index 93%
rename from provisioning/roles/geerlingguy.drupal/molecule/default/playbook.yml
rename to provisioning/roles/geerlingguy.drupal/molecule/default/converge.yml
index 8d63418cf..1a4a81a4b 100644
--- a/provisioning/roles/geerlingguy.drupal/molecule/default/playbook.yml
+++ b/provisioning/roles/geerlingguy.drupal/molecule/default/converge.yml
@@ -14,7 +14,7 @@
 
   roles:
     - name: geerlingguy.repo-remi
-      when: ansible_os_family == "RedHat"
+      when: ansible_os_family == 'RedHat'
     - role: geerlingguy.repo-dotdeb
       when: ansible_distribution == 'Debian'
     - role: geerlingguy.apache
diff --git a/provisioning/roles/geerlingguy.drupal/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.drupal/molecule/default/molecule.yml
index 2ca6feaf9..2da47dd1f 100644
--- a/provisioning/roles/geerlingguy.drupal/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.drupal/molecule/default/molecule.yml
@@ -3,10 +3,10 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
-  options:
-    config-file: molecule/default/yaml-lint.yml
+lint: |
+  set -e
+  yamllint .
+  ansible-lint
 platforms:
   - name: instance
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
@@ -17,13 +17,5 @@ platforms:
     pre_build_image: true
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
   playbooks:
-    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
-scenario:
-  name: default
-verifier:
-  name: testinfra
-  lint:
-    name: flake8
+    converge: ${MOLECULE_PLAYBOOK:-converge.yml}
diff --git a/provisioning/roles/geerlingguy.drupal/molecule/default/playbook-deploy.yml b/provisioning/roles/geerlingguy.drupal/molecule/default/playbook-deploy.yml
index a819de955..1004dd8cc 100644
--- a/provisioning/roles/geerlingguy.drupal/molecule/default/playbook-deploy.yml
+++ b/provisioning/roles/geerlingguy.drupal/molecule/default/playbook-deploy.yml
@@ -28,6 +28,7 @@
       when: ansible_distribution == 'Debian'
     - role: geerlingguy.apache
     - role: geerlingguy.mysql
+    - role: geerlingguy.php-versions
     - role: geerlingguy.php
     - role: geerlingguy.php-mysql
     - role: geerlingguy.git
diff --git a/provisioning/roles/geerlingguy.drupal/molecule/default/test-setup.yml b/provisioning/roles/geerlingguy.drupal/molecule/default/test-setup.yml
index 5427ef5e3..4a6d6c1f8 100644
--- a/provisioning/roles/geerlingguy.drupal/molecule/default/test-setup.yml
+++ b/provisioning/roles/geerlingguy.drupal/molecule/default/test-setup.yml
@@ -1,11 +1,11 @@
 ---
 - name: Update apt cache.
-  apt: update_cache=yes cache_valid_time=86400
+  apt: update_cache=yes cache_valid_time=600
   when: ansible_os_family == 'Debian'
 
 - name: Install dependencies.
-  package: name={{ item }}
-  with_items:
-    - curl
-    - unzip
-    - sendmail
+  package:
+    name:
+      - curl
+      - unzip
+      - sendmail
diff --git a/provisioning/roles/geerlingguy.drupal/molecule/default/test-vars.yml b/provisioning/roles/geerlingguy.drupal/molecule/default/test-vars.yml
index e53e73e39..e9f30da40 100644
--- a/provisioning/roles/geerlingguy.drupal/molecule/default/test-vars.yml
+++ b/provisioning/roles/geerlingguy.drupal/molecule/default/test-vars.yml
@@ -21,6 +21,7 @@ apache_vhosts:
             SetHandler "proxy:fcgi://{{ php_fpm_listen }}"
           </FilesMatch>
 
+mysql_python_package_debian: python3-mysqldb
 mysql_enablerepo: "remi"
 mysql_databases:
   - name: "{{ drupal_db_name }}"

From 279934a4f725710f6f0a44d1ccb9fb2373ebec13 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 6 Jul 2020 08:48:44 -0500
Subject: [PATCH 1184/1273] Fixes #2050: Default to Drupal 9.

---
 Dockerfile                                 |  4 ++--
 README.md                                  | 12 ++++++------
 default.config.yml                         |  4 ++--
 docs/configurations/base-os.md             |  2 +-
 docs/deployment/composer-package.md        |  4 ++--
 docs/deployment/drush-make.md              |  2 +-
 docs/extras/varnish.md                     |  2 +-
 docs/getting-started/configure-drupalvm.md |  4 ++--
 docs/other/docker.md                       |  4 ++--
 docs/other/drupal-6.md                     |  2 +-
 provisioning/templates/nginx-vhost.conf.j2 |  2 +-
 11 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 53f544fe7..a803ab7e2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM geerlingguy/docker-debian9-ansible:latest
+FROM geerlingguy/docker-debian10-ansible:latest
 LABEL maintainer="Jeff Geerling"
 
 # Copy provisioning directory, variable overrides, and scripts into container.
@@ -8,7 +8,7 @@ COPY ./provisioning/docker/bin/* /usr/local/bin
 
 # Provision Drupal VM inside Docker.
 RUN ansible-playbook /etc/ansible/drupal-vm/provisioning/playbook.yml \
-  -e "ansible_python_interpreter=/usr/bin/python" \
+  -e "ansible_python_interpreter=/usr/bin/python3" \
   # Enable FPM. See https://github.com/geerlingguy/drupal-vm/issues/1366.
   && systemctl enable php7.2-fpm.service
 
diff --git a/README.md b/README.md
index 444a201bf..45a08047b 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ Drupal VM installs the following on an Ubuntu 18.04 (by default) linux VM:
   - Apache (or Nginx)
   - PHP (configurable version)
   - MySQL (or MariaDB, or PostgreSQL)
-  - Drupal 7 or 8
+  - Drupal 7, 8, or 9
   - Optional:
     - Drupal Console
     - Drush
@@ -52,7 +52,7 @@ There are a couple places where you can customize the VM for your needs:
   - `config.yml`: Override any of the default VM configuration from `default.config.yml`; customize almost any aspect of any software installed in the VM (more about [configuring Drupal VM](http://docs.drupalvm.com/en/latest/getting-started/configure-drupalvm/).
   - `drupal.composer.json` or `drupal.make.yml`: Contains configuration for the Drupal core version, modules, and patches that will be downloaded on Drupal's initial installation (you can build using Composer, Drush make, or your own codebase).
 
-If you want to switch from Drupal 8 (default) to Drupal 7 on the initial install, do the following:
+If you want to use Drupal 7 on the initial install, do the following:
 
   1. Switch to using a [Drush Make file](http://docs.drupalvm.com/en/latest/deployment/drush-make/).
   1. Update the Drupal `version` and `core` inside your `drupal.make.yml` file.
@@ -60,9 +60,9 @@ If you want to switch from Drupal 8 (default) to Drupal 7 on the initial install
 
 ## Quick Start Guide
 
-This Quick Start Guide will help you quickly build a Drupal 8 site on the Drupal VM using Composer with `drupal-project`. You can also use Drupal VM with [Composer](http://docs.drupalvm.com/en/latest/deployment/composer/), a [Drush Make file](http://docs.drupalvm.com/en/latest/deployment/drush-make/), with a [Local Drupal codebase](http://docs.drupalvm.com/en/latest/deployment/local-codebase/), or even a [Drupal multisite installation](http://docs.drupalvm.com/en/latest/deployment/multisite/).
+This Quick Start Guide will help you quickly build a Drupal 9 site on the Drupal VM creating a new Composer project. You can also use Drupal VM with [Composer](http://docs.drupalvm.com/en/latest/deployment/composer/), a [Drush Make file](http://docs.drupalvm.com/en/latest/deployment/drush-make/), with a [Local Drupal codebase](http://docs.drupalvm.com/en/latest/deployment/local-codebase/), or even a [Drupal multisite installation](http://docs.drupalvm.com/en/latest/deployment/multisite/).
 
-If you want to install a Drupal 8 site locally with minimal fuss, just:
+If you want to install a Drupal site locally with minimal fuss, just:
 
   1. Install [Vagrant](https://www.vagrantup.com/downloads.html) and [VirtualBox](https://www.virtualbox.org/wiki/Downloads).
   2. Download or clone this project to your workstation.
@@ -81,7 +81,7 @@ Notes:
   - **For faster provisioning** (macOS/Linux only): *[Install Ansible](http://docs.ansible.com/intro_installation.html) on your host machine, so Drupal VM can run the provisioning steps locally instead of inside the VM.*
   - **For stability**: Because every version of VirtualBox introduces changes to networking, for the best stability, you should install Vagrant's `vbguest` plugin: `vagrant plugin install vagrant-vbguest`.
   - **NFS on Linux**: *If NFS is not already installed on your host, you will need to install it to use the default NFS synced folder configuration. See guides for [Debian/Ubuntu](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-ubuntu-14-04), [Arch](https://wiki.archlinux.org/index.php/NFS#Installation), and [RHEL/CentOS](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-centos-6).*
-  - **Versions**: *Make sure you're running the latest releases of Vagrant, VirtualBox, and Ansible—as of early 2019, Drupal VM recommends: Vagrant 2.2.x, VirtualBox 6.0.x, and Ansible 2.7.x*
+  - **Versions**: *Make sure you're running the latest releases of Vagrant, VirtualBox, and Ansible—as of 2020, Drupal VM recommends: Vagrant 2.2.x, VirtualBox 6.1.x, and Ansible 2.9.x*
 
 ### 2 - Build the Virtual Machine
 
@@ -141,7 +141,7 @@ Drupal VM follows semantic versioning, which means your configuration should con
   2. Do a diff of your `config.yml` with the updated `default.config.yml` (e.g. `curl https://raw.githubusercontent.com/geerlingguy/drupal-vm/master/default.config.yml | git diff --no-index config.yml -`).
   3. Run `vagrant provision` to provision the VM, incorporating all the latest changes.
 
-For major version upgrades (e.g. 3.x.x to 4.x.x), it may be simpler to destroy the VM (`vagrant destroy`) then build a fresh new VM (`vagrant up`) using the new version of Drupal VM.
+For major version upgrades (e.g. 4.x.x to 5.x.x), it may be simpler to destroy the VM (`vagrant destroy`) then build a fresh new VM (`vagrant up`) using the new version of Drupal VM.
 
 ## System Requirements
 
diff --git a/default.config.yml b/default.config.yml
index 522580151..eaec3f0a1 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -77,7 +77,7 @@ drupal_composer_dependencies:
 # Set this to 'true' and 'drupal_build_makefile', 'drupal_build_composer' to 'false'
 # if you are using Composer's create-project as a site deployment strategy.
 drupal_build_composer_project: true
-drupal_composer_project_package: "drupal-composer/drupal-project:8.x-dev"
+drupal_composer_project_package: "drupal/recommended-project:^9@dev"
 drupal_composer_project_options: "--prefer-dist --stability dev --no-interaction"
 
 # Set this to 'false' if you don't need to install drupal (using the drupal_*
@@ -93,7 +93,7 @@ drupal_db_name: drupal
 drupal_db_host: localhost
 
 # Settings for installing a Drupal site if 'drupal_install_site:' is 'true'.
-drupal_major_version: 8
+drupal_major_version: 9
 drupal_domain: "{{ vagrant_hostname }}"
 drupal_site_name: "Drupal"
 drupal_install_profile: standard
diff --git a/docs/configurations/base-os.md b/docs/configurations/base-os.md
index 1e382f3f7..cb398aa79 100644
--- a/docs/configurations/base-os.md
+++ b/docs/configurations/base-os.md
@@ -42,4 +42,4 @@ Most everything should work out of the box with Debian 10. If you are installing
 
 ## Debian 9 Stretch
 
-Everything should work out of the box with Debian 10.
+Everything should work out of the box with Debian 9.
diff --git a/docs/deployment/composer-package.md b/docs/deployment/composer-package.md
index 382f37f65..e0a56508b 100644
--- a/docs/deployment/composer-package.md
+++ b/docs/deployment/composer-package.md
@@ -1,4 +1,4 @@
-Out of the box Drupal VM is configured to use `composer create-project` to build a Drupal 8 codebase.
+Out of the box Drupal VM is configured to use `composer create-project` to build a Drupal codebase.
 
 This is set up with the following variables in `config.yml`:
 
@@ -10,7 +10,7 @@ This is set up with the following variables in `config.yml`:
 With [acquia/lightning-project](https://github.com/acquia/lightning-project) as an example your `config.yml` settings would be:
 
 ```yaml
-drupal_composer_project_package: "acquia/lightning-project:^8.1.0"
+drupal_composer_project_package: "acquia/lightning-project:^8.8.1"
 drupal_composer_project_options: "--prefer-dist --stability rc --no-interaction"
 drupal_core_path: "{{ drupal_composer_install_dir }}/docroot"
 ```
diff --git a/docs/deployment/drush-make.md b/docs/deployment/drush-make.md
index 6a9deb56b..c8265b805 100644
--- a/docs/deployment/drush-make.md
+++ b/docs/deployment/drush-make.md
@@ -9,7 +9,7 @@ If you want to build a Drupal site using a [Drush make file](http://www.drush.or
 ```yaml
 drush_launcher_install: no
 drush_install_from_source: yes
-drush_source_install_version: "8.1.15"
+drush_source_install_version: "8.9.1"
 ```
 
 Have a look at the defaults in `default.config.yml` and tweak the settings as you'd like in your `config.yml`, then run `vagrant up` as in the Quick Start Guide. Within a few minutes, you should have your site running and available at the `drupal_domain` configured in `config.yml`, falling back to the default `http://drupalvm.test` set in `default.config.yml`.
diff --git a/docs/extras/varnish.md b/docs/extras/varnish.md
index 49be21215..2176186c0 100644
--- a/docs/extras/varnish.md
+++ b/docs/extras/varnish.md
@@ -2,7 +2,7 @@
 
 To enable Varnish, make sure `varnish` is in the list of your `installed_extras` in `config.yml`, and run `vagrant provision`.
 
-There are a few varnish configuration variables further down in `default.config.yml` that you may wish to configure. You can use your own `.vcl` file template (instead of the generic Drupal 7-focused generic one) by editing the `varnish_default_vcl_template_path`, and you can use a different port for Varnish by changing `varnish_listen_port`.
+There are a few varnish configuration variables further down in `default.config.yml` that you may wish to configure. You can use your own `.vcl` file template (instead of the default generic Drupal-focused one) by editing the `varnish_default_vcl_template_path`, and you can use a different port for Varnish by changing `varnish_listen_port`.
 
 If you'd like to use Varnish on port 80, and switch Apache to a different backend port, you can do so pretty easily; just make sure you have the following values set in your `config.yml` file, and run `vagrant provision` to have Ansible make the necessary changes:
 
diff --git a/docs/getting-started/configure-drupalvm.md b/docs/getting-started/configure-drupalvm.md
index 8fb40f4f9..4ba130c7f 100644
--- a/docs/getting-started/configure-drupalvm.md
+++ b/docs/getting-started/configure-drupalvm.md
@@ -13,8 +13,8 @@ Drupal VM's default configurations which you should not edit directly.
 The main configuration file of a project. Commonly this is a copy of `default.config.yml` with the values tweaked to your own project. For an easier upgrade path you would only set the values you are actually overriding.
 
 ```yaml
-vagrant_box: geerlingguy/centos7
-vagrant_hostname: my-custom-site.dev
+vagrant_box: geerlingguy/centos8
+vagrant_hostname: my-custom-site.test
 vagrant_machine_name: my_custom_site
 
 php_version: "7.2"
diff --git a/docs/other/docker.md b/docs/other/docker.md
index 5b3027d55..b2a9fb651 100644
--- a/docs/other/docker.md
+++ b/docs/other/docker.md
@@ -28,7 +28,7 @@ You can also add other subdomains if you're using other built-in services, e.g.
 If you just want a quick, easy Drupal site for testing, you can run an instance of Drupal VM and install Drupal inside using the provided script.
 
   1. Run an instance of Drupal VM: `docker run -d -v /sys/fs/cgroup:/sys/fs/cgroup:ro -p 80:80 -p 443:443 --name=drupalvm --privileged geerlingguy/drupal-vm`
-  2. Install Drupal on this instance: `docker exec drupalvm install-drupal` (you can choose a version using `install-drupal [version]`, using versions like `8.x-dev` or `7.x-dev`).
+  2. Install Drupal on this instance: `docker exec drupalvm install-drupal` (you can choose a version using `install-drupal [version]`, using versions like `9.x-dev` or `8.x-dev`).
 
 You should be able to access the Drupal site at `http://localhost`. If you need to share a host directory into the VM, you can do so by adding another `-v` parameter, like `-v /path/on/host:/path/in/container.
 
@@ -122,7 +122,7 @@ After you've configured your Drupal VM settings in `config.yml` and other config
 
 This will bake a Docker images using Drupal VM's default settings for distro, IP address, hostname, etc. You can override these options (all are listed in the `provisioning/docker/bake.sh` file) by prepending them to the `composer` command:
 
-    DRUPALVM_IP_ADDRESS='192.168.89.89' DISTRO='debian9' composer docker-bake
+    DRUPALVM_IP_ADDRESS='192.168.89.89' DISTRO='debian10' composer docker-bake
 
 This process can take some time (it should take a similar amount of time as it takes to build Drupal VM normally, using Vagrant and VirtualBox), and at the end, you should see a message like:
 
diff --git a/docs/other/drupal-6.md b/docs/other/drupal-6.md
index b9869aeb0..ce6d5fe9f 100644
--- a/docs/other/drupal-6.md
+++ b/docs/other/drupal-6.md
@@ -1,4 +1,4 @@
 If you'd like to use the included configuration and Drush make file to install a Drupal 6 site using an older version of Drush (< 7.x), you may need to make some changes, namely:
 
   1. Drush < 7.x does not support .yml makefiles; if using Drush 5.x or 6.x, you will need to create the make file in the INI-style format.
-  2. In your customized `config.yml` file, you will need to use the `default` installation profile instead of `standard` (for the `drupal_install_profile` variable).
\ No newline at end of file
+  2. In your customized `config.yml` file, you will need to use the `default` installation profile instead of `standard` (for the `drupal_install_profile` variable).
diff --git a/provisioning/templates/nginx-vhost.conf.j2 b/provisioning/templates/nginx-vhost.conf.j2
index 23562a25e..3ba2f3fa8 100644
--- a/provisioning/templates/nginx-vhost.conf.j2
+++ b/provisioning/templates/nginx-vhost.conf.j2
@@ -49,7 +49,7 @@ server {
     {% endblock %}
 
     {% block location_drupal_legacy -%}
-    {% if drupal_major_version == 8 -%}
+    {% if drupal_major_version >= 8 -%}
     # Redirect common PHP files to their new locations.
     location ~ ^((?!.*(?:core)).*)/(install.php|rebuild.php) {
          return 301 $scheme://$host$1/core/$2$is_args$args;

From 95c0159534b799a1daa50d26a33ba32b2cb6ae68 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 6 Jul 2020 09:16:40 -0500
Subject: [PATCH 1185/1273] Fixes #2061: Update default PHP version to 7.4.

---
 .travis.yml                                | 2 +-
 Dockerfile                                 | 2 +-
 default.config.yml                         | 2 +-
 docs/configurations/php.md                 | 8 ++++----
 docs/getting-started/configure-drupalvm.md | 2 +-
 docs/other/bigpipe.md                      | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 97127349f..61dd89325 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 ---
 language: php
-php: 7.2
+php: 7.4
 services: docker
 
 env:
diff --git a/Dockerfile b/Dockerfile
index a803ab7e2..fbfe84796 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ COPY ./provisioning/docker/bin/* /usr/local/bin
 RUN ansible-playbook /etc/ansible/drupal-vm/provisioning/playbook.yml \
   -e "ansible_python_interpreter=/usr/bin/python3" \
   # Enable FPM. See https://github.com/geerlingguy/drupal-vm/issues/1366.
-  && systemctl enable php7.2-fpm.service
+  && systemctl enable php7.4-fpm.service
 
 EXPOSE 80 443 3306 8025
 
diff --git a/default.config.yml b/default.config.yml
index eaec3f0a1..880af8727 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -258,7 +258,7 @@ firewall_disable_ufw: true
 
 # PHP Configuration. Currently-supported versions: 7.2, 7.3, 7.4.
 # See version-specific notes: http://docs.drupalvm.com/en/latest/configurations/php/
-php_version: "7.2"
+php_version: "7.4"
 php_install_recommends: no
 php_memory_limit: "192M"
 php_display_errors: "On"
diff --git a/docs/configurations/php.md b/docs/configurations/php.md
index 50592e9c6..08d64c62b 100644
--- a/docs/configurations/php.md
+++ b/docs/configurations/php.md
@@ -1,8 +1,8 @@
-Drupal VM defaults to PHP 7.2, but you can also install and use 7.3 or 7.4.
+Drupal VM defaults to PHP 7.4, but you can also install and use 7.2 or 7.3.
 
 ## Ubuntu
 
-Ondřej Surý's PPA for PHP is used to install PHP 7.2, but you can switch versions by changing `php_version` inside `config.yml` to `"7.3"` or `"7.4"`.
+Ondřej Surý's PPA for PHP is used to install PHP 7.4, but you can switch versions by changing `php_version` inside `config.yml` to `"7.2"` or `"7.3"`.
 
 If you're using Apache with `mod_php` you should also add `libapache2-mod-php{{ php_version }}` to the `extra_packages` list.
 
@@ -10,10 +10,10 @@ _Note: XHProf does currently not work with PHP 7.1+, make sure you don't have it
 
 ## RedHat/CentOS 7 or 8
 
-Remi's RPM repository is included with Drupal VM, and you can make the following changes to use it to install a different version of PHP than 7.2:
+Remi's RPM repository is included with Drupal VM, and you can make the following changes to use it to install a different version of PHP than 7.4:
 
   1. Make sure you've followed the directions for switching to CentOS 7 in the [use a different base OS](base-os.md) guide.
-  2. Change `php_version` inside `config.yml` to `"7.3"` or `"7.4"`.
+  2. Change `php_version` inside `config.yml` to `"7.2"` or `"7.3"`.
 
 ## PHP 5.6 EOL
 
diff --git a/docs/getting-started/configure-drupalvm.md b/docs/getting-started/configure-drupalvm.md
index 4ba130c7f..2e068bf3b 100644
--- a/docs/getting-started/configure-drupalvm.md
+++ b/docs/getting-started/configure-drupalvm.md
@@ -17,7 +17,7 @@ vagrant_box: geerlingguy/centos8
 vagrant_hostname: my-custom-site.test
 vagrant_machine_name: my_custom_site
 
-php_version: "7.2"
+php_version: "7.3"
 ```
 
 #### 3. vagrant.config.yml
diff --git a/docs/other/bigpipe.md b/docs/other/bigpipe.md
index bd69df378..3a2f4cc80 100644
--- a/docs/other/bigpipe.md
+++ b/docs/other/bigpipe.md
@@ -37,7 +37,7 @@ This will disable the `mod_deflate` module for any requests inside that director
 
 If you want to switch Apache to use `mod_php` instead of proxying requests through PHP-FPM, you can make the following changes in `config.yml`:
 
-  1. Add `libapache2-mod-php7.2` to `extra_packages` in `config.yml`.
+  1. Add `libapache2-mod-php7.4` to `extra_packages` in `config.yml`.
   2. Delete the `extra_parameters` under any Drupal site in the list of `apache_vhosts` (so there is no `SetHandler` rule).
 
 You can also disable PHP-FPM and remove the two `proxy` entries from `apache_mods_enabled` if you don't want to use PHP-FPM with Apache at all, but that's optional; it won't break anything to run Apache with `mod_php` and `mod_proxy_fastcgi` at the same time.

From fcc7832996e90791189fcb192a9825665ce81446 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 6 Jul 2020 09:55:10 -0500
Subject: [PATCH 1186/1273] Fixes #2062: Drupal 9 composer codebase requires
 more memory for composer ops.

---
 provisioning/requirements.yml                                  | 2 +-
 .../roles/geerlingguy.drupal/tasks/build-composer-project.yml  | 3 +++
 provisioning/roles/geerlingguy.drupal/tasks/build-composer.yml | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 63909a24f..e80df2c09 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -19,7 +19,7 @@ roles:
   - name: geerlingguy.daemonize
     version: 1.2.1
   - name: geerlingguy.drupal
-    version: 4.0.0
+    version: 4.1.0
   - name: geerlingguy.drupal-console
     version: 1.1.1
   - name: geerlingguy.drush
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/build-composer-project.yml b/provisioning/roles/geerlingguy.drupal/tasks/build-composer-project.yml
index f682c02bf..6baed300c 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/build-composer-project.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/build-composer-project.yml
@@ -40,3 +40,6 @@
     working_dir: "{{ drupal_composer_install_dir }}"
   with_items: "{{ drupal_composer_dependencies|default([]) }}"
   become: false
+  environment:
+    COMPOSER_PROCESS_TIMEOUT: 1200
+    COMPOSER_MEMORY_LIMIT: '-1'
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/build-composer.yml b/provisioning/roles/geerlingguy.drupal/tasks/build-composer.yml
index bfec131fa..a06e57260 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/build-composer.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/build-composer.yml
@@ -35,3 +35,6 @@
     working_dir: "{{ drupal_composer_install_dir }}"
   with_items: "{{ drupal_composer_dependencies|default([]) }}"
   become: false
+  environment:
+    COMPOSER_PROCESS_TIMEOUT: 1200
+    COMPOSER_MEMORY_LIMIT: '-1'

From 396c6ba29e232e713261c90974bc5d40d6ef980f Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 6 Jul 2020 10:05:30 -0500
Subject: [PATCH 1187/1273] Issue #2050: Update example.drupal.composer.json
 for Drupal 9.

---
 .gitignore                   |  1 +
 drupal.composer.json         | 41 --------------------------------
 example.drupal.composer.json | 46 +++++++++++++++++++++++++++---------
 3 files changed, 36 insertions(+), 52 deletions(-)
 delete mode 100644 drupal.composer.json

diff --git a/.gitignore b/.gitignore
index 019808921..930d79a11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@
 vagrant_ansible_inventory_default
 
 # Drupal VM specific files.
+drupal.composer.json
 local.config.yml
 Vagrantfile.local
 /config.yml
diff --git a/drupal.composer.json b/drupal.composer.json
deleted file mode 100644
index 8b4f3b261..000000000
--- a/drupal.composer.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "name": "custom-project/drupal-vm",
-    "description": "",
-    "type": "project",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "",
-            "role": ""
-        }
-    ],
-    "repositories": [
-        {
-            "type": "composer",
-            "url": "https://packages.drupal.org/8"
-        }
-    ],
-    "require": {
-        "composer/installers": "^1.0.20",
-        "drupal-composer/drupal-scaffold": "^2.0.1",
-        "drupal/core": "^8.6",
-        "drupal/devel": "^1.2"
-    },
-    "replace": {
-        "drupal/drupal": "*"
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
-    "extra": {
-        "installer-paths": {
-            "web/core": ["type:drupal-core"],
-            "web/modules/contrib/{$name}": ["type:drupal-module"],
-            "web/profiles/contrib/{$name}": ["type:drupal-profile"],
-            "web/themes/contrib/{$name}": ["type:drupal-theme"],
-            "drush/contrib/{$name}": ["type:drupal-drush"]
-        }
-    },
-    "config": {
-        "process-timeout": 1200
-    }
-}
diff --git a/example.drupal.composer.json b/example.drupal.composer.json
index 8b4f3b261..45683fcc7 100644
--- a/example.drupal.composer.json
+++ b/example.drupal.composer.json
@@ -16,24 +16,48 @@
         }
     ],
     "require": {
-        "composer/installers": "^1.0.20",
-        "drupal-composer/drupal-scaffold": "^2.0.1",
-        "drupal/core": "^8.6",
-        "drupal/devel": "^1.2"
+        "composer/installers": "^1.9",
+        "drupal/core-composer-scaffold": "^9",
+        "drupal/core-project-message": "^9",
+        "drupal/core-recommended": "^9"
     },
-    "replace": {
+    "conflict": {
         "drupal/drupal": "*"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
     "extra": {
+        "drupal-scaffold": {
+            "locations": {
+                "web-root": "web/"
+            }
+        },
         "installer-paths": {
-            "web/core": ["type:drupal-core"],
-            "web/modules/contrib/{$name}": ["type:drupal-module"],
-            "web/profiles/contrib/{$name}": ["type:drupal-profile"],
-            "web/themes/contrib/{$name}": ["type:drupal-theme"],
-            "drush/contrib/{$name}": ["type:drupal-drush"]
-        }
+            "web/core": [
+                "type:drupal-core"
+            ],
+            "web/libraries/{$name}": [
+                "type:drupal-library"
+            ],
+            "web/modules/contrib/{$name}": [
+                "type:drupal-module"
+            ],
+            "web/profiles/contrib/{$name}": [
+                "type:drupal-profile"
+            ],
+            "web/themes/contrib/{$name}": [
+                "type:drupal-theme"
+            ],
+            "drush/Commands/contrib/{$name}": [
+                "type:drupal-drush"
+            ],
+            "web/modules/custom/{$name}": [
+                "type:drupal-custom-module"
+            ],
+            "web/themes/custom/{$name}": [
+                "type:drupal-custom-theme"
+            ]
+        },
     },
     "config": {
         "process-timeout": 1200

From cff39f0c0dcb3b19f51380e093b509d8b767acc8 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 6 Jul 2020 10:09:55 -0500
Subject: [PATCH 1188/1273] Fixes #2063: Update devel version to work with
 Drupal 9.

---
 default.config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.config.yml b/default.config.yml
index 880af8727..25d8ebdd9 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -72,7 +72,7 @@ drupal_build_composer: false
 drupal_composer_path: "{{ config_dir }}/drupal.composer.json"
 drupal_composer_install_dir: "/var/www/drupalvm/drupal"
 drupal_composer_dependencies:
-  - "drupal/devel:^1.2"
+  - "drupal/devel:^4.0"
 
 # Set this to 'true' and 'drupal_build_makefile', 'drupal_build_composer' to 'false'
 # if you are using Composer's create-project as a site deployment strategy.

From ee1ac2dd420f7f02841bec905688136965c30acd Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 6 Jul 2020 10:23:51 -0500
Subject: [PATCH 1189/1273] Fixes #2064: Explicitly require Drush so it is
 present in tests.

---
 default.config.yml           | 1 +
 example.drupal.composer.json | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/default.config.yml b/default.config.yml
index 25d8ebdd9..abaee7d9b 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -72,6 +72,7 @@ drupal_build_composer: false
 drupal_composer_path: "{{ config_dir }}/drupal.composer.json"
 drupal_composer_install_dir: "/var/www/drupalvm/drupal"
 drupal_composer_dependencies:
+  - "drush/drush:^10"
   - "drupal/devel:^4.0"
 
 # Set this to 'true' and 'drupal_build_makefile', 'drupal_build_composer' to 'false'
diff --git a/example.drupal.composer.json b/example.drupal.composer.json
index 45683fcc7..17f436960 100644
--- a/example.drupal.composer.json
+++ b/example.drupal.composer.json
@@ -19,7 +19,8 @@
         "composer/installers": "^1.9",
         "drupal/core-composer-scaffold": "^9",
         "drupal/core-project-message": "^9",
-        "drupal/core-recommended": "^9"
+        "drupal/core-recommended": "^9",
+        "drush/drush:^10"
     },
     "conflict": {
         "drupal/drupal": "*"

From a8cb9c88740bb60a0e2afaf4b453856e998c8d7d Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 6 Jul 2020 10:56:51 -0500
Subject: [PATCH 1190/1273] Fixes #2065: Drop official support for Debian 9,
 CentOS 7, and Ubuntu 16.04.

---
 .travis.yml                              | 10 +++++-----
 README.md                                |  2 +-
 default.config.yml                       |  3 ---
 docs/configurations/base-os.md           | 21 +--------------------
 docs/configurations/databases-mariadb.md |  4 ++--
 docs/configurations/php.md               |  4 ++--
 docs/other/production.md                 |  2 +-
 docs/other/vagrant-lxc.md                |  6 ------
 tests/run-tests.sh                       | 14 +-------------
 9 files changed, 13 insertions(+), 53 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 61dd89325..ea49e38bb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,14 +20,14 @@ env:
     # Defaults - Ubuntu 18.04.
     - type: defaults
       distro: ubuntu1804
-    # Defaults - Debian 9.
+    # Defaults - Debian 10.
     - type: debian
-      distro: debian9
+      distro: debian10
       ANSIBLE_PYTHON_INTERPRETER: /usr/bin/python
-    # Defaults - CentOS 7.
+    # Defaults - CentOS 8.
     - type: centos
-      distro: centos7
-      local_config: tests/centos-7.config.yml
+      distro: centos8
+      local_config: tests/centos-8.config.yml
       ANSIBLE_PYTHON_INTERPRETER: /usr/bin/python
 
     # PHP 7.3 - Ubuntu 18.04.
diff --git a/README.md b/README.md
index 45a08047b..bedf7bd7e 100644
--- a/README.md
+++ b/README.md
@@ -80,7 +80,7 @@ Notes:
 
   - **For faster provisioning** (macOS/Linux only): *[Install Ansible](http://docs.ansible.com/intro_installation.html) on your host machine, so Drupal VM can run the provisioning steps locally instead of inside the VM.*
   - **For stability**: Because every version of VirtualBox introduces changes to networking, for the best stability, you should install Vagrant's `vbguest` plugin: `vagrant plugin install vagrant-vbguest`.
-  - **NFS on Linux**: *If NFS is not already installed on your host, you will need to install it to use the default NFS synced folder configuration. See guides for [Debian/Ubuntu](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-ubuntu-14-04), [Arch](https://wiki.archlinux.org/index.php/NFS#Installation), and [RHEL/CentOS](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-centos-6).*
+  - **NFS on Linux**: *If NFS is not already installed on your host, you will need to install it to use the default NFS synced folder configuration. See [nfs instructions for Linux](http://docs.drupalvm.com/en/latest/getting-started/installation-linux/#mounting-nfs-shared-folders-hangs)*
   - **Versions**: *Make sure you're running the latest releases of Vagrant, VirtualBox, and Ansible—as of 2020, Drupal VM recommends: Vagrant 2.2.x, VirtualBox 6.1.x, and Ansible 2.9.x*
 
 ### 2 - Build the Virtual Machine
diff --git a/default.config.yml b/default.config.yml
index abaee7d9b..6e59a7444 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -2,11 +2,8 @@
 # Available `vagrant_box` values include:
 #   - geerlingguy/drupal-vm (pre-provisioned, based on Ubuntu 18.04)
 #   - geerlingguy/centos8
-#   - geerlingguy/centos7
 #   - geerlingguy/debian10
-#   - geerlingguy/debian9
 #   - geerlingguy/ubuntu1804
-#   - geerlingguy/ubuntu1604
 vagrant_box: geerlingguy/drupal-vm
 
 vagrant_user: vagrant
diff --git a/docs/configurations/base-os.md b/docs/configurations/base-os.md
index cb398aa79..f376f9d28 100644
--- a/docs/configurations/base-os.md
+++ b/docs/configurations/base-os.md
@@ -3,43 +3,24 @@ Drupal VM's configuration is designed to work with RedHat and Debian-compatible
 Currently-supported OSes are:
 
   - Ubuntu 18.04 'Bionic' (default)
-  - Ubuntu 16.04 'Xenial'
   - RedHat Enterprise Linux / CentOS 8
-  - RedHat Enterprise Linux / CentOS 7
   - Debian 10 'Buster'
-  - Debian 9 'Stretch'
 
 For certain OSes, there are a couple other caveats and tweaks you may need to perform to get things running smoothly—the main features and latest development is only guaranteed to work with the default OS as configured in `default.config.yml`.
 
-Some other OSes should work, but are not regularly tested with Drupal VM, including Debian 8/Jessie (`debian/jessie64`).
+Some other OSes may work, but are not regularly tested with Drupal VM, and may require extra work to make everything work, depending on the version of Drupal you're using.
 
 ## Ubuntu 18.04 Bionic LTS
 
 Everything should work out of the box with Ubuntu 18.04.
 
-## Ubuntu 16.04 Xenial LTS
-
-Most everything should work out of the box with Ubuntu 16.04. You will need to override one variable in your `config.yml` to use an older version of Python when provisioning:
-
-    ansible_python_interpreter: /usr/bin/python
-
 ## RedHat Enterprise Linux / CentOS 8
 
 Everything should work out of the box with RHEL 8.
 
-## RedHat Enterprise Linux / CentOS 7
-
-Most everything should work out of the box with CentOS 7. You will need to override one variable in your `config.yml` to use an older version of Python when provisioning:
-
-    ansible_python_interpreter: /usr/bin/python
-
 ## Debian 10 Buster
 
 Most everything should work out of the box with Debian 10. If you are installing `java` or `solr` in the `installed_extras`, you need to override the `java_packages` in your `config.yml`:
 
     java_packages:
       - openjdk-11-jdk
-
-## Debian 9 Stretch
-
-Everything should work out of the box with Debian 9.
diff --git a/docs/configurations/databases-mariadb.md b/docs/configurations/databases-mariadb.md
index 77ba60ef8..29329d6a7 100644
--- a/docs/configurations/databases-mariadb.md
+++ b/docs/configurations/databases-mariadb.md
@@ -9,9 +9,9 @@ mysql_packages:
   - python-mysqldb
 ```
 
-This set of packages works out of the box with Ubuntu 16.04 as well as the default Ubuntu 18.04 installation that comes with Drupal VM.
+This set of packages works out of the box with Ubuntu 18.04 installation that comes with Drupal VM.
 
-Alternatively, if you want to use RedHat 7 or CentOS 7 instead of Ubuntu, you can set the following variables to install and configure MariaDB instead of MySQL:
+Alternatively, if you want to use RedHat 8 or CentOS 8 instead of Ubuntu, you can set the following variables to install and configure MariaDB instead of MySQL:
 
 ```yaml
 mysql_packages:
diff --git a/docs/configurations/php.md b/docs/configurations/php.md
index 08d64c62b..34d72583c 100644
--- a/docs/configurations/php.md
+++ b/docs/configurations/php.md
@@ -8,11 +8,11 @@ If you're using Apache with `mod_php` you should also add `libapache2-mod-php{{
 
 _Note: XHProf does currently not work with PHP 7.1+, make sure you don't have it listed in `installed_extras`._
 
-## RedHat/CentOS 7 or 8
+## RedHat/CentOS 8
 
 Remi's RPM repository is included with Drupal VM, and you can make the following changes to use it to install a different version of PHP than 7.4:
 
-  1. Make sure you've followed the directions for switching to CentOS 7 in the [use a different base OS](base-os.md) guide.
+  1. Make sure you've followed the directions for switching to CentOS 8 in the [use a different base OS](base-os.md) guide.
   2. Change `php_version` inside `config.yml` to `"7.2"` or `"7.3"`.
 
 ## PHP 5.6 EOL
diff --git a/docs/other/production.md b/docs/other/production.md
index 1962a1065..5d2ce7d67 100644
--- a/docs/other/production.md
+++ b/docs/other/production.md
@@ -162,6 +162,6 @@ After a few minutes, your Drupal-VM-in-the-cloud Droplet should be fully configu
 
 ### Go Further
 
-You can use Ubuntu Ubuntu 18.04, Ubuntu 16.04, Debian 9, or CentOS 7 when you build the DigitalOcean Droplet. Just like with Drupal VM running locally, you can customize almost every aspect of the server!
+You can use Ubuntu Ubuntu 18.04, Debian 10, or CentOS 8 when you build the DigitalOcean Droplet. Just like with Drupal VM running locally, you can customize almost every aspect of the server!
 
 You may want to customize your configuration even further, to make sure Drupal VM is tuned for your specific Drupal site's needs, or you may want to change things and make the server configuration more flexible, etc. For all that, the book [Ansible for DevOps](http://ansiblefordevops.com/) will give you a great introduction to using Ansible to make Drupal VM and the included Ansible configuration do exactly what you need!
diff --git a/docs/other/vagrant-lxc.md b/docs/other/vagrant-lxc.md
index d1422b88b..1d9c056ac 100644
--- a/docs/other/vagrant-lxc.md
+++ b/docs/other/vagrant-lxc.md
@@ -27,12 +27,6 @@ Read more about how to configure the container in [`vagrant-lxc`'s README.md](ht
 
 The following boxes have been tested only minimally, choose which one you want.
 
-    # Centos 7
-    vagrant_box: frensjan/centos-7-64-lxc
-
-    # Ubuntu 16.04
-    vagrant_box: nhinds/xenial64
-
     # Do not interact with the UFW service on Ubuntu.
     drupalvm_disable_ufw_firewall: false
 
diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index c691f02ec..d95513c34 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -20,30 +20,18 @@ tag="${tag:-latest}"
 cleanup="${cleanup:-true}"
 
 ## Set up vars for Docker setup.
-# CentOS 7
-if [ $distro = 'centos7' ]; then
-  init="/usr/lib/systemd/systemd"
-  opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
 # CentOS 8
-elif [ $distro = 'centos8' ]; then
+if [ $distro = 'centos8' ]; then
   init="/usr/lib/systemd/systemd"
   opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
 # Ubuntu 18.04
 elif [ $distro = 'ubuntu1804' ]; then
   init="/lib/systemd/systemd"
   opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-# Ubuntu 16.04
-elif [ $distro = 'ubuntu1604' ]; then
-  init="/lib/systemd/systemd"
-  opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
 # Debian 10
 elif [ $distro = 'debian10' ]; then
   init="/lib/systemd/systemd"
   opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-# Debian 9
-elif [ $distro = 'debian9' ]; then
-  init="/lib/systemd/systemd"
-  opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
 fi
 
 # Set OS-specific options.

From f8899c1db35af24764cf7e3d41afbed8456f5268 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 6 Jul 2020 11:08:28 -0500
Subject: [PATCH 1191/1273] Issue #2065: Drop the extra python 2 settings in
 tests for Debian and CentOS.

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ea49e38bb..cefd44b75 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,12 +23,10 @@ env:
     # Defaults - Debian 10.
     - type: debian
       distro: debian10
-      ANSIBLE_PYTHON_INTERPRETER: /usr/bin/python
     # Defaults - CentOS 8.
     - type: centos
       distro: centos8
       local_config: tests/centos-8.config.yml
-      ANSIBLE_PYTHON_INTERPRETER: /usr/bin/python
 
     # PHP 7.3 - Ubuntu 18.04.
     - type: defaults

From 29937e4ca8083510e66a8d163bd8b902a602f681 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 6 Jul 2020 11:12:49 -0500
Subject: [PATCH 1192/1273] Issue #2065: Fix python pycurl package for CentOS
 8.

---
 provisioning/tasks/init-RedHat.yml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/provisioning/tasks/init-RedHat.yml b/provisioning/tasks/init-RedHat.yml
index 3b231a9f2..415742d61 100644
--- a/provisioning/tasks/init-RedHat.yml
+++ b/provisioning/tasks/init-RedHat.yml
@@ -1,19 +1,21 @@
 ---
 - name: Install required dependencies.
-  yum: "name={{ item }} state=present"
-  with_items:
-    - curl
-    - python-pycurl
-    - unzip
-    - make
-    - gcc
+  yum:
+    name:
+      - curl
+      - python3-pycurl
+      - unzip
+      - make
+      - gcc
+    state: present
 
 - name: Enable remi repo for MySQL.
-  set_fact: mysql_enablerepo="remi"
+  set_fact:
+    mysql_enablerepo: remi
   when: mysql_enablerepo is not defined or mysql_enablerepo == ""
 
 - name: Define php_xhprof_html_dir.
   set_fact:
-    php_xhprof_html_dir: "/usr/share/pear/xhprof_html"
+    php_xhprof_html_dir: /usr/share/pear/xhprof_html
   when: php_xhprof_html_dir is not defined
   tags: ['webserver']

From fd7332971d52f40fb0a2d722d6ddb759bc602dd4 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 7 Jul 2020 18:50:29 -0500
Subject: [PATCH 1193/1273] Update Varnish role to work on CentOS 8.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.varnish/.travis.yml     |  2 +-
 .../roles/geerlingguy.varnish/README.md       |  4 ++--
 .../roles/geerlingguy.varnish/meta/main.yml   |  2 +-
 .../molecule/default/converge.yml             |  8 -------
 .../tasks/setup-RedHat.yml                    | 24 +++++++++++++++----
 6 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index e80df2c09..63609bcf0 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -79,4 +79,4 @@ roles:
   - name: geerlingguy.solr
     version: 5.1.0
   - name: geerlingguy.varnish
-    version: 3.2.0
+    version: 3.3.0
diff --git a/provisioning/roles/geerlingguy.varnish/.travis.yml b/provisioning/roles/geerlingguy.varnish/.travis.yml
index b3a77c1af..917d1be3d 100644
--- a/provisioning/roles/geerlingguy.varnish/.travis.yml
+++ b/provisioning/roles/geerlingguy.varnish/.travis.yml
@@ -6,7 +6,7 @@ env:
   global:
     - ROLE_NAME: varnish
   matrix:
-    # - MOLECULE_DISTRO: centos8
+    - MOLECULE_DISTRO: centos8
     - MOLECULE_DISTRO: centos7
     - MOLECULE_DISTRO: ubuntu1804
     - MOLECULE_DISTRO: ubuntu1604
diff --git a/provisioning/roles/geerlingguy.varnish/README.md b/provisioning/roles/geerlingguy.varnish/README.md
index 2b60e9a48..fc48da7f7 100644
--- a/provisioning/roles/geerlingguy.varnish/README.md
+++ b/provisioning/roles/geerlingguy.varnish/README.md
@@ -16,9 +16,9 @@ Available variables are listed below, along with default values (see `defaults/m
 
 Varnish package name you want to install. See `apt-cache policy varnish` or `yum list varnish` for a listing of available candidates.
 
-    varnish_version: "6.1"
+    varnish_version: "6.4"
 
-Varnish version that should be installed. See the [Varnish Cache packagecloud.io repositories](https://packagecloud.io/varnishcache) for a listing of available versions. Some examples include: `6.1`, `6.0`, `5.1`, `4.1`, `3.0`, and `2.1`.
+Varnish version that should be installed. See the [Varnish Cache packagecloud.io repositories](https://packagecloud.io/varnishcache) for a listing of available versions. Some examples include: `6.4`, `6.3`, `6.1`, `4.1`, `3.0`, and `2.1`.
 
     varnish_config_path: /etc/varnish
 
diff --git a/provisioning/roles/geerlingguy.varnish/meta/main.yml b/provisioning/roles/geerlingguy.varnish/meta/main.yml
index 77a6c1dfa..7a5525325 100644
--- a/provisioning/roles/geerlingguy.varnish/meta/main.yml
+++ b/provisioning/roles/geerlingguy.varnish/meta/main.yml
@@ -13,7 +13,7 @@ galaxy_info:
       versions:
         - 6
         - 7
-        # - 8
+        - 8
     - name: Ubuntu
       versions:
         - precise
diff --git a/provisioning/roles/geerlingguy.varnish/molecule/default/converge.yml b/provisioning/roles/geerlingguy.varnish/molecule/default/converge.yml
index 34102ece4..78923beaf 100644
--- a/provisioning/roles/geerlingguy.varnish/molecule/default/converge.yml
+++ b/provisioning/roles/geerlingguy.varnish/molecule/default/converge.yml
@@ -6,14 +6,6 @@
   pre_tasks:
     - import_tasks: playbook-setup.yml
 
-    - name: Set older Varnish version for older OSes.
-      set_fact:
-        varnish_version: "5.1"
-      when: >
-        (ansible_os_family == 'RedHat' and ansible_distribution_major_version|int < 7) or
-        (ansible_distribution == 'Ubuntu' and ansible_distribution_major_version|int < 16) or
-        (ansible_distribution == 'Debian' and ansible_distribution_major_version|int < 9)
-
   roles:
     - role: geerlingguy.varnish
 
diff --git a/provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml
index bcaa869aa..e5707c20e 100644
--- a/provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml
@@ -1,11 +1,15 @@
 ---
-- name: Ensure Varnish dependencies are installed.
+- name: Ensure Varnish dependency is installed.
   yum:
-    name:
-      - yum-utils
-      - pygpgme
+    name: yum-utils
     state: present
 
+- name: Ensure extra Varnish dependency on older RHEL versions is installed.
+  yum:
+    name: pygpgme
+    state: present
+  when: ansible_distribution_major_version | int < 8
+
 - name: Add Varnish packagecloud.io yum repo.
   yum_repository:
     name: varnishcache_{{ varnish_packagecloud_repo }}
@@ -21,12 +25,22 @@
   register: varnish_packagecloud_repo_addition
 
 - name: Refresh yum metadata cache if repo changed.
-  command: yum clean metadata
+  command: >
+    yum -q makecache -y --disablerepo='*' --enablerepo='varnishcache_{{ varnish_packagecloud_repo }}'
   args:
     warn: false
   when: varnish_packagecloud_repo_addition.changed
   tags: ['skip_ansible_lint']
 
+- name: Disable varnish AppStream in RHEL 8.
+  command: dnf module disable -y varnish
+  args:
+    warn: false
+  when:
+    - varnish_packagecloud_repo_addition.changed
+    - ansible_distribution_major_version | int == 8
+  tags: ['skip_ansible_lint']
+
 - name: Ensure Varnish is installed.
   yum:
     name: "{{ varnish_package_name }}"

From 4b032e187121d4ce9fe51c289552775bb601f00e Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 7 Jul 2020 18:58:27 -0500
Subject: [PATCH 1194/1273] Issue #2066: Fix Postfix service failure on centos8
 container.

---
 tests/{centos-7.config.yml => centos-8.config.yml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename tests/{centos-7.config.yml => centos-8.config.yml} (100%)

diff --git a/tests/centos-7.config.yml b/tests/centos-8.config.yml
similarity index 100%
rename from tests/centos-7.config.yml
rename to tests/centos-8.config.yml

From 7381659583e9d5972a29d09c2884c7154dd115fb Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 7 Jul 2020 19:14:26 -0500
Subject: [PATCH 1195/1273] Fixes #2059: Add note about new URL in later
 versions of Drupal VM under Windows intro.

---
 docs/getting-started/installation-windows.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/getting-started/installation-windows.md b/docs/getting-started/installation-windows.md
index f39e2b8cc..712af9fbd 100644
--- a/docs/getting-started/installation-windows.md
+++ b/docs/getting-started/installation-windows.md
@@ -2,7 +2,7 @@ Please read through the [Quick Start Guide in the README](https://github.com/gee
 
 <iframe width="560" height="315" src="https://www.youtube.com/embed/mNio_aXMLos" frameborder="0" allowfullscreen></iframe>
 
-_In this video, Jeff Geerling walks through setting up a Drupal 8 website on Windows 10 using Drupal VM 3._
+_In this video, Jeff Geerling walks through setting up a Drupal 8 website on Windows 10 using Drupal VM 3. Note that Drupal VM has changed a bit in versions 4+, and one major change is the default URL for Drupal VM is now **drupalvm.test** (not **drupalvm.dev** as mentioned in the video)._
 
 There are a few caveats when using Drupal VM on Windows, and this page will try to identify the main gotchas or optimization tips for those wishing to use Drupal VM on a Windows host.
 

From 0257c5dfaaca71f2125d3076976b143a4fd63a86 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 14 Jul 2020 12:07:45 -0500
Subject: [PATCH 1196/1273] Issue #2068: Update CHANGELOG for Drupal VM 6.0.0.

---
 CHANGELOG.md | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c58b9e8e9..dc2a862a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,45 @@
 # Drupal VM Changelog
 
+## 6.0.0 "Rectifier" (2020-07-14)
+
+Drupal VM 6 drops support for some older OS distributions, to increase stability under the latest versions of Ubuntu, CentOS, and Debian, and to finally drop all support for the now-unsupported Python 2.
+
+The Drupal VM Docker container image is now based on Debian 10 Buster, though the default Drupal VM box when running as a VirtualBox VM is still based on Ubuntu 18.04.
+
+The default PHP version is now PHP 7.4, which works great with all the latest versions of Drupal 7, 8, and 9.
+
+### Breaking Changes
+
+  * #2065: Drop official support for Debian 9, CentOS 7, and Ubuntu 16.04 and Python 2.
+  * #2061: Default to PHP 7.4.
+  * Drupal VM Docker container now based on Debian 10 Buster.
+
+### New/changed variables in default.config.yml
+
+  * Removed `centos7`, `debian9`, and `ubuntu1604` from `vagrant_box` options.
+  * `ansible_python_interpreter` now defaults to `python3` (was `/usr/bin/python3`).
+  * `drupal_composer_dependencies` now includes both `"drush/drush:^10"` and `"drupal/devel:^4.0"`.
+  * `drupal_composer_project_package` now defaults to the recommended Drupal project: `"drupal/recommended-project:^9@dev"`.
+  * `drupal_major_version` is now `9` (was `8`).
+  * `php_version` is now `"7.4"` (was `"7.2"`).
+  * Added `php_xdebug_version: 2.9.5`.
+
+### Improvements
+
+  * #2050: Default to Drupal 9.
+  * #1997: Include `php_xdebug_version` in default config for visibility.
+  * Updated roles: varnish, solr, elasticsearch, java, memcached, postgresql, adminer, php, drupal.
+
+### Bugfixes
+
+  * #2041: Point to Python 3 interpreter in `$PATH`.
+  * #2062: Allow Composer to use more memory since it runs out at 1.5 GB.
+  * #2063: Update Devel version to work with Drupal 9.
+  * #2064: Explicitly require Drush on new sites to work with Drupal 9.
+  * #2066: Fix postfix service failure on CentOS 8 test container.
+  * #2059: Improve docs for Windows usage.
+
+
 ## 5.2.0 "The Game Has Changed" (2020-03-20)
 
 This release defaults to Python 3 for all Ansible-related tasks, which means some older OSes require a new variable to be overridden to work correctly. For most users, no change is required, however. The release also updates the order in which Postgresql updates

From 10908bb300a9340e0c92fa36f703a649503128ad Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 20 Jul 2020 21:23:27 -0500
Subject: [PATCH 1197/1273] Update security role to latest version.

---
 provisioning/requirements.yml                 |  2 +-
 .../geerlingguy.security/.github/stale.yml    | 56 +++++++++++++++++++
 .../roles/geerlingguy.security/.travis.yml    |  2 +-
 .../default/yaml-lint.yml => .yamllint}       |  0
 .../roles/geerlingguy.security/README.md      | 10 +++-
 .../geerlingguy.security/defaults/main.yml    |  2 +
 .../geerlingguy.security/handlers/main.yml    |  4 +-
 .../roles/geerlingguy.security/meta/main.yml  |  1 +
 .../default/{playbook.yml => converge.yml}    | 12 ++--
 .../molecule/default/molecule.yml             | 18 ++----
 .../tasks/autoupdate-Debian.yml               |  4 +-
 .../tasks/fail2ban-Debian.yml                 |  3 -
 .../tasks/fail2ban-RedHat.yml                 |  3 -
 .../geerlingguy.security/tasks/fail2ban.yml   | 27 +++++++++
 .../roles/geerlingguy.security/tasks/main.yml | 13 +----
 .../roles/geerlingguy.security/tasks/ssh.yml  |  6 ++
 .../templates/jail.local.j2                   |  4 ++
 17 files changed, 126 insertions(+), 41 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.security/.github/stale.yml
 rename provisioning/roles/geerlingguy.security/{molecule/default/yaml-lint.yml => .yamllint} (100%)
 rename provisioning/roles/geerlingguy.security/molecule/default/{playbook.yml => converge.yml} (77%)
 delete mode 100644 provisioning/roles/geerlingguy.security/tasks/fail2ban-Debian.yml
 delete mode 100644 provisioning/roles/geerlingguy.security/tasks/fail2ban-RedHat.yml
 create mode 100644 provisioning/roles/geerlingguy.security/tasks/fail2ban.yml
 create mode 100644 provisioning/roles/geerlingguy.security/templates/jail.local.j2

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 63609bcf0..e4b199e09 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -75,7 +75,7 @@ roles:
   - name: geerlingguy.ruby
     version: 2.6.0
   - name: geerlingguy.security
-    version: 1.9.0
+    version: 2.0.0
   - name: geerlingguy.solr
     version: 5.1.0
   - name: geerlingguy.varnish
diff --git a/provisioning/roles/geerlingguy.security/.github/stale.yml b/provisioning/roles/geerlingguy.security/.github/stale.yml
new file mode 100644
index 000000000..c7ff12754
--- /dev/null
+++ b/provisioning/roles/geerlingguy.security/.github/stale.yml
@@ -0,0 +1,56 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 90
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 30
+
+# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
+onlyLabels: []
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - pinned
+  - security
+  - planned
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: false
+
+# Label to use when marking as stale
+staleLabel: stale
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+pulls:
+  markComment: |-
+    This pull request has been marked 'stale' due to lack of recent activity. If there is no further activity, the PR will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark pull requests as stale.
+
+  unmarkComment: >-
+    This pull request is no longer marked for closure.
+
+  closeComment: >-
+    This pull request has been closed due to inactivity. If you feel this is in error, please reopen the pull request or file a new PR with the relevant details.
+
+issues:
+  markComment: |-
+    This issue has been marked 'stale' due to lack of recent activity. If there is no further activity, the issue will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark issues as stale.
+
+  unmarkComment: >-
+    This issue is no longer marked for closure.
+
+  closeComment: >-
+    This issue has been closed due to inactivity. If you feel this is in error, please reopen the issue or file a new issue with the relevant details.
diff --git a/provisioning/roles/geerlingguy.security/.travis.yml b/provisioning/roles/geerlingguy.security/.travis.yml
index c8b034098..a64630f9c 100644
--- a/provisioning/roles/geerlingguy.security/.travis.yml
+++ b/provisioning/roles/geerlingguy.security/.travis.yml
@@ -13,7 +13,7 @@ env:
 
 install:
   # Install test dependencies.
-  - pip install molecule docker
+  - pip install molecule yamllint ansible-lint docker
 
 before_script:
   # Use actual Ansible Galaxy role name for the project directory.
diff --git a/provisioning/roles/geerlingguy.security/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.security/.yamllint
similarity index 100%
rename from provisioning/roles/geerlingguy.security/molecule/default/yaml-lint.yml
rename to provisioning/roles/geerlingguy.security/.yamllint
diff --git a/provisioning/roles/geerlingguy.security/README.md b/provisioning/roles/geerlingguy.security/README.md
index ff626007a..7fd432c12 100644
--- a/provisioning/roles/geerlingguy.security/README.md
+++ b/provisioning/roles/geerlingguy.security/README.md
@@ -44,6 +44,10 @@ The port through which you'd like SSH to be accessible. The default is port 22,
 
 Security settings for SSH authentication. It's best to leave these set to `"no"`, but there are times (especially during initial server configuration or when you don't have key-based authentication in place) when one or all may be safely set to `'yes'`. **NOTE: It is _very_ important that you quote the 'yes' or 'no' values. Failure to do so may lock you out of your server.**
 
+    security_sshd_state: started
+
+The state of the SSH daemon. Typically this should remain `started`.
+
     security_ssh_restart_handler_state: restarted
 
 The state of the `restart ssh` handler. Typically this should remain `restarted`.
@@ -76,7 +80,11 @@ Whether to install/enable `yum-cron` (RedHat-based systems) or `unattended-upgra
 
     security_fail2ban_enabled: true
 
-Wether to install/enable `fail2ban`. You might not want to use fail2ban if you're already using some other service for login and intrusion detection (e.g. [ConfigServer](http://configserver.com/cp/csf.html)).
+Whether to install/enable `fail2ban`. You might not want to use fail2ban if you're already using some other service for login and intrusion detection (e.g. [ConfigServer](http://configserver.com/cp/csf.html)).
+
+    security_fail2ban_custom_configuration_template: "jail.local.j2"
+
+The name of the template file used to generate `fail2ban`'s configuration.
 
 ## Dependencies
 
diff --git a/provisioning/roles/geerlingguy.security/defaults/main.yml b/provisioning/roles/geerlingguy.security/defaults/main.yml
index 83bccbdb8..74e30ae5f 100644
--- a/provisioning/roles/geerlingguy.security/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.security/defaults/main.yml
@@ -7,6 +7,7 @@ security_ssh_permit_empty_password: "no"
 security_ssh_challenge_response_auth: "no"
 security_ssh_gss_api_authentication: "no"
 security_ssh_x11_forwarding: "no"
+security_sshd_state: started
 security_ssh_restart_handler_state: restarted
 
 security_sudoers_passwordless: []
@@ -22,3 +23,4 @@ security_autoupdate_mail_to: ""
 security_autoupdate_mail_on_error: true
 
 security_fail2ban_enabled: true
+security_fail2ban_custom_configuration_template: "jail.local.j2"
diff --git a/provisioning/roles/geerlingguy.security/handlers/main.yml b/provisioning/roles/geerlingguy.security/handlers/main.yml
index ca6f17641..1ac640aa1 100644
--- a/provisioning/roles/geerlingguy.security/handlers/main.yml
+++ b/provisioning/roles/geerlingguy.security/handlers/main.yml
@@ -1,3 +1,5 @@
 ---
 - name: restart ssh
-  service: "name={{ security_sshd_name }} state={{ security_ssh_restart_handler_state }}"
+  service:
+    name: "{{ security_sshd_name }}"
+    state: "{{ security_ssh_restart_handler_state }}"
diff --git a/provisioning/roles/geerlingguy.security/meta/main.yml b/provisioning/roles/geerlingguy.security/meta/main.yml
index adf847b65..8d598d3c0 100644
--- a/provisioning/roles/geerlingguy.security/meta/main.yml
+++ b/provisioning/roles/geerlingguy.security/meta/main.yml
@@ -2,6 +2,7 @@
 dependencies: []
 
 galaxy_info:
+  role_name: security
   author: geerlingguy
   description: Security software installation and configuration.
   company: "Midwestern Mac, LLC"
diff --git a/provisioning/roles/geerlingguy.security/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.security/molecule/default/converge.yml
similarity index 77%
rename from provisioning/roles/geerlingguy.security/molecule/default/playbook.yml
rename to provisioning/roles/geerlingguy.security/molecule/default/converge.yml
index 0b8187715..d191e1432 100644
--- a/provisioning/roles/geerlingguy.security/molecule/default/playbook.yml
+++ b/provisioning/roles/geerlingguy.security/molecule/default/converge.yml
@@ -5,7 +5,9 @@
 
   pre_tasks:
     - name: Update apt cache.
-      package: update_cache=true cache_valid_time=600
+      package:
+        update_cache: true
+        cache_valid_time: 600
       when: ansible_os_family == 'Debian'
 
     - name: Ensure build dependencies are installed (RedHat).
@@ -17,7 +19,9 @@
       when: ansible_os_family == 'RedHat'
 
     - name: Ensure build dependencies are installed (Fedora).
-      package: name=procps state=present
+      package:
+        name: procps
+        state: present
       when: ansible_distribution == 'Fedora'
 
     - name: Ensure build dependencies are installed (Debian).
@@ -33,9 +37,7 @@
         dest: /var/log/auth.log
         content: ""
         force: false
-      when: >
-        (ansible_distribution == 'Ubuntu' and ansible_distribution_version == '14.04') or
-        (ansible_distribution == 'Debian')
+      when: ansible_distribution == 'Debian'
 
   roles:
     - role: geerlingguy.security
diff --git a/provisioning/roles/geerlingguy.security/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.security/molecule/default/molecule.yml
index 2ca6feaf9..2da47dd1f 100644
--- a/provisioning/roles/geerlingguy.security/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.security/molecule/default/molecule.yml
@@ -3,10 +3,10 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
-  options:
-    config-file: molecule/default/yaml-lint.yml
+lint: |
+  set -e
+  yamllint .
+  ansible-lint
 platforms:
   - name: instance
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
@@ -17,13 +17,5 @@ platforms:
     pre_build_image: true
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
   playbooks:
-    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
-scenario:
-  name: default
-verifier:
-  name: testinfra
-  lint:
-    name: flake8
+    converge: ${MOLECULE_PLAYBOOK:-converge.yml}
diff --git a/provisioning/roles/geerlingguy.security/tasks/autoupdate-Debian.yml b/provisioning/roles/geerlingguy.security/tasks/autoupdate-Debian.yml
index e418e053b..05aebb783 100644
--- a/provisioning/roles/geerlingguy.security/tasks/autoupdate-Debian.yml
+++ b/provisioning/roles/geerlingguy.security/tasks/autoupdate-Debian.yml
@@ -1,6 +1,8 @@
 ---
 - name: Install unattended upgrades package.
-  package: name=unattended-upgrades state=present
+  package:
+    name: unattended-upgrades
+    state: present
 
 - name: Copy unattended-upgrades configuration files in place.
   template:
diff --git a/provisioning/roles/geerlingguy.security/tasks/fail2ban-Debian.yml b/provisioning/roles/geerlingguy.security/tasks/fail2ban-Debian.yml
deleted file mode 100644
index ae644edfc..000000000
--- a/provisioning/roles/geerlingguy.security/tasks/fail2ban-Debian.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-- name: Install fail2ban.
-  package: name=fail2ban state=present
diff --git a/provisioning/roles/geerlingguy.security/tasks/fail2ban-RedHat.yml b/provisioning/roles/geerlingguy.security/tasks/fail2ban-RedHat.yml
deleted file mode 100644
index f725c8437..000000000
--- a/provisioning/roles/geerlingguy.security/tasks/fail2ban-RedHat.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-- name: Install fail2ban.
-  package: name=fail2ban state=present enablerepo=epel
diff --git a/provisioning/roles/geerlingguy.security/tasks/fail2ban.yml b/provisioning/roles/geerlingguy.security/tasks/fail2ban.yml
new file mode 100644
index 000000000..1fab2f456
--- /dev/null
+++ b/provisioning/roles/geerlingguy.security/tasks/fail2ban.yml
@@ -0,0 +1,27 @@
+---
+- name: Install fail2ban (RedHat).
+  package:
+    name: fail2ban
+    state: present
+    enablerepo: epel
+  when: ansible_os_family == 'RedHat'
+
+- name: Install fail2ban (Debian).
+  package:
+    name: fail2ban
+    state: present
+  when: ansible_os_family == 'Debian'
+
+- name: Copy fail2ban custom configuration file into place.
+  template:
+    src: "{{ security_fail2ban_custom_configuration_template }}"
+    dest: /etc/fail2ban/jail.local
+    owner: root
+    group: root
+    mode: 0644
+
+- name: Ensure fail2ban is running and enabled on boot.
+  service:
+    name: fail2ban
+    state: started
+    enabled: true
diff --git a/provisioning/roles/geerlingguy.security/tasks/main.yml b/provisioning/roles/geerlingguy.security/tasks/main.yml
index 402404e3f..24e586063 100644
--- a/provisioning/roles/geerlingguy.security/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.security/tasks/main.yml
@@ -3,18 +3,7 @@
   include_vars: "{{ ansible_os_family }}.yml"
 
 # Fail2Ban
-- include_tasks: fail2ban-RedHat.yml
-  when:
-    - ansible_os_family == 'RedHat'
-    - security_fail2ban_enabled | bool
-
-- include_tasks: fail2ban-Debian.yml
-  when:
-    - ansible_os_family == 'Debian'
-    - security_fail2ban_enabled | bool
-
-- name: Ensure fail2ban is running and enabled on boot.
-  service: name=fail2ban state=started enabled=yes
+- include_tasks: fail2ban.yml
   when: security_fail2ban_enabled | bool
 
 # SSH
diff --git a/provisioning/roles/geerlingguy.security/tasks/ssh.yml b/provisioning/roles/geerlingguy.security/tasks/ssh.yml
index 0f85032c3..96c7053d8 100644
--- a/provisioning/roles/geerlingguy.security/tasks/ssh.yml
+++ b/provisioning/roles/geerlingguy.security/tasks/ssh.yml
@@ -1,10 +1,16 @@
 ---
+- name: Ensure SSH daemon is running.
+  service:
+    name: "{{ security_sshd_name }}"
+    state: "{{ security_sshd_state }}"
+
 - name: Update SSH configuration to be more secure.
   lineinfile:
     dest: "{{ security_ssh_config_path }}"
     regexp: "{{ item.regexp }}"
     line: "{{ item.line }}"
     state: present
+    validate: 'sshd -T -f %s'
   with_items:
     - regexp: "^PasswordAuthentication"
       line: "PasswordAuthentication {{ security_ssh_password_authentication }}"
diff --git a/provisioning/roles/geerlingguy.security/templates/jail.local.j2 b/provisioning/roles/geerlingguy.security/templates/jail.local.j2
new file mode 100644
index 000000000..de9b947f6
--- /dev/null
+++ b/provisioning/roles/geerlingguy.security/templates/jail.local.j2
@@ -0,0 +1,4 @@
+[sshd]
+enabled = true
+port    = {{ security_ssh_port }}
+filter  = sshd

From 9899e8c88c4c0217a1376eecc4ca7939f017f0f2 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 22 Jul 2020 09:13:42 -0500
Subject: [PATCH 1198/1273] Update nginx role to latest version.

---
 provisioning/requirements.yml                 |  2 +-
 .../geerlingguy.nginx/.github/FUNDING.yml     |  4 ++
 .../roles/geerlingguy.nginx/.github/stale.yml | 56 +++++++++++++++++++
 .../roles/geerlingguy.nginx/.travis.yml       |  8 +--
 .../default/yaml-lint.yml => .yamllint}       |  0
 .../roles/geerlingguy.nginx/meta/main.yml     |  3 +
 .../default/{playbook.yml => converge.yml}    |  0
 .../molecule/default/molecule.yml             | 18 ++----
 .../geerlingguy.nginx/tasks/setup-FreeBSD.yml |  2 +
 .../geerlingguy.nginx/tasks/setup-Ubuntu.yml  |  7 ++-
 10 files changed, 81 insertions(+), 19 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.nginx/.github/FUNDING.yml
 create mode 100644 provisioning/roles/geerlingguy.nginx/.github/stale.yml
 rename provisioning/roles/geerlingguy.nginx/{molecule/default/yaml-lint.yml => .yamllint} (100%)
 rename provisioning/roles/geerlingguy.nginx/molecule/default/{playbook.yml => converge.yml} (100%)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index e4b199e09..bda1378cb 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -39,7 +39,7 @@ roles:
   - name: geerlingguy.mysql
     version: 3.1.0
   - name: geerlingguy.nginx
-    version: 2.7.0
+    version: 2.8.0
   - name: geerlingguy.nodejs
     version: 5.1.1
   - name: geerlingguy.php
diff --git a/provisioning/roles/geerlingguy.nginx/.github/FUNDING.yml b/provisioning/roles/geerlingguy.nginx/.github/FUNDING.yml
new file mode 100644
index 000000000..96b493831
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nginx/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+---
+github: geerlingguy
+patreon: geerlingguy
diff --git a/provisioning/roles/geerlingguy.nginx/.github/stale.yml b/provisioning/roles/geerlingguy.nginx/.github/stale.yml
new file mode 100644
index 000000000..c7ff12754
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nginx/.github/stale.yml
@@ -0,0 +1,56 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 90
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 30
+
+# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
+onlyLabels: []
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - pinned
+  - security
+  - planned
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: false
+
+# Label to use when marking as stale
+staleLabel: stale
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+pulls:
+  markComment: |-
+    This pull request has been marked 'stale' due to lack of recent activity. If there is no further activity, the PR will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark pull requests as stale.
+
+  unmarkComment: >-
+    This pull request is no longer marked for closure.
+
+  closeComment: >-
+    This pull request has been closed due to inactivity. If you feel this is in error, please reopen the pull request or file a new PR with the relevant details.
+
+issues:
+  markComment: |-
+    This issue has been marked 'stale' due to lack of recent activity. If there is no further activity, the issue will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark issues as stale.
+
+  unmarkComment: >-
+    This issue is no longer marked for closure.
+
+  closeComment: >-
+    This issue has been closed due to inactivity. If you feel this is in error, please reopen the issue or file a new issue with the relevant details.
diff --git a/provisioning/roles/geerlingguy.nginx/.travis.yml b/provisioning/roles/geerlingguy.nginx/.travis.yml
index e6805d406..67fd08d80 100644
--- a/provisioning/roles/geerlingguy.nginx/.travis.yml
+++ b/provisioning/roles/geerlingguy.nginx/.travis.yml
@@ -6,14 +6,14 @@ env:
   global:
     - ROLE_NAME: nginx
   matrix:
-    - MOLECULE_DISTRO: centos7
+    - MOLECULE_DISTRO: centos8
+    - MOLECULE_DISTRO: ubuntu2004
     - MOLECULE_DISTRO: ubuntu1804
-    - MOLECULE_DISTRO: ubuntu1604
-    - MOLECULE_DISTRO: debian9
+    - MOLECULE_DISTRO: debian10
 
 install:
   # Install test dependencies.
-  - pip install molecule docker
+  - pip install molecule yamllint ansible-lint docker
 
 before_script:
   # Use actual Ansible Galaxy role name for the project directory.
diff --git a/provisioning/roles/geerlingguy.nginx/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.nginx/.yamllint
similarity index 100%
rename from provisioning/roles/geerlingguy.nginx/molecule/default/yaml-lint.yml
rename to provisioning/roles/geerlingguy.nginx/.yamllint
diff --git a/provisioning/roles/geerlingguy.nginx/meta/main.yml b/provisioning/roles/geerlingguy.nginx/meta/main.yml
index b258974df..aaff40d4c 100644
--- a/provisioning/roles/geerlingguy.nginx/meta/main.yml
+++ b/provisioning/roles/geerlingguy.nginx/meta/main.yml
@@ -2,6 +2,7 @@
 dependencies: []
 
 galaxy_info:
+  role_name: nginx
   author: geerlingguy
   description: Nginx installation for Linux, FreeBSD and OpenBSD.
   company: "Midwestern Mac, LLC"
@@ -12,6 +13,7 @@ galaxy_info:
       versions:
         - 6
         - 7
+        - 8
     - name: Debian
       versions:
         - all
@@ -19,6 +21,7 @@ galaxy_info:
       versions:
         - trusty
         - xenial
+        - focal
     - name: Archlinux
       versions:
         - all
diff --git a/provisioning/roles/geerlingguy.nginx/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.nginx/molecule/default/converge.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.nginx/molecule/default/playbook.yml
rename to provisioning/roles/geerlingguy.nginx/molecule/default/converge.yml
diff --git a/provisioning/roles/geerlingguy.nginx/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.nginx/molecule/default/molecule.yml
index 2ca6feaf9..2da47dd1f 100644
--- a/provisioning/roles/geerlingguy.nginx/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.nginx/molecule/default/molecule.yml
@@ -3,10 +3,10 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
-  options:
-    config-file: molecule/default/yaml-lint.yml
+lint: |
+  set -e
+  yamllint .
+  ansible-lint
 platforms:
   - name: instance
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
@@ -17,13 +17,5 @@ platforms:
     pre_build_image: true
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
   playbooks:
-    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
-scenario:
-  name: default
-verifier:
-  name: testinfra
-  lint:
-    name: flake8
+    converge: ${MOLECULE_PLAYBOOK:-converge.yml}
diff --git a/provisioning/roles/geerlingguy.nginx/tasks/setup-FreeBSD.yml b/provisioning/roles/geerlingguy.nginx/tasks/setup-FreeBSD.yml
index a624936e8..f4614f630 100644
--- a/provisioning/roles/geerlingguy.nginx/tasks/setup-FreeBSD.yml
+++ b/provisioning/roles/geerlingguy.nginx/tasks/setup-FreeBSD.yml
@@ -1,6 +1,8 @@
 ---
 - name: Update pkg cache.
   command: pkg update -f
+  environment:
+    ASSUME_ALWAYS_YES: "yes"
   tags: ['skip_ansible_lint']
 
 - name: Ensure nginx is installed.
diff --git a/provisioning/roles/geerlingguy.nginx/tasks/setup-Ubuntu.yml b/provisioning/roles/geerlingguy.nginx/tasks/setup-Ubuntu.yml
index 2fba70ad7..5e08aff0e 100644
--- a/provisioning/roles/geerlingguy.nginx/tasks/setup-Ubuntu.yml
+++ b/provisioning/roles/geerlingguy.nginx/tasks/setup-Ubuntu.yml
@@ -1,4 +1,9 @@
 ---
+- name: Ensure dirmngr is installed (gnupg dependency).
+  apt:
+    name: dirmngr
+    state: present
+
 - name: Add PPA for Nginx.
   apt_repository:
     repo: 'ppa:nginx/{{ nginx_ppa_version }}'
@@ -11,5 +16,5 @@
   apt:
     name: nginx
     state: absent
-  when: nginx_ppa_added.changed
+  when: nginx_ppa_added is changed
   tags: ['skip_ansible_lint']

From 922e536fb17caf4474877bf5531a1449330aa68f Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 23 Jul 2020 12:31:27 -0500
Subject: [PATCH 1199/1273] Update mysql role to the latest version.

---
 provisioning/requirements.yml                                | 2 +-
 provisioning/roles/geerlingguy.mysql/README.md               | 4 ++--
 provisioning/roles/geerlingguy.mysql/defaults/main.yml       | 2 ++
 provisioning/roles/geerlingguy.mysql/meta/main.yml           | 1 +
 .../roles/geerlingguy.mysql/molecule/default/converge.yml    | 3 ---
 provisioning/roles/geerlingguy.mysql/tasks/setup-Debian.yml  | 5 -----
 6 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index bda1378cb..8dbdbb5ea 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -37,7 +37,7 @@ roles:
   - name: geerlingguy.memcached
     version: 1.1.0
   - name: geerlingguy.mysql
-    version: 3.1.0
+    version: 3.2.0
   - name: geerlingguy.nginx
     version: 2.8.0
   - name: geerlingguy.nodejs
diff --git a/provisioning/roles/geerlingguy.mysql/README.md b/provisioning/roles/geerlingguy.mysql/README.md
index 21fe3dbf3..cd52bece2 100644
--- a/provisioning/roles/geerlingguy.mysql/README.md
+++ b/provisioning/roles/geerlingguy.mysql/README.md
@@ -84,9 +84,9 @@ The formats of these are the same as in the `mysql_user` module.
 
 (RedHat/CentOS only) If you have enabled any additional repositories (might I suggest geerlingguy.repo-epel or geerlingguy.repo-remi), those repositories can be listed under this variable (e.g. `remi,epel`). This can be handy, as an example, if you want to install later versions of MySQL.
 
-    mysql_python_package_debian: ''
+    mysql_python_package_debian: python3-mysqldb
 
-(Ubuntu/Debian only) If you need to explicitly set the MySQL Python package, you can set it here. If not set, it will default to `python-mysqldb` for Python 2 and `python3-mysqldb` for Python 3.
+(Ubuntu/Debian only) If you need to explicitly override the MySQL Python package, you can set it here. Set this to `python-mysqldb` if using older distributions running Python 2.
 
     mysql_port: "3306"
     mysql_bind_address: '0.0.0.0'
diff --git a/provisioning/roles/geerlingguy.mysql/defaults/main.yml b/provisioning/roles/geerlingguy.mysql/defaults/main.yml
index f79f82374..55bb2cc10 100644
--- a/provisioning/roles/geerlingguy.mysql/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.mysql/defaults/main.yml
@@ -34,6 +34,8 @@ mysql_enablerepo: ""
 #   - mysql-server
 #   - MySQL-python
 
+mysql_python_package_debian: python3-mysqldb
+
 # MySQL connection settings.
 mysql_port: "3306"
 mysql_bind_address: '0.0.0.0'
diff --git a/provisioning/roles/geerlingguy.mysql/meta/main.yml b/provisioning/roles/geerlingguy.mysql/meta/main.yml
index aea8654d7..0f1c0e7d8 100644
--- a/provisioning/roles/geerlingguy.mysql/meta/main.yml
+++ b/provisioning/roles/geerlingguy.mysql/meta/main.yml
@@ -2,6 +2,7 @@
 dependencies: []
 
 galaxy_info:
+  role_name: mysql
   author: geerlingguy
   description: MySQL server for RHEL/CentOS and Debian/Ubuntu.
   company: "Midwestern Mac, LLC"
diff --git a/provisioning/roles/geerlingguy.mysql/molecule/default/converge.yml b/provisioning/roles/geerlingguy.mysql/molecule/default/converge.yml
index 5e0213dcc..c83b10216 100644
--- a/provisioning/roles/geerlingguy.mysql/molecule/default/converge.yml
+++ b/provisioning/roles/geerlingguy.mysql/molecule/default/converge.yml
@@ -3,9 +3,6 @@
   hosts: all
   become: true
 
-  vars:
-    mysql_python_package_debian: python3-mysqldb
-
   roles:
     - role: geerlingguy.mysql
 
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.mysql/tasks/setup-Debian.yml
index c3197d574..7145c90ee 100644
--- a/provisioning/roles/geerlingguy.mysql/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.mysql/tasks/setup-Debian.yml
@@ -7,11 +7,6 @@
   apt: update_cache=yes
   when: not mysql_installed.stat.exists
 
-- name: Determine required MySQL Python libraries.
-  set_fact:
-    mysql_python_package_debian: "{% if 'python3' in ansible_python_interpreter|default('') %}python3-mysqldb{% else %}python-mysqldb{% endif %}"
-  when: mysql_python_package_debian is not defined
-
 - name: Ensure MySQL Python libraries are installed.
   apt:
     name: "{{ mysql_python_package_debian }}"

From 9324b2b699bedddb277d9ff84ac42abc56888951 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 24 Jul 2020 19:08:47 -0500
Subject: [PATCH 1200/1273] Update php and php-mysql roles.

---
 provisioning/requirements.yml                 |  4 +-
 .../geerlingguy.php-mysql/.github/FUNDING.yml |  4 ++
 .../geerlingguy.php-mysql/.github/stale.yml   | 56 +++++++++++++++++++
 .../roles/geerlingguy.php-mysql/.travis.yml   |  6 +-
 .../default/yaml-lint.yml => .yamllint}       |  0
 .../roles/geerlingguy.php-mysql/meta/main.yml |  4 +-
 .../default/{playbook.yml => converge.yml}    |  2 +-
 .../molecule/default/molecule.yml             | 24 +++-----
 .../molecule/default/tests/test_default.py    | 14 -----
 .../geerlingguy.php-mysql/vars/Debian.yml     |  2 +-
 .../roles/geerlingguy.php/.travis.yml         |  3 +-
 provisioning/roles/geerlingguy.php/.yamllint  |  3 +
 .../roles/geerlingguy.php/defaults/main.yml   |  4 +-
 .../molecule/default/converge.yml             |  3 +-
 .../roles/geerlingguy.php/tasks/main.yml      | 11 ++++
 .../roles/geerlingguy.php/vars/Debian-10.yml  |  2 +
 .../roles/geerlingguy.php/vars/Debian-9.yml   |  2 +
 .../roles/geerlingguy.php/vars/Debian.yml     |  2 +
 .../roles/geerlingguy.php/vars/Ubuntu-16.yml  |  2 +
 .../roles/geerlingguy.php/vars/Ubuntu-18.yml  |  2 +
 .../roles/geerlingguy.php/vars/Ubuntu-20.yml  |  2 +
 21 files changed, 111 insertions(+), 41 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.php-mysql/.github/FUNDING.yml
 create mode 100644 provisioning/roles/geerlingguy.php-mysql/.github/stale.yml
 rename provisioning/roles/geerlingguy.php-mysql/{molecule/default/yaml-lint.yml => .yamllint} (100%)
 rename provisioning/roles/geerlingguy.php-mysql/molecule/default/{playbook.yml => converge.yml} (93%)
 delete mode 100644 provisioning/roles/geerlingguy.php-mysql/molecule/default/tests/test_default.py
 create mode 100644 provisioning/roles/geerlingguy.php/vars/Debian-10.yml
 create mode 100644 provisioning/roles/geerlingguy.php/vars/Debian-9.yml
 create mode 100644 provisioning/roles/geerlingguy.php/vars/Ubuntu-16.yml
 create mode 100644 provisioning/roles/geerlingguy.php/vars/Ubuntu-18.yml
 create mode 100644 provisioning/roles/geerlingguy.php/vars/Ubuntu-20.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 8dbdbb5ea..93c370de2 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -43,11 +43,11 @@ roles:
   - name: geerlingguy.nodejs
     version: 5.1.1
   - name: geerlingguy.php
-    version: 4.3.1
+    version: 4.4.0
   - name: geerlingguy.php-memcached
     version: 2.0.2
   - name: geerlingguy.php-mysql
-    version: 2.0.2
+    version: 2.1.0
   - name: geerlingguy.php-pecl
     version: 2.0.0
   - name: geerlingguy.php-pgsql
diff --git a/provisioning/roles/geerlingguy.php-mysql/.github/FUNDING.yml b/provisioning/roles/geerlingguy.php-mysql/.github/FUNDING.yml
new file mode 100644
index 000000000..96b493831
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-mysql/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+---
+github: geerlingguy
+patreon: geerlingguy
diff --git a/provisioning/roles/geerlingguy.php-mysql/.github/stale.yml b/provisioning/roles/geerlingguy.php-mysql/.github/stale.yml
new file mode 100644
index 000000000..c7ff12754
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-mysql/.github/stale.yml
@@ -0,0 +1,56 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 90
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 30
+
+# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
+onlyLabels: []
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - pinned
+  - security
+  - planned
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: false
+
+# Label to use when marking as stale
+staleLabel: stale
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+pulls:
+  markComment: |-
+    This pull request has been marked 'stale' due to lack of recent activity. If there is no further activity, the PR will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark pull requests as stale.
+
+  unmarkComment: >-
+    This pull request is no longer marked for closure.
+
+  closeComment: >-
+    This pull request has been closed due to inactivity. If you feel this is in error, please reopen the pull request or file a new PR with the relevant details.
+
+issues:
+  markComment: |-
+    This issue has been marked 'stale' due to lack of recent activity. If there is no further activity, the issue will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark issues as stale.
+
+  unmarkComment: >-
+    This issue is no longer marked for closure.
+
+  closeComment: >-
+    This issue has been closed due to inactivity. If you feel this is in error, please reopen the issue or file a new issue with the relevant details.
diff --git a/provisioning/roles/geerlingguy.php-mysql/.travis.yml b/provisioning/roles/geerlingguy.php-mysql/.travis.yml
index e5b498ebe..1b9f5922a 100644
--- a/provisioning/roles/geerlingguy.php-mysql/.travis.yml
+++ b/provisioning/roles/geerlingguy.php-mysql/.travis.yml
@@ -7,12 +7,12 @@ env:
     - ROLE_NAME: php-mysql
   matrix:
     - MOLECULE_DISTRO: centos7
-      MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
-    - MOLECULE_DISTRO: ubuntu1604
+    - MOLECULE_DISTRO: ubuntu2004
+    - MOLECULE_DISTRO: debian10
 
 install:
   # Install test dependencies.
-  - pip install molecule docker
+  - pip install molecule yamllint ansible-lint docker
 
 before_script:
   # Use actual Ansible Galaxy role name for the project directory.
diff --git a/provisioning/roles/geerlingguy.php-mysql/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.php-mysql/.yamllint
similarity index 100%
rename from provisioning/roles/geerlingguy.php-mysql/molecule/default/yaml-lint.yml
rename to provisioning/roles/geerlingguy.php-mysql/.yamllint
diff --git a/provisioning/roles/geerlingguy.php-mysql/meta/main.yml b/provisioning/roles/geerlingguy.php-mysql/meta/main.yml
index 5b8f61f36..528a9d601 100644
--- a/provisioning/roles/geerlingguy.php-mysql/meta/main.yml
+++ b/provisioning/roles/geerlingguy.php-mysql/meta/main.yml
@@ -3,11 +3,13 @@ dependencies:
   - geerlingguy.php
 
 galaxy_info:
+  # See: https://github.com/ansible/galaxy/issues/2393
+  # role_name: php-mysql
   author: geerlingguy
   description: PHP MySQL support for Linux.
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 2.0
+  min_ansible_version: 2.4
   platforms:
     - name: EL
       versions:
diff --git a/provisioning/roles/geerlingguy.php-mysql/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.php-mysql/molecule/default/converge.yml
similarity index 93%
rename from provisioning/roles/geerlingguy.php-mysql/molecule/default/playbook.yml
rename to provisioning/roles/geerlingguy.php-mysql/molecule/default/converge.yml
index c68913352..cd6c0b3b9 100644
--- a/provisioning/roles/geerlingguy.php-mysql/molecule/default/playbook.yml
+++ b/provisioning/roles/geerlingguy.php-mysql/molecule/default/converge.yml
@@ -4,7 +4,7 @@
   become: true
 
   vars:
-    php_enablerepo: "remi,remi-php70"
+    php_enablerepo: "remi,remi-php72"
 
   pre_tasks:
     - name: Update apt cache.
diff --git a/provisioning/roles/geerlingguy.php-mysql/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.php-mysql/molecule/default/molecule.yml
index 033970241..2da47dd1f 100644
--- a/provisioning/roles/geerlingguy.php-mysql/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.php-mysql/molecule/default/molecule.yml
@@ -3,25 +3,19 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
-  options:
-    config-file: molecule/default/yaml-lint.yml
+lint: |
+  set -e
+  yamllint .
+  ansible-lint
 platforms:
   - name: instance
-    image: geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible
-    command: ${MOLECULE_DOCKER_COMMAND:-"sleep infinity"}
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
     privileged: true
     pre_build_image: true
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
   playbooks:
-    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
-scenario:
-  name: default
-verifier:
-  name: testinfra
-  lint:
-    name: flake8
+    converge: ${MOLECULE_PLAYBOOK:-converge.yml}
diff --git a/provisioning/roles/geerlingguy.php-mysql/molecule/default/tests/test_default.py b/provisioning/roles/geerlingguy.php-mysql/molecule/default/tests/test_default.py
deleted file mode 100644
index eedd64a1d..000000000
--- a/provisioning/roles/geerlingguy.php-mysql/molecule/default/tests/test_default.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import os
-
-import testinfra.utils.ansible_runner
-
-testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
-    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
-
-
-def test_hosts_file(host):
-    f = host.file('/etc/hosts')
-
-    assert f.exists
-    assert f.user == 'root'
-    assert f.group == 'root'
diff --git a/provisioning/roles/geerlingguy.php-mysql/vars/Debian.yml b/provisioning/roles/geerlingguy.php-mysql/vars/Debian.yml
index 7ba3ec0e5..96da86175 100644
--- a/provisioning/roles/geerlingguy.php-mysql/vars/Debian.yml
+++ b/provisioning/roles/geerlingguy.php-mysql/vars/Debian.yml
@@ -1,2 +1,2 @@
 ---
-__php_mysql_package: php7.0-mysql
+__php_mysql_package: php{{ php_default_version_debian | default("7.4") }}-mysql
diff --git a/provisioning/roles/geerlingguy.php/.travis.yml b/provisioning/roles/geerlingguy.php/.travis.yml
index ebcbe00f8..044c94069 100644
--- a/provisioning/roles/geerlingguy.php/.travis.yml
+++ b/provisioning/roles/geerlingguy.php/.travis.yml
@@ -8,8 +8,9 @@ env:
   matrix:
     - MOLECULE_DISTRO: centos8
     - MOLECULE_DISTRO: centos7
+    - MOLECULE_DISTRO: ubuntu2004
     - MOLECULE_DISTRO: ubuntu1804
-    - MOLECULE_DISTRO: ubuntu1604
+    - MOLECULE_DISTRO: debian10
     - MOLECULE_DISTRO: debian9
 
     - MOLECULE_DISTRO: centos7
diff --git a/provisioning/roles/geerlingguy.php/.yamllint b/provisioning/roles/geerlingguy.php/.yamllint
index a3dbc38ee..dff5082ff 100644
--- a/provisioning/roles/geerlingguy.php/.yamllint
+++ b/provisioning/roles/geerlingguy.php/.yamllint
@@ -4,3 +4,6 @@ rules:
   line-length:
     max: 120
     level: warning
+
+ignore: |
+  .github/stale.yml
diff --git a/provisioning/roles/geerlingguy.php/defaults/main.yml b/provisioning/roles/geerlingguy.php/defaults/main.yml
index e9d214b10..3e2c68644 100644
--- a/provisioning/roles/geerlingguy.php/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.php/defaults/main.yml
@@ -6,8 +6,8 @@ php_enablerepo: ""
 # Extra packages to install (in addition to distro-specific default lists).
 php_packages_extra: []
 
-# Default PHP version to install on Debian-based OSes.
-php_default_version_debian: "7.0"
+# Default PHP version to install on Debian-based OSes (OS-specific).
+# php_default_version_debian: ""
 
 # PHP package state; use 'present' to make sure it's installed, or 'latest' if
 # you want to upgrade or switch versions using a new repo.
diff --git a/provisioning/roles/geerlingguy.php/molecule/default/converge.yml b/provisioning/roles/geerlingguy.php/molecule/default/converge.yml
index f77853399..41ae7c192 100644
--- a/provisioning/roles/geerlingguy.php/molecule/default/converge.yml
+++ b/provisioning/roles/geerlingguy.php/molecule/default/converge.yml
@@ -26,7 +26,7 @@
       apt:
         name: dirmngr
         state: present
-      when: ansible_distribution == 'Ubuntu'
+      when: ansible_os_family == 'Debian'
 
     - name: Add repository for PHP 7.
       apt_repository: repo='ppa:ondrej/php'
@@ -38,6 +38,7 @@
         name:
           - apt-transport-https
           - ca-certificates
+          - gnupg2
         state: present
       when: ansible_distribution == "Debian"
 
diff --git a/provisioning/roles/geerlingguy.php/tasks/main.yml b/provisioning/roles/geerlingguy.php/tasks/main.yml
index e794e8c70..41a776146 100644
--- a/provisioning/roles/geerlingguy.php/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php/tasks/main.yml
@@ -1,5 +1,16 @@
 ---
 # Variable setup.
+- name: Include distribution and version-specific vars.
+  include_vars: "{{ item }}"
+  with_first_found:
+    - files:
+        - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
+      skip: true
+- name: Set the default PHP version for Debian-based OSes.
+  set_fact:
+    php_default_version_debian: "{{ __php_default_version_debian }}"
+  when: ansible_os_family == 'Debian'
+
 - name: Include OS-specific variables.
   include_vars: "{{ ansible_os_family }}.yml"
 
diff --git a/provisioning/roles/geerlingguy.php/vars/Debian-10.yml b/provisioning/roles/geerlingguy.php/vars/Debian-10.yml
new file mode 100644
index 000000000..ec895aec3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/vars/Debian-10.yml
@@ -0,0 +1,2 @@
+---
+__php_default_version_debian: "7.3"
diff --git a/provisioning/roles/geerlingguy.php/vars/Debian-9.yml b/provisioning/roles/geerlingguy.php/vars/Debian-9.yml
new file mode 100644
index 000000000..eb23ce3a0
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/vars/Debian-9.yml
@@ -0,0 +1,2 @@
+---
+__php_default_version_debian: "7.0"
diff --git a/provisioning/roles/geerlingguy.php/vars/Debian.yml b/provisioning/roles/geerlingguy.php/vars/Debian.yml
index c5f90b573..c487fd8a5 100644
--- a/provisioning/roles/geerlingguy.php/vars/Debian.yml
+++ b/provisioning/roles/geerlingguy.php/vars/Debian.yml
@@ -1,4 +1,6 @@
 ---
+__php_default_version_debian: "7.0"
+
 __php_packages:
   - php{{ php_default_version_debian }}-common
   - php{{ php_default_version_debian }}-cli
diff --git a/provisioning/roles/geerlingguy.php/vars/Ubuntu-16.yml b/provisioning/roles/geerlingguy.php/vars/Ubuntu-16.yml
new file mode 100644
index 000000000..eb23ce3a0
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/vars/Ubuntu-16.yml
@@ -0,0 +1,2 @@
+---
+__php_default_version_debian: "7.0"
diff --git a/provisioning/roles/geerlingguy.php/vars/Ubuntu-18.yml b/provisioning/roles/geerlingguy.php/vars/Ubuntu-18.yml
new file mode 100644
index 000000000..82230bcd7
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/vars/Ubuntu-18.yml
@@ -0,0 +1,2 @@
+---
+__php_default_version_debian: "7.2"
diff --git a/provisioning/roles/geerlingguy.php/vars/Ubuntu-20.yml b/provisioning/roles/geerlingguy.php/vars/Ubuntu-20.yml
new file mode 100644
index 000000000..a16b99b15
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/vars/Ubuntu-20.yml
@@ -0,0 +1,2 @@
+---
+__php_default_version_debian: "7.4"

From 9fae4c036e2f41a54dc946e9dbd0e8aa62177823 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 27 Jul 2020 09:50:19 -0500
Subject: [PATCH 1201/1273] Update mysql role to latest version to fix
 replication issues.

---
 provisioning/requirements.yml                          |  2 +-
 .../roles/geerlingguy.mysql/tasks/replication.yml      | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 93c370de2..62908cd69 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -37,7 +37,7 @@ roles:
   - name: geerlingguy.memcached
     version: 1.1.0
   - name: geerlingguy.mysql
-    version: 3.2.0
+    version: 3.3.0
   - name: geerlingguy.nginx
     version: 2.8.0
   - name: geerlingguy.nodejs
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/replication.yml b/provisioning/roles/geerlingguy.mysql/tasks/replication.yml
index 2532b5539..51103875f 100644
--- a/provisioning/roles/geerlingguy.mysql/tasks/replication.yml
+++ b/provisioning/roles/geerlingguy.mysql/tasks/replication.yml
@@ -9,7 +9,7 @@
   when:
     - mysql_replication_role == 'master'
     - mysql_replication_user.name is defined
-    - mysql_replication_master | default(false)
+    - (mysql_replication_master | length) > 0
   tags: ['skip_ansible_galaxy']
 
 - name: Check slave replication status.
@@ -21,7 +21,7 @@
   register: slave
   when:
     - mysql_replication_role == 'slave'
-    - mysql_replication_master | default(false)
+    - (mysql_replication_master | length) > 0
   tags: ['skip_ansible_galaxy']
 
 - name: Check master replication status.
@@ -31,7 +31,7 @@
   when:
     - (slave.Is_Slave is defined and not slave.Is_Slave) or (slave.Is_Slave is not defined and slave is failed)
     - mysql_replication_role == 'slave'
-    - mysql_replication_master | default(false)
+    - (mysql_replication_master | length) > 0
   tags: ['skip_ansible_galaxy']
 
 - name: Configure replication on the slave.
@@ -47,12 +47,12 @@
     - (slave.Is_Slave is defined and not slave.Is_Slave) or (slave.Is_Slave is not defined and slave is failed)
     - mysql_replication_role == 'slave'
     - mysql_replication_user.name is defined
-    - mysql_replication_master | default(false)
+    - (mysql_replication_master | length) > 0
 
 - name: Start replication.
   mysql_replication: mode=startslave
   when:
     - (slave.Is_Slave is defined and not slave.Is_Slave) or (slave.Is_Slave is not defined and slave is failed)
     - mysql_replication_role == 'slave'
-    - mysql_replication_master | default(false)
+    - (mysql_replication_master | length) > 0
   tags: ['skip_ansible_galaxy']

From 613c917788ce6ee5def6811f77559ce46ebf3daf Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 2 Aug 2020 20:21:35 -0500
Subject: [PATCH 1202/1273] Update solr role to latest version.

---
 provisioning/requirements.yml                                   | 2 +-
 provisioning/roles/geerlingguy.solr/README.md                   | 2 +-
 provisioning/roles/geerlingguy.solr/defaults/main.yml           | 2 +-
 provisioning/roles/geerlingguy.solr/meta/main.yml               | 1 +
 .../roles/geerlingguy.solr/molecule/default/playbook-solr-7.yml | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 62908cd69..dd6b4d80c 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -77,6 +77,6 @@ roles:
   - name: geerlingguy.security
     version: 2.0.0
   - name: geerlingguy.solr
-    version: 5.1.0
+    version: 5.1.1
   - name: geerlingguy.varnish
     version: 3.3.0
diff --git a/provisioning/roles/geerlingguy.solr/README.md b/provisioning/roles/geerlingguy.solr/README.md
index 3a8e00d00..1d7479559 100644
--- a/provisioning/roles/geerlingguy.solr/README.md
+++ b/provisioning/roles/geerlingguy.solr/README.md
@@ -23,7 +23,7 @@ Files will be downloaded to this path on the remote server before being moved in
 
 Solr will be run under the `solr_user`. Set `solr_create_user` to `false` if `solr_user` is created before this role runs, or if you're using Solr 5+ and want Solr's own installation script to set up the user.
 
-    solr_version: "8.4.1"
+    solr_version: "8.6.0"
 
 The Apache Solr version to install. For a full list, see [available Apache Solr versions](http://archive.apache.org/dist/lucene/solr/).
 
diff --git a/provisioning/roles/geerlingguy.solr/defaults/main.yml b/provisioning/roles/geerlingguy.solr/defaults/main.yml
index ffd99ec92..b1c5849f8 100644
--- a/provisioning/roles/geerlingguy.solr/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.solr/defaults/main.yml
@@ -4,7 +4,7 @@ solr_workspace: /root
 solr_create_user: true
 solr_user: solr
 
-solr_version: "8.4.1"
+solr_version: "8.6.0"
 solr_mirror: "https://archive.apache.org/dist"
 solr_remove_cruft: false
 
diff --git a/provisioning/roles/geerlingguy.solr/meta/main.yml b/provisioning/roles/geerlingguy.solr/meta/main.yml
index b66209d8f..86390307c 100644
--- a/provisioning/roles/geerlingguy.solr/meta/main.yml
+++ b/provisioning/roles/geerlingguy.solr/meta/main.yml
@@ -2,6 +2,7 @@
 dependencies: []
 
 galaxy_info:
+  role_name: solr
   author: geerlingguy
   description: Apache Solr for Linux.
   company: "Midwestern Mac, LLC"
diff --git a/provisioning/roles/geerlingguy.solr/molecule/default/playbook-solr-7.yml b/provisioning/roles/geerlingguy.solr/molecule/default/playbook-solr-7.yml
index 835d0bbda..c6b6f74f7 100644
--- a/provisioning/roles/geerlingguy.solr/molecule/default/playbook-solr-7.yml
+++ b/provisioning/roles/geerlingguy.solr/molecule/default/playbook-solr-7.yml
@@ -4,7 +4,7 @@
   become: true
 
   vars:
-    solr_version: "7.7.2"
+    solr_version: "7.7.3"
 
   pre_tasks:
     - name: Set Java 8 package for RedHat.

From fc0e710198dee46828570e49aa3ab1551b277694 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 3 Aug 2020 19:28:08 -0500
Subject: [PATCH 1203/1273] Update php role to latest version.

---
 provisioning/requirements.yml                                | 2 +-
 .../geerlingguy.php/molecule/default/playbook-source.yml     | 2 +-
 .../roles/geerlingguy.php/tasks/install-from-source.yml      | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index dd6b4d80c..f0578365e 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -43,7 +43,7 @@ roles:
   - name: geerlingguy.nodejs
     version: 5.1.1
   - name: geerlingguy.php
-    version: 4.4.0
+    version: 4.5.0
   - name: geerlingguy.php-memcached
     version: 2.0.2
   - name: geerlingguy.php-mysql
diff --git a/provisioning/roles/geerlingguy.php/molecule/default/playbook-source.yml b/provisioning/roles/geerlingguy.php/molecule/default/playbook-source.yml
index 1cc193d9e..d9ad0f95d 100644
--- a/provisioning/roles/geerlingguy.php/molecule/default/playbook-source.yml
+++ b/provisioning/roles/geerlingguy.php/molecule/default/playbook-source.yml
@@ -8,7 +8,7 @@
     php_install_from_source: true
     php_source_clone_dir: /root/php-src
     php_source_make_command: "make --jobs=2"
-    php_version: "7.1.17"
+    php_version: "7.4.8"
     php_source_version: "php-{{ php_version }}"
     php_memory_limit: "192M"
 
diff --git a/provisioning/roles/geerlingguy.php/tasks/install-from-source.yml b/provisioning/roles/geerlingguy.php/tasks/install-from-source.yml
index 09ad4c3e5..cde8e5c89 100644
--- a/provisioning/roles/geerlingguy.php/tasks/install-from-source.yml
+++ b/provisioning/roles/geerlingguy.php/tasks/install-from-source.yml
@@ -7,6 +7,9 @@
       - libtool
       - bison
       - make
+      - re2c
+      - sqlite-devel
+      - oniguruma-devel
       - curl-devel
       - recode-devel
       - aspell-devel
@@ -40,6 +43,8 @@
       - bison
       - pkg-config
       - re2c
+      - sqlite-dev
+      - libonig2
       - libxml2-dev
       - libcurl4-openssl-dev
       - libbz2-dev

From 2550784bec3685ff3c3f29b9fc127e333387c6e1 Mon Sep 17 00:00:00 2001
From: ijf8090 <i.finlay@yahoo.com>
Date: Thu, 10 Sep 2020 10:05:10 -0400
Subject: [PATCH 1204/1273] Update README.md

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index bedf7bd7e..b347b0196 100644
--- a/README.md
+++ b/README.md
@@ -52,6 +52,12 @@ There are a couple places where you can customize the VM for your needs:
   - `config.yml`: Override any of the default VM configuration from `default.config.yml`; customize almost any aspect of any software installed in the VM (more about [configuring Drupal VM](http://docs.drupalvm.com/en/latest/getting-started/configure-drupalvm/).
   - `drupal.composer.json` or `drupal.make.yml`: Contains configuration for the Drupal core version, modules, and patches that will be downloaded on Drupal's initial installation (you can build using Composer, Drush make, or your own codebase).
 
+If you want to use Drupal 8 on the initial install, do the following:
+
+  1. Set `drupal_major_version: 8` inside `config.yml`.
+  2. Set `drupal_composer_project_package: "drupal/recommended-project:^8@dev" inside `config.yml`.
+  
+  
 If you want to use Drupal 7 on the initial install, do the following:
 
   1. Switch to using a [Drush Make file](http://docs.drupalvm.com/en/latest/deployment/drush-make/).

From 42e1253396866924f1319451847779f81fd6fde5 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 29 Sep 2020 16:07:19 -0500
Subject: [PATCH 1205/1273] Update roles: security, solr, elasticsearch,
 repo-remi, and composer.

---
 .../roles/geerlingguy.composer/.ansible-lint  |   2 +
 .../geerlingguy.composer/.github/FUNDING.yml  |   4 +
 .../geerlingguy.composer/.github/stale.yml    |  56 +++++++++
 .../roles/geerlingguy.composer/.travis.yml    |   6 +-
 .../default/yaml-lint.yml => .yamllint}       |   5 +
 .../roles/geerlingguy.composer/meta/main.yml  |   1 +
 .../default/{playbook.yml => converge.yml}    |   0
 .../molecule/default/molecule.yml             |  18 +--
 .../roles/geerlingguy.composer/tasks/main.yml |   4 +
 .../geerlingguy.elasticsearch/.ansible-lint   |   2 +
 .../geerlingguy.elasticsearch/.travis.yml     |   4 +
 .../roles/geerlingguy.elasticsearch/.yamllint |   4 +
 .../roles/geerlingguy.elasticsearch/README.md |   4 +-
 .../geerlingguy.elasticsearch/meta/main.yml   |   4 +-
 .../geerlingguy.elasticsearch/tasks/main.yml  |   8 +-
 .../templates/heap.options.j2                 |  23 ++++
 .../templates/jvm.options.j2                  | 111 ------------------
 .../roles/geerlingguy.repo-remi/.ansible-lint |   2 +
 .../geerlingguy.repo-remi/.github/FUNDING.yml |   4 +
 .../geerlingguy.repo-remi/.github/stale.yml   |  56 +++++++++
 .../roles/geerlingguy.repo-remi/.gitignore    |   3 +
 .../roles/geerlingguy.repo-remi/.travis.yml   |  58 ++++-----
 .../roles/geerlingguy.repo-remi/.yamllint     |  10 ++
 .../roles/geerlingguy.repo-remi/LICENSE       |  20 ++++
 .../roles/geerlingguy.repo-remi/README.md     |   6 +-
 .../geerlingguy.repo-remi/defaults/main.yml   |   4 +-
 .../roles/geerlingguy.repo-remi/meta/main.yml |  14 ++-
 .../molecule/default/converge.yml             |   7 ++
 .../molecule/default/molecule.yml             |  21 ++++
 .../geerlingguy.repo-remi/tasks/main.yml      |  10 +-
 .../tests/Dockerfile.centos-6                 |  19 ---
 .../tests/Dockerfile.centos-7                 |  29 -----
 .../tests/requirements.yml                    |   2 -
 .../geerlingguy.repo-remi/tests/test.yml      |   5 -
 .../roles/geerlingguy.security/.ansible-lint  |   2 +
 .../roles/geerlingguy.security/.travis.yml    |   4 +
 .../roles/geerlingguy.security/.yamllint      |   5 +
 .../molecule/default/converge.yml             |   1 +
 .../tasks/autoupdate-RedHat.yml               |   1 +
 .../roles/geerlingguy.security/tasks/ssh.yml  |   3 +
 .../roles/geerlingguy.solr/.ansible-lint      |   2 +
 .../roles/geerlingguy.solr/.travis.yml        |   4 +
 provisioning/roles/geerlingguy.solr/.yamllint |   5 +
 .../geerlingguy.solr/tasks/configure.yml      |   1 +
 .../roles/geerlingguy.solr/tasks/cores.yml    |   1 +
 .../geerlingguy.solr/tasks/install-pre5.yml   |   5 +-
 46 files changed, 321 insertions(+), 239 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.composer/.ansible-lint
 create mode 100644 provisioning/roles/geerlingguy.composer/.github/FUNDING.yml
 create mode 100644 provisioning/roles/geerlingguy.composer/.github/stale.yml
 rename provisioning/roles/geerlingguy.composer/{molecule/default/yaml-lint.yml => .yamllint} (62%)
 rename provisioning/roles/geerlingguy.composer/molecule/default/{playbook.yml => converge.yml} (100%)
 create mode 100644 provisioning/roles/geerlingguy.elasticsearch/.ansible-lint
 create mode 100644 provisioning/roles/geerlingguy.elasticsearch/templates/heap.options.j2
 delete mode 100644 provisioning/roles/geerlingguy.elasticsearch/templates/jvm.options.j2
 create mode 100644 provisioning/roles/geerlingguy.repo-remi/.ansible-lint
 create mode 100644 provisioning/roles/geerlingguy.repo-remi/.github/FUNDING.yml
 create mode 100644 provisioning/roles/geerlingguy.repo-remi/.github/stale.yml
 create mode 100644 provisioning/roles/geerlingguy.repo-remi/.gitignore
 create mode 100644 provisioning/roles/geerlingguy.repo-remi/.yamllint
 create mode 100644 provisioning/roles/geerlingguy.repo-remi/LICENSE
 create mode 100644 provisioning/roles/geerlingguy.repo-remi/molecule/default/converge.yml
 create mode 100644 provisioning/roles/geerlingguy.repo-remi/molecule/default/molecule.yml
 delete mode 100644 provisioning/roles/geerlingguy.repo-remi/tests/Dockerfile.centos-6
 delete mode 100644 provisioning/roles/geerlingguy.repo-remi/tests/Dockerfile.centos-7
 delete mode 100644 provisioning/roles/geerlingguy.repo-remi/tests/requirements.yml
 delete mode 100644 provisioning/roles/geerlingguy.repo-remi/tests/test.yml
 create mode 100644 provisioning/roles/geerlingguy.security/.ansible-lint
 create mode 100644 provisioning/roles/geerlingguy.solr/.ansible-lint

diff --git a/provisioning/roles/geerlingguy.composer/.ansible-lint b/provisioning/roles/geerlingguy.composer/.ansible-lint
new file mode 100644
index 000000000..555729425
--- /dev/null
+++ b/provisioning/roles/geerlingguy.composer/.ansible-lint
@@ -0,0 +1,2 @@
+skip_list:
+  - '106'
diff --git a/provisioning/roles/geerlingguy.composer/.github/FUNDING.yml b/provisioning/roles/geerlingguy.composer/.github/FUNDING.yml
new file mode 100644
index 000000000..96b493831
--- /dev/null
+++ b/provisioning/roles/geerlingguy.composer/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+---
+github: geerlingguy
+patreon: geerlingguy
diff --git a/provisioning/roles/geerlingguy.composer/.github/stale.yml b/provisioning/roles/geerlingguy.composer/.github/stale.yml
new file mode 100644
index 000000000..c7ff12754
--- /dev/null
+++ b/provisioning/roles/geerlingguy.composer/.github/stale.yml
@@ -0,0 +1,56 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 90
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 30
+
+# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
+onlyLabels: []
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - pinned
+  - security
+  - planned
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: false
+
+# Label to use when marking as stale
+staleLabel: stale
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+pulls:
+  markComment: |-
+    This pull request has been marked 'stale' due to lack of recent activity. If there is no further activity, the PR will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark pull requests as stale.
+
+  unmarkComment: >-
+    This pull request is no longer marked for closure.
+
+  closeComment: >-
+    This pull request has been closed due to inactivity. If you feel this is in error, please reopen the pull request or file a new PR with the relevant details.
+
+issues:
+  markComment: |-
+    This issue has been marked 'stale' due to lack of recent activity. If there is no further activity, the issue will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark issues as stale.
+
+  unmarkComment: >-
+    This issue is no longer marked for closure.
+
+  closeComment: >-
+    This issue has been closed due to inactivity. If you feel this is in error, please reopen the issue or file a new issue with the relevant details.
diff --git a/provisioning/roles/geerlingguy.composer/.travis.yml b/provisioning/roles/geerlingguy.composer/.travis.yml
index 5765c02af..452786ab3 100644
--- a/provisioning/roles/geerlingguy.composer/.travis.yml
+++ b/provisioning/roles/geerlingguy.composer/.travis.yml
@@ -10,9 +10,13 @@ env:
     - MOLECULE_DISTRO: ubuntu1604
     - MOLECULE_DISTRO: debian9
 
+before_install:
+  # Upgrade Docker to work with docker-py.
+  - curl https://gist.githubusercontent.com/geerlingguy/ce883ad4aec6a5f1187ef93bd338511e/raw/36612d28981d92863f839c5aefe5b7dd7193d6c6/travis-ci-docker-upgrade.sh | sudo bash
+
 install:
   # Install test dependencies.
-  - pip install molecule docker
+  - pip install molecule yamllint ansible-lint docker
 
 before_script:
   # Use actual Ansible Galaxy role name for the project directory.
diff --git a/provisioning/roles/geerlingguy.composer/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.composer/.yamllint
similarity index 62%
rename from provisioning/roles/geerlingguy.composer/molecule/default/yaml-lint.yml
rename to provisioning/roles/geerlingguy.composer/.yamllint
index d43c30605..7107275b1 100644
--- a/provisioning/roles/geerlingguy.composer/molecule/default/yaml-lint.yml
+++ b/provisioning/roles/geerlingguy.composer/.yamllint
@@ -1,6 +1,11 @@
 ---
 extends: default
+
 rules:
   line-length:
     max: 140
     level: warning
+
+ignore: |
+  .github/stale.yml
+  .travis.ci
diff --git a/provisioning/roles/geerlingguy.composer/meta/main.yml b/provisioning/roles/geerlingguy.composer/meta/main.yml
index 4d3afbac9..0b3da1012 100644
--- a/provisioning/roles/geerlingguy.composer/meta/main.yml
+++ b/provisioning/roles/geerlingguy.composer/meta/main.yml
@@ -2,6 +2,7 @@
 dependencies: []
 
 galaxy_info:
+  role_name: composer
   author: geerlingguy
   description: Composer PHP Dependency Manager
   company: "Midwestern Mac, LLC"
diff --git a/provisioning/roles/geerlingguy.composer/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.composer/molecule/default/converge.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.composer/molecule/default/playbook.yml
rename to provisioning/roles/geerlingguy.composer/molecule/default/converge.yml
diff --git a/provisioning/roles/geerlingguy.composer/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.composer/molecule/default/molecule.yml
index 2ca6feaf9..2da47dd1f 100644
--- a/provisioning/roles/geerlingguy.composer/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.composer/molecule/default/molecule.yml
@@ -3,10 +3,10 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
-  options:
-    config-file: molecule/default/yaml-lint.yml
+lint: |
+  set -e
+  yamllint .
+  ansible-lint
 platforms:
   - name: instance
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
@@ -17,13 +17,5 @@ platforms:
     pre_build_image: true
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
   playbooks:
-    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
-scenario:
-  name: default
-verifier:
-  name: testinfra
-  lint:
-    name: flake8
+    converge: ${MOLECULE_PLAYBOOK:-converge.yml}
diff --git a/provisioning/roles/geerlingguy.composer/tasks/main.yml b/provisioning/roles/geerlingguy.composer/tasks/main.yml
index cecbfa65b..439ccec97 100644
--- a/provisioning/roles/geerlingguy.composer/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.composer/tasks/main.yml
@@ -43,11 +43,14 @@
   when: composer_keep_updated | bool
 
 - name: Ensure composer directory exists.
+  become: true
+  become_user: "{{ composer_home_owner }}"
   file:
     path: "{{ composer_home_path }}"
     owner: "{{ composer_home_owner }}"
     group: "{{ composer_home_group }}"
     state: directory
+    mode: 0755
 
 - name: Add GitHub OAuth token for Composer (if configured).
   become: true
@@ -57,6 +60,7 @@
     dest: "{{ composer_home_path }}/auth.json"
     owner: "{{ composer_home_owner }}"
     group: "{{ composer_home_group }}"
+    mode: 0644
   when: composer_github_oauth_token | length > 0
 
 - include_tasks: global-require.yml
diff --git a/provisioning/roles/geerlingguy.elasticsearch/.ansible-lint b/provisioning/roles/geerlingguy.elasticsearch/.ansible-lint
new file mode 100644
index 000000000..555729425
--- /dev/null
+++ b/provisioning/roles/geerlingguy.elasticsearch/.ansible-lint
@@ -0,0 +1,2 @@
+skip_list:
+  - '106'
diff --git a/provisioning/roles/geerlingguy.elasticsearch/.travis.yml b/provisioning/roles/geerlingguy.elasticsearch/.travis.yml
index 58ed78dfe..739944328 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/.travis.yml
+++ b/provisioning/roles/geerlingguy.elasticsearch/.travis.yml
@@ -10,6 +10,10 @@ env:
     - MOLECULE_DISTRO: ubuntu1804
     - MOLECULE_DISTRO: ubuntu1604
 
+before_install:
+  # Upgrade Docker to work with docker-py.
+  - curl https://gist.githubusercontent.com/geerlingguy/ce883ad4aec6a5f1187ef93bd338511e/raw/36612d28981d92863f839c5aefe5b7dd7193d6c6/travis-ci-docker-upgrade.sh | sudo bash
+
 install:
   # Install test dependencies.
   - pip install molecule yamllint ansible-lint docker
diff --git a/provisioning/roles/geerlingguy.elasticsearch/.yamllint b/provisioning/roles/geerlingguy.elasticsearch/.yamllint
index a3dbc38ee..76a383c6a 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/.yamllint
+++ b/provisioning/roles/geerlingguy.elasticsearch/.yamllint
@@ -1,6 +1,10 @@
 ---
 extends: default
+
 rules:
   line-length:
     max: 120
     level: warning
+
+ignore: |
+  .github/stale.yml
diff --git a/provisioning/roles/geerlingguy.elasticsearch/README.md b/provisioning/roles/geerlingguy.elasticsearch/README.md
index 9ad832eb7..9d1082bc1 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/README.md
+++ b/provisioning/roles/geerlingguy.elasticsearch/README.md
@@ -6,7 +6,7 @@ An Ansible Role that installs Elasticsearch on RedHat/CentOS or Debian/Ubuntu.
 
 ## Requirements
 
-Requires at least Java 8. See [`geerlingguy.java`](https://github.com/geerlingguy/ansible-role-java#example-playbook-install-openjdk-8) role instructions for installing OpenJDK 8.
+Requires at least Java 8. You can use the [`geerlingguy.java`](https://github.com/geerlingguy/ansible-role-java) to easilly install Java.
 
 ## Role Variables
 
@@ -53,7 +53,7 @@ elasticsearch_extra_options: |  # Dont forget the pipe!
 
 ## Dependencies
 
-  - geerlingguy.java
+None.
 
 ## Example Playbook
 
diff --git a/provisioning/roles/geerlingguy.elasticsearch/meta/main.yml b/provisioning/roles/geerlingguy.elasticsearch/meta/main.yml
index 032fe021b..013d34976 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/meta/main.yml
+++ b/provisioning/roles/geerlingguy.elasticsearch/meta/main.yml
@@ -1,8 +1,8 @@
 ---
-dependencies:
-  - geerlingguy.java
+dependencies: []
 
 galaxy_info:
+  role_name: elasticsearch
   author: geerlingguy
   description: Elasticsearch for Linux.
   company: "Midwestern Mac, LLC"
diff --git a/provisioning/roles/geerlingguy.elasticsearch/tasks/main.yml b/provisioning/roles/geerlingguy.elasticsearch/tasks/main.yml
index 5ec66df4c..10af4d5cb 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.elasticsearch/tasks/main.yml
@@ -12,14 +12,14 @@
 
 - name: Configure Elasticsearch.
   template:
-    src: "{{ item }}.j2"
-    dest: /etc/elasticsearch/{{ item }}
+    src: "{{ item | basename }}.j2"
+    dest: "{{ item }}"
     owner: root
     group: elasticsearch
     mode: 0660
   with_items:
-    - elasticsearch.yml
-    - jvm.options
+    - /etc/elasticsearch/elasticsearch.yml
+    - /etc/elasticsearch/jvm.options.d/heap.options
   notify: restart elasticsearch
 
 - name: Force a restart if configuration has changed.
diff --git a/provisioning/roles/geerlingguy.elasticsearch/templates/heap.options.j2 b/provisioning/roles/geerlingguy.elasticsearch/templates/heap.options.j2
new file mode 100644
index 000000000..5760fd1d2
--- /dev/null
+++ b/provisioning/roles/geerlingguy.elasticsearch/templates/heap.options.j2
@@ -0,0 +1,23 @@
+## JVM configuration
+
+################################################################
+## IMPORTANT: JVM heap size
+################################################################
+##
+## You should always set the min and max JVM heap
+## size to the same value. For example, to set
+## the heap to 4 GB, set:
+##
+## -Xms4g
+## -Xmx4g
+##
+## See https://www.elastic.co/guide/en/elasticsearch/reference/current/heap-size.html
+## for more information
+##
+################################################################
+
+# Xms represents the initial size of total heap space
+# Xmx represents the maximum size of total heap space
+
+-Xms{{ elasticsearch_heap_size_min }}
+-Xmx{{ elasticsearch_heap_size_max }}
diff --git a/provisioning/roles/geerlingguy.elasticsearch/templates/jvm.options.j2 b/provisioning/roles/geerlingguy.elasticsearch/templates/jvm.options.j2
deleted file mode 100644
index 7cb88c103..000000000
--- a/provisioning/roles/geerlingguy.elasticsearch/templates/jvm.options.j2
+++ /dev/null
@@ -1,111 +0,0 @@
-## JVM configuration
-
-################################################################
-## IMPORTANT: JVM heap size
-################################################################
-##
-## You should always set the min and max JVM heap
-## size to the same value. For example, to set
-## the heap to 4 GB, set:
-##
-## -Xms4g
-## -Xmx4g
-##
-## See https://www.elastic.co/guide/en/elasticsearch/reference/current/heap-size.html
-## for more information
-##
-################################################################
-
-# Xms represents the initial size of total heap space
-# Xmx represents the maximum size of total heap space
-
--Xms{{ elasticsearch_heap_size_min }}
--Xmx{{ elasticsearch_heap_size_max }}
-
-################################################################
-## Expert settings
-################################################################
-##
-## All settings below this section are considered
-## expert settings. Don't tamper with them unless
-## you understand what you are doing
-##
-################################################################
-
-## GC configuration
--XX:+UseConcMarkSweepGC
--XX:CMSInitiatingOccupancyFraction=75
--XX:+UseCMSInitiatingOccupancyOnly
-
-## optimizations
-
-# pre-touch memory pages used by the JVM during initialization
--XX:+AlwaysPreTouch
-
-## basic
-
-# force the server VM (remove on 32-bit client JVMs)
--server
-
-# explicitly set the stack size (reduce to 320k on 32-bit client JVMs)
--Xss1m
-
-# set to headless, just in case
--Djava.awt.headless=true
-
-# ensure UTF-8 encoding by default (e.g. filenames)
--Dfile.encoding=UTF-8
-
-# use our provided JNA always versus the system one
--Djna.nosys=true
-
-# use old-style file permissions on JDK9
--Djdk.io.permissionsUseCanonicalPath=true
-
-# flags to configure Netty
--Dio.netty.noUnsafe=true
--Dio.netty.noKeySetOptimization=true
--Dio.netty.recycler.maxCapacityPerThread=0
-
-# log4j 2
--Dlog4j.shutdownHookEnabled=false
--Dlog4j2.disable.jmx=true
--Dlog4j.skipJansi=true
-
-## heap dumps
-
-# generate a heap dump when an allocation from the Java heap fails
-# heap dumps are created in the working directory of the JVM
--XX:+HeapDumpOnOutOfMemoryError
-
-# specify an alternative path for heap dumps
-# ensure the directory exists and has sufficient space
-#-XX:HeapDumpPath=${heap.dump.path}
-
-## GC logging
-
-#-XX:+PrintGCDetails
-#-XX:+PrintGCTimeStamps
-#-XX:+PrintGCDateStamps
-#-XX:+PrintClassHistogram
-#-XX:+PrintTenuringDistribution
-#-XX:+PrintGCApplicationStoppedTime
-
-# log GC status to a file with time stamps
-# ensure the directory exists
-#-Xloggc:${loggc}
-
-# By default, the GC log file will not rotate.
-# By uncommenting the lines below, the GC log file
-# will be rotated every 128MB at most 32 times.
-#-XX:+UseGCLogFileRotation
-#-XX:NumberOfGCLogFiles=32
-#-XX:GCLogFileSize=128M
-
-# Elasticsearch 5.0.0 will throw an exception on unquoted field names in JSON.
-# If documents were already indexed with unquoted fields in a previous version
-# of Elasticsearch, some operations may throw errors.
-#
-# WARNING: This option will be removed in Elasticsearch 6.0.0 and is provided
-# only for migration purposes.
-#-Delasticsearch.json.allow_unquoted_field_names=true
diff --git a/provisioning/roles/geerlingguy.repo-remi/.ansible-lint b/provisioning/roles/geerlingguy.repo-remi/.ansible-lint
new file mode 100644
index 000000000..555729425
--- /dev/null
+++ b/provisioning/roles/geerlingguy.repo-remi/.ansible-lint
@@ -0,0 +1,2 @@
+skip_list:
+  - '106'
diff --git a/provisioning/roles/geerlingguy.repo-remi/.github/FUNDING.yml b/provisioning/roles/geerlingguy.repo-remi/.github/FUNDING.yml
new file mode 100644
index 000000000..96b493831
--- /dev/null
+++ b/provisioning/roles/geerlingguy.repo-remi/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+---
+github: geerlingguy
+patreon: geerlingguy
diff --git a/provisioning/roles/geerlingguy.repo-remi/.github/stale.yml b/provisioning/roles/geerlingguy.repo-remi/.github/stale.yml
new file mode 100644
index 000000000..c7ff12754
--- /dev/null
+++ b/provisioning/roles/geerlingguy.repo-remi/.github/stale.yml
@@ -0,0 +1,56 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 90
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 30
+
+# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
+onlyLabels: []
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - pinned
+  - security
+  - planned
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: false
+
+# Label to use when marking as stale
+staleLabel: stale
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+pulls:
+  markComment: |-
+    This pull request has been marked 'stale' due to lack of recent activity. If there is no further activity, the PR will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark pull requests as stale.
+
+  unmarkComment: >-
+    This pull request is no longer marked for closure.
+
+  closeComment: >-
+    This pull request has been closed due to inactivity. If you feel this is in error, please reopen the pull request or file a new PR with the relevant details.
+
+issues:
+  markComment: |-
+    This issue has been marked 'stale' due to lack of recent activity. If there is no further activity, the issue will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark issues as stale.
+
+  unmarkComment: >-
+    This issue is no longer marked for closure.
+
+  closeComment: >-
+    This issue has been closed due to inactivity. If you feel this is in error, please reopen the issue or file a new issue with the relevant details.
diff --git a/provisioning/roles/geerlingguy.repo-remi/.gitignore b/provisioning/roles/geerlingguy.repo-remi/.gitignore
new file mode 100644
index 000000000..f56f5b578
--- /dev/null
+++ b/provisioning/roles/geerlingguy.repo-remi/.gitignore
@@ -0,0 +1,3 @@
+*.retry
+*/__pycache__
+*.pyc
diff --git a/provisioning/roles/geerlingguy.repo-remi/.travis.yml b/provisioning/roles/geerlingguy.repo-remi/.travis.yml
index c96ecd0f9..018563e38 100644
--- a/provisioning/roles/geerlingguy.repo-remi/.travis.yml
+++ b/provisioning/roles/geerlingguy.repo-remi/.travis.yml
@@ -1,48 +1,32 @@
 ---
-sudo: required
+language: python
+services: docker
 
 env:
-  - distribution: centos
-    version: 6
-    init: /sbin/init
-    run_opts: ""
-  - distribution: centos
-    version: 7
-    init: /usr/lib/systemd/systemd
-    run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-
-services:
-  - docker
+  global:
+    - ROLE_NAME: repo-remi
+  matrix:
+    - MOLECULE_DISTRO: centos8
+    - MOLECULE_DISTRO: centos7
+    - MOLECULE_DISTRO: centos6
 
 before_install:
-  # Pull container
-  - 'sudo docker pull ${distribution}:${version}'
-  # Customize container
-  - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
-
-script:
-  - container_id=$(mktemp)
-  # Run container in detached state
-  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+  # Upgrade Docker to work with docker-py.
+  - curl https://gist.githubusercontent.com/geerlingguy/ce883ad4aec6a5f1187ef93bd338511e/raw/36612d28981d92863f839c5aefe5b7dd7193d6c6/travis-ci-docker-upgrade.sh | sudo bash
 
-  # Install dependencies.
-  - 'sudo docker exec "$(cat ${container_id})" ansible-galaxy install -r /etc/ansible/roles/role_under_test/tests/requirements.yml'
+install:
+  # Install test dependencies.
+  - pip install molecule yamllint ansible-lint docker
 
-  # Ansible syntax check.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
+before_script:
+  # Use actual Ansible Galaxy role name for the project directory.
+  - cd ../
+  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
+  - cd geerlingguy.$ROLE_NAME
 
-  # Test role.
-  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
-
-  # Test role idempotence.
-  - >
-    sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
-
-  # Clean up
-  - 'sudo docker stop "$(cat ${container_id})"'
+script:
+  # Run tests.
+  - molecule test
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.repo-remi/.yamllint b/provisioning/roles/geerlingguy.repo-remi/.yamllint
new file mode 100644
index 000000000..76a383c6a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.repo-remi/.yamllint
@@ -0,0 +1,10 @@
+---
+extends: default
+
+rules:
+  line-length:
+    max: 120
+    level: warning
+
+ignore: |
+  .github/stale.yml
diff --git a/provisioning/roles/geerlingguy.repo-remi/LICENSE b/provisioning/roles/geerlingguy.repo-remi/LICENSE
new file mode 100644
index 000000000..4275cf3c1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.repo-remi/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Jeff Geerling
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/provisioning/roles/geerlingguy.repo-remi/README.md b/provisioning/roles/geerlingguy.repo-remi/README.md
index c93ee157a..752ef878f 100644
--- a/provisioning/roles/geerlingguy.repo-remi/README.md
+++ b/provisioning/roles/geerlingguy.repo-remi/README.md
@@ -12,11 +12,11 @@ None.
 
 Available variables are listed below, along with default values (see `defaults/main.yml`):
 
-    remi_repo_url: "http://rpms.famillecollet.com/enterprise/remi-release-{{ ansible_distribution_major_version }}.rpm"
+    remi_repo_url: "https://rpms.remirepo.net/enterprise/remi-release-{{ ansible_distribution_major_version }}.rpm"
 
 The URL from which the Remi repo `.rpm` will be downloaded and installed.
 
-    remi_repo_gpg_key_url: "http://rpms.remirepo.net/RPM-GPG-KEY-remi"
+    remi_repo_gpg_key_url: "https://rpms.remirepo.net/RPM-GPG-KEY-remi2018"
 
 Remi repo GPG key location. Can be set to a local file or to the URL from Remi's website.
 
@@ -36,4 +36,4 @@ MIT / BSD
 
 ## Author Information
 
-This role was created in 2014 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
+This role was created in 2014 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.repo-remi/defaults/main.yml b/provisioning/roles/geerlingguy.repo-remi/defaults/main.yml
index c4827c60c..0dd05f17d 100644
--- a/provisioning/roles/geerlingguy.repo-remi/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.repo-remi/defaults/main.yml
@@ -1,3 +1,3 @@
 ---
-remi_repo_url: "http://rpms.remirepo.net/enterprise/remi-release-{{ ansible_distribution_major_version }}.rpm"
-remi_repo_gpg_key_url: "http://rpms.remirepo.net/RPM-GPG-KEY-remi"
+remi_repo_url: "https://rpms.remirepo.net/enterprise/remi-release-{{ ansible_distribution_major_version }}.rpm"
+remi_repo_gpg_key_url: "https://rpms.remirepo.net/RPM-GPG-KEY-remi2018"
diff --git a/provisioning/roles/geerlingguy.repo-remi/meta/main.yml b/provisioning/roles/geerlingguy.repo-remi/meta/main.yml
index 1f4e932f9..e3eb3b1d4 100644
--- a/provisioning/roles/geerlingguy.repo-remi/meta/main.yml
+++ b/provisioning/roles/geerlingguy.repo-remi/meta/main.yml
@@ -2,14 +2,24 @@
 dependencies: []
 
 galaxy_info:
+  # See: https://github.com/ansible/galaxy/issues/2393
+  # role_name: repo-remi
   author: geerlingguy
   description: Remi's RPM repository for RHEL/CentOS.
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 1.8
+  min_ansible_version: 2.4
   platforms:
     - name: EL
       versions:
-      - all
+        - all
   galaxy_tags:
     - packaging
+    - epel
+    - repository
+    - repo
+    - remi
+    - php
+    - redhat
+    - rhel
+    - centos
diff --git a/provisioning/roles/geerlingguy.repo-remi/molecule/default/converge.yml b/provisioning/roles/geerlingguy.repo-remi/molecule/default/converge.yml
new file mode 100644
index 000000000..9af25d7e9
--- /dev/null
+++ b/provisioning/roles/geerlingguy.repo-remi/molecule/default/converge.yml
@@ -0,0 +1,7 @@
+---
+- name: Converge
+  hosts: all
+  become: true
+
+  roles:
+    - role: geerlingguy.repo-remi
diff --git a/provisioning/roles/geerlingguy.repo-remi/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.repo-remi/molecule/default/molecule.yml
new file mode 100644
index 000000000..2da47dd1f
--- /dev/null
+++ b/provisioning/roles/geerlingguy.repo-remi/molecule/default/molecule.yml
@@ -0,0 +1,21 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint: |
+  set -e
+  yamllint .
+  ansible-lint
+platforms:
+  - name: instance
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    privileged: true
+    pre_build_image: true
+provisioner:
+  name: ansible
+  playbooks:
+    converge: ${MOLECULE_PLAYBOOK:-converge.yml}
diff --git a/provisioning/roles/geerlingguy.repo-remi/tasks/main.yml b/provisioning/roles/geerlingguy.repo-remi/tasks/main.yml
index b9c50b955..3adfb310b 100644
--- a/provisioning/roles/geerlingguy.repo-remi/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.repo-remi/tasks/main.yml
@@ -1,10 +1,10 @@
 ---
-- name: Install remi repo.
-  yum:
-    name: "{{ remi_repo_url }}"
-    state: present
-
 - name: Import remi GPG key.
   rpm_key:
     key: "{{ remi_repo_gpg_key_url }}"
     state: present
+
+- name: Install remi repo.
+  yum:
+    name: "{{ remi_repo_url }}"
+    state: present
diff --git a/provisioning/roles/geerlingguy.repo-remi/tests/Dockerfile.centos-6 b/provisioning/roles/geerlingguy.repo-remi/tests/Dockerfile.centos-6
deleted file mode 100644
index 7df05ff57..000000000
--- a/provisioning/roles/geerlingguy.repo-remi/tests/Dockerfile.centos-6
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM centos:6
-
-# Install Ansible
-RUN yum -y update; yum clean all;
-RUN yum -y install epel-release
-RUN yum -y install git python-setuptools gcc sudo libffi-devel python-devel openssl-devel
-RUN yum clean all
-RUN easy_install pip
-RUN pip install ansible
-
-
-# Disable requiretty
-RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
-
-# Install Ansible inventory file
-RUN mkdir - p /etc/ansible
-RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
-
-CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.repo-remi/tests/Dockerfile.centos-7 b/provisioning/roles/geerlingguy.repo-remi/tests/Dockerfile.centos-7
deleted file mode 100644
index ded17f155..000000000
--- a/provisioning/roles/geerlingguy.repo-remi/tests/Dockerfile.centos-7
+++ /dev/null
@@ -1,29 +0,0 @@
-FROM centos:7
-
-# Install systemd -- See https://hub.docker.com/_/centos/
-RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
-RUN yum -y update; yum clean all; \
-(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
-rm -f /lib/systemd/system/multi-user.target.wants/*; \
-rm -f /etc/systemd/system/*.wants/*; \
-rm -f /lib/systemd/system/local-fs.target.wants/*; \
-rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
-rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
-rm -f /lib/systemd/system/basic.target.wants/*; \
-rm -f /lib/systemd/system/anaconda.target.wants/*;
-
-# Install Ansible
-RUN yum -y install git python-setuptools gcc sudo libffi-devel python-devel openssl-devel
-RUN yum clean all
-RUN easy_install pip
-RUN pip install ansible
-
-# Disable requiretty
-RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
-
-# Install Ansible inventory file
-RUN mkdir - p /etc/ansible
-RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
-
-VOLUME ["/sys/fs/cgroup"]
-CMD ["/usr/sbin/init"]
diff --git a/provisioning/roles/geerlingguy.repo-remi/tests/requirements.yml b/provisioning/roles/geerlingguy.repo-remi/tests/requirements.yml
deleted file mode 100644
index 711227acc..000000000
--- a/provisioning/roles/geerlingguy.repo-remi/tests/requirements.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-- src: geerlingguy.repo-remi
diff --git a/provisioning/roles/geerlingguy.repo-remi/tests/test.yml b/provisioning/roles/geerlingguy.repo-remi/tests/test.yml
deleted file mode 100644
index 3646ff420..000000000
--- a/provisioning/roles/geerlingguy.repo-remi/tests/test.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- hosts: all
-
-  roles:
-    - role_under_test
diff --git a/provisioning/roles/geerlingguy.security/.ansible-lint b/provisioning/roles/geerlingguy.security/.ansible-lint
new file mode 100644
index 000000000..555729425
--- /dev/null
+++ b/provisioning/roles/geerlingguy.security/.ansible-lint
@@ -0,0 +1,2 @@
+skip_list:
+  - '106'
diff --git a/provisioning/roles/geerlingguy.security/.travis.yml b/provisioning/roles/geerlingguy.security/.travis.yml
index a64630f9c..ded62ac67 100644
--- a/provisioning/roles/geerlingguy.security/.travis.yml
+++ b/provisioning/roles/geerlingguy.security/.travis.yml
@@ -11,6 +11,10 @@ env:
     - MOLECULE_DISTRO: ubuntu1804
     - MOLECULE_DISTRO: debian10
 
+before_install:
+  # Upgrade Docker to work with docker-py.
+  - curl https://gist.githubusercontent.com/geerlingguy/ce883ad4aec6a5f1187ef93bd338511e/raw/36612d28981d92863f839c5aefe5b7dd7193d6c6/travis-ci-docker-upgrade.sh | sudo bash
+
 install:
   # Install test dependencies.
   - pip install molecule yamllint ansible-lint docker
diff --git a/provisioning/roles/geerlingguy.security/.yamllint b/provisioning/roles/geerlingguy.security/.yamllint
index a3dbc38ee..f2033dd21 100644
--- a/provisioning/roles/geerlingguy.security/.yamllint
+++ b/provisioning/roles/geerlingguy.security/.yamllint
@@ -1,6 +1,11 @@
 ---
 extends: default
+
 rules:
   line-length:
     max: 120
     level: warning
+
+ignore: |
+  .github/stale.yml
+  .travis.yml
diff --git a/provisioning/roles/geerlingguy.security/molecule/default/converge.yml b/provisioning/roles/geerlingguy.security/molecule/default/converge.yml
index d191e1432..1271dcfdc 100644
--- a/provisioning/roles/geerlingguy.security/molecule/default/converge.yml
+++ b/provisioning/roles/geerlingguy.security/molecule/default/converge.yml
@@ -37,6 +37,7 @@
         dest: /var/log/auth.log
         content: ""
         force: false
+        mode: 0644
       when: ansible_distribution == 'Debian'
 
   roles:
diff --git a/provisioning/roles/geerlingguy.security/tasks/autoupdate-RedHat.yml b/provisioning/roles/geerlingguy.security/tasks/autoupdate-RedHat.yml
index bb4e615c2..80aa12113 100644
--- a/provisioning/roles/geerlingguy.security/tasks/autoupdate-RedHat.yml
+++ b/provisioning/roles/geerlingguy.security/tasks/autoupdate-RedHat.yml
@@ -29,6 +29,7 @@
     dest: '{{ update_conf_path }}'
     regexp: '^apply_updates = .+'
     line: 'apply_updates = yes'
+    mode: 0644
   when:
     - security_autoupdate_enabled
     - ansible_distribution_major_version | int in [7, 8]
diff --git a/provisioning/roles/geerlingguy.security/tasks/ssh.yml b/provisioning/roles/geerlingguy.security/tasks/ssh.yml
index 96c7053d8..27e42beb7 100644
--- a/provisioning/roles/geerlingguy.security/tasks/ssh.yml
+++ b/provisioning/roles/geerlingguy.security/tasks/ssh.yml
@@ -11,6 +11,7 @@
     line: "{{ item.line }}"
     state: present
     validate: 'sshd -T -f %s'
+    mode: 0644
   with_items:
     - regexp: "^PasswordAuthentication"
       line: "PasswordAuthentication {{ security_ssh_password_authentication }}"
@@ -37,6 +38,7 @@
     line: '{{ item }} ALL=(ALL) NOPASSWD: ALL'
     state: present
     validate: 'visudo -cf %s'
+    mode: 0644
   with_items: "{{ security_sudoers_passwordless }}"
   when: security_sudoers_passwordless | length > 0
 
@@ -47,5 +49,6 @@
     line: '{{ item }} ALL=(ALL) ALL'
     state: present
     validate: 'visudo -cf %s'
+    mode: 0644
   with_items: "{{ security_sudoers_passworded }}"
   when: security_sudoers_passworded | length > 0
diff --git a/provisioning/roles/geerlingguy.solr/.ansible-lint b/provisioning/roles/geerlingguy.solr/.ansible-lint
new file mode 100644
index 000000000..555729425
--- /dev/null
+++ b/provisioning/roles/geerlingguy.solr/.ansible-lint
@@ -0,0 +1,2 @@
+skip_list:
+  - '106'
diff --git a/provisioning/roles/geerlingguy.solr/.travis.yml b/provisioning/roles/geerlingguy.solr/.travis.yml
index 051ac2114..953992835 100644
--- a/provisioning/roles/geerlingguy.solr/.travis.yml
+++ b/provisioning/roles/geerlingguy.solr/.travis.yml
@@ -32,6 +32,10 @@ env:
     - MOLECULE_DISTRO: ubuntu1604
       MOLECULE_PLAYBOOK: playbook-solr-3.yml
 
+before_install:
+  # Upgrade Docker to work with docker-py.
+  - curl https://gist.githubusercontent.com/geerlingguy/ce883ad4aec6a5f1187ef93bd338511e/raw/36612d28981d92863f839c5aefe5b7dd7193d6c6/travis-ci-docker-upgrade.sh | sudo bash
+
 install:
   # Install test dependencies.
   - pip install molecule yamllint ansible-lint docker
diff --git a/provisioning/roles/geerlingguy.solr/.yamllint b/provisioning/roles/geerlingguy.solr/.yamllint
index a3dbc38ee..f2033dd21 100644
--- a/provisioning/roles/geerlingguy.solr/.yamllint
+++ b/provisioning/roles/geerlingguy.solr/.yamllint
@@ -1,6 +1,11 @@
 ---
 extends: default
+
 rules:
   line-length:
     max: 120
     level: warning
+
+ignore: |
+  .github/stale.yml
+  .travis.yml
diff --git a/provisioning/roles/geerlingguy.solr/tasks/configure.yml b/provisioning/roles/geerlingguy.solr/tasks/configure.yml
index 6123e2dd7..91ca8a372 100644
--- a/provisioning/roles/geerlingguy.solr/tasks/configure.yml
+++ b/provisioning/roles/geerlingguy.solr/tasks/configure.yml
@@ -12,6 +12,7 @@
     regexp: "{{ item.regexp }}"
     line: "{{ item.line }}"
     state: present
+    mode: 0644
   with_items:
     - regexp: "^.?SOLR_JAVA_MEM="
       line: 'SOLR_JAVA_MEM="-Xms{{ solr_xms }} -Xmx{{ solr_xmx }}"'
diff --git a/provisioning/roles/geerlingguy.solr/tasks/cores.yml b/provisioning/roles/geerlingguy.solr/tasks/cores.yml
index cd9481c9c..4baf9f038 100644
--- a/provisioning/roles/geerlingguy.solr/tasks/cores.yml
+++ b/provisioning/roles/geerlingguy.solr/tasks/cores.yml
@@ -13,6 +13,7 @@
     owner: "{{ solr_user }}"
     group: "{{ solr_user }}"
     recurse: true
+    mode: 0755
   when: "item not in solr_cores_current.content"
   with_items: "{{ solr_cores }}"
 
diff --git a/provisioning/roles/geerlingguy.solr/tasks/install-pre5.yml b/provisioning/roles/geerlingguy.solr/tasks/install-pre5.yml
index 7ae567505..aff963336 100644
--- a/provisioning/roles/geerlingguy.solr/tasks/install-pre5.yml
+++ b/provisioning/roles/geerlingguy.solr/tasks/install-pre5.yml
@@ -9,7 +9,7 @@
   when: not solr_war_file.stat.exists
 
 - name: Ensure Solr install files are owned by the solr_user.
-  file:
+  file:  # noqa 208
     path: "{{ solr_install_path }}"
     owner: "{{ solr_user }}"
     group: "{{ solr_user }}"
@@ -39,10 +39,11 @@
     dest: "{{ solr_home }}/collection1/conf/solrconfig.xml"
     regexp: ^.+solr\.install\.dir.+$
     replace: ""
+    mode: 0644
   when: "not solr_example.stat.exists and solr_version.split('.')[0] == '4'"
 
 - name: Ensure Solr home files are owned by the solr_user.
-  file:
+  file:  # noqa 208
     path: "{{ solr_home }}"
     owner: "{{ solr_user }}"
     group: "{{ solr_user }}"

From 97c006dbbfef9b5b146a7d6bb8e9e34fcc1f9409 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 29 Sep 2020 19:30:02 -0500
Subject: [PATCH 1206/1273] Issue #2076: Update php-versions role to latest
 version.

---
 provisioning/requirements.yml                                 | 2 +-
 provisioning/roles/geerlingguy.php-versions/.ansible-lint     | 1 +
 provisioning/roles/geerlingguy.php-versions/.travis.yml       | 4 ++++
 provisioning/roles/geerlingguy.php-versions/.yamllint         | 4 ++++
 provisioning/roles/geerlingguy.php-versions/meta/main.yml     | 2 ++
 .../geerlingguy.php-versions/molecule/default/molecule.yml    | 1 +
 provisioning/roles/geerlingguy.php-versions/vars/Debian.yml   | 1 +
 7 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index f0578365e..f5aea5596 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -57,7 +57,7 @@ roles:
   - name: geerlingguy.php-tideways
     version: 2.2.0
   - name: geerlingguy.php-versions
-    version: 4.0.3
+    version: 4.0.4
   - name: geerlingguy.php-xdebug
     version: 3.0.0
   - name: geerlingguy.php-xhprof
diff --git a/provisioning/roles/geerlingguy.php-versions/.ansible-lint b/provisioning/roles/geerlingguy.php-versions/.ansible-lint
index f7ae1c6d1..e42fb8085 100644
--- a/provisioning/roles/geerlingguy.php-versions/.ansible-lint
+++ b/provisioning/roles/geerlingguy.php-versions/.ansible-lint
@@ -1,3 +1,4 @@
 skip_list:
   - '306'
   - '503'
+  - '106'
diff --git a/provisioning/roles/geerlingguy.php-versions/.travis.yml b/provisioning/roles/geerlingguy.php-versions/.travis.yml
index 694160a4a..0a7084867 100644
--- a/provisioning/roles/geerlingguy.php-versions/.travis.yml
+++ b/provisioning/roles/geerlingguy.php-versions/.travis.yml
@@ -28,6 +28,10 @@ env:
     - MOLECULE_DISTRO: ubuntu1804
       MOLECULE_PLAYBOOK: playbook-7.2.yml
 
+before_install:
+  # Upgrade Docker to work with docker-py.
+  - curl https://gist.githubusercontent.com/geerlingguy/ce883ad4aec6a5f1187ef93bd338511e/raw/36612d28981d92863f839c5aefe5b7dd7193d6c6/travis-ci-docker-upgrade.sh | sudo bash
+
 install:
   # Install test dependencies.
   - pip install molecule yamllint ansible-lint docker
diff --git a/provisioning/roles/geerlingguy.php-versions/.yamllint b/provisioning/roles/geerlingguy.php-versions/.yamllint
index a3dbc38ee..76a383c6a 100644
--- a/provisioning/roles/geerlingguy.php-versions/.yamllint
+++ b/provisioning/roles/geerlingguy.php-versions/.yamllint
@@ -1,6 +1,10 @@
 ---
 extends: default
+
 rules:
   line-length:
     max: 120
     level: warning
+
+ignore: |
+  .github/stale.yml
diff --git a/provisioning/roles/geerlingguy.php-versions/meta/main.yml b/provisioning/roles/geerlingguy.php-versions/meta/main.yml
index 059eeebe0..f145cd636 100644
--- a/provisioning/roles/geerlingguy.php-versions/meta/main.yml
+++ b/provisioning/roles/geerlingguy.php-versions/meta/main.yml
@@ -2,6 +2,8 @@
 dependencies: []
 
 galaxy_info:
+  # See: https://github.com/ansible/galaxy/issues/2393
+  # role_name: php-versions
   author: geerlingguy
   description: Allows different PHP versions to be installed.
   company: "Midwestern Mac, LLC"
diff --git a/provisioning/roles/geerlingguy.php-versions/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.php-versions/molecule/default/molecule.yml
index 38eb962bd..2da47dd1f 100644
--- a/provisioning/roles/geerlingguy.php-versions/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.php-versions/molecule/default/molecule.yml
@@ -4,6 +4,7 @@ dependency:
 driver:
   name: docker
 lint: |
+  set -e
   yamllint .
   ansible-lint
 platforms:
diff --git a/provisioning/roles/geerlingguy.php-versions/vars/Debian.yml b/provisioning/roles/geerlingguy.php-versions/vars/Debian.yml
index 678b29c3b..06ad544bf 100644
--- a/provisioning/roles/geerlingguy.php-versions/vars/Debian.yml
+++ b/provisioning/roles/geerlingguy.php-versions/vars/Debian.yml
@@ -41,3 +41,4 @@ __php_packages:
 php_versions_debian:
   - php7.2-common
   - php7.3-common
+  - php7.4-common

From af97556ae48600bad242e583d995b3cbf450299f Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 29 Sep 2020 19:34:45 -0500
Subject: [PATCH 1207/1273] Update list of branches to build on push.

---
 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index cefd44b75..652434e40 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,10 @@ language: php
 php: 7.4
 services: docker
 
+branches:
+  only:
+    - master
+
 env:
   global:
     - CONFIG: tests/config.yml

From 88144b6c250fdf3cba77d39af1424b236ebe7e89 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 29 Sep 2020 19:37:41 -0500
Subject: [PATCH 1208/1273] Update README.md

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

diff --git a/README.md b/README.md
index b347b0196..f392b91c7 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ There are a couple places where you can customize the VM for your needs:
 If you want to use Drupal 8 on the initial install, do the following:
 
   1. Set `drupal_major_version: 8` inside `config.yml`.
-  2. Set `drupal_composer_project_package: "drupal/recommended-project:^8@dev" inside `config.yml`.
+  2. Set `drupal_composer_project_package: "drupal/recommended-project:^8@dev"` inside `config.yml`.
   
   
 If you want to use Drupal 7 on the initial install, do the following:

From 013c2a0098779ade442cc23db57636006de381d6 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 29 Sep 2020 22:26:27 -0500
Subject: [PATCH 1209/1273] Issue #2089: Update CHANGELOG in preparation for
 6.0.1 release.

---
 CHANGELOG.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc2a862a6..015c0069e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Drupal VM Changelog
 
+## 6.0.1 (2020-09-29)
+
+### New/changed variables in default.config.yml
+
+N/A
+
+### Improvements
+
+  * #2083: Improve README guide for installing Drupal 8 instead of default Drupal 9.
+  * Updated roles: security, nginx, mysql, php, php-mysql, solr, elasticsearch, repo-remi, composer.
+
+### Bugfixes
+
+  * #2076: Fix bug when switching PHP versions to/from PHP 7.4.
+
+
 ## 6.0.0 "Rectifier" (2020-07-14)
 
 Drupal VM 6 drops support for some older OS distributions, to increase stability under the latest versions of Ubuntu, CentOS, and Debian, and to finally drop all support for the now-unsupported Python 2.

From 4fc9ffff80c3356310e304f527fddb1cb0365e4a Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 29 Sep 2020 22:28:12 -0500
Subject: [PATCH 1210/1273] Tweak CHANGELOG for consistency [ci skip].

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 015c0069e..ed897e788 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## 6.0.1 (2020-09-29)
 
+### Breaking Changes
+
+N/A
+
 ### New/changed variables in default.config.yml
 
 N/A

From 286432d26d6831db7f1c97b58113b51db0fac56c Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 29 Sep 2020 22:48:06 -0500
Subject: [PATCH 1211/1273] Add EPEL repo for better compatibility with all
 RedHat and UBI-flavored installations.

---
 provisioning/playbook.yml                     |  1 +
 provisioning/requirements.yml                 |  4 +-
 .../roles/geerlingguy.repo-epel/.ansible-lint |  2 +
 .../geerlingguy.repo-epel/.github/FUNDING.yml |  4 ++
 .../geerlingguy.repo-epel/.github/stale.yml   | 56 +++++++++++++++++++
 .../roles/geerlingguy.repo-epel/.gitignore    |  3 +
 .../roles/geerlingguy.repo-epel/.travis.yml   | 32 +++++++++++
 .../roles/geerlingguy.repo-epel/.yamllint     | 11 ++++
 .../roles/geerlingguy.repo-epel/LICENSE       | 20 +++++++
 .../roles/geerlingguy.repo-epel/README.md     | 40 +++++++++++++
 .../geerlingguy.repo-epel/defaults/main.yml   |  5 ++
 .../roles/geerlingguy.repo-epel/meta/main.yml | 26 +++++++++
 .../molecule/default/converge.yml             |  7 +++
 .../molecule/default/molecule.yml             | 21 +++++++
 .../geerlingguy.repo-epel/tasks/main.yml      | 35 ++++++++++++
 15 files changed, 266 insertions(+), 1 deletion(-)
 create mode 100644 provisioning/roles/geerlingguy.repo-epel/.ansible-lint
 create mode 100644 provisioning/roles/geerlingguy.repo-epel/.github/FUNDING.yml
 create mode 100644 provisioning/roles/geerlingguy.repo-epel/.github/stale.yml
 create mode 100644 provisioning/roles/geerlingguy.repo-epel/.gitignore
 create mode 100644 provisioning/roles/geerlingguy.repo-epel/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.repo-epel/.yamllint
 create mode 100644 provisioning/roles/geerlingguy.repo-epel/LICENSE
 create mode 100644 provisioning/roles/geerlingguy.repo-epel/README.md
 create mode 100644 provisioning/roles/geerlingguy.repo-epel/defaults/main.yml
 create mode 100644 provisioning/roles/geerlingguy.repo-epel/meta/main.yml
 create mode 100644 provisioning/roles/geerlingguy.repo-epel/molecule/default/converge.yml
 create mode 100644 provisioning/roles/geerlingguy.repo-epel/molecule/default/molecule.yml
 create mode 100644 provisioning/roles/geerlingguy.repo-epel/tasks/main.yml

diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index f16a160f2..1578c44b2 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -32,6 +32,7 @@
 
   roles:
     # Essential roles.
+    - { role: geerlingguy.repo-epel, when: ansible_os_family == 'RedHat' }
     - { role: geerlingguy.repo-remi, when: ansible_os_family == 'RedHat', tags: ['webserver', 'php'] }
     - { role: drupalvm.hostname, when: hostname_configure }
     - { role: geerlingguy.firewall, when: firewall_enabled }
diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index f5aea5596..653df3eeb 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -70,8 +70,10 @@ roles:
     version: 2.2.1
   - name: geerlingguy.redis
     version: 1.6.0
+  - name: geerlingguy.repo-epel
+    version: 3.0.0
   - name: geerlingguy.repo-remi
-    version: 1.2.0
+    version: 2.0.1
   - name: geerlingguy.ruby
     version: 2.6.0
   - name: geerlingguy.security
diff --git a/provisioning/roles/geerlingguy.repo-epel/.ansible-lint b/provisioning/roles/geerlingguy.repo-epel/.ansible-lint
new file mode 100644
index 000000000..555729425
--- /dev/null
+++ b/provisioning/roles/geerlingguy.repo-epel/.ansible-lint
@@ -0,0 +1,2 @@
+skip_list:
+  - '106'
diff --git a/provisioning/roles/geerlingguy.repo-epel/.github/FUNDING.yml b/provisioning/roles/geerlingguy.repo-epel/.github/FUNDING.yml
new file mode 100644
index 000000000..96b493831
--- /dev/null
+++ b/provisioning/roles/geerlingguy.repo-epel/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+---
+github: geerlingguy
+patreon: geerlingguy
diff --git a/provisioning/roles/geerlingguy.repo-epel/.github/stale.yml b/provisioning/roles/geerlingguy.repo-epel/.github/stale.yml
new file mode 100644
index 000000000..c7ff12754
--- /dev/null
+++ b/provisioning/roles/geerlingguy.repo-epel/.github/stale.yml
@@ -0,0 +1,56 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 90
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 30
+
+# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
+onlyLabels: []
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - pinned
+  - security
+  - planned
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: false
+
+# Label to use when marking as stale
+staleLabel: stale
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+pulls:
+  markComment: |-
+    This pull request has been marked 'stale' due to lack of recent activity. If there is no further activity, the PR will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark pull requests as stale.
+
+  unmarkComment: >-
+    This pull request is no longer marked for closure.
+
+  closeComment: >-
+    This pull request has been closed due to inactivity. If you feel this is in error, please reopen the pull request or file a new PR with the relevant details.
+
+issues:
+  markComment: |-
+    This issue has been marked 'stale' due to lack of recent activity. If there is no further activity, the issue will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark issues as stale.
+
+  unmarkComment: >-
+    This issue is no longer marked for closure.
+
+  closeComment: >-
+    This issue has been closed due to inactivity. If you feel this is in error, please reopen the issue or file a new issue with the relevant details.
diff --git a/provisioning/roles/geerlingguy.repo-epel/.gitignore b/provisioning/roles/geerlingguy.repo-epel/.gitignore
new file mode 100644
index 000000000..f56f5b578
--- /dev/null
+++ b/provisioning/roles/geerlingguy.repo-epel/.gitignore
@@ -0,0 +1,3 @@
+*.retry
+*/__pycache__
+*.pyc
diff --git a/provisioning/roles/geerlingguy.repo-epel/.travis.yml b/provisioning/roles/geerlingguy.repo-epel/.travis.yml
new file mode 100644
index 000000000..725ce9f91
--- /dev/null
+++ b/provisioning/roles/geerlingguy.repo-epel/.travis.yml
@@ -0,0 +1,32 @@
+---
+language: python
+services: docker
+
+env:
+  global:
+    - ROLE_NAME: repo-epel
+  matrix:
+    - MOLECULE_DISTRO: centos8
+    - MOLECULE_DISTRO: centos7
+    - MOLECULE_DISTRO: centos6
+
+before_install:
+  # Upgrade Docker to work with docker-py.
+  - curl https://gist.githubusercontent.com/geerlingguy/ce883ad4aec6a5f1187ef93bd338511e/raw/36612d28981d92863f839c5aefe5b7dd7193d6c6/travis-ci-docker-upgrade.sh | sudo bash
+
+install:
+  # Install test dependencies.
+  - pip install molecule yamllint ansible-lint docker
+
+before_script:
+  # Use actual Ansible Galaxy role name for the project directory.
+  - cd ../
+  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
+  - cd geerlingguy.$ROLE_NAME
+
+script:
+  # Run tests.
+  - molecule test
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.repo-epel/.yamllint b/provisioning/roles/geerlingguy.repo-epel/.yamllint
new file mode 100644
index 000000000..dc34c1953
--- /dev/null
+++ b/provisioning/roles/geerlingguy.repo-epel/.yamllint
@@ -0,0 +1,11 @@
+---
+extends: default
+
+rules:
+  line-length:
+    max: 140
+    level: warning
+
+ignore: |
+  .github/stale.yml
+  .travis.yml
diff --git a/provisioning/roles/geerlingguy.repo-epel/LICENSE b/provisioning/roles/geerlingguy.repo-epel/LICENSE
new file mode 100644
index 000000000..4275cf3c1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.repo-epel/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Jeff Geerling
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/provisioning/roles/geerlingguy.repo-epel/README.md b/provisioning/roles/geerlingguy.repo-epel/README.md
new file mode 100644
index 000000000..1eea16483
--- /dev/null
+++ b/provisioning/roles/geerlingguy.repo-epel/README.md
@@ -0,0 +1,40 @@
+# Ansible Role: EPEL Repository
+
+[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-repo-epel.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-repo-epel)
+
+Installs the [EPEL repository](https://fedoraproject.org/wiki/EPEL) (Extra Packages for Enterprise Linux) for RHEL/CentOS.
+
+## Requirements
+
+This role only is needed/runs on RHEL and its derivatives.
+
+## Role Variables
+
+Available variables are listed below, along with default values (see `defaults/main.yml`):
+
+    epel_repo_url: "http://download.fedoraproject.org/pub/epel/{{ ansible_distribution_major_version }}/{{ ansible_userspace_architecture }}{{ '/' if ansible_distribution_major_version < '7' else '/e/' }}epel-release-{{ ansible_distribution_major_version }}-{{ epel_release[ansible_distribution_major_version] }}.noarch.rpm"
+    epel_repo_gpg_key_url: "/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-{{ ansible_distribution_major_version }}"
+
+The EPEL repo URL and GPG key URL. Generally, these should not be changed, but if this role is out of date, or if you need a very specific version, these can both be overridden.
+
+    epel_repo_disable: false
+
+Set to `true` to disable the EPEL repo (even if already installed).
+
+## Dependencies
+
+None.
+
+## Example Playbook
+
+    - hosts: servers
+      roles:
+        - geerlingguy.repo-epel
+
+## License
+
+MIT / BSD
+
+## Author Information
+
+This role was created in 2014 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.repo-epel/defaults/main.yml b/provisioning/roles/geerlingguy.repo-epel/defaults/main.yml
new file mode 100644
index 000000000..9e308c9e3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.repo-epel/defaults/main.yml
@@ -0,0 +1,5 @@
+---
+epel_repo_url: "https://dl.fedoraproject.org/pub/epel/epel-release-latest-{{ ansible_distribution_major_version }}.noarch.rpm"
+epel_repo_gpg_key_url: "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-{{ ansible_distribution_major_version }}"
+epel_repofile_path: "/etc/yum.repos.d/epel.repo"
+epel_repo_disable: false
diff --git a/provisioning/roles/geerlingguy.repo-epel/meta/main.yml b/provisioning/roles/geerlingguy.repo-epel/meta/main.yml
new file mode 100644
index 000000000..f9674b3f4
--- /dev/null
+++ b/provisioning/roles/geerlingguy.repo-epel/meta/main.yml
@@ -0,0 +1,26 @@
+---
+dependencies: []
+
+galaxy_info:
+  # See: https://github.com/ansible/galaxy/issues/2393
+  # role_name: repo-epel
+  author: geerlingguy
+  description: EPEL repository for RHEL/CentOS.
+  company: "Midwestern Mac, LLC"
+  license: "license (BSD, MIT)"
+  min_ansible_version: 2.5
+  platforms:
+    - name: EL
+      versions:
+        - 5
+        - 6
+        - 7
+        - 8
+  galaxy_tags:
+    - packaging
+    - epel
+    - repository
+    - repo
+    - redhat
+    - centos
+    - rhel
diff --git a/provisioning/roles/geerlingguy.repo-epel/molecule/default/converge.yml b/provisioning/roles/geerlingguy.repo-epel/molecule/default/converge.yml
new file mode 100644
index 000000000..a1bc3193b
--- /dev/null
+++ b/provisioning/roles/geerlingguy.repo-epel/molecule/default/converge.yml
@@ -0,0 +1,7 @@
+---
+- name: Converge
+  hosts: all
+  become: true
+
+  roles:
+    - role: geerlingguy.repo-epel
diff --git a/provisioning/roles/geerlingguy.repo-epel/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.repo-epel/molecule/default/molecule.yml
new file mode 100644
index 000000000..2da47dd1f
--- /dev/null
+++ b/provisioning/roles/geerlingguy.repo-epel/molecule/default/molecule.yml
@@ -0,0 +1,21 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint: |
+  set -e
+  yamllint .
+  ansible-lint
+platforms:
+  - name: instance
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    privileged: true
+    pre_build_image: true
+provisioner:
+  name: ansible
+  playbooks:
+    converge: ${MOLECULE_PLAYBOOK:-converge.yml}
diff --git a/provisioning/roles/geerlingguy.repo-epel/tasks/main.yml b/provisioning/roles/geerlingguy.repo-epel/tasks/main.yml
new file mode 100644
index 000000000..4dee06358
--- /dev/null
+++ b/provisioning/roles/geerlingguy.repo-epel/tasks/main.yml
@@ -0,0 +1,35 @@
+---
+- name: Check if EPEL repo is already configured.
+  stat:
+    path: "{{ epel_repofile_path }}"
+  register: epel_repofile_result
+
+- name: Import EPEL GPG key.
+  rpm_key:
+    key: "{{ epel_repo_gpg_key_url }}"
+    state: present
+  register: result
+  until: result is succeeded
+  retries: 5
+  delay: 10
+  when: not epel_repofile_result.stat.exists
+  ignore_errors: "{{ ansible_check_mode }}"
+
+- name: Install EPEL repo.
+  yum:
+    name: "{{ epel_repo_url }}"
+    state: present
+  register: result
+  until: result is succeeded
+  retries: 5
+  delay: 10
+  when: not epel_repofile_result.stat.exists
+
+- name: Disable Main EPEL repo.
+  ini_file:
+    path: "/etc/yum.repos.d/epel.repo"
+    section: epel
+    option: enabled
+    value: 0
+    mode: 0644
+  when: epel_repo_disable

From 3af991fd607b744513bcd6e76634a18eafe1e9b4 Mon Sep 17 00:00:00 2001
From: Caleb Tucker-Raymond <caleb.tucker-raymond@oregonmetro.gov>
Date: Thu, 15 Oct 2020 10:13:28 -0700
Subject: [PATCH 1212/1273] Fixes syntax errors in example.drupal.composer.json
 #2094

---
 example.drupal.composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/example.drupal.composer.json b/example.drupal.composer.json
index 17f436960..2ff33bb63 100644
--- a/example.drupal.composer.json
+++ b/example.drupal.composer.json
@@ -20,7 +20,7 @@
         "drupal/core-composer-scaffold": "^9",
         "drupal/core-project-message": "^9",
         "drupal/core-recommended": "^9",
-        "drush/drush:^10"
+        "drush/drush": "^10"
     },
     "conflict": {
         "drupal/drupal": "*"
@@ -58,7 +58,7 @@
             "web/themes/custom/{$name}": [
                 "type:drupal-custom-theme"
             ]
-        },
+        }
     },
     "config": {
         "process-timeout": 1200

From 71f086bb8dc5367b6ff361d5423f804b5457d7d6 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 23 Oct 2020 14:15:08 -0500
Subject: [PATCH 1213/1273] Update PHP role to latest version.

---
 provisioning/requirements.yml                       |  2 +-
 provisioning/roles/geerlingguy.php/.ansible-lint    |  1 +
 provisioning/roles/geerlingguy.php/.travis.yml      |  6 +++++-
 provisioning/roles/geerlingguy.php/.yamllint        |  2 ++
 provisioning/roles/geerlingguy.php/README.md        |  7 ++++---
 .../roles/geerlingguy.php/defaults/main.yml         |  3 ++-
 .../roles/geerlingguy.php/tasks/configure-fpm.yml   |  1 +
 .../roles/geerlingguy.php/tasks/configure.yml       |  1 +
 .../geerlingguy.php/tasks/install-from-source.yml   | 13 +++++++------
 provisioning/roles/geerlingguy.php/tasks/main.yml   |  3 ++-
 10 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 653df3eeb..c17ba7eaf 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -43,7 +43,7 @@ roles:
   - name: geerlingguy.nodejs
     version: 5.1.1
   - name: geerlingguy.php
-    version: 4.5.0
+    version: 4.5.1
   - name: geerlingguy.php-memcached
     version: 2.0.2
   - name: geerlingguy.php-mysql
diff --git a/provisioning/roles/geerlingguy.php/.ansible-lint b/provisioning/roles/geerlingguy.php/.ansible-lint
index 195bd18ee..9034f22ad 100644
--- a/provisioning/roles/geerlingguy.php/.ansible-lint
+++ b/provisioning/roles/geerlingguy.php/.ansible-lint
@@ -2,3 +2,4 @@ skip_list:
   - '306'
   - '405'
   - '503'
+  - '106'
diff --git a/provisioning/roles/geerlingguy.php/.travis.yml b/provisioning/roles/geerlingguy.php/.travis.yml
index 044c94069..f13e273de 100644
--- a/provisioning/roles/geerlingguy.php/.travis.yml
+++ b/provisioning/roles/geerlingguy.php/.travis.yml
@@ -16,9 +16,13 @@ env:
     - MOLECULE_DISTRO: centos7
       MOLECULE_PLAYBOOK: playbook-source.yml
 
+before_install:
+  # Upgrade Docker to work with docker-py.
+  - curl https://gist.githubusercontent.com/geerlingguy/ce883ad4aec6a5f1187ef93bd338511e/raw/36612d28981d92863f839c5aefe5b7dd7193d6c6/travis-ci-docker-upgrade.sh | sudo bash
+
 install:
   # Install test dependencies.
-  - pip install molecule yamllint ansible-lint docker
+  - pip install molecule[docker] yamllint ansible-lint docker
 
 before_script:
   # Use actual Ansible Galaxy role name for the project directory.
diff --git a/provisioning/roles/geerlingguy.php/.yamllint b/provisioning/roles/geerlingguy.php/.yamllint
index dff5082ff..f2033dd21 100644
--- a/provisioning/roles/geerlingguy.php/.yamllint
+++ b/provisioning/roles/geerlingguy.php/.yamllint
@@ -1,5 +1,6 @@
 ---
 extends: default
+
 rules:
   line-length:
     max: 120
@@ -7,3 +8,4 @@ rules:
 
 ignore: |
   .github/stale.yml
+  .travis.yml
diff --git a/provisioning/roles/geerlingguy.php/README.md b/provisioning/roles/geerlingguy.php/README.md
index 10f36249f..c56dea719 100644
--- a/provisioning/roles/geerlingguy.php/README.md
+++ b/provisioning/roles/geerlingguy.php/README.md
@@ -34,9 +34,9 @@ The default values for the HTTP server deamon are `httpd` (used by Apache) for R
 
 (RedHat/CentOS only) If you have enabled any additional repositories (might I suggest [geerlingguy.repo-epel](https://github.com/geerlingguy/ansible-role-repo-epel) or [geerlingguy.repo-remi](https://github.com/geerlingguy/ansible-role-repo-remi)), those repositories can be listed under this variable (e.g. `remi-php70,epel`). This can be handy, as an example, if you want to install the latest version of PHP 7.0, which is in the Remi repository.
 
-    php_default_version_debian: "7.0"
+    php_default_version_debian: ""
 
-(Debian/Ubuntu only) The default version of PHP in the given OS version repositories. Defaults to the latest Ubuntu LTS release. Ubuntu 18.04 needs this to be set to `"7.2"` since PHP 7.0 is not available in the default bionic packages.
+(Debian/Ubuntu only) The default version of PHP in the given OS version repositories. The specific version is set per distro and per version, but you can override it by providing a value here, like `"7.4"`.
 
 **If you'd like to be able to switch PHP versions easily, or use a version that's not available in system packages**: You can use the [`geerlingguy.php-versions`](https://galaxy.ansible.com/geerlingguy/php-versions/) role to more easily switch between major PHP versions (e.g. 5.6, 7.1, 7.2).
 
@@ -182,8 +182,9 @@ The version of PHP to install from source (a git branch, tag, or commit hash).
     php_source_clone_depth: 1
     php_source_install_path: "/opt/php"
     php_source_install_gmp_path: "/usr/include/x86_64-linux-gnu/gmp.h"
+    php_source_mysql_config: "/usr/bin/mysql_config"
 
-Location where source will be cloned and installed, and the location of the GMP header file (which can be platform/distribution specific).
+Location where source will be cloned and installed, and the location of the GMP header file (which can be platform/distribution specific), and `mysql_config` binary (this may be `mariadb_config` in newer operating system versions).
 
     php_source_make_command: "make"
 
diff --git a/provisioning/roles/geerlingguy.php/defaults/main.yml b/provisioning/roles/geerlingguy.php/defaults/main.yml
index 3e2c68644..e716d5909 100644
--- a/provisioning/roles/geerlingguy.php/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.php/defaults/main.yml
@@ -98,6 +98,7 @@ php_source_clone_dir: "~/php-src"
 php_source_clone_depth: 1
 php_source_install_path: "/opt/php"
 php_source_install_gmp_path: "/usr/include/x86_64-linux-gnu/gmp.h"
+php_source_mysql_config: "/usr/bin/mysql_config"
 # For faster compile time: "make --jobs=X" where X is # of cores present.
 php_source_make_command: "make"
 php_source_configure_command: >
@@ -136,4 +137,4 @@ php_source_configure_command: >
   --with-zlib=/usr
   --with-bz2=/usr
   --with-recode=/usr
-  --with-mysqli=/usr/bin/mysql_config
+  --with-mysqli={{ php_source_mysql_config }}
diff --git a/provisioning/roles/geerlingguy.php/tasks/configure-fpm.yml b/provisioning/roles/geerlingguy.php/tasks/configure-fpm.yml
index fa0dbc4a0..dfebf0be1 100644
--- a/provisioning/roles/geerlingguy.php/tasks/configure-fpm.yml
+++ b/provisioning/roles/geerlingguy.php/tasks/configure-fpm.yml
@@ -49,6 +49,7 @@
     regexp: "{{ item.regexp }}"
     line: "{{ item.line }}"
     state: present
+    mode: 0644
   with_items:
     - regexp: "^user.?=.+$"
       line: "user = {{ php_fpm_pool_user }}"
diff --git a/provisioning/roles/geerlingguy.php/tasks/configure.yml b/provisioning/roles/geerlingguy.php/tasks/configure.yml
index f4fa94c4d..e0e1434bc 100644
--- a/provisioning/roles/geerlingguy.php/tasks/configure.yml
+++ b/provisioning/roles/geerlingguy.php/tasks/configure.yml
@@ -4,6 +4,7 @@
     path: "{{ item }}"
     state: directory
     follow: true
+    mode: 0755
   with_flattened:
     - "{{ php_conf_paths }}"
     - "{{ php_extension_conf_paths }}"
diff --git a/provisioning/roles/geerlingguy.php/tasks/install-from-source.yml b/provisioning/roles/geerlingguy.php/tasks/install-from-source.yml
index cde8e5c89..cd18daacf 100644
--- a/provisioning/roles/geerlingguy.php/tasks/install-from-source.yml
+++ b/provisioning/roles/geerlingguy.php/tasks/install-from-source.yml
@@ -43,8 +43,8 @@
       - bison
       - pkg-config
       - re2c
-      - sqlite-dev
-      - libonig2
+      - libsqlite3-dev
+      - libonig-dev
       - libxml2-dev
       - libcurl4-openssl-dev
       - libbz2-dev
@@ -54,7 +54,7 @@
       - libfreetype6-dev
       - libgmp3-dev
       - libmcrypt-dev
-      - libmysqlclient-dev
+      - libmariadbclient-dev
       - libpspell-dev
       - librecode-dev
       - libssl-dev
@@ -71,7 +71,7 @@
   register: gmp_file
 
 - name: Ensure gmp.h is symlinked into a location accessible to gcc.
-  file:
+  file:  # noqa 208
     src: "{{ php_source_install_gmp_path }}"
     dest: /usr/include/gmp.h
     state: link
@@ -121,14 +121,14 @@
   when: php_installed.rc != 0
 
 - name: Ensure php executable is symlinked into a standard path.
-  file:
+  file:  # noqa 208
     src: "{{ php_source_install_path }}/bin/php"
     dest: /usr/bin/php
     state: link
 
 # PHP FPM configuration.
 - name: Ensure php-fpm executable is symlinked into a standard path.
-  file:
+  file:  # noqa 208
     src: "{{ php_source_install_path }}/sbin/php-fpm"
     dest: "/usr/sbin/{{ php_fpm_daemon }}"
     state: link
@@ -146,6 +146,7 @@
   file:
     path: "{{ php_fpm_conf_path }}"
     state: directory
+    mode: 0755
   when: "'--enable-fpm' in php_source_configure_command"
 
 - name: Ensure php-fpm config file is installed.
diff --git a/provisioning/roles/geerlingguy.php/tasks/main.yml b/provisioning/roles/geerlingguy.php/tasks/main.yml
index 41a776146..dbad76595 100644
--- a/provisioning/roles/geerlingguy.php/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php/tasks/main.yml
@@ -6,10 +6,11 @@
     - files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
       skip: true
+
 - name: Set the default PHP version for Debian-based OSes.
   set_fact:
     php_default_version_debian: "{{ __php_default_version_debian }}"
-  when: ansible_os_family == 'Debian'
+  when: php_default_version_debian is not defined and ansible_os_family == 'Debian'
 
 - name: Include OS-specific variables.
   include_vars: "{{ ansible_os_family }}.yml"

From 3aded7d3fd3050ffc95f15352ffe769f402fe4ae Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 23 Oct 2020 21:15:43 -0500
Subject: [PATCH 1214/1273] Ignore rubocop annoying rule.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 652434e40..3cf269a63 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -53,7 +53,7 @@ before_install:
 
 script:
   # Vagrantfile syntax check.
-  - 'rubocop ./Vagrantfile ./lib/drupalvm --except Metrics/LineLength,Security/Eval,Style/MutableConstant,Metrics/BlockLength,Metrics/MethodLength,Style/ConditionalAssignment,Style/IfUnlessModifier'
+  - 'rubocop ./Vagrantfile ./lib/drupalvm --except Metrics/LineLength,Security/Eval,Style/MutableConstant,Metrics/BlockLength,Metrics/MethodLength,Style/ConditionalAssignment,Style/IfUnlessModifier,Style/CaseLikeIf'
 
   # Run tests.
   - composer run-tests

From 96eb4f76c52ed158be6e74ac2eec9bfe2ac9786d Mon Sep 17 00:00:00 2001
From: Richard Sheppard <richard.sheppard@weareaccess.co.uk>
Date: Tue, 27 Oct 2020 15:38:29 +0000
Subject: [PATCH 1215/1273] Removed hirak/prestissimo, as the writing is on the
 wall.

---
 default.config.yml                         | 3 +--
 docs/other/wordpress-other-applications.md | 1 -
 examples/scripts/pareview.sh               | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/default.config.yml b/default.config.yml
index 6e59a7444..ba940f8fd 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -278,8 +278,7 @@ composer_path: /usr/bin/composer
 composer_home_path: "/home/{{ drupalvm_user }}/.composer"
 composer_home_owner: "{{ drupalvm_user }}"
 composer_home_group: "{{ drupalvm_user }}"
-composer_global_packages:
-  - { name: hirak/prestissimo, release: '^0.3' }
+composer_global_packages: []
 
 # Run specified scripts before or after VM is provisioned. Use {{ playbook_dir }}
 # to reference the provisioning/ folder in Drupal VM or {{ config_dir }} to
diff --git a/docs/other/wordpress-other-applications.md b/docs/other/wordpress-other-applications.md
index 5714db435..96a4446ab 100644
--- a/docs/other/wordpress-other-applications.md
+++ b/docs/other/wordpress-other-applications.md
@@ -42,7 +42,6 @@ installed_extras:
 
 # Add wp-cli
 composer_global_packages:
-  - { name: hirak/prestissimo, release: '^0.3' }
   - { name: wp-cli/wp-cli, release: '^1.0.0' }
 ```
 
diff --git a/examples/scripts/pareview.sh b/examples/scripts/pareview.sh
index 5c68414f8..820477e0e 100755
--- a/examples/scripts/pareview.sh
+++ b/examples/scripts/pareview.sh
@@ -9,7 +9,6 @@
 #       - "../examples/scripts/pareview.sh"
 #
 #     composer_global_packages:
-#       - { name: hirak/prestissimo, release: '^0.3' }
 #       - { name: drupal/coder, release: '^' }
 #
 #     nodejs_version: "6.x"

From a82bd5b896c82050e1132d7871a61407eb200ea9 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 27 Oct 2020 16:21:08 -0500
Subject: [PATCH 1216/1273] Update README to point to travis-ci.com.

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

diff --git a/README.md b/README.md
index f392b91c7..8f61a9691 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ![Drupal VM Logo](https://raw.githubusercontent.com/geerlingguy/drupal-vm/master/docs/images/drupal-vm-logo.png)
 
-[![Build Status](https://travis-ci.org/geerlingguy/drupal-vm.svg?branch=master)](https://travis-ci.org/geerlingguy/drupal-vm) [![Documentation Status](https://readthedocs.org/projects/drupal-vm/badge/?version=latest)](http://docs.drupalvm.com) [![Packagist](https://img.shields.io/packagist/v/geerlingguy/drupal-vm.svg)](https://packagist.org/packages/geerlingguy/drupal-vm) [![Docker Automated build](https://img.shields.io/docker/automated/geerlingguy/drupal-vm.svg?maxAge=2592000)](https://hub.docker.com/r/geerlingguy/drupal-vm/) [![](https://images.microbadger.com/badges/image/geerlingguy/drupal-vm.svg)](https://microbadger.com/images/geerlingguy/drupal-vm "Get your own image badge on microbadger.com") [![irc://irc.freenode.net/drupal-vm](https://img.shields.io/badge/irc.freenode.net-%23drupal--vm-brightgreen.svg)](https://riot.im/app/#/room/#drupal-vm:matrix.org)
+[![Build Status](https://travis-ci.com/geerlingguy/drupal-vm.svg?branch=master)](https://travis-ci.com/geerlingguy/drupal-vm) [![Documentation Status](https://readthedocs.org/projects/drupal-vm/badge/?version=latest)](http://docs.drupalvm.com) [![Packagist](https://img.shields.io/packagist/v/geerlingguy/drupal-vm.svg)](https://packagist.org/packages/geerlingguy/drupal-vm) [![Docker Automated build](https://img.shields.io/docker/automated/geerlingguy/drupal-vm.svg?maxAge=2592000)](https://hub.docker.com/r/geerlingguy/drupal-vm/) [![](https://images.microbadger.com/badges/image/geerlingguy/drupal-vm.svg)](https://microbadger.com/images/geerlingguy/drupal-vm "Get your own image badge on microbadger.com") [![irc://irc.freenode.net/drupal-vm](https://img.shields.io/badge/irc.freenode.net-%23drupal--vm-brightgreen.svg)](https://riot.im/app/#/room/#drupal-vm:matrix.org)
 
 [Drupal VM](https://www.drupalvm.com/) is a VM for Drupal, built with Ansible.
 

From edf73dd6d2508cb70095876c0d86b2b7fe47207d Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 27 Oct 2020 16:38:23 -0500
Subject: [PATCH 1217/1273] Issue #2101: Update CHANGELOG.

---
 CHANGELOG.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed897e788..479694893 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,25 @@
 # Drupal VM Changelog
 
+## 6.0.2 (2020-10-27)
+
+### Breaking Changes
+
+N/A
+
+### New/changed variables in default.config.yml
+
+The `hirak/prestissimo` package was removed from `composer_global_packages` (and that variable is now empty).
+
+### Improvements
+
+  * N/A
+
+### Bugfixes
+
+  * #2100: Remove hirak/prestissimo, for Composer v2 compatibility.
+  * #2095: Fix syntax errors in example drupal.composer.json file.
+
+
 ## 6.0.1 (2020-09-29)
 
 ### Breaking Changes

From c349699ecfbd25f01e41635f62b9bf340e0cf993 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 27 Oct 2020 16:47:12 -0500
Subject: [PATCH 1218/1273] Update drush role to latest version for better
 Composer v2 compatibility.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.drush/.ansible-lint     |  3 +
 .../geerlingguy.drush/.github/FUNDING.yml     |  4 ++
 .../roles/geerlingguy.drush/.github/stale.yml | 56 +++++++++++++++++++
 .../roles/geerlingguy.drush/.travis.yml       |  9 ++-
 .../default/yaml-lint.yml => .yamllint}       |  5 ++
 .../roles/geerlingguy.drush/README.md         |  5 +-
 .../roles/geerlingguy.drush/defaults/main.yml |  1 +
 .../roles/geerlingguy.drush/meta/main.yml     |  1 +
 .../molecule/default/converge.yml             | 24 ++++++++
 .../molecule/default/molecule.yml             | 24 +++-----
 .../molecule/default/playbook-composer.yml    | 31 +---------
 .../molecule/default/playbook-source.yml      |  5 +-
 .../molecule/default/playbook.yml             | 52 -----------------
 .../molecule/default/requirements.yml         |  1 +
 .../molecule/default/tests/test_default.py    | 14 -----
 .../tasks/install-drush-composer.yml          |  5 +-
 .../tasks/install-source.yml                  |  8 ++-
 18 files changed, 124 insertions(+), 126 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.drush/.ansible-lint
 create mode 100644 provisioning/roles/geerlingguy.drush/.github/FUNDING.yml
 create mode 100644 provisioning/roles/geerlingguy.drush/.github/stale.yml
 rename provisioning/roles/geerlingguy.drush/{molecule/default/yaml-lint.yml => .yamllint} (61%)
 create mode 100644 provisioning/roles/geerlingguy.drush/molecule/default/converge.yml
 delete mode 100644 provisioning/roles/geerlingguy.drush/molecule/default/playbook.yml
 delete mode 100644 provisioning/roles/geerlingguy.drush/molecule/default/tests/test_default.py

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index c17ba7eaf..eadd8abb6 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -23,7 +23,7 @@ roles:
   - name: geerlingguy.drupal-console
     version: 1.1.1
   - name: geerlingguy.drush
-    version: 3.1.2
+    version: 3.2.0
   - name: geerlingguy.elasticsearch
     version: 4.2.0
   - name: geerlingguy.firewall
diff --git a/provisioning/roles/geerlingguy.drush/.ansible-lint b/provisioning/roles/geerlingguy.drush/.ansible-lint
new file mode 100644
index 000000000..af2cdfe6f
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drush/.ansible-lint
@@ -0,0 +1,3 @@
+skip_list:
+  - '503'
+  - '106'
diff --git a/provisioning/roles/geerlingguy.drush/.github/FUNDING.yml b/provisioning/roles/geerlingguy.drush/.github/FUNDING.yml
new file mode 100644
index 000000000..96b493831
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drush/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+---
+github: geerlingguy
+patreon: geerlingguy
diff --git a/provisioning/roles/geerlingguy.drush/.github/stale.yml b/provisioning/roles/geerlingguy.drush/.github/stale.yml
new file mode 100644
index 000000000..c7ff12754
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drush/.github/stale.yml
@@ -0,0 +1,56 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 90
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 30
+
+# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
+onlyLabels: []
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - pinned
+  - security
+  - planned
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: false
+
+# Label to use when marking as stale
+staleLabel: stale
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+pulls:
+  markComment: |-
+    This pull request has been marked 'stale' due to lack of recent activity. If there is no further activity, the PR will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark pull requests as stale.
+
+  unmarkComment: >-
+    This pull request is no longer marked for closure.
+
+  closeComment: >-
+    This pull request has been closed due to inactivity. If you feel this is in error, please reopen the pull request or file a new PR with the relevant details.
+
+issues:
+  markComment: |-
+    This issue has been marked 'stale' due to lack of recent activity. If there is no further activity, the issue will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark issues as stale.
+
+  unmarkComment: >-
+    This issue is no longer marked for closure.
+
+  closeComment: >-
+    This issue has been closed due to inactivity. If you feel this is in error, please reopen the issue or file a new issue with the relevant details.
diff --git a/provisioning/roles/geerlingguy.drush/.travis.yml b/provisioning/roles/geerlingguy.drush/.travis.yml
index 1e2fa6a51..a1672dc96 100644
--- a/provisioning/roles/geerlingguy.drush/.travis.yml
+++ b/provisioning/roles/geerlingguy.drush/.travis.yml
@@ -7,17 +7,20 @@ env:
     - ROLE_NAME: drush
   matrix:
     - MOLECULE_DISTRO: centos7
-      MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
-    - MOLECULE_DISTRO: ubuntu1604
+    - MOLECULE_DISTRO: ubuntu1804
     - MOLECULE_DISTRO: debian9
     - MOLECULE_DISTRO: centos7
       MOLECULE_PLAYBOOK: playbook-composer.yml
     - MOLECULE_DISTRO: centos7
       MOLECULE_PLAYBOOK: playbook-source.yml
 
+before_install:
+  # Upgrade Docker to work with docker-py.
+  - curl https://gist.githubusercontent.com/geerlingguy/ce883ad4aec6a5f1187ef93bd338511e/raw/36612d28981d92863f839c5aefe5b7dd7193d6c6/travis-ci-docker-upgrade.sh | sudo bash
+
 install:
   # Install test dependencies.
-  - pip install molecule docker
+  - pip install molecule[docker] yamllint ansible-lint docker
 
 before_script:
   # Use actual Ansible Galaxy role name for the project directory.
diff --git a/provisioning/roles/geerlingguy.drush/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.drush/.yamllint
similarity index 61%
rename from provisioning/roles/geerlingguy.drush/molecule/default/yaml-lint.yml
rename to provisioning/roles/geerlingguy.drush/.yamllint
index a3dbc38ee..f2033dd21 100644
--- a/provisioning/roles/geerlingguy.drush/molecule/default/yaml-lint.yml
+++ b/provisioning/roles/geerlingguy.drush/.yamllint
@@ -1,6 +1,11 @@
 ---
 extends: default
+
 rules:
   line-length:
     max: 120
     level: warning
+
+ignore: |
+  .github/stale.yml
+  .travis.yml
diff --git a/provisioning/roles/geerlingguy.drush/README.md b/provisioning/roles/geerlingguy.drush/README.md
index 16214b1d7..a0b2e0f93 100644
--- a/provisioning/roles/geerlingguy.drush/README.md
+++ b/provisioning/roles/geerlingguy.drush/README.md
@@ -1,6 +1,6 @@
 # Ansible Role: Drush
 
-[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-drush.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-drush)
+[![Build Status](https://travis-ci.com/geerlingguy/ansible-role-drush.svg?branch=master)](https://travis-ci.com/geerlingguy/ansible-role-drush)
 
 Installs [Drush](http://www.drush.org), a command line shell and scripting interface for Drupal, on any Linux or UNIX system.
 
@@ -54,9 +54,10 @@ The version constraint for the global Drush installation.
 
 Whether to run `composer update drush/drush` to ensure the version of Drush installed globally is the latest version.
 
+    drush_composer_global_bin_path: ~/.config/composer/vendor/bin
     drush_composer_path: /usr/local/bin/drush
 
-The path in which a symlink to the Drush binary installed via Composer should be placed.
+The global path where Composer installs global binaries, and the path in which you'd like the `drush` binary to be placed.
 
 > NOTE: Composer 'global' installation is global _to the user under which Drush is installed_—e.g. if you install globally using the root user, `drush` will only work properly as `root` or when using `sudo`.
 
diff --git a/provisioning/roles/geerlingguy.drush/defaults/main.yml b/provisioning/roles/geerlingguy.drush/defaults/main.yml
index e8f3fa02d..1723a1ab3 100644
--- a/provisioning/roles/geerlingguy.drush/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.drush/defaults/main.yml
@@ -10,6 +10,7 @@ drush_launcher_path: /usr/local/bin/drush
 drush_composer_global_install: false
 drush_composer_version: "~9.0"
 drush_composer_update: false
+drush_composer_global_bin_path: ~/.config/composer/vendor/bin
 drush_composer_path: /usr/local/bin/drush
 
 # Install from source (git clone + composer-based install).
diff --git a/provisioning/roles/geerlingguy.drush/meta/main.yml b/provisioning/roles/geerlingguy.drush/meta/main.yml
index 45166d593..14733bb6b 100644
--- a/provisioning/roles/geerlingguy.drush/meta/main.yml
+++ b/provisioning/roles/geerlingguy.drush/meta/main.yml
@@ -2,6 +2,7 @@
 dependencies: []
 
 galaxy_info:
+  role_name: drush
   author: geerlingguy
   description: Drush - command line shell for Drupal
   company: "Midwestern Mac, LLC"
diff --git a/provisioning/roles/geerlingguy.drush/molecule/default/converge.yml b/provisioning/roles/geerlingguy.drush/molecule/default/converge.yml
new file mode 100644
index 000000000..a31c174af
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drush/molecule/default/converge.yml
@@ -0,0 +1,24 @@
+---
+- name: Converge
+  hosts: all
+  become: true
+
+  vars:
+    php_enable_webserver: false
+    php_opcache_enable: "0"
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=true cache_valid_time=600
+      when: ansible_os_family == 'Debian'
+
+    - name: Ensure unzip is installed.
+      package: name=unzip state=present
+
+  roles:
+    - role: geerlingguy.repo-remi
+      when: ansible_os_family == 'RedHat'
+    - role: geerlingguy.php-versions
+    - role: geerlingguy.php
+    - role: geerlingguy.composer
+    - role: geerlingguy.drush
diff --git a/provisioning/roles/geerlingguy.drush/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.drush/molecule/default/molecule.yml
index 033970241..2da47dd1f 100644
--- a/provisioning/roles/geerlingguy.drush/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.drush/molecule/default/molecule.yml
@@ -3,25 +3,19 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
-  options:
-    config-file: molecule/default/yaml-lint.yml
+lint: |
+  set -e
+  yamllint .
+  ansible-lint
 platforms:
   - name: instance
-    image: geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible
-    command: ${MOLECULE_DOCKER_COMMAND:-"sleep infinity"}
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
     privileged: true
     pre_build_image: true
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
   playbooks:
-    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
-scenario:
-  name: default
-verifier:
-  name: testinfra
-  lint:
-    name: flake8
+    converge: ${MOLECULE_PLAYBOOK:-converge.yml}
diff --git a/provisioning/roles/geerlingguy.drush/molecule/default/playbook-composer.yml b/provisioning/roles/geerlingguy.drush/molecule/default/playbook-composer.yml
index 946e6594a..3ed04622b 100644
--- a/provisioning/roles/geerlingguy.drush/molecule/default/playbook-composer.yml
+++ b/provisioning/roles/geerlingguy.drush/molecule/default/playbook-composer.yml
@@ -12,14 +12,7 @@
     drush_composer_global_install: true
     drush_composer_update: true
 
-  handlers:
-    - name: update apt cache
-      apt: update_cache=true
-
   pre_tasks:
-    - name: Enable remi repo for PHP 7.0 (RedHat).
-      set_fact: php_enablerepo="remi,remi-php70"
-      when: ansible_os_family == 'RedHat'
 
     - name: Update apt cache.
       apt: update_cache=true cache_valid_time=600
@@ -28,32 +21,10 @@
     - name: Ensure unzip is installed.
       package: name=unzip state=present
 
-    # Debian-specific tasks.
-    - name: Add dependencies for PHP versions (Debian).
-      apt:
-        name:
-          - apt-transport-https
-          - ca-certificates
-      when: ansible_distribution == "Debian"
-
-    - name: Add Ondrej Sury's apt key (Debian).
-      apt_key:
-        url: https://packages.sury.org/php/apt.gpg
-        state: present
-      when: ansible_distribution == "Debian"
-
-    - name: Add Ondrej Sury's repo (Debian).
-      apt_repository:
-        repo: "deb https://packages.sury.org/php/ {{ ansible_distribution_release }} main"
-        state: present
-      when: ansible_distribution == "Debian"
-      notify: update apt cache
-
-    - meta: flush_handlers
-
   roles:
     - role: geerlingguy.repo-remi
       when: ansible_os_family == 'RedHat'
+    - role: geerlingguy.php-versions
     - role: geerlingguy.php
     - role: geerlingguy.composer
     - role: geerlingguy.drush
diff --git a/provisioning/roles/geerlingguy.drush/molecule/default/playbook-source.yml b/provisioning/roles/geerlingguy.drush/molecule/default/playbook-source.yml
index 7a353fd0e..78883d4e0 100644
--- a/provisioning/roles/geerlingguy.drush/molecule/default/playbook-source.yml
+++ b/provisioning/roles/geerlingguy.drush/molecule/default/playbook-source.yml
@@ -11,10 +11,6 @@
     drush_install_from_source: true
 
   pre_tasks:
-    - name: Enable remi repo for PHP 7.0 (RedHat).
-      set_fact: php_enablerepo="remi,remi-php70"
-      when: ansible_os_family == 'RedHat'
-
     - name: Update apt cache.
       apt: update_cache=true cache_valid_time=600
       when: ansible_os_family == 'Debian'
@@ -22,6 +18,7 @@
   roles:
     - role: geerlingguy.repo-remi
       when: ansible_os_family == 'RedHat'
+    - role: geerlingguy.php-versions
     - role: geerlingguy.php
     - role: geerlingguy.composer
     - role: geerlingguy.git
diff --git a/provisioning/roles/geerlingguy.drush/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.drush/molecule/default/playbook.yml
deleted file mode 100644
index be1b9ef11..000000000
--- a/provisioning/roles/geerlingguy.drush/molecule/default/playbook.yml
+++ /dev/null
@@ -1,52 +0,0 @@
----
-- name: Converge
-  hosts: all
-  become: true
-
-  vars:
-    php_enable_webserver: false
-    php_opcache_enable: "0"
-
-  handlers:
-    - name: update apt cache
-      apt: update_cache=true
-
-  pre_tasks:
-    - name: Enable remi repo for PHP 7.0 (RedHat).
-      set_fact: php_enablerepo="remi,remi-php70"
-      when: ansible_os_family == 'RedHat'
-
-    - name: Update apt cache.
-      apt: update_cache=true cache_valid_time=600
-      when: ansible_os_family == 'Debian'
-
-    - name: Ensure unzip is installed.
-      package: name=unzip state=present
-
-    # Debian-specific tasks.
-    - name: Add dependencies for PHP versions (Debian).
-      apt:
-        name:
-          - apt-transport-https
-          - ca-certificates
-      when: ansible_distribution == "Debian"
-
-    - name: Add Ondrej Sury's apt key (Debian).
-      apt_key:
-        url: https://packages.sury.org/php/apt.gpg
-        state: present
-      when: ansible_distribution == "Debian"
-
-    - name: Add Ondrej Sury's repo (Debian).
-      apt_repository:
-        repo: "deb https://packages.sury.org/php/ {{ ansible_distribution_release }} main"
-        state: present
-      when: ansible_distribution == "Debian"
-      notify: update apt cache
-
-  roles:
-    - role: geerlingguy.repo-remi
-      when: ansible_os_family == 'RedHat'
-    - role: geerlingguy.php
-    - role: geerlingguy.composer
-    - role: geerlingguy.drush
diff --git a/provisioning/roles/geerlingguy.drush/molecule/default/requirements.yml b/provisioning/roles/geerlingguy.drush/molecule/default/requirements.yml
index 521a77ebf..7c724e64b 100644
--- a/provisioning/roles/geerlingguy.drush/molecule/default/requirements.yml
+++ b/provisioning/roles/geerlingguy.drush/molecule/default/requirements.yml
@@ -1,5 +1,6 @@
 ---
 - src: geerlingguy.repo-remi
+- src: geerlingguy.php-versions
 - src: geerlingguy.php
 - src: geerlingguy.composer
 - src: geerlingguy.git
diff --git a/provisioning/roles/geerlingguy.drush/molecule/default/tests/test_default.py b/provisioning/roles/geerlingguy.drush/molecule/default/tests/test_default.py
deleted file mode 100644
index eedd64a1d..000000000
--- a/provisioning/roles/geerlingguy.drush/molecule/default/tests/test_default.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import os
-
-import testinfra.utils.ansible_runner
-
-testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
-    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
-
-
-def test_hosts_file(host):
-    f = host.file('/etc/hosts')
-
-    assert f.exists
-    assert f.user == 'root'
-    assert f.group == 'root'
diff --git a/provisioning/roles/geerlingguy.drush/tasks/install-drush-composer.yml b/provisioning/roles/geerlingguy.drush/tasks/install-drush-composer.yml
index 2f4d5c5c6..7338c599c 100644
--- a/provisioning/roles/geerlingguy.drush/tasks/install-drush-composer.yml
+++ b/provisioning/roles/geerlingguy.drush/tasks/install-drush-composer.yml
@@ -14,9 +14,10 @@
   when:
     - drush_composer_update
     - not drush_composer_require.changed
+  tags: ['skip_ansible_lint']
 
 - name: Ensure globally-installed Drush is symlinked into bin dir.
-  file:
-    src: "~/.composer/vendor/bin/drush"
+  file:  # noqa 208
+    src: "{{ drush_composer_global_bin_path }}/drush"
     dest: "{{ drush_composer_path }}"
     state: link
diff --git a/provisioning/roles/geerlingguy.drush/tasks/install-source.yml b/provisioning/roles/geerlingguy.drush/tasks/install-source.yml
index ae183bc56..b95a07bbd 100644
--- a/provisioning/roles/geerlingguy.drush/tasks/install-source.yml
+++ b/provisioning/roles/geerlingguy.drush/tasks/install-source.yml
@@ -15,22 +15,24 @@
 
 # See: https://github.com/geerlingguy/ansible-role-drush/issues/6
 - name: Ensure Drush can be installed on Debian Wheezy.
-  shell: >
+  command: >
     {{ composer_path }} update {{ drush_composer_cli_options }}
     chdir={{ drush_source_install_path }}
   when:
     - drush_clone.changed and ansible_distribution == "Debian"
     - ansible_distribution_release == "wheezy"
     - drush_composer.stat.exists
+  tags: ['skip_ansible_lint']
 
 - name: Install Drush dependencies with Composer.
-  shell: >
+  command: >
     {{ composer_path }} install {{ drush_composer_cli_options }}
     chdir={{ drush_source_install_path }}
   when: (drush_clone.changed and drush_composer.stat.exists) or drush_force_composer_install
+  tags: ['skip_ansible_lint']
 
 - name: Create drush symlink.
-  file:
+  file:  # noqa 208
     src: "{{ drush_source_install_path }}/drush"
     dest: "{{ drush_source_install_bin_path }}"
     state: link

From e9d3596e7e300f6ea4ee38127d2775e704aba8fb Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 12 Nov 2020 09:22:16 -0600
Subject: [PATCH 1219/1273] Update composer role to latest version. Allows
 switching Composer major versions.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.composer/.ansible-lint  |  1 +
 .../.github/workflows/ci.yml                  | 68 +++++++++++++++++++
 .../.github/workflows/release.yml             | 38 +++++++++++
 .../roles/geerlingguy.composer/.travis.yml    | 32 ---------
 .../roles/geerlingguy.composer/README.md      |  6 +-
 .../geerlingguy.composer/defaults/main.yml    |  1 +
 .../molecule/default/molecule.yml             |  4 --
 .../roles/geerlingguy.composer/tasks/main.yml |  4 +-
 9 files changed, 116 insertions(+), 40 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.composer/.github/workflows/ci.yml
 create mode 100644 provisioning/roles/geerlingguy.composer/.github/workflows/release.yml
 delete mode 100644 provisioning/roles/geerlingguy.composer/.travis.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index eadd8abb6..4fc5baf49 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -15,7 +15,7 @@ roles:
   - name: geerlingguy.blackfire
     version: 1.1.3
   - name: geerlingguy.composer
-    version: 1.7.6
+    version: 1.9.0
   - name: geerlingguy.daemonize
     version: 1.2.1
   - name: geerlingguy.drupal
diff --git a/provisioning/roles/geerlingguy.composer/.ansible-lint b/provisioning/roles/geerlingguy.composer/.ansible-lint
index 555729425..192211d37 100644
--- a/provisioning/roles/geerlingguy.composer/.ansible-lint
+++ b/provisioning/roles/geerlingguy.composer/.ansible-lint
@@ -1,2 +1,3 @@
 skip_list:
   - '106'
+  - '204'
diff --git a/provisioning/roles/geerlingguy.composer/.github/workflows/ci.yml b/provisioning/roles/geerlingguy.composer/.github/workflows/ci.yml
new file mode 100644
index 000000000..493f349e3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.composer/.github/workflows/ci.yml
@@ -0,0 +1,68 @@
+---
+name: CI
+'on':
+  pull_request:
+  push:
+    branches:
+      - master
+  schedule:
+    - cron: "0 6 * * 0"
+
+defaults:
+  run:
+    working-directory: 'geerlingguy.composer'
+
+jobs:
+
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.composer'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies.
+        run: pip3 install yamllint ansible-lint
+
+      - name: Lint code.
+        run: |
+          yamllint .
+          ansible-lint
+
+  molecule:
+    name: Molecule
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        distro:
+          - centos7
+          - ubuntu1804
+          - debian9
+
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.composer'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies.
+        run: pip3 install ansible molecule[docker] docker
+
+      - name: Run Molecule tests.
+        run: molecule test
+        env:
+          PY_COLORS: '1'
+          ANSIBLE_FORCE_COLOR: '1'
+          MOLECULE_DISTRO: ${{ matrix.distro }}
diff --git a/provisioning/roles/geerlingguy.composer/.github/workflows/release.yml b/provisioning/roles/geerlingguy.composer/.github/workflows/release.yml
new file mode 100644
index 000000000..054152bef
--- /dev/null
+++ b/provisioning/roles/geerlingguy.composer/.github/workflows/release.yml
@@ -0,0 +1,38 @@
+---
+# This workflow requires a GALAXY_API_KEY secret present in the GitHub
+# repository or organization.
+#
+# See: https://github.com/marketplace/actions/publish-ansible-role-to-galaxy
+# See: https://github.com/ansible/galaxy/issues/46
+
+name: Release
+'on':
+  push:
+    tags:
+      - '*'
+
+defaults:
+  run:
+    working-directory: 'geerlingguy.composer'
+
+jobs:
+
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.composer'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install Ansible.
+        run: pip3 install ansible-base
+
+      - name: Trigger a new import on Galaxy.
+        run: ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }} $(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} | cut -d/ -f2)
diff --git a/provisioning/roles/geerlingguy.composer/.travis.yml b/provisioning/roles/geerlingguy.composer/.travis.yml
deleted file mode 100644
index 452786ab3..000000000
--- a/provisioning/roles/geerlingguy.composer/.travis.yml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-language: python
-services: docker
-
-env:
-  global:
-    - ROLE_NAME: composer
-  matrix:
-    - MOLECULE_DISTRO: centos7
-    - MOLECULE_DISTRO: ubuntu1604
-    - MOLECULE_DISTRO: debian9
-
-before_install:
-  # Upgrade Docker to work with docker-py.
-  - curl https://gist.githubusercontent.com/geerlingguy/ce883ad4aec6a5f1187ef93bd338511e/raw/36612d28981d92863f839c5aefe5b7dd7193d6c6/travis-ci-docker-upgrade.sh | sudo bash
-
-install:
-  # Install test dependencies.
-  - pip install molecule yamllint ansible-lint docker
-
-before_script:
-  # Use actual Ansible Galaxy role name for the project directory.
-  - cd ../
-  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
-  - cd geerlingguy.$ROLE_NAME
-
-script:
-  # Run tests.
-  - molecule test
-
-notifications:
-  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.composer/README.md b/provisioning/roles/geerlingguy.composer/README.md
index b88175081..b932b3cf8 100644
--- a/provisioning/roles/geerlingguy.composer/README.md
+++ b/provisioning/roles/geerlingguy.composer/README.md
@@ -1,6 +1,6 @@
 # Ansible Role: Composer
 
-[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-composer.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-composer)
+[![CI](https://github.com/geerlingguy/ansible-role-composer/workflows/CI/badge.svg?event=push)](https://github.com/geerlingguy/ansible-role-composer/actions?query=workflow%3ACI)
 
 Installs Composer, the PHP Dependency Manager, on any Linux or UNIX system.
 
@@ -31,6 +31,10 @@ The `COMPOSER_HOME` path and directory ownership; this is the directory where gl
 
 You can install a specific release of Composer, e.g. `composer_version: '1.0.0-alpha11'`. If left empty the latest development version will be installed. Note that `composer_keep_updated` will override this variable, as it will always install the latest development version.
 
+    composer_version_branch: '--2'
+
+You can choose which major branch of composer you wish to use. Default is `--2`. Note that `composer_keep_updated` will update the latest version available for this branch.
+
     composer_global_packages: []
 
 A list of packages to install globally (using `composer global require`). If you want to install any packages globally, add a list item with a dictionary with the `name` of the package and a `release`, e.g. `- { name: phpunit/phpunit, release: "4.7.*" }`. The 'release' is optional, and defaults to `@stable`.
diff --git a/provisioning/roles/geerlingguy.composer/defaults/main.yml b/provisioning/roles/geerlingguy.composer/defaults/main.yml
index d96a43768..3cd45a773 100644
--- a/provisioning/roles/geerlingguy.composer/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.composer/defaults/main.yml
@@ -2,6 +2,7 @@
 composer_path: /usr/local/bin/composer
 composer_keep_updated: false
 composer_version: ''
+composer_version_branch: '--2'
 
 # The directory where global packages will be installed.
 composer_home_path: '~/.composer'
diff --git a/provisioning/roles/geerlingguy.composer/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.composer/molecule/default/molecule.yml
index 2da47dd1f..74907107f 100644
--- a/provisioning/roles/geerlingguy.composer/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.composer/molecule/default/molecule.yml
@@ -3,10 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint: |
-  set -e
-  yamllint .
-  ansible-lint
 platforms:
   - name: instance
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
diff --git a/provisioning/roles/geerlingguy.composer/tasks/main.yml b/provisioning/roles/geerlingguy.composer/tasks/main.yml
index 439ccec97..db8f6f154 100644
--- a/provisioning/roles/geerlingguy.composer/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.composer/tasks/main.yml
@@ -25,7 +25,7 @@
 
 - name: Run Composer installer.
   command: >
-    {{ php_executable }} composer-installer.php {% if composer_version %} --version={{ composer_version }}{% endif %}
+    {{ php_executable }} composer-installer.php {% if composer_version_branch %} {{ composer_version_branch }}{% elif composer_version %} --version={{ composer_version }}{% endif %}
     chdir=/tmp
   when: not composer_bin.stat.exists
 
@@ -37,7 +37,7 @@
 
 - name: Update Composer to latest version (if configured).
   command: >
-    {{ php_executable }} {{ composer_path }} self-update
+    {{ php_executable }} {{ composer_path }} self-update {{ composer_version_branch }}
   register: composer_update
   changed_when: "'Updating to version' in composer_update.stdout"
   when: composer_keep_updated | bool

From 36e779baf1611fa2143df2a82e8700327452c247 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 16 Nov 2020 10:08:58 -0600
Subject: [PATCH 1220/1273] Update Postgres role to latest version.

---
 provisioning/requirements.yml                 |  2 +-
 .../geerlingguy.postgresql/.ansible-lint      |  1 +
 .../.github/workflows/ci.yml                  | 71 +++++++++++++++++++
 .../.github/workflows/release.yml             | 38 ++++++++++
 .../roles/geerlingguy.postgresql/.travis.yml  | 31 --------
 .../roles/geerlingguy.postgresql/.yamllint    |  2 +
 .../roles/geerlingguy.postgresql/README.md    |  2 +-
 .../molecule/default/molecule.yml             |  4 --
 .../tasks/configure.yml                       |  1 +
 .../geerlingguy.postgresql/tasks/main.yml     |  1 +
 .../geerlingguy.postgresql/tasks/users.yml    | 11 ---
 .../tasks/users_props.yml                     | 22 ++++++
 12 files changed, 138 insertions(+), 48 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.postgresql/.github/workflows/ci.yml
 create mode 100644 provisioning/roles/geerlingguy.postgresql/.github/workflows/release.yml
 delete mode 100644 provisioning/roles/geerlingguy.postgresql/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.postgresql/tasks/users_props.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 4fc5baf49..d1211ffe9 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -67,7 +67,7 @@ roles:
   - name: geerlingguy.postfix
     version: 2.0.0
   - name: geerlingguy.postgresql
-    version: 2.2.1
+    version: 3.0.0
   - name: geerlingguy.redis
     version: 1.6.0
   - name: geerlingguy.repo-epel
diff --git a/provisioning/roles/geerlingguy.postgresql/.ansible-lint b/provisioning/roles/geerlingguy.postgresql/.ansible-lint
index f3c109091..0c235a756 100644
--- a/provisioning/roles/geerlingguy.postgresql/.ansible-lint
+++ b/provisioning/roles/geerlingguy.postgresql/.ansible-lint
@@ -1,3 +1,4 @@
 skip_list:
   - '405'
   - '503'
+  - '106'
diff --git a/provisioning/roles/geerlingguy.postgresql/.github/workflows/ci.yml b/provisioning/roles/geerlingguy.postgresql/.github/workflows/ci.yml
new file mode 100644
index 000000000..7a82e4edb
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/.github/workflows/ci.yml
@@ -0,0 +1,71 @@
+---
+name: CI
+'on':
+  pull_request:
+  push:
+    branches:
+      - master
+  schedule:
+    - cron: "0 3 * * 5"
+
+defaults:
+  run:
+    working-directory: 'geerlingguy.postgresql'
+
+jobs:
+
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.postgresql'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies.
+        run: pip3 install yamllint ansible-lint
+
+      - name: Lint code.
+        run: |
+          yamllint .
+          ansible-lint
+
+  molecule:
+    name: Molecule
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        distro:
+          - centos8
+          - centos7
+          - fedora32
+          - ubuntu2004
+          - ubuntu1804
+          - debian10
+
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.postgresql'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies.
+        run: pip3 install ansible molecule[docker] docker
+
+      - name: Run Molecule tests.
+        run: molecule test
+        env:
+          PY_COLORS: '1'
+          ANSIBLE_FORCE_COLOR: '1'
+          MOLECULE_DISTRO: ${{ matrix.distro }}
diff --git a/provisioning/roles/geerlingguy.postgresql/.github/workflows/release.yml b/provisioning/roles/geerlingguy.postgresql/.github/workflows/release.yml
new file mode 100644
index 000000000..e1f8ae623
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/.github/workflows/release.yml
@@ -0,0 +1,38 @@
+---
+# This workflow requires a GALAXY_API_KEY secret present in the GitHub
+# repository or organization.
+#
+# See: https://github.com/marketplace/actions/publish-ansible-role-to-galaxy
+# See: https://github.com/ansible/galaxy/issues/46
+
+name: Release
+'on':
+  push:
+    tags:
+      - '*'
+
+defaults:
+  run:
+    working-directory: 'geerlingguy.postgresql'
+
+jobs:
+
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.postgresql'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install Ansible.
+        run: pip3 install ansible-base
+
+      - name: Trigger a new import on Galaxy.
+        run: ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }} $(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} | cut -d/ -f2)
diff --git a/provisioning/roles/geerlingguy.postgresql/.travis.yml b/provisioning/roles/geerlingguy.postgresql/.travis.yml
deleted file mode 100644
index 6f9a9aef2..000000000
--- a/provisioning/roles/geerlingguy.postgresql/.travis.yml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-language: python
-services: docker
-
-env:
-  global:
-    - ROLE_NAME: postgresql
-  matrix:
-    - MOLECULE_DISTRO: centos7
-    - MOLECULE_DISTRO: centos8
-    - MOLECULE_DISTRO: fedora32
-    - MOLECULE_DISTRO: ubuntu2004
-    - MOLECULE_DISTRO: ubuntu1804
-    - MOLECULE_DISTRO: debian10
-
-install:
-  # Install test dependencies.
-  - pip install molecule yamllint ansible-lint docker
-
-before_script:
-  # Use actual Ansible Galaxy role name for the project directory.
-  - cd ../
-  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
-  - cd geerlingguy.$ROLE_NAME
-
-script:
-  # Run tests.
-  - molecule test
-
-notifications:
-  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.postgresql/.yamllint b/provisioning/roles/geerlingguy.postgresql/.yamllint
index dff5082ff..f2033dd21 100644
--- a/provisioning/roles/geerlingguy.postgresql/.yamllint
+++ b/provisioning/roles/geerlingguy.postgresql/.yamllint
@@ -1,5 +1,6 @@
 ---
 extends: default
+
 rules:
   line-length:
     max: 120
@@ -7,3 +8,4 @@ rules:
 
 ignore: |
   .github/stale.yml
+  .travis.yml
diff --git a/provisioning/roles/geerlingguy.postgresql/README.md b/provisioning/roles/geerlingguy.postgresql/README.md
index d447a6e82..a30ec2227 100644
--- a/provisioning/roles/geerlingguy.postgresql/README.md
+++ b/provisioning/roles/geerlingguy.postgresql/README.md
@@ -1,6 +1,6 @@
 # Ansible Role: PostgreSQL
 
-[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-postgresql.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-postgresql)
+[![CI](https://github.com/geerlingguy/ansible-role-postgresql/workflows/CI/badge.svg?event=push)](https://github.com/geerlingguy/ansible-role-postgresql/actions?query=workflow%3ACI)
 
 Installs and configures PostgreSQL server on RHEL/CentOS or Debian/Ubuntu servers.
 
diff --git a/provisioning/roles/geerlingguy.postgresql/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.postgresql/molecule/default/molecule.yml
index 2da47dd1f..74907107f 100644
--- a/provisioning/roles/geerlingguy.postgresql/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.postgresql/molecule/default/molecule.yml
@@ -3,10 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint: |
-  set -e
-  yamllint .
-  ansible-lint
 platforms:
   - name: instance
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
diff --git a/provisioning/roles/geerlingguy.postgresql/tasks/configure.yml b/provisioning/roles/geerlingguy.postgresql/tasks/configure.yml
index bcbc0fb47..df4346450 100644
--- a/provisioning/roles/geerlingguy.postgresql/tasks/configure.yml
+++ b/provisioning/roles/geerlingguy.postgresql/tasks/configure.yml
@@ -5,6 +5,7 @@
     regexp: "^#?{{ item.option }}.+$"
     line: "{{ item.option }} = '{{ item.value }}'"
     state: "{{ item.state | default('present') }}"
+    mode: 0644
   with_items: "{{ postgresql_global_config_options }}"
   notify: restart postgresql
 
diff --git a/provisioning/roles/geerlingguy.postgresql/tasks/main.yml b/provisioning/roles/geerlingguy.postgresql/tasks/main.yml
index 5d4f5fe9c..308f38e38 100644
--- a/provisioning/roles/geerlingguy.postgresql/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.postgresql/tasks/main.yml
@@ -21,3 +21,4 @@
 # Configure PostgreSQL.
 - import_tasks: users.yml
 - import_tasks: databases.yml
+- import_tasks: users_props.yml
diff --git a/provisioning/roles/geerlingguy.postgresql/tasks/users.yml b/provisioning/roles/geerlingguy.postgresql/tasks/users.yml
index a1ae8947a..4bc84bfc1 100644
--- a/provisioning/roles/geerlingguy.postgresql/tasks/users.yml
+++ b/provisioning/roles/geerlingguy.postgresql/tasks/users.yml
@@ -2,17 +2,6 @@
 - name: Ensure PostgreSQL users are present.
   postgresql_user:
     name: "{{ item.name }}"
-    password: "{{ item.password | default(omit) }}"
-    encrypted: "{{ item.encrypted | default(omit) }}"
-    priv: "{{ item.priv | default(omit) }}"
-    role_attr_flags: "{{ item.role_attr_flags | default(omit) }}"
-    db: "{{ item.db | default(omit) }}"
-    login_host: "{{ item.login_host | default('localhost') }}"
-    login_password: "{{ item.login_password | default(omit) }}"
-    login_user: "{{ item.login_user | default(postgresql_user) }}"
-    login_unix_socket: "{{ item.login_unix_socket | default(postgresql_unix_socket_directories[0]) }}"
-    port: "{{ item.port | default(omit) }}"
-    state: "{{ item.state | default('present') }}"
   with_items: "{{ postgresql_users }}"
   no_log: "{{ postgres_users_no_log }}"
   become: true
diff --git a/provisioning/roles/geerlingguy.postgresql/tasks/users_props.yml b/provisioning/roles/geerlingguy.postgresql/tasks/users_props.yml
new file mode 100644
index 000000000..fa210eac5
--- /dev/null
+++ b/provisioning/roles/geerlingguy.postgresql/tasks/users_props.yml
@@ -0,0 +1,22 @@
+---
+- name: Ensure PostgreSQL users are configured correctly.
+  postgresql_user:
+    name: "{{ item.name }}"
+    password: "{{ item.password | default(omit) }}"
+    encrypted: "{{ item.encrypted | default(omit) }}"
+    priv: "{{ item.priv | default(omit) }}"
+    role_attr_flags: "{{ item.role_attr_flags | default(omit) }}"
+    db: "{{ item.db | default(omit) }}"
+    login_host: "{{ item.login_host | default('localhost') }}"
+    login_password: "{{ item.login_password | default(omit) }}"
+    login_user: "{{ item.login_user | default(postgresql_user) }}"
+    login_unix_socket: "{{ item.login_unix_socket | default(postgresql_unix_socket_directories[0]) }}"
+    port: "{{ item.port | default(omit) }}"
+    state: "{{ item.state | default('present') }}"
+  with_items: "{{ postgresql_users }}"
+  no_log: "{{ postgres_users_no_log }}"
+  become: true
+  become_user: "{{ postgresql_user }}"
+  # See: https://github.com/ansible/ansible/issues/16048#issuecomment-229012509
+  vars:
+    ansible_ssh_pipelining: true

From de17b47546b8757d8260c4f0e07933a2e278ec2f Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 17 Nov 2020 13:21:14 -0600
Subject: [PATCH 1221/1273] Update redis role to latest version.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.redis/.ansible-lint     |  2 +
 .../geerlingguy.redis/.github/FUNDING.yml     |  4 ++
 .../roles/geerlingguy.redis/.github/stale.yml | 56 +++++++++++++++
 .../.github/workflows/ci.yml                  | 68 +++++++++++++++++++
 .../.github/workflows/release.yml             | 38 +++++++++++
 .../roles/geerlingguy.redis/.gitignore        |  3 +-
 .../roles/geerlingguy.redis/.travis.yml       | 33 ---------
 .../roles/geerlingguy.redis/.yamllint         | 10 +++
 .../roles/geerlingguy.redis/README.md         |  2 +-
 .../roles/geerlingguy.redis/meta/main.yml     | 14 ++--
 .../default/converge.yml}                     |  8 ++-
 .../molecule/default/molecule.yml             | 17 +++++
 .../roles/geerlingguy.redis/tasks/main.yml    | 20 ++++--
 .../geerlingguy.redis/tasks/setup-RedHat.yml  |  2 +-
 .../roles/geerlingguy.redis/tests/README.md   | 11 ---
 .../roles/geerlingguy.redis/vars/Debian.yml   |  1 +
 .../roles/geerlingguy.redis/vars/RedHat.yml   |  1 +
 18 files changed, 228 insertions(+), 64 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.redis/.ansible-lint
 create mode 100644 provisioning/roles/geerlingguy.redis/.github/FUNDING.yml
 create mode 100644 provisioning/roles/geerlingguy.redis/.github/stale.yml
 create mode 100644 provisioning/roles/geerlingguy.redis/.github/workflows/ci.yml
 create mode 100644 provisioning/roles/geerlingguy.redis/.github/workflows/release.yml
 delete mode 100644 provisioning/roles/geerlingguy.redis/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.redis/.yamllint
 rename provisioning/roles/geerlingguy.redis/{tests/test.yml => molecule/default/converge.yml} (64%)
 create mode 100644 provisioning/roles/geerlingguy.redis/molecule/default/molecule.yml
 delete mode 100644 provisioning/roles/geerlingguy.redis/tests/README.md

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index d1211ffe9..d67687141 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -69,7 +69,7 @@ roles:
   - name: geerlingguy.postgresql
     version: 3.0.0
   - name: geerlingguy.redis
-    version: 1.6.0
+    version: 1.7.0
   - name: geerlingguy.repo-epel
     version: 3.0.0
   - name: geerlingguy.repo-remi
diff --git a/provisioning/roles/geerlingguy.redis/.ansible-lint b/provisioning/roles/geerlingguy.redis/.ansible-lint
new file mode 100644
index 000000000..555729425
--- /dev/null
+++ b/provisioning/roles/geerlingguy.redis/.ansible-lint
@@ -0,0 +1,2 @@
+skip_list:
+  - '106'
diff --git a/provisioning/roles/geerlingguy.redis/.github/FUNDING.yml b/provisioning/roles/geerlingguy.redis/.github/FUNDING.yml
new file mode 100644
index 000000000..96b493831
--- /dev/null
+++ b/provisioning/roles/geerlingguy.redis/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+---
+github: geerlingguy
+patreon: geerlingguy
diff --git a/provisioning/roles/geerlingguy.redis/.github/stale.yml b/provisioning/roles/geerlingguy.redis/.github/stale.yml
new file mode 100644
index 000000000..c7ff12754
--- /dev/null
+++ b/provisioning/roles/geerlingguy.redis/.github/stale.yml
@@ -0,0 +1,56 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 90
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 30
+
+# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
+onlyLabels: []
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - pinned
+  - security
+  - planned
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: false
+
+# Label to use when marking as stale
+staleLabel: stale
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+pulls:
+  markComment: |-
+    This pull request has been marked 'stale' due to lack of recent activity. If there is no further activity, the PR will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark pull requests as stale.
+
+  unmarkComment: >-
+    This pull request is no longer marked for closure.
+
+  closeComment: >-
+    This pull request has been closed due to inactivity. If you feel this is in error, please reopen the pull request or file a new PR with the relevant details.
+
+issues:
+  markComment: |-
+    This issue has been marked 'stale' due to lack of recent activity. If there is no further activity, the issue will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark issues as stale.
+
+  unmarkComment: >-
+    This issue is no longer marked for closure.
+
+  closeComment: >-
+    This issue has been closed due to inactivity. If you feel this is in error, please reopen the issue or file a new issue with the relevant details.
diff --git a/provisioning/roles/geerlingguy.redis/.github/workflows/ci.yml b/provisioning/roles/geerlingguy.redis/.github/workflows/ci.yml
new file mode 100644
index 000000000..60bf7de6c
--- /dev/null
+++ b/provisioning/roles/geerlingguy.redis/.github/workflows/ci.yml
@@ -0,0 +1,68 @@
+---
+name: CI
+'on':
+  pull_request:
+  push:
+    branches:
+      - master
+  schedule:
+    - cron: "30 2 * * 5"
+
+defaults:
+  run:
+    working-directory: 'geerlingguy.redis'
+
+jobs:
+
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.redis'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies.
+        run: pip3 install yamllint ansible-lint
+
+      - name: Lint code.
+        run: |
+          yamllint .
+          ansible-lint
+
+  molecule:
+    name: Molecule
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        distro:
+          - centos7
+          - fedora32
+          - ubuntu1804
+
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.redis'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies.
+        run: pip3 install ansible molecule[docker] docker
+
+      - name: Run Molecule tests.
+        run: molecule test
+        env:
+          PY_COLORS: '1'
+          ANSIBLE_FORCE_COLOR: '1'
+          MOLECULE_DISTRO: ${{ matrix.distro }}
diff --git a/provisioning/roles/geerlingguy.redis/.github/workflows/release.yml b/provisioning/roles/geerlingguy.redis/.github/workflows/release.yml
new file mode 100644
index 000000000..1d9c179a1
--- /dev/null
+++ b/provisioning/roles/geerlingguy.redis/.github/workflows/release.yml
@@ -0,0 +1,38 @@
+---
+# This workflow requires a GALAXY_API_KEY secret present in the GitHub
+# repository or organization.
+#
+# See: https://github.com/marketplace/actions/publish-ansible-role-to-galaxy
+# See: https://github.com/ansible/galaxy/issues/46
+
+name: Release
+'on':
+  push:
+    tags:
+      - '*'
+
+defaults:
+  run:
+    working-directory: 'geerlingguy.redis'
+
+jobs:
+
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.redis'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install Ansible.
+        run: pip3 install ansible-base
+
+      - name: Trigger a new import on Galaxy.
+        run: ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }} $(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} | cut -d/ -f2)
diff --git a/provisioning/roles/geerlingguy.redis/.gitignore b/provisioning/roles/geerlingguy.redis/.gitignore
index c9b2377e3..f56f5b578 100644
--- a/provisioning/roles/geerlingguy.redis/.gitignore
+++ b/provisioning/roles/geerlingguy.redis/.gitignore
@@ -1,2 +1,3 @@
 *.retry
-tests/test.sh
+*/__pycache__
+*.pyc
diff --git a/provisioning/roles/geerlingguy.redis/.travis.yml b/provisioning/roles/geerlingguy.redis/.travis.yml
deleted file mode 100644
index 5c35da846..000000000
--- a/provisioning/roles/geerlingguy.redis/.travis.yml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-services: docker
-
-env:
-  - distro: centos7
-    redis_daemon: redis
-  - distro: fedora27
-    redis_daemon: redis
-  - distro: ubuntu1604
-    redis_daemon: redis-server
-
-script:
-  # Configure test script so we can run extra tests after playbook is run.
-  - export container_id=$(date +%s)
-  - export cleanup=false
-
-  # Download test shim.
-  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
-  - chmod +x ${PWD}/tests/test.sh
-
-  # Run tests.
-  - ${PWD}/tests/test.sh
-
-  # Make sure Redis is running, and can be stopped and started cleanly.
-  - 'docker exec --tty ${container_id} env TERM=xterm systemctl --no-pager status ${redis_daemon}'
-  - 'docker exec --tty ${container_id} env TERM=xterm systemctl --no-pager stop ${redis_daemon}'
-  - 'docker exec --tty ${container_id} env TERM=xterm systemctl --no-pager start ${redis_daemon}'
-
-after_failure:
-  - 'docker exec --tty ${container_id} env TERM=xterm cat /var/log/redis/redis-server.log'
-
-notifications:
-  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.redis/.yamllint b/provisioning/roles/geerlingguy.redis/.yamllint
new file mode 100644
index 000000000..76a383c6a
--- /dev/null
+++ b/provisioning/roles/geerlingguy.redis/.yamllint
@@ -0,0 +1,10 @@
+---
+extends: default
+
+rules:
+  line-length:
+    max: 120
+    level: warning
+
+ignore: |
+  .github/stale.yml
diff --git a/provisioning/roles/geerlingguy.redis/README.md b/provisioning/roles/geerlingguy.redis/README.md
index e8134ee7f..31092fa90 100644
--- a/provisioning/roles/geerlingguy.redis/README.md
+++ b/provisioning/roles/geerlingguy.redis/README.md
@@ -1,6 +1,6 @@
 # Ansible Role: Redis
 
-[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-redis.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-redis)
+[![CI](https://github.com/geerlingguy/ansible-role-redis/workflows/CI/badge.svg?event=push)](https://github.com/geerlingguy/ansible-role-redis/actions?query=workflow%3ACI)
 
 Installs [Redis](http://redis.io/) on Linux.
 
diff --git a/provisioning/roles/geerlingguy.redis/meta/main.yml b/provisioning/roles/geerlingguy.redis/meta/main.yml
index ffccc6a41..882938cf7 100644
--- a/provisioning/roles/geerlingguy.redis/meta/main.yml
+++ b/provisioning/roles/geerlingguy.redis/meta/main.yml
@@ -2,6 +2,7 @@
 dependencies: []
 
 galaxy_info:
+  role_name: redis
   author: geerlingguy
   description: Redis for Linux
   company: "Midwestern Mac, LLC"
@@ -10,20 +11,21 @@ galaxy_info:
   platforms:
     - name: EL
       versions:
-      - 6
-      - 7
+        - 6
+        - 7
+        - 8
     - name: Fedora
       versions:
-      - all
+        - all
     - name: Debian
       versions:
-      - all
+        - all
     - name: Ubuntu
       versions:
-      - all
+        - all
     - name: Archlinux
       versions:
-      - all
+        - all
   galaxy_tags:
     - database
     - development
diff --git a/provisioning/roles/geerlingguy.redis/tests/test.yml b/provisioning/roles/geerlingguy.redis/molecule/default/converge.yml
similarity index 64%
rename from provisioning/roles/geerlingguy.redis/tests/test.yml
rename to provisioning/roles/geerlingguy.redis/molecule/default/converge.yml
index 7e86758c2..8259ab8dc 100644
--- a/provisioning/roles/geerlingguy.redis/tests/test.yml
+++ b/provisioning/roles/geerlingguy.redis/molecule/default/converge.yml
@@ -1,9 +1,11 @@
 ---
-- hosts: all
+- name: Converge
+  hosts: all
+  become: true
 
   pre_tasks:
     - name: Update apt cache.
-      apt: update_cache=yes cache_valid_time=600
+      apt: update_cache=true cache_valid_time=600
       when: ansible_os_family == 'Debian'
 
     - name: Clear out repo for Fedora.
@@ -12,4 +14,4 @@
       when: ansible_distribution == 'Fedora'
 
   roles:
-    - role_under_test
+    - role: geerlingguy.redis
diff --git a/provisioning/roles/geerlingguy.redis/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.redis/molecule/default/molecule.yml
new file mode 100644
index 000000000..74907107f
--- /dev/null
+++ b/provisioning/roles/geerlingguy.redis/molecule/default/molecule.yml
@@ -0,0 +1,17 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+platforms:
+  - name: instance
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    privileged: true
+    pre_build_image: true
+provisioner:
+  name: ansible
+  playbooks:
+    converge: ${MOLECULE_PLAYBOOK:-converge.yml}
diff --git a/provisioning/roles/geerlingguy.redis/tasks/main.yml b/provisioning/roles/geerlingguy.redis/tasks/main.yml
index c249de3d7..0d57dc4d5 100644
--- a/provisioning/roles/geerlingguy.redis/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.redis/tasks/main.yml
@@ -8,6 +8,19 @@
     redis_package: "{{ __redis_package }}"
   when: redis_package is not defined
 
+- name: Ensure Redis configuration dir exists.
+  file:
+    path: "{{ redis_conf_path | dirname }}"
+    state: directory
+    mode: 0755
+
+- name: Ensure Redis is configured.
+  template:
+    src: redis.conf.j2
+    dest: "{{ redis_conf_path }}"
+    mode: "{{ redis_conf_mode }}"
+  notify: restart redis
+
 # Setup/install tasks.
 - include_tasks: setup-RedHat.yml
   when: ansible_os_family == 'RedHat'
@@ -18,12 +31,5 @@
 - include_tasks: setup-Archlinux.yml
   when: ansible_os_family == 'Archlinux'
 
-- name: Ensure Redis is configured.
-  template:
-    src: redis.conf.j2
-    dest: "{{ redis_conf_path }}"
-    mode: 0644
-  notify: restart redis
-
 - name: Ensure Redis is running and enabled on boot.
   service: "name={{ redis_daemon }} state=started enabled=yes"
diff --git a/provisioning/roles/geerlingguy.redis/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.redis/tasks/setup-RedHat.yml
index 69f56685d..ebb7e9e26 100644
--- a/provisioning/roles/geerlingguy.redis/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.redis/tasks/setup-RedHat.yml
@@ -3,4 +3,4 @@
   package:
     name: "{{ redis_package }}"
     state: present
-    enablerepo: "{{ redis_enablerepo }}"
+    enablerepo: "{{ redis_enablerepo | default(omit, true) }}"
diff --git a/provisioning/roles/geerlingguy.redis/tests/README.md b/provisioning/roles/geerlingguy.redis/tests/README.md
deleted file mode 100644
index 6fb211721..000000000
--- a/provisioning/roles/geerlingguy.redis/tests/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Ansible Role tests
-
-To run the test playbook(s) in this directory:
-
-  1. Install and start Docker.
-  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
-    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
-  1. Make the test shim executable: `chmod +x tests/test.sh`.
-  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
-
-If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.redis/vars/Debian.yml b/provisioning/roles/geerlingguy.redis/vars/Debian.yml
index 7863ccd74..47aaa0270 100644
--- a/provisioning/roles/geerlingguy.redis/vars/Debian.yml
+++ b/provisioning/roles/geerlingguy.redis/vars/Debian.yml
@@ -2,3 +2,4 @@
 __redis_package: redis-server
 redis_daemon: redis-server
 redis_conf_path: /etc/redis/redis.conf
+redis_conf_mode: 0640
diff --git a/provisioning/roles/geerlingguy.redis/vars/RedHat.yml b/provisioning/roles/geerlingguy.redis/vars/RedHat.yml
index 4aba21366..a64d953f5 100644
--- a/provisioning/roles/geerlingguy.redis/vars/RedHat.yml
+++ b/provisioning/roles/geerlingguy.redis/vars/RedHat.yml
@@ -2,3 +2,4 @@
 __redis_package: redis
 redis_daemon: redis
 redis_conf_path: /etc/redis.conf
+redis_conf_mode: 0644

From 9087cf1b4d74e2c37432c1c65ee8ff07e1690236 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 23 Nov 2020 16:40:22 -0600
Subject: [PATCH 1222/1273] Issue #2109: Add molecule configuration and GitHub
 Actions CI.

---
 .github/workflows/ci.yml      | 83 +++++++++++++++++++++++++++++++++++
 molecule/default/converge.yml | 35 +++++++++++++++
 molecule/default/molecule.yml | 17 +++++++
 3 files changed, 135 insertions(+)
 create mode 100644 .github/workflows/ci.yml
 create mode 100644 molecule/default/converge.yml
 create mode 100644 molecule/default/molecule.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 000000000..fd9127a22
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,83 @@
+---
+name: CI
+'on':
+  pull_request:
+  push:
+    branches:
+      - master
+  schedule:
+    - cron: "20 3 * * 0"
+
+jobs:
+
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.apache'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies.
+        run: pip3 install yamllint ansible-lint
+
+      - name: Lint code.
+        run: |
+          yamllint .
+          ansible-lint
+
+  molecule:
+    name: Molecule
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - distro: ubuntu1804
+            playbook: converge.yml
+          - distro: debian10
+            playbook: converge.yml
+          - distro: centos8
+            playbook: converge.yml
+          # TODO:
+          #
+          # PHP 7.3
+          # local_config: tests/ubuntu-18-php73.config.yml
+          # DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/bin/drush"
+          # TEST_INSTALLED_EXTRAS: false
+          #
+          # Postgresql
+          # local_config: tests/ubuntu-18-postgresql.config.yml
+          # DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/bin/drush"
+          # config_dir: /var/www/drupalvm/config
+          # TEST_INSTALLED_EXTRAS: false
+
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies.
+        run: pip3 install ansible molecule[docker] docker
+
+      - name: Copy test scaffold files into place.
+        run: |
+          cp tests/config.yml ./config.yml
+          cp example.drupal.make.yml drupal.make.yml
+          cp example.drupal.composer.json drupal.composer.json
+
+      - name: Run Molecule tests.
+        run: molecule test
+        env:
+          PY_COLORS: '1'
+          ANSIBLE_FORCE_COLOR: '1'
+          MOLECULE_DISTRO: ${{ matrix.distro }}
diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
new file mode 100644
index 000000000..5b19bf0eb
--- /dev/null
+++ b/molecule/default/converge.yml
@@ -0,0 +1,35 @@
+---
+- name: Converge
+  hosts: all
+  become: true
+
+  vars:
+    # Update the composer_home_path for global installs.
+    composer_home_path: "/{{ drupalvm_user }}/.composer"
+
+    # Don't run the 'disable firewall' tasks in tests.
+    firewall_disable_firewalld: false
+    firewall_disable_ufw: false
+
+    # Added to prevent test failures in CI.
+    firewall_enable_ipv6: false
+
+  tasks:
+    - name: Update apt cache.
+      apt:
+        update_cache: true
+        cache_valid_time: 1200
+      when: ansible_os_family == 'Debian'
+
+    - name: Install test dependencies (RedHat).
+      package:
+        name: logrotate
+        state: present
+      when: ansible_os_family == 'RedHat'
+
+    - name: Configure test vars (RedHat).
+      set_fact:
+        postfix_inet_protocols: ipv4
+      when: ansible_os_family == 'RedHat'
+
+- import_playbook: ../../provisioning/playbook.yml
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
new file mode 100644
index 000000000..04169a846
--- /dev/null
+++ b/molecule/default/molecule.yml
@@ -0,0 +1,17 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+platforms:
+  - name: instance
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu1804}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    privileged: true
+    pre_build_image: true
+provisioner:
+  name: ansible
+  playbooks:
+    converge: ${MOLECULE_PLAYBOOK:-converge.yml}

From d5d32b9a12bb98f3afe683878578059996b83b86 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 23 Nov 2020 16:58:19 -0600
Subject: [PATCH 1223/1273] Issue #2109: Tons of linting fixes.

---
 .github/FUNDING.yml              |   2 +-
 .github/workflows/ci.yml         |  39 +++++++----
 .travis.yml                      |  59 ----------------
 .yamllint                        |  19 +++++
 README.md                        |   2 +-
 default.config.yml               |   4 +-
 example.docker-compose.yml       |   1 +
 mkdocs.yml                       | 115 ++++++++++++++++---------------
 provisioning/playbook.yml        |   2 +-
 provisioning/templates/drush.yml |   1 +
 10 files changed, 109 insertions(+), 135 deletions(-)
 delete mode 100644 .travis.yml
 create mode 100644 .yamllint

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index af7a1e022..96b493831 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,4 +1,4 @@
 # These are supported funding model platforms
-
+---
 github: geerlingguy
 patreon: geerlingguy
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fd9127a22..03e259873 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,13 +24,21 @@ jobs:
         with:
           python-version: '3.x'
 
+      - name: Set up Ruby.
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6
+
       - name: Install test dependencies.
-        run: pip3 install yamllint ansible-lint
+        run: |
+          pip3 install yamllint
+          gem install rubocop
 
       - name: Lint code.
         run: |
           yamllint .
-          ansible-lint
+          rubocop ./Vagrantfile ./lib/drupalvm \
+            --except Metrics/LineLength,Security/Eval,Style/MutableConstant,Metrics/BlockLength,Metrics/MethodLength,Style/ConditionalAssignment,Style/IfUnlessModifier,Style/CaseLikeIf
 
   molecule:
     name: Molecule
@@ -44,18 +52,21 @@ jobs:
             playbook: converge.yml
           - distro: centos8
             playbook: converge.yml
-          # TODO:
-          #
-          # PHP 7.3
-          # local_config: tests/ubuntu-18-php73.config.yml
-          # DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/bin/drush"
-          # TEST_INSTALLED_EXTRAS: false
-          #
-          # Postgresql
-          # local_config: tests/ubuntu-18-postgresql.config.yml
-          # DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/bin/drush"
-          # config_dir: /var/www/drupalvm/config
-          # TEST_INSTALLED_EXTRAS: false
+
+            # PHP 7.3
+            # local_config: tests/ubuntu-18-php73.config.yml
+            # DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/bin/drush"
+            # TEST_INSTALLED_EXTRAS: false
+            # - distro: ubuntu1804
+            #   playbook: php-7.3.yml
+
+            # Postgresql
+            # local_config: tests/ubuntu-18-postgresql.config.yml
+            # DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/bin/drush"
+            # config_dir: /var/www/drupalvm/config
+            # TEST_INSTALLED_EXTRAS: false
+            # - distro: ubunt1804
+            #   playbook: postgresql.yml
 
     steps:
       - name: Check out the codebase.
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 3cf269a63..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,59 +0,0 @@
----
-language: php
-php: 7.4
-services: docker
-
-branches:
-  only:
-    - master
-
-env:
-  global:
-    - CONFIG: tests/config.yml
-      MAKEFILE: example.drupal.make.yml
-      COMPOSERFILE: example.drupal.composer.json
-      HOSTNAME: drupalvm.test
-      MACHINE_NAME: drupalvm
-      IP: 192.168.88.88
-      DRUPALVM_DIR: /var/www/drupalvm
-      DRUSH_BIN: drush
-      TEST_INSTALLED_EXTRAS: true
-      CONTAINER_ID: dvm-test
-
-  matrix:
-    # Defaults - Ubuntu 18.04.
-    - type: defaults
-      distro: ubuntu1804
-    # Defaults - Debian 10.
-    - type: debian
-      distro: debian10
-    # Defaults - CentOS 8.
-    - type: centos
-      distro: centos8
-      local_config: tests/centos-8.config.yml
-
-    # PHP 7.3 - Ubuntu 18.04.
-    - type: defaults
-      distro: ubuntu1804
-      local_config: tests/ubuntu-18-php73.config.yml
-      DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/bin/drush"
-      TEST_INSTALLED_EXTRAS: false
-
-    # PostgreSQL - Ubuntu 18.04.
-    - type: postgresql
-      distro: ubuntu1804
-      local_config: tests/ubuntu-18-postgresql.config.yml
-      DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/bin/drush"
-      config_dir: /var/www/drupalvm/config
-      TEST_INSTALLED_EXTRAS: false
-
-before_install:
-  # Install lint tools.
-  - gem install rubocop
-
-script:
-  # Vagrantfile syntax check.
-  - 'rubocop ./Vagrantfile ./lib/drupalvm --except Metrics/LineLength,Security/Eval,Style/MutableConstant,Metrics/BlockLength,Metrics/MethodLength,Style/ConditionalAssignment,Style/IfUnlessModifier,Style/CaseLikeIf'
-
-  # Run tests.
-  - composer run-tests
diff --git a/.yamllint b/.yamllint
new file mode 100644
index 000000000..e6ad70a67
--- /dev/null
+++ b/.yamllint
@@ -0,0 +1,19 @@
+---
+extends: default
+
+rules:
+  line-length:
+    max: 200
+    level: warning
+  truthy:
+    allowed-values: ['true', 'false', 'yes', 'no']
+  braces:
+    min-spaces-inside: 1
+    max-spaces-inside: 1
+    min-spaces-inside-empty: -1
+    max-spaces-inside-empty: -1
+
+ignore: |
+  */stale.yml
+  */.travis.yml
+  provisioning/roles/
diff --git a/README.md b/README.md
index 8f61a9691..cd57f690c 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ![Drupal VM Logo](https://raw.githubusercontent.com/geerlingguy/drupal-vm/master/docs/images/drupal-vm-logo.png)
 
-[![Build Status](https://travis-ci.com/geerlingguy/drupal-vm.svg?branch=master)](https://travis-ci.com/geerlingguy/drupal-vm) [![Documentation Status](https://readthedocs.org/projects/drupal-vm/badge/?version=latest)](http://docs.drupalvm.com) [![Packagist](https://img.shields.io/packagist/v/geerlingguy/drupal-vm.svg)](https://packagist.org/packages/geerlingguy/drupal-vm) [![Docker Automated build](https://img.shields.io/docker/automated/geerlingguy/drupal-vm.svg?maxAge=2592000)](https://hub.docker.com/r/geerlingguy/drupal-vm/) [![](https://images.microbadger.com/badges/image/geerlingguy/drupal-vm.svg)](https://microbadger.com/images/geerlingguy/drupal-vm "Get your own image badge on microbadger.com") [![irc://irc.freenode.net/drupal-vm](https://img.shields.io/badge/irc.freenode.net-%23drupal--vm-brightgreen.svg)](https://riot.im/app/#/room/#drupal-vm:matrix.org)
+[![CI](https://github.com/geerlingguy/drupal-vm/workflows/CI/badge.svg?event=push)](https://github.com/geerlingguy/drupal-vm/actions?query=workflow%3ACI) [![Documentation Status](https://readthedocs.org/projects/drupal-vm/badge/?version=latest)](http://docs.drupalvm.com) [![Packagist](https://img.shields.io/packagist/v/geerlingguy/drupal-vm.svg)](https://packagist.org/packages/geerlingguy/drupal-vm) [![Docker Automated build](https://img.shields.io/docker/automated/geerlingguy/drupal-vm.svg?maxAge=2592000)](https://hub.docker.com/r/geerlingguy/drupal-vm/) [![](https://images.microbadger.com/badges/image/geerlingguy/drupal-vm.svg)](https://microbadger.com/images/geerlingguy/drupal-vm "Get your own image badge on microbadger.com") [![irc://irc.freenode.net/drupal-vm](https://img.shields.io/badge/irc.freenode.net-%23drupal--vm-brightgreen.svg)](https://riot.im/app/#/room/#drupal-vm:matrix.org)
 
 [Drupal VM](https://www.drupalvm.com/) is a VM for Drupal, built with Ansible.
 
diff --git a/default.config.yml b/default.config.yml
index ba940f8fd..a82589518 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -95,7 +95,7 @@ drupal_major_version: 9
 drupal_domain: "{{ vagrant_hostname }}"
 drupal_site_name: "Drupal"
 drupal_install_profile: standard
-drupal_enable_modules: [ 'devel' ]
+drupal_enable_modules: ['devel']
 drupal_account_name: admin
 drupal_account_pass: admin
 
@@ -285,7 +285,7 @@ composer_global_packages: []
 # reference the directory where your `config.yml` is.
 pre_provision_scripts: []
 post_provision_scripts: []
-  # - "{{ playbook_dir }}/../examples/scripts/configure-solr.sh"
+# - "{{ playbook_dir }}/../examples/scripts/configure-solr.sh"
 
 # MySQL Configuration.
 mysql_root_password: root
diff --git a/example.docker-compose.yml b/example.docker-compose.yml
index d11a14a43..75b0c34d6 100644
--- a/example.docker-compose.yml
+++ b/example.docker-compose.yml
@@ -1,3 +1,4 @@
+---
 version: "3"
 
 services:
diff --git a/mkdocs.yml b/mkdocs.yml
index 1f2a3da0f..ba65b03f6 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -1,3 +1,4 @@
+---
 site_name: Drupal VM Documentation
 
 repo_url: https://github.com/geerlingguy/drupal-vm
@@ -9,69 +10,69 @@ extra_javascript:
 
 markdown_extensions:
   - toc:
-      permalink: True
+      permalink: true
 
 pages:
   - Home: 'index.md'
   - Getting Started:
-    - Installation:
-      - 'macOS': 'getting-started/installation-macos.md'
-      - 'Windows': 'getting-started/installation-windows.md'
-      - 'Linux': 'getting-started/installation-linux.md'
-    - 'Configuring Drupal VM': 'getting-started/configure-drupalvm.md'
-    - 'Syncing Folders': 'getting-started/syncing-folders.md'
+      - Installation:
+          - 'macOS': 'getting-started/installation-macos.md'
+          - 'Windows': 'getting-started/installation-windows.md'
+          - 'Linux': 'getting-started/installation-linux.md'
+      - 'Configuring Drupal VM': 'getting-started/configure-drupalvm.md'
+      - 'Syncing Folders': 'getting-started/syncing-folders.md'
   - Building your codebase:
-    - 'Using a local Drupal codebase': 'deployment/local-codebase.md'
-    - 'Using a composer package': 'deployment/composer-package.md'
-    - 'Using composer.json': 'deployment/composer.md'
-    - 'Using a Drush Make file': 'deployment/drush-make.md'
-    - 'Drupal VM as a Composer Dependency': 'deployment/composer-dependency.md'
-    - 'Deploying Drupal via Git': 'deployment/git.md'
+      - 'Using a local Drupal codebase': 'deployment/local-codebase.md'
+      - 'Using a composer package': 'deployment/composer-package.md'
+      - 'Using composer.json': 'deployment/composer.md'
+      - 'Using a Drush Make file': 'deployment/drush-make.md'
+      - 'Drupal VM as a Composer Dependency': 'deployment/composer-dependency.md'
+      - 'Deploying Drupal via Git': 'deployment/git.md'
   - Basic configurations:
-    - 'Using different base OSes': 'configurations/base-os.md'
-    - 'Using a different PHP version': 'configurations/php.md'
-    - Webservers:
-      - 'Apache': 'configurations/webservers-apache.md'
-      - 'Nginx': 'configurations/webservers-nginx.md'
-    - Databases:
-      - 'Connect to the MySQL Database': 'configurations/databases-mysql.md'
-      - 'Use MariaDB instead of MySQL': 'configurations/databases-mariadb.md'
-      - 'Use PostgreSQL instead of MySQL': 'configurations/databases-postgresql.md'
+      - 'Using different base OSes': 'configurations/base-os.md'
+      - 'Using a different PHP version': 'configurations/php.md'
+      - Webservers:
+          - 'Apache': 'configurations/webservers-apache.md'
+          - 'Nginx': 'configurations/webservers-nginx.md'
+      - Databases:
+          - 'Connect to the MySQL Database': 'configurations/databases-mysql.md'
+          - 'Use MariaDB instead of MySQL': 'configurations/databases-mariadb.md'
+          - 'Use PostgreSQL instead of MySQL': 'configurations/databases-postgresql.md'
   - Installed extras:
-    - 'adminer (Database UI)': 'extras/adminer.md'
-    - 'blackfire (Profiling tool)': 'extras/blackfire.md'
-    - 'drupalconsole (Drupal CLI)': 'extras/drupal-console.md'
-    - 'drush (Drupal CLI)': 'extras/drush.md'
-    - 'elasticsearch (Search engine)': 'extras/elasticsearch.md'
-    - 'java': 'extras/java.md'
-    - 'mailhog (Mail catcher)': 'extras/mailhog.md'
-    - 'memcached (In-memory cache)': 'extras/memcached.md'
-    - 'newrelic (Performance monitoring)': 'extras/newrelic.md'
-    - 'nodejs': 'extras/nodejs.md'
-    - 'pimpmylog (Log viewer)': 'extras/pimpmylog.md'
-    - 'redis (In-memory database)': 'extras/redis.md'
-    - 'ruby': 'extras/ruby.md'
-    - 'selenium (BDD with Behat)': 'extras/selenium.md'
-    - 'solr (Search engine)': 'extras/solr.md'
-    - 'tideways (Profiling tool)': 'extras/tideways.md'
-    - 'upload-progress': 'extras/upload-progress.md'
-    - 'varnish (Caching reverse proxy)': 'extras/varnish.md'
-    - 'xdebug (Debugging tool)': 'extras/xdebug.md'
-    - 'xhprof (Profiling tool)': 'extras/xhprof.md'
+      - 'adminer (Database UI)': 'extras/adminer.md'
+      - 'blackfire (Profiling tool)': 'extras/blackfire.md'
+      - 'drupalconsole (Drupal CLI)': 'extras/drupal-console.md'
+      - 'drush (Drupal CLI)': 'extras/drush.md'
+      - 'elasticsearch (Search engine)': 'extras/elasticsearch.md'
+      - 'java': 'extras/java.md'
+      - 'mailhog (Mail catcher)': 'extras/mailhog.md'
+      - 'memcached (In-memory cache)': 'extras/memcached.md'
+      - 'newrelic (Performance monitoring)': 'extras/newrelic.md'
+      - 'nodejs': 'extras/nodejs.md'
+      - 'pimpmylog (Log viewer)': 'extras/pimpmylog.md'
+      - 'redis (In-memory database)': 'extras/redis.md'
+      - 'ruby': 'extras/ruby.md'
+      - 'selenium (BDD with Behat)': 'extras/selenium.md'
+      - 'solr (Search engine)': 'extras/solr.md'
+      - 'tideways (Profiling tool)': 'extras/tideways.md'
+      - 'upload-progress': 'extras/upload-progress.md'
+      - 'varnish (Caching reverse proxy)': 'extras/varnish.md'
+      - 'xdebug (Debugging tool)': 'extras/xdebug.md'
+      - 'xhprof (Profiling tool)': 'extras/xhprof.md'
   - Extending Drupal VM:
-    - 'Adding Vagrant plugins Vagrantfile.local': 'extending/vagrantfile.md'
-    - 'Passing on CLI arguments to ansible': 'extending/ansible-args.md'
-    - 'Pre- and Post-Provision Scripts': 'extending/scripts.md'
+      - 'Adding Vagrant plugins Vagrantfile.local': 'extending/vagrantfile.md'
+      - 'Passing on CLI arguments to ansible': 'extending/ansible-args.md'
+      - 'Pre- and Post-Provision Scripts': 'extending/scripts.md'
   - Other Information:
-    - 'Networking Notes': 'other/networking.md'
-    - 'Vagrant LXC provider': 'other/vagrant-lxc.md'
-    - 'Improving Performance': 'other/performance.md'
-    - 'Docker': 'other/docker.md'
-    - 'Custom Vagrant Base Box': 'other/custom-base-box.md'
-    - 'BigPipe with Drupal VM': 'other/bigpipe.md'
-    - 'Drupal multisite': 'deployment/multisite.md'
-    - 'Drupal 6 Notes': 'other/drupal-6.md'
-    - 'Drupal VM Management Tools': 'other/management-tools.md'
-    - 'Emulating Acquia Cloud environment': 'other/acquia.md'
-    - 'Deploying to a production environment': 'other/production.md'
-    - 'Wordpress or other applications': 'other/wordpress-other-applications.md'
+      - 'Networking Notes': 'other/networking.md'
+      - 'Vagrant LXC provider': 'other/vagrant-lxc.md'
+      - 'Improving Performance': 'other/performance.md'
+      - 'Docker': 'other/docker.md'
+      - 'Custom Vagrant Base Box': 'other/custom-base-box.md'
+      - 'BigPipe with Drupal VM': 'other/bigpipe.md'
+      - 'Drupal multisite': 'deployment/multisite.md'
+      - 'Drupal 6 Notes': 'other/drupal-6.md'
+      - 'Drupal VM Management Tools': 'other/management-tools.md'
+      - 'Emulating Acquia Cloud environment': 'other/acquia.md'
+      - 'Deploying to a production environment': 'other/production.md'
+      - 'Wordpress or other applications': 'other/wordpress-other-applications.md'
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 1578c44b2..e32621f13 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -38,7 +38,7 @@
     - { role: geerlingguy.firewall, when: firewall_enabled }
     - { role: geerlingguy.git }
     - { role: geerlingguy.postfix }
-    - { role: geerlingguy.apache, when: drupalvm_webserver == 'apache', tags: ['webserver']}
+    - { role: geerlingguy.apache, when: drupalvm_webserver == 'apache', tags: ['webserver'] }
     - { role: geerlingguy.apache-php-fpm, when: drupalvm_webserver == 'apache', tags: ['webserver'] }
     - { role: geerlingguy.nginx, when: drupalvm_webserver == 'nginx', tags: ['webserver'] }
     - { role: geerlingguy.php-versions, when: php_version != '', tags: ['php', 'xdebug', 'database'] }
diff --git a/provisioning/templates/drush.yml b/provisioning/templates/drush.yml
index e04ccc67d..4ad3f737e 100644
--- a/provisioning/templates/drush.yml
+++ b/provisioning/templates/drush.yml
@@ -1,3 +1,4 @@
+---
 drush:
   paths:
     alias-path:

From 897122317d8b587bab438e8ad2f806a23c5456ab Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 23 Nov 2020 17:14:30 -0600
Subject: [PATCH 1224/1273] Issue #2109: More fixes for linting and testing.

---
 .github/workflows/ci.yml              |   3 +-
 composer.json                         |   2 +-
 molecule/default/converge.yml         |   1 +
 molecule/default/verify.yml           |  50 +++++++
 tests/centos-8.config.yml             |   2 -
 tests/config.yml                      |  10 --
 tests/run-tests.sh                    | 185 --------------------------
 tests/test-setup.yml                  |  12 --
 tests/ubuntu-18-php74.config.yml      |   4 -
 tests/ubuntu-18-postgresql.config.yml |   4 -
 10 files changed, 53 insertions(+), 220 deletions(-)
 create mode 100644 molecule/default/verify.yml
 delete mode 100644 tests/centos-8.config.yml
 delete mode 100644 tests/config.yml
 delete mode 100755 tests/run-tests.sh
 delete mode 100644 tests/test-setup.yml
 delete mode 100644 tests/ubuntu-18-php74.config.yml
 delete mode 100644 tests/ubuntu-18-postgresql.config.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 03e259873..91e3169fa 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,8 +16,6 @@ jobs:
     steps:
       - name: Check out the codebase.
         uses: actions/checkout@v2
-        with:
-          path: 'geerlingguy.apache'
 
       - name: Set up Python 3.
         uses: actions/setup-python@v2
@@ -46,6 +44,7 @@ jobs:
     strategy:
       matrix:
         include:
+          # Defaults.
           - distro: ubuntu1804
             playbook: converge.yml
           - distro: debian10
diff --git a/composer.json b/composer.json
index fae792f0a..f0a4ca336 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,7 @@
         "process-timeout": 1800
     },
     "scripts": {
-        "run-tests": "./tests/run-tests.sh",
+        "run-tests": "molecule test",
         "docker-bake": "./provisioning/docker/bake.sh",
         "docker-save-image": "./provisioning/docker/save-image.sh",
         "docker-load-image": "./provisioning/docker/load-image.sh"
diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
index 5b19bf0eb..3130e1f16 100644
--- a/molecule/default/converge.yml
+++ b/molecule/default/converge.yml
@@ -13,6 +13,7 @@
 
     # Added to prevent test failures in CI.
     firewall_enable_ipv6: false
+    hostname_fqdn: ''
 
   tasks:
     - name: Update apt cache.
diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml
new file mode 100644
index 000000000..a3f58d61a
--- /dev/null
+++ b/molecule/default/verify.yml
@@ -0,0 +1,50 @@
+---
+- name: Verify
+  hosts: all
+  become: true
+
+  vars:
+    drupal_vm_hostname: drupalvm.test
+
+  tasks:
+    - name: Validate web services are up and running.
+      uri:
+        url: localhost{{ item.port | default(omit) }}
+        headers:
+          Host: "{{ item.host_prefix }}{{ drupal_vm_hostname }}"
+        return_content: true
+      register: response
+      failed_when: item.expected_content not in response.content
+      with_items:
+        - name: Drupal
+          host_prefix: ""
+          expected_content: "<title>Welcome to Drupal"
+        - name: Dashboard
+          host_prefix: "dashboard."
+          expected_content: "Vagrant + Ansible"
+        - name: Adminer
+          host_prefix: "adminer."
+          expected_content: "<title>Login - Adminer"
+        - name: Pimp My Log
+          host_prefix: "pimpmylog."
+          expected_content: "<title>Pimp my Log"
+        - name: MailHog
+          host_prefix: ""
+          port: "8025"
+          expected_content: "<title>MailHog"
+
+# TODO: Varnish
+# if [ $TEST_INSTALLED_EXTRAS = true ]; then
+#   docker exec $CONTAINER_ID curl -sSI --header Host:$HOSTNAME localhost:81 \
+#     | tee /tmp/dvm-test \
+#     | grep -q 'Via: .* varnish' \
+#     && (echo 'Varnish install pass' && exit 0) \
+#     || (echo 'Varnish install fail' && cat /tmp/dvm-test && exit 1)
+# fi
+
+# TODO: Drush
+# docker exec $CONTAINER_ID bash -c "cd $DRUPALVM_DIR/drupal && $DRUSH_BIN status" \
+#   | tee /tmp/dvm-test \
+#   | grep -q 'Drush' \
+#   && (echo 'Drush install pass' && exit 0) \
+#   || (echo 'Drush install fail' && cat /tmp/dvm-test && exit 1)
diff --git a/tests/centos-8.config.yml b/tests/centos-8.config.yml
deleted file mode 100644
index c5b40e548..000000000
--- a/tests/centos-8.config.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-postfix_inet_protocols: ipv4
diff --git a/tests/config.yml b/tests/config.yml
deleted file mode 100644
index 442f4f19c..000000000
--- a/tests/config.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-# Update the composer_home_path for global installs.
-composer_home_path: "/{{ drupalvm_user }}/.composer"
-
-# Don't run the 'disable firewall' tasks in tests.
-firewall_disable_firewalld: false
-firewall_disable_ufw: false
-
-# Added to prevent test failures in CI.
-firewall_enable_ipv6: false
diff --git a/tests/run-tests.sh b/tests/run-tests.sh
deleted file mode 100755
index d95513c34..000000000
--- a/tests/run-tests.sh
+++ /dev/null
@@ -1,185 +0,0 @@
-#!/bin/bash
-#
-# A script to run Drupal VM functional tests.
-
-# Set defaults if they're not set upstream.
-CONFIG="${CONFIG:-tests/config.yml}"
-MAKEFILE="${MAKEFILE:-example.drupal.make.yml}"
-COMPOSERFILE="${COMPOSERFILE:-example.drupal.composer.json}"
-HOSTNAME="${HOSTNAME:-drupalvm.test}"
-MACHINE_NAME="${MACHINE_NAME:-drupalvm}"
-IP="${IP:-192.168.88.88}"
-DRUPALVM_DIR="${DRUPALVM_DIR:-/var/www/drupalvm}"
-DRUSH_BIN="${DRUSH_BIN:-drush}"
-ANSIBLE_PYTHON_INTERPRETER="${ANSIBLE_PYTHON_INTERPRETER:-/usr/bin/python3}"
-TEST_INSTALLED_EXTRAS="${TEST_INSTALLED_EXTRAS:-true}"
-CONTAINER_ID="${CONTAINER_ID:-dvm-test}"
-type="${type:-tests/defaults}"
-distro="${distro:-ubuntu1804}"
-tag="${tag:-latest}"
-cleanup="${cleanup:-true}"
-
-## Set up vars for Docker setup.
-# CentOS 8
-if [ $distro = 'centos8' ]; then
-  init="/usr/lib/systemd/systemd"
-  opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-# Ubuntu 18.04
-elif [ $distro = 'ubuntu1804' ]; then
-  init="/lib/systemd/systemd"
-  opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-# Debian 10
-elif [ $distro = 'debian10' ]; then
-  init="/lib/systemd/systemd"
-  opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
-fi
-
-# Set OS-specific options.
-if [[ "$OSTYPE" == "darwin"* ]]; then
-  volume_opts='rw,cached'
-else
-  volume_opts='rw'
-fi
-
-# Use correct xargs command depending if it's GNU or BSD.
-if xargs --version 2>&1 | grep -s GNU >/dev/null; then
-  xargs_command='xargs -r'
-else
-  xargs_command='xargs'
-fi
-
-# Exit on any individual command failure.
-set -e
-
-# Pretty colors.
-red='\033[0;31m'
-green='\033[0;32m'
-neutral='\033[0m'
-
-# Remove test container if it already exists.
-printf "\n"${green}"Removing any existing test containers..."${neutral}"\n"
-docker ps -aq --filter name=$CONTAINER_ID | $xargs_command docker rm -f -v
-printf ${green}"...done!"${neutral}"\n"
-
-# Run the container.
-printf "\n"${green}"Starting Docker container: geerlingguy/docker-$distro-ansible."${neutral}"\n"
-docker run --name=$CONTAINER_ID -d \
-  --add-host "$HOSTNAME  drupalvm":127.0.0.1 \
-  -v $PWD:/var/www/drupalvm/:$volume_opts \
-  $opts \
-  geerlingguy/docker-$distro-ansible:$tag \
-  $init
-
-# Set up directories.
-docker exec $CONTAINER_ID mkdir -p /var/www/drupalvm/drupal
-[[ ! -z "$config_dir" ]] && docker exec $CONTAINER_ID mkdir -p $config_dir || true
-
-# Copy configuration into place.
-docker exec $CONTAINER_ID cp $DRUPALVM_DIR/$CONFIG ${config_dir:-$DRUPALVM_DIR}/config.yml
-docker exec $CONTAINER_ID cp $DRUPALVM_DIR/$MAKEFILE ${config_dir:-$DRUPALVM_DIR}/drupal.make.yml
-docker exec $CONTAINER_ID cp $DRUPALVM_DIR/$COMPOSERFILE ${config_dir:-$DRUPALVM_DIR}/drupal.composer.json
-[[ ! -z "$DRUPALVM_ENV" ]] && docker exec $CONTAINER_ID bash -c "cp $DRUPALVM_DIR/tests/$DRUPALVM_ENV.config.yml ${config_dir:-$DRUPALVM_DIR}/$DRUPALVM_ENV.config.yml" || true
-
-# Override configuration variables with local config.
-[[ ! -z "$local_config" ]] && docker exec $CONTAINER_ID bash -c "cp $DRUPALVM_DIR/$local_config ${config_dir:-$DRUPALVM_DIR}/local.config.yml" || true
-
-# Check playbook syntax.
-printf "\n"${green}"Checking playbook syntax..."${neutral}"\n"
-docker exec --tty $CONTAINER_ID env TERM=xterm ansible-playbook $DRUPALVM_DIR/provisioning/playbook.yml --syntax-check
-
-# Run the setup playbook.
-printf "\n"${green}"Running the setup playbook..."${neutral}"\n"
-docker exec --tty $CONTAINER_ID env TERM=xterm \
-  ansible-playbook /var/www/drupalvm/tests/test-setup.yml \
-  -e "ansible_python_interpreter=$ANSIBLE_PYTHON_INTERPRETER";
-
-# Run the Drupal VM playbook.
-printf "\n"${green}"Running the Drupal VM playbook..."${neutral}"\n"
-if [ ! -z "${config_dir}" ]; then
-  # Run with config_dir specified.
-  docker exec $CONTAINER_ID env TERM=xterm ANSIBLE_FORCE_COLOR=true DRUPALVM_ENV=$DRUPALVM_ENV \
-    ansible-playbook $DRUPALVM_DIR/provisioning/playbook.yml \
-    -e "config_dir=$config_dir" -e "ansible_python_interpreter=$ANSIBLE_PYTHON_INTERPRETER";
-else
-  # Run without config_dir specified.
-  docker exec $CONTAINER_ID env TERM=xterm ANSIBLE_FORCE_COLOR=true DRUPALVM_ENV=$DRUPALVM_ENV \
-    ansible-playbook $DRUPALVM_DIR/provisioning/playbook.yml \
-    -e "ansible_python_interpreter=$ANSIBLE_PYTHON_INTERPRETER";
-fi
-
-# Drupal.
-printf "\n"${green}"Running functional tests..."${neutral}"\n"
-docker exec $CONTAINER_ID curl -sSi --header Host:$HOSTNAME localhost \
-  | tee /tmp/dvm-test \
-  | grep -q '<title>Welcome to Drupal' \
-  && (echo 'Drupal install pass' && exit 0) \
-  || (echo 'Drupal install fail' && cat /tmp/dvm-test && exit 1)
-
-# Adminer.
-if [ $TEST_INSTALLED_EXTRAS = true ]; then
-  docker exec $CONTAINER_ID curl -sSi --header Host:adminer.$HOSTNAME localhost \
-    | tee /tmp/dvm-test \
-    | grep -q '<title>Login - Adminer' \
-    && (echo 'Adminer install pass' && exit 0) \
-    || (echo 'Adminer install fail' && cat /tmp/dvm-test && exit 1)
-fi
-
-# Pimp My Log.
-if [ $TEST_INSTALLED_EXTRAS = true ]; then
-  docker exec $CONTAINER_ID curl -sSi --header Host:pimpmylog.$HOSTNAME localhost \
-    | tee /tmp/dvm-test \
-    | grep -q '<title>Pimp my Log' \
-    && (echo 'Pimp my Log install pass' && exit 0) \
-    || (echo 'Pimp my Log install fail' && cat /tmp/dvm-test && exit 1)
-fi
-
-# MailHog.
-if [ $TEST_INSTALLED_EXTRAS = true ]; then
-  docker exec $CONTAINER_ID curl -sSi localhost:8025 \
-    | tee /tmp/dvm-test \
-    | grep -q '<title>MailHog' \
-    && (echo 'MailHog install pass' && exit 0) \
-    || (echo 'MailHog install fail' && cat /tmp/dvm-test && exit 1)
-fi
-
-# Varnish.
-if [ $TEST_INSTALLED_EXTRAS = true ]; then
-  docker exec $CONTAINER_ID curl -sSI --header Host:$HOSTNAME localhost:81 \
-    | tee /tmp/dvm-test \
-    | grep -q 'Via: .* varnish' \
-    && (echo 'Varnish install pass' && exit 0) \
-    || (echo 'Varnish install fail' && cat /tmp/dvm-test && exit 1)
-fi
-
-# Dashboard.
-docker exec $CONTAINER_ID curl -sSi --header Host:$IP localhost \
-  | tee /tmp/dvm-test \
-  | grep -q "<li>$IP $HOSTNAME</li>" \
-  && (echo 'Dashboard install pass' && exit 0) \
-  || (echo 'Dashboard install fail' && cat /tmp/dvm-test && exit 1)
-
-# Drush - see https://github.com/drush-ops/drush/issues/3336. This test would
-# also test generated global Drush aliases, but it's currently not working due
-# to $reasons.
-# docker exec $CONTAINER_ID $DRUSH_BIN @$MACHINE_NAME.$HOSTNAME status \
-#   | tee /tmp/dvm-test \
-#   | grep -q 'Drupal bootstrap.*Successful' \
-#   && (echo 'Drush install pass' && exit 0) \
-#   || (echo 'Drush install fail' && cat /tmp/dvm-test && exit 1)
-
-# Drush.
-docker exec $CONTAINER_ID bash -c "cd $DRUPALVM_DIR/drupal && $DRUSH_BIN status" \
-  | tee /tmp/dvm-test \
-  | grep -q 'Drush' \
-  && (echo 'Drush install pass' && exit 0) \
-  || (echo 'Drush install fail' && cat /tmp/dvm-test && exit 1)
-
-# Remove test container.
-if [ $cleanup = true ]; then
-  printf "\n"${green}"Cleaning up..."${neutral}"\n"
-  docker rm -f $CONTAINER_ID
-  printf ${green}"...done!"${neutral}"\n\n"
-else
-  printf "\n"${green}"Skipping cleanup for container id: ${CONTAINER_ID}!"${neutral}"\n"
-  printf ${green}"Done!"${neutral}"\n\n"
-fi
diff --git a/tests/test-setup.yml b/tests/test-setup.yml
deleted file mode 100644
index 9ae3c099f..000000000
--- a/tests/test-setup.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-- hosts: all
-  become: yes
-
-  tasks:
-    - name: Update apt cache.
-      apt: update_cache=yes
-      when: ansible_os_family == 'Debian'
-
-    - name: Install test dependencies (RedHat).
-      package: name=logrotate state=present
-      when: ansible_os_family == 'RedHat'
diff --git a/tests/ubuntu-18-php74.config.yml b/tests/ubuntu-18-php74.config.yml
deleted file mode 100644
index 736d0e6a8..000000000
--- a/tests/ubuntu-18-php74.config.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-php_version: "7.4"
-php_sendmail_path: "/usr/sbin/sendmail -t -i"
-installed_extras: []
diff --git a/tests/ubuntu-18-postgresql.config.yml b/tests/ubuntu-18-postgresql.config.yml
deleted file mode 100644
index 573d78e13..000000000
--- a/tests/ubuntu-18-postgresql.config.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-drupal_db_backend: pgsql
-php_sendmail_path: "/usr/sbin/sendmail -t -i"
-installed_extras: []

From 3a768a9e2fe3cde3a40d31bc862ca56265f0a0c5 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 23 Nov 2020 17:22:17 -0600
Subject: [PATCH 1225/1273] Issue #2109: Account for moved files.

---
 .github/workflows/ci.yml                         | 1 -
 molecule/default/ubuntu-18-php74.config.yml      | 4 ++++
 molecule/default/ubuntu-18-postgresql.config.yml | 4 ++++
 3 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 molecule/default/ubuntu-18-php74.config.yml
 create mode 100644 molecule/default/ubuntu-18-postgresql.config.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 91e3169fa..c5cd6a520 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -81,7 +81,6 @@ jobs:
 
       - name: Copy test scaffold files into place.
         run: |
-          cp tests/config.yml ./config.yml
           cp example.drupal.make.yml drupal.make.yml
           cp example.drupal.composer.json drupal.composer.json
 
diff --git a/molecule/default/ubuntu-18-php74.config.yml b/molecule/default/ubuntu-18-php74.config.yml
new file mode 100644
index 000000000..736d0e6a8
--- /dev/null
+++ b/molecule/default/ubuntu-18-php74.config.yml
@@ -0,0 +1,4 @@
+---
+php_version: "7.4"
+php_sendmail_path: "/usr/sbin/sendmail -t -i"
+installed_extras: []
diff --git a/molecule/default/ubuntu-18-postgresql.config.yml b/molecule/default/ubuntu-18-postgresql.config.yml
new file mode 100644
index 000000000..573d78e13
--- /dev/null
+++ b/molecule/default/ubuntu-18-postgresql.config.yml
@@ -0,0 +1,4 @@
+---
+drupal_db_backend: pgsql
+php_sendmail_path: "/usr/sbin/sendmail -t -i"
+installed_extras: []

From b0af59a7b9a5c32fc9c43dd647fe475a4b9f3247 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 23 Nov 2020 17:29:10 -0600
Subject: [PATCH 1226/1273] Issue 2109: Disable Hostname configure for CI.

---
 molecule/default/converge.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
index 3130e1f16..11e52b5ad 100644
--- a/molecule/default/converge.yml
+++ b/molecule/default/converge.yml
@@ -13,7 +13,7 @@
 
     # Added to prevent test failures in CI.
     firewall_enable_ipv6: false
-    hostname_fqdn: ''
+    hostname_configure: false
 
   tasks:
     - name: Update apt cache.

From 93189e9a5d07cbaa9995578182a1de8ec73043ae Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 23 Nov 2020 17:42:08 -0600
Subject: [PATCH 1227/1273] Issue #2109: Playing with variable precedence.

---
 molecule/default/converge.yml | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
index 11e52b5ad..12046f77e 100644
--- a/molecule/default/converge.yml
+++ b/molecule/default/converge.yml
@@ -3,18 +3,6 @@
   hosts: all
   become: true
 
-  vars:
-    # Update the composer_home_path for global installs.
-    composer_home_path: "/{{ drupalvm_user }}/.composer"
-
-    # Don't run the 'disable firewall' tasks in tests.
-    firewall_disable_firewalld: false
-    firewall_disable_ufw: false
-
-    # Added to prevent test failures in CI.
-    firewall_enable_ipv6: false
-    hostname_configure: false
-
   tasks:
     - name: Update apt cache.
       apt:
@@ -28,6 +16,19 @@
         state: present
       when: ansible_os_family == 'RedHat'
 
+    - name: Configure override vars (all).
+      set_fact:
+        # Update the composer_home_path for global installs.
+        composer_home_path: "/{{ drupalvm_user }}/.composer"
+
+        # Don't run the 'disable firewall' tasks in tests.
+        firewall_disable_firewalld: false
+        firewall_disable_ufw: false
+
+        # Added to prevent test failures in CI.
+        firewall_enable_ipv6: false
+        hostname_configure: false
+
     - name: Configure test vars (RedHat).
       set_fact:
         postfix_inet_protocols: ipv4

From 448da88a689095726126acf3c688bcf66b87a1ed Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 23 Nov 2020 18:06:14 -0600
Subject: [PATCH 1228/1273] Issue #2109: Set root user explicitly for CI tests.

---
 molecule/default/converge.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
index 12046f77e..d4f2679e2 100644
--- a/molecule/default/converge.yml
+++ b/molecule/default/converge.yml
@@ -19,7 +19,7 @@
     - name: Configure override vars (all).
       set_fact:
         # Update the composer_home_path for global installs.
-        composer_home_path: "/{{ drupalvm_user }}/.composer"
+        composer_home_path: "/root/.composer"
 
         # Don't run the 'disable firewall' tasks in tests.
         firewall_disable_firewalld: false

From bcb2707b2e21bf16e6cd2bff82f216adaa6d4b94 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 23 Nov 2020 22:43:14 -0600
Subject: [PATCH 1229/1273] Issue #2109: Update Drupal and Drush roles to fix
 idempotence.

---
 provisioning/requirements.yml                 |  4 +-
 .../roles/geerlingguy.drupal/.ansible-lint    |  1 +
 .../.github/workflows/ci.yml                  | 72 ++++++++++++++++++
 .../.github/workflows/release.yml             | 38 ++++++++++
 .../roles/geerlingguy.drupal/.travis.yml      | 31 --------
 .../roles/geerlingguy.drupal/.yamllint        |  5 ++
 .../roles/geerlingguy.drupal/README.md        |  2 +-
 .../{playbook-deploy.yml => deploy.yml}       |  6 +-
 .../molecule/default/molecule.yml             |  4 -
 .../tasks/build-composer-project.yml          | 20 ++++-
 .../tasks/build-composer.yml                  | 21 ++++-
 .../tasks/build-makefile.yml                  |  1 +
 .../roles/geerlingguy.drupal/tasks/deploy.yml | 20 ++++-
 .../.github/workflows/ci.yml                  | 76 +++++++++++++++++++
 .../.github/workflows/release.yml             | 38 ++++++++++
 .../roles/geerlingguy.drush/README.md         |  2 +-
 .../{playbook-composer.yml => composer.yml}   |  0
 .../molecule/default/molecule.yml             |  4 -
 .../{playbook-source.yml => source.yml}       |  0
 .../tasks/install-drush-composer.yml          | 32 ++++++--
 20 files changed, 311 insertions(+), 66 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.drupal/.github/workflows/ci.yml
 create mode 100644 provisioning/roles/geerlingguy.drupal/.github/workflows/release.yml
 delete mode 100644 provisioning/roles/geerlingguy.drupal/.travis.yml
 rename provisioning/roles/geerlingguy.drupal/molecule/default/{playbook-deploy.yml => deploy.yml} (81%)
 create mode 100644 provisioning/roles/geerlingguy.drush/.github/workflows/ci.yml
 create mode 100644 provisioning/roles/geerlingguy.drush/.github/workflows/release.yml
 rename provisioning/roles/geerlingguy.drush/molecule/default/{playbook-composer.yml => composer.yml} (100%)
 rename provisioning/roles/geerlingguy.drush/molecule/default/{playbook-source.yml => source.yml} (100%)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index d67687141..7f64ded79 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -19,11 +19,11 @@ roles:
   - name: geerlingguy.daemonize
     version: 1.2.1
   - name: geerlingguy.drupal
-    version: 4.1.0
+    version: 4.2.0
   - name: geerlingguy.drupal-console
     version: 1.1.1
   - name: geerlingguy.drush
-    version: 3.2.0
+    version: 3.3.0
   - name: geerlingguy.elasticsearch
     version: 4.2.0
   - name: geerlingguy.firewall
diff --git a/provisioning/roles/geerlingguy.drupal/.ansible-lint b/provisioning/roles/geerlingguy.drupal/.ansible-lint
index a7564ce11..7ae7eb59b 100644
--- a/provisioning/roles/geerlingguy.drupal/.ansible-lint
+++ b/provisioning/roles/geerlingguy.drupal/.ansible-lint
@@ -1,3 +1,4 @@
 skip_list:
   - '204'
   - '503'
+  - '106'
diff --git a/provisioning/roles/geerlingguy.drupal/.github/workflows/ci.yml b/provisioning/roles/geerlingguy.drupal/.github/workflows/ci.yml
new file mode 100644
index 000000000..57c082f82
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal/.github/workflows/ci.yml
@@ -0,0 +1,72 @@
+---
+name: CI
+'on':
+  pull_request:
+  push:
+    branches:
+      - master
+  schedule:
+    - cron: "30 5 * * 1"
+
+defaults:
+  run:
+    working-directory: 'geerlingguy.drupal'
+
+jobs:
+
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.drupal'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies.
+        run: pip3 install yamllint ansible-lint
+
+      - name: Lint code.
+        run: |
+          yamllint .
+          ansible-lint
+
+  molecule:
+    name: Molecule
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - distro: centos8
+            playbook: converge.yml
+          - distro: ubuntu1804
+            playbook: converge.yml
+          - distro: centos8
+            playbook: deploy.yml
+
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.drupal'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies.
+        run: pip3 install ansible molecule[docker] docker
+
+      - name: Run Molecule tests.
+        run: molecule test
+        env:
+          PY_COLORS: '1'
+          ANSIBLE_FORCE_COLOR: '1'
+          MOLECULE_DISTRO: ${{ matrix.distro }}
+          MOLECULE_PLAYBOOK: ${{ matrix.playbook }}
diff --git a/provisioning/roles/geerlingguy.drupal/.github/workflows/release.yml b/provisioning/roles/geerlingguy.drupal/.github/workflows/release.yml
new file mode 100644
index 000000000..fec1983e9
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drupal/.github/workflows/release.yml
@@ -0,0 +1,38 @@
+---
+# This workflow requires a GALAXY_API_KEY secret present in the GitHub
+# repository or organization.
+#
+# See: https://github.com/marketplace/actions/publish-ansible-role-to-galaxy
+# See: https://github.com/ansible/galaxy/issues/46
+
+name: Release
+'on':
+  push:
+    tags:
+      - '*'
+
+defaults:
+  run:
+    working-directory: 'geerlingguy.drupal'
+
+jobs:
+
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.drupal'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install Ansible.
+        run: pip3 install ansible-base
+
+      - name: Trigger a new import on Galaxy.
+        run: ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }} $(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} | cut -d/ -f2)
diff --git a/provisioning/roles/geerlingguy.drupal/.travis.yml b/provisioning/roles/geerlingguy.drupal/.travis.yml
deleted file mode 100644
index 97f9381cb..000000000
--- a/provisioning/roles/geerlingguy.drupal/.travis.yml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-language: python
-services: docker
-
-env:
-  global:
-    - ROLE_NAME: drupal
-  matrix:
-    - MOLECULE_DISTRO: centos8
-    - MOLECULE_DISTRO: ubuntu1804
-    # See: https://github.com/geerlingguy/ansible-role-drupal/issues/77
-    # - MOLECULE_DISTRO: debian10
-    - MOLECULE_DISTRO: centos8
-      MOLECULE_PLAYBOOK: playbook-deploy.yml
-
-install:
-  # Install test dependencies.
-  - pip install molecule yamllint ansible-lint docker
-
-before_script:
-  # Use actual Ansible Galaxy role name for the project directory.
-  - cd ../
-  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
-  - cd geerlingguy.$ROLE_NAME
-
-script:
-  # Run tests.
-  - molecule test
-
-notifications:
-  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.drupal/.yamllint b/provisioning/roles/geerlingguy.drupal/.yamllint
index db22c42ea..a8dc58bd7 100644
--- a/provisioning/roles/geerlingguy.drupal/.yamllint
+++ b/provisioning/roles/geerlingguy.drupal/.yamllint
@@ -1,6 +1,11 @@
 ---
 extends: default
+
 rules:
   line-length:
     max: 160
     level: warning
+
+ignore: |
+  .github/stale.yml
+  .travis.yml
diff --git a/provisioning/roles/geerlingguy.drupal/README.md b/provisioning/roles/geerlingguy.drupal/README.md
index 526632abf..91d909a61 100644
--- a/provisioning/roles/geerlingguy.drupal/README.md
+++ b/provisioning/roles/geerlingguy.drupal/README.md
@@ -1,6 +1,6 @@
 # Ansible Role: Drupal
 
-[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-drupal.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-drupal)
+[![CI](https://github.com/geerlingguy/ansible-role-drupal/workflows/CI/badge.svg?event=push)](https://github.com/geerlingguy/ansible-role-drupal/actions?query=workflow%3ACI)
 
 Builds and installs [Drupal](https://drupal.org/), an open source content management platform.
 
diff --git a/provisioning/roles/geerlingguy.drupal/molecule/default/playbook-deploy.yml b/provisioning/roles/geerlingguy.drupal/molecule/default/deploy.yml
similarity index 81%
rename from provisioning/roles/geerlingguy.drupal/molecule/default/playbook-deploy.yml
rename to provisioning/roles/geerlingguy.drupal/molecule/default/deploy.yml
index 1004dd8cc..3be18bfc9 100644
--- a/provisioning/roles/geerlingguy.drupal/molecule/default/playbook-deploy.yml
+++ b/provisioning/roles/geerlingguy.drupal/molecule/default/deploy.yml
@@ -7,11 +7,11 @@
     - test-vars.yml
 
   vars:
-    # Deploy from the Drupal VM Prod example project.
+    # Deploy from the Drupal for Kubernetes example project.
     drupal_deploy: true
-    drupal_deploy_repo: "https://github.com/geerlingguy/drupalvm-live.git"
+    drupal_deploy_repo: "https://github.com/geerlingguy/drupal-for-kubernetes.git"
     drupal_deploy_dir: /var/www/drupal
-    drupal_domain: "prod.drupalvm.com"
+    drupal_domain: "test.pidramble.com"
 
     # Disable Composer-based codebase setup.
     drupal_build_composer_project: false
diff --git a/provisioning/roles/geerlingguy.drupal/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.drupal/molecule/default/molecule.yml
index 2da47dd1f..74907107f 100644
--- a/provisioning/roles/geerlingguy.drupal/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.drupal/molecule/default/molecule.yml
@@ -3,10 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint: |
-  set -e
-  yamllint .
-  ansible-lint
 platforms:
   - name: instance
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/build-composer-project.yml b/provisioning/roles/geerlingguy.drupal/tasks/build-composer-project.yml
index 6baed300c..46dd36b2a 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/build-composer-project.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/build-composer-project.yml
@@ -33,13 +33,25 @@
   become: false
   when: not drupal_site_exists
 
+# Use manual composer require tasks until Ansible 2.10.4 is released.
 - name: Install dependencies with composer require (this may take a while).
-  composer:
-    command: require
-    arguments: "{{ item }}"
-    working_dir: "{{ drupal_composer_install_dir }}"
+  command: "{{ composer_path }} require {{ item }} -d {{ drupal_composer_install_dir }}"
+  register: composer_require_result
+  changed_when: "'Nothing to install' not in composer_require_result.stderr"
   with_items: "{{ drupal_composer_dependencies|default([]) }}"
   become: false
   environment:
     COMPOSER_PROCESS_TIMEOUT: 1200
     COMPOSER_MEMORY_LIMIT: '-1'
+
+# Switch back to this task after Ansible 2.10.4 is released.
+# - name: Install dependencies with composer require (this may take a while).
+#   composer:
+#     command: require
+#     arguments: "{{ item }}"
+#     working_dir: "{{ drupal_composer_install_dir }}"
+#   with_items: "{{ drupal_composer_dependencies | default([]) }}"
+#   become: false
+#   environment:
+#     COMPOSER_PROCESS_TIMEOUT: 1200
+#     COMPOSER_MEMORY_LIMIT: '-1'
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/build-composer.yml b/provisioning/roles/geerlingguy.drupal/tasks/build-composer.yml
index a06e57260..ccf8d4797 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/build-composer.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/build-composer.yml
@@ -13,6 +13,7 @@
   copy:
     src: "{{ drupal_composer_path }}"
     dest: "/tmp/drupalvm-composer.json"
+    mode: 0644
   when: drupal_composer_path and not drupal_site_exists
   become: false
 
@@ -28,13 +29,25 @@
   when: not drupal_site_exists
   become: false
 
+# Use manual composer require tasks until Ansible 2.10.4 is released.
 - name: Install dependencies with composer require (this may take a while).
-  composer:
-    command: require
-    arguments: "{{ item }}"
-    working_dir: "{{ drupal_composer_install_dir }}"
+  command: "{{ composer_path }} require {{ item }} -d {{ drupal_composer_install_dir }}"
+  register: composer_require_result
+  changed_when: "'Nothing to install' not in composer_require_result.stderr"
   with_items: "{{ drupal_composer_dependencies|default([]) }}"
   become: false
   environment:
     COMPOSER_PROCESS_TIMEOUT: 1200
     COMPOSER_MEMORY_LIMIT: '-1'
+
+# Switch back to this task after Ansible 2.10.4 is released.
+# - name: Install dependencies with composer require (this may take a while).
+#   composer:
+#     command: require
+#     arguments: "{{ item }}"
+#     working_dir: "{{ drupal_composer_install_dir }}"
+#   with_items: "{{ drupal_composer_dependencies | default([]) }}"
+#   become: false
+#   environment:
+#     COMPOSER_PROCESS_TIMEOUT: 1200
+#     COMPOSER_MEMORY_LIMIT: '-1'
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/build-makefile.yml b/provisioning/roles/geerlingguy.drupal/tasks/build-makefile.yml
index 2cf132c8a..d905470dc 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/build-makefile.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/build-makefile.yml
@@ -3,6 +3,7 @@
   copy:
     src: "{{ drush_makefile_path }}"
     dest: /tmp/drupal.make.yml
+    mode: 0644
   when: not drupal_site_exists
 
 - name: Ensure drupal_core_path directory exists.
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/deploy.yml b/provisioning/roles/geerlingguy.drupal/tasks/deploy.yml
index b036acd15..93ba6a693 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/deploy.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/deploy.yml
@@ -25,13 +25,25 @@
   stat: "path={{ drupal_deploy_dir }}/composer.json"
   register: drupal_deploy_composer_file
 
+# Use manual composer require tasks until Ansible 2.10.4 is released.
 - name: Run composer install if composer.json is present.
-  composer:
-    command: install
-    working_dir: "{{ drupal_deploy_dir }}"
-    no_dev: "{{ drupal_composer_no_dev }}"
+  command: "composer install -d {{ drupal_deploy_dir }}{% if drupal_composer_no_dev %} --no-dev{% endif %}"
+  register: composer_install_result
+  changed_when: "'Nothing to install' not in composer_install_result.stderr"
   when:
     - drupal_deploy_composer_file.stat.exists
     - drupal_deploy_composer_install
   become: "{{ drupal_core_owner_become }}"
   become_user: "{{ drupal_core_owner }}"
+
+# Switch back to this task after Ansible 2.10.4 is released.
+# - name: Run composer install if composer.json is present.
+#   composer:
+#     command: install
+#     working_dir: "{{ drupal_deploy_dir }}"
+#     no_dev: "{{ drupal_composer_no_dev }}"
+#   when:
+#     - drupal_deploy_composer_file.stat.exists
+#     - drupal_deploy_composer_install
+#   become: "{{ drupal_core_owner_become }}"
+#   become_user: "{{ drupal_core_owner }}"
diff --git a/provisioning/roles/geerlingguy.drush/.github/workflows/ci.yml b/provisioning/roles/geerlingguy.drush/.github/workflows/ci.yml
new file mode 100644
index 000000000..8cabc649b
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drush/.github/workflows/ci.yml
@@ -0,0 +1,76 @@
+---
+name: CI
+'on':
+  pull_request:
+  push:
+    branches:
+      - master
+  schedule:
+    - cron: "0 4 * * 1"
+
+defaults:
+  run:
+    working-directory: 'geerlingguy.drush'
+
+jobs:
+
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.drush'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies.
+        run: pip3 install yamllint ansible-lint
+
+      - name: Lint code.
+        run: |
+          yamllint .
+          ansible-lint
+
+  molecule:
+    name: Molecule
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - distro: centos7
+            playbook: converge.yml
+          - distro: ubuntu1804
+            playbook: converge.yml
+          - distro: debian9
+            playbook: converge.yml
+          - distro: centos7
+            playbook: composer.yml
+          - distro: centos7
+            playbook: source.yml
+
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.drush'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies.
+        run: pip3 install ansible molecule[docker] docker
+
+      - name: Run Molecule tests.
+        run: molecule test
+        env:
+          PY_COLORS: '1'
+          ANSIBLE_FORCE_COLOR: '1'
+          MOLECULE_DISTRO: ${{ matrix.distro }}
+          MOLECULE_PLAYBOOK: ${{ matrix.playbook }}
diff --git a/provisioning/roles/geerlingguy.drush/.github/workflows/release.yml b/provisioning/roles/geerlingguy.drush/.github/workflows/release.yml
new file mode 100644
index 000000000..611bd55ef
--- /dev/null
+++ b/provisioning/roles/geerlingguy.drush/.github/workflows/release.yml
@@ -0,0 +1,38 @@
+---
+# This workflow requires a GALAXY_API_KEY secret present in the GitHub
+# repository or organization.
+#
+# See: https://github.com/marketplace/actions/publish-ansible-role-to-galaxy
+# See: https://github.com/ansible/galaxy/issues/46
+
+name: Release
+'on':
+  push:
+    tags:
+      - '*'
+
+defaults:
+  run:
+    working-directory: 'geerlingguy.drush'
+
+jobs:
+
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.drush'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install Ansible.
+        run: pip3 install ansible-base
+
+      - name: Trigger a new import on Galaxy.
+        run: ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }} $(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} | cut -d/ -f2)
diff --git a/provisioning/roles/geerlingguy.drush/README.md b/provisioning/roles/geerlingguy.drush/README.md
index a0b2e0f93..9f8ccf9c5 100644
--- a/provisioning/roles/geerlingguy.drush/README.md
+++ b/provisioning/roles/geerlingguy.drush/README.md
@@ -1,6 +1,6 @@
 # Ansible Role: Drush
 
-[![Build Status](https://travis-ci.com/geerlingguy/ansible-role-drush.svg?branch=master)](https://travis-ci.com/geerlingguy/ansible-role-drush)
+[![CI](https://github.com/geerlingguy/ansible-role-drush/workflows/CI/badge.svg?event=push)](https://github.com/geerlingguy/ansible-role-drush/actions?query=workflow%3ACI)
 
 Installs [Drush](http://www.drush.org), a command line shell and scripting interface for Drupal, on any Linux or UNIX system.
 
diff --git a/provisioning/roles/geerlingguy.drush/molecule/default/playbook-composer.yml b/provisioning/roles/geerlingguy.drush/molecule/default/composer.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.drush/molecule/default/playbook-composer.yml
rename to provisioning/roles/geerlingguy.drush/molecule/default/composer.yml
diff --git a/provisioning/roles/geerlingguy.drush/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.drush/molecule/default/molecule.yml
index 2da47dd1f..74907107f 100644
--- a/provisioning/roles/geerlingguy.drush/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.drush/molecule/default/molecule.yml
@@ -3,10 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint: |
-  set -e
-  yamllint .
-  ansible-lint
 platforms:
   - name: instance
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
diff --git a/provisioning/roles/geerlingguy.drush/molecule/default/playbook-source.yml b/provisioning/roles/geerlingguy.drush/molecule/default/source.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.drush/molecule/default/playbook-source.yml
rename to provisioning/roles/geerlingguy.drush/molecule/default/source.yml
diff --git a/provisioning/roles/geerlingguy.drush/tasks/install-drush-composer.yml b/provisioning/roles/geerlingguy.drush/tasks/install-drush-composer.yml
index 7338c599c..fadd11e0c 100644
--- a/provisioning/roles/geerlingguy.drush/tasks/install-drush-composer.yml
+++ b/provisioning/roles/geerlingguy.drush/tasks/install-drush-composer.yml
@@ -1,21 +1,37 @@
 ---
+# Use manual composer tasks until Ansible 2.10.4 is released.
 - name: Ensure Drush is installed globally via Composer.
-  composer:
-    command: require
-    global_command: true
-    arguments: "drush/drush:{{ drush_composer_version }}"
+  command: "{{ composer_path }} global require drush/drush:{{ drush_composer_version }}"
   register: drush_composer_require
+  changed_when: "'Nothing to install' not in drush_composer_require.stderr"
 
 - name: Update global Drush install if configured.
-  composer:
-    command: update
-    global_command: true
-    arguments: "drush/drush --with-dependencies"
+  command: "{{ composer_path }} global update drush/drush --with-dependencies"
+  changed_when: "'Nothing to install' not in drush_composer_require.stderr"
+  register: tasky
   when:
     - drush_composer_update
     - not drush_composer_require.changed
   tags: ['skip_ansible_lint']
 
+# Switch back to these tasks after Ansible 2.10.4 is released.
+# - name: Ensure Drush is installed globally via Composer.
+#   composer:
+#     command: require
+#     global_command: true
+#     arguments: "drush/drush:{{ drush_composer_version }}"
+#   register: drush_composer_require
+#
+# - name: Update global Drush install if configured.
+#   composer:
+#     command: update
+#     global_command: true
+#     arguments: "drush/drush --with-dependencies"
+#   when:
+#     - drush_composer_update
+#     - not drush_composer_require.changed
+#   tags: ['skip_ansible_lint']
+
 - name: Ensure globally-installed Drush is symlinked into bin dir.
   file:  # noqa 208
     src: "{{ drush_composer_global_bin_path }}/drush"

From 4439570d5878e9c5fd4cdb3a0aeee6cf91fb8a66 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 23 Nov 2020 23:30:26 -0600
Subject: [PATCH 1230/1273] Update verification play to work with all the
 require tests.

---
 molecule/default/verify.yml | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml
index a3f58d61a..aafbabd7a 100644
--- a/molecule/default/verify.yml
+++ b/molecule/default/verify.yml
@@ -5,11 +5,12 @@
 
   vars:
     drupal_vm_hostname: drupalvm.test
+    drupal_composer_install_dir: /var/www/drupalvm/drupal
 
   tasks:
     - name: Validate web services are up and running.
       uri:
-        url: localhost{{ item.port | default(omit) }}
+        url: http://localhost{{ item.port | default('') }}
         headers:
           Host: "{{ item.host_prefix }}{{ drupal_vm_hostname }}"
         return_content: true
@@ -30,21 +31,21 @@
           expected_content: "<title>Pimp my Log"
         - name: MailHog
           host_prefix: ""
-          port: "8025"
+          port: ":8025"
           expected_content: "<title>MailHog"
 
-# TODO: Varnish
-# if [ $TEST_INSTALLED_EXTRAS = true ]; then
-#   docker exec $CONTAINER_ID curl -sSI --header Host:$HOSTNAME localhost:81 \
-#     | tee /tmp/dvm-test \
-#     | grep -q 'Via: .* varnish' \
-#     && (echo 'Varnish install pass' && exit 0) \
-#     || (echo 'Varnish install fail' && cat /tmp/dvm-test && exit 1)
-# fi
+    - name: Validate Varnish is up and running.
+      uri:
+        url: http://localhost:81
+        headers:
+          Host: "{{ drupal_vm_hostname }}"
+      register: varnish_response
+      failed_when: "'varnish' not in varnish_response.via"
 
-# TODO: Drush
-# docker exec $CONTAINER_ID bash -c "cd $DRUPALVM_DIR/drupal && $DRUSH_BIN status" \
-#   | tee /tmp/dvm-test \
-#   | grep -q 'Drush' \
-#   && (echo 'Drush install pass' && exit 0) \
-#   || (echo 'Drush install fail' && cat /tmp/dvm-test && exit 1)
+    - name: Validate Drush is working with Drupal.
+      command: >
+        vendor/bin/drush status
+        chdir={{ drupal_composer_install_dir }}
+      register: drush_result
+      changed_when: false
+      failed_when: "'Drupal bootstrap : Successful' in drush_result.stdout"

From 44c582c2ca6e96c257b75f3876e6373397bbb4eb Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 24 Nov 2020 09:21:50 -0600
Subject: [PATCH 1231/1273] Issue #2109: Simplify drush verification test.

---
 molecule/default/verify.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml
index aafbabd7a..702e3fd50 100644
--- a/molecule/default/verify.yml
+++ b/molecule/default/verify.yml
@@ -48,4 +48,4 @@
         chdir={{ drupal_composer_install_dir }}
       register: drush_result
       changed_when: false
-      failed_when: "'Drupal bootstrap : Successful' in drush_result.stdout"
+      failed_when: "'Successful' in drush_result.stdout"

From 48f3a73df8256539ab8bae01e299962f2c0b9b60 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 24 Nov 2020 09:49:16 -0600
Subject: [PATCH 1232/1273] Issue #2109: Oops, might want to make sure boolean
 is correct.

---
 molecule/default/verify.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml
index 702e3fd50..732e1f964 100644
--- a/molecule/default/verify.yml
+++ b/molecule/default/verify.yml
@@ -48,4 +48,4 @@
         chdir={{ drupal_composer_install_dir }}
       register: drush_result
       changed_when: false
-      failed_when: "'Successful' in drush_result.stdout"
+      failed_when: "'Drupal bootstrap : Successful' not in drush_result.stdout"

From 218e350a509366582870ac1bf8d475b6d032ecab Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 24 Nov 2020 11:23:11 -0600
Subject: [PATCH 1233/1273] Issue #2109: Disable AppArmor so Debian tests can
 pass.

---
 .github/workflows/ci.yml | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c5cd6a520..471397d09 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -54,18 +54,16 @@ jobs:
 
             # PHP 7.3
             # local_config: tests/ubuntu-18-php73.config.yml
-            # DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/bin/drush"
             # TEST_INSTALLED_EXTRAS: false
             # - distro: ubuntu1804
-            #   playbook: php-7.3.yml
+            #   playbook: TODO
 
             # Postgresql
             # local_config: tests/ubuntu-18-postgresql.config.yml
-            # DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/bin/drush"
             # config_dir: /var/www/drupalvm/config
             # TEST_INSTALLED_EXTRAS: false
             # - distro: ubunt1804
-            #   playbook: postgresql.yml
+            #   playbook: TODO
 
     steps:
       - name: Check out the codebase.
@@ -79,6 +77,15 @@ jobs:
       - name: Install test dependencies.
         run: pip3 install ansible molecule[docker] docker
 
+      # See: https://github.com/geerlingguy/ansible-role-mysql/issues/422
+      - name: Disable AppArmor on Debian.
+        run: |
+            set -x
+            sudo apt-get install apparmor-profiles
+            sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
+            sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
+        if: ${{ startsWith(matrix.distro, 'debian') }}
+
       - name: Copy test scaffold files into place.
         run: |
           cp example.drupal.make.yml drupal.make.yml

From 9e0809064f8ce61467c22195ef96a4eef37942bf Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 24 Nov 2020 11:48:01 -0600
Subject: [PATCH 1234/1273] Issue #2109: Brush things up before committing
 final changes.

---
 .github/workflows/ci.yml                             | 12 ++++++------
 ...-php74.config.yml => ubuntu1804-php74.config.yml} |  0
 ...l.config.yml => ubuntu1804-postgresql.config.yml} |  0
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename molecule/default/{ubuntu-18-php74.config.yml => ubuntu1804-php74.config.yml} (100%)
 rename molecule/default/{ubuntu-18-postgresql.config.yml => ubuntu1804-postgresql.config.yml} (100%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 471397d09..71587e092 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -52,16 +52,16 @@ jobs:
           - distro: centos8
             playbook: converge.yml
 
-            # PHP 7.3
-            # local_config: tests/ubuntu-18-php73.config.yml
-            # TEST_INSTALLED_EXTRAS: false
+            # TODO: Add PHP 7.4 test.
+            # local_config: tests/ubuntu1804-php74.config.yml
+            # test_extras: false
             # - distro: ubuntu1804
             #   playbook: TODO
 
-            # Postgresql
-            # local_config: tests/ubuntu-18-postgresql.config.yml
+            # TODO: Add Postgresql test.
+            # local_config: tests/ubuntu1804-postgresql.config.yml
             # config_dir: /var/www/drupalvm/config
-            # TEST_INSTALLED_EXTRAS: false
+            # test_extras: false
             # - distro: ubunt1804
             #   playbook: TODO
 
diff --git a/molecule/default/ubuntu-18-php74.config.yml b/molecule/default/ubuntu1804-php74.config.yml
similarity index 100%
rename from molecule/default/ubuntu-18-php74.config.yml
rename to molecule/default/ubuntu1804-php74.config.yml
diff --git a/molecule/default/ubuntu-18-postgresql.config.yml b/molecule/default/ubuntu1804-postgresql.config.yml
similarity index 100%
rename from molecule/default/ubuntu-18-postgresql.config.yml
rename to molecule/default/ubuntu1804-postgresql.config.yml

From da0c3d251d81f04c2af0ceba13cfc13432d7e47f Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 24 Nov 2020 12:22:03 -0600
Subject: [PATCH 1235/1273] Remove final mentions of Travis CI.

---
 .yamllint | 1 -
 README.md | 7 +++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.yamllint b/.yamllint
index e6ad70a67..8fc434d23 100644
--- a/.yamllint
+++ b/.yamllint
@@ -15,5 +15,4 @@ rules:
 
 ignore: |
   */stale.yml
-  */.travis.yml
   provisioning/roles/
diff --git a/README.md b/README.md
index cd57f690c..8384fe300 100644
--- a/README.md
+++ b/README.md
@@ -168,14 +168,13 @@ Drupal VM runs on almost any modern computer that can run VirtualBox and Vagrant
 
 ## Tests
 
-To run basic integration tests using Docker:
+To run basic integration tests using Docker and Molecule:
 
   1. [Install Docker](https://docs.docker.com/engine/installation/).
+  2. Install Molecule: `pip3 install ansible molecule[docker]`
   2. In this project directory, run: `composer run-tests`
 
-> Note: If you're on a Mac, you need to use [Docker's Edge release](https://docs.docker.com/docker-for-mac/install/#download-docker-for-mac), at least until [this issue](https://github.com/docker/for-mac/issues/77) is resolved.
-
-The project's automated tests are run via Travis CI, and the more comprehensive test suite covers multiple Linux distributions and many different Drupal VM use cases and deployment techniques.
+The project's automated tests are run via GitHub Actions, and the more comprehensive test suite covers multiple Linux distributions and many different Drupal VM use cases and deployment techniques.
 
 ## License
 

From 3cf88d5bbd63ff2045f3f0f1eb3693e3ca88780e Mon Sep 17 00:00:00 2001
From: phizev <phizev@users.noreply.github.com>
Date: Tue, 5 Jan 2021 16:33:05 +0200
Subject: [PATCH 1236/1273] Replace php_opcache_enabled_in_ini with
 php_opcache_enable

---
 default.config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.config.yml b/default.config.yml
index a82589518..bb022c596 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -263,7 +263,7 @@ php_display_errors: "On"
 php_display_startup_errors: "On"
 php_realpath_cache_size: "1024K"
 php_sendmail_path: "/opt/mailhog/mhsendmail"
-php_opcache_enabled_in_ini: true
+php_opcache_enable: "1"
 php_opcache_memory_consumption: "192"
 php_opcache_max_accelerated_files: 4096
 php_max_input_vars: "4000"

From 0baa86a45f645e1870f006ab41e57697b25746c9 Mon Sep 17 00:00:00 2001
From: Jake Love <rockymountainhigh1943@gmail.com>
Date: Mon, 25 Jan 2021 23:55:59 -0800
Subject: [PATCH 1237/1273] fix: add ansible install_mode "pip3"

This fixes an issue that was recently created by the release of a new version of the script here: https://bootstrap.pypa.io/get-pip.py.
---
 Vagrantfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Vagrantfile b/Vagrantfile
index c8689fafe..756ca62b4 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -111,6 +111,7 @@ Vagrant.configure('2') do |config|
   config.vm.provision 'drupalvm', type: provisioner do |ansible|
     ansible.compatibility_mode = '2.0'
     ansible.playbook = playbook
+    ansible.install_mode = "pip3"
     ansible.extra_vars = {
       config_dir: config_dir,
       drupalvm_env: drupalvm_env,
@@ -119,7 +120,7 @@ Vagrant.configure('2') do |config|
     ansible.raw_arguments = Shellwords.shellsplit(ENV['DRUPALVM_ANSIBLE_ARGS']) if ENV['DRUPALVM_ANSIBLE_ARGS']
     ansible.tags = ENV['DRUPALVM_ANSIBLE_TAGS']
     # Use pip to get the latest Ansible version when using ansible_local.
-    provisioner == :ansible_local && ansible.install_mode = 'pip'
+    provisioner == :ansible_local && ansible.install_mode = 'pip3'
   end
 
   # VMware Fusion.

From 9feb090b1d6ea593541aaf17bffa336283b40b40 Mon Sep 17 00:00:00 2001
From: Jake Love <rockymountainhigh1943@gmail.com>
Date: Tue, 26 Jan 2021 00:34:42 -0800
Subject: [PATCH 1238/1273] chore: swap double quotes for single to pass lint

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

diff --git a/Vagrantfile b/Vagrantfile
index 756ca62b4..890bc494d 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -111,7 +111,7 @@ Vagrant.configure('2') do |config|
   config.vm.provision 'drupalvm', type: provisioner do |ansible|
     ansible.compatibility_mode = '2.0'
     ansible.playbook = playbook
-    ansible.install_mode = "pip3"
+    ansible.install_mode = 'pip3'
     ansible.extra_vars = {
       config_dir: config_dir,
       drupalvm_env: drupalvm_env,

From 218b92f3d6e9c79881cffe9e0b7ee82a459627e3 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 1 Feb 2021 21:05:58 -0600
Subject: [PATCH 1239/1273] Fixup for PR #2137: Don't use install_mode for
 normal ansible provisioner.

---
 Vagrantfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Vagrantfile b/Vagrantfile
index 890bc494d..68d413548 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -111,7 +111,6 @@ Vagrant.configure('2') do |config|
   config.vm.provision 'drupalvm', type: provisioner do |ansible|
     ansible.compatibility_mode = '2.0'
     ansible.playbook = playbook
-    ansible.install_mode = 'pip3'
     ansible.extra_vars = {
       config_dir: config_dir,
       drupalvm_env: drupalvm_env,

From 41cfaa3b090b1a5dbe966bf35ef96f40d8f86169 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Mon, 8 Feb 2021 18:31:02 -0300
Subject: [PATCH 1240/1273] Fixes #2144: Change docs on native synced folders
 to use explicit type

---
 docs/getting-started/syncing-folders.md | 6 +++---
 docs/other/performance.md               | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/getting-started/syncing-folders.md b/docs/getting-started/syncing-folders.md
index 5ec0cff88..ed50f48c1 100644
--- a/docs/getting-started/syncing-folders.md
+++ b/docs/getting-started/syncing-folders.md
@@ -45,13 +45,13 @@ There are a number of issues people encounter with synced folders from time to t
 
 ### Using Native Synced Folders
 
-You can use a native synced folder, which should work pretty flawlessly on any platform, but with a potential serious performance downside (compared to other synced folder methods). Just set `type` to `""`.
+You can use a native synced folder, which should work pretty flawlessly on any platform, but with a potential serious performance downside (compared to other synced folder methods). Just set `type` to `virtualbox`.
 
 ```yaml
 vagrant_synced_folders:
   - local_path: .
     destination: /var/www/docroot
-    type: ""
+    type: virtualbox
     create: true
 ```
 
@@ -65,7 +65,7 @@ If you're encountering errors where Drupal or some other software inside the VM
 vagrant_synced_folders:
   - local_path: .
     destination: /var/www/drupalvm
-    type: ""
+    type: virtualbox
     create: true
     mount_options: ["dmode=775", "fmode=664"]
     options_override:
diff --git a/docs/other/performance.md b/docs/other/performance.md
index 9dfa72aa8..b0744a6e9 100644
--- a/docs/other/performance.md
+++ b/docs/other/performance.md
@@ -59,7 +59,7 @@ vagrant_synced_folders:
   # Use a slower but two-way sync for configuration sync directory.
   - local_path: config/drupal
     destination: /var/www/drupal/config/drupal
-    type: "" # Or smb/nfs if available
+    type: virtualbox # Or smb/nfs if available
     create: true
 ```
 
@@ -82,7 +82,7 @@ Another option for the more adventurous is to manually install and configure Win
 
 GuyPaddock's [fork of `vagrant-winnfsd`](https://github.com/GuyPaddock/vagrant-winnfsd) adds logging and debug messages. You can replace the vagrant-winnfsd gem inside `.vagrant.d\gems\gems` to use it instead. For further caveats, please read through [vagrant-winnfsd issue #12](https://github.com/winnfsd/vagrant-winnfsd/issues/12#issuecomment-78195957), and make the following changes to `config.yml`:
 
-    vagrant_synced_folder_default_type: ""
+    vagrant_synced_folder_default_type: virtualbox
 
 Add `mount_options` to your synced folder to avoid an error:
 

From e0863ce3b355f995097673997c4bc88ced40629f Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sat, 13 Feb 2021 21:17:36 -0600
Subject: [PATCH 1241/1273] Issue #2147: Changelog updates for 6.0.3 release.

---
 CHANGELOG.md | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 479694893..cfb889b30 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,29 @@
 # Drupal VM Changelog
 
+## 6.0.3 (2021-02-13)
+
+### Breaking Changes
+
+N/A
+
+### New/changed variables in default.config.yml
+
+  * Replaced obsolete variable `php_opcache_enabled_in_ini` with `php_opcache_enable`.
+
+### Improvements
+
+  * #2109: Switch CI test environment from homegrown script and Travis CI to Molecule and GitHub Actions.
+  * Updated Postgres role to latest version.
+  * Updated Composer role to latest version to allow switching between Composer major versions.
+
+### Bugfixes
+
+  * #2137: Use pip3 inside VM if using ansible_local provisioner.
+  * #2144: Update docs for native synced folder usage due to changed typing of the variable in Vagrant.
+  * #2121: Replace php_opcache_enabled_in_ini with php_opcache_enable.
+  * Updated Drush role for better Composer v2 compatibility.
+
+
 ## 6.0.2 (2020-10-27)
 
 ### Breaking Changes

From 6b6ac19a8094d26900b4458ecc44c0ffeee6e7b7 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 18 Feb 2021 08:59:38 -0600
Subject: [PATCH 1242/1273] Upgrade php-versions role.

---
 provisioning/requirements.yml                 |  2 +-
 .../.github/stale.yml                         | 56 ++++++++++++
 .../.github/workflows/ci.yml                  | 89 +++++++++++++++++++
 .../.github/workflows/release.yml             | 38 ++++++++
 .../geerlingguy.php-versions/.travis.yml      | 50 -----------
 .../roles/geerlingguy.php-versions/README.md  |  2 +-
 .../default/{playbook-7.2.yml => 7.2.yml}     |  0
 .../default/{playbook-7.4.yml => 7.4.yml}     |  0
 .../molecule/default/molecule.yml             |  4 -
 .../tasks/setup-RedHat.yml                    |  2 +-
 10 files changed, 186 insertions(+), 57 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.php-versions/.github/stale.yml
 create mode 100644 provisioning/roles/geerlingguy.php-versions/.github/workflows/ci.yml
 create mode 100644 provisioning/roles/geerlingguy.php-versions/.github/workflows/release.yml
 delete mode 100644 provisioning/roles/geerlingguy.php-versions/.travis.yml
 rename provisioning/roles/geerlingguy.php-versions/molecule/default/{playbook-7.2.yml => 7.2.yml} (100%)
 rename provisioning/roles/geerlingguy.php-versions/molecule/default/{playbook-7.4.yml => 7.4.yml} (100%)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 7f64ded79..74b3ca26b 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -57,7 +57,7 @@ roles:
   - name: geerlingguy.php-tideways
     version: 2.2.0
   - name: geerlingguy.php-versions
-    version: 4.0.4
+    version: 4.0.5
   - name: geerlingguy.php-xdebug
     version: 3.0.0
   - name: geerlingguy.php-xhprof
diff --git a/provisioning/roles/geerlingguy.php-versions/.github/stale.yml b/provisioning/roles/geerlingguy.php-versions/.github/stale.yml
new file mode 100644
index 000000000..c7ff12754
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-versions/.github/stale.yml
@@ -0,0 +1,56 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 90
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 30
+
+# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
+onlyLabels: []
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - pinned
+  - security
+  - planned
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: false
+
+# Label to use when marking as stale
+staleLabel: stale
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+pulls:
+  markComment: |-
+    This pull request has been marked 'stale' due to lack of recent activity. If there is no further activity, the PR will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark pull requests as stale.
+
+  unmarkComment: >-
+    This pull request is no longer marked for closure.
+
+  closeComment: >-
+    This pull request has been closed due to inactivity. If you feel this is in error, please reopen the pull request or file a new PR with the relevant details.
+
+issues:
+  markComment: |-
+    This issue has been marked 'stale' due to lack of recent activity. If there is no further activity, the issue will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark issues as stale.
+
+  unmarkComment: >-
+    This issue is no longer marked for closure.
+
+  closeComment: >-
+    This issue has been closed due to inactivity. If you feel this is in error, please reopen the issue or file a new issue with the relevant details.
diff --git a/provisioning/roles/geerlingguy.php-versions/.github/workflows/ci.yml b/provisioning/roles/geerlingguy.php-versions/.github/workflows/ci.yml
new file mode 100644
index 000000000..686c6e9a2
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-versions/.github/workflows/ci.yml
@@ -0,0 +1,89 @@
+---
+name: CI
+'on':
+  pull_request:
+  push:
+    branches:
+      - master
+  schedule:
+    - cron: "30 6 * * 4"
+
+defaults:
+  run:
+    working-directory: 'geerlingguy.php-versions'
+
+jobs:
+
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.php-versions'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies.
+        run: pip3 install yamllint ansible-lint
+
+      - name: Lint code.
+        run: |
+          yamllint .
+          ansible-lint
+
+  molecule:
+    name: Molecule
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          # Default PHP version (7.3).
+          - distro: centos8
+            playbook: converge.yml
+          - distro: centos7
+            playbook: converge.yml
+          - distro: ubuntu1804
+            playbook: converge.yml
+          - distro: debian10
+            playbook: converge.yml
+
+          # PHP 7.4.
+          - distro: centos8
+            playbook: 7.4.yml
+          - distro: ubuntu1804
+            playbook: 7.4.yml
+          - distro: debian10
+            playbook: 7.4.yml
+
+          # PHP 7.2.
+          - distro: centos8
+            playbook: 7.2.yml
+          - distro: ubuntu1804
+            playbook: 7.2.yml
+
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.php-versions'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies.
+        run: pip3 install ansible molecule[docker] docker
+
+      - name: Run Molecule tests.
+        run: molecule test
+        env:
+          PY_COLORS: '1'
+          ANSIBLE_FORCE_COLOR: '1'
+          MOLECULE_DISTRO: ${{ matrix.distro }}
+          MOLECULE_PLAYBOOK: ${{ matrix.playbook }}
diff --git a/provisioning/roles/geerlingguy.php-versions/.github/workflows/release.yml b/provisioning/roles/geerlingguy.php-versions/.github/workflows/release.yml
new file mode 100644
index 000000000..14cdf926e
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php-versions/.github/workflows/release.yml
@@ -0,0 +1,38 @@
+---
+# This workflow requires a GALAXY_API_KEY secret present in the GitHub
+# repository or organization.
+#
+# See: https://github.com/marketplace/actions/publish-ansible-role-to-galaxy
+# See: https://github.com/ansible/galaxy/issues/46
+
+name: Release
+'on':
+  push:
+    tags:
+      - '*'
+
+defaults:
+  run:
+    working-directory: 'geerlingguy.php-versions'
+
+jobs:
+
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.php-versions'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install Ansible.
+        run: pip3 install ansible-base
+
+      - name: Trigger a new import on Galaxy.
+        run: ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }} $(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} | cut -d/ -f2)
diff --git a/provisioning/roles/geerlingguy.php-versions/.travis.yml b/provisioning/roles/geerlingguy.php-versions/.travis.yml
deleted file mode 100644
index 0a7084867..000000000
--- a/provisioning/roles/geerlingguy.php-versions/.travis.yml
+++ /dev/null
@@ -1,50 +0,0 @@
----
-language: python
-services: docker
-
-env:
-  global:
-    - ROLE_NAME: php-versions
-  matrix:
-    # Default PHP version (7.3).
-    - MOLECULE_DISTRO: centos8
-    - MOLECULE_DISTRO: centos7
-    - MOLECULE_DISTRO: ubuntu1804
-    - MOLECULE_DISTRO: ubuntu1604
-    - MOLECULE_DISTRO: debian10
-
-    # PHP 7.4.
-    - MOLECULE_DISTRO: centos8
-      MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
-      MOLECULE_PLAYBOOK: playbook-7.4.yml
-    - MOLECULE_DISTRO: ubuntu1804
-      MOLECULE_PLAYBOOK: playbook-7.4.yml
-    - MOLECULE_DISTRO: debian10
-      MOLECULE_PLAYBOOK: playbook-7.4.yml
-
-    # PHP 7.2.
-    - MOLECULE_DISTRO: centos8
-      MOLECULE_PLAYBOOK: playbook-7.2.yml
-    - MOLECULE_DISTRO: ubuntu1804
-      MOLECULE_PLAYBOOK: playbook-7.2.yml
-
-before_install:
-  # Upgrade Docker to work with docker-py.
-  - curl https://gist.githubusercontent.com/geerlingguy/ce883ad4aec6a5f1187ef93bd338511e/raw/36612d28981d92863f839c5aefe5b7dd7193d6c6/travis-ci-docker-upgrade.sh | sudo bash
-
-install:
-  # Install test dependencies.
-  - pip install molecule yamllint ansible-lint docker
-
-before_script:
-  # Use actual Ansible Galaxy role name for the project directory.
-  - cd ../
-  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
-  - cd geerlingguy.$ROLE_NAME
-
-script:
-  # Run tests.
-  - molecule test
-
-notifications:
-  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.php-versions/README.md b/provisioning/roles/geerlingguy.php-versions/README.md
index c11d9b308..3d15fd789 100644
--- a/provisioning/roles/geerlingguy.php-versions/README.md
+++ b/provisioning/roles/geerlingguy.php-versions/README.md
@@ -1,6 +1,6 @@
 # Ansible Role: PHP Versions
 
-[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-php-versions.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-php-versions)
+[![CI](https://github.com/geerlingguy/ansible-role-php-versions/workflows/CI/badge.svg?event=push)](https://github.com/geerlingguy/ansible-role-php-versions/actions?query=workflow%3ACI)
 
 Allows different PHP versions to be installed when using the `geerlingguy.php` role (or a similar role). This role was originally built for [Drupal VM](https://www.drupalvm.com) but was released more generically so others could use an easier mechanism for switching PHP versions.
 
diff --git a/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-7.2.yml b/provisioning/roles/geerlingguy.php-versions/molecule/default/7.2.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-7.2.yml
rename to provisioning/roles/geerlingguy.php-versions/molecule/default/7.2.yml
diff --git a/provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-7.4.yml b/provisioning/roles/geerlingguy.php-versions/molecule/default/7.4.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.php-versions/molecule/default/playbook-7.4.yml
rename to provisioning/roles/geerlingguy.php-versions/molecule/default/7.4.yml
diff --git a/provisioning/roles/geerlingguy.php-versions/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.php-versions/molecule/default/molecule.yml
index 2da47dd1f..74907107f 100644
--- a/provisioning/roles/geerlingguy.php-versions/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.php-versions/molecule/default/molecule.yml
@@ -3,10 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint: |
-  set -e
-  yamllint .
-  ansible-lint
 platforms:
   - name: instance
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
diff --git a/provisioning/roles/geerlingguy.php-versions/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.php-versions/tasks/setup-RedHat.yml
index 714e24fa9..4ba5e6a0b 100644
--- a/provisioning/roles/geerlingguy.php-versions/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.php-versions/tasks/setup-RedHat.yml
@@ -21,7 +21,7 @@
 
   - name: Enable DNF module for CentOS 8+.
     shell: |
-      dnf config-manager --set-enabled PowerTools
+      dnf config-manager --set-enabled powertools
       dnf module enable -y php:remi-{{ php_version }}
     args:
       warn: false

From 2898d8836c96dc96516999e47dd9abf003b328ff Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 22 Feb 2021 15:44:12 -0600
Subject: [PATCH 1243/1273] Update php-versions role to latest version.

---
 provisioning/requirements.yml                                 | 2 +-
 provisioning/roles/geerlingguy.php-versions/tasks/main.yml    | 4 ++--
 .../roles/geerlingguy.php-versions/tasks/setup-Debian.yml     | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 74b3ca26b..354477c57 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -57,7 +57,7 @@ roles:
   - name: geerlingguy.php-tideways
     version: 2.2.0
   - name: geerlingguy.php-versions
-    version: 4.0.5
+    version: 4.1.0
   - name: geerlingguy.php-xdebug
     version: 3.0.0
   - name: geerlingguy.php-xhprof
diff --git a/provisioning/roles/geerlingguy.php-versions/tasks/main.yml b/provisioning/roles/geerlingguy.php-versions/tasks/main.yml
index 7820086e2..5c7707984 100644
--- a/provisioning/roles/geerlingguy.php-versions/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php-versions/tasks/main.yml
@@ -8,8 +8,8 @@
 - name: Define PHP variables.
   set_fact: "{{ item.key }}={{ lookup('vars', item.value) }}"
   when:
-    - hostvars[inventory_hostname][item.key] is undefined
-    - hostvars[inventory_hostname][item.value] is defined
+    - vars[item.key] is undefined
+    - vars[item.value] is defined
   with_dict:
     php_conf_paths: __php_conf_paths
     php_extension_conf_paths: __php_extension_conf_paths
diff --git a/provisioning/roles/geerlingguy.php-versions/tasks/setup-Debian.yml b/provisioning/roles/geerlingguy.php-versions/tasks/setup-Debian.yml
index 86b6be259..cfd093eb6 100644
--- a/provisioning/roles/geerlingguy.php-versions/tasks/setup-Debian.yml
+++ b/provisioning/roles/geerlingguy.php-versions/tasks/setup-Debian.yml
@@ -24,6 +24,7 @@
 - name: Add Ondrej Sury's apt key (Debian).
   apt_key:
     url: https://packages.sury.org/php/apt.gpg
+    id: 15058500A0235D97F5D10063B188E2B695BD4743
     state: present
   when: ansible_distribution == "Debian"
 

From 733000ded858f8db6e92a155ab72c8790611a12e Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 29 Mar 2021 12:55:23 -0500
Subject: [PATCH 1244/1273] Update Solr and Memcached roles to latest versions.

---
 provisioning/requirements.yml                 |  4 +-
 .../roles/geerlingguy.memcached/.ansible-lint |  3 +
 .../.github/workflows/ci.yml                  | 66 ++++++++++++++
 .../.github/workflows/release.yml             | 38 ++++++++
 .../roles/geerlingguy.memcached/.gitignore    |  2 +
 .../roles/geerlingguy.memcached/.travis.yml   | 28 ------
 .../roles/geerlingguy.memcached/.yamllint     |  4 +
 .../roles/geerlingguy.memcached/README.md     |  2 +-
 .../geerlingguy.memcached/handlers/main.yml   |  1 -
 .../roles/geerlingguy.memcached/meta/main.yml |  2 +-
 .../molecule/default/molecule.yml             |  4 -
 .../roles/geerlingguy.solr/.ansible-lint      |  3 +-
 .../geerlingguy.solr/.github/workflows/ci.yml | 88 +++++++++++++++++++
 .../.github/workflows/release.yml             | 38 ++++++++
 .../roles/geerlingguy.solr/.gitignore         |  2 +
 .../roles/geerlingguy.solr/.travis.yml        | 54 ------------
 provisioning/roles/geerlingguy.solr/README.md |  5 +-
 .../roles/geerlingguy.solr/defaults/main.yml  |  1 +
 .../roles/geerlingguy.solr/meta/main.yml      |  1 -
 .../molecule/default/molecule.yml             |  4 -
 .../{playbook-solr-3.yml => solr-3.yml}       |  0
 .../{playbook-solr-4.yml => solr-4.yml}       |  0
 .../{playbook-solr-5.yml => solr-5.yml}       |  0
 .../{playbook-solr-6.yml => solr-6.yml}       |  0
 .../{playbook-solr-7.yml => solr-7.yml}       |  0
 .../roles/geerlingguy.solr/tasks/cores.yml    |  2 +-
 .../geerlingguy.solr/tasks/install-pre5.yml   |  6 +-
 .../roles/geerlingguy.solr/tasks/install.yml  |  1 +
 .../roles/geerlingguy.solr/tasks/user.yml     |  6 +-
 29 files changed, 259 insertions(+), 106 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.memcached/.ansible-lint
 create mode 100644 provisioning/roles/geerlingguy.memcached/.github/workflows/ci.yml
 create mode 100644 provisioning/roles/geerlingguy.memcached/.github/workflows/release.yml
 delete mode 100644 provisioning/roles/geerlingguy.memcached/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.solr/.github/workflows/ci.yml
 create mode 100644 provisioning/roles/geerlingguy.solr/.github/workflows/release.yml
 delete mode 100644 provisioning/roles/geerlingguy.solr/.travis.yml
 rename provisioning/roles/geerlingguy.solr/molecule/default/{playbook-solr-3.yml => solr-3.yml} (100%)
 rename provisioning/roles/geerlingguy.solr/molecule/default/{playbook-solr-4.yml => solr-4.yml} (100%)
 rename provisioning/roles/geerlingguy.solr/molecule/default/{playbook-solr-5.yml => solr-5.yml} (100%)
 rename provisioning/roles/geerlingguy.solr/molecule/default/{playbook-solr-6.yml => solr-6.yml} (100%)
 rename provisioning/roles/geerlingguy.solr/molecule/default/{playbook-solr-7.yml => solr-7.yml} (100%)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 354477c57..7748257fb 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -35,7 +35,7 @@ roles:
   - name: geerlingguy.mailhog
     version: 2.2.0
   - name: geerlingguy.memcached
-    version: 1.1.0
+    version: 2.0.0
   - name: geerlingguy.mysql
     version: 3.3.0
   - name: geerlingguy.nginx
@@ -79,6 +79,6 @@ roles:
   - name: geerlingguy.security
     version: 2.0.0
   - name: geerlingguy.solr
-    version: 5.1.1
+    version: 5.2.0
   - name: geerlingguy.varnish
     version: 3.3.0
diff --git a/provisioning/roles/geerlingguy.memcached/.ansible-lint b/provisioning/roles/geerlingguy.memcached/.ansible-lint
new file mode 100644
index 000000000..acc82551f
--- /dev/null
+++ b/provisioning/roles/geerlingguy.memcached/.ansible-lint
@@ -0,0 +1,3 @@
+skip_list:
+  - 'yaml'
+  - 'role-name'
diff --git a/provisioning/roles/geerlingguy.memcached/.github/workflows/ci.yml b/provisioning/roles/geerlingguy.memcached/.github/workflows/ci.yml
new file mode 100644
index 000000000..947307974
--- /dev/null
+++ b/provisioning/roles/geerlingguy.memcached/.github/workflows/ci.yml
@@ -0,0 +1,66 @@
+---
+name: CI
+'on':
+  pull_request:
+  push:
+    branches:
+      - master
+  schedule:
+    - cron: "30 3 * * 3"
+
+defaults:
+  run:
+    working-directory: 'geerlingguy.memcached'
+
+jobs:
+
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.memcached'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies.
+        run: pip3 install yamllint
+
+      - name: Lint code.
+        run: |
+          yamllint .
+
+  molecule:
+    name: Molecule
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        distro:
+          - centos7
+          - ubuntu1804
+
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.memcached'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies.
+        run: pip3 install ansible molecule[docker] docker
+
+      - name: Run Molecule tests.
+        run: molecule test
+        env:
+          PY_COLORS: '1'
+          ANSIBLE_FORCE_COLOR: '1'
+          MOLECULE_DISTRO: ${{ matrix.distro }}
diff --git a/provisioning/roles/geerlingguy.memcached/.github/workflows/release.yml b/provisioning/roles/geerlingguy.memcached/.github/workflows/release.yml
new file mode 100644
index 000000000..0dae6077b
--- /dev/null
+++ b/provisioning/roles/geerlingguy.memcached/.github/workflows/release.yml
@@ -0,0 +1,38 @@
+---
+# This workflow requires a GALAXY_API_KEY secret present in the GitHub
+# repository or organization.
+#
+# See: https://github.com/marketplace/actions/publish-ansible-role-to-galaxy
+# See: https://github.com/ansible/galaxy/issues/46
+
+name: Release
+'on':
+  push:
+    tags:
+      - '*'
+
+defaults:
+  run:
+    working-directory: 'geerlingguy.memcached'
+
+jobs:
+
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.memcached'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install Ansible.
+        run: pip3 install ansible-base
+
+      - name: Trigger a new import on Galaxy.
+        run: ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }} $(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} | cut -d/ -f2)
diff --git a/provisioning/roles/geerlingguy.memcached/.gitignore b/provisioning/roles/geerlingguy.memcached/.gitignore
index f56f5b578..8840c8f02 100644
--- a/provisioning/roles/geerlingguy.memcached/.gitignore
+++ b/provisioning/roles/geerlingguy.memcached/.gitignore
@@ -1,3 +1,5 @@
 *.retry
 */__pycache__
 *.pyc
+.cache
+
diff --git a/provisioning/roles/geerlingguy.memcached/.travis.yml b/provisioning/roles/geerlingguy.memcached/.travis.yml
deleted file mode 100644
index bc826755e..000000000
--- a/provisioning/roles/geerlingguy.memcached/.travis.yml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-language: python
-services: docker
-
-env:
-  global:
-    - ROLE_NAME: memcached
-  matrix:
-    - MOLECULE_DISTRO: centos7
-    - MOLECULE_DISTRO: ubuntu1804
-    - MOLECULE_DISTRO: ubuntu1604
-
-install:
-  # Install test dependencies.
-  - pip install molecule yamllint ansible-lint docker
-
-before_script:
-  # Use actual Ansible Galaxy role name for the project directory.
-  - cd ../
-  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
-  - cd geerlingguy.$ROLE_NAME
-
-script:
-  # Run tests.
-  - molecule test
-
-notifications:
-  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.memcached/.yamllint b/provisioning/roles/geerlingguy.memcached/.yamllint
index a3dbc38ee..76a383c6a 100644
--- a/provisioning/roles/geerlingguy.memcached/.yamllint
+++ b/provisioning/roles/geerlingguy.memcached/.yamllint
@@ -1,6 +1,10 @@
 ---
 extends: default
+
 rules:
   line-length:
     max: 120
     level: warning
+
+ignore: |
+  .github/stale.yml
diff --git a/provisioning/roles/geerlingguy.memcached/README.md b/provisioning/roles/geerlingguy.memcached/README.md
index 77e8125cb..3d1d53a50 100644
--- a/provisioning/roles/geerlingguy.memcached/README.md
+++ b/provisioning/roles/geerlingguy.memcached/README.md
@@ -1,6 +1,6 @@
 # Ansible Role: Memcached
 
-[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-memcached.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-memcached)
+[![CI](https://github.com/geerlingguy/ansible-role-memcached/workflows/CI/badge.svg?event=push)](https://github.com/geerlingguy/ansible-role-memcached/actions?query=workflow%3ACI)
 
 An Ansible Role that installs Memcached on RedHat/CentOS or Debian/Ubuntu Linux.
 
diff --git a/provisioning/roles/geerlingguy.memcached/handlers/main.yml b/provisioning/roles/geerlingguy.memcached/handlers/main.yml
index af45c6f07..9aaea02cb 100644
--- a/provisioning/roles/geerlingguy.memcached/handlers/main.yml
+++ b/provisioning/roles/geerlingguy.memcached/handlers/main.yml
@@ -1,4 +1,3 @@
 ---
 - name: restart memcached
   service: name=memcached state=restarted
-  when: not memcached_install.changed
diff --git a/provisioning/roles/geerlingguy.memcached/meta/main.yml b/provisioning/roles/geerlingguy.memcached/meta/main.yml
index 21485862e..84be97de7 100644
--- a/provisioning/roles/geerlingguy.memcached/meta/main.yml
+++ b/provisioning/roles/geerlingguy.memcached/meta/main.yml
@@ -2,6 +2,7 @@
 dependencies: []
 
 galaxy_info:
+  role_name: memcached
   author: geerlingguy
   description: Memcached for Linux
   company: "Midwestern Mac, LLC"
@@ -10,7 +11,6 @@ galaxy_info:
   platforms:
     - name: EL
       versions:
-        - 6
         - 7
         - 8
     - name: Ubuntu
diff --git a/provisioning/roles/geerlingguy.memcached/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.memcached/molecule/default/molecule.yml
index 2da47dd1f..74907107f 100644
--- a/provisioning/roles/geerlingguy.memcached/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.memcached/molecule/default/molecule.yml
@@ -3,10 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint: |
-  set -e
-  yamllint .
-  ansible-lint
 platforms:
   - name: instance
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
diff --git a/provisioning/roles/geerlingguy.solr/.ansible-lint b/provisioning/roles/geerlingguy.solr/.ansible-lint
index 555729425..acc82551f 100644
--- a/provisioning/roles/geerlingguy.solr/.ansible-lint
+++ b/provisioning/roles/geerlingguy.solr/.ansible-lint
@@ -1,2 +1,3 @@
 skip_list:
-  - '106'
+  - 'yaml'
+  - 'role-name'
diff --git a/provisioning/roles/geerlingguy.solr/.github/workflows/ci.yml b/provisioning/roles/geerlingguy.solr/.github/workflows/ci.yml
new file mode 100644
index 000000000..0ea2ada86
--- /dev/null
+++ b/provisioning/roles/geerlingguy.solr/.github/workflows/ci.yml
@@ -0,0 +1,88 @@
+---
+name: CI
+'on':
+  pull_request:
+  push:
+    branches:
+      - master
+  schedule:
+    - cron: "30 6 * * 2"
+
+defaults:
+  run:
+    working-directory: 'geerlingguy.solr'
+
+jobs:
+
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.solr'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies.
+        run: pip3 install yamllint
+
+      - name: Lint code.
+        run: |
+          yamllint .
+
+  molecule:
+    name: Molecule
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          # Solr 8.
+          - distro: centos7
+            playbook: converge.yml
+          - distro: ubuntu1804
+            playbook: converge.yml
+          - distro: debian10
+            playbook: converge.yml
+
+          # Solr 7.
+          - distro: centos7
+            playbook: solr-7.yml
+          - distro: debian10
+            playbook: solr-7.yml
+
+          # Older versions.
+          - distro: ubuntu1604
+            playbook: solr-6.yml
+          - distro: ubuntu1604
+            playbook: solr-5.yml
+          - distro: ubuntu1604
+            playbook: solr-4.yml
+          - distro: ubuntu1604
+            playbook: solr-3.yml
+
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.solr'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies.
+        run: pip3 install ansible molecule[docker] docker
+
+      - name: Run Molecule tests.
+        run: molecule test
+        env:
+          PY_COLORS: '1'
+          ANSIBLE_FORCE_COLOR: '1'
+          MOLECULE_DISTRO: ${{ matrix.distro }}
+          MOLECULE_PLAYBOOK: ${{ matrix.playbook }}
diff --git a/provisioning/roles/geerlingguy.solr/.github/workflows/release.yml b/provisioning/roles/geerlingguy.solr/.github/workflows/release.yml
new file mode 100644
index 000000000..4d280a521
--- /dev/null
+++ b/provisioning/roles/geerlingguy.solr/.github/workflows/release.yml
@@ -0,0 +1,38 @@
+---
+# This workflow requires a GALAXY_API_KEY secret present in the GitHub
+# repository or organization.
+#
+# See: https://github.com/marketplace/actions/publish-ansible-role-to-galaxy
+# See: https://github.com/ansible/galaxy/issues/46
+
+name: Release
+'on':
+  push:
+    tags:
+      - '*'
+
+defaults:
+  run:
+    working-directory: 'geerlingguy.solr'
+
+jobs:
+
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.solr'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install Ansible.
+        run: pip3 install ansible-base
+
+      - name: Trigger a new import on Galaxy.
+        run: ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }} $(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} | cut -d/ -f2)
diff --git a/provisioning/roles/geerlingguy.solr/.gitignore b/provisioning/roles/geerlingguy.solr/.gitignore
index f56f5b578..8840c8f02 100644
--- a/provisioning/roles/geerlingguy.solr/.gitignore
+++ b/provisioning/roles/geerlingguy.solr/.gitignore
@@ -1,3 +1,5 @@
 *.retry
 */__pycache__
 *.pyc
+.cache
+
diff --git a/provisioning/roles/geerlingguy.solr/.travis.yml b/provisioning/roles/geerlingguy.solr/.travis.yml
deleted file mode 100644
index 953992835..000000000
--- a/provisioning/roles/geerlingguy.solr/.travis.yml
+++ /dev/null
@@ -1,54 +0,0 @@
----
-language: python
-services: docker
-
-env:
-  global:
-    - ROLE_NAME: solr
-  matrix:
-    - MOLECULE_DISTRO: centos7
-    - MOLECULE_DISTRO: ubuntu1804
-    - MOLECULE_DISTRO: debian10
-
-    # Solr 7.
-    - MOLECULE_DISTRO: centos7
-      MOLECULE_PLAYBOOK: playbook-solr-7.yml
-    - MOLECULE_DISTRO: debian10
-      MOLECULE_PLAYBOOK: playbook-solr-7.yml
-
-    # Solr 6.
-    - MOLECULE_DISTRO: ubuntu1604
-      MOLECULE_PLAYBOOK: playbook-solr-6.yml
-
-    # Solr 5.
-    - MOLECULE_DISTRO: ubuntu1604
-      MOLECULE_PLAYBOOK: playbook-solr-5.yml
-
-    # Solr 4.
-    - MOLECULE_DISTRO: ubuntu1604
-      MOLECULE_PLAYBOOK: playbook-solr-4.yml
-
-    # Solr 3.
-    - MOLECULE_DISTRO: ubuntu1604
-      MOLECULE_PLAYBOOK: playbook-solr-3.yml
-
-before_install:
-  # Upgrade Docker to work with docker-py.
-  - curl https://gist.githubusercontent.com/geerlingguy/ce883ad4aec6a5f1187ef93bd338511e/raw/36612d28981d92863f839c5aefe5b7dd7193d6c6/travis-ci-docker-upgrade.sh | sudo bash
-
-install:
-  # Install test dependencies.
-  - pip install molecule yamllint ansible-lint docker
-
-before_script:
-  # Use actual Ansible Galaxy role name for the project directory.
-  - cd ../
-  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
-  - cd geerlingguy.$ROLE_NAME
-
-script:
-  # Run tests.
-  - molecule test
-
-notifications:
-  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.solr/README.md b/provisioning/roles/geerlingguy.solr/README.md
index 1d7479559..a26ab385d 100644
--- a/provisioning/roles/geerlingguy.solr/README.md
+++ b/provisioning/roles/geerlingguy.solr/README.md
@@ -1,6 +1,6 @@
 # Ansible Role: Apache Solr
 
-[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-solr.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-solr)
+[![CI](https://github.com/geerlingguy/ansible-role-solr/workflows/CI/badge.svg?event=push)](https://github.com/geerlingguy/ansible-role-solr/actions?query=workflow%3ACI)
 
 Installs [Apache Solr](http://lucene.apache.org/solr/) on Linux servers.
 
@@ -20,8 +20,9 @@ Files will be downloaded to this path on the remote server before being moved in
 
     solr_create_user: true
     solr_user: solr
+    solr_group: "{{ solr_user }}"
 
-Solr will be run under the `solr_user`. Set `solr_create_user` to `false` if `solr_user` is created before this role runs, or if you're using Solr 5+ and want Solr's own installation script to set up the user.
+Solr will be run under the `solr_user`. Set `solr_create_user` to `false` if `solr_user` is created before this role runs, or if you're using Solr 5+ and want Solr's own installation script to set up the user. By default, `solr_group` equals `solr_user`, but it can be overwritten to fit your own configuration.
 
     solr_version: "8.6.0"
 
diff --git a/provisioning/roles/geerlingguy.solr/defaults/main.yml b/provisioning/roles/geerlingguy.solr/defaults/main.yml
index b1c5849f8..38e441a47 100644
--- a/provisioning/roles/geerlingguy.solr/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.solr/defaults/main.yml
@@ -3,6 +3,7 @@ solr_workspace: /root
 
 solr_create_user: true
 solr_user: solr
+solr_group: "{{ solr_user }}"
 
 solr_version: "8.6.0"
 solr_mirror: "https://archive.apache.org/dist"
diff --git a/provisioning/roles/geerlingguy.solr/meta/main.yml b/provisioning/roles/geerlingguy.solr/meta/main.yml
index 86390307c..82b560821 100644
--- a/provisioning/roles/geerlingguy.solr/meta/main.yml
+++ b/provisioning/roles/geerlingguy.solr/meta/main.yml
@@ -11,7 +11,6 @@ galaxy_info:
   platforms:
     - name: EL
       versions:
-        - 6
         - 7
         - 8
     - name: Debian
diff --git a/provisioning/roles/geerlingguy.solr/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.solr/molecule/default/molecule.yml
index 2da47dd1f..74907107f 100644
--- a/provisioning/roles/geerlingguy.solr/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.solr/molecule/default/molecule.yml
@@ -3,10 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint: |
-  set -e
-  yamllint .
-  ansible-lint
 platforms:
   - name: instance
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
diff --git a/provisioning/roles/geerlingguy.solr/molecule/default/playbook-solr-3.yml b/provisioning/roles/geerlingguy.solr/molecule/default/solr-3.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.solr/molecule/default/playbook-solr-3.yml
rename to provisioning/roles/geerlingguy.solr/molecule/default/solr-3.yml
diff --git a/provisioning/roles/geerlingguy.solr/molecule/default/playbook-solr-4.yml b/provisioning/roles/geerlingguy.solr/molecule/default/solr-4.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.solr/molecule/default/playbook-solr-4.yml
rename to provisioning/roles/geerlingguy.solr/molecule/default/solr-4.yml
diff --git a/provisioning/roles/geerlingguy.solr/molecule/default/playbook-solr-5.yml b/provisioning/roles/geerlingguy.solr/molecule/default/solr-5.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.solr/molecule/default/playbook-solr-5.yml
rename to provisioning/roles/geerlingguy.solr/molecule/default/solr-5.yml
diff --git a/provisioning/roles/geerlingguy.solr/molecule/default/playbook-solr-6.yml b/provisioning/roles/geerlingguy.solr/molecule/default/solr-6.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.solr/molecule/default/playbook-solr-6.yml
rename to provisioning/roles/geerlingguy.solr/molecule/default/solr-6.yml
diff --git a/provisioning/roles/geerlingguy.solr/molecule/default/playbook-solr-7.yml b/provisioning/roles/geerlingguy.solr/molecule/default/solr-7.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.solr/molecule/default/playbook-solr-7.yml
rename to provisioning/roles/geerlingguy.solr/molecule/default/solr-7.yml
diff --git a/provisioning/roles/geerlingguy.solr/tasks/cores.yml b/provisioning/roles/geerlingguy.solr/tasks/cores.yml
index 4baf9f038..aead23c7b 100644
--- a/provisioning/roles/geerlingguy.solr/tasks/cores.yml
+++ b/provisioning/roles/geerlingguy.solr/tasks/cores.yml
@@ -11,7 +11,7 @@
     path: "{{ solr_home }}/data/{{ item }}/conf"
     state: directory
     owner: "{{ solr_user }}"
-    group: "{{ solr_user }}"
+    group: "{{ solr_group }}"
     recurse: true
     mode: 0755
   when: "item not in solr_cores_current.content"
diff --git a/provisioning/roles/geerlingguy.solr/tasks/install-pre5.yml b/provisioning/roles/geerlingguy.solr/tasks/install-pre5.yml
index aff963336..f891904ad 100644
--- a/provisioning/roles/geerlingguy.solr/tasks/install-pre5.yml
+++ b/provisioning/roles/geerlingguy.solr/tasks/install-pre5.yml
@@ -12,7 +12,7 @@
   file:  # noqa 208
     path: "{{ solr_install_path }}"
     owner: "{{ solr_user }}"
-    group: "{{ solr_user }}"
+    group: "{{ solr_group }}"
     recurse: true
   when: not solr_war_file.stat.exists
 
@@ -26,7 +26,7 @@
     path: "{{ solr_home }}"
     state: directory
     owner: "{{ solr_user }}"
-    group: "{{ solr_user }}"
+    group: "{{ solr_group }}"
     mode: 0755
   when: not solr_example.stat.exists
 
@@ -46,7 +46,7 @@
   file:  # noqa 208
     path: "{{ solr_home }}"
     owner: "{{ solr_user }}"
-    group: "{{ solr_user }}"
+    group: "{{ solr_group }}"
     recurse: true
   when: not solr_example.stat.exists
 
diff --git a/provisioning/roles/geerlingguy.solr/tasks/install.yml b/provisioning/roles/geerlingguy.solr/tasks/install.yml
index 25974ebac..9f02f5665 100644
--- a/provisioning/roles/geerlingguy.solr/tasks/install.yml
+++ b/provisioning/roles/geerlingguy.solr/tasks/install.yml
@@ -18,6 +18,7 @@
     -s {{ solr_service_name }}
     -p {{ solr_port }}
     {{ (solr_version is version('6.3.0', '>=')) | ternary('-n','') }}
+    {{ (solr_version is version('5.4.0', '>=')) | ternary('-f','') }}
     creates={{ solr_install_path }}/bin/solr
   register: solr_install_script_result
 
diff --git a/provisioning/roles/geerlingguy.solr/tasks/user.yml b/provisioning/roles/geerlingguy.solr/tasks/user.yml
index 8c899a30c..6ef1f7f1f 100644
--- a/provisioning/roles/geerlingguy.solr/tasks/user.yml
+++ b/provisioning/roles/geerlingguy.solr/tasks/user.yml
@@ -1,9 +1,9 @@
 ---
-- name: Ensure solr_user group exists.
-  group: "name={{ solr_user }} state=present"
+- name: Ensure solr_group exists.
+  group: "name={{ solr_group }} state=present"
 
 - name: Ensure solr_user exists.
   user:
     name: "{{ solr_user }}"
     state: present
-    group: "{{ solr_user }}"
+    group: "{{ solr_group }}"

From a3aaa457daee871ed05aafc805b1fbeff4e32e90 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 13 Apr 2021 22:45:12 -0500
Subject: [PATCH 1245/1273] Update geerlingguy.nginx role to latest version
 (with IPv6 support).

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.nginx/.ansible-lint     |  3 +
 .../.github/workflows/ci.yml                  | 68 +++++++++++++++++++
 .../.github/workflows/release.yml             | 38 +++++++++++
 .../roles/geerlingguy.nginx/.gitignore        |  2 +
 .../roles/geerlingguy.nginx/.travis.yml       | 29 --------
 .../roles/geerlingguy.nginx/.yamllint         |  5 ++
 .../roles/geerlingguy.nginx/README.md         |  7 +-
 .../roles/geerlingguy.nginx/defaults/main.yml |  4 ++
 .../roles/geerlingguy.nginx/meta/main.yml     |  1 -
 .../molecule/default/molecule.yml             |  4 --
 .../geerlingguy.nginx/tasks/setup-FreeBSD.yml |  1 +
 .../geerlingguy.nginx/tasks/setup-OpenBSD.yml |  1 +
 .../geerlingguy.nginx/tasks/setup-Ubuntu.yml  |  2 +-
 .../roles/geerlingguy.nginx/tasks/vhosts.yml  |  1 +
 .../geerlingguy.nginx/templates/vhost.j2      |  6 ++
 16 files changed, 137 insertions(+), 37 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.nginx/.ansible-lint
 create mode 100644 provisioning/roles/geerlingguy.nginx/.github/workflows/ci.yml
 create mode 100644 provisioning/roles/geerlingguy.nginx/.github/workflows/release.yml
 delete mode 100644 provisioning/roles/geerlingguy.nginx/.travis.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 7748257fb..fa1105477 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -39,7 +39,7 @@ roles:
   - name: geerlingguy.mysql
     version: 3.3.0
   - name: geerlingguy.nginx
-    version: 2.8.0
+    version: 3.0.0
   - name: geerlingguy.nodejs
     version: 5.1.1
   - name: geerlingguy.php
diff --git a/provisioning/roles/geerlingguy.nginx/.ansible-lint b/provisioning/roles/geerlingguy.nginx/.ansible-lint
new file mode 100644
index 000000000..acc82551f
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nginx/.ansible-lint
@@ -0,0 +1,3 @@
+skip_list:
+  - 'yaml'
+  - 'role-name'
diff --git a/provisioning/roles/geerlingguy.nginx/.github/workflows/ci.yml b/provisioning/roles/geerlingguy.nginx/.github/workflows/ci.yml
new file mode 100644
index 000000000..ff706f0f0
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nginx/.github/workflows/ci.yml
@@ -0,0 +1,68 @@
+---
+name: CI
+'on':
+  pull_request:
+  push:
+    branches:
+      - master
+  schedule:
+    - cron: "0 6 * * 3"
+
+defaults:
+  run:
+    working-directory: 'geerlingguy.nginx'
+
+jobs:
+
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.nginx'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies.
+        run: pip3 install yamllint
+
+      - name: Lint code.
+        run: |
+          yamllint .
+
+  molecule:
+    name: Molecule
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        distro:
+          - centos8
+          - ubuntu2004
+          - ubuntu1804
+          - debian10
+
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.nginx'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies.
+        run: pip3 install ansible molecule[docker] docker
+
+      - name: Run Molecule tests.
+        run: molecule test
+        env:
+          PY_COLORS: '1'
+          ANSIBLE_FORCE_COLOR: '1'
+          MOLECULE_DISTRO: ${{ matrix.distro }}
diff --git a/provisioning/roles/geerlingguy.nginx/.github/workflows/release.yml b/provisioning/roles/geerlingguy.nginx/.github/workflows/release.yml
new file mode 100644
index 000000000..de16921ba
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nginx/.github/workflows/release.yml
@@ -0,0 +1,38 @@
+---
+# This workflow requires a GALAXY_API_KEY secret present in the GitHub
+# repository or organization.
+#
+# See: https://github.com/marketplace/actions/publish-ansible-role-to-galaxy
+# See: https://github.com/ansible/galaxy/issues/46
+
+name: Release
+'on':
+  push:
+    tags:
+      - '*'
+
+defaults:
+  run:
+    working-directory: 'geerlingguy.nginx'
+
+jobs:
+
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.nginx'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install Ansible.
+        run: pip3 install ansible-base
+
+      - name: Trigger a new import on Galaxy.
+        run: ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }} $(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} | cut -d/ -f2)
diff --git a/provisioning/roles/geerlingguy.nginx/.gitignore b/provisioning/roles/geerlingguy.nginx/.gitignore
index f56f5b578..8840c8f02 100644
--- a/provisioning/roles/geerlingguy.nginx/.gitignore
+++ b/provisioning/roles/geerlingguy.nginx/.gitignore
@@ -1,3 +1,5 @@
 *.retry
 */__pycache__
 *.pyc
+.cache
+
diff --git a/provisioning/roles/geerlingguy.nginx/.travis.yml b/provisioning/roles/geerlingguy.nginx/.travis.yml
deleted file mode 100644
index 67fd08d80..000000000
--- a/provisioning/roles/geerlingguy.nginx/.travis.yml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-language: python
-services: docker
-
-env:
-  global:
-    - ROLE_NAME: nginx
-  matrix:
-    - MOLECULE_DISTRO: centos8
-    - MOLECULE_DISTRO: ubuntu2004
-    - MOLECULE_DISTRO: ubuntu1804
-    - MOLECULE_DISTRO: debian10
-
-install:
-  # Install test dependencies.
-  - pip install molecule yamllint ansible-lint docker
-
-before_script:
-  # Use actual Ansible Galaxy role name for the project directory.
-  - cd ../
-  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
-  - cd geerlingguy.$ROLE_NAME
-
-script:
-  # Run tests.
-  - molecule test
-
-notifications:
-  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.nginx/.yamllint b/provisioning/roles/geerlingguy.nginx/.yamllint
index a3dbc38ee..f2033dd21 100644
--- a/provisioning/roles/geerlingguy.nginx/.yamllint
+++ b/provisioning/roles/geerlingguy.nginx/.yamllint
@@ -1,6 +1,11 @@
 ---
 extends: default
+
 rules:
   line-length:
     max: 120
     level: warning
+
+ignore: |
+  .github/stale.yml
+  .travis.yml
diff --git a/provisioning/roles/geerlingguy.nginx/README.md b/provisioning/roles/geerlingguy.nginx/README.md
index e28557142..d418aaacf 100644
--- a/provisioning/roles/geerlingguy.nginx/README.md
+++ b/provisioning/roles/geerlingguy.nginx/README.md
@@ -1,6 +1,6 @@
 # Ansible Role: Nginx
 
-[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-nginx.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-nginx)
+[![CI](https://github.com/geerlingguy/ansible-role-nginx/workflows/CI/badge.svg?event=push)](https://github.com/geerlingguy/ansible-role-nginx/actions?query=workflow%3ACI)
 
 **Note:** Please consider using the official [NGINX Ansible role](https://github.com/nginxinc/ansible-role-nginx) from NGINX, Inc.
 
@@ -16,6 +16,11 @@ None.
 
 Available variables are listed below, along with default values (see `defaults/main.yml`):
 
+
+    nginx_listen_ipv6: true
+
+Whether or not to listen on IPv6 (applied to all vhosts managed by this role).
+
     nginx_vhosts: []
 
 A list of vhost definitions (server blocks) for Nginx virtual hosts. Each entry will create a separate config file named by `server_name`. If left empty, you will need to supply your own virtual host configuration. See the commented example in `defaults/main.yml` for available server options. If you have a large number of customizations required for your server definition(s), you're likely better off managing the vhost configuration file yourself, leaving this variable set to `[]`.
diff --git a/provisioning/roles/geerlingguy.nginx/defaults/main.yml b/provisioning/roles/geerlingguy.nginx/defaults/main.yml
index 0509dbed5..fa4a15363 100644
--- a/provisioning/roles/geerlingguy.nginx/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.nginx/defaults/main.yml
@@ -57,6 +57,10 @@ nginx_extra_http_options: ""
 #      proxy_set_header   Host $http_host;
 
 nginx_remove_default_vhost: false
+
+# Listen on IPv6 (default: true)
+nginx_listen_ipv6: true
+
 nginx_vhosts: []
 # Example vhost below, showing all available options:
 # - listen: "80" # default: "80"
diff --git a/provisioning/roles/geerlingguy.nginx/meta/main.yml b/provisioning/roles/geerlingguy.nginx/meta/main.yml
index aaff40d4c..0033d24cb 100644
--- a/provisioning/roles/geerlingguy.nginx/meta/main.yml
+++ b/provisioning/roles/geerlingguy.nginx/meta/main.yml
@@ -11,7 +11,6 @@ galaxy_info:
   platforms:
     - name: EL
       versions:
-        - 6
         - 7
         - 8
     - name: Debian
diff --git a/provisioning/roles/geerlingguy.nginx/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.nginx/molecule/default/molecule.yml
index 2da47dd1f..74907107f 100644
--- a/provisioning/roles/geerlingguy.nginx/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.nginx/molecule/default/molecule.yml
@@ -3,10 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint: |
-  set -e
-  yamllint .
-  ansible-lint
 platforms:
   - name: instance
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
diff --git a/provisioning/roles/geerlingguy.nginx/tasks/setup-FreeBSD.yml b/provisioning/roles/geerlingguy.nginx/tasks/setup-FreeBSD.yml
index f4614f630..637c5202d 100644
--- a/provisioning/roles/geerlingguy.nginx/tasks/setup-FreeBSD.yml
+++ b/provisioning/roles/geerlingguy.nginx/tasks/setup-FreeBSD.yml
@@ -14,3 +14,4 @@
   file:
     path: /var/log/nginx
     state: directory
+    mode: 0755
diff --git a/provisioning/roles/geerlingguy.nginx/tasks/setup-OpenBSD.yml b/provisioning/roles/geerlingguy.nginx/tasks/setup-OpenBSD.yml
index c660301ce..c75c27e4d 100644
--- a/provisioning/roles/geerlingguy.nginx/tasks/setup-OpenBSD.yml
+++ b/provisioning/roles/geerlingguy.nginx/tasks/setup-OpenBSD.yml
@@ -8,3 +8,4 @@
   file:
     path: /var/log/nginx
     state: directory
+    mode: 0755
diff --git a/provisioning/roles/geerlingguy.nginx/tasks/setup-Ubuntu.yml b/provisioning/roles/geerlingguy.nginx/tasks/setup-Ubuntu.yml
index 5e08aff0e..c608d25b9 100644
--- a/provisioning/roles/geerlingguy.nginx/tasks/setup-Ubuntu.yml
+++ b/provisioning/roles/geerlingguy.nginx/tasks/setup-Ubuntu.yml
@@ -4,7 +4,7 @@
     name: dirmngr
     state: present
 
-- name: Add PPA for Nginx.
+- name: Add PPA for Nginx (if configured).
   apt_repository:
     repo: 'ppa:nginx/{{ nginx_ppa_version }}'
     state: present
diff --git a/provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml b/provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml
index 7e2995ecc..8f990fb00 100644
--- a/provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml
+++ b/provisioning/roles/geerlingguy.nginx/tasks/vhosts.yml
@@ -10,6 +10,7 @@
   file:
     path: "{{ nginx_vhost_path }}"
     state: directory
+    mode: 0755
   notify: reload nginx
 
 - name: Add managed vhost config files.
diff --git a/provisioning/roles/geerlingguy.nginx/templates/vhost.j2 b/provisioning/roles/geerlingguy.nginx/templates/vhost.j2
index 0feb60299..f419a0a02 100644
--- a/provisioning/roles/geerlingguy.nginx/templates/vhost.j2
+++ b/provisioning/roles/geerlingguy.nginx/templates/vhost.j2
@@ -2,6 +2,9 @@
 {% if item.server_name_redirect is defined %}
 server {
     listen       {{ item.listen | default('80') }};
+{% if nginx_listen_ipv6 %}
+    listen       [::]:{{item.listen | default('80') }};
+{% endif %}
     server_name  {{ item.server_name_redirect }};
     return       301 $scheme://{{ item.server_name.split(' ')[0] }}$request_uri;
 }
@@ -13,6 +16,9 @@ server {
 
     {% block server_basic -%}
     listen {{ item.listen | default('80') }};
+{% if nginx_listen_ipv6 %}
+    listen       [::]:{{item.listen | default('80') }};
+{% endif %}
 
 {% if item.server_name is defined %}
     server_name {{ item.server_name }};

From fb4675d9d6043e7cc3513b25c90e56d984bf933a Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 19 Apr 2021 17:00:11 -0500
Subject: [PATCH 1246/1273] Update memcached role to latest version.

---
 provisioning/requirements.yml                               | 2 +-
 .../templates/memcached-Debian.conf.j2                      | 6 ++++++
 .../templates/memcached-RedHat.conf.j2                      | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index fa1105477..65d93cceb 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -35,7 +35,7 @@ roles:
   - name: geerlingguy.mailhog
     version: 2.2.0
   - name: geerlingguy.memcached
-    version: 2.0.0
+    version: 2.1.0
   - name: geerlingguy.mysql
     version: 3.3.0
   - name: geerlingguy.nginx
diff --git a/provisioning/roles/geerlingguy.memcached/templates/memcached-Debian.conf.j2 b/provisioning/roles/geerlingguy.memcached/templates/memcached-Debian.conf.j2
index c3941edfc..7988aa4a3 100644
--- a/provisioning/roles/geerlingguy.memcached/templates/memcached-Debian.conf.j2
+++ b/provisioning/roles/geerlingguy.memcached/templates/memcached-Debian.conf.j2
@@ -28,7 +28,13 @@ logfile {{ memcached_log_file }}
 # Specify which IP address to listen on. The default is to listen on all IP addresses
 # This parameter is one of the only security measures that memcached has, so make sure
 # it's listening on a firewalled interface.
+{% if memcached_listen_ip is string %}
 -l {{ memcached_listen_ip }}
+{% else %}
+{% for ip in memcached_listen_ip %}
+-l {{ ip }}
+{% endfor %}
+{% endif %}
 
 # Limit the number of simultaneous incoming connections. The daemon default is 1024
 -c {{ memcached_connections }}
diff --git a/provisioning/roles/geerlingguy.memcached/templates/memcached-RedHat.conf.j2 b/provisioning/roles/geerlingguy.memcached/templates/memcached-RedHat.conf.j2
index 0bd877aa6..803de6e75 100644
--- a/provisioning/roles/geerlingguy.memcached/templates/memcached-RedHat.conf.j2
+++ b/provisioning/roles/geerlingguy.memcached/templates/memcached-RedHat.conf.j2
@@ -17,4 +17,4 @@ CACHESIZE="{{ memcached_memory_limit }}"
 # -l Specify which IP address to listen on. The default is to listen on all IP addresses
 #    This parameter is one of the only security measures that memcached has, so make sure
 #    it's listening on a firewalled interface.
-OPTIONS="-l {{ memcached_listen_ip }} -I {{ memcached_max_item_size }} {{ memcached_log_verbosity }} >> {{ memcached_log_file }} 2>&1"
+OPTIONS="{% if memcached_listen_ip is string %}-l {{ memcached_listen_ip }} {% else %}{% for ip in memcached_listen_ip %}-l {{ ip }} {% endfor %}{% endif %}-I {{ memcached_max_item_size }} {{ memcached_log_verbosity }} >> {{ memcached_log_file }} 2>&1"

From 079f6f4de1beb629ca96726cfa89f841f21696a6 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 28 Apr 2021 09:00:38 -0500
Subject: [PATCH 1247/1273] Update MySQL role to latest version.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.mysql/.ansible-lint     |  3 +-
 .../.github/workflows/ci.yml                  | 77 +++++++++++++++++++
 .../.github/workflows/release.yml             | 38 +++++++++
 .../roles/geerlingguy.mysql/.gitignore        |  1 +
 .../roles/geerlingguy.mysql/.travis.yml       | 31 --------
 .../roles/geerlingguy.mysql/.yamllint         |  4 +
 .../roles/geerlingguy.mysql/README.md         |  2 +-
 .../roles/geerlingguy.mysql/meta/main.yml     |  1 -
 .../molecule/default/molecule.yml             |  4 -
 .../tasks/secure-installation.yml             |  4 +-
 .../roles/geerlingguy.mysql/vars/RedHat-6.yml | 14 ----
 12 files changed, 126 insertions(+), 55 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.mysql/.github/workflows/ci.yml
 create mode 100644 provisioning/roles/geerlingguy.mysql/.github/workflows/release.yml
 delete mode 100644 provisioning/roles/geerlingguy.mysql/.travis.yml
 delete mode 100644 provisioning/roles/geerlingguy.mysql/vars/RedHat-6.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 65d93cceb..d779932df 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -37,7 +37,7 @@ roles:
   - name: geerlingguy.memcached
     version: 2.1.0
   - name: geerlingguy.mysql
-    version: 3.3.0
+    version: 3.3.1
   - name: geerlingguy.nginx
     version: 3.0.0
   - name: geerlingguy.nodejs
diff --git a/provisioning/roles/geerlingguy.mysql/.ansible-lint b/provisioning/roles/geerlingguy.mysql/.ansible-lint
index 1ae5e6ccf..acc82551f 100644
--- a/provisioning/roles/geerlingguy.mysql/.ansible-lint
+++ b/provisioning/roles/geerlingguy.mysql/.ansible-lint
@@ -1,2 +1,3 @@
 skip_list:
-  - '204'
+  - 'yaml'
+  - 'role-name'
diff --git a/provisioning/roles/geerlingguy.mysql/.github/workflows/ci.yml b/provisioning/roles/geerlingguy.mysql/.github/workflows/ci.yml
new file mode 100644
index 000000000..e956354e9
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/.github/workflows/ci.yml
@@ -0,0 +1,77 @@
+---
+name: CI
+'on':
+  pull_request:
+  push:
+    branches:
+      - master
+  schedule:
+    - cron: "0 1 * * 3"
+
+defaults:
+  run:
+    working-directory: 'geerlingguy.mysql'
+
+jobs:
+
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.mysql'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies.
+        run: pip3 install yamllint
+
+      - name: Lint code.
+        run: |
+          yamllint .
+
+  molecule:
+    name: Molecule
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        distro:
+          - centos8
+          - centos7
+          - ubuntu1804
+          - debian10
+
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.mysql'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies.
+        run: pip3 install ansible molecule[docker] docker
+
+      # See: https://github.com/geerlingguy/ansible-role-mysql/issues/422
+      - name: Disable AppArmor on Debian.
+        run: |
+            set -x
+            sudo apt-get install apparmor-profiles
+            sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
+            sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
+        if: ${{ startsWith(matrix.distro, 'debian') }}
+
+      - name: Run Molecule tests.
+        run: molecule test
+        env:
+          PY_COLORS: '1'
+          ANSIBLE_FORCE_COLOR: '1'
+          MOLECULE_DISTRO: ${{ matrix.distro }}
diff --git a/provisioning/roles/geerlingguy.mysql/.github/workflows/release.yml b/provisioning/roles/geerlingguy.mysql/.github/workflows/release.yml
new file mode 100644
index 000000000..f92b7d8e3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.mysql/.github/workflows/release.yml
@@ -0,0 +1,38 @@
+---
+# This workflow requires a GALAXY_API_KEY secret present in the GitHub
+# repository or organization.
+#
+# See: https://github.com/marketplace/actions/publish-ansible-role-to-galaxy
+# See: https://github.com/ansible/galaxy/issues/46
+
+name: Release
+'on':
+  push:
+    tags:
+      - '*'
+
+defaults:
+  run:
+    working-directory: 'geerlingguy.mysql'
+
+jobs:
+
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.mysql'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install Ansible.
+        run: pip3 install ansible-base
+
+      - name: Trigger a new import on Galaxy.
+        run: ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }} $(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} | cut -d/ -f2)
diff --git a/provisioning/roles/geerlingguy.mysql/.gitignore b/provisioning/roles/geerlingguy.mysql/.gitignore
index f56f5b578..554cc54a2 100644
--- a/provisioning/roles/geerlingguy.mysql/.gitignore
+++ b/provisioning/roles/geerlingguy.mysql/.gitignore
@@ -1,3 +1,4 @@
 *.retry
 */__pycache__
 *.pyc
+.cache
diff --git a/provisioning/roles/geerlingguy.mysql/.travis.yml b/provisioning/roles/geerlingguy.mysql/.travis.yml
deleted file mode 100644
index c82b59e5c..000000000
--- a/provisioning/roles/geerlingguy.mysql/.travis.yml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-language: python
-services: docker
-
-env:
-  global:
-    - ROLE_NAME: mysql
-  matrix:
-    - MOLECULE_DISTRO: centos8
-    - MOLECULE_DISTRO: centos7
-    - MOLECULE_DISTRO: centos6
-    - MOLECULE_DISTRO: ubuntu1804
-    - MOLECULE_DISTRO: ubuntu1604
-    - MOLECULE_DISTRO: debian10
-
-install:
-  # Install test dependencies.
-  - pip install molecule yamllint ansible-lint docker
-
-before_script:
-  # Use actual Ansible Galaxy role name for the project directory.
-  - cd ../
-  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
-  - cd geerlingguy.$ROLE_NAME
-
-script:
-  # Run tests.
-  - molecule test
-
-notifications:
-  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.mysql/.yamllint b/provisioning/roles/geerlingguy.mysql/.yamllint
index db22c42ea..2a66c05d6 100644
--- a/provisioning/roles/geerlingguy.mysql/.yamllint
+++ b/provisioning/roles/geerlingguy.mysql/.yamllint
@@ -1,6 +1,10 @@
 ---
 extends: default
+
 rules:
   line-length:
     max: 160
     level: warning
+
+ignore: |
+  .github/stale.yml
diff --git a/provisioning/roles/geerlingguy.mysql/README.md b/provisioning/roles/geerlingguy.mysql/README.md
index cd52bece2..6a69c3b73 100644
--- a/provisioning/roles/geerlingguy.mysql/README.md
+++ b/provisioning/roles/geerlingguy.mysql/README.md
@@ -1,6 +1,6 @@
 # Ansible Role: MySQL
 
-[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-mysql.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-mysql)
+[![CI](https://github.com/geerlingguy/ansible-role-mysql/workflows/CI/badge.svg?event=push)](https://github.com/geerlingguy/ansible-role-mysql/actions?query=workflow%3ACI)
 
 Installs and configures MySQL or MariaDB server on RHEL/CentOS or Debian/Ubuntu servers.
 
diff --git a/provisioning/roles/geerlingguy.mysql/meta/main.yml b/provisioning/roles/geerlingguy.mysql/meta/main.yml
index 0f1c0e7d8..a1bdc8517 100644
--- a/provisioning/roles/geerlingguy.mysql/meta/main.yml
+++ b/provisioning/roles/geerlingguy.mysql/meta/main.yml
@@ -11,7 +11,6 @@ galaxy_info:
   platforms:
     - name: EL
       versions:
-        - 6
         - 7
         - 8
     - name: Ubuntu
diff --git a/provisioning/roles/geerlingguy.mysql/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.mysql/molecule/default/molecule.yml
index 2da47dd1f..74907107f 100644
--- a/provisioning/roles/geerlingguy.mysql/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.mysql/molecule/default/molecule.yml
@@ -3,10 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint: |
-  set -e
-  yamllint .
-  ansible-lint
 platforms:
   - name: instance
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
diff --git a/provisioning/roles/geerlingguy.mysql/tasks/secure-installation.yml b/provisioning/roles/geerlingguy.mysql/tasks/secure-installation.yml
index 3e7251206..d7a17b8f1 100644
--- a/provisioning/roles/geerlingguy.mysql/tasks/secure-installation.yml
+++ b/provisioning/roles/geerlingguy.mysql/tasks/secure-installation.yml
@@ -43,7 +43,7 @@
   shell: >
     mysql -u root -NBe
     'ALTER USER "{{ mysql_root_username }}"@"{{ item }}"
-    IDENTIFIED WITH mysql_native_password BY "{{ mysql_root_password }}";'
+    IDENTIFIED WITH mysql_native_password BY "{{ mysql_root_password }}"; FLUSH PRIVILEGES;'
   with_items: "{{ mysql_root_hosts.stdout_lines|default([]) }}"
   when: >
     ((mysql_install_packages | bool) or mysql_root_password_update)
@@ -53,7 +53,7 @@
 - name: Update MySQL root password for localhost root account (< 5.7.x).
   shell: >
     mysql -NBe
-    'SET PASSWORD FOR "{{ mysql_root_username }}"@"{{ item }}" = PASSWORD("{{ mysql_root_password }}");'
+    'SET PASSWORD FOR "{{ mysql_root_username }}"@"{{ item }}" = PASSWORD("{{ mysql_root_password }}"); FLUSH PRIVILEGES;'
   with_items: "{{ mysql_root_hosts.stdout_lines|default([]) }}"
   when: >
     ((mysql_install_packages | bool) or mysql_root_password_update)
diff --git a/provisioning/roles/geerlingguy.mysql/vars/RedHat-6.yml b/provisioning/roles/geerlingguy.mysql/vars/RedHat-6.yml
deleted file mode 100644
index 12e086f62..000000000
--- a/provisioning/roles/geerlingguy.mysql/vars/RedHat-6.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-__mysql_daemon: mysqld
-__mysql_packages:
-  - mysql
-  - mysql-server
-  - MySQL-python
-__mysql_slow_query_log_file: /var/log/mysql-slow.log
-__mysql_log_error: /var/log/mysql.err
-__mysql_syslog_tag: mysql
-__mysql_pid_file: /var/run/mysqld/mysqld.pid
-__mysql_config_file: /etc/my.cnf
-__mysql_config_include_dir: /etc/my.cnf.d
-__mysql_socket: /var/lib/mysql/mysql.sock
-__mysql_supports_innodb_large_prefix: false

From 0c3af7da053d3720e8b93e49a8d573489106c8ba Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 28 Apr 2021 09:12:47 -0500
Subject: [PATCH 1248/1273] Update memcached role to latest version.

---
 provisioning/requirements.yml                                 | 2 +-
 provisioning/roles/geerlingguy.memcached/README.md            | 4 ++++
 provisioning/roles/geerlingguy.memcached/defaults/main.yml    | 2 ++
 .../geerlingguy.memcached/templates/memcached-Debian.conf.j2  | 3 +++
 .../geerlingguy.memcached/templates/memcached-RedHat.conf.j2  | 2 +-
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index d779932df..2ebbf794f 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -35,7 +35,7 @@ roles:
   - name: geerlingguy.mailhog
     version: 2.2.0
   - name: geerlingguy.memcached
-    version: 2.1.0
+    version: 2.2.0
   - name: geerlingguy.mysql
     version: 3.3.1
   - name: geerlingguy.nginx
diff --git a/provisioning/roles/geerlingguy.memcached/README.md b/provisioning/roles/geerlingguy.memcached/README.md
index 3d1d53a50..253230e4c 100644
--- a/provisioning/roles/geerlingguy.memcached/README.md
+++ b/provisioning/roles/geerlingguy.memcached/README.md
@@ -21,6 +21,10 @@ The user under which the Memcached daemon will run.
 
 The port and IP address (127.0.0.1 for localhost) on which Memcached will listen for requests.
 
+    memcached_threads: 4
+
+Number of threads to run.
+
     memcached_memory_limit: 64
     memcached_max_item_size: 1m
     memcached_connections: 1024
diff --git a/provisioning/roles/geerlingguy.memcached/defaults/main.yml b/provisioning/roles/geerlingguy.memcached/defaults/main.yml
index 0af34e386..bef3ad052 100644
--- a/provisioning/roles/geerlingguy.memcached/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.memcached/defaults/main.yml
@@ -9,3 +9,5 @@ memcached_log_file: /var/log/memcached.log
 memcached_log_verbosity: ""
 
 memcached_max_item_size: 1m
+
+memcached_threads: 4
diff --git a/provisioning/roles/geerlingguy.memcached/templates/memcached-Debian.conf.j2 b/provisioning/roles/geerlingguy.memcached/templates/memcached-Debian.conf.j2
index 7988aa4a3..87e7021f8 100644
--- a/provisioning/roles/geerlingguy.memcached/templates/memcached-Debian.conf.j2
+++ b/provisioning/roles/geerlingguy.memcached/templates/memcached-Debian.conf.j2
@@ -9,6 +9,9 @@
 # information.
 -d
 
+# Threads count
+-t {{ memcached_threads }}
+
 # Log memcached's output to /var/log/memcached
 logfile {{ memcached_log_file }}
 {{ memcached_log_verbosity }}
diff --git a/provisioning/roles/geerlingguy.memcached/templates/memcached-RedHat.conf.j2 b/provisioning/roles/geerlingguy.memcached/templates/memcached-RedHat.conf.j2
index 803de6e75..21efeaada 100644
--- a/provisioning/roles/geerlingguy.memcached/templates/memcached-RedHat.conf.j2
+++ b/provisioning/roles/geerlingguy.memcached/templates/memcached-RedHat.conf.j2
@@ -17,4 +17,4 @@ CACHESIZE="{{ memcached_memory_limit }}"
 # -l Specify which IP address to listen on. The default is to listen on all IP addresses
 #    This parameter is one of the only security measures that memcached has, so make sure
 #    it's listening on a firewalled interface.
-OPTIONS="{% if memcached_listen_ip is string %}-l {{ memcached_listen_ip }} {% else %}{% for ip in memcached_listen_ip %}-l {{ ip }} {% endfor %}{% endif %}-I {{ memcached_max_item_size }} {{ memcached_log_verbosity }} >> {{ memcached_log_file }} 2>&1"
+OPTIONS="{% if memcached_listen_ip is string %}-l {{ memcached_listen_ip }} {% else %}{% for ip in memcached_listen_ip %}-l {{ ip }} {% endfor %}{% endif %}-t {{ memcached_threads }} -I {{ memcached_max_item_size }} {{ memcached_log_verbosity }} >> {{ memcached_log_file }} 2>&1"

From 639d773cb3153b3de46d6a007a5d7f40f907a92b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Tue, 4 May 2021 20:00:39 -0300
Subject: [PATCH 1249/1273] Issue #2154: Add vagrant-nfs-fix role to fix NFS
 timeout issues on macOS

Co-authored-by: MokDevelopment
Co-authored-by: Susanne Coates <scoates@susannecoates.net>
---
 default.config.yml                            |  4 ++
 provisioning/playbook.yml                     |  1 +
 .../roles/drupalvm.vagrant-nfs-fix/README.md  | 29 ++++++++++
 .../defaults/main.yml                         |  2 +
 .../drupalvm.vagrant-nfs-fix/tasks/main.yml   | 32 +++++++++++
 .../templates/vagrant-nfs-fix.init.j2         | 55 +++++++++++++++++++
 .../templates/vagrant-nfs-fix.j2              |  6 ++
 .../templates/vagrant-nfs-fix.unit.j2         | 12 ++++
 8 files changed, 141 insertions(+)
 create mode 100644 provisioning/roles/drupalvm.vagrant-nfs-fix/README.md
 create mode 100644 provisioning/roles/drupalvm.vagrant-nfs-fix/defaults/main.yml
 create mode 100644 provisioning/roles/drupalvm.vagrant-nfs-fix/tasks/main.yml
 create mode 100644 provisioning/roles/drupalvm.vagrant-nfs-fix/templates/vagrant-nfs-fix.init.j2
 create mode 100644 provisioning/roles/drupalvm.vagrant-nfs-fix/templates/vagrant-nfs-fix.j2
 create mode 100644 provisioning/roles/drupalvm.vagrant-nfs-fix/templates/vagrant-nfs-fix.unit.j2

diff --git a/default.config.yml b/default.config.yml
index bb022c596..582d94c32 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -42,6 +42,10 @@ vagrant_plugins:
   - name: vagrant-vbguest
   - name: vagrant-hostsupdater
 
+# Automatically fix timeout issues with NFS on macOS. See
+# https://github.com/geerlingguy/drupal-vm/issues/2154
+vagrant_nfs_fix_enabled: "{{ vagrant_synced_folder_default_type == 'nfs' }}"
+
 ansible_python_interpreter: python3
 
 # Minimum required versions.
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index e32621f13..65fc4636e 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -35,6 +35,7 @@
     - { role: geerlingguy.repo-epel, when: ansible_os_family == 'RedHat' }
     - { role: geerlingguy.repo-remi, when: ansible_os_family == 'RedHat', tags: ['webserver', 'php'] }
     - { role: drupalvm.hostname, when: hostname_configure }
+    - { role: drupalvm.vagrant-nfs-fix, when: vagrant_nfs_fix_enabled }
     - { role: geerlingguy.firewall, when: firewall_enabled }
     - { role: geerlingguy.git }
     - { role: geerlingguy.postfix }
diff --git a/provisioning/roles/drupalvm.vagrant-nfs-fix/README.md b/provisioning/roles/drupalvm.vagrant-nfs-fix/README.md
new file mode 100644
index 000000000..f815cd118
--- /dev/null
+++ b/provisioning/roles/drupalvm.vagrant-nfs-fix/README.md
@@ -0,0 +1,29 @@
+# Drupal VM Vagrant NFS Fix Role
+
+This role exists to fix [issue #2154](https://github.com/geerlingguy/drupal-vm/issues/2154).
+
+## Requirements
+
+This role is meant to be run in Drupal VM.
+
+## Role Variables
+
+Available variables are listed below:
+
+```yaml
+vagrant_nfs_fix_keepalive_file: "/vagrant/.vagrant-nfs-fix-keepalive.tmp"
+```
+
+Path to the keepalive file that we'll be `touch`ed every 30 seconds to keep NFS from timing out.
+
+## Dependencies
+
+None.
+
+## License
+
+MIT / BSD
+
+## Author Information
+
+This role was created in 2021 by [Oskar Schöldström](http://oxy.fi) and [Jeff Geerling](https://www.jeffgeerling.com/) (author of [Ansible for DevOps](https://www.ansiblefordevops.com/)).
diff --git a/provisioning/roles/drupalvm.vagrant-nfs-fix/defaults/main.yml b/provisioning/roles/drupalvm.vagrant-nfs-fix/defaults/main.yml
new file mode 100644
index 000000000..0f893eb68
--- /dev/null
+++ b/provisioning/roles/drupalvm.vagrant-nfs-fix/defaults/main.yml
@@ -0,0 +1,2 @@
+---
+vagrant_nfs_fix_keepalive_file: "/vagrant/.vagrant-nfs-fix-keepalive.tmp"
\ No newline at end of file
diff --git a/provisioning/roles/drupalvm.vagrant-nfs-fix/tasks/main.yml b/provisioning/roles/drupalvm.vagrant-nfs-fix/tasks/main.yml
new file mode 100644
index 000000000..9df6eb8c8
--- /dev/null
+++ b/provisioning/roles/drupalvm.vagrant-nfs-fix/tasks/main.yml
@@ -0,0 +1,32 @@
+---
+- name: Copy Vagrant NFS fix script into place.
+  template:
+    src: vagrant-nfs-fix.j2
+    dest: /usr/sbin/vagrant-nfs-fix
+    owner: root
+    group: root
+    mode: 0755
+
+- name: Copy Vagrant NFS fix init script into place.
+  template:
+    src: vagrant-nfs-fix.init.j2
+    dest: /etc/init.d/vagrant-nfs-fix
+    owner: root
+    group: root
+    mode: 0755
+  when: ansible_service_mgr != 'systemd'
+
+- name: Copy Vagrant NFS fix systemd unit file into place (for systemd systems).
+  template:
+    src: vagrant-nfs-fix.unit.j2
+    dest: /etc/systemd/system/vagrant-nfs-fix.service
+    owner: root
+    group: root
+    mode: 0644
+  when: ansible_service_mgr == 'systemd'
+
+- name: Configure the NFS fix service.
+  service:
+    name: vagrant-nfs-fix
+    state: started
+    enabled: true
\ No newline at end of file
diff --git a/provisioning/roles/drupalvm.vagrant-nfs-fix/templates/vagrant-nfs-fix.init.j2 b/provisioning/roles/drupalvm.vagrant-nfs-fix/templates/vagrant-nfs-fix.init.j2
new file mode 100644
index 000000000..de5001f1c
--- /dev/null
+++ b/provisioning/roles/drupalvm.vagrant-nfs-fix/templates/vagrant-nfs-fix.init.j2
@@ -0,0 +1,55 @@
+#! /bin/sh
+# /etc/init.d/vagrant-nfs-fix
+
+### BEGIN INIT INFO
+# Provides:          vagrant-nfs-fix
+# Required-Start:    $local_fs $network
+# Required-Stop:     $local_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start vagrant-nfs-fix at boot time
+# Description:       Continuously touch a file within an NFS mount to avoid timeout problems on macOS.
+### END INIT INFO
+
+PID_FILE="/var/run/vagrant-nfs-fix.pid"
+
+# Carry out specific functions when asked to by the system
+case "$1" in
+  start)
+    echo "Starting vagrant-nfs-fix."
+    /usr/sbin/vagrant-nfs-fix &
+    echo $! > $PID_FILE
+    ;;
+  stop)
+    echo "Stopping vagrant-nfs-fix."
+    kill `cat $PID_FILE`
+    rm $PID_FILE
+    ;;
+  restart)
+    echo "Restarting firewall."
+    kill `cat $PID_FILE`
+    rm $PID_FILE
+
+    /usr/sbin/vagrant-nfs-fix &
+    echo $! > $PID_FILE
+    ;;
+  status)
+    EXIT=4 # program or service status is unknown
+    if [ -e $PID_FILE ]; then
+        if ps -p `cat $PID_FILE` > /dev/null 2>&1; then
+            EXIT=0 # program is running or service is OK
+        else
+            EXIT=3 # program is not running
+        fi
+    else
+        EXIT=3 # program is not running
+    fi
+    exit $EXIT
+    ;;
+  *)
+    echo "Usage: /etc/init.d/vagrant-nfs-fix {start|stop|status|restart}"
+    exit 1
+    ;;
+esac
+
+exit 0
diff --git a/provisioning/roles/drupalvm.vagrant-nfs-fix/templates/vagrant-nfs-fix.j2 b/provisioning/roles/drupalvm.vagrant-nfs-fix/templates/vagrant-nfs-fix.j2
new file mode 100644
index 000000000..9e080999a
--- /dev/null
+++ b/provisioning/roles/drupalvm.vagrant-nfs-fix/templates/vagrant-nfs-fix.j2
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+while true; do
+  touch {{ vagrant_nfs_fix_keepalive_file }}
+  sleep 30
+done
\ No newline at end of file
diff --git a/provisioning/roles/drupalvm.vagrant-nfs-fix/templates/vagrant-nfs-fix.unit.j2 b/provisioning/roles/drupalvm.vagrant-nfs-fix/templates/vagrant-nfs-fix.unit.j2
new file mode 100644
index 000000000..da4c1c909
--- /dev/null
+++ b/provisioning/roles/drupalvm.vagrant-nfs-fix/templates/vagrant-nfs-fix.unit.j2
@@ -0,0 +1,12 @@
+[Unit]
+Description=Workaround for vagrant NFS inactivity bug
+StartLimitIntervalSec=0
+
+[Service]
+Type=simple
+Restart=always
+RestartSec=1
+ExecStart=/usr/sbin/vagrant-nfs-fix
+
+[Install]
+WantedBy=multi-user.target
\ No newline at end of file

From 44e146a7351977b69cca74263cc3f566b5971bd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Tue, 4 May 2021 20:10:36 -0300
Subject: [PATCH 1250/1273] Remove the keepalive file so its less likely to get
 committed to git O.o

---
 .../roles/drupalvm.vagrant-nfs-fix/templates/vagrant-nfs-fix.j2 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/provisioning/roles/drupalvm.vagrant-nfs-fix/templates/vagrant-nfs-fix.j2 b/provisioning/roles/drupalvm.vagrant-nfs-fix/templates/vagrant-nfs-fix.j2
index 9e080999a..6d9f591e3 100644
--- a/provisioning/roles/drupalvm.vagrant-nfs-fix/templates/vagrant-nfs-fix.j2
+++ b/provisioning/roles/drupalvm.vagrant-nfs-fix/templates/vagrant-nfs-fix.j2
@@ -2,5 +2,7 @@
 
 while true; do
   touch {{ vagrant_nfs_fix_keepalive_file }}
+  sleep 1
+  rm {{ vagrant_nfs_fix_keepalive_file }}
   sleep 30
 done
\ No newline at end of file

From 4adebf659b3f1bb3f3f09a5f0562f68c8c7ef75a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Fri, 7 May 2021 11:03:29 -0300
Subject: [PATCH 1251/1273] Add trailing newlines

---
 provisioning/roles/drupalvm.vagrant-nfs-fix/defaults/main.yml   | 2 +-
 provisioning/roles/drupalvm.vagrant-nfs-fix/tasks/main.yml      | 2 +-
 .../roles/drupalvm.vagrant-nfs-fix/templates/vagrant-nfs-fix.j2 | 2 +-
 .../drupalvm.vagrant-nfs-fix/templates/vagrant-nfs-fix.unit.j2  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/provisioning/roles/drupalvm.vagrant-nfs-fix/defaults/main.yml b/provisioning/roles/drupalvm.vagrant-nfs-fix/defaults/main.yml
index 0f893eb68..ce6bb638e 100644
--- a/provisioning/roles/drupalvm.vagrant-nfs-fix/defaults/main.yml
+++ b/provisioning/roles/drupalvm.vagrant-nfs-fix/defaults/main.yml
@@ -1,2 +1,2 @@
 ---
-vagrant_nfs_fix_keepalive_file: "/vagrant/.vagrant-nfs-fix-keepalive.tmp"
\ No newline at end of file
+vagrant_nfs_fix_keepalive_file: "/vagrant/.vagrant-nfs-fix-keepalive.tmp"
diff --git a/provisioning/roles/drupalvm.vagrant-nfs-fix/tasks/main.yml b/provisioning/roles/drupalvm.vagrant-nfs-fix/tasks/main.yml
index 9df6eb8c8..ce8981e8d 100644
--- a/provisioning/roles/drupalvm.vagrant-nfs-fix/tasks/main.yml
+++ b/provisioning/roles/drupalvm.vagrant-nfs-fix/tasks/main.yml
@@ -29,4 +29,4 @@
   service:
     name: vagrant-nfs-fix
     state: started
-    enabled: true
\ No newline at end of file
+    enabled: true
diff --git a/provisioning/roles/drupalvm.vagrant-nfs-fix/templates/vagrant-nfs-fix.j2 b/provisioning/roles/drupalvm.vagrant-nfs-fix/templates/vagrant-nfs-fix.j2
index 6d9f591e3..435b39de8 100644
--- a/provisioning/roles/drupalvm.vagrant-nfs-fix/templates/vagrant-nfs-fix.j2
+++ b/provisioning/roles/drupalvm.vagrant-nfs-fix/templates/vagrant-nfs-fix.j2
@@ -5,4 +5,4 @@ while true; do
   sleep 1
   rm {{ vagrant_nfs_fix_keepalive_file }}
   sleep 30
-done
\ No newline at end of file
+done
diff --git a/provisioning/roles/drupalvm.vagrant-nfs-fix/templates/vagrant-nfs-fix.unit.j2 b/provisioning/roles/drupalvm.vagrant-nfs-fix/templates/vagrant-nfs-fix.unit.j2
index da4c1c909..c0ece3a68 100644
--- a/provisioning/roles/drupalvm.vagrant-nfs-fix/templates/vagrant-nfs-fix.unit.j2
+++ b/provisioning/roles/drupalvm.vagrant-nfs-fix/templates/vagrant-nfs-fix.unit.j2
@@ -9,4 +9,4 @@ RestartSec=1
 ExecStart=/usr/sbin/vagrant-nfs-fix
 
 [Install]
-WantedBy=multi-user.target
\ No newline at end of file
+WantedBy=multi-user.target

From 3c625d62b45f444f1f5cba2e023fefc74638c248 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Fri, 7 May 2021 11:04:26 -0300
Subject: [PATCH 1252/1273] Remove init.d script since its no longer supported

---
 .../drupalvm.vagrant-nfs-fix/tasks/main.yml   | 12 +---
 .../templates/vagrant-nfs-fix.init.j2         | 55 -------------------
 2 files changed, 1 insertion(+), 66 deletions(-)
 delete mode 100644 provisioning/roles/drupalvm.vagrant-nfs-fix/templates/vagrant-nfs-fix.init.j2

diff --git a/provisioning/roles/drupalvm.vagrant-nfs-fix/tasks/main.yml b/provisioning/roles/drupalvm.vagrant-nfs-fix/tasks/main.yml
index ce8981e8d..4b4072d56 100644
--- a/provisioning/roles/drupalvm.vagrant-nfs-fix/tasks/main.yml
+++ b/provisioning/roles/drupalvm.vagrant-nfs-fix/tasks/main.yml
@@ -7,23 +7,13 @@
     group: root
     mode: 0755
 
-- name: Copy Vagrant NFS fix init script into place.
-  template:
-    src: vagrant-nfs-fix.init.j2
-    dest: /etc/init.d/vagrant-nfs-fix
-    owner: root
-    group: root
-    mode: 0755
-  when: ansible_service_mgr != 'systemd'
-
-- name: Copy Vagrant NFS fix systemd unit file into place (for systemd systems).
+- name: Copy Vagrant NFS fix systemd unit file into place.
   template:
     src: vagrant-nfs-fix.unit.j2
     dest: /etc/systemd/system/vagrant-nfs-fix.service
     owner: root
     group: root
     mode: 0644
-  when: ansible_service_mgr == 'systemd'
 
 - name: Configure the NFS fix service.
   service:
diff --git a/provisioning/roles/drupalvm.vagrant-nfs-fix/templates/vagrant-nfs-fix.init.j2 b/provisioning/roles/drupalvm.vagrant-nfs-fix/templates/vagrant-nfs-fix.init.j2
deleted file mode 100644
index de5001f1c..000000000
--- a/provisioning/roles/drupalvm.vagrant-nfs-fix/templates/vagrant-nfs-fix.init.j2
+++ /dev/null
@@ -1,55 +0,0 @@
-#! /bin/sh
-# /etc/init.d/vagrant-nfs-fix
-
-### BEGIN INIT INFO
-# Provides:          vagrant-nfs-fix
-# Required-Start:    $local_fs $network
-# Required-Stop:     $local_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Start vagrant-nfs-fix at boot time
-# Description:       Continuously touch a file within an NFS mount to avoid timeout problems on macOS.
-### END INIT INFO
-
-PID_FILE="/var/run/vagrant-nfs-fix.pid"
-
-# Carry out specific functions when asked to by the system
-case "$1" in
-  start)
-    echo "Starting vagrant-nfs-fix."
-    /usr/sbin/vagrant-nfs-fix &
-    echo $! > $PID_FILE
-    ;;
-  stop)
-    echo "Stopping vagrant-nfs-fix."
-    kill `cat $PID_FILE`
-    rm $PID_FILE
-    ;;
-  restart)
-    echo "Restarting firewall."
-    kill `cat $PID_FILE`
-    rm $PID_FILE
-
-    /usr/sbin/vagrant-nfs-fix &
-    echo $! > $PID_FILE
-    ;;
-  status)
-    EXIT=4 # program or service status is unknown
-    if [ -e $PID_FILE ]; then
-        if ps -p `cat $PID_FILE` > /dev/null 2>&1; then
-            EXIT=0 # program is running or service is OK
-        else
-            EXIT=3 # program is not running
-        fi
-    else
-        EXIT=3 # program is not running
-    fi
-    exit $EXIT
-    ;;
-  *)
-    echo "Usage: /etc/init.d/vagrant-nfs-fix {start|stop|status|restart}"
-    exit 1
-    ;;
-esac
-
-exit 0

From fda7c96a535a451dd0771995de2a222b3524c6c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Fri, 7 May 2021 21:31:14 -0300
Subject: [PATCH 1253/1273] Default nfs fix to false and add a note in the docs

---
 default.config.yml                         | 2 +-
 docs/getting-started/installation-macos.md | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/default.config.yml b/default.config.yml
index 582d94c32..4fd08b2f8 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -44,7 +44,7 @@ vagrant_plugins:
 
 # Automatically fix timeout issues with NFS on macOS. See
 # https://github.com/geerlingguy/drupal-vm/issues/2154
-vagrant_nfs_fix_enabled: "{{ vagrant_synced_folder_default_type == 'nfs' }}"
+vagrant_nfs_fix_enabled: false
 
 ansible_python_interpreter: python3
 
diff --git a/docs/getting-started/installation-macos.md b/docs/getting-started/installation-macos.md
index 66f103ce9..85d3787d2 100644
--- a/docs/getting-started/installation-macos.md
+++ b/docs/getting-started/installation-macos.md
@@ -3,3 +3,7 @@ Please read through the [Quick Start Guide](https://github.com/geerlingguy/drupa
 <iframe width="560" height="315" src="https://www.youtube.com/embed/PR9uh_GGZhI" frameborder="0" allowfullscreen></iframe>
 
 _In this quick overview, Jeff Geerling will show you where you can learn more about Drupal VM, then show you a simple Drupal VM setup._
+
+## NFS Timeout on Big Sur
+
+If you are using NFS shares on macOS Big Sur, and you have problems with the NFS mount going away, please set `vagrant_nfs_fix_enabled: true` in your `config.yml`.

From df60dd154ea78b984086ce537a30bf5648ffde9a Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 21 May 2021 11:10:11 -0500
Subject: [PATCH 1254/1273] Update PHP role to latest version.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.php/.ansible-lint       |  8 +-
 .../geerlingguy.php/.github/workflows/ci.yml  | 80 +++++++++++++++++++
 .../.github/workflows/release.yml             | 38 +++++++++
 provisioning/roles/geerlingguy.php/.gitignore |  2 +
 .../roles/geerlingguy.php/.travis.yml         | 38 ---------
 provisioning/roles/geerlingguy.php/README.md  | 24 ++++--
 .../roles/geerlingguy.php/defaults/main.yml   | 14 ++++
 .../roles/geerlingguy.php/meta/main.yml       |  1 -
 .../molecule/default/molecule.yml             |  4 -
 ...playbook-source.yml => source-install.yml} |  0
 .../geerlingguy.php/tasks/configure-fpm.yml   | 35 ++------
 .../geerlingguy.php/templates/www.conf.j2     | 20 ++---
 13 files changed, 171 insertions(+), 95 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.php/.github/workflows/ci.yml
 create mode 100644 provisioning/roles/geerlingguy.php/.github/workflows/release.yml
 delete mode 100644 provisioning/roles/geerlingguy.php/.travis.yml
 rename provisioning/roles/geerlingguy.php/molecule/default/{playbook-source.yml => source-install.yml} (100%)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 2ebbf794f..f91282796 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -43,7 +43,7 @@ roles:
   - name: geerlingguy.nodejs
     version: 5.1.1
   - name: geerlingguy.php
-    version: 4.5.1
+    version: 4.6.1
   - name: geerlingguy.php-memcached
     version: 2.0.2
   - name: geerlingguy.php-mysql
diff --git a/provisioning/roles/geerlingguy.php/.ansible-lint b/provisioning/roles/geerlingguy.php/.ansible-lint
index 9034f22ad..8d58b475f 100644
--- a/provisioning/roles/geerlingguy.php/.ansible-lint
+++ b/provisioning/roles/geerlingguy.php/.ansible-lint
@@ -1,5 +1,5 @@
 skip_list:
-  - '306'
-  - '405'
-  - '503'
-  - '106'
+  - 'yaml'
+  - 'risky-shell-pipe'
+  - 'no-handler'
+  - 'role-name'
diff --git a/provisioning/roles/geerlingguy.php/.github/workflows/ci.yml b/provisioning/roles/geerlingguy.php/.github/workflows/ci.yml
new file mode 100644
index 000000000..a452cebd3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/.github/workflows/ci.yml
@@ -0,0 +1,80 @@
+---
+name: CI
+'on':
+  pull_request:
+  push:
+    branches:
+      - master
+  schedule:
+    - cron: "0 4 * * 4"
+
+defaults:
+  run:
+    working-directory: 'geerlingguy.php'
+
+jobs:
+
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.php'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies.
+        run: pip3 install yamllint
+
+      - name: Lint code.
+        run: |
+          yamllint .
+
+  molecule:
+    name: Molecule
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - distro: centos8
+            playbook: converge.yml
+          - distro: centos7
+            playbook: converge.yml
+          - distro: ubuntu2004
+            playbook: converge.yml
+          - distro: ubuntu1804
+            playbook: converge.yml
+          - distro: debian10
+            playbook: converge.yml
+          - distro: debian9
+            playbook: converge.yml
+
+          - distro: centos7
+            playbook: source-install.yml
+
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.php'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies.
+        run: pip3 install ansible molecule[docker] docker
+
+      - name: Run Molecule tests.
+        run: molecule test
+        env:
+          PY_COLORS: '1'
+          ANSIBLE_FORCE_COLOR: '1'
+          MOLECULE_DISTRO: ${{ matrix.distro }}
+          MOLECULE_PLAYBOOK: ${{ matrix.playbook }}
diff --git a/provisioning/roles/geerlingguy.php/.github/workflows/release.yml b/provisioning/roles/geerlingguy.php/.github/workflows/release.yml
new file mode 100644
index 000000000..8335b8b72
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/.github/workflows/release.yml
@@ -0,0 +1,38 @@
+---
+# This workflow requires a GALAXY_API_KEY secret present in the GitHub
+# repository or organization.
+#
+# See: https://github.com/marketplace/actions/publish-ansible-role-to-galaxy
+# See: https://github.com/ansible/galaxy/issues/46
+
+name: Release
+'on':
+  push:
+    tags:
+      - '*'
+
+defaults:
+  run:
+    working-directory: 'geerlingguy.php'
+
+jobs:
+
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.php'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install Ansible.
+        run: pip3 install ansible-base
+
+      - name: Trigger a new import on Galaxy.
+        run: ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }} $(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} | cut -d/ -f2)
diff --git a/provisioning/roles/geerlingguy.php/.gitignore b/provisioning/roles/geerlingguy.php/.gitignore
index f56f5b578..8840c8f02 100644
--- a/provisioning/roles/geerlingguy.php/.gitignore
+++ b/provisioning/roles/geerlingguy.php/.gitignore
@@ -1,3 +1,5 @@
 *.retry
 */__pycache__
 *.pyc
+.cache
+
diff --git a/provisioning/roles/geerlingguy.php/.travis.yml b/provisioning/roles/geerlingguy.php/.travis.yml
deleted file mode 100644
index f13e273de..000000000
--- a/provisioning/roles/geerlingguy.php/.travis.yml
+++ /dev/null
@@ -1,38 +0,0 @@
----
-language: python
-services: docker
-
-env:
-  global:
-    - ROLE_NAME: php
-  matrix:
-    - MOLECULE_DISTRO: centos8
-    - MOLECULE_DISTRO: centos7
-    - MOLECULE_DISTRO: ubuntu2004
-    - MOLECULE_DISTRO: ubuntu1804
-    - MOLECULE_DISTRO: debian10
-    - MOLECULE_DISTRO: debian9
-
-    - MOLECULE_DISTRO: centos7
-      MOLECULE_PLAYBOOK: playbook-source.yml
-
-before_install:
-  # Upgrade Docker to work with docker-py.
-  - curl https://gist.githubusercontent.com/geerlingguy/ce883ad4aec6a5f1187ef93bd338511e/raw/36612d28981d92863f839c5aefe5b7dd7193d6c6/travis-ci-docker-upgrade.sh | sudo bash
-
-install:
-  # Install test dependencies.
-  - pip install molecule[docker] yamllint ansible-lint docker
-
-before_script:
-  # Use actual Ansible Galaxy role name for the project directory.
-  - cd ../
-  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
-  - cd geerlingguy.$ROLE_NAME
-
-script:
-  # Run tests.
-  - molecule test
-
-notifications:
-  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.php/README.md b/provisioning/roles/geerlingguy.php/README.md
index c56dea719..7e7707efb 100644
--- a/provisioning/roles/geerlingguy.php/README.md
+++ b/provisioning/roles/geerlingguy.php/README.md
@@ -1,6 +1,6 @@
 # Ansible Role: PHP
 
-[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-php.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-php)
+[![CI](https://github.com/geerlingguy/ansible-role-php/workflows/CI/badge.svg?event=push)](https://github.com/geerlingguy/ansible-role-php/actions?query=workflow%3ACI)
 
 Installs PHP on RedHat/CentOS and Debian/Ubuntu servers.
 
@@ -71,14 +71,22 @@ Control over the fpm daemon's state; set these to `stopped` and `false` if you w
 
 The handler restarts PHP-FPM by default. Setting the value to `reloaded` will reload the service, intead of restarting it.
 
-    php_fpm_listen: "127.0.0.1:9000"
-    php_fpm_listen_allowed_clients: "127.0.0.1"
-    php_fpm_pm_max_children: 50
-    php_fpm_pm_start_servers: 5
-    php_fpm_pm_min_spare_servers: 5
-    php_fpm_pm_max_spare_servers: 5
 
-Specific settings inside the default `www.conf` PHP-FPM pool. If you'd like to manage additional settings, you can do so either by replacing the file with your own template or using `lineinfile` like this role does inside `tasks/configure-fpm.yml`.
+    php_fpm_pools:
+      - pool_name: www
+        pool_template: www.conf.j2
+        pool_listen: "127.0.0.1:9000"
+        pool_listen_allowed_clients: "127.0.0.1"
+        pool_pm: dynamic
+        pool_pm_max_children: 5
+        pool_pm_start_servers: 2
+        pool_pm_min_spare_servers: 1
+        pool_pm_max_spare_servers: 3
+        pool_pm_max_requests: 500
+
+List of PHP-FPM pool to create. By default, www pool is created. To setup a new pool, add an item to php_fpm_pools list.
+
+Specific settings inside the default `www.conf.j2` PHP-FPM pool. If you'd like to manage additional settings, you can do so either by replacing the file with your own template using `pool_template`.
 
 ### php.ini settings
 
diff --git a/provisioning/roles/geerlingguy.php/defaults/main.yml b/provisioning/roles/geerlingguy.php/defaults/main.yml
index e716d5909..92550eba9 100644
--- a/provisioning/roles/geerlingguy.php/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.php/defaults/main.yml
@@ -30,6 +30,20 @@ php_fpm_pm_max_children: 50
 php_fpm_pm_start_servers: 5
 php_fpm_pm_min_spare_servers: 5
 php_fpm_pm_max_spare_servers: 5
+php_fpm_pm_max_requests: 0
+
+# PHP-FPM pool configuration.
+php_fpm_pools:
+  - pool_name: www
+    pool_template: www.conf.j2
+    pool_listen: "{{ php_fpm_listen }}"
+    pool_listen_allowed_clients: "{{ php_fpm_listen_allowed_clients }}"
+    pool_pm: dynamic
+    pool_pm_max_children: "{{ php_fpm_pm_max_children }}"
+    pool_pm_start_servers: "{{ php_fpm_pm_start_servers }}"
+    pool_pm_min_spare_servers: "{{ php_fpm_pm_min_spare_servers }}"
+    pool_pm_max_spare_servers: "{{ php_fpm_pm_max_spare_servers }}"
+    pool_php_fpm_pm_max_requests: "{{ php_fpm_pm_max_requests }}"
 
 # The executable to run when calling PHP from the command line.
 php_executable: "php"
diff --git a/provisioning/roles/geerlingguy.php/meta/main.yml b/provisioning/roles/geerlingguy.php/meta/main.yml
index 821b9732c..e3ade6fb4 100644
--- a/provisioning/roles/geerlingguy.php/meta/main.yml
+++ b/provisioning/roles/geerlingguy.php/meta/main.yml
@@ -11,7 +11,6 @@ galaxy_info:
   platforms:
     - name: EL
       versions:
-        - 6
         - 7
         - 8
     - name: Fedora
diff --git a/provisioning/roles/geerlingguy.php/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.php/molecule/default/molecule.yml
index 2da47dd1f..74907107f 100644
--- a/provisioning/roles/geerlingguy.php/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.php/molecule/default/molecule.yml
@@ -3,10 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint: |
-  set -e
-  yamllint .
-  ansible-lint
 platforms:
   - name: instance
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
diff --git a/provisioning/roles/geerlingguy.php/molecule/default/playbook-source.yml b/provisioning/roles/geerlingguy.php/molecule/default/source-install.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.php/molecule/default/playbook-source.yml
rename to provisioning/roles/geerlingguy.php/molecule/default/source-install.yml
diff --git a/provisioning/roles/geerlingguy.php/tasks/configure-fpm.yml b/provisioning/roles/geerlingguy.php/tasks/configure-fpm.yml
index dfebf0be1..28135208f 100644
--- a/provisioning/roles/geerlingguy.php/tasks/configure-fpm.yml
+++ b/provisioning/roles/geerlingguy.php/tasks/configure-fpm.yml
@@ -33,40 +33,15 @@
     mode: 0755
   when: php_fpm_pool_conf_path_dir_stat.stat.islnk is not defined
 
-- name: Ensure the default pool exists.
+- name: Create fpm pools.
   template:
-    src: www.conf.j2
-    dest: "{{ php_fpm_pool_conf_path }}"
+    src: "{{ item.pool_template | default('www.conf.j2', true) }}"
+    dest: "{{ php_fpm_pool_conf_path | dirname }}/{{ item.pool_name }}.conf"
     owner: root
     group: root
     mode: 0644
-    force: false
-  when: php_enable_php_fpm
-
-- name: Configure php-fpm pool (if enabled).
-  lineinfile:
-    dest: "{{ php_fpm_pool_conf_path }}"
-    regexp: "{{ item.regexp }}"
-    line: "{{ item.line }}"
-    state: present
-    mode: 0644
-  with_items:
-    - regexp: "^user.?=.+$"
-      line: "user = {{ php_fpm_pool_user }}"
-    - regexp: "^group.?=.+$"
-      line: "group = {{ php_fpm_pool_group }}"
-    - regexp: "^listen.?=.+$"
-      line: "listen = {{ php_fpm_listen }}"
-    - regexp: '^listen\.allowed_clients.?=.+$'
-      line: "listen.allowed_clients = {{ php_fpm_listen_allowed_clients }}"
-    - regexp: '^pm\.max_children.?=.+$'
-      line: "pm.max_children = {{ php_fpm_pm_max_children }}"
-    - regexp: '^pm\.start_servers.?=.+$'
-      line: "pm.start_servers = {{ php_fpm_pm_start_servers }}"
-    - regexp: '^pm\.min_spare_servers.?=.+$'
-      line: "pm.min_spare_servers = {{ php_fpm_pm_min_spare_servers }}"
-    - regexp: '^pm\.max_spare_servers.?=.+$'
-      line: "pm.max_spare_servers = {{ php_fpm_pm_max_spare_servers }}"
+    force: true
+  loop: "{{ php_fpm_pools | default([], true) }}"
   when: php_enable_php_fpm
   notify: restart php-fpm
 
diff --git a/provisioning/roles/geerlingguy.php/templates/www.conf.j2 b/provisioning/roles/geerlingguy.php/templates/www.conf.j2
index da0921c3c..b206cce6f 100644
--- a/provisioning/roles/geerlingguy.php/templates/www.conf.j2
+++ b/provisioning/roles/geerlingguy.php/templates/www.conf.j2
@@ -1,15 +1,17 @@
-[www]
-listen = 127.0.0.1:9000
-listen.allowed_clients = 127.0.0.1
+; {{ ansible_managed }}
+
+[{{ item.pool_name | mandatory }}]
+listen = {{ item.pool_listen | mandatory }}
+listen.allowed_clients = {{ item.pool_listen_allowed_clients | default('127.0.0.1', true) }}
 user = {{ php_fpm_pool_user }}
 group = {{ php_fpm_pool_group }}
 
 listen.owner = {{ php_fpm_pool_user }}
 listen.group = {{ php_fpm_pool_group }}
 
-pm = dynamic
-pm.max_children = 50
-pm.start_servers = 5
-pm.min_spare_servers = 5
-pm.max_spare_servers = 5
-pm.max_requests = 500
+pm = {{ item.pool_pm | default('dynamic', true) }}
+pm.max_children = {{ item.pool_pm_max_children | default(50, true) }}
+pm.start_servers = {{ item.pool_pm_start_servers | default(5, true) }}
+pm.min_spare_servers = {{ item.pool_pm_min_spare_servers | default(5, true) }}
+pm.max_spare_servers = {{ item.pool_pm_max_spare_servers | default(5, true) }}
+pm.max_requests = {{ item.pool_pm_max_requests | default(500, true) }}

From 6312f18d78594cae81edba4c784c6ffe6696aa1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <public@oxy.fi>
Date: Wed, 26 May 2021 21:11:06 -0300
Subject: [PATCH 1255/1273] Issue #2166: Fix new ansible version output doesnt
 match regex

---
 lib/drupalvm/vagrant.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/drupalvm/vagrant.rb b/lib/drupalvm/vagrant.rb
index 96b8fa9a6..003648755 100644
--- a/lib/drupalvm/vagrant.rb
+++ b/lib/drupalvm/vagrant.rb
@@ -54,7 +54,7 @@ def ansible_bin
 
 # Return the ansible version parsed from running the executable path provided.
 def ansible_version
-  /^[^\s]+ ([^\s]+)/.match(`#{ansible_bin} --version`) { |match| return match[1] }
+  /(#{Gem::Version::VERSION_PATTERN})/.match(`#{ansible_bin} --version`) { |match| return match[1] }
 end
 
 # Require that if installed, the ansible version meets the requirements.

From 01545c37d96d4973b57ec6e842e54c40d0988207 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 28 May 2021 15:26:07 -0500
Subject: [PATCH 1256/1273] Issue #2163: Update CHANGELOG for latest 6.0.4
 changes.

---
 CHANGELOG.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cfb889b30..bfeb1ee9e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,25 @@
 # Drupal VM Changelog
 
+## 6.0.4 (2021-05-28)
+
+### Breaking Changes
+
+N/A
+
+### New/changed variables in default.config.yml
+
+  * Added variable `vagrant_nfs_fix_enabled: false` - See #2154. If you are having trouble with NFS going away on macOS Big Sur, override this variable and set it to `true` to overcome a Vagrant bug in the latest version of macOS.
+
+### Improvements
+
+  * Upgraded php-versions, solr, memcached, nginx, and mysql roles to latest versions.
+
+### Bugfixes
+
+  * #2154: Add new `vagrant-nfs-fix` role to solve NFS issues on macOS Big Sur.
+  * #2166: Fix ansible version output regex matching for new core/community version output.
+
+
 ## 6.0.3 (2021-02-13)
 
 ### Breaking Changes

From 4e6b0bbb61d328bc31fcad38e0d80fea0765655d Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 8 Jun 2021 09:37:36 -0500
Subject: [PATCH 1257/1273] Update adminer role to latest version - allows
 custom download URL.

---
 provisioning/requirements.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index f91282796..e51145fe5 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -7,7 +7,7 @@ roles:
   - name: weareinteractive.newrelic
     version: 1.8.0
   - name: geerlingguy.adminer
-    version: 1.3.0
+    version: 1.3.1
   - name: geerlingguy.apache
     version: 3.1.0
   - name: geerlingguy.apache-php-fpm

From 8fef7b02ed9342dc02dc841c68762c2eb37a715d Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 8 Jun 2021 09:37:55 -0500
Subject: [PATCH 1258/1273] Update adminer role to latest version - allows
 custom download URL.

---
 .../roles/geerlingguy.adminer/.gitignore      |  2 ++
 .../roles/geerlingguy.adminer/.travis.yml     | 32 -------------------
 .../roles/geerlingguy.adminer/.yamllint       |  5 +++
 .../roles/geerlingguy.adminer/README.md       |  6 +++-
 .../geerlingguy.adminer/defaults/main.yml     |  1 +
 .../molecule/default/molecule.yml             |  4 ---
 .../molecule/default/playbook-standalone.yml  | 17 ----------
 .../roles/geerlingguy.adminer/tasks/main.yml  |  9 ++++--
 8 files changed, 20 insertions(+), 56 deletions(-)
 delete mode 100644 provisioning/roles/geerlingguy.adminer/.travis.yml
 delete mode 100644 provisioning/roles/geerlingguy.adminer/molecule/default/playbook-standalone.yml

diff --git a/provisioning/roles/geerlingguy.adminer/.gitignore b/provisioning/roles/geerlingguy.adminer/.gitignore
index f56f5b578..8840c8f02 100644
--- a/provisioning/roles/geerlingguy.adminer/.gitignore
+++ b/provisioning/roles/geerlingguy.adminer/.gitignore
@@ -1,3 +1,5 @@
 *.retry
 */__pycache__
 *.pyc
+.cache
+
diff --git a/provisioning/roles/geerlingguy.adminer/.travis.yml b/provisioning/roles/geerlingguy.adminer/.travis.yml
deleted file mode 100644
index 82b9aa658..000000000
--- a/provisioning/roles/geerlingguy.adminer/.travis.yml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-language: python
-services: docker
-
-env:
-  global:
-    - ROLE_NAME: adminer
-  matrix:
-    - MOLECULE_DISTRO: centos7
-    - MOLECULE_DISTRO: centos6
-    - MOLECULE_DISTRO: ubuntu1804
-    - MOLECULE_DISTRO: ubuntu1604
-    - MOLECULE_DISTRO: debian9
-    - MOLECULE_DISTRO: ubuntu1804
-      MOLECULE_PLAYBOOK: playbook-standalone.yml
-
-install:
-  # Install test dependencies.
-  - pip install molecule yamllint ansible-lint docker
-
-before_script:
-  # Use actual Ansible Galaxy role name for the project directory.
-  - cd ../
-  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
-  - cd geerlingguy.$ROLE_NAME
-
-script:
-  # Run tests.
-  - molecule test
-
-notifications:
-  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.adminer/.yamllint b/provisioning/roles/geerlingguy.adminer/.yamllint
index a3dbc38ee..f2033dd21 100644
--- a/provisioning/roles/geerlingguy.adminer/.yamllint
+++ b/provisioning/roles/geerlingguy.adminer/.yamllint
@@ -1,6 +1,11 @@
 ---
 extends: default
+
 rules:
   line-length:
     max: 120
     level: warning
+
+ignore: |
+  .github/stale.yml
+  .travis.yml
diff --git a/provisioning/roles/geerlingguy.adminer/README.md b/provisioning/roles/geerlingguy.adminer/README.md
index 6670fde8d..dfc1d5335 100644
--- a/provisioning/roles/geerlingguy.adminer/README.md
+++ b/provisioning/roles/geerlingguy.adminer/README.md
@@ -1,6 +1,6 @@
 # Ansible Role: Adminer
 
-[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-adminer.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-adminer)
+[![CI](https://github.com/geerlingguy/ansible-role-adminer/workflows/CI/badge.svg?event=push)](https://github.com/geerlingguy/ansible-role-adminer/actions?query=workflow%3ACI)
 
 An Ansible Role that installs [Adminer](http://www.adminer.org/) on almost any computer.
 
@@ -12,6 +12,10 @@ You need to have PHP and MySQL for Adminer to do anything useful. If you have Ap
 
 Available variables are listed below, along with default values (see `defaults/main.yml`):
 
+    adminer_download_url: https://www.adminer.org/latest.php
+
+The URL from which Adminer should be downloaded.
+
     adminer_install_dir: /opt/adminer
 
 The directory in which Adminer will be downloaded/installed.
diff --git a/provisioning/roles/geerlingguy.adminer/defaults/main.yml b/provisioning/roles/geerlingguy.adminer/defaults/main.yml
index 2a0f61580..c93ec8231 100644
--- a/provisioning/roles/geerlingguy.adminer/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.adminer/defaults/main.yml
@@ -1,4 +1,5 @@
 ---
+adminer_download_url: https://www.adminer.org/latest.php
 adminer_install_dir: /opt/adminer
 adminer_install_filename: adminer.php
 adminer_symlink_dirs: []
diff --git a/provisioning/roles/geerlingguy.adminer/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.adminer/molecule/default/molecule.yml
index 2da47dd1f..74907107f 100644
--- a/provisioning/roles/geerlingguy.adminer/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.adminer/molecule/default/molecule.yml
@@ -3,10 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint: |
-  set -e
-  yamllint .
-  ansible-lint
 platforms:
   - name: instance
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
diff --git a/provisioning/roles/geerlingguy.adminer/molecule/default/playbook-standalone.yml b/provisioning/roles/geerlingguy.adminer/molecule/default/playbook-standalone.yml
deleted file mode 100644
index aaaa0c65d..000000000
--- a/provisioning/roles/geerlingguy.adminer/molecule/default/playbook-standalone.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-- name: Converge
-  hosts: all
-  become: true
-
-  vars:
-    adminer_install_dir: /opt/adminer
-    adminer_add_apache_config: false
-
-  pre_tasks:
-    - name: Update apt cache.
-      apt: update_cache=yes cache_valid_time=600
-      when: ansible_os_family == 'Debian'
-      changed_when: false
-
-  roles:
-    - role: geerlingguy.adminer
diff --git a/provisioning/roles/geerlingguy.adminer/tasks/main.yml b/provisioning/roles/geerlingguy.adminer/tasks/main.yml
index 2c14fd8f8..b3853951c 100644
--- a/provisioning/roles/geerlingguy.adminer/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.adminer/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 # Install Adminer.
 - name: Ensure Adminer directory exists.
-  file:
+  file:  # noqa 208
     path: "{{ adminer_install_dir }}"
     state: directory
     recurse: true
@@ -15,7 +15,7 @@
 
 - name: Download Adminer to configured directory.
   get_url:
-    url: https://www.adminer.org/latest.php
+    url: "{{ adminer_download_url }}"
     dest: "{{ adminer_install_dir }}/{{ adminer_install_filename }}"
     force: "{{ (adminer_is_old.matched == 1) | ternary('yes','no') }}"
     mode: 0644
@@ -25,6 +25,7 @@
   file:
     state: directory
     path: "{{ item }}"
+    mode: 0755
   with_items:
     - "{{ adminer_symlink_dirs }}"
 
@@ -33,6 +34,7 @@
     src: "{{ adminer_install_dir }}/adminer.php"
     dest: "{{ item }}/adminer.php"
     state: link
+    mode: 0644
   with_items: "{{ adminer_symlink_dirs }}"
 
 # Install Adminer theme.
@@ -50,6 +52,7 @@
     src: "{{ adminer_install_dir }}/adminer.css"
     dest: "{{ item }}/adminer.css"
     state: link
+    mode: 0644
   with_items: "{{ adminer_symlink_dirs }}"
   when: adminer_theme is defined and adminer_theme != null
 
@@ -64,6 +67,7 @@
   template:
     src: adminer.conf.j2
     dest: "{{ apache_conf_path }}/{{ apache_extra_conf_dir }}/adminer.conf"
+    mode: 0644
   when: adminer_add_apache_config and ansible_os_family == 'Debian'
   notify: restart apache
 
@@ -71,5 +75,6 @@
   template:
     src: adminer.conf.j2
     dest: "{{ apache_conf_path }}/adminer.conf"
+    mode: 0644
   when: adminer_add_apache_config and ansible_os_family == 'RedHat'
   notify: restart apache

From fff10c006fbc3885410953ae5c8605ad9af51733 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 8 Jun 2021 09:37:59 -0500
Subject: [PATCH 1259/1273] Update adminer role to latest version - allows
 custom download URL.

---
 .../roles/geerlingguy.adminer/.ansible-lint   |  3 +
 .../.github/workflows/ci.yml                  | 73 +++++++++++++++++++
 .../.github/workflows/release.yml             | 38 ++++++++++
 .../molecule/default/standalone.yml           | 17 +++++
 4 files changed, 131 insertions(+)
 create mode 100644 provisioning/roles/geerlingguy.adminer/.ansible-lint
 create mode 100644 provisioning/roles/geerlingguy.adminer/.github/workflows/ci.yml
 create mode 100644 provisioning/roles/geerlingguy.adminer/.github/workflows/release.yml
 create mode 100644 provisioning/roles/geerlingguy.adminer/molecule/default/standalone.yml

diff --git a/provisioning/roles/geerlingguy.adminer/.ansible-lint b/provisioning/roles/geerlingguy.adminer/.ansible-lint
new file mode 100644
index 000000000..acc82551f
--- /dev/null
+++ b/provisioning/roles/geerlingguy.adminer/.ansible-lint
@@ -0,0 +1,3 @@
+skip_list:
+  - 'yaml'
+  - 'role-name'
diff --git a/provisioning/roles/geerlingguy.adminer/.github/workflows/ci.yml b/provisioning/roles/geerlingguy.adminer/.github/workflows/ci.yml
new file mode 100644
index 000000000..c499de068
--- /dev/null
+++ b/provisioning/roles/geerlingguy.adminer/.github/workflows/ci.yml
@@ -0,0 +1,73 @@
+---
+name: CI
+'on':
+  pull_request:
+  push:
+    branches:
+      - master
+  schedule:
+    - cron: "0 5 * * 0"
+
+defaults:
+  run:
+    working-directory: 'geerlingguy.adminer'
+
+jobs:
+
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.adminer'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies.
+        run: pip3 install yamllint
+
+      - name: Lint code.
+        run: |
+          yamllint .
+
+  molecule:
+    name: Molecule
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - distro: centos7
+            playbook: converge.yml
+          - distro: ubuntu2004
+            playbook: converge.yml
+          - distro: debian10
+            playbook: converge.yml
+          - distro: centos7
+            playbook: standalone.yml
+
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.adminer'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies.
+        run: pip3 install ansible molecule[docker] docker
+
+      - name: Run Molecule tests.
+        run: molecule test
+        env:
+          PY_COLORS: '1'
+          ANSIBLE_FORCE_COLOR: '1'
+          MOLECULE_DISTRO: ${{ matrix.distro }}
+          MOLECULE_PLAYBOOK: ${{ matrix.playbook }}
diff --git a/provisioning/roles/geerlingguy.adminer/.github/workflows/release.yml b/provisioning/roles/geerlingguy.adminer/.github/workflows/release.yml
new file mode 100644
index 000000000..66901cb0f
--- /dev/null
+++ b/provisioning/roles/geerlingguy.adminer/.github/workflows/release.yml
@@ -0,0 +1,38 @@
+---
+# This workflow requires a GALAXY_API_KEY secret present in the GitHub
+# repository or organization.
+#
+# See: https://github.com/marketplace/actions/publish-ansible-role-to-galaxy
+# See: https://github.com/ansible/galaxy/issues/46
+
+name: Release
+'on':
+  push:
+    tags:
+      - '*'
+
+defaults:
+  run:
+    working-directory: 'geerlingguy.adminer'
+
+jobs:
+
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.adminer'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install Ansible.
+        run: pip3 install ansible-base
+
+      - name: Trigger a new import on Galaxy.
+        run: ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }} $(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} | cut -d/ -f2)
diff --git a/provisioning/roles/geerlingguy.adminer/molecule/default/standalone.yml b/provisioning/roles/geerlingguy.adminer/molecule/default/standalone.yml
new file mode 100644
index 000000000..aaaa0c65d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.adminer/molecule/default/standalone.yml
@@ -0,0 +1,17 @@
+---
+- name: Converge
+  hosts: all
+  become: true
+
+  vars:
+    adminer_install_dir: /opt/adminer
+    adminer_add_apache_config: false
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=yes cache_valid_time=600
+      when: ansible_os_family == 'Debian'
+      changed_when: false
+
+  roles:
+    - role: geerlingguy.adminer

From f3956e8fc9588b626602d34f3547627ab8c94f51 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 30 Jun 2021 10:43:40 -0500
Subject: [PATCH 1260/1273] Update postgresql role to latest version.

---
 provisioning/requirements.yml                         |  2 +-
 .../roles/geerlingguy.postgresql/.ansible-lint        |  6 +++---
 .../geerlingguy.postgresql/.github/workflows/ci.yml   |  3 +--
 provisioning/roles/geerlingguy.postgresql/.gitignore  |  2 ++
 .../roles/geerlingguy.postgresql/defaults/main.yml    |  7 +++++--
 .../roles/geerlingguy.postgresql/meta/main.yml        |  3 +--
 .../molecule/default/converge.yml                     | 10 ----------
 .../roles/geerlingguy.postgresql/tasks/users.yml      |  8 ++++++++
 .../geerlingguy.postgresql/tasks/users_props.yml      |  2 ++
 .../roles/geerlingguy.postgresql/vars/RedHat-6.yml    | 11 -----------
 10 files changed, 23 insertions(+), 31 deletions(-)
 delete mode 100644 provisioning/roles/geerlingguy.postgresql/vars/RedHat-6.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index e51145fe5..3f0f96358 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -67,7 +67,7 @@ roles:
   - name: geerlingguy.postfix
     version: 2.0.0
   - name: geerlingguy.postgresql
-    version: 3.0.0
+    version: 3.1.1
   - name: geerlingguy.redis
     version: 1.7.0
   - name: geerlingguy.repo-epel
diff --git a/provisioning/roles/geerlingguy.postgresql/.ansible-lint b/provisioning/roles/geerlingguy.postgresql/.ansible-lint
index 0c235a756..4b5e4fde5 100644
--- a/provisioning/roles/geerlingguy.postgresql/.ansible-lint
+++ b/provisioning/roles/geerlingguy.postgresql/.ansible-lint
@@ -1,4 +1,4 @@
 skip_list:
-  - '405'
-  - '503'
-  - '106'
+  - 'yaml'
+  - 'no-handler'
+  - 'role-name'
diff --git a/provisioning/roles/geerlingguy.postgresql/.github/workflows/ci.yml b/provisioning/roles/geerlingguy.postgresql/.github/workflows/ci.yml
index 7a82e4edb..254f61f9c 100644
--- a/provisioning/roles/geerlingguy.postgresql/.github/workflows/ci.yml
+++ b/provisioning/roles/geerlingguy.postgresql/.github/workflows/ci.yml
@@ -29,12 +29,11 @@ jobs:
           python-version: '3.x'
 
       - name: Install test dependencies.
-        run: pip3 install yamllint ansible-lint
+        run: pip3 install yamllint
 
       - name: Lint code.
         run: |
           yamllint .
-          ansible-lint
 
   molecule:
     name: Molecule
diff --git a/provisioning/roles/geerlingguy.postgresql/.gitignore b/provisioning/roles/geerlingguy.postgresql/.gitignore
index f56f5b578..8840c8f02 100644
--- a/provisioning/roles/geerlingguy.postgresql/.gitignore
+++ b/provisioning/roles/geerlingguy.postgresql/.gitignore
@@ -1,3 +1,5 @@
 *.retry
 */__pycache__
 *.pyc
+.cache
+
diff --git a/provisioning/roles/geerlingguy.postgresql/defaults/main.yml b/provisioning/roles/geerlingguy.postgresql/defaults/main.yml
index 0e2d50367..4e1677969 100644
--- a/provisioning/roles/geerlingguy.postgresql/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.postgresql/defaults/main.yml
@@ -10,6 +10,9 @@ postgresql_python_library: python-psycopg2
 postgresql_user: postgres
 postgresql_group: postgres
 
+# `md5` or `scram-sha-256` (https://www.postgresql.org/docs/10/auth-methods.html)
+postgresql_auth_method: "{{ ansible_fips  | ternary('scram-sha-256', 'md5') }}"
+
 postgresql_unix_socket_directories:
   - /var/run/postgresql
 
@@ -26,8 +29,8 @@ postgresql_global_config_options:
 postgresql_hba_entries:
   - {type: local, database: all, user: postgres, auth_method: peer}
   - {type: local, database: all, user: all, auth_method: peer}
-  - {type: host, database: all, user: all, address: '127.0.0.1/32', auth_method: md5}
-  - {type: host, database: all, user: all, address: '::1/128', auth_method: md5}
+  - {type: host, database: all, user: all, address: '127.0.0.1/32', auth_method: "{{ postgresql_auth_method }}"}
+  - {type: host, database: all, user: all, address: '::1/128', auth_method: "{{ postgresql_auth_method }}"}
 
 # Debian only. Used to generate the locales used by PostgreSQL databases.
 postgresql_locales:
diff --git a/provisioning/roles/geerlingguy.postgresql/meta/main.yml b/provisioning/roles/geerlingguy.postgresql/meta/main.yml
index 86577229b..411689b51 100644
--- a/provisioning/roles/geerlingguy.postgresql/meta/main.yml
+++ b/provisioning/roles/geerlingguy.postgresql/meta/main.yml
@@ -11,15 +11,14 @@ galaxy_info:
   platforms:
     - name: EL
       versions:
-        - 6
         - 7
         - 8
     - name: Fedora
       versions:
-        - 29
         - 30
         - 31
         - 32
+        - 33
     - name: Ubuntu
       versions:
         - xenial
diff --git a/provisioning/roles/geerlingguy.postgresql/molecule/default/converge.yml b/provisioning/roles/geerlingguy.postgresql/molecule/default/converge.yml
index bac2eb95f..8def2ca8b 100644
--- a/provisioning/roles/geerlingguy.postgresql/molecule/default/converge.yml
+++ b/provisioning/roles/geerlingguy.postgresql/molecule/default/converge.yml
@@ -26,16 +26,6 @@
       changed_when: false
       when: ansible_os_family == 'Debian'
 
-    - name: Set custom variables for old CentOS 6 PostgreSQL install.
-      set_fact:
-        postgresql_hba_entries: []
-        postgresql_global_config_options:
-          - option: unix_socket_directory
-            value: '{{ postgresql_unix_socket_directories[0] }}'
-      when:
-        - ansible_os_family == 'RedHat'
-        - ansible_distribution_version.split('.')[0] == '6'
-
   roles:
     - role: geerlingguy.postgresql
 
diff --git a/provisioning/roles/geerlingguy.postgresql/tasks/users.yml b/provisioning/roles/geerlingguy.postgresql/tasks/users.yml
index 4bc84bfc1..6cbae0150 100644
--- a/provisioning/roles/geerlingguy.postgresql/tasks/users.yml
+++ b/provisioning/roles/geerlingguy.postgresql/tasks/users.yml
@@ -2,6 +2,12 @@
 - name: Ensure PostgreSQL users are present.
   postgresql_user:
     name: "{{ item.name }}"
+    password: "{{ item.password | default(omit) }}"
+    login_host: "{{ item.login_host | default('localhost') }}"
+    login_password: "{{ item.login_password | default(omit) }}"
+    login_user: "{{ item.login_user | default(postgresql_user) }}"
+    login_unix_socket: "{{ item.login_unix_socket | default(postgresql_unix_socket_directories[0]) }}"
+    port: "{{ item.port | default(omit) }}"
   with_items: "{{ postgresql_users }}"
   no_log: "{{ postgres_users_no_log }}"
   become: true
@@ -9,3 +15,5 @@
   # See: https://github.com/ansible/ansible/issues/16048#issuecomment-229012509
   vars:
     ansible_ssh_pipelining: true
+  environment:
+    PGOPTIONS: "{{ (postgresql_auth_method == 'scram-sha-256') | ternary('-c password_encryption=scram-sha-256', '') }}"
diff --git a/provisioning/roles/geerlingguy.postgresql/tasks/users_props.yml b/provisioning/roles/geerlingguy.postgresql/tasks/users_props.yml
index fa210eac5..992ccf5c9 100644
--- a/provisioning/roles/geerlingguy.postgresql/tasks/users_props.yml
+++ b/provisioning/roles/geerlingguy.postgresql/tasks/users_props.yml
@@ -20,3 +20,5 @@
   # See: https://github.com/ansible/ansible/issues/16048#issuecomment-229012509
   vars:
     ansible_ssh_pipelining: true
+  environment:
+    PGOPTIONS: "{{ (postgresql_auth_method == 'scram-sha-256') | ternary('-c password_encryption=scram-sha-256', '') }}"
diff --git a/provisioning/roles/geerlingguy.postgresql/vars/RedHat-6.yml b/provisioning/roles/geerlingguy.postgresql/vars/RedHat-6.yml
deleted file mode 100644
index 8923c50dd..000000000
--- a/provisioning/roles/geerlingguy.postgresql/vars/RedHat-6.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-__postgresql_version: "8.4"
-__postgresql_data_dir: "/var/lib/pgsql/data"
-__postgresql_bin_path: "/usr/bin"
-__postgresql_config_path: "/var/lib/pgsql/data"
-__postgresql_daemon: postgresql
-__postgresql_packages:
-  - postgresql
-  - postgresql-server
-  - postgresql-contrib
-  - postgresql-libs

From a1a91ed3f94e1f7bd6c57bb5824a16165a83259e Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 5 Jul 2021 11:32:45 -0500
Subject: [PATCH 1261/1273] Update nginx role to latest version.

---
 provisioning/requirements.yml                            | 2 +-
 .../roles/geerlingguy.nginx/.github/workflows/ci.yml     | 1 +
 provisioning/roles/geerlingguy.nginx/defaults/main.yml   | 9 ++++-----
 provisioning/roles/geerlingguy.nginx/tasks/main.yml      | 2 +-
 provisioning/roles/geerlingguy.nginx/vars/Rocky.yml      | 9 +++++++++
 5 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.nginx/vars/Rocky.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 3f0f96358..dee6e9f59 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -39,7 +39,7 @@ roles:
   - name: geerlingguy.mysql
     version: 3.3.1
   - name: geerlingguy.nginx
-    version: 3.0.0
+    version: 3.1.0
   - name: geerlingguy.nodejs
     version: 5.1.1
   - name: geerlingguy.php
diff --git a/provisioning/roles/geerlingguy.nginx/.github/workflows/ci.yml b/provisioning/roles/geerlingguy.nginx/.github/workflows/ci.yml
index ff706f0f0..bd266ca41 100644
--- a/provisioning/roles/geerlingguy.nginx/.github/workflows/ci.yml
+++ b/provisioning/roles/geerlingguy.nginx/.github/workflows/ci.yml
@@ -42,6 +42,7 @@ jobs:
       matrix:
         distro:
           - centos8
+          - rockylinux8
           - ubuntu2004
           - ubuntu1804
           - debian10
diff --git a/provisioning/roles/geerlingguy.nginx/defaults/main.yml b/provisioning/roles/geerlingguy.nginx/defaults/main.yml
index fa4a15363..3178cd562 100644
--- a/provisioning/roles/geerlingguy.nginx/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.nginx/defaults/main.yml
@@ -82,11 +82,10 @@ nginx_upstreams: []
 # - name: myapp1
 #   strategy: "ip_hash" # "least_conn", etc.
 #   keepalive: 16 # optional
-#   servers: {
-#     "srv1.example.com",
-#     "srv2.example.com weight=3",
-#     "srv3.example.com"
-#   }
+#   servers:
+#     - "srv1.example.com"
+#     - "srv2.example.com weight=3"
+#     - "srv3.example.com"
 
 nginx_log_format: |-
   '$remote_addr - $remote_user [$time_local] "$request" '
diff --git a/provisioning/roles/geerlingguy.nginx/tasks/main.yml b/provisioning/roles/geerlingguy.nginx/tasks/main.yml
index bfb5fe404..bcf3ccec5 100644
--- a/provisioning/roles/geerlingguy.nginx/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.nginx/tasks/main.yml
@@ -10,7 +10,7 @@
 
 # Setup/install tasks.
 - include_tasks: setup-RedHat.yml
-  when: ansible_os_family == 'RedHat'
+  when: ansible_os_family == 'RedHat' or ansible_os_family == 'Rocky'
 
 - include_tasks: setup-Ubuntu.yml
   when: ansible_distribution == 'Ubuntu'
diff --git a/provisioning/roles/geerlingguy.nginx/vars/Rocky.yml b/provisioning/roles/geerlingguy.nginx/vars/Rocky.yml
new file mode 100644
index 000000000..0138f8daa
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nginx/vars/Rocky.yml
@@ -0,0 +1,9 @@
+---
+root_group: root
+nginx_conf_path: /etc/nginx/conf.d
+nginx_conf_file_path: /etc/nginx/nginx.conf
+nginx_mime_file_path: /etc/nginx/mime.types
+nginx_pidfile: /var/run/nginx.pid
+nginx_vhost_path: /etc/nginx/conf.d
+nginx_default_vhost_path: /etc/nginx/conf.d/default.conf
+__nginx_user: "nginx"

From fa16fabca4ba9aba1022afad96879f78e156ea4f Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 16 Jul 2021 17:17:57 -0500
Subject: [PATCH 1262/1273] Fixes #2174: Remove Pimp my Log from
 installed_extras.

---
 README.md                                     | 17 +------
 default.config.yml                            | 13 -----
 docs/deployment/local-codebase.md             |  2 +-
 docs/extras/pimpmylog.md                      | 20 --------
 docs/other/production.md                      |  2 +-
 docs/other/wordpress-other-applications.md    |  1 -
 mkdocs.yml                                    |  1 -
 molecule/default/verify.yml                   |  3 --
 .../docker/vars/docker-hub-overrides.yml      |  1 -
 provisioning/playbook.yml                     |  1 -
 provisioning/requirements.yml                 |  2 -
 .../roles/geerlingguy.pimpmylog/.travis.yml   | 41 ----------------
 .../roles/geerlingguy.pimpmylog/README.md     | 49 -------------------
 .../geerlingguy.pimpmylog/defaults/main.yml   |  5 --
 .../roles/geerlingguy.pimpmylog/meta/main.yml | 23 ---------
 .../geerlingguy.pimpmylog/tasks/main.yml      | 14 ------
 .../geerlingguy.pimpmylog/tests/inventory     |  1 -
 .../geerlingguy.pimpmylog/tests/test.yml      | 11 -----
 provisioning/templates/dashboard.html.j2      | 13 -----
 provisioning/vars/main.yml                    |  1 -
 20 files changed, 4 insertions(+), 217 deletions(-)
 delete mode 100644 docs/extras/pimpmylog.md
 delete mode 100644 provisioning/roles/geerlingguy.pimpmylog/.travis.yml
 delete mode 100644 provisioning/roles/geerlingguy.pimpmylog/README.md
 delete mode 100644 provisioning/roles/geerlingguy.pimpmylog/defaults/main.yml
 delete mode 100644 provisioning/roles/geerlingguy.pimpmylog/meta/main.yml
 delete mode 100644 provisioning/roles/geerlingguy.pimpmylog/tasks/main.yml
 delete mode 100644 provisioning/roles/geerlingguy.pimpmylog/tests/inventory
 delete mode 100644 provisioning/roles/geerlingguy.pimpmylog/tests/test.yml

diff --git a/README.md b/README.md
index 8384fe300..c4cd15d26 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,6 @@ Drupal VM installs the following on an Ubuntu 18.04 (by default) linux VM:
     - Blackfire, XHProf, or Tideways for profiling your code
     - XDebug, for debugging your code
     - Adminer, for accessing databases directly
-    - Pimp my Log, for easy viewing of log files
     - MailHog, for catching and debugging email
 
 It should take 5-10 minutes to build or rebuild the VM from scratch on a decent broadband connection.
@@ -109,7 +108,7 @@ Note: *By default Drupal VM is configured to use `192.168.88.88` as its IP, if y
 
 ## Extra software/utilities
 
-By default, this VM includes the extras listed in the `config.yml` option `installed_extras`:
+By default, this VM includes the extras listed in the `config.yml` option `installed_extras`, for example:
 
     installed_extras:
       - adminer
@@ -119,19 +118,7 @@ By default, this VM includes the extras listed in the `config.yml` option `insta
       # - elasticsearch
       # - java
       - mailhog
-      # - memcached
-      # - newrelic
-      # - nodejs
-      - pimpmylog
-      # - redis
-      # - ruby
-      # - selenium
-      # - solr
-      # - tideways
-      # - upload-progress
-      - varnish
-      # - xdebug
-      # - xhprof
+      [...]
 
 If you don't want or need one or more of these extras, just delete them or comment them from the list. This is helpful if you want to reduce PHP memory usage or otherwise conserve system resources.
 
diff --git a/default.config.yml b/default.config.yml
index 4fd08b2f8..dae1105cb 100644
--- a/default.config.yml
+++ b/default.config.yml
@@ -142,10 +142,6 @@ apache_vhosts:
     documentroot: "{{ php_xhprof_html_dir }}"
     extra_parameters: "{{ apache_vhost_php_fpm_parameters }}"
 
-  - servername: "pimpmylog.{{ vagrant_hostname }}"
-    documentroot: "{{ pimpmylog_install_dir }}"
-    extra_parameters: "{{ apache_vhost_php_fpm_parameters }}"
-
   - servername: "{{ vagrant_ip }}"
     serveralias: "dashboard.{{ vagrant_hostname }}"
     documentroot: "{{ dashboard_install_dir }}"
@@ -177,10 +173,6 @@ nginx_hosts:
     root: "{{ php_xhprof_html_dir }}"
     is_php: true
 
-  - server_name: "pimpmylog.{{ vagrant_hostname }}"
-    root: "{{ pimpmylog_install_dir }}"
-    is_php: true
-
   - server_name: "{{ vagrant_ip }} dashboard.{{ vagrant_hostname }}"
     root: "{{ dashboard_install_dir }}"
     is_php: true
@@ -223,7 +215,6 @@ installed_extras:
   # - memcached
   # - newrelic
   # - nodejs
-  - pimpmylog
   # - redis
   # - ruby
   # - selenium
@@ -316,10 +307,6 @@ varnish_default_vcl_template_path: templates/drupalvm.vcl.j2
 varnish_default_backend_host: "127.0.0.1"
 varnish_default_backend_port: "80"
 
-# Pimp my Log settings.
-pimpmylog_install_dir: /usr/share/php/pimpmylog
-pimpmylog_grant_all_privs: true
-
 # XDebug configuration. XDebug is disabled by default for better performance.
 php_xdebug_version: 2.9.5
 php_xdebug_default_enable: 0
diff --git a/docs/deployment/local-codebase.md b/docs/deployment/local-codebase.md
index 50620d3e3..d0d887be0 100644
--- a/docs/deployment/local-codebase.md
+++ b/docs/deployment/local-codebase.md
@@ -45,7 +45,7 @@ By default the domain of your site will be `drupalvm.test` but you can change it
 drupal_domain: "local.my-drupal-site.com"
 ```
 
-If you prefer using your domain as the root of all extra packages installed, ie. `adminer`, `xhprof` and `pimpmylog`, set it as the value of `vagrant_hostname` instead.
+If you prefer using your domain as the root of all extra packages installed, ie. `adminer` and `xhprof`, set it as the value of `vagrant_hostname` instead.
 
 ```yaml
 vagrant_hostname: "my-drupal-site.com"
diff --git a/docs/extras/pimpmylog.md b/docs/extras/pimpmylog.md
deleted file mode 100644
index 38d05052c..000000000
--- a/docs/extras/pimpmylog.md
+++ /dev/null
@@ -1,20 +0,0 @@
-[Pimp my Log](http://pimpmylog.com/) is a PHP-based web GUI for viewing log files on a given server. By default, it is installed on Drupal VM, and you can access it at the URL [http://pimpmylog.drupalvm.test/](http://pimpmylog.drupalvm.test) (as long as you have a hosts entry for that URL pointing at Drupal VM's IP address!).
-
-By default, it will find the default Apache 2 `access.log` and `error.log` files, but it will not find other logs, like MySQL or extra Apache virtualhost logs.
-
-When configuring Pimp my Log (on the first visit to [pimpmylog.drupalvm.test](http://pimpmylog.drupalvm.test)), you can add extra paths in the UI, or you can add them after the fact by manually editing the configuration file, which by default is stored at `/usr/share/php/pimpmylog/config.user.php`. You can also delete that file and re-configure Pimp my Log via the web UI.
-
-Some log files you may be interested in monitoring:
-
-  - `/var/log/apache2/access.log`
-  - `/var/log/apache2/error.log` (this log will show Apache and PHP notices/warnings/errors)
-  - `/var/log/apache2/other_vhosts_access.log`
-  - `/var/log/mysql.err` (MySQL error log)
-  - `/var/log/mysql-slow.log` (MySQL slow query log)
-  - `/var/log/syslog` (enable the Drupal syslog module to route watchdog log entries to this file)
-
-For MySQL logs, you might want to read through the PML docs on [MySQL](http://support.pimpmylog.com/kb/softwares/mysql).
-
-It might be necessary to grant read permissions to the other group (e.g. `chmod o+r /var/log/mysql.err`) on some log files in order for Pimp My Log to be able to parse them.
-
-For a list of available role variables, see the [`geerlingguy.pimpmylog` Ansible role's README](https://github.com/geerlingguy/ansible-role-pimpmylog#readme).
diff --git a/docs/other/production.md b/docs/other/production.md
index 5d2ce7d67..2964bc887 100644
--- a/docs/other/production.md
+++ b/docs/other/production.md
@@ -102,7 +102,7 @@ Your DigitalOcean Droplet is booted and ready to have Drupal VM installed on it.
 
 Copy [`examples/prod/prod.config.yml`](https://github.com/geerlingguy/drupal-vm/blob/4.9.1/examples/prod/prod.config.yml) to `config.yml`, and by looking at `default.config.yml` add any other overrides you'd like. Whatever variables you have set in `config.yml` will override the defaults set by `default.config.yml`.
 
-The changes outlined in the [example `prod.config.yml`](https://github.com/geerlingguy/drupal-vm/blob/4.9.1/examples/prod/prod.config.yml) disable development-environment tools (like Pimp My Log and Adminer) and add extra security hardening configuration (via the `extra_security_enabled` variable).
+The changes outlined in the [example `prod.config.yml`](https://github.com/geerlingguy/drupal-vm/blob/4.9.1/examples/prod/prod.config.yml) disable development-environment tools (like Adminer) and add extra security hardening configuration (via the `extra_security_enabled` variable).
 
 You now have Drupal VM configured for production by default. This is the recommended and safest way, so that you can't accidentally provision a production server with development tools. If desired you can also use the [environment variable `DRUPALVM_ENV`](#production-specific-overrides) to load an additional `<ENV>.config.yml` with production specific overrides. In most cases this is not needed though.
 
diff --git a/docs/other/wordpress-other-applications.md b/docs/other/wordpress-other-applications.md
index 96a4446ab..39f843fa6 100644
--- a/docs/other/wordpress-other-applications.md
+++ b/docs/other/wordpress-other-applications.md
@@ -38,7 +38,6 @@ configure_drush_aliases: false
 installed_extras:
   - adminer
   - mailhog
-  - pimpmylog
 
 # Add wp-cli
 composer_global_packages:
diff --git a/mkdocs.yml b/mkdocs.yml
index ba65b03f6..7b71f1cfe 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -49,7 +49,6 @@ pages:
       - 'memcached (In-memory cache)': 'extras/memcached.md'
       - 'newrelic (Performance monitoring)': 'extras/newrelic.md'
       - 'nodejs': 'extras/nodejs.md'
-      - 'pimpmylog (Log viewer)': 'extras/pimpmylog.md'
       - 'redis (In-memory database)': 'extras/redis.md'
       - 'ruby': 'extras/ruby.md'
       - 'selenium (BDD with Behat)': 'extras/selenium.md'
diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml
index 732e1f964..58a5c8477 100644
--- a/molecule/default/verify.yml
+++ b/molecule/default/verify.yml
@@ -26,9 +26,6 @@
         - name: Adminer
           host_prefix: "adminer."
           expected_content: "<title>Login - Adminer"
-        - name: Pimp My Log
-          host_prefix: "pimpmylog."
-          expected_content: "<title>Pimp my Log"
         - name: MailHog
           host_prefix: ""
           port: ":8025"
diff --git a/provisioning/docker/vars/docker-hub-overrides.yml b/provisioning/docker/vars/docker-hub-overrides.yml
index 812e16b0e..b345f0f6f 100644
--- a/provisioning/docker/vars/docker-hub-overrides.yml
+++ b/provisioning/docker/vars/docker-hub-overrides.yml
@@ -5,7 +5,6 @@ installed_extras:
   - adminer
   - drush
   - mailhog
-  - pimpmylog
   # - varnish
 
 # Don't build or install Drupal inside the container.
diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml
index 65fc4636e..e8427ecaa 100644
--- a/provisioning/playbook.yml
+++ b/provisioning/playbook.yml
@@ -79,7 +79,6 @@
 
     - { role: geerlingguy.blackfire, when: '"blackfire" in installed_extras' }
     - { role: geerlingguy.adminer, when: '"adminer" in installed_extras', tags: ['database'] }
-    - { role: geerlingguy.pimpmylog, when: '"pimpmylog" in installed_extras' }
     - { role: geerlingguy.daemonize, when: '"mailhog" in installed_extras' }
     - { role: geerlingguy.mailhog, when: '"mailhog" in installed_extras' }
     - { role: weareinteractive.newrelic, when: '"newrelic" in installed_extras' }
diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index dee6e9f59..04e5d9b75 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -62,8 +62,6 @@ roles:
     version: 3.0.0
   - name: geerlingguy.php-xhprof
     version: 3.0.0
-  - name: geerlingguy.pimpmylog
-    version: 1.0.2
   - name: geerlingguy.postfix
     version: 2.0.0
   - name: geerlingguy.postgresql
diff --git a/provisioning/roles/geerlingguy.pimpmylog/.travis.yml b/provisioning/roles/geerlingguy.pimpmylog/.travis.yml
deleted file mode 100644
index ba14ee002..000000000
--- a/provisioning/roles/geerlingguy.pimpmylog/.travis.yml
+++ /dev/null
@@ -1,41 +0,0 @@
----
-sudo: required
-language: python
-python: "2.7"
-
-env:
-  - SITE=test.yml
-
-before_install:
-  - sudo apt-get update -qq
-  - sudo apt-get install curl
-
-install:
-  # Install Ansible.
-  - pip install ansible
-
-  # Add ansible.cfg to pick up roles path.
-  - "{ echo '[defaults]'; echo 'roles_path = ../'; } >> ansible.cfg"
-
-  # Install dependencies.
-  - ansible-galaxy install geerlingguy.apache geerlingguy.php
-
-script:
-  # Check the role/playbook's syntax.
-  - "ansible-playbook -i tests/inventory tests/$SITE --syntax-check"
-
-  # Run the role/playbook with ansible-playbook.
-  - "ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo"
-
-  # Run the role/playbook again, checking to make sure it's idempotent.
-  - >
-    ansible-playbook -i tests/inventory tests/$SITE --connection=local --sudo
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
-
-  # Check if Pimp my Log is reachable.
-  - curl http://127.0.0.1/pimpmylog/
-
-notifications:
-  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.pimpmylog/README.md b/provisioning/roles/geerlingguy.pimpmylog/README.md
deleted file mode 100644
index b46539e87..000000000
--- a/provisioning/roles/geerlingguy.pimpmylog/README.md
+++ /dev/null
@@ -1,49 +0,0 @@
-# Ansible Role: Pimp My Log
-
-[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-pimpmylog.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-pimpmylog)
-
-Installs [Pimp my Log](http://pimpmylog.com/).
-
-## Requirements
-
-Requires PHP to be installed on the server, and a web server like Apache, Nginx, IIS. You can get Pimp my Log set up pretty quickly with this role in tandem with `geerlingguy.apache` and `geerlingguy.php` available on Ansible Galaxy.
-
-## Role Variables
-
-Available variables are listed below, along with default values (see `defaults/main.yml`):
-
-    pimpmylog_install_dir: /var/www/pimpmylog
-
-The location where Pimp my Log will be installed. You should configure a virtual host or server entry pointing to this directory so you can access the interface. Otherwise, you could choose a location that's within an existing docroot, e.g. the default docroot `/var/www/html/pimpmylog`, and access Pimp my Log at `http://localhost/pimpmylog/`.
-
-    pimpmylog_repo: https://github.com/potsky/PimpMyLog.git
-
-The git repository URL from which Pimp my Log will be cloned.
-
-    pimpmylog_version: master
-
-The version of Pimp my Log to install. Can be any valid tag, branch, or `HEAD`.
-
-    pimpmylog_grant_all_privs: no
-
-The setup of Pimp my Log allows for auto-configuration if the installation directory has `777` privileges, but this is an insecure way to install Pimp my Log. If you're installing on a local development environment, this is relatively harmless to set to `yes` to ease in installation... but if you're running this on a production or publicly-available server, don't even _think_ about changing this value!
-
-## Dependencies
-
-None.
-
-## Example Playbook
-
-    - hosts: webservers
-      roles:
-        - { role: geerlingguy.apache }
-        - { role: geerlingguy.php }
-        - { role: geerlingguy.pimpmylog }
-
-## License
-
-MIT / BSD
-
-## Author Information
-
-This role was created in 2015 by [Jeff Geerling](http://jeffgeerling.com/), author of [Ansible for DevOps](http://ansiblefordevops.com/).
diff --git a/provisioning/roles/geerlingguy.pimpmylog/defaults/main.yml b/provisioning/roles/geerlingguy.pimpmylog/defaults/main.yml
deleted file mode 100644
index 723fbefe4..000000000
--- a/provisioning/roles/geerlingguy.pimpmylog/defaults/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-pimpmylog_install_dir: /var/www/pimpmylog
-pimpmylog_repo: https://github.com/potsky/PimpMyLog.git
-pimpmylog_version: master
-pimpmylog_grant_all_privs: no
diff --git a/provisioning/roles/geerlingguy.pimpmylog/meta/main.yml b/provisioning/roles/geerlingguy.pimpmylog/meta/main.yml
deleted file mode 100644
index 1c8775be3..000000000
--- a/provisioning/roles/geerlingguy.pimpmylog/meta/main.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-dependencies: []
-
-galaxy_info:
-  author: geerlingguy
-  description: Pimp my Log installation for Linux
-  company: "Midwestern Mac, LLC"
-  license: "license (BSD, MIT)"
-  min_ansible_version: 1.8
-  platforms:
-    - name: EL
-      versions:
-      - all
-    - name: Debian
-      versions:
-      - all
-    - name: Ubuntu
-      versions:
-      - all
-  galaxy_tags:
-    - development
-    - web
-    - server
diff --git a/provisioning/roles/geerlingguy.pimpmylog/tasks/main.yml b/provisioning/roles/geerlingguy.pimpmylog/tasks/main.yml
deleted file mode 100644
index ccf0fca44..000000000
--- a/provisioning/roles/geerlingguy.pimpmylog/tasks/main.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- name: Clone Pimp my Log.
-  git:
-    dest: "{{ pimpmylog_install_dir }}"
-    repo: "{{ pimpmylog_repo }}"
-    version: "{{ pimpmylog_version }}"
-    accept_hostkey: yes
-
-- name: Grant all privileges on the Pimp my Log directory.
-  file:
-    path: "{{ pimpmylog_install_dir }}"
-    state: directory
-    mode: 0777
-  when: pimpmylog_grant_all_privs
diff --git a/provisioning/roles/geerlingguy.pimpmylog/tests/inventory b/provisioning/roles/geerlingguy.pimpmylog/tests/inventory
deleted file mode 100644
index 2fbb50c4a..000000000
--- a/provisioning/roles/geerlingguy.pimpmylog/tests/inventory
+++ /dev/null
@@ -1 +0,0 @@
-localhost
diff --git a/provisioning/roles/geerlingguy.pimpmylog/tests/test.yml b/provisioning/roles/geerlingguy.pimpmylog/tests/test.yml
deleted file mode 100644
index 0b6322eff..000000000
--- a/provisioning/roles/geerlingguy.pimpmylog/tests/test.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-- hosts: localhost
-  remote_user: root
-
-  vars:
-    pimpmylog_grant_all_privs: yes
-
-  roles:
-    - geerlingguy.apache
-    - geerlingguy.php
-    - ansible-role-pimpmylog
diff --git a/provisioning/templates/dashboard.html.j2 b/provisioning/templates/dashboard.html.j2
index e134275ae..212732902 100644
--- a/provisioning/templates/dashboard.html.j2
+++ b/provisioning/templates/dashboard.html.j2
@@ -157,19 +157,6 @@
             </tr>
           {%- endif -%}
         {%- endif %}
-        {% if 'pimpmylog' in installed_extras -%}
-          {% macro servername() %}{{ getServernameFromDocroot(pimpmylog_install_dir) }}{% endmacro %}
-          {%- if servername() -%}
-            <tr>
-              <th>PimpMyLog</th>
-              <td><a href="http://{{ servername() }}">{{ servername() }}</a>
-              </br>
-              <a href="http://{{ servername() }}" class="btn btn-success btn-xs" role="button">Open</a>
-                <a href="http://docs.drupalvm.com/en/latest/extras/pimpmylog/" target="_blank" class="btn btn-info btn-xs" role="button">Documentation</a>
-              </td>
-            </tr>
-          {%- endif -%}
-        {%- endif %}
         {% if 'solr' in installed_extras -%}
           {% macro servername() %}{{ vagrant_hostname }}:{{ solr_port }}/solr/{% endmacro %}
           <tr>
diff --git a/provisioning/vars/main.yml b/provisioning/vars/main.yml
index 691ad8d42..4c145acb4 100644
--- a/provisioning/vars/main.yml
+++ b/provisioning/vars/main.yml
@@ -1,7 +1,6 @@
 ---
 _devtool_docroots:
   - "{{ adminer_install_dir }}"
-  - "{{ pimpmylog_install_dir }}"
   - "{{ php_xhprof_html_dir }}"
   - "{{ dashboard_install_dir|default('') }}"
 

From fb6300bfd723655d9b0dd8b9b47a75fe385218ec Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Wed, 18 Aug 2021 10:45:10 -0500
Subject: [PATCH 1263/1273] Update Node.js role to latest version.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.nodejs/.ansible-lint    |  4 +-
 .../geerlingguy.nodejs/.github/stale.yml      | 56 ++++++++++++++
 .../.github/workflows/ci.yml                  | 76 +++++++++++++++++++
 .../.github/workflows/release.yml             | 38 ++++++++++
 .../roles/geerlingguy.nodejs/.gitignore       |  2 +
 .../roles/geerlingguy.nodejs/.travis.yml      | 33 --------
 .../roles/geerlingguy.nodejs/.yamllint        |  5 ++
 .../roles/geerlingguy.nodejs/README.md        | 10 ++-
 .../geerlingguy.nodejs/defaults/main.yml      |  8 +-
 .../roles/geerlingguy.nodejs/meta/main.yml    |  2 +-
 .../molecule/default/molecule.yml             |  3 -
 .../molecule/default/playbook-latest.yml      |  2 +-
 .../roles/geerlingguy.nodejs/tasks/main.yml   |  2 +
 14 files changed, 197 insertions(+), 46 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.nodejs/.github/stale.yml
 create mode 100644 provisioning/roles/geerlingguy.nodejs/.github/workflows/ci.yml
 create mode 100644 provisioning/roles/geerlingguy.nodejs/.github/workflows/release.yml
 delete mode 100644 provisioning/roles/geerlingguy.nodejs/.travis.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 04e5d9b75..0c705f1f7 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -41,7 +41,7 @@ roles:
   - name: geerlingguy.nginx
     version: 3.1.0
   - name: geerlingguy.nodejs
-    version: 5.1.1
+    version: 6.0.0
   - name: geerlingguy.php
     version: 4.6.1
   - name: geerlingguy.php-memcached
diff --git a/provisioning/roles/geerlingguy.nodejs/.ansible-lint b/provisioning/roles/geerlingguy.nodejs/.ansible-lint
index 0af17d0d0..acc82551f 100644
--- a/provisioning/roles/geerlingguy.nodejs/.ansible-lint
+++ b/provisioning/roles/geerlingguy.nodejs/.ansible-lint
@@ -1,3 +1,3 @@
 skip_list:
-  - '405'
-  - '204'
+  - 'yaml'
+  - 'role-name'
diff --git a/provisioning/roles/geerlingguy.nodejs/.github/stale.yml b/provisioning/roles/geerlingguy.nodejs/.github/stale.yml
new file mode 100644
index 000000000..c7ff12754
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nodejs/.github/stale.yml
@@ -0,0 +1,56 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 90
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 30
+
+# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
+onlyLabels: []
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - pinned
+  - security
+  - planned
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: false
+
+# Label to use when marking as stale
+staleLabel: stale
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+pulls:
+  markComment: |-
+    This pull request has been marked 'stale' due to lack of recent activity. If there is no further activity, the PR will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark pull requests as stale.
+
+  unmarkComment: >-
+    This pull request is no longer marked for closure.
+
+  closeComment: >-
+    This pull request has been closed due to inactivity. If you feel this is in error, please reopen the pull request or file a new PR with the relevant details.
+
+issues:
+  markComment: |-
+    This issue has been marked 'stale' due to lack of recent activity. If there is no further activity, the issue will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark issues as stale.
+
+  unmarkComment: >-
+    This issue is no longer marked for closure.
+
+  closeComment: >-
+    This issue has been closed due to inactivity. If you feel this is in error, please reopen the issue or file a new issue with the relevant details.
diff --git a/provisioning/roles/geerlingguy.nodejs/.github/workflows/ci.yml b/provisioning/roles/geerlingguy.nodejs/.github/workflows/ci.yml
new file mode 100644
index 000000000..68009cdbd
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nodejs/.github/workflows/ci.yml
@@ -0,0 +1,76 @@
+---
+name: CI
+'on':
+  pull_request:
+  push:
+    branches:
+      - master
+  schedule:
+    - cron: "0 7 * * 3"
+
+defaults:
+  run:
+    working-directory: 'geerlingguy.nodejs'
+
+jobs:
+
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.nodejs'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies.
+        run: pip3 install yamllint
+
+      - name: Lint code.
+        run: |
+          yamllint .
+
+  molecule:
+    name: Molecule
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - distro: rockylinux8
+            playbook: converge.yml
+          - distro: centos7
+            playbook: converge.yml
+          - distro: ubuntu1804
+            playbook: converge.yml
+          - distro: debian9
+            playbook: converge.yml
+
+          - distro: centos7
+            playbook: playbook-latest.yml
+
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.nodejs'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies.
+        run: pip3 install ansible molecule[docker] docker
+
+      - name: Run Molecule tests.
+        run: molecule test
+        env:
+          PY_COLORS: '1'
+          ANSIBLE_FORCE_COLOR: '1'
+          MOLECULE_DISTRO: ${{ matrix.distro }}
+          MOLECULE_PLAYBOOK: ${{ matrix.playbook }}
diff --git a/provisioning/roles/geerlingguy.nodejs/.github/workflows/release.yml b/provisioning/roles/geerlingguy.nodejs/.github/workflows/release.yml
new file mode 100644
index 000000000..d4724394c
--- /dev/null
+++ b/provisioning/roles/geerlingguy.nodejs/.github/workflows/release.yml
@@ -0,0 +1,38 @@
+---
+# This workflow requires a GALAXY_API_KEY secret present in the GitHub
+# repository or organization.
+#
+# See: https://github.com/marketplace/actions/publish-ansible-role-to-galaxy
+# See: https://github.com/ansible/galaxy/issues/46
+
+name: Release
+'on':
+  push:
+    tags:
+      - '*'
+
+defaults:
+  run:
+    working-directory: 'geerlingguy.nodejs'
+
+jobs:
+
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.nodejs'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install Ansible.
+        run: pip3 install ansible-base
+
+      - name: Trigger a new import on Galaxy.
+        run: ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }} $(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} | cut -d/ -f2)
diff --git a/provisioning/roles/geerlingguy.nodejs/.gitignore b/provisioning/roles/geerlingguy.nodejs/.gitignore
index f56f5b578..8840c8f02 100644
--- a/provisioning/roles/geerlingguy.nodejs/.gitignore
+++ b/provisioning/roles/geerlingguy.nodejs/.gitignore
@@ -1,3 +1,5 @@
 *.retry
 */__pycache__
 *.pyc
+.cache
+
diff --git a/provisioning/roles/geerlingguy.nodejs/.travis.yml b/provisioning/roles/geerlingguy.nodejs/.travis.yml
deleted file mode 100644
index 1fa9d69e2..000000000
--- a/provisioning/roles/geerlingguy.nodejs/.travis.yml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-language: python
-services: docker
-
-env:
-  global:
-    - ROLE_NAME: nodejs
-  matrix:
-    - MOLECULE_DISTRO: centos8
-    - MOLECULE_DISTRO: centos7
-    - MOLECULE_DISTRO: ubuntu1804
-    - MOLECULE_DISTRO: ubuntu1604
-    - MOLECULE_DISTRO: debian9
-
-    - MOLECULE_DISTRO: centos7
-      MOLECULE_PLAYBOOK: playbook-latest.yml
-
-install:
-  # Install test dependencies.
-  - pip install molecule yamllint ansible-lint docker
-
-before_script:
-  # Use actual Ansible Galaxy role name for the project directory.
-  - cd ../
-  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
-  - cd geerlingguy.$ROLE_NAME
-
-script:
-  # Run tests.
-  - molecule test
-
-notifications:
-  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.nodejs/.yamllint b/provisioning/roles/geerlingguy.nodejs/.yamllint
index 76d14595e..dfae3893f 100644
--- a/provisioning/roles/geerlingguy.nodejs/.yamllint
+++ b/provisioning/roles/geerlingguy.nodejs/.yamllint
@@ -1,6 +1,11 @@
 ---
 extends: default
+
 rules:
   line-length:
     max: 220
     level: warning
+
+ignore: |
+  .github/stale.yml
+  .travis.yml
diff --git a/provisioning/roles/geerlingguy.nodejs/README.md b/provisioning/roles/geerlingguy.nodejs/README.md
index f8ffbaba9..4cff0f3d9 100644
--- a/provisioning/roles/geerlingguy.nodejs/README.md
+++ b/provisioning/roles/geerlingguy.nodejs/README.md
@@ -1,6 +1,6 @@
 # Ansible Role: Node.js
 
-[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-nodejs.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-nodejs)
+[![CI](https://github.com/geerlingguy/ansible-role-nodejs/workflows/CI/badge.svg?event=push)](https://github.com/geerlingguy/ansible-role-nodejs/actions?query=workflow%3ACI)
 
 Installs Node.js on RHEL/CentOS or Debian/Ubuntu.
 
@@ -12,9 +12,9 @@ None.
 
 Available variables are listed below, along with default values (see `defaults/main.yml`):
 
-    nodejs_version: "12.x"
+    nodejs_version: "14.x"
 
-The Node.js version to install. "12.x" is the default and works on most supported OSes. Other versions such as "8.x", "10.x", "13.x", etc. should work on the latest versions of Debian/Ubuntu and RHEL/CentOS.
+The Node.js version to install. "14.x" is the default and works on most supported OSes. Other versions such as "8.x", "10.x", "13.x", etc. should work on the latest versions of Debian/Ubuntu and RHEL/CentOS.
 
     nodejs_install_npm_user: "{{ ansible_ssh_user }}"
 
@@ -46,6 +46,10 @@ A list of npm packages with a `name` and (optional) `version` to be installed gl
 
 Set a path pointing to a particular `package.json` (e.g. `"/var/www/app/package.json"`). This will install all of the defined packages globally using Ansible's `npm` module.
 
+    nodejs_generate_etc_profile: "true"
+    
+By default the role will create `/etc/profile.d/npm.sh` with exported variables (`PATH`, `NPM_CONFIG_PREFIX`, `NODE_PATH`). If you prefer to avoid generating that file (e.g. you want to set the variables yourself for a non-global install), set it to "false".
+
 ## Dependencies
 
 None.
diff --git a/provisioning/roles/geerlingguy.nodejs/defaults/main.yml b/provisioning/roles/geerlingguy.nodejs/defaults/main.yml
index 301cfb5a5..54a8f32fb 100644
--- a/provisioning/roles/geerlingguy.nodejs/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.nodejs/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
-# Set the version of Node.js to install (8.x", "10.x", "12.x", "13.x", etc.).
+# Set the version of Node.js to install ("12.x", "13.x", "14.x", "15.x", etc.).
 # Version numbers from Nodesource: https://github.com/nodesource/distributions
-nodejs_version: "12.x"
+nodejs_version: "14.x"
 
 # The user for whom the npm packages will be installed.
 # nodejs_install_npm_user: username
@@ -25,3 +25,7 @@ nodejs_npm_global_packages: []
 
 # The path of a package.json file used to install packages globally.
 nodejs_package_json_path: ""
+
+# Whether or not /etc/profile.d/npm.sh (globa) must be generated.
+# Set to false if you need to handle this manually with a per-user install.
+nodejs_generate_etc_profile: "true"
diff --git a/provisioning/roles/geerlingguy.nodejs/meta/main.yml b/provisioning/roles/geerlingguy.nodejs/meta/main.yml
index 164f7dbd4..110fd78e0 100644
--- a/provisioning/roles/geerlingguy.nodejs/meta/main.yml
+++ b/provisioning/roles/geerlingguy.nodejs/meta/main.yml
@@ -2,6 +2,7 @@
 dependencies: []
 
 galaxy_info:
+  role_name: nodejs
   author: geerlingguy
   description: Node.js installation for Linux
   company: "Midwestern Mac, LLC"
@@ -10,7 +11,6 @@ galaxy_info:
   platforms:
     - name: EL
       versions:
-        - 6
         - 7
         - 8
     - name: Debian
diff --git a/provisioning/roles/geerlingguy.nodejs/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.nodejs/molecule/default/molecule.yml
index 38eb962bd..74907107f 100644
--- a/provisioning/roles/geerlingguy.nodejs/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.nodejs/molecule/default/molecule.yml
@@ -3,9 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint: |
-  yamllint .
-  ansible-lint
 platforms:
   - name: instance
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
diff --git a/provisioning/roles/geerlingguy.nodejs/molecule/default/playbook-latest.yml b/provisioning/roles/geerlingguy.nodejs/molecule/default/playbook-latest.yml
index 1213795f2..70d002cc5 100644
--- a/provisioning/roles/geerlingguy.nodejs/molecule/default/playbook-latest.yml
+++ b/provisioning/roles/geerlingguy.nodejs/molecule/default/playbook-latest.yml
@@ -9,7 +9,7 @@
     npm_config_prefix: /root/.npm-global
     npm_config_unsafe_perm: "true"
     nodejs_npm_global_packages:
-      - node-sass
+      - slugify
       - name: jslint
         version: 0.12.0
       - name: yo
diff --git a/provisioning/roles/geerlingguy.nodejs/tasks/main.yml b/provisioning/roles/geerlingguy.nodejs/tasks/main.yml
index 5622c3592..90afd6e16 100644
--- a/provisioning/roles/geerlingguy.nodejs/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.nodejs/tasks/main.yml
@@ -16,12 +16,14 @@
     owner: "{{ nodejs_install_npm_user }}"
     group: "{{ nodejs_install_npm_user }}"
     state: directory
+    mode: 0755
 
 - name: Add npm_config_prefix bin directory to global $PATH.
   template:
     src: npm.sh.j2
     dest: /etc/profile.d/npm.sh
     mode: 0644
+  when: nodejs_generate_etc_profile
 
 - name: Ensure npm global packages are installed.
   npm:

From 348084de275aa2fd5feb949d45714f6dd2a387e9 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 19 Aug 2021 22:47:51 -0500
Subject: [PATCH 1264/1273] Update all included roles to latest versions.

---
 provisioning/requirements.yml                 |  20 +--
 .../roles/geerlingguy.apache/.ansible-lint    |   2 +
 .../geerlingguy.apache/.github/FUNDING.yml    |   4 +
 .../geerlingguy.apache/.github/stale.yml      |  56 ++++++++
 .../.github/workflows/ci.yml                  |  69 ++++++++++
 .../.github/workflows/release.yml             |  38 ++++++
 .../roles/geerlingguy.apache/.travis.yml      |  33 -----
 .../.yamllint}                                |   5 +
 .../roles/geerlingguy.apache/README.md        |   2 +-
 .../roles/geerlingguy.apache/meta/main.yml    |   1 +
 .../default/{playbook.yml => converge.yml}    |   0
 .../molecule/default/molecule.yml             |  15 +-
 .../tasks/configure-Debian.yml                |   3 +
 .../tasks/configure-RedHat.yml                |   1 +
 .../tasks/configure-Solaris.yml               |   1 +
 .../tasks/configure-Suse.yml                  |   1 +
 .../roles/geerlingguy.daemonize/.ansible-lint |   2 +
 .../geerlingguy.daemonize/.github/FUNDING.yml |   4 +
 .../geerlingguy.daemonize/.github/stale.yml   |  56 ++++++++
 .../.github/workflows/ci.yml                  |  67 +++++++++
 .../.github/workflows/release.yml             |  38 ++++++
 .../roles/geerlingguy.daemonize/.gitignore    |   3 +-
 .../roles/geerlingguy.daemonize/.travis.yml   |  27 ----
 .../.yamllint}                                |   5 +
 .../roles/geerlingguy.daemonize/README.md     |   2 +-
 .../roles/geerlingguy.daemonize/meta/main.yml |  29 ++--
 .../default/converge.yml}                     |   6 +-
 .../molecule/default/molecule.yml             |  17 +++
 .../geerlingguy.daemonize/tasks/main.yml      |   6 +-
 .../geerlingguy.daemonize/tests/README.md     |  11 --
 .../.github/workflows/ci.yml                  |  67 +++++++++
 .../.github/workflows/release.yml             |  38 ++++++
 .../geerlingguy.elasticsearch/.travis.yml     |  32 -----
 .../roles/geerlingguy.elasticsearch/README.md |   2 +-
 .../molecule/default/molecule.yml             |   4 -
 .../geerlingguy.elasticsearch/tasks/main.yml  |  16 ++-
 .../templates/jvm.options.j2                  | 128 ++++++++++++++++++
 .../geerlingguy.firewall/.github/stale.yml    |  56 ++++++++
 .../roles/geerlingguy.firewall/.travis.yml    |   2 +-
 .../.yamllint}                                |   0
 .../roles/geerlingguy.firewall/README.md      |   4 +
 .../geerlingguy.firewall/defaults/main.yml    |   2 +
 .../default/{playbook.yml => converge.yml}    |   0
 .../molecule/default/molecule.yml             |  17 +--
 .../templates/firewall.bash.j2                |  37 ++---
 .../roles/geerlingguy.git/.github/FUNDING.yml |   4 +
 .../roles/geerlingguy.git/.github/stale.yml   |  56 ++++++++
 .../roles/geerlingguy.git/.travis.yml         |   2 +-
 .../default/yaml-lint.yml => .yamllint}       |   0
 provisioning/roles/geerlingguy.git/README.md  |   5 +-
 .../roles/geerlingguy.git/defaults/main.yml   |   3 +-
 .../default/{playbook.yml => converge.yml}    |   0
 .../molecule/default/molecule.yml             |  18 +--
 .../molecule/default/playbook-source.yml      |   2 +-
 .../roles/geerlingguy.mysql/defaults/main.yml |   2 +-
 .../geerlingguy.mysql/templates/my.cnf.j2     |   2 +-
 .../geerlingguy.php-versions/.ansible-lint    |   7 +-
 .../.github/workflows/ci.yml                  |  21 +--
 .../roles/geerlingguy.php-versions/README.md  |   9 +-
 .../defaults/main.yml                         |   2 +-
 .../geerlingguy.php-versions/meta/main.yml    |   3 +-
 .../molecule/default/{7.4.yml => 7.3.yml}     |   2 +-
 .../molecule/default/{7.2.yml => 8.0.yml}     |   2 +-
 .../geerlingguy.php-versions/tasks/main.yml   |   7 +
 .../tasks/setup-RedHat.yml                    |   6 +
 .../geerlingguy.php-versions/vars/Debian.yml  |   3 +
 .../roles/geerlingguy.repo-epel/.ansible-lint |   3 +-
 .../.github/workflows/ci.yml                  |  66 +++++++++
 .../.github/workflows/release.yml             |  38 ++++++
 .../roles/geerlingguy.repo-epel/.gitignore    |   2 +
 .../roles/geerlingguy.repo-epel/.travis.yml   |  32 -----
 .../roles/geerlingguy.repo-epel/README.md     |   2 +-
 .../roles/geerlingguy.repo-epel/meta/main.yml |   5 +-
 .../molecule/default/molecule.yml             |   4 -
 .../geerlingguy.repo-epel/tasks/main.yml      |   3 +-
 .../roles/geerlingguy.repo-remi/.travis.yml   |   1 +
 .../roles/geerlingguy.repo-remi/README.md     |   2 +-
 .../molecule/default/converge.yml             |   1 +
 .../molecule/default/requirements.yml         |   2 +
 .../roles/geerlingguy.ruby/.ansible-lint      |   1 +
 .../geerlingguy.ruby/.github/FUNDING.yml      |   4 +
 .../roles/geerlingguy.ruby/.github/stale.yml  |  56 ++++++++
 .../geerlingguy.ruby/.github/workflows/ci.yml |  77 +++++++++++
 .../.github/workflows/release.yml             |  38 ++++++
 .../roles/geerlingguy.ruby/.travis.yml        |  34 -----
 provisioning/roles/geerlingguy.ruby/.yamllint |  11 ++
 provisioning/roles/geerlingguy.ruby/README.md |   6 +-
 .../roles/geerlingguy.ruby/defaults/main.yml  |   4 +-
 .../roles/geerlingguy.ruby/meta/main.yml      |   1 +
 .../default/{playbook.yml => converge.yml}    |   1 +
 .../molecule/default/molecule.yml             |  14 +-
 ...playbook-source.yml => source-install.yml} |   0
 .../molecule/default/tests/test_default.py    |  14 --
 .../tasks/install-from-source.yml             |   3 +-
 94 files changed, 1170 insertions(+), 340 deletions(-)
 create mode 100644 provisioning/roles/geerlingguy.apache/.ansible-lint
 create mode 100644 provisioning/roles/geerlingguy.apache/.github/FUNDING.yml
 create mode 100644 provisioning/roles/geerlingguy.apache/.github/stale.yml
 create mode 100644 provisioning/roles/geerlingguy.apache/.github/workflows/ci.yml
 create mode 100644 provisioning/roles/geerlingguy.apache/.github/workflows/release.yml
 delete mode 100644 provisioning/roles/geerlingguy.apache/.travis.yml
 rename provisioning/roles/{geerlingguy.firewall/molecule/default/yaml-lint.yml => geerlingguy.apache/.yamllint} (61%)
 rename provisioning/roles/geerlingguy.apache/molecule/default/{playbook.yml => converge.yml} (100%)
 create mode 100644 provisioning/roles/geerlingguy.daemonize/.ansible-lint
 create mode 100644 provisioning/roles/geerlingguy.daemonize/.github/FUNDING.yml
 create mode 100644 provisioning/roles/geerlingguy.daemonize/.github/stale.yml
 create mode 100644 provisioning/roles/geerlingguy.daemonize/.github/workflows/ci.yml
 create mode 100644 provisioning/roles/geerlingguy.daemonize/.github/workflows/release.yml
 delete mode 100644 provisioning/roles/geerlingguy.daemonize/.travis.yml
 rename provisioning/roles/{geerlingguy.ruby/molecule/default/yaml-lint.yml => geerlingguy.daemonize/.yamllint} (61%)
 rename provisioning/roles/geerlingguy.daemonize/{tests/test.yml => molecule/default/converge.yml} (89%)
 create mode 100644 provisioning/roles/geerlingguy.daemonize/molecule/default/molecule.yml
 delete mode 100644 provisioning/roles/geerlingguy.daemonize/tests/README.md
 create mode 100644 provisioning/roles/geerlingguy.elasticsearch/.github/workflows/ci.yml
 create mode 100644 provisioning/roles/geerlingguy.elasticsearch/.github/workflows/release.yml
 delete mode 100644 provisioning/roles/geerlingguy.elasticsearch/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.elasticsearch/templates/jvm.options.j2
 create mode 100644 provisioning/roles/geerlingguy.firewall/.github/stale.yml
 rename provisioning/roles/{geerlingguy.apache/molecule/default/yaml-lint.yml => geerlingguy.firewall/.yamllint} (100%)
 rename provisioning/roles/geerlingguy.firewall/molecule/default/{playbook.yml => converge.yml} (100%)
 create mode 100644 provisioning/roles/geerlingguy.git/.github/FUNDING.yml
 create mode 100644 provisioning/roles/geerlingguy.git/.github/stale.yml
 rename provisioning/roles/geerlingguy.git/{molecule/default/yaml-lint.yml => .yamllint} (100%)
 rename provisioning/roles/geerlingguy.git/molecule/default/{playbook.yml => converge.yml} (100%)
 rename provisioning/roles/geerlingguy.php-versions/molecule/default/{7.4.yml => 7.3.yml} (95%)
 rename provisioning/roles/geerlingguy.php-versions/molecule/default/{7.2.yml => 8.0.yml} (95%)
 create mode 100644 provisioning/roles/geerlingguy.repo-epel/.github/workflows/ci.yml
 create mode 100644 provisioning/roles/geerlingguy.repo-epel/.github/workflows/release.yml
 delete mode 100644 provisioning/roles/geerlingguy.repo-epel/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.repo-remi/molecule/default/requirements.yml
 create mode 100644 provisioning/roles/geerlingguy.ruby/.github/FUNDING.yml
 create mode 100644 provisioning/roles/geerlingguy.ruby/.github/stale.yml
 create mode 100644 provisioning/roles/geerlingguy.ruby/.github/workflows/ci.yml
 create mode 100644 provisioning/roles/geerlingguy.ruby/.github/workflows/release.yml
 delete mode 100644 provisioning/roles/geerlingguy.ruby/.travis.yml
 create mode 100644 provisioning/roles/geerlingguy.ruby/.yamllint
 rename provisioning/roles/geerlingguy.ruby/molecule/default/{playbook.yml => converge.yml} (97%)
 rename provisioning/roles/geerlingguy.ruby/molecule/default/{playbook-source.yml => source-install.yml} (100%)
 delete mode 100644 provisioning/roles/geerlingguy.ruby/molecule/default/tests/test_default.py

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 0c705f1f7..9f099e582 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -9,7 +9,7 @@ roles:
   - name: geerlingguy.adminer
     version: 1.3.1
   - name: geerlingguy.apache
-    version: 3.1.0
+    version: 3.1.4
   - name: geerlingguy.apache-php-fpm
     version: 1.1.0
   - name: geerlingguy.blackfire
@@ -17,7 +17,7 @@ roles:
   - name: geerlingguy.composer
     version: 1.9.0
   - name: geerlingguy.daemonize
-    version: 1.2.1
+    version: 1.2.2
   - name: geerlingguy.drupal
     version: 4.2.0
   - name: geerlingguy.drupal-console
@@ -25,11 +25,11 @@ roles:
   - name: geerlingguy.drush
     version: 3.3.0
   - name: geerlingguy.elasticsearch
-    version: 4.2.0
+    version: 5.0.1
   - name: geerlingguy.firewall
-    version: 2.4.3
+    version: 2.5.0
   - name: geerlingguy.git
-    version: 2.1.0
+    version: 3.0.0
   - name: geerlingguy.java
     version: 1.10.0
   - name: geerlingguy.mailhog
@@ -37,7 +37,7 @@ roles:
   - name: geerlingguy.memcached
     version: 2.2.0
   - name: geerlingguy.mysql
-    version: 3.3.1
+    version: 3.3.2
   - name: geerlingguy.nginx
     version: 3.1.0
   - name: geerlingguy.nodejs
@@ -57,7 +57,7 @@ roles:
   - name: geerlingguy.php-tideways
     version: 2.2.0
   - name: geerlingguy.php-versions
-    version: 4.1.0
+    version: 5.0.0
   - name: geerlingguy.php-xdebug
     version: 3.0.0
   - name: geerlingguy.php-xhprof
@@ -69,13 +69,13 @@ roles:
   - name: geerlingguy.redis
     version: 1.7.0
   - name: geerlingguy.repo-epel
-    version: 3.0.0
+    version: 3.1.0
   - name: geerlingguy.repo-remi
     version: 2.0.1
   - name: geerlingguy.ruby
-    version: 2.6.0
+    version: 3.0.0
   - name: geerlingguy.security
-    version: 2.0.0
+    version: 2.0.1
   - name: geerlingguy.solr
     version: 5.2.0
   - name: geerlingguy.varnish
diff --git a/provisioning/roles/geerlingguy.apache/.ansible-lint b/provisioning/roles/geerlingguy.apache/.ansible-lint
new file mode 100644
index 000000000..555729425
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache/.ansible-lint
@@ -0,0 +1,2 @@
+skip_list:
+  - '106'
diff --git a/provisioning/roles/geerlingguy.apache/.github/FUNDING.yml b/provisioning/roles/geerlingguy.apache/.github/FUNDING.yml
new file mode 100644
index 000000000..96b493831
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+---
+github: geerlingguy
+patreon: geerlingguy
diff --git a/provisioning/roles/geerlingguy.apache/.github/stale.yml b/provisioning/roles/geerlingguy.apache/.github/stale.yml
new file mode 100644
index 000000000..c7ff12754
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache/.github/stale.yml
@@ -0,0 +1,56 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 90
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 30
+
+# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
+onlyLabels: []
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - pinned
+  - security
+  - planned
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: false
+
+# Label to use when marking as stale
+staleLabel: stale
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+pulls:
+  markComment: |-
+    This pull request has been marked 'stale' due to lack of recent activity. If there is no further activity, the PR will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark pull requests as stale.
+
+  unmarkComment: >-
+    This pull request is no longer marked for closure.
+
+  closeComment: >-
+    This pull request has been closed due to inactivity. If you feel this is in error, please reopen the pull request or file a new PR with the relevant details.
+
+issues:
+  markComment: |-
+    This issue has been marked 'stale' due to lack of recent activity. If there is no further activity, the issue will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark issues as stale.
+
+  unmarkComment: >-
+    This issue is no longer marked for closure.
+
+  closeComment: >-
+    This issue has been closed due to inactivity. If you feel this is in error, please reopen the issue or file a new issue with the relevant details.
diff --git a/provisioning/roles/geerlingguy.apache/.github/workflows/ci.yml b/provisioning/roles/geerlingguy.apache/.github/workflows/ci.yml
new file mode 100644
index 000000000..c775c47fc
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache/.github/workflows/ci.yml
@@ -0,0 +1,69 @@
+---
+name: CI
+'on':
+  pull_request:
+  push:
+    branches:
+      - master
+  schedule:
+    - cron: "0 5 * * 0"
+
+defaults:
+  run:
+    working-directory: 'geerlingguy.apache'
+
+jobs:
+
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.apache'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies.
+        run: pip3 install yamllint ansible-lint
+
+      - name: Lint code.
+        run: |
+          yamllint .
+          ansible-lint
+
+  molecule:
+    name: Molecule
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        distro:
+          - centos8
+          - centos7
+          - ubuntu2004
+          - debian10
+
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.apache'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies.
+        run: pip3 install ansible molecule[docker] docker
+
+      - name: Run Molecule tests.
+        run: molecule test
+        env:
+          PY_COLORS: '1'
+          ANSIBLE_FORCE_COLOR: '1'
+          MOLECULE_DISTRO: ${{ matrix.distro }}
diff --git a/provisioning/roles/geerlingguy.apache/.github/workflows/release.yml b/provisioning/roles/geerlingguy.apache/.github/workflows/release.yml
new file mode 100644
index 000000000..06be70522
--- /dev/null
+++ b/provisioning/roles/geerlingguy.apache/.github/workflows/release.yml
@@ -0,0 +1,38 @@
+---
+# This workflow requires a GALAXY_API_KEY secret present in the GitHub
+# repository or organization.
+#
+# See: https://github.com/marketplace/actions/publish-ansible-role-to-galaxy
+# See: https://github.com/ansible/galaxy/issues/46
+
+name: Release
+'on':
+  push:
+    tags:
+      - '*'
+
+defaults:
+  run:
+    working-directory: 'geerlingguy.apache'
+
+jobs:
+
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.apache'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install Ansible.
+        run: pip3 install ansible-base
+
+      - name: Trigger a new import on Galaxy.
+        run: ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }} $(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} | cut -d/ -f2)
diff --git a/provisioning/roles/geerlingguy.apache/.travis.yml b/provisioning/roles/geerlingguy.apache/.travis.yml
deleted file mode 100644
index 57deda127..000000000
--- a/provisioning/roles/geerlingguy.apache/.travis.yml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-language: python
-services: docker
-
-env:
-  global:
-    - ROLE_NAME: apache
-  matrix:
-    - MOLECULE_DISTRO: ubi8
-    - MOLECULE_DISTRO: centos7
-    - MOLECULE_DISTRO: centos6
-    - MOLECULE_DISTRO: ubuntu1804
-    - MOLECULE_DISTRO: ubuntu1604
-    - MOLECULE_DISTRO: ubuntu1404
-    - MOLECULE_DISTRO: debian10
-    - MOLECULE_DISTRO: debian9
-
-install:
-  # Install test dependencies.
-  - pip install molecule docker
-
-before_script:
-  # Use actual Ansible Galaxy role name for the project directory.
-  - cd ../
-  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
-  - cd geerlingguy.$ROLE_NAME
-
-script:
-  # Run tests.
-  - molecule test
-
-notifications:
-  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.firewall/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.apache/.yamllint
similarity index 61%
rename from provisioning/roles/geerlingguy.firewall/molecule/default/yaml-lint.yml
rename to provisioning/roles/geerlingguy.apache/.yamllint
index a3dbc38ee..f2033dd21 100644
--- a/provisioning/roles/geerlingguy.firewall/molecule/default/yaml-lint.yml
+++ b/provisioning/roles/geerlingguy.apache/.yamllint
@@ -1,6 +1,11 @@
 ---
 extends: default
+
 rules:
   line-length:
     max: 120
     level: warning
+
+ignore: |
+  .github/stale.yml
+  .travis.yml
diff --git a/provisioning/roles/geerlingguy.apache/README.md b/provisioning/roles/geerlingguy.apache/README.md
index b4f52ec4f..a0888c18c 100644
--- a/provisioning/roles/geerlingguy.apache/README.md
+++ b/provisioning/roles/geerlingguy.apache/README.md
@@ -1,6 +1,6 @@
 # Ansible Role: Apache 2.x
 
-[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-apache.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-apache)
+[![CI](https://github.com/geerlingguy/ansible-role-apache/workflows/CI/badge.svg?event=push)](https://github.com/geerlingguy/ansible-role-apache/actions?query=workflow%3ACI)
 
 An Ansible Role that installs Apache 2.x on RHEL/CentOS, Debian/Ubuntu, SLES and Solaris.
 
diff --git a/provisioning/roles/geerlingguy.apache/meta/main.yml b/provisioning/roles/geerlingguy.apache/meta/main.yml
index 16cc210bd..5a28c0542 100644
--- a/provisioning/roles/geerlingguy.apache/meta/main.yml
+++ b/provisioning/roles/geerlingguy.apache/meta/main.yml
@@ -2,6 +2,7 @@
 dependencies: []
 
 galaxy_info:
+  role_name: apache
   author: geerlingguy
   description: Apache 2.x for Linux.
   company: "Midwestern Mac, LLC"
diff --git a/provisioning/roles/geerlingguy.apache/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.apache/molecule/default/converge.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.apache/molecule/default/playbook.yml
rename to provisioning/roles/geerlingguy.apache/molecule/default/converge.yml
diff --git a/provisioning/roles/geerlingguy.apache/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.apache/molecule/default/molecule.yml
index 2ca6feaf9..0714c439d 100644
--- a/provisioning/roles/geerlingguy.apache/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.apache/molecule/default/molecule.yml
@@ -3,10 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
-  options:
-    config-file: molecule/default/yaml-lint.yml
 platforms:
   - name: instance
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
@@ -17,13 +13,6 @@ platforms:
     pre_build_image: true
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
+  log: true
   playbooks:
-    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
-scenario:
-  name: default
-verifier:
-  name: testinfra
-  lint:
-    name: flake8
+    converge: ${MOLECULE_PLAYBOOK:-converge.yml}
diff --git a/provisioning/roles/geerlingguy.apache/tasks/configure-Debian.yml b/provisioning/roles/geerlingguy.apache/tasks/configure-Debian.yml
index e115e61e4..e9b2ad432 100644
--- a/provisioning/roles/geerlingguy.apache/tasks/configure-Debian.yml
+++ b/provisioning/roles/geerlingguy.apache/tasks/configure-Debian.yml
@@ -5,6 +5,7 @@
     regexp: "{{ item.regexp }}"
     line: "{{ item.line }}"
     state: present
+    mode: 0644
   with_items: "{{ apache_ports_configuration_items }}"
   notify: restart apache
 
@@ -13,6 +14,7 @@
     src: "{{ apache_server_root }}/mods-available/{{ item }}"
     dest: "{{ apache_server_root }}/mods-enabled/{{ item }}"
     state: link
+    mode: 0644
   with_items: "{{ apache_mods_enabled }}"
   notify: restart apache
 
@@ -43,6 +45,7 @@
     src: "{{ apache_conf_path }}/sites-available/{{ apache_vhosts_filename }}"
     dest: "{{ apache_conf_path }}/sites-enabled/{{ apache_vhosts_filename }}"
     state: link
+    mode: 0644
   notify: restart apache
   when: apache_create_vhosts | bool
 
diff --git a/provisioning/roles/geerlingguy.apache/tasks/configure-RedHat.yml b/provisioning/roles/geerlingguy.apache/tasks/configure-RedHat.yml
index 95675e45c..857746149 100644
--- a/provisioning/roles/geerlingguy.apache/tasks/configure-RedHat.yml
+++ b/provisioning/roles/geerlingguy.apache/tasks/configure-RedHat.yml
@@ -5,6 +5,7 @@
     regexp: "{{ item.regexp }}"
     line: "{{ item.line }}"
     state: present
+    mode: 0644
   with_items: "{{ apache_ports_configuration_items }}"
   notify: restart apache
 
diff --git a/provisioning/roles/geerlingguy.apache/tasks/configure-Solaris.yml b/provisioning/roles/geerlingguy.apache/tasks/configure-Solaris.yml
index b6c121bae..2fbf83207 100644
--- a/provisioning/roles/geerlingguy.apache/tasks/configure-Solaris.yml
+++ b/provisioning/roles/geerlingguy.apache/tasks/configure-Solaris.yml
@@ -5,6 +5,7 @@
     regexp: "{{ item.regexp }}"
     line: "{{ item.line }}"
     state: present
+    mode: 0644
   with_items: "{{ apache_ports_configuration_items }}"
   notify: restart apache
 
diff --git a/provisioning/roles/geerlingguy.apache/tasks/configure-Suse.yml b/provisioning/roles/geerlingguy.apache/tasks/configure-Suse.yml
index 54d4d1c1f..9f084cfd7 100644
--- a/provisioning/roles/geerlingguy.apache/tasks/configure-Suse.yml
+++ b/provisioning/roles/geerlingguy.apache/tasks/configure-Suse.yml
@@ -5,6 +5,7 @@
     regexp: "{{ item.regexp }}"
     line: "{{ item.line }}"
     state: present
+    mode: 0644
   with_items: "{{ apache_ports_configuration_items }}"
   notify: restart apache
 
diff --git a/provisioning/roles/geerlingguy.daemonize/.ansible-lint b/provisioning/roles/geerlingguy.daemonize/.ansible-lint
new file mode 100644
index 000000000..555729425
--- /dev/null
+++ b/provisioning/roles/geerlingguy.daemonize/.ansible-lint
@@ -0,0 +1,2 @@
+skip_list:
+  - '106'
diff --git a/provisioning/roles/geerlingguy.daemonize/.github/FUNDING.yml b/provisioning/roles/geerlingguy.daemonize/.github/FUNDING.yml
new file mode 100644
index 000000000..96b493831
--- /dev/null
+++ b/provisioning/roles/geerlingguy.daemonize/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+---
+github: geerlingguy
+patreon: geerlingguy
diff --git a/provisioning/roles/geerlingguy.daemonize/.github/stale.yml b/provisioning/roles/geerlingguy.daemonize/.github/stale.yml
new file mode 100644
index 000000000..c7ff12754
--- /dev/null
+++ b/provisioning/roles/geerlingguy.daemonize/.github/stale.yml
@@ -0,0 +1,56 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 90
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 30
+
+# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
+onlyLabels: []
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - pinned
+  - security
+  - planned
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: false
+
+# Label to use when marking as stale
+staleLabel: stale
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+pulls:
+  markComment: |-
+    This pull request has been marked 'stale' due to lack of recent activity. If there is no further activity, the PR will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark pull requests as stale.
+
+  unmarkComment: >-
+    This pull request is no longer marked for closure.
+
+  closeComment: >-
+    This pull request has been closed due to inactivity. If you feel this is in error, please reopen the pull request or file a new PR with the relevant details.
+
+issues:
+  markComment: |-
+    This issue has been marked 'stale' due to lack of recent activity. If there is no further activity, the issue will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark issues as stale.
+
+  unmarkComment: >-
+    This issue is no longer marked for closure.
+
+  closeComment: >-
+    This issue has been closed due to inactivity. If you feel this is in error, please reopen the issue or file a new issue with the relevant details.
diff --git a/provisioning/roles/geerlingguy.daemonize/.github/workflows/ci.yml b/provisioning/roles/geerlingguy.daemonize/.github/workflows/ci.yml
new file mode 100644
index 000000000..4c3c89e84
--- /dev/null
+++ b/provisioning/roles/geerlingguy.daemonize/.github/workflows/ci.yml
@@ -0,0 +1,67 @@
+---
+name: CI
+'on':
+  pull_request:
+  push:
+    branches:
+      - master
+  schedule:
+    - cron: "30 6 * * 0"
+
+defaults:
+  run:
+    working-directory: 'geerlingguy.daemonize'
+
+jobs:
+
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.daemonize'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies.
+        run: pip3 install yamllint ansible-lint
+
+      - name: Lint code.
+        run: |
+          yamllint .
+          ansible-lint
+
+  molecule:
+    name: Molecule
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        distro:
+          - centos7
+          - ubuntu1804
+
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.daemonize'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies.
+        run: pip3 install ansible molecule[docker] docker
+
+      - name: Run Molecule tests.
+        run: molecule test
+        env:
+          PY_COLORS: '1'
+          ANSIBLE_FORCE_COLOR: '1'
+          MOLECULE_DISTRO: ${{ matrix.distro }}
diff --git a/provisioning/roles/geerlingguy.daemonize/.github/workflows/release.yml b/provisioning/roles/geerlingguy.daemonize/.github/workflows/release.yml
new file mode 100644
index 000000000..e733f503b
--- /dev/null
+++ b/provisioning/roles/geerlingguy.daemonize/.github/workflows/release.yml
@@ -0,0 +1,38 @@
+---
+# This workflow requires a GALAXY_API_KEY secret present in the GitHub
+# repository or organization.
+#
+# See: https://github.com/marketplace/actions/publish-ansible-role-to-galaxy
+# See: https://github.com/ansible/galaxy/issues/46
+
+name: Release
+'on':
+  push:
+    tags:
+      - '*'
+
+defaults:
+  run:
+    working-directory: 'geerlingguy.daemonize'
+
+jobs:
+
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.daemonize'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install Ansible.
+        run: pip3 install ansible-base
+
+      - name: Trigger a new import on Galaxy.
+        run: ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }} $(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} | cut -d/ -f2)
diff --git a/provisioning/roles/geerlingguy.daemonize/.gitignore b/provisioning/roles/geerlingguy.daemonize/.gitignore
index c9b2377e3..f56f5b578 100644
--- a/provisioning/roles/geerlingguy.daemonize/.gitignore
+++ b/provisioning/roles/geerlingguy.daemonize/.gitignore
@@ -1,2 +1,3 @@
 *.retry
-tests/test.sh
+*/__pycache__
+*.pyc
diff --git a/provisioning/roles/geerlingguy.daemonize/.travis.yml b/provisioning/roles/geerlingguy.daemonize/.travis.yml
deleted file mode 100644
index b3d24462e..000000000
--- a/provisioning/roles/geerlingguy.daemonize/.travis.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-services: docker
-
-env:
-  - distro: centos7
-  - distro: centos6
-  - distro: ubuntu1604
-  - distro: ubuntu1404
-  - distro: ubuntu1204
-
-script:
-  # Configure test script so we can run extra tests after playbook is run.
-  - export container_id=$(date +%s)
-  - export cleanup=false
-
-  # Download test shim.
-  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
-  - chmod +x ${PWD}/tests/test.sh
-
-  # Run tests.
-  - ${PWD}/tests/test.sh
-
-  # Ensure daemonize is available.
-  - 'docker exec --tty ${container_id} env TERM=xterm which daemonize'
-
-notifications:
-  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.ruby/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.daemonize/.yamllint
similarity index 61%
rename from provisioning/roles/geerlingguy.ruby/molecule/default/yaml-lint.yml
rename to provisioning/roles/geerlingguy.daemonize/.yamllint
index a3dbc38ee..f2033dd21 100644
--- a/provisioning/roles/geerlingguy.ruby/molecule/default/yaml-lint.yml
+++ b/provisioning/roles/geerlingguy.daemonize/.yamllint
@@ -1,6 +1,11 @@
 ---
 extends: default
+
 rules:
   line-length:
     max: 120
     level: warning
+
+ignore: |
+  .github/stale.yml
+  .travis.yml
diff --git a/provisioning/roles/geerlingguy.daemonize/README.md b/provisioning/roles/geerlingguy.daemonize/README.md
index 3f1f2d974..2f7f0118b 100644
--- a/provisioning/roles/geerlingguy.daemonize/README.md
+++ b/provisioning/roles/geerlingguy.daemonize/README.md
@@ -1,6 +1,6 @@
 # Ansible Role: Daemonize
 
-[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-daemonize.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-daemonize)
+[![CI](https://github.com/geerlingguy/ansible-role-daemonize/workflows/CI/badge.svg?event=push)](https://github.com/geerlingguy/ansible-role-daemonize/actions?query=workflow%3ACI)
 
 Installs [Daemonize](http://software.clapper.org/daemonize/), a tool for running commands as a Unix daemon.
 
diff --git a/provisioning/roles/geerlingguy.daemonize/meta/main.yml b/provisioning/roles/geerlingguy.daemonize/meta/main.yml
index 09258d152..2711c4bc4 100644
--- a/provisioning/roles/geerlingguy.daemonize/meta/main.yml
+++ b/provisioning/roles/geerlingguy.daemonize/meta/main.yml
@@ -2,25 +2,26 @@
 dependencies: []
 
 galaxy_info:
+  role_name: daemonize
   author: geerlingguy
   description: "Daemonize for Unix-like operating systems"
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 1.6
+  min_ansible_version: 2.0
   platforms:
-  - name: EL
-    versions:
-    - all
-  - name: Ubuntu
-    versions:
-    - all
-  - name: Debian
-    versions:
-    - all
-  - name: GenericUNIX
-    versions:
-    - all
-    - any
+    - name: EL
+      versions:
+        - all
+    - name: Ubuntu
+      versions:
+        - all
+    - name: Debian
+      versions:
+        - all
+    - name: GenericUNIX
+      versions:
+        - all
+        - any
   galaxy_tags:
     - development
     - web
diff --git a/provisioning/roles/geerlingguy.daemonize/tests/test.yml b/provisioning/roles/geerlingguy.daemonize/molecule/default/converge.yml
similarity index 89%
rename from provisioning/roles/geerlingguy.daemonize/tests/test.yml
rename to provisioning/roles/geerlingguy.daemonize/molecule/default/converge.yml
index 3b4e619d7..7ef4de602 100644
--- a/provisioning/roles/geerlingguy.daemonize/tests/test.yml
+++ b/provisioning/roles/geerlingguy.daemonize/molecule/default/converge.yml
@@ -1,5 +1,7 @@
 ---
-- hosts: all
+- name: Converge
+  hosts: all
+  become: true
 
   pre_tasks:
     - name: Ensure build dependencies are installed (RedHat).
@@ -25,4 +27,4 @@
       when: ansible_os_family == 'Debian'
 
   roles:
-    - role_under_test
+    - role: geerlingguy.daemonize
diff --git a/provisioning/roles/geerlingguy.daemonize/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.daemonize/molecule/default/molecule.yml
new file mode 100644
index 000000000..74907107f
--- /dev/null
+++ b/provisioning/roles/geerlingguy.daemonize/molecule/default/molecule.yml
@@ -0,0 +1,17 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+platforms:
+  - name: instance
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    privileged: true
+    pre_build_image: true
+provisioner:
+  name: ansible
+  playbooks:
+    converge: ${MOLECULE_PLAYBOOK:-converge.yml}
diff --git a/provisioning/roles/geerlingguy.daemonize/tasks/main.yml b/provisioning/roles/geerlingguy.daemonize/tasks/main.yml
index 4a69bf555..765cfbdb6 100644
--- a/provisioning/roles/geerlingguy.daemonize/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.daemonize/tasks/main.yml
@@ -9,7 +9,8 @@
     src: "{{ workspace }}/daemonize-{{ daemonize_version }}.tar.gz"
     dest: "{{ workspace }}"
     creates: "{{ workspace }}/daemonize-release-{{ daemonize_version }}/INSTALL"
-    copy: no
+    copy: false
+    mode: 0755
 
 - name: Check if daemonize is installed.
   command: which daemonize
@@ -22,8 +23,9 @@
     {{ item }}
     chdir={{ workspace }}/daemonize-release-{{ daemonize_version }}
   when: daemonize_installed.rc != 0
+  ignore_errors: "{{ ansible_check_mode }}"
   with_items:
     - "./configure --prefix={{ daemonize_install_path }}"
     - make
     - make install
-  become: yes
+  become: true
diff --git a/provisioning/roles/geerlingguy.daemonize/tests/README.md b/provisioning/roles/geerlingguy.daemonize/tests/README.md
deleted file mode 100644
index 6fb211721..000000000
--- a/provisioning/roles/geerlingguy.daemonize/tests/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Ansible Role tests
-
-To run the test playbook(s) in this directory:
-
-  1. Install and start Docker.
-  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
-    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
-  1. Make the test shim executable: `chmod +x tests/test.sh`.
-  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
-
-If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/provisioning/roles/geerlingguy.elasticsearch/.github/workflows/ci.yml b/provisioning/roles/geerlingguy.elasticsearch/.github/workflows/ci.yml
new file mode 100644
index 000000000..6e6f3f7c6
--- /dev/null
+++ b/provisioning/roles/geerlingguy.elasticsearch/.github/workflows/ci.yml
@@ -0,0 +1,67 @@
+---
+name: CI
+'on':
+  pull_request:
+  push:
+    branches:
+      - master
+  schedule:
+    - cron: "30 4 * * 1"
+
+defaults:
+  run:
+    working-directory: 'geerlingguy.elasticsearch'
+
+jobs:
+
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.elasticsearch'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies.
+        run: pip3 install yamllint ansible-lint
+
+      - name: Lint code.
+        run: |
+          yamllint .
+          ansible-lint
+
+  molecule:
+    name: Molecule
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        distro:
+          - centos7
+          - ubuntu1804
+
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.elasticsearch'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies.
+        run: pip3 install ansible molecule[docker] docker
+
+      - name: Run Molecule tests.
+        run: molecule test
+        env:
+          PY_COLORS: '1'
+          ANSIBLE_FORCE_COLOR: '1'
+          MOLECULE_DISTRO: ${{ matrix.distro }}
diff --git a/provisioning/roles/geerlingguy.elasticsearch/.github/workflows/release.yml b/provisioning/roles/geerlingguy.elasticsearch/.github/workflows/release.yml
new file mode 100644
index 000000000..3fcb691d3
--- /dev/null
+++ b/provisioning/roles/geerlingguy.elasticsearch/.github/workflows/release.yml
@@ -0,0 +1,38 @@
+---
+# This workflow requires a GALAXY_API_KEY secret present in the GitHub
+# repository or organization.
+#
+# See: https://github.com/marketplace/actions/publish-ansible-role-to-galaxy
+# See: https://github.com/ansible/galaxy/issues/46
+
+name: Release
+'on':
+  push:
+    tags:
+      - '*'
+
+defaults:
+  run:
+    working-directory: 'geerlingguy.elasticsearch'
+
+jobs:
+
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.elasticsearch'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install Ansible.
+        run: pip3 install ansible-base
+
+      - name: Trigger a new import on Galaxy.
+        run: ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }} $(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} | cut -d/ -f2)
diff --git a/provisioning/roles/geerlingguy.elasticsearch/.travis.yml b/provisioning/roles/geerlingguy.elasticsearch/.travis.yml
deleted file mode 100644
index 739944328..000000000
--- a/provisioning/roles/geerlingguy.elasticsearch/.travis.yml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-language: python
-services: docker
-
-env:
-  global:
-    - ROLE_NAME: elasticsearch
-  matrix:
-    - MOLECULE_DISTRO: centos7
-    - MOLECULE_DISTRO: ubuntu1804
-    - MOLECULE_DISTRO: ubuntu1604
-
-before_install:
-  # Upgrade Docker to work with docker-py.
-  - curl https://gist.githubusercontent.com/geerlingguy/ce883ad4aec6a5f1187ef93bd338511e/raw/36612d28981d92863f839c5aefe5b7dd7193d6c6/travis-ci-docker-upgrade.sh | sudo bash
-
-install:
-  # Install test dependencies.
-  - pip install molecule yamllint ansible-lint docker
-
-before_script:
-  # Use actual Ansible Galaxy role name for the project directory.
-  - cd ../
-  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
-  - cd geerlingguy.$ROLE_NAME
-
-script:
-  # Run tests.
-  - molecule test
-
-notifications:
-  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.elasticsearch/README.md b/provisioning/roles/geerlingguy.elasticsearch/README.md
index 9d1082bc1..f6b2aa107 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/README.md
+++ b/provisioning/roles/geerlingguy.elasticsearch/README.md
@@ -1,6 +1,6 @@
 # Ansible Role: Elasticsearch
 
-[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-elasticsearch.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-elasticsearch)
+[![CI](https://github.com/geerlingguy/ansible-role-elasticsearch/workflows/CI/badge.svg?event=push)](https://github.com/geerlingguy/ansible-role-elasticsearch/actions?query=workflow%3ACI)
 
 An Ansible Role that installs Elasticsearch on RedHat/CentOS or Debian/Ubuntu.
 
diff --git a/provisioning/roles/geerlingguy.elasticsearch/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.elasticsearch/molecule/default/molecule.yml
index 2da47dd1f..74907107f 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.elasticsearch/molecule/default/molecule.yml
@@ -3,10 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint: |
-  set -e
-  yamllint .
-  ansible-lint
 platforms:
   - name: instance
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
diff --git a/provisioning/roles/geerlingguy.elasticsearch/tasks/main.yml b/provisioning/roles/geerlingguy.elasticsearch/tasks/main.yml
index 10af4d5cb..362ede22a 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.elasticsearch/tasks/main.yml
@@ -10,7 +10,20 @@
     name: elasticsearch
     state: "{{ elasticsearch_package_state }}"
 
-- name: Configure Elasticsearch.
+- name: Configure Elasticsearch 6 or below.
+  template:
+    src: "{{ item | basename }}.j2"
+    dest: "{{ item }}"
+    owner: root
+    group: elasticsearch
+    mode: 0660
+  with_items:
+    - /etc/elasticsearch/elasticsearch.yml
+    - /etc/elasticsearch/jvm.options
+  notify: restart elasticsearch
+  when: elasticsearch_version[0] | int < 7
+
+- name: Configure Elasticsearch 7+.
   template:
     src: "{{ item | basename }}.j2"
     dest: "{{ item }}"
@@ -21,6 +34,7 @@
     - /etc/elasticsearch/elasticsearch.yml
     - /etc/elasticsearch/jvm.options.d/heap.options
   notify: restart elasticsearch
+  when: elasticsearch_version[0] | int >= 7
 
 - name: Force a restart if configuration has changed.
   meta: flush_handlers
diff --git a/provisioning/roles/geerlingguy.elasticsearch/templates/jvm.options.j2 b/provisioning/roles/geerlingguy.elasticsearch/templates/jvm.options.j2
new file mode 100644
index 000000000..d45ea640d
--- /dev/null
+++ b/provisioning/roles/geerlingguy.elasticsearch/templates/jvm.options.j2
@@ -0,0 +1,128 @@
+## JVM configuration
+
+################################################################
+## IMPORTANT: JVM heap size
+################################################################
+##
+## You should always set the min and max JVM heap
+## size to the same value. For example, to set
+## the heap to 4 GB, set:
+##
+## -Xms4g
+## -Xmx4g
+##
+## See https://www.elastic.co/guide/en/elasticsearch/reference/current/heap-size.html
+## for more information
+##
+################################################################
+
+# Xms represents the initial size of total heap space
+# Xmx represents the maximum size of total heap space
+
+-Xms{{ elasticsearch_heap_size_min }}
+-Xmx{{ elasticsearch_heap_size_max }}
+
+################################################################
+## Expert settings
+################################################################
+##
+## All settings below this section are considered
+## expert settings. Don't tamper with them unless
+## you understand what you are doing
+##
+################################################################
+
+## GC configuration
+8-13:-XX:+UseConcMarkSweepGC
+8-13:-XX:CMSInitiatingOccupancyFraction=75
+8-13:-XX:+UseCMSInitiatingOccupancyOnly
+
+## G1GC Configuration
+# NOTE: G1 GC is only supported on JDK version 10 or later
+# to use G1GC, uncomment the next two lines and update the version on the
+# following three lines to your version of the JDK
+# 10-13:-XX:-UseConcMarkSweepGC
+# 10-13:-XX:-UseCMSInitiatingOccupancyOnly
+14-:-XX:+UseG1GC
+14-:-XX:G1ReservePercent=25
+14-:-XX:InitiatingHeapOccupancyPercent=30
+
+## DNS cache policy
+# cache ttl in seconds for positive DNS lookups noting that this overrides the
+# JDK security property networkaddress.cache.ttl; set to -1 to cache forever
+-Des.networkaddress.cache.ttl=60
+# cache ttl in seconds for negative DNS lookups noting that this overrides the
+# JDK security property networkaddress.cache.negative ttl; set to -1 to cache
+# forever
+-Des.networkaddress.cache.negative.ttl=10
+
+## optimizations
+
+# pre-touch memory pages used by the JVM during initialization
+-XX:+AlwaysPreTouch
+
+## basic
+
+# explicitly set the stack size
+-Xss1m
+
+# set to headless, just in case
+-Djava.awt.headless=true
+
+# ensure UTF-8 encoding by default (e.g. filenames)
+-Dfile.encoding=UTF-8
+
+# use our provided JNA always versus the system one
+-Djna.nosys=true
+
+# turn off a JDK optimization that throws away stack traces for common
+# exceptions because stack traces are important for debugging
+-XX:-OmitStackTraceInFastThrow
+
+# enable helpful NullPointerExceptions (https://openjdk.java.net/jeps/358), if
+# they are supported
+14-:-XX:+ShowCodeDetailsInExceptionMessages
+
+# flags to configure Netty
+-Dio.netty.noUnsafe=true
+-Dio.netty.noKeySetOptimization=true
+-Dio.netty.recycler.maxCapacityPerThread=0
+
+# log4j 2
+-Dlog4j.shutdownHookEnabled=false
+-Dlog4j2.disable.jmx=true
+
+-Djava.io.tmpdir=${ES_TMPDIR}
+
+## heap dumps
+
+# generate a heap dump when an allocation from the Java heap fails
+# heap dumps are created in the working directory of the JVM
+-XX:+HeapDumpOnOutOfMemoryError
+
+# specify an alternative path for heap dumps; ensure the directory exists and
+# has sufficient space
+-XX:HeapDumpPath=data
+
+# specify an alternative path for JVM fatal error logs
+-XX:ErrorFile=logs/hs_err_pid%p.log
+
+## JDK 8 GC logging
+
+8:-XX:+PrintGCDetails
+8:-XX:+PrintGCDateStamps
+8:-XX:+PrintTenuringDistribution
+8:-XX:+PrintGCApplicationStoppedTime
+8:-Xloggc:logs/gc.log
+8:-XX:+UseGCLogFileRotation
+8:-XX:NumberOfGCLogFiles=32
+8:-XX:GCLogFileSize=64m
+
+# JDK 9+ GC logging
+9-:-Xlog:gc*,gc+age=trace,safepoint:file=logs/gc.log:utctime,pid,tags:filecount=32,filesize=64m
+# due to internationalization enhancements in JDK 9 Elasticsearch need to set the provider to COMPAT otherwise
+# time/date parsing will break in an incompatible way for some date patterns and locals
+9-:-Djava.locale.providers=COMPAT
+
+# temporary workaround for C2 bug with JDK 10 on hardware with AVX-512
+10-:-XX:UseAVX=2
diff --git a/provisioning/roles/geerlingguy.firewall/.github/stale.yml b/provisioning/roles/geerlingguy.firewall/.github/stale.yml
new file mode 100644
index 000000000..c7ff12754
--- /dev/null
+++ b/provisioning/roles/geerlingguy.firewall/.github/stale.yml
@@ -0,0 +1,56 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 90
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 30
+
+# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
+onlyLabels: []
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - pinned
+  - security
+  - planned
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: false
+
+# Label to use when marking as stale
+staleLabel: stale
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+pulls:
+  markComment: |-
+    This pull request has been marked 'stale' due to lack of recent activity. If there is no further activity, the PR will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark pull requests as stale.
+
+  unmarkComment: >-
+    This pull request is no longer marked for closure.
+
+  closeComment: >-
+    This pull request has been closed due to inactivity. If you feel this is in error, please reopen the pull request or file a new PR with the relevant details.
+
+issues:
+  markComment: |-
+    This issue has been marked 'stale' due to lack of recent activity. If there is no further activity, the issue will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark issues as stale.
+
+  unmarkComment: >-
+    This issue is no longer marked for closure.
+
+  closeComment: >-
+    This issue has been closed due to inactivity. If you feel this is in error, please reopen the issue or file a new issue with the relevant details.
diff --git a/provisioning/roles/geerlingguy.firewall/.travis.yml b/provisioning/roles/geerlingguy.firewall/.travis.yml
index 25675a7c9..0d9b903ac 100644
--- a/provisioning/roles/geerlingguy.firewall/.travis.yml
+++ b/provisioning/roles/geerlingguy.firewall/.travis.yml
@@ -14,7 +14,7 @@ env:
 
 install:
   # Install test dependencies.
-  - pip install molecule docker
+  - pip install molecule yamllint ansible-lint docker
 
 before_script:
   # Use actual Ansible Galaxy role name for the project directory.
diff --git a/provisioning/roles/geerlingguy.apache/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.firewall/.yamllint
similarity index 100%
rename from provisioning/roles/geerlingguy.apache/molecule/default/yaml-lint.yml
rename to provisioning/roles/geerlingguy.firewall/.yamllint
diff --git a/provisioning/roles/geerlingguy.firewall/README.md b/provisioning/roles/geerlingguy.firewall/README.md
index e69302ebd..ac7dbdc14 100644
--- a/provisioning/roles/geerlingguy.firewall/README.md
+++ b/provisioning/roles/geerlingguy.firewall/README.md
@@ -21,6 +21,10 @@ Available variables are listed below, along with default values (see `defaults/m
 
 Controls the state of the firewall service; whether it should be running (`firewall_state`) and/or enabled on system boot (`firewall_enabled_at_boot`).
 
+    firewall_flush_rules_and_chains: true
+
+Whether to flush all rules and chains whenever the firewall is restarted. Set this to `false` if there are other processes managing iptables (e.g. Docker).
+
     firewall_allowed_tcp_ports:
       - "22"
       - "80"
diff --git a/provisioning/roles/geerlingguy.firewall/defaults/main.yml b/provisioning/roles/geerlingguy.firewall/defaults/main.yml
index decf51503..d23986ebd 100644
--- a/provisioning/roles/geerlingguy.firewall/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.firewall/defaults/main.yml
@@ -2,6 +2,8 @@
 firewall_state: started
 firewall_enabled_at_boot: true
 
+firewall_flush_rules_and_chains: true
+
 firewall_allowed_tcp_ports:
   - "22"
   - "25"
diff --git a/provisioning/roles/geerlingguy.firewall/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.firewall/molecule/default/converge.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.firewall/molecule/default/playbook.yml
rename to provisioning/roles/geerlingguy.firewall/molecule/default/converge.yml
diff --git a/provisioning/roles/geerlingguy.firewall/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.firewall/molecule/default/molecule.yml
index eac4b0efb..47c232d37 100644
--- a/provisioning/roles/geerlingguy.firewall/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.firewall/molecule/default/molecule.yml
@@ -3,10 +3,10 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
-  options:
-    config-file: molecule/default/yaml-lint.yml
+lint: |
+  set -e
+  yamllint .
+  ansible-lint
 platforms:
   - name: instance
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
@@ -17,12 +17,9 @@ platforms:
     pre_build_image: true
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
   playbooks:
-    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
+    converge: ${MOLECULE_PLAYBOOK:-converge.yml}
 scenario:
-  name: default
   test_sequence:
     - lint
     - destroy
@@ -36,7 +33,3 @@ scenario:
     - side_effect
     - verify
     - destroy
-verifier:
-  name: testinfra
-  lint:
-    name: flake8
diff --git a/provisioning/roles/geerlingguy.firewall/templates/firewall.bash.j2 b/provisioning/roles/geerlingguy.firewall/templates/firewall.bash.j2
index d816d0160..ac32abc53 100755
--- a/provisioning/roles/geerlingguy.firewall/templates/firewall.bash.j2
+++ b/provisioning/roles/geerlingguy.firewall/templates/firewall.bash.j2
@@ -1,8 +1,8 @@
 #!/bin/bash
-# iptables firewall for common LAMP servers.
+# iptables firewall.
 #
 # This file should be located at /etc/firewall.bash, and is meant to work with
-# Jeff Geerling's firewall init script.
+# the `geerlingguy.firewall` Ansible role.
 #
 # Common port reference:
 #   22: SSH
@@ -11,12 +11,7 @@
 #   123: NTP
 #   443: HTTPS
 #   2222: SSH alternate
-#   4949: Munin
-#   6082: Varnish admin
-#   8080: HTTP alternate (often used with Tomcat)
-#   8983: Tomcat HTTP
-#   8443: Tomcat HTTPS
-#   9000: SonarQube
+#   8080: HTTP alternate
 #
 # @author Jeff Geerling
 
@@ -29,14 +24,18 @@ echo 1 > $filter
 done
 fi
 
-# Completely reset the firewall by removing all rules and chains.
+# Set the default rules.
 iptables -P INPUT ACCEPT
 iptables -P FORWARD ACCEPT
 iptables -P OUTPUT ACCEPT
+
+{% if firewall_flush_rules_and_chains %}
+# Remove all rules and chains.
 iptables -t nat -F
 iptables -t mangle -F
 iptables -F
 iptables -X
+{% endif %}
 
 # Accept traffic from loopback interface (localhost).
 iptables -A INPUT -i lo -j ACCEPT
@@ -91,21 +90,23 @@ iptables -A INPUT -j DROP
 # Configure IPv6 if ip6tables is present.
 if [ -x "$(which ip6tables 2>/dev/null)" ]; then
 
+{% if firewall_flush_rules_and_chains %}
   # Remove all rules and chains.
   ip6tables -F
   ip6tables -X
+{% endif %}
 
   # Accept traffic from loopback interface (localhost).
   ip6tables -A INPUT -i lo -j ACCEPT
 
   # Open ports.
-  {# Add a rule for each open port #}
-  {% for port in firewall_allowed_tcp_ports %}
+{# Add a rule for each open port #}
+{% for port in firewall_allowed_tcp_ports %}
   ip6tables -A INPUT -p tcp -m tcp --dport {{ port }} -j ACCEPT
-  {% endfor %}
-  {% for port in firewall_allowed_udp_ports %}
+{% endfor %}
+{% for port in firewall_allowed_udp_ports %}
   ip6tables -A INPUT -p udp -m udp --dport {{ port }} -j ACCEPT
-  {% endfor %}
+{% endfor %}
 
   # Accept icmp ping requests.
   ip6tables -A INPUT -p icmpv6 -j ACCEPT
@@ -115,9 +116,9 @@ if [ -x "$(which ip6tables 2>/dev/null)" ]; then
   ip6tables -A INPUT -p udp --sport 123 -j ACCEPT
 
   # Additional custom rules.
-  {% for rule in firewall_ip6_additional_rules %}
+{% for rule in firewall_ip6_additional_rules %}
   {{ rule }}
-  {% endfor %}
+{% endfor %}
 
   # Allow established connections:
   ip6tables -A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT
@@ -125,10 +126,10 @@ if [ -x "$(which ip6tables 2>/dev/null)" ]; then
   # Log EVERYTHING (ONLY for Debug).
   # ip6tables -A INPUT -j LOG
 
-  {% if firewall_log_dropped_packets %}
+{% if firewall_log_dropped_packets %}
   # Log other incoming requests (all of which are dropped) at 15/minute max.
   ip6tables -A INPUT -m limit --limit 15/minute -j LOG --log-level 7 --log-prefix "Dropped by firewall: "
-  {% endif %}
+{% endif %}
 
   # Drop all other traffic.
   ip6tables -A INPUT -j DROP
diff --git a/provisioning/roles/geerlingguy.git/.github/FUNDING.yml b/provisioning/roles/geerlingguy.git/.github/FUNDING.yml
new file mode 100644
index 000000000..96b493831
--- /dev/null
+++ b/provisioning/roles/geerlingguy.git/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+---
+github: geerlingguy
+patreon: geerlingguy
diff --git a/provisioning/roles/geerlingguy.git/.github/stale.yml b/provisioning/roles/geerlingguy.git/.github/stale.yml
new file mode 100644
index 000000000..c7ff12754
--- /dev/null
+++ b/provisioning/roles/geerlingguy.git/.github/stale.yml
@@ -0,0 +1,56 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 90
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 30
+
+# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
+onlyLabels: []
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - pinned
+  - security
+  - planned
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: false
+
+# Label to use when marking as stale
+staleLabel: stale
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+pulls:
+  markComment: |-
+    This pull request has been marked 'stale' due to lack of recent activity. If there is no further activity, the PR will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark pull requests as stale.
+
+  unmarkComment: >-
+    This pull request is no longer marked for closure.
+
+  closeComment: >-
+    This pull request has been closed due to inactivity. If you feel this is in error, please reopen the pull request or file a new PR with the relevant details.
+
+issues:
+  markComment: |-
+    This issue has been marked 'stale' due to lack of recent activity. If there is no further activity, the issue will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark issues as stale.
+
+  unmarkComment: >-
+    This issue is no longer marked for closure.
+
+  closeComment: >-
+    This issue has been closed due to inactivity. If you feel this is in error, please reopen the issue or file a new issue with the relevant details.
diff --git a/provisioning/roles/geerlingguy.git/.travis.yml b/provisioning/roles/geerlingguy.git/.travis.yml
index 742ed3b71..23e723a5d 100644
--- a/provisioning/roles/geerlingguy.git/.travis.yml
+++ b/provisioning/roles/geerlingguy.git/.travis.yml
@@ -18,7 +18,7 @@ env:
 
 install:
   # Install test dependencies.
-  - pip install molecule docker
+  - pip install molecule yamllint ansible-lint docker
 
 before_script:
   # Use actual Ansible Galaxy role name for the project directory.
diff --git a/provisioning/roles/geerlingguy.git/molecule/default/yaml-lint.yml b/provisioning/roles/geerlingguy.git/.yamllint
similarity index 100%
rename from provisioning/roles/geerlingguy.git/molecule/default/yaml-lint.yml
rename to provisioning/roles/geerlingguy.git/.yamllint
diff --git a/provisioning/roles/geerlingguy.git/README.md b/provisioning/roles/geerlingguy.git/README.md
index d1eb74df3..e64a2dee3 100644
--- a/provisioning/roles/geerlingguy.git/README.md
+++ b/provisioning/roles/geerlingguy.git/README.md
@@ -22,13 +22,12 @@ This variable, a well as `git_packages`, will be used to install git via a parti
 
     git_packages:
       - git
-      - git-svn
 
-The specific Git packages that will be installed. By default, `git-svn` is included, but you can easily add this variable to your playbook's variables and remove `git-svn` if desired.
+The specific Git packages that will be installed. By default, only `git` is installed, but you could add additional git-related packages like `git-svn` if desired.
 
     git_install_from_source: false
     git_install_path: "/usr"
-    git_version: "2.16.2"
+    git_version: "2.26.0"
 
 Whether to install Git from source; if set to `true`, `git_version` is required and will be used to install a particular version of git (see all available versions here: https://www.kernel.org/pub/software/scm/git/), and `git_install_path` defines where git should be installed.
 
diff --git a/provisioning/roles/geerlingguy.git/defaults/main.yml b/provisioning/roles/geerlingguy.git/defaults/main.yml
index d01f33254..53d320cc2 100644
--- a/provisioning/roles/geerlingguy.git/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.git/defaults/main.yml
@@ -7,13 +7,12 @@ workspace: /root
 git_enablerepo: ""
 git_packages:
   - git
-  - git-svn
 
 # If set to TRUE, git will be installed from source, using the version set with
 # the 'git_version' variable instead of using a package.
 git_install_from_source: false
 git_install_path: "/usr"
-git_version: "2.16.2"
+git_version: "2.26.0"
 
 # If git is already installed at and older version, force a new source build.
 # Only applies if git_install_from_source is `true`.
diff --git a/provisioning/roles/geerlingguy.git/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.git/molecule/default/converge.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.git/molecule/default/playbook.yml
rename to provisioning/roles/geerlingguy.git/molecule/default/converge.yml
diff --git a/provisioning/roles/geerlingguy.git/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.git/molecule/default/molecule.yml
index 2ca6feaf9..2da47dd1f 100644
--- a/provisioning/roles/geerlingguy.git/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.git/molecule/default/molecule.yml
@@ -3,10 +3,10 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
-  options:
-    config-file: molecule/default/yaml-lint.yml
+lint: |
+  set -e
+  yamllint .
+  ansible-lint
 platforms:
   - name: instance
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
@@ -17,13 +17,5 @@ platforms:
     pre_build_image: true
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
   playbooks:
-    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
-scenario:
-  name: default
-verifier:
-  name: testinfra
-  lint:
-    name: flake8
+    converge: ${MOLECULE_PLAYBOOK:-converge.yml}
diff --git a/provisioning/roles/geerlingguy.git/molecule/default/playbook-source.yml b/provisioning/roles/geerlingguy.git/molecule/default/playbook-source.yml
index 59743635c..02d2d5e8a 100644
--- a/provisioning/roles/geerlingguy.git/molecule/default/playbook-source.yml
+++ b/provisioning/roles/geerlingguy.git/molecule/default/playbook-source.yml
@@ -6,7 +6,7 @@
   vars:
     git_install_from_source: true
     git_install_from_source_force_update: true
-    git_version: "2.16.2"
+    git_version: "2.26.0"
 
   pre_tasks:
     - name: Update apt cache.
diff --git a/provisioning/roles/geerlingguy.mysql/defaults/main.yml b/provisioning/roles/geerlingguy.mysql/defaults/main.yml
index 55bb2cc10..318b16941 100644
--- a/provisioning/roles/geerlingguy.mysql/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.mysql/defaults/main.yml
@@ -41,7 +41,7 @@ mysql_port: "3306"
 mysql_bind_address: '0.0.0.0'
 mysql_skip_name_resolve: false
 mysql_datadir: /var/lib/mysql
-mysql_sql_mode: ''
+mysql_sql_mode: ~
 # The following variables have a default value depending on operating system.
 # mysql_pid_file: /var/run/mysqld/mysqld.pid
 # mysql_socket: /var/lib/mysql/mysql.sock
diff --git a/provisioning/roles/geerlingguy.mysql/templates/my.cnf.j2 b/provisioning/roles/geerlingguy.mysql/templates/my.cnf.j2
index 479b93f22..78e4e9125 100644
--- a/provisioning/roles/geerlingguy.mysql/templates/my.cnf.j2
+++ b/provisioning/roles/geerlingguy.mysql/templates/my.cnf.j2
@@ -14,7 +14,7 @@ pid-file = {{ mysql_pid_file }}
 {% if mysql_skip_name_resolve %}
 skip-name-resolve
 {% endif %}
-{% if mysql_sql_mode %}
+{% if mysql_sql_mode is not none %}
 sql_mode = {{ mysql_sql_mode }}
 {% endif %}
 
diff --git a/provisioning/roles/geerlingguy.php-versions/.ansible-lint b/provisioning/roles/geerlingguy.php-versions/.ansible-lint
index e42fb8085..8d58b475f 100644
--- a/provisioning/roles/geerlingguy.php-versions/.ansible-lint
+++ b/provisioning/roles/geerlingguy.php-versions/.ansible-lint
@@ -1,4 +1,5 @@
 skip_list:
-  - '306'
-  - '503'
-  - '106'
+  - 'yaml'
+  - 'risky-shell-pipe'
+  - 'no-handler'
+  - 'role-name'
diff --git a/provisioning/roles/geerlingguy.php-versions/.github/workflows/ci.yml b/provisioning/roles/geerlingguy.php-versions/.github/workflows/ci.yml
index 686c6e9a2..24f8d52db 100644
--- a/provisioning/roles/geerlingguy.php-versions/.github/workflows/ci.yml
+++ b/provisioning/roles/geerlingguy.php-versions/.github/workflows/ci.yml
@@ -29,12 +29,11 @@ jobs:
           python-version: '3.x'
 
       - name: Install test dependencies.
-        run: pip3 install yamllint ansible-lint
+        run: pip3 install yamllint
 
       - name: Lint code.
         run: |
           yamllint .
-          ansible-lint
 
   molecule:
     name: Molecule
@@ -42,7 +41,7 @@ jobs:
     strategy:
       matrix:
         include:
-          # Default PHP version (7.3).
+          # Default PHP version (7.4).
           - distro: centos8
             playbook: converge.yml
           - distro: centos7
@@ -52,19 +51,21 @@ jobs:
           - distro: debian10
             playbook: converge.yml
 
-          # PHP 7.4.
+          # PHP 8.0.
           - distro: centos8
-            playbook: 7.4.yml
+            playbook: 8.0.yml
           - distro: ubuntu1804
-            playbook: 7.4.yml
+            playbook: 8.0.yml
           - distro: debian10
-            playbook: 7.4.yml
+            playbook: 8.0.yml
 
-          # PHP 7.2.
+          # PHP 7.3.
           - distro: centos8
-            playbook: 7.2.yml
+            playbook: 7.3.yml
           - distro: ubuntu1804
-            playbook: 7.2.yml
+            playbook: 7.3.yml
+          - distro: debian10
+            playbook: 7.3.yml
 
     steps:
       - name: Check out the codebase.
diff --git a/provisioning/roles/geerlingguy.php-versions/README.md b/provisioning/roles/geerlingguy.php-versions/README.md
index 3d15fd789..45274e4d1 100644
--- a/provisioning/roles/geerlingguy.php-versions/README.md
+++ b/provisioning/roles/geerlingguy.php-versions/README.md
@@ -12,9 +12,9 @@ N/A
 
 Available variables are listed below, along with default values (see `defaults/main.yml`):
 
-    php_version: '7.3'
+    php_version: '7.4'
 
-The PHP version to be installed. Any [currently-supported PHP major version](http://php.net/supported-versions.php) is a valid option (e.g. `7.2`, `7.3`, `7.4` etc.).
+The PHP version to be installed. Any [currently-supported PHP major version](http://php.net/supported-versions.php) is a valid option (e.g. `7.3`, `7.4`, or `8.0`).
 
     php_versions_install_recommends: false
 
@@ -28,12 +28,13 @@ The PHP version to be installed. Any [currently-supported PHP major version](htt
 ## Example Playbook
 
     - hosts: webservers
+      become: true
     
       vars:
-        php_version: '7.3'
+        php_version: '7.4'
     
       roles:
-        - role: geerlingguy.repo-remi
+        - name: geerlingguy.repo-remi
           when: ansible_os_family == 'RedHat'
         - geerlingguy.php-versions
         - geerlingguy.php
diff --git a/provisioning/roles/geerlingguy.php-versions/defaults/main.yml b/provisioning/roles/geerlingguy.php-versions/defaults/main.yml
index 289b1bac1..14647c068 100644
--- a/provisioning/roles/geerlingguy.php-versions/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.php-versions/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
 # The PHP version to be installed.
-php_version: '7.3'
+php_version: '7.4'
 
 # For Debian OSes only.
 php_versions_install_recommends: false
diff --git a/provisioning/roles/geerlingguy.php-versions/meta/main.yml b/provisioning/roles/geerlingguy.php-versions/meta/main.yml
index f145cd636..79132db29 100644
--- a/provisioning/roles/geerlingguy.php-versions/meta/main.yml
+++ b/provisioning/roles/geerlingguy.php-versions/meta/main.yml
@@ -2,8 +2,7 @@
 dependencies: []
 
 galaxy_info:
-  # See: https://github.com/ansible/galaxy/issues/2393
-  # role_name: php-versions
+  role_name: php-versions
   author: geerlingguy
   description: Allows different PHP versions to be installed.
   company: "Midwestern Mac, LLC"
diff --git a/provisioning/roles/geerlingguy.php-versions/molecule/default/7.4.yml b/provisioning/roles/geerlingguy.php-versions/molecule/default/7.3.yml
similarity index 95%
rename from provisioning/roles/geerlingguy.php-versions/molecule/default/7.4.yml
rename to provisioning/roles/geerlingguy.php-versions/molecule/default/7.3.yml
index f42e56467..e6e55ca59 100644
--- a/provisioning/roles/geerlingguy.php-versions/molecule/default/7.4.yml
+++ b/provisioning/roles/geerlingguy.php-versions/molecule/default/7.3.yml
@@ -5,7 +5,7 @@
 
   vars:
     php_enable_webserver: false
-    php_version: '7.4'
+    php_version: '7.3'
 
   pre_tasks:
     - name: Update apt cache.
diff --git a/provisioning/roles/geerlingguy.php-versions/molecule/default/7.2.yml b/provisioning/roles/geerlingguy.php-versions/molecule/default/8.0.yml
similarity index 95%
rename from provisioning/roles/geerlingguy.php-versions/molecule/default/7.2.yml
rename to provisioning/roles/geerlingguy.php-versions/molecule/default/8.0.yml
index 6ae3076f8..ca9c75551 100644
--- a/provisioning/roles/geerlingguy.php-versions/molecule/default/7.2.yml
+++ b/provisioning/roles/geerlingguy.php-versions/molecule/default/8.0.yml
@@ -5,7 +5,7 @@
 
   vars:
     php_enable_webserver: false
-    php_version: '7.2'
+    php_version: '8.0'
 
   pre_tasks:
     - name: Update apt cache.
diff --git a/provisioning/roles/geerlingguy.php-versions/tasks/main.yml b/provisioning/roles/geerlingguy.php-versions/tasks/main.yml
index 5c7707984..df5b84b0b 100644
--- a/provisioning/roles/geerlingguy.php-versions/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.php-versions/tasks/main.yml
@@ -5,6 +5,13 @@
     - "{{ role_path }}/vars/{{ ansible_os_family }}.yml"
     - "{{ role_path }}/vars/{{ ansible_os_family }}-php{{ php_version }}.yml"
 
+- name: Remove missing JSON extension for PHP 8.0 (included by default)
+  set_fact:
+    __php_packages: "{{ __php_packages | reject('search','php' + php_version + '-json') | list }}"
+  when:
+    - __php_packages is defined
+    - php_version is version('8.0', '>=')
+
 - name: Define PHP variables.
   set_fact: "{{ item.key }}={{ lookup('vars', item.value) }}"
   when:
diff --git a/provisioning/roles/geerlingguy.php-versions/tasks/setup-RedHat.yml b/provisioning/roles/geerlingguy.php-versions/tasks/setup-RedHat.yml
index 4ba5e6a0b..c20f0025a 100644
--- a/provisioning/roles/geerlingguy.php-versions/tasks/setup-RedHat.yml
+++ b/provisioning/roles/geerlingguy.php-versions/tasks/setup-RedHat.yml
@@ -1,4 +1,6 @@
 ---
+# TODO: PHP 7.2 support will be removed soon. This is only being left in here as
+# a convenience for legacy PHP 7.2 users.
 - name: Enable remi repo for PHP 7.2.
   set_fact: php_enablerepo="remi,remi-php72"
   when: php_version == "7.2"
@@ -11,6 +13,10 @@
   set_fact: php_enablerepo="remi,remi-php74"
   when: php_version == "7.4"
 
+- name: Enable remi repo for PHP 8.0.
+  set_fact: php_enablerepo="remi,remi-php80"
+  when: php_version == "8.0"
+
 # See: https://github.com/ansible/ansible/issues/64852
 - block:
 
diff --git a/provisioning/roles/geerlingguy.php-versions/vars/Debian.yml b/provisioning/roles/geerlingguy.php-versions/vars/Debian.yml
index 06ad544bf..bcaee60a1 100644
--- a/provisioning/roles/geerlingguy.php-versions/vars/Debian.yml
+++ b/provisioning/roles/geerlingguy.php-versions/vars/Debian.yml
@@ -39,6 +39,9 @@ __php_packages:
   - "php{{ php_version }}-yaml"
 
 php_versions_debian:
+  # TODO: PHP 7.2 support will be removed soon. This is only being left in here as
+  # a convenience for legacy PHP 7.2 users.
   - php7.2-common
   - php7.3-common
   - php7.4-common
+  - php8.0-common
diff --git a/provisioning/roles/geerlingguy.repo-epel/.ansible-lint b/provisioning/roles/geerlingguy.repo-epel/.ansible-lint
index 555729425..acc82551f 100644
--- a/provisioning/roles/geerlingguy.repo-epel/.ansible-lint
+++ b/provisioning/roles/geerlingguy.repo-epel/.ansible-lint
@@ -1,2 +1,3 @@
 skip_list:
-  - '106'
+  - 'yaml'
+  - 'role-name'
diff --git a/provisioning/roles/geerlingguy.repo-epel/.github/workflows/ci.yml b/provisioning/roles/geerlingguy.repo-epel/.github/workflows/ci.yml
new file mode 100644
index 000000000..64ebd7574
--- /dev/null
+++ b/provisioning/roles/geerlingguy.repo-epel/.github/workflows/ci.yml
@@ -0,0 +1,66 @@
+---
+name: CI
+'on':
+  pull_request:
+  push:
+    branches:
+      - master
+  schedule:
+    - cron: "30 1 * * 5"
+
+defaults:
+  run:
+    working-directory: 'geerlingguy.repo-epel'
+
+jobs:
+
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.repo-epel'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies.
+        run: pip3 install yamllint
+
+      - name: Lint code.
+        run: |
+          yamllint .
+
+  molecule:
+    name: Molecule
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        distro:
+          - centos8
+          - centos7
+
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.repo-epel'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies.
+        run: pip3 install ansible molecule[docker] docker
+
+      - name: Run Molecule tests.
+        run: molecule test
+        env:
+          PY_COLORS: '1'
+          ANSIBLE_FORCE_COLOR: '1'
+          MOLECULE_DISTRO: ${{ matrix.distro }}
diff --git a/provisioning/roles/geerlingguy.repo-epel/.github/workflows/release.yml b/provisioning/roles/geerlingguy.repo-epel/.github/workflows/release.yml
new file mode 100644
index 000000000..82ad097ed
--- /dev/null
+++ b/provisioning/roles/geerlingguy.repo-epel/.github/workflows/release.yml
@@ -0,0 +1,38 @@
+---
+# This workflow requires a GALAXY_API_KEY secret present in the GitHub
+# repository or organization.
+#
+# See: https://github.com/marketplace/actions/publish-ansible-role-to-galaxy
+# See: https://github.com/ansible/galaxy/issues/46
+
+name: Release
+'on':
+  push:
+    tags:
+      - '*'
+
+defaults:
+  run:
+    working-directory: 'geerlingguy.repo-epel'
+
+jobs:
+
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.repo-epel'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install Ansible.
+        run: pip3 install ansible-base
+
+      - name: Trigger a new import on Galaxy.
+        run: ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }} $(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} | cut -d/ -f2)
diff --git a/provisioning/roles/geerlingguy.repo-epel/.gitignore b/provisioning/roles/geerlingguy.repo-epel/.gitignore
index f56f5b578..8840c8f02 100644
--- a/provisioning/roles/geerlingguy.repo-epel/.gitignore
+++ b/provisioning/roles/geerlingguy.repo-epel/.gitignore
@@ -1,3 +1,5 @@
 *.retry
 */__pycache__
 *.pyc
+.cache
+
diff --git a/provisioning/roles/geerlingguy.repo-epel/.travis.yml b/provisioning/roles/geerlingguy.repo-epel/.travis.yml
deleted file mode 100644
index 725ce9f91..000000000
--- a/provisioning/roles/geerlingguy.repo-epel/.travis.yml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-language: python
-services: docker
-
-env:
-  global:
-    - ROLE_NAME: repo-epel
-  matrix:
-    - MOLECULE_DISTRO: centos8
-    - MOLECULE_DISTRO: centos7
-    - MOLECULE_DISTRO: centos6
-
-before_install:
-  # Upgrade Docker to work with docker-py.
-  - curl https://gist.githubusercontent.com/geerlingguy/ce883ad4aec6a5f1187ef93bd338511e/raw/36612d28981d92863f839c5aefe5b7dd7193d6c6/travis-ci-docker-upgrade.sh | sudo bash
-
-install:
-  # Install test dependencies.
-  - pip install molecule yamllint ansible-lint docker
-
-before_script:
-  # Use actual Ansible Galaxy role name for the project directory.
-  - cd ../
-  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
-  - cd geerlingguy.$ROLE_NAME
-
-script:
-  # Run tests.
-  - molecule test
-
-notifications:
-  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.repo-epel/README.md b/provisioning/roles/geerlingguy.repo-epel/README.md
index 1eea16483..db6da5cbb 100644
--- a/provisioning/roles/geerlingguy.repo-epel/README.md
+++ b/provisioning/roles/geerlingguy.repo-epel/README.md
@@ -1,6 +1,6 @@
 # Ansible Role: EPEL Repository
 
-[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-repo-epel.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-repo-epel)
+[![CI](https://github.com/geerlingguy/ansible-role-repo-epel/workflows/CI/badge.svg?event=push)](https://github.com/geerlingguy/ansible-role-repo-epel/actions?query=workflow%3ACI)
 
 Installs the [EPEL repository](https://fedoraproject.org/wiki/EPEL) (Extra Packages for Enterprise Linux) for RHEL/CentOS.
 
diff --git a/provisioning/roles/geerlingguy.repo-epel/meta/main.yml b/provisioning/roles/geerlingguy.repo-epel/meta/main.yml
index f9674b3f4..af6766cd2 100644
--- a/provisioning/roles/geerlingguy.repo-epel/meta/main.yml
+++ b/provisioning/roles/geerlingguy.repo-epel/meta/main.yml
@@ -2,8 +2,7 @@
 dependencies: []
 
 galaxy_info:
-  # See: https://github.com/ansible/galaxy/issues/2393
-  # role_name: repo-epel
+  role_name: repo-epel
   author: geerlingguy
   description: EPEL repository for RHEL/CentOS.
   company: "Midwestern Mac, LLC"
@@ -12,8 +11,6 @@ galaxy_info:
   platforms:
     - name: EL
       versions:
-        - 5
-        - 6
         - 7
         - 8
   galaxy_tags:
diff --git a/provisioning/roles/geerlingguy.repo-epel/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.repo-epel/molecule/default/molecule.yml
index 2da47dd1f..74907107f 100644
--- a/provisioning/roles/geerlingguy.repo-epel/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.repo-epel/molecule/default/molecule.yml
@@ -3,10 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint: |
-  set -e
-  yamllint .
-  ansible-lint
 platforms:
   - name: instance
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
diff --git a/provisioning/roles/geerlingguy.repo-epel/tasks/main.yml b/provisioning/roles/geerlingguy.repo-epel/tasks/main.yml
index 4dee06358..1c28825aa 100644
--- a/provisioning/roles/geerlingguy.repo-epel/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.repo-epel/tasks/main.yml
@@ -30,6 +30,5 @@
     path: "/etc/yum.repos.d/epel.repo"
     section: epel
     option: enabled
-    value: 0
+    value: "{{ epel_repo_disable | ternary(0, 1) }}"
     mode: 0644
-  when: epel_repo_disable
diff --git a/provisioning/roles/geerlingguy.repo-remi/.travis.yml b/provisioning/roles/geerlingguy.repo-remi/.travis.yml
index 018563e38..a8d04d80c 100644
--- a/provisioning/roles/geerlingguy.repo-remi/.travis.yml
+++ b/provisioning/roles/geerlingguy.repo-remi/.travis.yml
@@ -6,6 +6,7 @@ env:
   global:
     - ROLE_NAME: repo-remi
   matrix:
+    - MOLECULE_DISTRO: ubi8
     - MOLECULE_DISTRO: centos8
     - MOLECULE_DISTRO: centos7
     - MOLECULE_DISTRO: centos6
diff --git a/provisioning/roles/geerlingguy.repo-remi/README.md b/provisioning/roles/geerlingguy.repo-remi/README.md
index 752ef878f..739fe96ea 100644
--- a/provisioning/roles/geerlingguy.repo-remi/README.md
+++ b/provisioning/roles/geerlingguy.repo-remi/README.md
@@ -6,7 +6,7 @@ Installs [Remi's RPM repository](http://rpms.famillecollet.com/) for RHEL/CentOS
 
 ## Requirements
 
-None.
+On RHEL 8 or newer, you should make sure to install or enable the EPEL repository. I recommend using the `geerlingguy.repo-epel` repository.
 
 ## Role Variables
 
diff --git a/provisioning/roles/geerlingguy.repo-remi/molecule/default/converge.yml b/provisioning/roles/geerlingguy.repo-remi/molecule/default/converge.yml
index 9af25d7e9..b07c6ec34 100644
--- a/provisioning/roles/geerlingguy.repo-remi/molecule/default/converge.yml
+++ b/provisioning/roles/geerlingguy.repo-remi/molecule/default/converge.yml
@@ -4,4 +4,5 @@
   become: true
 
   roles:
+    - role: geerlingguy.repo-epel
     - role: geerlingguy.repo-remi
diff --git a/provisioning/roles/geerlingguy.repo-remi/molecule/default/requirements.yml b/provisioning/roles/geerlingguy.repo-remi/molecule/default/requirements.yml
new file mode 100644
index 000000000..1c344b344
--- /dev/null
+++ b/provisioning/roles/geerlingguy.repo-remi/molecule/default/requirements.yml
@@ -0,0 +1,2 @@
+---
+- role: geerlingguy.repo-epel
diff --git a/provisioning/roles/geerlingguy.ruby/.ansible-lint b/provisioning/roles/geerlingguy.ruby/.ansible-lint
index cb8e2acf5..6632e614f 100644
--- a/provisioning/roles/geerlingguy.ruby/.ansible-lint
+++ b/provisioning/roles/geerlingguy.ruby/.ansible-lint
@@ -1,2 +1,3 @@
 skip_list:
   - '405'
+  - '106'
diff --git a/provisioning/roles/geerlingguy.ruby/.github/FUNDING.yml b/provisioning/roles/geerlingguy.ruby/.github/FUNDING.yml
new file mode 100644
index 000000000..96b493831
--- /dev/null
+++ b/provisioning/roles/geerlingguy.ruby/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+---
+github: geerlingguy
+patreon: geerlingguy
diff --git a/provisioning/roles/geerlingguy.ruby/.github/stale.yml b/provisioning/roles/geerlingguy.ruby/.github/stale.yml
new file mode 100644
index 000000000..c7ff12754
--- /dev/null
+++ b/provisioning/roles/geerlingguy.ruby/.github/stale.yml
@@ -0,0 +1,56 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 90
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 30
+
+# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
+onlyLabels: []
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - pinned
+  - security
+  - planned
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: false
+
+# Label to use when marking as stale
+staleLabel: stale
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+pulls:
+  markComment: |-
+    This pull request has been marked 'stale' due to lack of recent activity. If there is no further activity, the PR will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark pull requests as stale.
+
+  unmarkComment: >-
+    This pull request is no longer marked for closure.
+
+  closeComment: >-
+    This pull request has been closed due to inactivity. If you feel this is in error, please reopen the pull request or file a new PR with the relevant details.
+
+issues:
+  markComment: |-
+    This issue has been marked 'stale' due to lack of recent activity. If there is no further activity, the issue will be closed in another 30 days. Thank you for your contribution!
+
+    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark issues as stale.
+
+  unmarkComment: >-
+    This issue is no longer marked for closure.
+
+  closeComment: >-
+    This issue has been closed due to inactivity. If you feel this is in error, please reopen the issue or file a new issue with the relevant details.
diff --git a/provisioning/roles/geerlingguy.ruby/.github/workflows/ci.yml b/provisioning/roles/geerlingguy.ruby/.github/workflows/ci.yml
new file mode 100644
index 000000000..255bac379
--- /dev/null
+++ b/provisioning/roles/geerlingguy.ruby/.github/workflows/ci.yml
@@ -0,0 +1,77 @@
+---
+name: CI
+'on':
+  pull_request:
+  push:
+    branches:
+      - master
+  schedule:
+    - cron: "0 3 * * 4"
+
+defaults:
+  run:
+    working-directory: 'geerlingguy.ruby'
+
+jobs:
+
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.ruby'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies.
+        run: pip3 install yamllint ansible-lint
+
+      - name: Lint code.
+        run: |
+          yamllint .
+          ansible-lint
+
+  molecule:
+    name: Molecule
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - distro: centos7
+            playbook: converge.yml
+          - distro: ubuntu1804
+            playbook: converge.yml
+          - distro: debian9
+            playbook: converge.yml
+
+          - distro: centos7
+            playbook: source-install.yml
+          - distro: ubuntu1804
+            playbook: source-install.yml
+
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.ruby'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install test dependencies.
+        run: pip3 install ansible molecule[docker] docker
+
+      - name: Run Molecule tests.
+        run: molecule test
+        env:
+          PY_COLORS: '1'
+          ANSIBLE_FORCE_COLOR: '1'
+          MOLECULE_DISTRO: ${{ matrix.distro }}
+          MOLECULE_PLAYBOOK: ${{ matrix.playbook }}
diff --git a/provisioning/roles/geerlingguy.ruby/.github/workflows/release.yml b/provisioning/roles/geerlingguy.ruby/.github/workflows/release.yml
new file mode 100644
index 000000000..0a2b99ae2
--- /dev/null
+++ b/provisioning/roles/geerlingguy.ruby/.github/workflows/release.yml
@@ -0,0 +1,38 @@
+---
+# This workflow requires a GALAXY_API_KEY secret present in the GitHub
+# repository or organization.
+#
+# See: https://github.com/marketplace/actions/publish-ansible-role-to-galaxy
+# See: https://github.com/ansible/galaxy/issues/46
+
+name: Release
+'on':
+  push:
+    tags:
+      - '*'
+
+defaults:
+  run:
+    working-directory: 'geerlingguy.ruby'
+
+jobs:
+
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the codebase.
+        uses: actions/checkout@v2
+        with:
+          path: 'geerlingguy.ruby'
+
+      - name: Set up Python 3.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install Ansible.
+        run: pip3 install ansible-base
+
+      - name: Trigger a new import on Galaxy.
+        run: ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }} $(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} | cut -d/ -f2)
diff --git a/provisioning/roles/geerlingguy.ruby/.travis.yml b/provisioning/roles/geerlingguy.ruby/.travis.yml
deleted file mode 100644
index 05d43df15..000000000
--- a/provisioning/roles/geerlingguy.ruby/.travis.yml
+++ /dev/null
@@ -1,34 +0,0 @@
----
-language: python
-services: docker
-
-env:
-  global:
-    - ROLE_NAME: ruby
-  matrix:
-    - MOLECULE_DISTRO: centos7
-    - MOLECULE_DISTRO: ubuntu1804
-    - MOLECULE_DISTRO: ubuntu1604
-    - MOLECULE_DISTRO: debian9
-
-    - MOLECULE_DISTRO: centos7
-      MOLECULE_PLAYBOOK: playbook-source.yml
-    - MOLECULE_DISTRO: ubuntu1804
-      MOLECULE_PLAYBOOK: playbook-source.yml
-
-install:
-  # Install test dependencies.
-  - pip install molecule docker
-
-before_script:
-  # Use actual Ansible Galaxy role name for the project directory.
-  - cd ../
-  - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME
-  - cd geerlingguy.$ROLE_NAME
-
-script:
-  # Run tests.
-  - molecule test
-
-notifications:
-  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/provisioning/roles/geerlingguy.ruby/.yamllint b/provisioning/roles/geerlingguy.ruby/.yamllint
new file mode 100644
index 000000000..f2033dd21
--- /dev/null
+++ b/provisioning/roles/geerlingguy.ruby/.yamllint
@@ -0,0 +1,11 @@
+---
+extends: default
+
+rules:
+  line-length:
+    max: 120
+    level: warning
+
+ignore: |
+  .github/stale.yml
+  .travis.yml
diff --git a/provisioning/roles/geerlingguy.ruby/README.md b/provisioning/roles/geerlingguy.ruby/README.md
index 7a2f5d5ef..f436061c9 100644
--- a/provisioning/roles/geerlingguy.ruby/README.md
+++ b/provisioning/roles/geerlingguy.ruby/README.md
@@ -1,6 +1,6 @@
 # Ansible Role: Ruby
 
-[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-ruby.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-ruby)
+[![CI](https://github.com/geerlingguy/ansible-role-ruby/workflows/CI/badge.svg?event=push)](https://github.com/geerlingguy/ansible-role-ruby/actions?query=workflow%3ACI)
 
 Installs Ruby and bundler gem on Linux.
 
@@ -32,11 +32,11 @@ The user account under which Ruby gems will be installed. Defaults to the `ansib
 
 By default, this role will install whatever version of ruby is available through your system's package manager (`apt` or `yum`). You can install whatever version you like (including the latest release) by setting this to `true` and/or updating the `ruby_download_url` and `ruby_version`.
 
-    ruby_download_url: http://cache.ruby-lang.org/pub/ruby/2.5/ruby-2.4.4.tar.gz
+    ruby_download_url: http://cache.ruby-lang.org/pub/ruby/3.0/ruby-3.0.0.tar.gz
 
 The URL from which Ruby will be downloaded (only used if `ruby_install_from_source` is `true`).
 
-    ruby_version: 2.5.1
+    ruby_version: 3.0.0
 
 The version of ruby that will be installed (only used if `ruby_install_from_source` is `true`).
 
diff --git a/provisioning/roles/geerlingguy.ruby/defaults/main.yml b/provisioning/roles/geerlingguy.ruby/defaults/main.yml
index d9be6d672..bbed4cb40 100644
--- a/provisioning/roles/geerlingguy.ruby/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.ruby/defaults/main.yml
@@ -13,8 +13,8 @@ ruby_install_gems_user: "{{ ansible_user }}"
 # If set to True, ruby will be installed from source, using the version set with
 # the 'ruby_version' variable instead of using a package.
 ruby_install_from_source: false
-ruby_download_url: http://cache.ruby-lang.org/pub/ruby/2.5/ruby-2.5.1.tar.gz
-ruby_version: 2.5.1
+ruby_download_url: http://cache.ruby-lang.org/pub/ruby/3.0/ruby-3.0.0.tar.gz
+ruby_version: 3.0.0
 ruby_source_configure_command: ./configure --enable-shared
 
 # Default should usually work, but this will be overridden on Ubuntu 14.04.
diff --git a/provisioning/roles/geerlingguy.ruby/meta/main.yml b/provisioning/roles/geerlingguy.ruby/meta/main.yml
index 2920c6248..ba48f9e4e 100644
--- a/provisioning/roles/geerlingguy.ruby/meta/main.yml
+++ b/provisioning/roles/geerlingguy.ruby/meta/main.yml
@@ -2,6 +2,7 @@
 dependencies: []
 
 galaxy_info:
+  role_name: ruby
   author: geerlingguy
   description: Ruby installation for Linux.
   company: "Midwestern Mac, LLC"
diff --git a/provisioning/roles/geerlingguy.ruby/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.ruby/molecule/default/converge.yml
similarity index 97%
rename from provisioning/roles/geerlingguy.ruby/molecule/default/playbook.yml
rename to provisioning/roles/geerlingguy.ruby/molecule/default/converge.yml
index 7cc7ffb48..873ad8fd9 100644
--- a/provisioning/roles/geerlingguy.ruby/molecule/default/playbook.yml
+++ b/provisioning/roles/geerlingguy.ruby/molecule/default/converge.yml
@@ -18,6 +18,7 @@
       copy:
         dest: /etc/profile.d/ruby.sh
         content: 'PATH=$PATH:{{ ruby_gems_bin_path }}'
+        mode: 0644
 
     - name: Don't install Bundler on CentOS 7 because of old Ruby version.
       set_fact:
diff --git a/provisioning/roles/geerlingguy.ruby/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.ruby/molecule/default/molecule.yml
index 2ca6feaf9..74907107f 100644
--- a/provisioning/roles/geerlingguy.ruby/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.ruby/molecule/default/molecule.yml
@@ -3,10 +3,6 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
-  options:
-    config-file: molecule/default/yaml-lint.yml
 platforms:
   - name: instance
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
@@ -17,13 +13,5 @@ platforms:
     pre_build_image: true
 provisioner:
   name: ansible
-  lint:
-    name: ansible-lint
   playbooks:
-    converge: ${MOLECULE_PLAYBOOK:-playbook.yml}
-scenario:
-  name: default
-verifier:
-  name: testinfra
-  lint:
-    name: flake8
+    converge: ${MOLECULE_PLAYBOOK:-converge.yml}
diff --git a/provisioning/roles/geerlingguy.ruby/molecule/default/playbook-source.yml b/provisioning/roles/geerlingguy.ruby/molecule/default/source-install.yml
similarity index 100%
rename from provisioning/roles/geerlingguy.ruby/molecule/default/playbook-source.yml
rename to provisioning/roles/geerlingguy.ruby/molecule/default/source-install.yml
diff --git a/provisioning/roles/geerlingguy.ruby/molecule/default/tests/test_default.py b/provisioning/roles/geerlingguy.ruby/molecule/default/tests/test_default.py
deleted file mode 100644
index eedd64a1d..000000000
--- a/provisioning/roles/geerlingguy.ruby/molecule/default/tests/test_default.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import os
-
-import testinfra.utils.ansible_runner
-
-testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
-    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
-
-
-def test_hosts_file(host):
-    f = host.file('/etc/hosts')
-
-    assert f.exists
-    assert f.user == 'root'
-    assert f.group == 'root'
diff --git a/provisioning/roles/geerlingguy.ruby/tasks/install-from-source.yml b/provisioning/roles/geerlingguy.ruby/tasks/install-from-source.yml
index d65d895d0..d171c940e 100644
--- a/provisioning/roles/geerlingguy.ruby/tasks/install-from-source.yml
+++ b/provisioning/roles/geerlingguy.ruby/tasks/install-from-source.yml
@@ -30,6 +30,7 @@
     src: "{{ workspace }}/ruby-{{ ruby_version }}.tar.gz"
     dest: "{{ workspace }}/"
     copy: false
+    mode: 0755
 
 - name: Build ruby.
   command: >
@@ -42,7 +43,7 @@
     - make install
 
 - name: Add ruby symlinks.
-  file:
+  file:  # noqa 208
     src: "/usr/local/bin/{{ item }}"
     dest: "/usr/bin/{{ item }}"
     state: link

From 788ff5c8cddc96e5b0dfed025d487f91b38ad975 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 26 Aug 2021 23:03:44 -0500
Subject: [PATCH 1265/1273] Update apache and elasticsearch roles to latest
 version.

---
 provisioning/requirements.yml                          |  4 ++--
 provisioning/roles/geerlingguy.apache/.ansible-lint    |  3 ++-
 .../roles/geerlingguy.apache/.github/stale.yml         |  1 +
 .../roles/geerlingguy.apache/.github/workflows/ci.yml  |  3 +--
 provisioning/roles/geerlingguy.apache/.gitignore       |  2 ++
 .../geerlingguy.apache/molecule/default/molecule.yml   |  1 -
 .../roles/geerlingguy.apache/templates/vhosts.conf.j2  |  4 ++--
 .../roles/geerlingguy.elasticsearch/.ansible-lint      |  3 ++-
 .../roles/geerlingguy.elasticsearch/.github/stale.yml  |  1 +
 .../geerlingguy.elasticsearch/.github/workflows/ci.yml |  3 +--
 .../roles/geerlingguy.elasticsearch/.gitignore         |  2 ++
 provisioning/roles/geerlingguy.elasticsearch/README.md | 10 ++++++++--
 .../roles/geerlingguy.elasticsearch/defaults/main.yml  |  1 +
 .../roles/geerlingguy.elasticsearch/tasks/main.yml     |  3 ++-
 14 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 9f099e582..3cd494aaa 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -9,7 +9,7 @@ roles:
   - name: geerlingguy.adminer
     version: 1.3.1
   - name: geerlingguy.apache
-    version: 3.1.4
+    version: 3.1.5
   - name: geerlingguy.apache-php-fpm
     version: 1.1.0
   - name: geerlingguy.blackfire
@@ -25,7 +25,7 @@ roles:
   - name: geerlingguy.drush
     version: 3.3.0
   - name: geerlingguy.elasticsearch
-    version: 5.0.1
+    version: 5.1.0
   - name: geerlingguy.firewall
     version: 2.5.0
   - name: geerlingguy.git
diff --git a/provisioning/roles/geerlingguy.apache/.ansible-lint b/provisioning/roles/geerlingguy.apache/.ansible-lint
index 555729425..acc82551f 100644
--- a/provisioning/roles/geerlingguy.apache/.ansible-lint
+++ b/provisioning/roles/geerlingguy.apache/.ansible-lint
@@ -1,2 +1,3 @@
 skip_list:
-  - '106'
+  - 'yaml'
+  - 'role-name'
diff --git a/provisioning/roles/geerlingguy.apache/.github/stale.yml b/provisioning/roles/geerlingguy.apache/.github/stale.yml
index c7ff12754..3cc6ec313 100644
--- a/provisioning/roles/geerlingguy.apache/.github/stale.yml
+++ b/provisioning/roles/geerlingguy.apache/.github/stale.yml
@@ -12,6 +12,7 @@ onlyLabels: []
 
 # Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
 exemptLabels:
+  - bug
   - pinned
   - security
   - planned
diff --git a/provisioning/roles/geerlingguy.apache/.github/workflows/ci.yml b/provisioning/roles/geerlingguy.apache/.github/workflows/ci.yml
index c775c47fc..91bbbc992 100644
--- a/provisioning/roles/geerlingguy.apache/.github/workflows/ci.yml
+++ b/provisioning/roles/geerlingguy.apache/.github/workflows/ci.yml
@@ -29,12 +29,11 @@ jobs:
           python-version: '3.x'
 
       - name: Install test dependencies.
-        run: pip3 install yamllint ansible-lint
+        run: pip3 install yamllint
 
       - name: Lint code.
         run: |
           yamllint .
-          ansible-lint
 
   molecule:
     name: Molecule
diff --git a/provisioning/roles/geerlingguy.apache/.gitignore b/provisioning/roles/geerlingguy.apache/.gitignore
index f56f5b578..8840c8f02 100644
--- a/provisioning/roles/geerlingguy.apache/.gitignore
+++ b/provisioning/roles/geerlingguy.apache/.gitignore
@@ -1,3 +1,5 @@
 *.retry
 */__pycache__
 *.pyc
+.cache
+
diff --git a/provisioning/roles/geerlingguy.apache/molecule/default/molecule.yml b/provisioning/roles/geerlingguy.apache/molecule/default/molecule.yml
index 0714c439d..74907107f 100644
--- a/provisioning/roles/geerlingguy.apache/molecule/default/molecule.yml
+++ b/provisioning/roles/geerlingguy.apache/molecule/default/molecule.yml
@@ -13,6 +13,5 @@ platforms:
     pre_build_image: true
 provisioner:
   name: ansible
-  log: true
   playbooks:
     converge: ${MOLECULE_PLAYBOOK:-converge.yml}
diff --git a/provisioning/roles/geerlingguy.apache/templates/vhosts.conf.j2 b/provisioning/roles/geerlingguy.apache/templates/vhosts.conf.j2
index 8b7af90bb..48a8721c6 100644
--- a/provisioning/roles/geerlingguy.apache/templates/vhosts.conf.j2
+++ b/provisioning/roles/geerlingguy.apache/templates/vhosts.conf.j2
@@ -27,7 +27,7 @@
   </Directory>
 {% endif %}
 {% if vhost.extra_parameters is defined %}
-  {{ vhost.extra_parameters }}
+{{ vhost.extra_parameters | indent(width=2, first=True, indentfirst=True) }}
 {% endif %}
 </VirtualHost>
 
@@ -74,7 +74,7 @@
   </Directory>
 {% endif %}
 {% if vhost.extra_parameters is defined %}
-  {{ vhost.extra_parameters }}
+{{ vhost.extra_parameters | indent(width=2, first=True, indentfirst=True) }}
 {% endif %}
 </VirtualHost>
 
diff --git a/provisioning/roles/geerlingguy.elasticsearch/.ansible-lint b/provisioning/roles/geerlingguy.elasticsearch/.ansible-lint
index 555729425..acc82551f 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/.ansible-lint
+++ b/provisioning/roles/geerlingguy.elasticsearch/.ansible-lint
@@ -1,2 +1,3 @@
 skip_list:
-  - '106'
+  - 'yaml'
+  - 'role-name'
diff --git a/provisioning/roles/geerlingguy.elasticsearch/.github/stale.yml b/provisioning/roles/geerlingguy.elasticsearch/.github/stale.yml
index c7ff12754..3cc6ec313 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/.github/stale.yml
+++ b/provisioning/roles/geerlingguy.elasticsearch/.github/stale.yml
@@ -12,6 +12,7 @@ onlyLabels: []
 
 # Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
 exemptLabels:
+  - bug
   - pinned
   - security
   - planned
diff --git a/provisioning/roles/geerlingguy.elasticsearch/.github/workflows/ci.yml b/provisioning/roles/geerlingguy.elasticsearch/.github/workflows/ci.yml
index 6e6f3f7c6..eb5ef4456 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/.github/workflows/ci.yml
+++ b/provisioning/roles/geerlingguy.elasticsearch/.github/workflows/ci.yml
@@ -29,12 +29,11 @@ jobs:
           python-version: '3.x'
 
       - name: Install test dependencies.
-        run: pip3 install yamllint ansible-lint
+        run: pip3 install yamllint
 
       - name: Lint code.
         run: |
           yamllint .
-          ansible-lint
 
   molecule:
     name: Molecule
diff --git a/provisioning/roles/geerlingguy.elasticsearch/.gitignore b/provisioning/roles/geerlingguy.elasticsearch/.gitignore
index f56f5b578..8840c8f02 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/.gitignore
+++ b/provisioning/roles/geerlingguy.elasticsearch/.gitignore
@@ -1,3 +1,5 @@
 *.retry
 */__pycache__
 *.pyc
+.cache
+
diff --git a/provisioning/roles/geerlingguy.elasticsearch/README.md b/provisioning/roles/geerlingguy.elasticsearch/README.md
index f6b2aa107..9b9054532 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/README.md
+++ b/provisioning/roles/geerlingguy.elasticsearch/README.md
@@ -10,12 +10,16 @@ Requires at least Java 8. You can use the [`geerlingguy.java`](https://github.co
 
 ## Role Variables
 
-Available variables are listed below, along with default values (see `defaults/main.yml`):
+Available variables are listed below, along with default values (see `defaults/main.yml` for default role variables, `vars/RedHat.yml` and  `vars/Debian.yml` for distribution specific variables):
 
     elasticsearch_version: '7.x'
 
 The major version to use when installing Elasticsearch.
 
+    elasticsearch_package: elasticsearch
+
+If you want to follow the latest release in the `elasticsearch_version` major release cycle, keep the default here. Otherwise you can add `-7.13.2` (for RHEL-based systems) or `=7.13.2` (for Debian-based systems) to lock in a specific version, e.g. `7.13.2`.
+
     elasticsearch_package_state: present
 
 The `elasticsearch` package state; set to `latest` to upgrade or change versions.
@@ -27,7 +31,9 @@ Controls the Elasticsearch service options.
 
     elasticsearch_network_host: localhost
 
-Network host to listen for incoming connections on. By default we only listen on the localhost interface. Change this to the IP address to listen on a specific interface, or `0.0.0.0` to listen on all interfaces.
+Network host to listen for incoming connections on. By default we only listen on the localhost interface. Change this to the IP address to listen on a specific interface, or `"0.0.0.0"` to listen on all interfaces.
+
+When listening on multiple interfaces, if you're setting up a single Elasticsearch server (not a cluster), you should also add `discovery.type: single-node` to `elasticsearch_extra_options`.
 
     elasticsearch_http_port: 9200
 
diff --git a/provisioning/roles/geerlingguy.elasticsearch/defaults/main.yml b/provisioning/roles/geerlingguy.elasticsearch/defaults/main.yml
index 7b9bf118d..132a30147 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.elasticsearch/defaults/main.yml
@@ -1,5 +1,6 @@
 ---
 elasticsearch_version: '7.x'
+elasticsearch_package: elasticsearch
 elasticsearch_package_state: present
 
 elasticsearch_service_state: started
diff --git a/provisioning/roles/geerlingguy.elasticsearch/tasks/main.yml b/provisioning/roles/geerlingguy.elasticsearch/tasks/main.yml
index 362ede22a..1926fe78b 100644
--- a/provisioning/roles/geerlingguy.elasticsearch/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.elasticsearch/tasks/main.yml
@@ -1,4 +1,5 @@
 ---
+
 - include_tasks: setup-RedHat.yml
   when: ansible_os_family == 'RedHat'
 
@@ -7,7 +8,7 @@
 
 - name: Install Elasticsearch.
   package:
-    name: elasticsearch
+    name: "{{ elasticsearch_package }}"
     state: "{{ elasticsearch_package_state }}"
 
 - name: Configure Elasticsearch 6 or below.

From e43ae92e778b4f2ed8cfdcfbd1eed1a61ea4a3ca Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 26 Aug 2021 23:39:40 -0500
Subject: [PATCH 1266/1273] Update Apache role to latest version.

---
 provisioning/requirements.yml                                 | 2 +-
 .../roles/geerlingguy.apache/templates/vhosts.conf.j2         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 3cd494aaa..3c77776e8 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -9,7 +9,7 @@ roles:
   - name: geerlingguy.adminer
     version: 1.3.1
   - name: geerlingguy.apache
-    version: 3.1.5
+    version: 3.1.6
   - name: geerlingguy.apache-php-fpm
     version: 1.1.0
   - name: geerlingguy.blackfire
diff --git a/provisioning/roles/geerlingguy.apache/templates/vhosts.conf.j2 b/provisioning/roles/geerlingguy.apache/templates/vhosts.conf.j2
index 48a8721c6..b5307b94d 100644
--- a/provisioning/roles/geerlingguy.apache/templates/vhosts.conf.j2
+++ b/provisioning/roles/geerlingguy.apache/templates/vhosts.conf.j2
@@ -27,7 +27,7 @@
   </Directory>
 {% endif %}
 {% if vhost.extra_parameters is defined %}
-{{ vhost.extra_parameters | indent(width=2, first=True, indentfirst=True) }}
+{{ vhost.extra_parameters | indent(width=2, first=True) }}
 {% endif %}
 </VirtualHost>
 
@@ -74,7 +74,7 @@
   </Directory>
 {% endif %}
 {% if vhost.extra_parameters is defined %}
-{{ vhost.extra_parameters | indent(width=2, first=True, indentfirst=True) }}
+{{ vhost.extra_parameters | indent(width=2, first=True) }}
 {% endif %}
 </VirtualHost>
 

From 0345df4e6f0dd34e123258afeab50093fb6ca0d3 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 24 Aug 2021 12:03:11 -0500
Subject: [PATCH 1267/1273] Update PHP role to latest version.

---
 provisioning/requirements.yml                               | 2 +-
 provisioning/roles/geerlingguy.php/.github/stale.yml        | 1 +
 provisioning/roles/geerlingguy.php/.github/workflows/ci.yml | 2 ++
 provisioning/roles/geerlingguy.php/vars/Debian-11.yml       | 2 ++
 4 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 provisioning/roles/geerlingguy.php/vars/Debian-11.yml

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 3c77776e8..95e864b78 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -43,7 +43,7 @@ roles:
   - name: geerlingguy.nodejs
     version: 6.0.0
   - name: geerlingguy.php
-    version: 4.6.1
+    version: 4.7.0
   - name: geerlingguy.php-memcached
     version: 2.0.2
   - name: geerlingguy.php-mysql
diff --git a/provisioning/roles/geerlingguy.php/.github/stale.yml b/provisioning/roles/geerlingguy.php/.github/stale.yml
index c7ff12754..3cc6ec313 100644
--- a/provisioning/roles/geerlingguy.php/.github/stale.yml
+++ b/provisioning/roles/geerlingguy.php/.github/stale.yml
@@ -12,6 +12,7 @@ onlyLabels: []
 
 # Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
 exemptLabels:
+  - bug
   - pinned
   - security
   - planned
diff --git a/provisioning/roles/geerlingguy.php/.github/workflows/ci.yml b/provisioning/roles/geerlingguy.php/.github/workflows/ci.yml
index a452cebd3..96a41a653 100644
--- a/provisioning/roles/geerlingguy.php/.github/workflows/ci.yml
+++ b/provisioning/roles/geerlingguy.php/.github/workflows/ci.yml
@@ -49,6 +49,8 @@ jobs:
             playbook: converge.yml
           - distro: ubuntu1804
             playbook: converge.yml
+          - distro: debian11
+            playbook: converge.yml
           - distro: debian10
             playbook: converge.yml
           - distro: debian9
diff --git a/provisioning/roles/geerlingguy.php/vars/Debian-11.yml b/provisioning/roles/geerlingguy.php/vars/Debian-11.yml
new file mode 100644
index 000000000..a16b99b15
--- /dev/null
+++ b/provisioning/roles/geerlingguy.php/vars/Debian-11.yml
@@ -0,0 +1,2 @@
+---
+__php_default_version_debian: "7.4"

From 0bc54dd982e6f66ad97ed5235ee08e3a18b1031c Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 20 Sep 2021 10:40:53 -0500
Subject: [PATCH 1268/1273] Update Drupal role to latest version.

---
 provisioning/requirements.yml                 |  2 +-
 .../roles/geerlingguy.drupal/.ansible-lint    |  6 ++---
 .../geerlingguy.drupal/.github/stale.yml      |  1 +
 .../.github/workflows/ci.yml                  |  9 ++++----
 .../roles/geerlingguy.drupal/.gitignore       |  2 ++
 .../tasks/build-composer-project.yml          | 22 +++++--------------
 .../tasks/build-composer.yml                  | 22 +++++--------------
 .../roles/geerlingguy.drupal/tasks/deploy.yml | 20 ++++-------------
 8 files changed, 26 insertions(+), 58 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 95e864b78..1013680a8 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -19,7 +19,7 @@ roles:
   - name: geerlingguy.daemonize
     version: 1.2.2
   - name: geerlingguy.drupal
-    version: 4.2.0
+    version: 4.3.0
   - name: geerlingguy.drupal-console
     version: 1.1.1
   - name: geerlingguy.drush
diff --git a/provisioning/roles/geerlingguy.drupal/.ansible-lint b/provisioning/roles/geerlingguy.drupal/.ansible-lint
index 7ae7eb59b..4b5e4fde5 100644
--- a/provisioning/roles/geerlingguy.drupal/.ansible-lint
+++ b/provisioning/roles/geerlingguy.drupal/.ansible-lint
@@ -1,4 +1,4 @@
 skip_list:
-  - '204'
-  - '503'
-  - '106'
+  - 'yaml'
+  - 'no-handler'
+  - 'role-name'
diff --git a/provisioning/roles/geerlingguy.drupal/.github/stale.yml b/provisioning/roles/geerlingguy.drupal/.github/stale.yml
index c7ff12754..3cc6ec313 100644
--- a/provisioning/roles/geerlingguy.drupal/.github/stale.yml
+++ b/provisioning/roles/geerlingguy.drupal/.github/stale.yml
@@ -12,6 +12,7 @@ onlyLabels: []
 
 # Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
 exemptLabels:
+  - bug
   - pinned
   - security
   - planned
diff --git a/provisioning/roles/geerlingguy.drupal/.github/workflows/ci.yml b/provisioning/roles/geerlingguy.drupal/.github/workflows/ci.yml
index 57c082f82..cff7a133b 100644
--- a/provisioning/roles/geerlingguy.drupal/.github/workflows/ci.yml
+++ b/provisioning/roles/geerlingguy.drupal/.github/workflows/ci.yml
@@ -29,12 +29,11 @@ jobs:
           python-version: '3.x'
 
       - name: Install test dependencies.
-        run: pip3 install yamllint ansible-lint
+        run: pip3 install yamllint
 
       - name: Lint code.
         run: |
           yamllint .
-          ansible-lint
 
   molecule:
     name: Molecule
@@ -42,11 +41,13 @@ jobs:
     strategy:
       matrix:
         include:
-          - distro: centos8
+          - distro: rockylinux8
             playbook: converge.yml
           - distro: ubuntu1804
             playbook: converge.yml
-          - distro: centos8
+          # - distro: debian10
+          #   playbook: converge.yml
+          - distro: rockylinux8
             playbook: deploy.yml
 
     steps:
diff --git a/provisioning/roles/geerlingguy.drupal/.gitignore b/provisioning/roles/geerlingguy.drupal/.gitignore
index f56f5b578..8840c8f02 100644
--- a/provisioning/roles/geerlingguy.drupal/.gitignore
+++ b/provisioning/roles/geerlingguy.drupal/.gitignore
@@ -1,3 +1,5 @@
 *.retry
 */__pycache__
 *.pyc
+.cache
+
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/build-composer-project.yml b/provisioning/roles/geerlingguy.drupal/tasks/build-composer-project.yml
index 46dd36b2a..a84f1eb9c 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/build-composer-project.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/build-composer-project.yml
@@ -33,25 +33,13 @@
   become: false
   when: not drupal_site_exists
 
-# Use manual composer require tasks until Ansible 2.10.4 is released.
 - name: Install dependencies with composer require (this may take a while).
-  command: "{{ composer_path }} require {{ item }} -d {{ drupal_composer_install_dir }}"
-  register: composer_require_result
-  changed_when: "'Nothing to install' not in composer_require_result.stderr"
-  with_items: "{{ drupal_composer_dependencies|default([]) }}"
+  composer:
+    command: require
+    arguments: "{{ item }}"
+    working_dir: "{{ drupal_composer_install_dir }}"
+  with_items: "{{ drupal_composer_dependencies | default([]) }}"
   become: false
   environment:
     COMPOSER_PROCESS_TIMEOUT: 1200
     COMPOSER_MEMORY_LIMIT: '-1'
-
-# Switch back to this task after Ansible 2.10.4 is released.
-# - name: Install dependencies with composer require (this may take a while).
-#   composer:
-#     command: require
-#     arguments: "{{ item }}"
-#     working_dir: "{{ drupal_composer_install_dir }}"
-#   with_items: "{{ drupal_composer_dependencies | default([]) }}"
-#   become: false
-#   environment:
-#     COMPOSER_PROCESS_TIMEOUT: 1200
-#     COMPOSER_MEMORY_LIMIT: '-1'
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/build-composer.yml b/provisioning/roles/geerlingguy.drupal/tasks/build-composer.yml
index ccf8d4797..81123969e 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/build-composer.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/build-composer.yml
@@ -29,25 +29,13 @@
   when: not drupal_site_exists
   become: false
 
-# Use manual composer require tasks until Ansible 2.10.4 is released.
 - name: Install dependencies with composer require (this may take a while).
-  command: "{{ composer_path }} require {{ item }} -d {{ drupal_composer_install_dir }}"
-  register: composer_require_result
-  changed_when: "'Nothing to install' not in composer_require_result.stderr"
-  with_items: "{{ drupal_composer_dependencies|default([]) }}"
+  composer:
+    command: require
+    arguments: "{{ item }}"
+    working_dir: "{{ drupal_composer_install_dir }}"
+  with_items: "{{ drupal_composer_dependencies | default([]) }}"
   become: false
   environment:
     COMPOSER_PROCESS_TIMEOUT: 1200
     COMPOSER_MEMORY_LIMIT: '-1'
-
-# Switch back to this task after Ansible 2.10.4 is released.
-# - name: Install dependencies with composer require (this may take a while).
-#   composer:
-#     command: require
-#     arguments: "{{ item }}"
-#     working_dir: "{{ drupal_composer_install_dir }}"
-#   with_items: "{{ drupal_composer_dependencies | default([]) }}"
-#   become: false
-#   environment:
-#     COMPOSER_PROCESS_TIMEOUT: 1200
-#     COMPOSER_MEMORY_LIMIT: '-1'
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/deploy.yml b/provisioning/roles/geerlingguy.drupal/tasks/deploy.yml
index 93ba6a693..b036acd15 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/deploy.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/deploy.yml
@@ -25,25 +25,13 @@
   stat: "path={{ drupal_deploy_dir }}/composer.json"
   register: drupal_deploy_composer_file
 
-# Use manual composer require tasks until Ansible 2.10.4 is released.
 - name: Run composer install if composer.json is present.
-  command: "composer install -d {{ drupal_deploy_dir }}{% if drupal_composer_no_dev %} --no-dev{% endif %}"
-  register: composer_install_result
-  changed_when: "'Nothing to install' not in composer_install_result.stderr"
+  composer:
+    command: install
+    working_dir: "{{ drupal_deploy_dir }}"
+    no_dev: "{{ drupal_composer_no_dev }}"
   when:
     - drupal_deploy_composer_file.stat.exists
     - drupal_deploy_composer_install
   become: "{{ drupal_core_owner_become }}"
   become_user: "{{ drupal_core_owner }}"
-
-# Switch back to this task after Ansible 2.10.4 is released.
-# - name: Run composer install if composer.json is present.
-#   composer:
-#     command: install
-#     working_dir: "{{ drupal_deploy_dir }}"
-#     no_dev: "{{ drupal_composer_no_dev }}"
-#   when:
-#     - drupal_deploy_composer_file.stat.exists
-#     - drupal_deploy_composer_install
-#   become: "{{ drupal_core_owner_become }}"
-#   become_user: "{{ drupal_core_owner }}"

From 8fe7920dccfe2e4b0efe4945ef3b290480935de9 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 28 Sep 2021 12:29:22 -0500
Subject: [PATCH 1269/1273] Update apache role to latest version.

---
 provisioning/requirements.yml                           | 2 +-
 provisioning/roles/geerlingguy.apache/README.md         | 4 ++++
 provisioning/roles/geerlingguy.apache/defaults/main.yml | 3 +++
 provisioning/roles/geerlingguy.apache/tasks/main.yml    | 2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 1013680a8..b98ab96b4 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -9,7 +9,7 @@ roles:
   - name: geerlingguy.adminer
     version: 1.3.1
   - name: geerlingguy.apache
-    version: 3.1.6
+    version: 3.2.0
   - name: geerlingguy.apache-php-fpm
     version: 1.1.0
   - name: geerlingguy.blackfire
diff --git a/provisioning/roles/geerlingguy.apache/README.md b/provisioning/roles/geerlingguy.apache/README.md
index a0888c18c..24149d808 100644
--- a/provisioning/roles/geerlingguy.apache/README.md
+++ b/provisioning/roles/geerlingguy.apache/README.md
@@ -100,6 +100,10 @@ The list of packages to be installed. This defaults to a set of platform-specifi
 
 Set initial Apache daemon state to be enforced when this role is run. This should generally remain `started`, but you can set it to `stopped` if you need to fix the Apache config during a playbook run or otherwise would not like Apache started at the time this role is run.
 
+    apache_enabled: yes
+
+Set the Apache service boot time status. This should generally remain `yes`, but you can set it to `no` if you need to run Ansible while leaving the service disabled.
+
     apache_packages_state: present
 
 If you have enabled any additional repositories such as _ondrej/apache2_, [geerlingguy.repo-epel](https://github.com/geerlingguy/ansible-role-repo-epel), or [geerlingguy.repo-remi](https://github.com/geerlingguy/ansible-role-repo-remi), you may want an easy way to upgrade versions. You can set this to `latest` (combined with `apache_enablerepo` on RHEL) and can directly upgrade to a different Apache version from a different repo (instead of uninstalling and reinstalling Apache).
diff --git a/provisioning/roles/geerlingguy.apache/defaults/main.yml b/provisioning/roles/geerlingguy.apache/defaults/main.yml
index 941a57c3d..21d7726bf 100644
--- a/provisioning/roles/geerlingguy.apache/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.apache/defaults/main.yml
@@ -49,6 +49,9 @@ apache_mods_disabled: []
 # Set initial apache state. Recommended values: `started` or `stopped`
 apache_state: started
 
+# Set initial apache service status. Recommended values: `yes` or `no`
+apache_enabled: yes
+
 # Set apache state when configuration changes are made. Recommended values:
 # `restarted` or `reloaded`
 apache_restart_state: restarted
diff --git a/provisioning/roles/geerlingguy.apache/tasks/main.yml b/provisioning/roles/geerlingguy.apache/tasks/main.yml
index cdbcb63d4..567356c04 100644
--- a/provisioning/roles/geerlingguy.apache/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.apache/tasks/main.yml
@@ -44,4 +44,4 @@
   service:
     name: "{{ apache_service }}"
     state: "{{ apache_state }}"
-    enabled: true
+    enabled: "{{ apache_enabled }}"

From e139fd7499dbb484a36c3c6fc9a0c01ca3a46d0b Mon Sep 17 00:00:00 2001
From: Tolga Ozses <tolga@ozses.net>
Date: Fri, 5 Nov 2021 10:17:24 +0300
Subject: [PATCH 1270/1273] Issue #2183: Minor typo

---
 provisioning/roles/geerlingguy.adminer/tasks/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provisioning/roles/geerlingguy.adminer/tasks/main.yml b/provisioning/roles/geerlingguy.adminer/tasks/main.yml
index b3853951c..8ab43dbdf 100644
--- a/provisioning/roles/geerlingguy.adminer/tasks/main.yml
+++ b/provisioning/roles/geerlingguy.adminer/tasks/main.yml
@@ -6,7 +6,7 @@
     state: directory
     recurse: true
 
-- name: Testing if adminer is older then 1 day
+- name: Testing if adminer is older than 1 day
   find:
     paths: "{{ adminer_install_dir }}"
     patterns: "{{ adminer_install_filename }}"

From c091ff80e355c85b6cc30efd0e6326cbcf2b46d2 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 10 Dec 2021 14:01:56 -0600
Subject: [PATCH 1271/1273] Bump Solr role version to mitigate CVE-2021-44228.

---
 provisioning/requirements.yml                           | 2 +-
 provisioning/roles/geerlingguy.solr/.github/stale.yml   | 1 +
 provisioning/roles/geerlingguy.solr/README.md           | 6 +++++-
 provisioning/roles/geerlingguy.solr/defaults/main.yml   | 4 +++-
 provisioning/roles/geerlingguy.solr/tasks/configure.yml | 2 ++
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index b98ab96b4..236a386f3 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -77,6 +77,6 @@ roles:
   - name: geerlingguy.security
     version: 2.0.1
   - name: geerlingguy.solr
-    version: 5.2.0
+    version: 5.3.0
   - name: geerlingguy.varnish
     version: 3.3.0
diff --git a/provisioning/roles/geerlingguy.solr/.github/stale.yml b/provisioning/roles/geerlingguy.solr/.github/stale.yml
index c7ff12754..3cc6ec313 100644
--- a/provisioning/roles/geerlingguy.solr/.github/stale.yml
+++ b/provisioning/roles/geerlingguy.solr/.github/stale.yml
@@ -12,6 +12,7 @@ onlyLabels: []
 
 # Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
 exemptLabels:
+  - bug
   - pinned
   - security
   - planned
diff --git a/provisioning/roles/geerlingguy.solr/README.md b/provisioning/roles/geerlingguy.solr/README.md
index a26ab385d..125c09d90 100644
--- a/provisioning/roles/geerlingguy.solr/README.md
+++ b/provisioning/roles/geerlingguy.solr/README.md
@@ -24,7 +24,7 @@ Files will be downloaded to this path on the remote server before being moved in
 
 Solr will be run under the `solr_user`. Set `solr_create_user` to `false` if `solr_user` is created before this role runs, or if you're using Solr 5+ and want Solr's own installation script to set up the user. By default, `solr_group` equals `solr_user`, but it can be overwritten to fit your own configuration.
 
-    solr_version: "8.6.0"
+    solr_version: "8.11.0"
 
 The Apache Solr version to install. For a full list, see [available Apache Solr versions](http://archive.apache.org/dist/lucene/solr/).
 
@@ -64,6 +64,10 @@ Memory settings for the JVM. These should be set as high as you can allow for be
 
 Default timezone of JVM running solr. You can override this if needed when using dataimport and delta imports (ex: comparing against a MySQL external data source). Read through Apache Solr's [Working with Dates](https://cwiki.apache.org/confluence/display/solr/Working+with+Dates) documentation for more background.
 
+    solr_opts: "$SOLR_OPTS -Dlog4j2.formatMsgNoLookups=true"
+
+Solr options. This option was added to the role in part to mitigate [CVE-2021-44228](https://solr.apache.org/security.html#apache-solr-affected-by-apache-log4j-cve-2021-44228).
+
     solr_cores:
       - collection1
 
diff --git a/provisioning/roles/geerlingguy.solr/defaults/main.yml b/provisioning/roles/geerlingguy.solr/defaults/main.yml
index 38e441a47..d98ca2788 100644
--- a/provisioning/roles/geerlingguy.solr/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.solr/defaults/main.yml
@@ -5,7 +5,7 @@ solr_create_user: true
 solr_user: solr
 solr_group: "{{ solr_user }}"
 
-solr_version: "8.6.0"
+solr_version: "8.11.0"
 solr_mirror: "https://archive.apache.org/dist"
 solr_remove_cruft: false
 
@@ -24,6 +24,8 @@ solr_xmx: "512M"
 
 solr_timezone: "UTC"
 
+solr_opts: "$SOLR_OPTS -Dlog4j2.formatMsgNoLookups=true"
+
 solr_cores:
   - collection1
 
diff --git a/provisioning/roles/geerlingguy.solr/tasks/configure.yml b/provisioning/roles/geerlingguy.solr/tasks/configure.yml
index 91ca8a372..aa63878a1 100644
--- a/provisioning/roles/geerlingguy.solr/tasks/configure.yml
+++ b/provisioning/roles/geerlingguy.solr/tasks/configure.yml
@@ -20,4 +20,6 @@
       line: 'SOLR_PORT="{{ solr_port }}"'
     - regexp: "^.?SOLR_TIMEZONE="
       line: 'SOLR_TIMEZONE="{{ solr_timezone }}"'
+    - regexp: "^.?SOLR_OPTS="
+      line: 'SOLR_OPTS="{{ solr_opts }}"'
   notify: restart solr

From b517d52f1c0ddac0183293b0b6fc2635459dcc55 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 17 Dec 2021 17:33:42 -0600
Subject: [PATCH 1272/1273] Bump Solr role to mitigate CVE-2021-44228.

---
 provisioning/requirements.yml                         | 2 +-
 provisioning/roles/geerlingguy.solr/README.md         | 2 +-
 provisioning/roles/geerlingguy.solr/defaults/main.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 236a386f3..c01added6 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -77,6 +77,6 @@ roles:
   - name: geerlingguy.security
     version: 2.0.1
   - name: geerlingguy.solr
-    version: 5.3.0
+    version: 5.3.1
   - name: geerlingguy.varnish
     version: 3.3.0
diff --git a/provisioning/roles/geerlingguy.solr/README.md b/provisioning/roles/geerlingguy.solr/README.md
index 125c09d90..6631c2c03 100644
--- a/provisioning/roles/geerlingguy.solr/README.md
+++ b/provisioning/roles/geerlingguy.solr/README.md
@@ -24,7 +24,7 @@ Files will be downloaded to this path on the remote server before being moved in
 
 Solr will be run under the `solr_user`. Set `solr_create_user` to `false` if `solr_user` is created before this role runs, or if you're using Solr 5+ and want Solr's own installation script to set up the user. By default, `solr_group` equals `solr_user`, but it can be overwritten to fit your own configuration.
 
-    solr_version: "8.11.0"
+    solr_version: "8.11.1"
 
 The Apache Solr version to install. For a full list, see [available Apache Solr versions](http://archive.apache.org/dist/lucene/solr/).
 
diff --git a/provisioning/roles/geerlingguy.solr/defaults/main.yml b/provisioning/roles/geerlingguy.solr/defaults/main.yml
index d98ca2788..72aed123a 100644
--- a/provisioning/roles/geerlingguy.solr/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.solr/defaults/main.yml
@@ -5,7 +5,7 @@ solr_create_user: true
 solr_user: solr
 solr_group: "{{ solr_user }}"
 
-solr_version: "8.11.0"
+solr_version: "8.11.1"
 solr_mirror: "https://archive.apache.org/dist"
 solr_remove_cruft: false
 

From 07289c8bf823604f8977bd4af0085a769f8db58f Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Sun, 12 Feb 2023 21:16:04 -0600
Subject: [PATCH 1273/1273] Add deprecation notice. Fixes #2164.

---
 CHANGELOG.md | 8 ++++++++
 README.md    | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bfeb1ee9e..52c075e98 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Drupal VM Changelog
 
+
+## 7.0.0 (2023-02-12)
+
+This version shall never be released :'-(
+
+Drupal VM is no longer maintained. See #2164 for details.
+
+
 ## 6.0.4 (2021-05-28)
 
 ### Breaking Changes
diff --git a/README.md b/README.md
index c4cd15d26..811c142d8 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 ![Drupal VM Logo](https://raw.githubusercontent.com/geerlingguy/drupal-vm/master/docs/images/drupal-vm-logo.png)
 
+> **DEPRECATION NOTICE**: Drupal VM is no longer maintained, and no new releases will be made. See issue #2164 for details. Thank you to all users and maintainers over the past decade!
+
 [![CI](https://github.com/geerlingguy/drupal-vm/workflows/CI/badge.svg?event=push)](https://github.com/geerlingguy/drupal-vm/actions?query=workflow%3ACI) [![Documentation Status](https://readthedocs.org/projects/drupal-vm/badge/?version=latest)](http://docs.drupalvm.com) [![Packagist](https://img.shields.io/packagist/v/geerlingguy/drupal-vm.svg)](https://packagist.org/packages/geerlingguy/drupal-vm) [![Docker Automated build](https://img.shields.io/docker/automated/geerlingguy/drupal-vm.svg?maxAge=2592000)](https://hub.docker.com/r/geerlingguy/drupal-vm/) [![](https://images.microbadger.com/badges/image/geerlingguy/drupal-vm.svg)](https://microbadger.com/images/geerlingguy/drupal-vm "Get your own image badge on microbadger.com") [![irc://irc.freenode.net/drupal-vm](https://img.shields.io/badge/irc.freenode.net-%23drupal--vm-brightgreen.svg)](https://riot.im/app/#/room/#drupal-vm:matrix.org)
 
 [Drupal VM](https://www.drupalvm.com/) is a VM for Drupal, built with Ansible.