tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

abusesa: Rename abusesa::analytics as abusesa::analytics::ui

Browse source
This commit is contained in:
Ossi Salmi 2016-03-16 16:17:51 +02:00
parent 99ea38f22f
commit 35027cedb0
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
abusesa/manifests/analytics.pp → abusesa/manifests/analytics/ui.pp
View file

@ -1,4 +1,4 @@
# Install AbuseSA Analytics. # Install AbuseSA Analytics UI.
# #
# === Parameters # === Parameters
# #
@ -8,34 +8,34 @@
# $webhosts: # $webhosts:
# List of analytics virtual hosts. # List of analytics virtual hosts.
# #
class abusesa::analytics( class abusesa::analytics::ui(
$config=undef, $config=undef,
$webhosts=undef, $webhosts=undef,
) { ) {
if ! $abusesa_analytics_package { if ! $abusesa_analytics_ui_package {
if $::abusesa_analytics_package_latest { if $::abusesa_analytics_ui_package_latest {
$abusesa_analytics_package = $::abusesa_analytics_package_latest $abusesa_analytics_ui_package = $::abusesa_analytics_ui_package_latest
} else { } 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, ensure => present,
mode => '0644', mode => '0644',
owner => 'root', owner => 'root',
group => '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, ensure => latest,
strip => '1', strip => '1',
source => '/usr/local/src/abusesa-analytics.tar.gz', source => '/usr/local/src/abusesa-analytics-ui.tar.gz',
require => File['/usr/local/src/abusesa-analytics.tar.gz'], require => File['/usr/local/src/abusesa-analytics-ui.tar.gz'],
} }
python::setup::install { '/usr/local/src/abusesa-analytics': python::setup::install { '/usr/local/src/abusesa-analytics-ui':
require => Util::Extract::Tar['/usr/local/src/abusesa-analytics'], require => Util::Extract::Tar['/usr/local/src/abusesa-analytics-ui'],
} }
$htdocs = $::operatingsystem ? { $htdocs = $::operatingsystem ? {
@ -50,12 +50,12 @@ class abusesa::analytics(
owner => 'root', owner => 'root',
group => 'root', group => 'root',
source => $config, source => $config,
require => Python::Setup::Install['/usr/local/src/abusesa-analytics'], require => Python::Setup::Install['/usr/local/src/abusesa-analytics-ui'],
} }
} }
if $webhosts { if $webhosts {
abusesa::analytics::configwebhost { $webhosts: abusesa::analytics::ui::configwebhost { $webhosts:
htdocs => $htdocs, htdocs => $htdocs,
} }
} }
@ -65,7 +65,7 @@ class abusesa::analytics(
# Enable AbuseSA Analytics for virtual host. # Enable AbuseSA Analytics for virtual host.
# #
define abusesa::analytics::configwebhost($htdocs) { define abusesa::analytics::ui::configwebhost($htdocs) {
if ! defined(Abusesa::Configwebhost[$name]) { if ! defined(Abusesa::Configwebhost[$name]) {
abusesa::configwebhost { $name: } abusesa::configwebhost { $name: }