Merge pull request #972 from thom8/php_55_apt

Remove deprecated PPA ondrej/php5.
geerlingguy · Nov 7, 2016 · a5518f8 · a5518f8
2 parents a702f93 + e7f0169
commit a5518f8
Showing 1 changed file with 2 additions and 6 deletions.
diff --git 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"