From 61f6b1104ce02b8ba8d9bf79c4720e1e85a26fa2 Mon Sep 17 00:00:00 2001 From: Ossi Salmi Date: Mon, 9 Feb 2015 12:24:06 +0200 Subject: [PATCH] abusesa: Add abusesa::passivedns --- abusesa/Makefile | 19 +++++++++++++-- abusesa/manifests/passivedns.pp | 41 +++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 abusesa/manifests/passivedns.pp diff --git a/abusesa/Makefile b/abusesa/Makefile index 6008b26..39e57d8 100644 --- a/abusesa/Makefile +++ b/abusesa/Makefile @@ -5,6 +5,9 @@ BRANCH = default SOURCE = https://bitbucket.org/clarifiednetworks/abusesa/get/$(BRANCH).tar.gz TARGET = abusesa-$(BRANCH)-$(TIMESTAMP).tar.gz +PASSIVEDNSSOURCE = https://bitbucket.org/clarifiednetworks/abusesa-passivedns/get/$(BRANCH).tar.gz +PASSIVEDNSTARGET = abusesa-passivedns-$(BRANCH)-$(TIMESTAMP).tar.gz + SEARCHSOURCE = https://bitbucket.org/clarifiednetworks/abusesa-search/get/$(BRANCH).tar.gz SEARCHTARGET = abusesa-search-$(BRANCH)-$(TIMESTAMP).tar.gz @@ -12,6 +15,10 @@ all: tarball manifest tarball: $(PACKAGES)/$(TARGET) manifest: $(MANIFESTS)/abusesa.pp +passivedns: passivednstarball passivednsmanifest +passivednstarball: $(PACKAGES)/$(PASSIVEDNSTARGET) +passivednsmanifest: $(MANIFESTS)/abusesa_passivedns.pp + search: searchtarball searchmanifest searchtarball: $(PACKAGES)/$(SEARCHTARGET) searchmanifest: $(MANIFESTS)/abusesa_search.pp @@ -22,7 +29,15 @@ $(PACKAGES)/$(TARGET): $(MANIFESTS)/abusesa.pp: $(PACKAGES)/$(TARGET) @umask 022; echo $@; \ - echo '$$abusesa_package_latest = "$(TARGET)"' > $@ + echo "\$$abusesa_package_latest = '$(TARGET)'"> $@ + +$(PACKAGES)/$(PASSIVEDNSTARGET): + @umask 022; echo $@; \ + test -f $@ || curl -f --digest -u $(USER) -o $@ $(PASSIVEDNSSOURCE) + +$(MANIFESTS)/abusesa_passivedns.pp: $(PACKAGES)/$(PASSIVEDNSTARGET) + @umask 022; echo $@; \ + echo "\$$abusesa_passivedns_package_latest = '$(PASSIVEDNSTARGET)'" > $@ $(PACKAGES)/$(SEARCHTARGET): @umask 022; echo $@; \ @@ -30,4 +45,4 @@ $(PACKAGES)/$(SEARCHTARGET): $(MANIFESTS)/abusesa_search.pp: $(PACKAGES)/$(SEARCHTARGET) @umask 022; echo $@; \ - echo '$$abusesa_search_package_latest = "$(SEARCHTARGET)"' > $@ + echo "\$$abusesa_search_package_latest = '$(SEARCHTARGET)'" > $@ diff --git a/abusesa/manifests/passivedns.pp b/abusesa/manifests/passivedns.pp new file mode 100644 index 0000000..664900f --- /dev/null +++ b/abusesa/manifests/passivedns.pp @@ -0,0 +1,41 @@ +# Install abusesa-passivedns. +# +class abusesa::passivedns { + + if ! $abusesa_passivedns_package { + if $::abusesa_passivedns_package_latest { + $abusesa_passivedns_package = $::abusesa_passivedns_package_latest + } else { + fail('Must define $abusesa_passivedns_package or $abusesa_passivedns_package_latest') + } + } + + file { '/usr/local/src/abusesa-passivedns.tar.gz': + ensure => present, + mode => '0644', + owner => 'root', + group => $::operatingsystem ? { + 'openbsd' => 'wheel', + default => 'root', + }, + 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': } + } + +}