From f7f6e1eabda45c1ca1d099ca69029d2f3ee5f4e0 Mon Sep 17 00:00:00 2001
From: Fabio Rauber <fabiorauber@gmail.com>
Date: Thu, 9 Oct 2014 20:21:23 +0000
Subject: [PATCH 1/3] Created conditional to deal with updated Ubuntu 14.04 php
 conf.d directory

---
 manifests/params.pp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index ff07341..c7b867a 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -5,7 +5,10 @@
       $php_apc_package_name = 'php-apc'
       $common_package_name = 'php5-common'
       $cli_package_name = 'php5-cli'
-      $php_conf_dir = '/etc/php5/conf.d'
+      $php_conf_dir = $lsbdistcodename ? {
+                        'trusty'  => '/etc/php5/apache2/conf.d',
+                        default   => '/etc/php5/conf.d',
+                      }
       $fpm_package_name = 'php5-fpm'
       $fpm_service_name = 'php5-fpm'
       $fpm_pool_dir = '/etc/php5/fpm/pool.d'

From 9fc8a15e7d3d6790051893a908da7361a9c21d5f Mon Sep 17 00:00:00 2001
From: Fabio Rauber <fabiorauber@gmail.com>
Date: Sat, 11 Oct 2014 17:08:18 +0000
Subject: [PATCH 2/3] Enable PHP modules via php5enmod in Ubuntu 14.04 LTS

---
 manifests/module.pp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/manifests/module.pp b/manifests/module.pp
index 9e90b6e..b52ca52 100644
--- a/manifests/module.pp
+++ b/manifests/module.pp
@@ -28,5 +28,16 @@
   package { $package:
     ensure => $ensure,
   }
+
+  # Enable module in Ubuntu 14.04 LTS
+  if $lsbdistcodename == 'trusty' {
+    exec { "enable $title":
+      unless  => "php5query -s apache2 -m $title",
+      command => "php5enmod $title",
+      path    => ['/bin', '/usr/bin', '/usr/sbin'],
+      require => Package[$package],
+    }
+  }
+
 }
 

From 8b5e11d6cb46879741a0978fc459fe1910e03ef8 Mon Sep 17 00:00:00 2001
From: Fabio Rauber <fabiorauber@gmail.com>
Date: Fri, 27 Mar 2015 11:54:26 -0300
Subject: [PATCH 3/3] Fixed issue with php5 built-in opcache module

---
 manifests/module.pp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/manifests/module.pp b/manifests/module.pp
index b52ca52..c2e9693 100644
--- a/manifests/module.pp
+++ b/manifests/module.pp
@@ -25,8 +25,14 @@
     }
   }
 
-  package { $package:
-    ensure => $ensure,
+  if $title == 'opcache' { 
+    package { 'php5-opcache':
+      name => 'php5',
+    }
+  } else {
+    package { $package:
+      ensure => $ensure,
+    }
   }
 
   # Enable module in Ubuntu 14.04 LTS