From da71d1b36046cd281eb33a7d6a44d8a4bc6a6f7c Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 13 May 2016 10:04:38 -0500
Subject: [PATCH] Update Ubuntu 12.04 variables to fix broken tests.

---
 .travis.yml                    |  2 +-
 tests/test-package.yml         | 23 ++++++++---------------
 tests/test-vars-ubuntu1204.yml | 23 +++++++++++++++++++++++
 3 files changed, 32 insertions(+), 16 deletions(-)
 create mode 100644 tests/test-vars-ubuntu1204.yml

diff --git a/.travis.yml b/.travis.yml
index 9860585..0fe9aae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,7 +34,7 @@ env:
     init: /sbin/init
     run_opts: ""
     SITE: package
-    PHP_VERSION: 7.0
+    PHP_VERSION: 5.6
 
 services:
   - docker
diff --git a/tests/test-package.yml b/tests/test-package.yml
index a0cf0ee..3ed8397 100644
--- a/tests/test-package.yml
+++ b/tests/test-package.yml
@@ -7,29 +7,22 @@
     php_enablerepo: "remi,remi-php70"
 
   pre_tasks:
+    - include_vars: test-vars-ubuntu1204.yml
+      when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '12.04'
+
     - name: Ensure build dependencies are installed (RedHat).
       yum: name=which state=present
       when: ansible_os_family == 'RedHat'
 
     - name: Add repository for PHP 7.
       apt_repository: repo='ppa:ondrej/php'
-      when: ansible_os_family == 'Debian'
+      when: 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: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '12.04'
 
     - name: Override package list manually for Ubuntu 12.04.
-      set_fact:
-        php_packages:
-          - php7.0-common
-          - php7.0-cli
-          - php7.0-dev
-          - php7.0-fpm
-          - libpcre3-dev
-          - php7.0-gd
-          - php7.0-curl
-          - php7.0-imap
-          - php7.0-json
-          - php7.0-opcache
-          - php7.0-xml
-          - php7.0-mbstring
       when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '12.04'
 
   roles:
diff --git a/tests/test-vars-ubuntu1204.yml b/tests/test-vars-ubuntu1204.yml
new file mode 100644
index 0000000..9fabcac
--- /dev/null
+++ b/tests/test-vars-ubuntu1204.yml
@@ -0,0 +1,23 @@
+---
+php_version: "5.6"
+php_packages:
+  - php5
+  - php5-mcrypt
+  - php5-cli
+  - php5-common
+  - php5-curl
+  - php5-dev
+  - php5-fpm
+  - php5-gd
+  - php-pear
+  - libpcre3-dev
+php_conf_paths:
+  - /etc/php5/fpm
+  - /etc/php5/apache2
+  - /etc/php5/cli
+php_extension_conf_paths:
+  - /etc/php5/fpm/conf.d
+  - /etc/php5/apache2/conf.d
+  - /etc/php5/cli/conf.d
+php_fpm_daemon: php5-fpm
+php_fpm_conf_path: "/etc/php5/fpm"