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

* Sun May 18 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-10.sme

Browse Source 
- add pollinterval setting [SME: 13006]
- update config for Nut 2.8.2 [SME: 12657]
This commit is contained in:
Jean-Philippe Pialasse
2025-05-18 01:01:00 -04:00
parent 21fed495e6
commit e235701fe2
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,9 @@
{ {
my $poll = $nut{pollInterval} || '2';
if ($poll ne '2') {
$OUT .= "pollinterval = $poll\n";
}
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 )
{ {

3
root/usr/share/smanager/themes/default/public/js/nutups.js
View File

@@ -1,13 +1,16 @@
$(document).ready(function() { $(document).ready(function() {
function toggleUPSClasses() { function toggleUPSClasses() {
var selectedOption = $('#Nutmode_select').val(); var selectedOption = $('#Nutmode_select').val();
var upsModelValue = $('#UPS_Model_select').val().toLowerCase(); // Get the current value from UPS_Model
$('.masterups').toggle(selectedOption === 'netserver' || selectedOption === 'standalone'); // Show/Hide masterups based on Net Server or Standalone $('.masterups').toggle(selectedOption === 'netserver' || selectedOption === 'standalone'); // Show/Hide masterups based on Net Server or Standalone
$('.secondaryups').toggle(selectedOption === 'netserver' ); // Show/Hide Secondary logins for net server $('.secondaryups').toggle(selectedOption === 'netserver' ); // Show/Hide Secondary logins for net server
$('.slaveups').toggle(selectedOption === 'netclient'); // Show/Hide slaveups based on Net Client $('.slaveups').toggle(selectedOption === 'netclient'); // Show/Hide slaveups based on Net Client
$('.generics').toggle(selectedOption !== 'netclient' && upsModelValue === 'genericups' );
// Enable/Disable inputs based on the selected option // Enable/Disable inputs based on the selected option
$('.masterups input').prop('disabled', !(selectedOption === 'netserver' || selectedOption === 'standalone')); $('.masterups input').prop('disabled', !(selectedOption === 'netserver' || selectedOption === 'standalone'));
$('.slaveups input').prop('disabled', selectedOption !== 'netclient'); $('.slaveups input').prop('disabled', selectedOption !== 'netclient');
$('.generics input').prop('disabled', selectedOption === 'netclient');
} }
function toggleGenerics() { function toggleGenerics() {

10
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 9 %define release 10
Version: %{version} Version: %{version}
Release: %{release}%{?dist} Release: %{release}%{?dist}
License: GPL License: GPL
@@ -26,12 +26,12 @@ A module which configures the Network UPS Tools suite for operation with
the SME server software. the SME server software.
%changelog %changelog
* Sun May 18 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-10.sme
- add pollinterval setting [SME: 13006]
- update config for Nut 2.8.2 [SME: 12657]
* Tue Mar 18 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-9.sme * Tue Mar 18 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-9.sme
- update config for Nut 2.8.2 [SME: 12657] - 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
* Wed Mar 05 2025 Brian Read <brianr@koozali.org> 11.0.0-8.sme * Wed Mar 05 2025 Brian Read <brianr@koozali.org> 11.0.0-8.sme
- typo in lex file [SME: 12949] - typo in lex file [SME: 12949]