From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 23 Mar 2016 23:40:33 +0000 (-0300)
Subject: Merge remote-tracking branch 'lelutin/master'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=5b914fa948ccbdc6b10cc9f6c559f68dfb5f2be8;p=puppet-apcupsd.git

Merge remote-tracking branch 'lelutin/master'

Conflicts:
	manifests/init.pp
---

5b914fa948ccbdc6b10cc9f6c559f68dfb5f2be8
diff --cc manifests/init.pp
index 5374ba5,9c963f6..06c0d02
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@@ -22,10 -22,9 +22,12 @@@ class apcupsd
    $device = '/dev/ttyS0',
    $ensure = 'present',
    $nisip = '127.0.0.1',
-   $polltime = '60',
 +  $onbatterydelay = '6',
 +  $batterylevel = '5',
 +  $minutes = '3')
+   $admin = 'root',
+   $mail = 'mail',
+   $polltime = '60' )
  {
  
    package { "apcupsd":