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] 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"