Renaming parameter 'type' to 'upstype'

diff --git a/manifests/init.pp b/manifests/init.pp
index 703e95be0ec910e6f1d1f020c40a486e974ff66a..aca9a821b1ca28fef7c6b9896f1191a70865df81 100644 (file)
--- 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 7fb24a03faf4a3f7465d7ca5eb807e335279e76d..b5a5a16d9e5edd87162ec705754f07e3743e8252 100644 (file)
--- 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 <int>