Issue #609: Clean up some references to / usage of PHP < 7.

geerlingguy · May 12, 2016 · 2607ff0 · 2607ff0
1 parent 8a527fc
commit 2607ff0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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: