From 995a242e46d79912519a9a75d46def0bfa319b6a Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Wed, 25 May 2016 11:11:39 +0300
Subject: [PATCH] abusehelper: Install idiokit and abusehelper using pip

---
 abusehelper/manifests/init.pp | 56 +++--------------------------------
 1 file changed, 4 insertions(+), 52 deletions(-)

diff --git a/abusehelper/manifests/init.pp b/abusehelper/manifests/init.pp
index 4a56086..7d93cf6 100644
--- a/abusehelper/manifests/init.pp
+++ b/abusehelper/manifests/init.pp
@@ -33,60 +33,12 @@ class abusehelper(
     }
   }
 
-  file { '/usr/local/src/abusehelper.tar.gz':
-    ensure => present,
-    mode   => '0644',
-    owner  => 'root',
-    group  => $::operatingsystem ? {
-      'openbsd' => 'wheel',
-      default   => 'root',
-    },
+  python::pip::install { 'idiokit.tar.gz':
+    source => "puppet:///files/packages/${idiokit_package}",
+  } ->
+  python::pip::install { 'abusehelper.tar.gz':
     source => "puppet:///files/packages/${abusehelper_package}",
   }
-  util::extract::tar { '/usr/local/src/abusehelper':
-    ensure  => latest,
-    strip   => '1',
-    source  => '/usr/local/src/abusehelper.tar.gz',
-    require => File['/usr/local/src/abusehelper.tar.gz'],
-    before  => Python::Setup::Install['/usr/local/src/abusehelper'],
-  }
-
-  file { '/usr/local/src/idiokit.tar.gz':
-    ensure => present,
-    mode   => '0644',
-    owner  => 'root',
-    group  => $::operatingsystem ? {
-      'openbsd' => 'wheel',
-      default   => 'root',
-    },
-    source => "puppet:///files/packages/${idiokit_package}",
-  }
-  util::extract::tar { '/usr/local/src/idiokit':
-    ensure  => latest,
-    strip   => '1',
-    source  => '/usr/local/src/idiokit.tar.gz',
-    require => File['/usr/local/src/idiokit.tar.gz'],
-    before  => Python::Setup::Install['/usr/local/src/idiokit'],
-  }
-
-  if $::operatingsystem in ['CentOS','RedHat'] and versioncmp($::operatingsystemrelease, '6') < 0 {
-    include python::python26
-    python::setup::install { [
-      '/usr/local/src/abusehelper',
-      '/usr/local/src/idiokit',
-    ]:
-      python  => 'python2.6',
-      require => Package['python26'],
-    }
-  } else {
-    python::setup::install { [
-      '/usr/local/src/abusehelper',
-      '/usr/local/src/idiokit',
-    ]: }
-  }
-
-  Python::Setup::Install['/usr/local/src/idiokit'] ->
-  Python::Setup::Install['/usr/local/src/abusehelper']
 
   include user::system
   realize(User['abusehel'], Group['abusehel'])