Merge pull request #361 from geerlingguy/357-two-php-versions

Issue #357: Two versions of PHP are getting installed.

tasks/main.yml

@@ -1,5 +1,8 @@
 ---
 # Variable setup.
+- name: Include OS-specific variables.
+  include_vars: "{{ ansible_os_family }}.yml"
+
 - name: Include distribution and version-specific vars.
   include_vars: "{{ item }}"
   with_first_found:
@@ -12,9 +15,6 @@
     php_default_version_debian: "{{ __php_default_version_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"
-
 - name: Define php_packages.
   set_fact:
     php_packages: "{{ __php_packages | list }}"

vars/Debian.yml

@@ -1,6 +1,5 @@
 ---
 __php_default_version_debian: "7.0"
-
 __php_packages:
   - php{{ php_default_version_debian }}-common
   - php{{ php_default_version_debian }}-cli
@@ -14,8 +13,9 @@ __php_packages:
   - php{{ php_default_version_debian }}-opcache
   - php{{ php_default_version_debian }}-xml
   - php{{ php_default_version_debian }}-mbstring
-  - php-sqlite3
-  - php-apcu
+  - php{{ php_default_version_debian }}-apcu
+  - php{{ php_default_version_debian }}-sqlite3
+
 __php_webserver_daemon: "apache2"
 
 # Vendor-specific configuration paths on Debian/Ubuntu make my brain asplode.