From bea5f9554ed66025f72ff7d0831e33aae58e41ca Mon Sep 17 00:00:00 2001
From: "Wile E. Coyote" <rhizomatica@rhizomatica.org>
Date: Tue, 24 Jan 2017 21:25:15 +0000
Subject: [PATCH] Fix path for php.ini on Ubuntu

---
 modules/rhizo_base/manifests/packages.pp | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/modules/rhizo_base/manifests/packages.pp b/modules/rhizo_base/manifests/packages.pp
index 154e628..46774b0 100644
--- a/modules/rhizo_base/manifests/packages.pp
+++ b/modules/rhizo_base/manifests/packages.pp
@@ -23,10 +23,6 @@ class rhizo_base::packages::common {
       require => Class['rhizo_base::apt'],
     }
 
-  file { '/etc/php5/apache2/php.ini':
-      ensure  => present,
-      source  => "puppet:///modules/rhizo_base/etc/php5/apache2/php.ini.$operatingsystem"
-    }
 
 
 }
@@ -48,10 +44,16 @@ class rhizo_base::packages::ubuntu inherits rhizo_base::packages::common {
       require => Class['rhizo_base::apt'],
     }
 
+  file { '/etc/php/5.6/apache2/php.ini':
+      ensure  => present,
+      source  => "puppet:///modules/rhizo_base/etc/php5/apache2/php.ini.$operatingsystem"
+    }
+
 
 }
 
 class rhizo_base::packages::debian inherits rhizo_base::packages::common {
+
   package { ['apache2','libapache2-mod-php5',
   'rrdtool', 'python-psycopg2',
   'python-pysqlite2', 'php5', 'php5-pgsql',
@@ -61,4 +63,11 @@ class rhizo_base::packages::debian inherits rhizo_base::packages::common {
       ensure  => installed,
       require => Class['rhizo_base::apt'],
     }
+
+  file { '/etc/php5/apache2/php.ini':
+      ensure  => present,
+      source  => "puppet:///modules/rhizo_base/etc/php5/apache2/php.ini.$operatingsystem"
+    }
+
+
 }
\ No newline at end of file