From 844d97da6ddd2be280930ccedb002b540ba8a8d4 Mon Sep 17 00:00:00 2001
From: Adam Malone <adam@adammalone.net>
Date: Thu, 4 Feb 2016 20:34:57 +0000
Subject: [PATCH 1/2] Moves the inclusion of mysql into the project manifest

---
 manifests/project.pp | 1 +
 manifests/version.pp | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/project.pp b/manifests/project.pp
index 70d90a0..f6cb4d5 100644
--- a/manifests/project.pp
+++ b/manifests/project.pp
@@ -143,6 +143,7 @@
   }
 
   if $mysql {
+    include mysql::config
     $mysql_dbs = $mysql ? {
       true    => ["${name}_development", "${name}_test"],
       default => $mysql,
diff --git a/manifests/version.pp b/manifests/version.pp
index 1eff4dc..49bf970 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -9,7 +9,6 @@
   $version  = $name
 ) {
   require php
-  include mysql::config
 
   # Current supported and secure versions
   $secure_5_6 = $php::config::secure_versions['5.6']

From ad94685290cb8f19bbd79218b13916d36c238337 Mon Sep 17 00:00:00 2001
From: Adam Malone <adam@adammalone.net>
Date: Thu, 4 Feb 2016 20:54:43 +0000
Subject: [PATCH 2/2] Preventing mysql from being put into the templates

---
 templates/php.ini.erb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/templates/php.ini.erb b/templates/php.ini.erb
index de3a5cd..053f768 100644
--- a/templates/php.ini.erb
+++ b/templates/php.ini.erb
@@ -1005,6 +1005,7 @@ date.timezone = UTC
 
 ;pdo_odbc.db2_instance_name
 
+<% if @mysql %>
 [Pdo_mysql]
 ; If mysqlnd is used: Number of cache slots for the internal result set cache
 ; http://php.net/pdo_mysql.cache_size
@@ -1014,6 +1015,7 @@ pdo_mysql.cache_size = 2000
 ; MySQL defaults.
 ; http://php.net/pdo_mysql.default-socket
 pdo_mysql.default_socket=<%= scope.lookupvar('::mysql::config::socket') %>
+<% end -%>
 
 [Phar]
 ; http://php.net/phar.readonly
@@ -1136,6 +1138,7 @@ ibase.dateformat = "%Y-%m-%d"
 ; Default time format.
 ibase.timeformat = "%H:%M:%S"
 
+<% if @mysql %>
 [MySQL]
 ; Allow accessing, from PHP's perspective, local files with LOAD DATA statements
 ; http://php.net/mysql.allow_local_infile
@@ -1266,6 +1269,7 @@ mysqlnd.collect_memory_statistics = Off
 ; bytes.
 ; http://php.net/mysqlnd.net_read_buffer_size
 ;mysqlnd.net_read_buffer_size = 32768
+<% end -%>
 
 [OCI8]