Adding UPS NIS support

diff --git a/manifests/subsystems/firewall.pp b/manifests/subsystems/firewall.pp
index eaf5ef7a12865c6e7bc5b5189b0689d7648bb7a3..24d66b8013ddec49d359b7df29d8580912f291c9 100644 (file)
--- a/manifests/subsystems/firewall.pp
+++ b/manifests/subsystems/firewall.pp
@@ -303,3 +303,15 @@ class firewall::printer {
     order           => "201",
   }
 }
+
+class firewall::ups {
+  shorewall::rule { "ups":
+    action          => 'ACCEPT',
+    source          => 'net',
+    destination     => '$FW',
+    proto           => 'tcp',
+    destinationport => "3551",
+    ratelimit       => '-',
+    order           => "200",
+  }
+}

diff --git a/manifests/subsystems/ups.pp b/manifests/subsystems/ups.pp
index 558941e40ed27eab6b8212dda19d6595fabd84c8..648e0df4ace402ce3f466063c6212258d442a73c 100644 (file)
--- a/manifests/subsystems/ups.pp
+++ b/manifests/subsystems/ups.pp
@@ -1,12 +1,34 @@
 class ups {
   include apcupsd
 
+  case $ups_type {
+    '': { $ups_type = 'usb' }
+  }
+
+  case $ups_cable {
+    '': { $ups_cable = 'usb' }
+  }
+
+  case $ups_dev {
+    '': { $ups_dev = '/dev/usb/hiddev0' }
+  }
+
+  case $ups_nisip {
+    '': { $ups_nisip = '127.0.0.1' }
+  }
+
+  case $ups_polltime {
+    '': { $ups_polltime = '60' }
+  }
+
   case $has_ups {
     true: {
       apcupsd::ups { "ups0":
-        upstype => 'usb',
-        cable   => 'usb',
-        device  => '/dev/usb/hiddev0',
+        upstype  => $ups_type,
+        cable    => $ups_cable,
+        device   => $ups_dev,
+        nisip    => $ups_nisip,
+        polltime => $ups_polltime,
       }
     }
   }