From 65129ab449aea2f688016aae71906bfff60795e1 Mon Sep 17 00:00:00 2001
From: Jeff George <jeff.george@gmail.com>
Date: Mon, 18 Jan 2016 17:08:28 -0500
Subject: [PATCH] Swap php from Ubuntu 14.04's base (5.5) to Ondrej's 5.6 PPA

---
 puppet/precip/manifests/php.pp | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/puppet/precip/manifests/php.pp b/puppet/precip/manifests/php.pp
index bcf6adc..d3ff4fb 100644
--- a/puppet/precip/manifests/php.pp
+++ b/puppet/precip/manifests/php.pp
@@ -1,6 +1,18 @@
 class precip::php {
+  apt::key { 'ppa:ondrej':
+    id => '14AA40EC0831756756D7F66C4F4EA0AAE5267A6C',
+  }
+
+  apt::ppa { 'ppa:ondrej/php5-5.6':
+    package_manage => true,
+    require => Apt::Key['ppa:ondrej'],
+  }
   
-  class { 'php::cli': }
+  class { 'php::cli': 
+    require => [
+      Apt::Ppa['ppa:ondrej/php5-5.6'],
+    ]
+  }
   
   file {[
       '/etc/php5/',
@@ -40,8 +52,7 @@
     'memcached',
     'mysql',
     'sqlite',
-    'xdebug',
-    'xhprof']:
+    'xdebug']:
     notify => Service['httpd'],
   }
   
@@ -53,7 +64,7 @@
       'xdebug.idekey' => 'vagrant',
       'xdebug.max_nesting_level' => '1000',
     },
-    zend => '/usr/lib/php5/20121212',
+    zend => '/usr/lib/php5/20131226',
     notify => Service['httpd'],
   }