diff --git a/abusesa/manifests/init.pp b/abusesa/manifests/init.pp index 93d7b7c..0d4a327 100644 --- a/abusesa/manifests/init.pp +++ b/abusesa/manifests/init.pp @@ -1,5 +1,10 @@ # Install AbuseSA. # +# === Global variables +# +# $abusesa_datadir +# AbuseSA home directory. Defaults to /var/lib/abusesa. +# class abusesa { case $::operatingsystem { @@ -29,12 +34,27 @@ class abusesa { include user::system realize(User["abusesa"], Group["abusesa"]) - file { "/home/abusesa": - ensure => "directory", - mode => "0700", - owner => "abusesa", - group => "abusesa", - require => User["abusesa"], + if $abusesa_datadir { + file { $abusesa_datadir: + ensure => directory, + mode => "2770", + owner => "abusesa", + group => "abusesa", + require => User["abusesa"], + } + file { "/var/lib/abusesa": + ensure => link, + target => $abusesa_datadir, + require => File[$abusesa_datadir], + } + } else { + file { "/var/lib/abusesa": + ensure => directory, + mode => "2770", + owner => "abusesa", + group => "abusesa", + require => User["abusesa"], + } } file { "/usr/local/src/abusesa.tar.gz": diff --git a/user/manifests/init.pp b/user/manifests/init.pp index 7cbb8be..9aa7e64 100644 --- a/user/manifests/init.pp +++ b/user/manifests/init.pp @@ -255,7 +255,7 @@ class user::system { uid => 817, gid => 817, comment => "Service AbuseSA", - home => "/home/abusesa", + home => "/var/lib/abusesa", shell => "/sbin/nologin", require => Group["abusesa"], }