From a4bff4d8828059f99217f2d85c025f574f7a699d Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Fri, 2 Aug 2013 23:30:55 +0300
Subject: [PATCH] abusehelper: Better parameter name

---
 abusehelper/manifests/init.pp              | 2 +-
 abusehelper/templates/botnet.sysconfig.erb | 2 +-
 abusesa/manifests/init.pp                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/abusehelper/manifests/init.pp b/abusehelper/manifests/init.pp
index 5ce33e2..f764570 100644
--- a/abusehelper/manifests/init.pp
+++ b/abusehelper/manifests/init.pp
@@ -136,7 +136,7 @@ class abusehelper {
 
 # Install abusehelper init script.
 #
-class abusehelper::init($botnets, $user="abusehel") {
+class abusehelper::init($botnets, $botuser="abusehel") {
 
     file { "/etc/sysconfig/botnet":
         ensure  => present,
diff --git a/abusehelper/templates/botnet.sysconfig.erb b/abusehelper/templates/botnet.sysconfig.erb
index c9d0d03..8a80203 100644
--- a/abusehelper/templates/botnet.sysconfig.erb
+++ b/abusehelper/templates/botnet.sysconfig.erb
@@ -1,2 +1,2 @@
-BOTUSER="<%= @user %>"
+BOTUSER="<%= @botuser %>"
 BOTNETS="<%= @botnets.join(" ") %>"
diff --git a/abusesa/manifests/init.pp b/abusesa/manifests/init.pp
index 90e0742..cd2eeb4 100644
--- a/abusesa/manifests/init.pp
+++ b/abusesa/manifests/init.pp
@@ -91,7 +91,7 @@ class abusesa {
     if $abusesa_botnets {
         class { "abusehelper::init":
             botnets => $abusesa_botnets,
-            user    => "abusesa",
+            botuser => "abusesa",
         }
     }