From baf347204b14cbebbf393fb5905749b112aab788 Mon Sep 17 00:00:00 2001 From: Ossi Salmi Date: Tue, 30 Jul 2013 15:56:09 +0300 Subject: [PATCH] Fixed variable passing to abusehelper::init on puppet 3 --- abusehelper/manifests/init.pp | 14 ++++---------- abusehelper/templates/botnet.sysconfig.erb | 4 ++-- abusesa/manifests/init.pp | 7 ++++--- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/abusehelper/manifests/init.pp b/abusehelper/manifests/init.pp index 50da617..5ce33e2 100644 --- a/abusehelper/manifests/init.pp +++ b/abusehelper/manifests/init.pp @@ -126,7 +126,9 @@ class abusehelper { } if $abusehelper_botnets { - include abusehelper::init + class { "abusehelper::init": + botnets => $abusehelper_botnets, + } } } @@ -134,15 +136,7 @@ class abusehelper { # Install abusehelper init script. # -class abusehelper::init { - - if !$abusehelper_botnets { - fail("Must define \$abusehelper_botnets") - } - - if !$abusehelper_user { - $abusehelper_user = "abusehel" - } +class abusehelper::init($botnets, $user="abusehel") { file { "/etc/sysconfig/botnet": ensure => present, diff --git a/abusehelper/templates/botnet.sysconfig.erb b/abusehelper/templates/botnet.sysconfig.erb index 37c2a5a..c9d0d03 100644 --- a/abusehelper/templates/botnet.sysconfig.erb +++ b/abusehelper/templates/botnet.sysconfig.erb @@ -1,2 +1,2 @@ -BOTUSER="<%= @abusehelper_user %>" -BOTNETS="<%= @abusehelper_botnets.join(" ") %>" +BOTUSER="<%= @user %>" +BOTNETS="<%= @botnets.join(" ") %>" diff --git a/abusesa/manifests/init.pp b/abusesa/manifests/init.pp index ec6adae..90e0742 100644 --- a/abusesa/manifests/init.pp +++ b/abusesa/manifests/init.pp @@ -89,9 +89,10 @@ class abusesa { python::setup::install { "/usr/local/src/abusesa": } if $abusesa_botnets { - $abusehelper_botnets = $abusesa_botnets - $abusehelper_user = "abusesa" - include abusehelper::init + class { "abusehelper::init": + botnets => $abusesa_botnets, + user => "abusesa", + } } }