diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2016-03-23 20:40:33 -0300 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2016-03-23 20:40:33 -0300 |
commit | 5b914fa948ccbdc6b10cc9f6c559f68dfb5f2be8 (patch) | |
tree | ae15452aae7e26273f99d51543268ab75da1e637 /manifests | |
parent | d3cd26efcb2271a968f802090b9e96d17f8ff6df (diff) | |
parent | 4ce75b3bf26c3d8de6f9302e8e6d0c937ea4711a (diff) | |
download | puppet-apcupsd-5b914fa948ccbdc6b10cc9f6c559f68dfb5f2be8.tar.gz puppet-apcupsd-5b914fa948ccbdc6b10cc9f6c559f68dfb5f2be8.tar.bz2 |
Merge remote-tracking branch 'lelutin/master'
Conflicts:
manifests/init.pp
Diffstat (limited to 'manifests')
-rw-r--r-- | manifests/init.pp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 5374ba5..06c0d02 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -22,10 +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": @@ -59,6 +61,16 @@ class apcupsd( content => template('apcupsd/apcupsd.conf.erb'), } + file { "/etc/apcupsd/changeme": + ensure => present, + owner => root, + group => root, + mode => 0755, + notify => Service["apcupsd"], + require => File["/etc/apcupsd"], + content => template('apcupsd/changeme.erb'), + } + file { "/etc/default/apcupsd": ensure => present, owner => root, |