From 66b541506eac14af3c7d930c8be0e94188072166 Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Wed, 6 Mar 2013 15:02:39 +0200
Subject: [PATCH 1/2] Added abusesa user

---
 abusesa/manifests/init.pp | 11 +++++++++++
 user/manifests/init.pp    | 15 +++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/abusesa/manifests/init.pp b/abusesa/manifests/init.pp
index da0f383..93d7b7c 100644
--- a/abusesa/manifests/init.pp
+++ b/abusesa/manifests/init.pp
@@ -26,6 +26,17 @@ class abusesa {
         }
     }
 
+    include user::system
+    realize(User["abusesa"], Group["abusesa"])
+
+    file { "/home/abusesa":
+        ensure  => "directory",
+        mode    => "0700",
+        owner   => "abusesa",
+        group   => "abusesa",
+        require => User["abusesa"],
+    }
+
     file { "/usr/local/src/abusesa.tar.gz":
         ensure => present,
         mode   => "0644",
diff --git a/user/manifests/init.pp b/user/manifests/init.pp
index 65e1880..7cbb8be 100644
--- a/user/manifests/init.pp
+++ b/user/manifests/init.pp
@@ -245,6 +245,21 @@ class user::system {
         require => Group["etherpad"],
     }
 
+    # AbuseSA
+    @group { "abusesa":
+        ensure => present,
+        gid    => 817,
+    }
+    @user { "abusesa":
+        ensure  => present,
+        uid     => 817,
+        gid     => 817,
+        comment => "Service AbuseSA",
+        home    => "/home/abusesa",
+        shell   => "/sbin/nologin",
+        require => Group["abusesa"],
+    }
+
 }
 
 

From c987851d082cf1a0b7a833d1e8a6282053060cb2 Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Thu, 7 Mar 2013 13:23:50 +0200
Subject: [PATCH 2/2] Moved abusesa homedir under /var/lib

---
 abusesa/manifests/init.pp | 32 ++++++++++++++++++++++++++------
 user/manifests/init.pp    |  2 +-
 2 files changed, 27 insertions(+), 7 deletions(-)

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"],
     }