Merge branch 'update/debops.nginx' of https://github.com/ypid/debops …

…into ypid-update/debops.nginx
debops · Sep 18, 2019 · 34922fd · 34922fd
2 parents 726ddb7 + 8f48974
commit 34922fd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -142,6 +142,16 @@ General
 - The role will use Ansible local facts to check if OpenSSH server package is
   installed to conditionally enable/disable its start on first install.
 
+Removed
+~~~~~~~
+
+:ref:`debops.nginx` role
+''''''''''''''''''''''''
+
+- Set `nginx_upstream_php5_www_data` to absent. If you are still using
+  that Nginx upstream which was enabled by default then update your Ansible
+  role and switch to a supported PHP release.
+
 Fixed
 ~~~~~
 

diff --git a/ansible/roles/debops.nginx/defaults/main.yml b/ansible/roles/debops.nginx/defaults/main.yml
@@ -897,8 +897,9 @@ nginx__dependent_upstreams: []
 # .. envvar:: nginx_upstream_php5_www_data [[[
 #
 # Upstream for default php5-fpm configuration
+# Legacy.
 nginx_upstream_php5_www_data:
-  enabled: True
+  state: 'absent'
   name: 'php5_www-data'
   type: 'php5'
   php5: 'www-data'