From 9a8bb4bbdad507b3b6b00490edb3e821d18d11a9 Mon Sep 17 00:00:00 2001
From: Ciaby <ciaby@rhizomatica.org>
Date: Wed, 16 Jul 2014 19:01:48 -0500
Subject: [PATCH] Add the PHP5.5 PPA repository.

---
 modules/rhizomatica_base_system/manifests/init.pp | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/modules/rhizomatica_base_system/manifests/init.pp b/modules/rhizomatica_base_system/manifests/init.pp
index dd91c4d..98ebe49 100644
--- a/modules/rhizomatica_base_system/manifests/init.pp
+++ b/modules/rhizomatica_base_system/manifests/init.pp
@@ -110,14 +110,8 @@ class rhizomatica_base_system {
       require           => File['/etc/apt/apt.conf.d/90unsigned'],
     }
 
-  apt::source { 'mosh':
-      location          => 'http://ppa.launchpad.net/keithw/mosh/ubuntu',
-      release           => 'precise',
-      repos             => 'main',
-      key               => '7BF6DFCD',
-      include_src       => false,
-      require           => File['/etc/apt/apt.conf.d/90unsigned'],
-    }
+   apt::ppa { 'ppa:keithw/mosh': }
+   apt::ppa { 'ppa:ondrej/php5': }
 
 
   file { '/var/rhizomatica':
@@ -202,7 +196,7 @@ class rhizomatica_base_system {
 #MoSH
   package { 'mosh':
       ensure  => installed,
-      require => Apt::Source['mosh'],
+      require => Apt::Ppa['ppa:keithw/mosh'],
     }
 
 #Riak server
@@ -234,6 +228,7 @@ class rhizomatica_base_system {
   package { ['apache2','libapache2-mod-php5', 'rrdtool', 'python-twisted-web', 'python-psycopg2', 'python-pysqlite2',
              'php5', 'php5-pgsql', 'php5-curl', 'php5-cli', 'php5-gd', 'python-corepost']:
       ensure  => installed,
+      require => Apt::Ppa['ppa:ondrej/php5'],
     }
 
 #FreeSWITCH