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