From ffa3aea734c32b4b2316bb67a3968f98ba33b634 Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Wed, 29 Jun 2016 14:35:25 +0300
Subject: [PATCH] abusesa: Install live using pip

---
 abusesa/manifests/live.pp | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/abusesa/manifests/live.pp b/abusesa/manifests/live.pp
index cd05b5f..062ccb1 100644
--- a/abusesa/manifests/live.pp
+++ b/abusesa/manifests/live.pp
@@ -37,22 +37,9 @@ class abusesa::live(
     }
   }
 
-  file { '/usr/local/src/abusesa-live.tar.gz':
-    ensure => present,
-    mode   => '0644',
-    owner  => 'root',
-    group  => 'root',
+  python::pip::install { 'abusesa-live.tar.gz':
     source => "puppet:///files/packages/${abusesa_live_package}",
   }
-  util::extract::tar { '/usr/local/src/abusesa-live':
-    ensure  => latest,
-    strip   => '1',
-    source  => '/usr/local/src/abusesa-live.tar.gz',
-    require => File['/usr/local/src/abusesa-live.tar.gz'],
-  }
-  python::setup::install { '/usr/local/src/abusesa-live':
-    require => Util::Extract::Tar['/usr/local/src/abusesa-live'],
-  }
 
   $htdocs = $::operatingsystem ? {
     'ubuntu' => '/usr/local/share/abusesa-live/htdocs',
@@ -72,7 +59,7 @@ class abusesa::live(
     group   => 'root',
     source  => $config,
     content => $config_content,
-    require => Python::Setup::Install['/usr/local/src/abusesa-live'],
+    require => Python::Pip::Install['abusesa-live.tar.gz'],
   }
 
   if $webhosts {