Manual merge of abusehelper and abusesa from parameterize branch

This commit is contained in:
Ossi Salmi 2015-03-16 17:12:34 +02:00
parent f517230310
commit 09ae1aa84b
10 changed files with 501 additions and 354 deletions

View file

@ -27,18 +27,16 @@ class abusesa::passivedns(
if $datadir != '/var/lib/passivedns' {
file { '/var/lib/passivedns':
ensure => link,
target => $datadir,
require => File[$datadir],
ensure => link,
target => $datadir,
}
}
file { $datadir:
ensure => directory,
mode => '2770',
owner => 'passdns',
group => 'passdns',
require => User['passdns'],
ensure => directory,
mode => '2770',
owner => 'passdns',
group => 'passdns',
}
file { '/var/lib/passivedns/.profile':
@ -61,7 +59,7 @@ class abusesa::passivedns(
}
util::extract::tar { '/usr/local/src/abusesa-passivedns':
ensure => latest,
strip => 1,
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'],