aboutsummaryrefslogtreecommitdiffstats
path: root/config/nut
diff options
context:
space:
mode:
Diffstat (limited to 'config/nut')
-rw-r--r--config/nut/nut.inc5
-rw-r--r--config/nut/nut.xml11
2 files changed, 12 insertions, 4 deletions
diff --git a/config/nut/nut.inc b/config/nut/nut.inc
index 0c1235dd..46c5741e 100644
--- a/config/nut/nut.inc
+++ b/config/nut/nut.inc
@@ -272,7 +272,7 @@ EOD;
$upsd_users = "[monuser]\n";
$upsd_users .= "password = {$password}\n";
$upsd_users .= "upsmon master\n";
- if($allowaddr && $allowuser) {
+ if($allowuser && $allowpass) {
$upsd_users .= "\n[$allowuser]\n";
$upsd_users .= "password = $allowpass\n";
$upsd_users .= "upsmon master\n";
@@ -356,7 +356,6 @@ EOD;
$snmpcommunity = nut_config('snmpcommunity');
$snmpfreq = nut_config('snmpfreq');
$snmpdisabletransfer = (nut_config('snmpdisabletransfer') == 'on');
- $allowaddr = nut_config('allowaddr');
$allowuser = nut_config('allowuser');
$allowpass = nut_config('allowpass');
@@ -389,7 +388,7 @@ EOD;
$upsd_users = "[monuser]\n";
$upsd_users .= "password = {$password}\n";
$upsd_users .= "upsmon master\n";
- if($allowaddr && $allowuser) {
+ if($allowuser && $allowpass) {
$upsd_users .= "\n[$allowuser]\n";
$upsd_users .= "password = $allowpass\n";
$upsd_users .= "upsmon master\n";
diff --git a/config/nut/nut.xml b/config/nut/nut.xml
index 75a5c246..fcfbdfe6 100644
--- a/config/nut/nut.xml
+++ b/config/nut/nut.xml
@@ -61,6 +61,7 @@
<name>nut</name>
<rcfile>nut.sh</rcfile>
<executable>upsmon</executable>
+ <description>UPS monitoring daemon</description>
</service>
<tabs>
<tab>
@@ -298,6 +299,10 @@
<value>upscode204</value>
</option>
<option>
+ <name>Generic USB UPS (Blazer)</name>
+ <value>blazer_usb01</value>
+ </option>
+ <option>
<name>Inform GUARD Line Interactive</name>
<value>powercom00</value>
</option>
@@ -599,6 +604,10 @@
<name>pw</name>
<value>pw</value>
</option>
+ <option>
+ <name>cyberpower</name>
+ <value>cyberpower</value>
+ </option>
</options>
</field>
<field>
@@ -648,4 +657,4 @@
<custom_php_deinstall_command>
deinstall_package_nut();
</custom_php_deinstall_command>
-</packagegui> \ No newline at end of file
+</packagegui>