From ab5576bfdcd167a5a97164956c1db73f2bc14bbd Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Fri, 8 Jul 2016 12:28:31 +0300
Subject: [PATCH] abusesa: Install abusesa packages using pip

---
 abusesa/manifests/analytics.pp    | 20 ++++++++++++++++++++
 abusesa/manifests/analytics/ui.pp | 17 ++---------------
 abusesa/manifests/init.pp         | 30 +++---------------------------
 abusesa/manifests/passivedns.pp   | 30 +++---------------------------
 abusesa/manifests/sensor.pp       | 21 ++++-----------------
 5 files changed, 32 insertions(+), 86 deletions(-)
 create mode 100644 abusesa/manifests/analytics.pp

diff --git a/abusesa/manifests/analytics.pp b/abusesa/manifests/analytics.pp
new file mode 100644
index 0000000..995227b
--- /dev/null
+++ b/abusesa/manifests/analytics.pp
@@ -0,0 +1,20 @@
+# Install abusesa-analytics.
+#
+class abusesa::analytics {
+
+  if ! $abusesa_analytics_package {
+    if $::abusesa_analytics_package_latest {
+      $abusesa_analytics_package = $::abusesa_analytics_package_latest
+    } else {
+      fail('Must define $abusesa_analytics_package or $abusesa_analytics_package_latest')
+    }
+  }
+
+  python::pip::install { 'abusesa-analytics.tar.gz':
+    source => "puppet:///files/packages/${abusesa_analytics_package}",
+  }
+
+  Python::Pip::Install['abusesa.tar.gz'] ->
+  Python::Pip::Install['abusesa-analytics.tar.gz']
+
+}
diff --git a/abusesa/manifests/analytics/ui.pp b/abusesa/manifests/analytics/ui.pp
index 2fdb5e0..35ed9ff 100644
--- a/abusesa/manifests/analytics/ui.pp
+++ b/abusesa/manifests/analytics/ui.pp
@@ -21,22 +21,9 @@ class abusesa::analytics::ui(
     }
   }
 
-  file { '/usr/local/src/abusesa-analytics-ui.tar.gz':
-    ensure => present,
-    mode   => '0644',
-    owner  => 'root',
-    group  => 'root',
+  python::pip::install { 'abusesa-analytics-ui.tar.gz':
     source => "puppet:///files/packages/${abusesa_analytics_ui_package}",
   }
-  util::extract::tar { '/usr/local/src/abusesa-analytics-ui':
-    ensure  => latest,
-    strip   => '1',
-    source  => '/usr/local/src/abusesa-analytics-ui.tar.gz',
-    require => File['/usr/local/src/abusesa-analytics-ui.tar.gz'],
-  }
-  python::setup::install { '/usr/local/src/abusesa-analytics-ui':
-    require => Util::Extract::Tar['/usr/local/src/abusesa-analytics-ui'],
-  }
 
   $htdocs = $::operatingsystem ? {
     'ubuntu' => '/usr/local/share/analytics/htdocs',
@@ -50,7 +37,7 @@ class abusesa::analytics::ui(
       owner   => 'root',
       group   => 'root',
       source  => $config,
-      require => Python::Setup::Install['/usr/local/src/abusesa-analytics-ui'],
+      require => Python::Pip::Install['abusesa-analytics-ui.tar.gz'],
     }
   }
 
diff --git a/abusesa/manifests/init.pp b/abusesa/manifests/init.pp
index 3d143b5..f2806e6 100644
--- a/abusesa/manifests/init.pp
+++ b/abusesa/manifests/init.pp
@@ -51,39 +51,15 @@ class abusesa(
     content => "umask 007\n",
   }
 
-  file { '/usr/local/src/abusesa.tar.gz':
-    ensure => present,
-    mode   => '0644',
-    owner  => 'root',
-    group  => $::operatingsystem ? {
-      'openbsd' => 'wheel',
-      default   => 'root',
-    },
+  python::pip::install { 'abusesa.tar.gz':
     source => "puppet:///files/packages/${abusesa_package}",
   }
-  util::extract::tar { '/usr/local/src/abusesa':
-    ensure  => latest,
-    strip   => '1',
-    source  => '/usr/local/src/abusesa.tar.gz',
-    require => File['/usr/local/src/abusesa.tar.gz'],
-    before  => Python::Setup::Install['/usr/local/src/abusesa'],
-}
-
-  if $::operatingsystem in ['CentOS','RedHat'] and versioncmp($::operatingsystemrelease, '6') < 0 {
-    include python::python26
-    python::setup::install { '/usr/local/src/abusesa':
-      python  => 'python2.6',
-      require => Package['python26'],
-    }
-  } else {
-    python::setup::install { '/usr/local/src/abusesa': }
-  }
 
   Python::Pip::Install['abusehelper.tar.gz'] ->
-  Python::Setup::Install['/usr/local/src/abusesa']
+  Python::Pip::Install['abusesa.tar.gz']
 
   Python::Setup::Install['/usr/local/src/opencollab'] ->
-  Python::Setup::Install['/usr/local/src/abusesa']
+  Python::Pip::Install['abusesa.tar.gz']
 
   if $botnets {
     class { 'abusehelper::init':
diff --git a/abusesa/manifests/passivedns.pp b/abusesa/manifests/passivedns.pp
index 03388df..72d16cc 100644
--- a/abusesa/manifests/passivedns.pp
+++ b/abusesa/manifests/passivedns.pp
@@ -57,35 +57,11 @@ class abusesa::passivedns(
     content => "umask 007\n",
   }
 
-  file { '/usr/local/src/abusesa-passivedns.tar.gz':
-    ensure => present,
-    mode   => '0644',
-    owner  => 'root',
-    group  => $::operatingsystem ? {
-      'openbsd' => 'wheel',
-      default   => 'root',
-    },
+  python::pip::install { 'abusesa-passivedns.tar.gz':
     source => "puppet:///files/packages/${abusesa_passivedns_package}",
   }
-  util::extract::tar { '/usr/local/src/abusesa-passivedns':
-    ensure  => latest,
-    strip   => '1',
-    source  => '/usr/local/src/abusesa-passivedns.tar.gz',
-    require => File['/usr/local/src/abusesa-passivedns.tar.gz'],
-    before  => Python::Setup::Install['/usr/local/src/abusesa-passivedns'],
-  }
 
-  if $::operatingsystem in ['CentOS','RedHat'] and versioncmp($::operatingsystemrelease, '6') < 0 {
-    include python::python26
-    python::setup::install { '/usr/local/src/abusesa-passivedns':
-      python  => 'python2.6',
-      require => Package['python26'],
-    }
-  } else {
-    python::setup::install { '/usr/local/src/abusesa-passivedns': }
-  }
-
-  Python::Setup::Install['/usr/local/src/abusesa'] ->
-  Python::Setup::Install['/usr/local/src/abusesa-passivedns']
+  Python::Pip::Install['abusesa.tar.gz'] ->
+  Python::Pip::Install['abusesa-passivedns.tar.gz']
 
 }
diff --git a/abusesa/manifests/sensor.pp b/abusesa/manifests/sensor.pp
index ae8ea89..dafa291 100644
--- a/abusesa/manifests/sensor.pp
+++ b/abusesa/manifests/sensor.pp
@@ -10,24 +10,11 @@ class abusesa::sensor {
     }
   }
 
-  file { '/usr/local/src/abusesa-sensor.tar.gz':
-    ensure => present,
-    mode   => '0644',
-    owner  => 'root',
-    group  => $::operatingsystem ? {
-      'openbsd' => 'wheel',
-      default   => 'root',
-    },
+  python::pip::install { 'abusesa-sensor.tar.gz':
     source => "puppet:///files/packages/${abusesa_sensor_package}",
-  } ->
-  util::extract::tar { '/usr/local/src/abusesa-sensor':
-    ensure => latest,
-    strip  => '1',
-    source => '/usr/local/src/abusesa-sensor.tar.gz',
-  } ->
-  python::setup::install { '/usr/local/src/abusesa-sensor': }
+  }
 
-  Python::Setup::Install['/usr/local/src/abusesa'] ->
-  Python::Setup::Install['/usr/local/src/abusesa-sensor']
+  Python::Pip::Install['abusesa.tar.gz'] ->
+  Python::Pip::Install['abusesa-sensor.tar.gz']
 
 }