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

* Tue Mar 18 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-9.sme

Browse Source 
- update config for Nut 2.8.2 [SME: 12657]
  TODO review master/slave mode
  TODO convert master/slave to primary/secondary
  TODO convert to new config data + migrate
  TODO event and action
This commit is contained in:
Jean-Philippe Pialasse 2025-05-16 00:15:02 -04:00
parent 26bc766e56
commit 4743293464
2 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,11 +76,15 @@ my $cdb = esmith::ConfigDB->open() || die("Couldn't open config db");
sub get_data_for_panel_STATUS { sub get_data_for_panel_STATUS {
# Return a hash with the fields required which will be loaded into the shared data # Return a hash with the fields required which will be loaded into the shared data
my $c = shift; my $c = shift;
$cdb = esmith::ConfigDB->open() || die("Couldn't open config db");
my %ret = ( my %ret = (
#'Data1'=>'Data for STATUS', #Example #'Data1'=>'Data for STATUS', #Example
# fields from Inputs in STATUS $fields['STATUS'] # fields from Inputs in STATUS $fields['STATUS']
'UPSStatus'=>$c->get_ups_status(), 'UPSStatus'=>$c->get_ups_status(),
'ups_data' => $c->get_ups_status_as_hash() 'ups_data' => $c->get_ups_status_as_hash(),
'Nutmode'=>$cdb->get_prop('nut', 'mode')||"none",
'localip'=>$cdb->get_value('LocalIP'),
'SlaveUPS_Pass'=>$cdb->get_prop('nut', 'SecondaryPass'),
); );
return %ret; return %ret;
} }
@ -99,7 +103,7 @@ my $cdb = esmith::ConfigDB->open() || die("Couldn't open config db");
'ClientUPS_Name'=>$cdb->get_prop('nut', 'ClientUPS'), 'ClientUPS_Name'=>$cdb->get_prop('nut', 'ClientUPS'),
'ClientUPS_User'=>$cdb->get_prop('nut', 'ClientUser'), 'ClientUPS_User'=>$cdb->get_prop('nut', 'ClientUser'),
'ClientUPS_Pass'=>$cdb->get_prop('nut', 'ClientPass'), 'ClientUPS_Pass'=>$cdb->get_prop('nut', 'ClientPass'),
'SlaveUPS_Pass'=>$cdb->get_prop('nut', 'SlavePass'), 'SlaveUPS_Pass'=>$cdb->get_prop('nut', 'SecondaryPass'),
'MasterUPS_Name'=>$cdb->get_prop('nut', 'MasterUPS'), 'MasterUPS_Name'=>$cdb->get_prop('nut', 'MasterUPS'),
# TODO migrate to nut-driver@ups entry # TODO migrate to nut-driver@ups entry
'UPS_Model'=>$cdb->get_prop('nut', 'Model') || 'usbhid-ups', 'UPS_Model'=>$cdb->get_prop('nut', 'Model') || 'usbhid-ups',

25
root/usr/share/smanager/themes/default/templates/partials/_nut_STATUS.html.ep
View File

@ -44,9 +44,32 @@
%= text_area 'UPSStatus', cols=>55, rows=>35, Readonly=>'true' %= text_area 'UPSStatus', cols=>55, rows=>35, Readonly=>'true'
</span><br> </span><br>
--> -->
% if ($nut_data->{Nutmode} eq "nutserver") {
<div class=secondaryups>
<p><span class=label>
%=l('nut_MasterUPS_UPSNAME@IP')
</span><span class=data>
% param 'MasterUPS_Name' => $nut_data->{MasterUPS_Name} unless param 'MasterUPS_Name';
%= 'ups@'. $nut_data->{'localip'}
<br></span></p>
<p><span class='label'>
%=l('nut_SlaveUPS_User')
</span><span class=data>
%= 'upssecondary'
</span></p>
<p><span class='label'>
%=l('nut_SlaveUPS_Password')
</span><span class=data>
<%= $nut_data->{'SlaveUPS_Pass'}%>
</span></p>
</div>
% }
%= include 'partials/_nut_UPS_STATUS' %= include 'partials/_nut_UPS_STATUS'
%# Probably finally by a submit. %# Probably finally by a submit.
%end %end
</div> </div>