From 48584c8cc51119c6b0dfbde767e34043e8aa080d Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Sun, 3 Jan 2010 18:59:38 -0200 Subject: Renaming parameter 'type' to 'upstype' --- manifests/init.pp | 8 ++++---- templates/apcupsd.conf.erb | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 703e95b..aca9a82 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -21,7 +21,7 @@ class apcupsd { ensure => installed, } - define ups($type = 'apcsmart', $cable = 'smart', $device = '/dev/ttyS0', $ensure = 'present') { + define ups($upstype = 'apcsmart', $cable = 'smart', $device = '/dev/ttyS0', $ensure = 'present') { $ups_configured = $ensure ? { 'present' => 'yes', @@ -37,14 +37,14 @@ class apcupsd { ensure => 'directory', owner => 'root', group => 'root', - mode => 755, + mode => 0755, } file { "/etc/apcupsd/apcupsd.conf": ensure => present, owner => root, group => root, - mode => 644, + mode => 0644, notify => Service["apcupsd"], require => File["/etc/apcupsd"], content => template('apcupsd/apcupsd.conf.erb'), @@ -54,7 +54,7 @@ class apcupsd { ensure => present, owner => root, group => root, - mode => 644, + mode => 0644, notify => Service["apcupsd"], content => template('apcupsd/default/apcupsd.erb'), } diff --git a/templates/apcupsd.conf.erb b/templates/apcupsd.conf.erb index 7fb24a0..b5a5a16 100644 --- a/templates/apcupsd.conf.erb +++ b/templates/apcupsd.conf.erb @@ -72,7 +72,7 @@ UPSCABLE <%= cable %> # credentials for which the card has been # configured. # -UPSTYPE <%= type %> +UPSTYPE <%= upstype %> DEVICE <%= device %> # POLLTIME -- cgit v1.2.3