From 35027cedb0b52c4752f0b1eb665801c3fa033d25 Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Wed, 16 Mar 2016 16:17:51 +0200
Subject: [PATCH] abusesa: Rename abusesa::analytics as abusesa::analytics::ui

---
 .../{analytics.pp => analytics/ui.pp}         | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)
 rename abusesa/manifests/{analytics.pp => analytics/ui.pp} (56%)

diff --git a/abusesa/manifests/analytics.pp b/abusesa/manifests/analytics/ui.pp
similarity index 56%
rename from abusesa/manifests/analytics.pp
rename to abusesa/manifests/analytics/ui.pp
index 9646373..2fdb5e0 100644
--- a/abusesa/manifests/analytics.pp
+++ b/abusesa/manifests/analytics/ui.pp
@@ -1,4 +1,4 @@
-# Install AbuseSA Analytics.
+# Install AbuseSA Analytics UI.
 #
 # === Parameters
 #
@@ -8,34 +8,34 @@
 # $webhosts:
 #   List of analytics virtual hosts.
 #
-class abusesa::analytics(
+class abusesa::analytics::ui(
   $config=undef,
   $webhosts=undef,
 ) {
 
-  if ! $abusesa_analytics_package {
-    if $::abusesa_analytics_package_latest {
-      $abusesa_analytics_package = $::abusesa_analytics_package_latest
+  if ! $abusesa_analytics_ui_package {
+    if $::abusesa_analytics_ui_package_latest {
+      $abusesa_analytics_ui_package = $::abusesa_analytics_ui_package_latest
     } else {
-      fail('Must define $abusesa_analytics_package or $abusesa_analytics_package_latest')
+      fail('Must define $abusesa_analytics_ui_package or $abusesa_analytics_ui_package_latest')
     }
   }
 
-  file { '/usr/local/src/abusesa-analytics.tar.gz':
+  file { '/usr/local/src/abusesa-analytics-ui.tar.gz':
     ensure => present,
     mode   => '0644',
     owner  => 'root',
     group  => 'root',
-    source => "puppet:///files/packages/${abusesa_analytics_package}",
+    source => "puppet:///files/packages/${abusesa_analytics_ui_package}",
   }
-  util::extract::tar { '/usr/local/src/abusesa-analytics':
+  util::extract::tar { '/usr/local/src/abusesa-analytics-ui':
     ensure  => latest,
     strip   => '1',
-    source  => '/usr/local/src/abusesa-analytics.tar.gz',
-    require => File['/usr/local/src/abusesa-analytics.tar.gz'],
+    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':
-    require => Util::Extract::Tar['/usr/local/src/abusesa-analytics'],
+  python::setup::install { '/usr/local/src/abusesa-analytics-ui':
+    require => Util::Extract::Tar['/usr/local/src/abusesa-analytics-ui'],
   }
 
   $htdocs = $::operatingsystem ? {
@@ -50,12 +50,12 @@ class abusesa::analytics(
       owner   => 'root',
       group   => 'root',
       source  => $config,
-      require => Python::Setup::Install['/usr/local/src/abusesa-analytics'],
+      require => Python::Setup::Install['/usr/local/src/abusesa-analytics-ui'],
     }
   }
 
   if $webhosts {
-    abusesa::analytics::configwebhost { $webhosts:
+    abusesa::analytics::ui::configwebhost { $webhosts:
       htdocs => $htdocs,
     }
   }
@@ -65,7 +65,7 @@ class abusesa::analytics(
 
 # Enable AbuseSA Analytics for virtual host.
 #
-define abusesa::analytics::configwebhost($htdocs) {
+define abusesa::analytics::ui::configwebhost($htdocs) {
 
   if ! defined(Abusesa::Configwebhost[$name]) {
     abusesa::configwebhost { $name: }