smeserver/smeserver-nutUPS
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Sat May 24 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-11.sme

Browse Source 
- fix issue with standalone and netserver mode [SME: 13012]
This commit is contained in:
Jean-Philippe Pialasse 2025-05-24 16:09:49 -04:00
parent e235701fe2
commit 830b29b569
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
root/etc/e-smith/templates/etc/ups/nut.conf/10MODE
View File

@ -3,5 +3,5 @@ MODE={
return "none" unless ( ($nut{"status"}||"disabled") eq "enabled"); return "none" unless ( ($nut{"status"}||"disabled") eq "enabled");
# if Master no => netclient # if Master no => netclient
# if Master yes => standalone or netserver # if Master yes => standalone or netserver
$nut{mode} || "standalone"; $nut{Mode} || "standalone";
} }

13
root/etc/e-smith/templates/etc/ups/ups.conf/UPS
View File

@ -7,15 +7,14 @@
my @upses = grep(/^nut-driver\@[a-zA-Z0-9_-]+$/, $DB->keys); my @upses = grep(/^nut-driver\@[a-zA-Z0-9_-]+$/, $DB->keys);
foreach my $ups ( sort {$a cmp $b} @upses ) foreach my $ups ( sort {$a cmp $b} @upses )
{ {
my $nnut = ${$ups}; my $status = ${"$ups"}{status} || "disabled";
my $status = $nnut{status} || "disabled";
next if $status eq "disabled"; next if $status eq "disabled";
my ($name )= $ups =~ /^nut-driver\@(.*)$/ ; my ($name )= $ups =~ /^nut-driver\@(.*)$/ ;
my $model = $nnut{Model} || "usbhid-ups"; my $model = ${"$ups"}{Model} || "usbhid-ups";
my $device = $nnut{Device} || "auto"; #"/var/lib/ups/hiddev0"; my $device = ${"$ups"}{Device} || "auto"; #"/var/lib/ups/hiddev0";
my $type = $nnut{Type}; my $type = ${"$ups"}{Type};
my $mfr = $nnut{mfr}; my $mfr = ${"$ups"}{mfr};
my $mdl = $nnut{mdl}; my $mdl = ${"$ups"}{mdl};
$OUT .= "[$name]\n"; $OUT .= "[$name]\n";
$OUT .= "\tdriver = $model\n"; $OUT .= "\tdriver = $model\n";
if ($model eq 'genericups') if ($model eq 'genericups')

5
root/usr/share/smanager/lib/SrvMngr/Controller/Nutups-Custom.pm
View File

@ -253,7 +253,10 @@ sub get_ups_status {
} elsif ($nutmode eq 'netclient'){ } elsif ($nutmode eq 'netclient'){
return $c->get_status_from_device($cdb->get_prop('nut','ClientUPS')); return $c->get_status_from_device($cdb->get_prop('nut','ClientUPS'));
} else { } else {
return $c->get_status_from_device($cdb->get_prop('nut','MasterUPS')); # TODO: could enumerate all the upses using
# my @upses = grep(/^nut-driver\@[a-zA-Z0-9_-]+$/, $DB->keys);
# we will only use the default first one for the moment nut-driver@ups for ups named "ups"
return $c->get_status_from_device("ups");
} }
} }

5
smeserver-nutUPS.spec
View File

@ -4,7 +4,7 @@ Summary: SME server - nut UPS interaction module
%define name smeserver-nutUPS %define name smeserver-nutUPS
Name: %{name} Name: %{name}
%define version 11.0.0 %define version 11.0.0
%define release 10 %define release 11
Version: %{version} Version: %{version}
Release: %{release}%{?dist} Release: %{release}%{?dist}
License: GPL License: GPL
@ -26,6 +26,9 @@ A module which configures the Network UPS Tools suite for operation with
the SME server software. the SME server software.
%changelog %changelog
* Sat May 24 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-11.sme
- fix issue with standalone and netserver mode [SME: 13012]
* Sun May 18 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-10.sme * Sun May 18 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-10.sme
- add pollinterval setting [SME: 13006] - add pollinterval setting [SME: 13006]
- update config for Nut 2.8.2 [SME: 12657] - update config for Nut 2.8.2 [SME: 12657]