From fb897cc0b8949be77bf15c0a0813d768291e4ca0 Mon Sep 17 00:00:00 2001 From: Ossi Salmi Date: Fri, 20 May 2016 14:02:22 +0300 Subject: [PATCH] abusesa: Add abusesa::sensor --- abusesa/Makefile | 15 +++++++++++++++ abusesa/manifests/sensor.pp | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 abusesa/manifests/sensor.pp diff --git a/abusesa/Makefile b/abusesa/Makefile index 901e588..eacc8c1 100644 --- a/abusesa/Makefile +++ b/abusesa/Makefile @@ -11,6 +11,9 @@ PASSIVEDNSTARGET = abusesa-passivedns-$(BRANCH)-$(TIMESTAMP).tar.gz SEARCHSOURCE = https://github.com/abusesa/search/archive/$(BRANCH).tar.gz SEARCHTARGET = abusesa-search-$(BRANCH)-$(TIMESTAMP).tar.gz +SENSORSOURCE = https://github.com/abusesa/sensor/archive/$(BRANCH).tar.gz +SENSORTARGET = abusesa-sensor-$(BRANCH)-$(TIMESTAMP).tar.gz + all: tarball manifest tarball: $(PACKAGES)/$(TARGET) manifest: $(MANIFESTS)/abusesa.pp @@ -23,6 +26,10 @@ search: searchtarball searchmanifest searchtarball: $(PACKAGES)/$(SEARCHTARGET) searchmanifest: $(MANIFESTS)/abusesa_search.pp +sensor: sensortarball sensormanifest +sensortarball: $(PACKAGES)/$(SENSORTARGET) +sensormanifest: $(MANIFESTS)/abusesa_sensor.pp + $(PACKAGES)/$(TARGET): @umask 022; echo $@; \ test -f $@ || curl -L -f --basic -u $(USER) -o $@ $(SOURCE) @@ -46,3 +53,11 @@ $(PACKAGES)/$(SEARCHTARGET): $(MANIFESTS)/abusesa_search.pp: $(PACKAGES)/$(SEARCHTARGET) @umask 022; echo $@; \ echo "\$$abusesa_search_package_latest = '$(SEARCHTARGET)'" > $@ + +$(PACKAGES)/$(SENSORTARGET): + @umask 022; echo $@; \ + test -f $@ || curl -L -f --basic -u $(USER) -o $@ $(SENSORSOURCE) + +$(MANIFESTS)/abusesa_sensor.pp: $(PACKAGES)/$(SENSORTARGET) + @umask 022; echo $@; \ + echo "\$$abusesa_sensor_package_latest = '$(SENSORTARGET)'" > $@ diff --git a/abusesa/manifests/sensor.pp b/abusesa/manifests/sensor.pp new file mode 100644 index 0000000..ae8ea89 --- /dev/null +++ b/abusesa/manifests/sensor.pp @@ -0,0 +1,33 @@ +# Install abusesa-sensor. +# +class abusesa::sensor { + + if ! $abusesa_sensor_package { + if $::abusesa_sensor_package_latest { + $abusesa_sensor_package = $::abusesa_sensor_package_latest + } else { + fail('Must define $abusesa_sensor_package or $abusesa_sensor_package_latest') + } + } + + file { '/usr/local/src/abusesa-sensor.tar.gz': + ensure => present, + mode => '0644', + owner => 'root', + group => $::operatingsystem ? { + 'openbsd' => 'wheel', + default => 'root', + }, + 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'] + +}