summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-01-03 15:04:44 -0200
committerSilvio Rhatto <rhatto@riseup.net>2010-01-03 15:04:44 -0200
commitda5ed6dea2abd2ae14345903df98a257777bf7b4 (patch)
tree82804a2a1019ac188a136a839d6ce514278e51f1
parentf1556ba8635f60d677dc64d2c765b679a5bf0758 (diff)
downloadpuppet-apcupsd-da5ed6dea2abd2ae14345903df98a257777bf7b4.tar.gz
puppet-apcupsd-da5ed6dea2abd2ae14345903df98a257777bf7b4.tar.bz2
Misc changes
- Added license on header. - Notifying apcupsd. - Adding ups name into config file.
-rw-r--r--manifests/init.pp20
-rw-r--r--templates/apcupsd.conf.erb2
2 files changed, 21 insertions, 1 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 660bda9..703e95b 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,3 +1,21 @@
+# This module is distributed under the GNU Affero General Public License:
+#
+# Apcupsd module for puppet
+# Copyright (C) 2010 Sarava Group
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
class apcupsd {
package { "apcupsd":
ensure => installed,
@@ -27,6 +45,7 @@ class apcupsd {
owner => root,
group => root,
mode => 644,
+ notify => Service["apcupsd"],
require => File["/etc/apcupsd"],
content => template('apcupsd/apcupsd.conf.erb'),
}
@@ -36,6 +55,7 @@ class apcupsd {
owner => root,
group => root,
mode => 644,
+ notify => Service["apcupsd"],
content => template('apcupsd/default/apcupsd.erb'),
}
diff --git a/templates/apcupsd.conf.erb b/templates/apcupsd.conf.erb
index 1259c54..7fb24a0 100644
--- a/templates/apcupsd.conf.erb
+++ b/templates/apcupsd.conf.erb
@@ -12,7 +12,7 @@
# Use this to give your UPS a name in log files and such. This
# is particulary useful if you have multiple UPSes. This does not
# set the EEPROM. It should be 8 characters or less.
-#UPSNAME
+UPSNAME <%= name %>
# UPSCABLE <cable>
# Defines the type of cable connecting the UPS to your computer.