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

Compare commits

base: smeserver:11_0_0-17_el8_sme
Branches Tags
smeserver:master
smeserver:11_0_0-20_el8_sme smeserver:11_0_0-19_el8_sme smeserver:11_0_0-18_el8_sme smeserver:11_0_0-17_el8_sme smeserver:11_0_0-16_el8_sme smeserver:11_0_0-15_el8_sme smeserver:11_0_0-14_el8_sme smeserver:11_0_0-13_el8_sme smeserver:11_0_0-12_el8_sme smeserver:11_0_0-11_el8_sme smeserver:11_0_0-10_el8_sme smeserver:11_0_0-9_el8_sme smeserver:11_0_0-8_el8_sme smeserver:11_0_0-7_el8_sme smeserver:11_0_0-6_el8_sme smeserver:11_0_0-5_el8_sme smeserver:11_0_0-4_el8_sme smeserver:11_0_0-2_el8_sme smeserver:11_0_0-1_el8_sme smeserver:2.6.0-15 smeserver:2.6.0 smeserver:SME10.2
..
compare: smeserver:master
Branches Tags
smeserver:master
smeserver:11_0_0-20_el8_sme smeserver:11_0_0-19_el8_sme smeserver:11_0_0-18_el8_sme smeserver:11_0_0-17_el8_sme smeserver:11_0_0-16_el8_sme smeserver:11_0_0-15_el8_sme smeserver:11_0_0-14_el8_sme smeserver:11_0_0-13_el8_sme smeserver:11_0_0-12_el8_sme smeserver:11_0_0-11_el8_sme smeserver:11_0_0-10_el8_sme smeserver:11_0_0-9_el8_sme smeserver:11_0_0-8_el8_sme smeserver:11_0_0-7_el8_sme smeserver:11_0_0-6_el8_sme smeserver:11_0_0-5_el8_sme smeserver:11_0_0-4_el8_sme smeserver:11_0_0-2_el8_sme smeserver:11_0_0-1_el8_sme smeserver:2.6.0-15 smeserver:2.6.0 smeserver:SME10.2

3 Commits
11_0_0-17_ ... master

Author SHA1 Message Date
John Crisp
848f2bbfc0 Remove errant backticks 2025-07-07 17:12:20 +02:00
Brian Read
1962b616ec * Mon Jul 07 2025 Brian Read <brianr@koozali.org> 11.0.0-19.sme 
- Changes from JC (thanks) and also make sure descriptions fit in with Master->Primary and Slave->Secondary [SME: 13069]
  Also write descriptive paragraph as no-one else has!
  Also also, incorporate newly auditted lex file
 2025-07-07 09:21:35 +01:00
Brian Read
7e4ab54b55 * Fri Jun 13 2025 Brian Read <brianr@koozali.org> 11.0.0-18.sme 
- Adjust call from Custom to be emtpy hash not hashref [SME: 13042]
 2025-06-13 15:51:19 +01:00
5 changed files with 169 additions and 159 deletions
Expand all files Collapse all files

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

@@ -116,7 +116,7 @@ our $cdb;
my $c = shift; my $c = shift;
my $selected = shift; #Parameter is name of selected row. my $selected = shift; #Parameter is name of selected row.
my $is_new_record = shift; #Indicates new record required (defaults) my $is_new_record = shift; #Indicates new record required (defaults)
my %ret = {}; my %ret = ();
return %ret; return %ret;
} }
@@ -124,7 +124,7 @@ our $cdb;
my $c = shift; my $c = shift;
my $selected = shift; #Parameter is name of selected row. my $selected = shift; #Parameter is name of selected row.
my $is_new_record = shift; #Indicates new record required (defaults) my $is_new_record = shift; #Indicates new record required (defaults)
my %ret = {}; my %ret = ();
return %ret; return %ret;
} }

43
root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Nutups/nutups_en.lex
View File

@@ -1,30 +1,29 @@
# 'nut_APPLY' => 'Apply',
# Generated by SM2Gen version: SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-01-20 16:21:33 'nut_ClientUPS_Password' => 'Client UPS password',
# 'nut_ClientUPS_Username' => 'Client UPS username',
'nut_UPS_Generic_Model' => 'UPS Generic Model',
'nut_UPS_Model' => 'UPS Model',
'nut_Manage_Nutups-config_settings:' => 'Manage Nutups-config settings',
'nut_Descriptive_paragraph' => 'Descriptive paragraph',
'nut_MasterUPS_UPSNAME@IP' => 'UPS name@localhost',
'nut_SlaveUPS_UPSNAME@IP' => 'Slave->Master UPSNAME@IP',
'nut_MasterUPS_Password' => 'Local server password',
'nut_SlaveUPS_Password' => 'Slaves Password ->Server',
'nut_Nut_status' => 'Nut status',
'nut_Configure_NutUPS' => 'Configure NutUPS',
'nut_CONFIG_panel_action_was_successful' => 'CONFIG panel action was successful', 'nut_CONFIG_panel_action_was_successful' => 'CONFIG panel action was successful',
'nut_UPS_Generic_Type' => 'UPS Generic Type', 'nut_Configure_NutUPS' => 'Configure NutUPS',
'nut_Status_(from_upsc)' => 'Status (from running upsc)', 'nut_Descriptive_paragraph' => 'You can use your UPS connected directly to your server in a standalone mode or you can act as a Primary whereby other servers can also react to the status of your connected UPS, or you can connect to another server as a Secondary and react to the status of the UPS connected to that server.',
'nut_Error_Status_Report' => 'Error Status Report', 'nut_Error_Status_Report' => 'Error Status Report',
'nut_if_Net_Server' => 'Net Server details',
'nut_if_genericups' => 'Generic UPS details', 'nut_if_genericups' => 'Generic UPS details',
'nut_if_Net_Client' => 'Net Client details', 'nut_if_Net_Client' => 'Net Client details',
'nut_STATUS_panel_action_was_successful' => 'STATUS panel action was successful', 'nut_if_Net_Server' => 'Net Server details',
'nut_Manage_Nutups-config_settings:' => 'Manage Nutups configuration settings',
'nut_MasterUPS_Password' => 'Local server password',
'nut_MasterUPS_UPSNAME@IP' => 'UPS name@localhost',
'nut_Nut_mode' => 'Nut mode', 'nut_Nut_mode' => 'Nut mode',
'nut_Status_Report' => 'Status Report', 'nut_Nut_status' => 'Nut status',
'nut_NutUPS_configuration' => 'NutUPS configuration', 'nut_NutUPS_configuration' => 'NutUPS configuration',
'nut_APPLY' => 'Apply', 'nut_Save' => 'Save',
'nut_SlaveUPS_Password' => 'Secondary->Primary ->Server',
'nut_SlaveUPS_UPSNAME@IP' => 'Secondary->Primary UPSNAME@IP',
'nut_SlaveUPS_User' => 'Secondary UPS user',
'nut_Status_(from_upsc)' => 'Status (from running upsc)',
'nut_Status_of_the_controlled_UPS' => 'Status of the controlled UPS',
'nut_STATUS_panel_action_was_successful' => 'STATUS panel action was successful',
'nut_Status_Report' => 'Status Report',
'nut_UPS_Device' => 'UPS Device', 'nut_UPS_Device' => 'UPS Device',
'nut_UPS_Generic_Manufacturer' => 'UPS Generic Manufacturer', 'nut_UPS_Generic_Manufacturer' => 'UPS Generic Manufacturer',
'nut_Status_of_the_controlled_UPS' => 'Status of the controlled UPS', 'nut_UPS_Generic_Model' => 'UPS Generic Model',
'nut_Save' => 'Save', 'nut_UPS_Generic_Type' => 'UPS Generic Type',
'nut_status_is_disabled' => 'Nut disabled', 'nut_UPS_Model' => 'UPS Model',

233
root/usr/share/smanager/themes/default/templates/partials/_nut_CONFIG.html.ep
View File

@@ -2,138 +2,135 @@
%# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-01-20 16:21:33 %# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-01-20 16:21:33
%# %#
<div id="Nutups-CONFIG" class="partial Nutups-CONFIG"> <div id="Nutups-CONFIG" class="partial Nutups-CONFIG">
<script> <script>
window.onload = function() { window.onload = function() {
SelectInput(); SelectInput();
}; };
</script> </script>
% if (config->{debug} == 1) { % if (config->{debug} == 1) {
<pre> <pre>
%= dumper $nut_data %= dumper $nut_data
</pre> </pre>
% } % }
% my $btn = l('nut_APPLY'); % my $btn = l('nut_APPLY');
%= form_for "nutupsu" => (method => 'POST') => (autocomplete => "off" ) => begin %= form_for "nutupsu" => (method => 'POST') => (autocomplete => "off" ) => begin
% param 'trt' => $nut_data->{trt} unless param 'trt'; % param 'trt' => $nut_data->{trt} unless param 'trt';
%= hidden_field 'trt' => $nut_data->{trt} %= hidden_field 'trt' => $nut_data->{trt}
%# Inputs etc in here. %# Inputs etc in here.
<h2 class='subh2'><%=l('nut_Manage_Nutups-config_settings:')%></h2> <h2 class='subh2'><%=l('nut_Manage_Nutups-config_settings:')%></h2>
<p><span class=label> <p><span class=label>
%=l('nut_Nut_status') %=l('nut_Nut_status')
</span><span class=data> </span><span class=data>
%# my @status_options = [['Disabled' => 'disabled'], ['Enabled' => 'enabled']]; %# my @status_options = [['Disabled' => 'disabled'], ['Enabled' => 'enabled']];
%# param 'status' => $nut_data->{status} unless param 'status'; %# param 'status' => $nut_data->{status} unless param 'status';
% my @status_options = selected_field([['Disabled' => 'disabled'], ['Enabled' => 'enabled']], $nut_data->{status}); % my @status_options = selected_field([['Disabled' => 'disabled'], ['Enabled' => 'enabled']], $nut_data->{status});
%= select_field 'status' => @status_options, class => 'input', id => 'status_select' %= select_field 'status' => @status_options, class => 'input', id => 'status_select'
<br></span> </p> <br></span> </p>
<p><span class=label> <p><span class=label>
%=l('nut_Nut_mode') %=l('nut_Nut_mode')
</span><span class=data> </span><span class=data>
% my @Nutmode_options = [['Standalone' => 'standalone'], ['Net Server' => 'netserver'], ['Net Client ' => 'netclient']]; % my @Nutmode_options = [['Standalone' => 'standalone'], ['Net Server' => 'netserver'], ['Net Client ' => 'netclient']];
% param 'Nutmode' => $nut_data->{Nutmode} unless param 'Nutmode'; % param 'Nutmode' => $nut_data->{Nutmode} unless param 'Nutmode';
%= select_field 'Nutmode' => @Nutmode_options, class => 'input', id => 'Nutmode_select' %= select_field 'Nutmode' => @Nutmode_options, class => 'input', id => 'Nutmode_select'
<br></span> </p> <br></span> </p>
<div class=masterups> <div class=masterups>
<h2 class='subh3'><%=l('nut_if_Net_Server')%></h2> <div class=secondaryups>
<h2 class='subh3'><%=l('nut_if_Net_Server')%></h2>
<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>
<div class=secondaryups> <p><span class='label'>
<p><span class=label> %=l('nut_SlaveUPS_User')
%=l('nut_MasterUPS_UPSNAME@IP') </span><span class=data>
</span><span class=data> %= 'upssecondary'
% param 'MasterUPS_Name' => $nut_data->{MasterUPS_Name} unless param 'MasterUPS_Name'; </span></p>
%= 'ups@'. $nut_data->{'localip'}
<br></span></p>
<p><span class='label'> <p><span class='label'>
%=l('nut_SlaveUPS_User') %=l('nut_SlaveUPS_Password')
</span><span class=data> </span><span class=data>
%= 'upssecondary' <%= $nut_data->{'SlaveUPS_Pass'}%>
</span></p> </span></p>
</div>
<div>
<h2><%= l ('nut_UPS_Device') %></h2>
<p><span class=label>
%=l('nut_UPS_Model')
</span><span class=data>
% my @UPS_Model_options = $c->get_model_options();
% param 'UPS_Model' => $nut_data->{UPS_Model} unless param 'UPS_Model';
%= select_field 'UPS_Model' => \@UPS_Model_options, class => 'input', id => 'UPS_Model_select'
<br></span> </p>
<p><span class=label>
%=l('nut_UPS_Device')
</span><span class=data>
% param 'UPS_Device' => $nut_data->{UPS_Device} unless param 'UPS_Device';
%= text_field 'UPS_Device', size => '50', class => 'textinput UPS_Device' , pattern=>'.*' , placeholder=>'auto (for usb)'
<br></span></p>
</div>
</div>
<p><span class='label'> <div class=slaveups>
%=l('nut_SlaveUPS_Password') <h2 class='subh4'><%=l('nut_if_Net_Client')%></h2>
</span><span class=data> <p><span class=label>
<%= $nut_data->{'SlaveUPS_Pass'}%> %=l('nut_SlaveUPS_UPSNAME@IP')
</span></p> </span><span class=data>
</div> % param 'ClientUPS_Name' => $nut_data->{ClientUPS_Name} unless param 'ClientUPS_Name';
%= text_field 'ClientUPS_Name', size => '50', class => 'textinput ClientUPS_Name' , pattern=>'.*' , placeholder=>'upsname@IP[:port]'
<br></span></p>
<p><span class=label> <p><span class='label'>
%=l('nut_UPS_Model') %=l('nut_ClientUPS_Username')
</span><span class=data> </span><span class=data>
% my @UPS_Model_options = $c->get_model_options(); % param 'ClientUPS_User' => $nut_data->{ClientUPS_User} unless param 'ClientUPS_User';
% param 'UPS_Model' => $nut_data->{UPS_Model} unless param 'UPS_Model'; %=text_field 'ClientUPS_User', class => 'textinput'
%= select_field 'UPS_Model' => \@UPS_Model_options, class => 'input', id => 'UPS_Model_select' </span></p>
<br></span> </p>
<p><span class=label> <p><span class='label'>
%=l('nut_UPS_Device') %=l('nut_ClientUPS_Password')
</span><span class=data> </span><span class=data>
% param 'UPS_Device' => $nut_data->{UPS_Device} unless param 'UPS_Device'; % param 'ClientUPS_Pass' => $nut_data->{ClientUPS_Pass} unless param 'ClientUPS_Pass';
%= text_field 'UPS_Device', size => '50', class => 'textinput UPS_Device' , pattern=>'.*' , placeholder=>'auto (for usb)' %=password_field 'ClientUPS_Pass', class => 'pass4 sme-password', autocomplete => 'off'
<br></span></p> </span></p>
</div> </div>
<div class=slaveups> <div class=generics>
<h2 class='subh4'><%=l('nut_if_Net_Client')%></h2> <h2 class='subh5'><%=l('nut_if_genericups')%></h2>
<p><span class=label> <p><span class=label>
%=l('nut_SlaveUPS_UPSNAME@IP') %=l('nut_UPS_Generic_Type')
</span><span class=data> </span><span class=data>
% param 'ClientUPS_Name' => $nut_data->{ClientUPS_Name} unless param 'ClientUPS_Name'; % param 'UPS_gen_Type' => $nut_data->{UPS_gen_Type} unless param 'UPS_gen_Type';
%= text_field 'ClientUPS_Name', size => '50', class => 'textinput ClientUPS_Name' , pattern=>'.*' , placeholder=>'upsname@IP[:port]' %= text_field 'UPS_gen_Type', size => '50', class => 'textinput UPS_gen_Type' , pattern=>'.*' , placeholder=>'UPS_gen_Type'
<br></span></p> <br></span></p>
<p><span class='label'> <p><span class=label>
%=l('nut_ClientUPS_Username') %=l('nut_UPS_Generic_Manufacturer')
</span><span class=data> </span><span class=data>
% param 'ClientUPS_User' => $nut_data->{ClientUPS_User} unless param 'ClientUPS_User'; % param 'UPS_gen_Mfr' => $nut_data->{UPS_gen_Mfr} unless param 'UPS_gen_Mfr';
%=text_field 'ClientUPS_User', class => 'textinput' %= text_field 'UPS_gen_Mfr', size => '50', class => 'textinput UPS_gen_Mfr' , pattern=>'.*' , placeholder=>'UPS_gen_Mfr'
</span></p> <br></span></p>
<p><span class='label'> <p><span class=label>
%=l('nut_ClientUPS_Password') %=l('nut_UPS_Generic_Model')
</span><span class=data> </span><span class=data>
% param 'ClientUPS_Pass' => $nut_data->{ClientUPS_Pass} unless param 'ClientUPS_Pass'; % param 'UPS_gen_Model' => $nut_data->{UPS_gen_Model} unless param 'UPS_gen_Model';
%=password_field 'ClientUPS_Pass', class => 'pass4 sme-password', autocomplete => 'off' %= text_field 'UPS_gen_Model', size => '50', class => 'textinput UPS_gen_Model' , pattern=>'.*' , placeholder=>'UPS_gen_Model'
</span></p> <br></span></p>
</div> </div>
<div class=generics> <span class='data'>
` <h2 class='subh5'><%=l('nut_if_genericups')%></h2> %= submit_button l('nut_Save'), class => 'action subm12'
<p><span class=label> </span>
%=l('nut_UPS_Generic_Type')
</span><span class=data>
% param 'UPS_gen_Type' => $nut_data->{UPS_gen_Type} unless param 'UPS_gen_Type';
%= text_field 'UPS_gen_Type', size => '50', class => 'textinput UPS_gen_Type' , pattern=>'.*' , placeholder=>'UPS_gen_Type'
<br></span></p>
<p><span class=label> %# Probably finally by a submit.
%=l('nut_UPS_Generic_Manufacturer') %end
</span><span class=data>
% param 'UPS_gen_Mfr' => $nut_data->{UPS_gen_Mfr} unless param 'UPS_gen_Mfr';
%= text_field 'UPS_gen_Mfr', size => '50', class => 'textinput UPS_gen_Mfr' , pattern=>'.*' , placeholder=>'UPS_gen_Mfr'
<br></span></p>
<p><span class=label>
%=l('nut_UPS_Generic_Model')
</span><span class=data>
% param 'UPS_gen_Model' => $nut_data->{UPS_gen_Model} unless param 'UPS_gen_Model';
%= text_field 'UPS_gen_Model', size => '50', class => 'textinput UPS_gen_Model' , pattern=>'.*' , placeholder=>'UPS_gen_Model'
<br></span></p>
` </div>
<span class='data'>
%= submit_button l('nut_Save'), class => 'action subm12'
</span>
%# Probably finally by a submit.
%end
</div> </div>

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

@@ -35,6 +35,8 @@
<p class='paragraph para1'> <p class='paragraph para1'>
%=l('nut_Descriptive_paragraph') %=l('nut_Descriptive_paragraph')
</p> </p>
<br />
<!-- <!--
<span class=label> <span class=label>

20
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 17 %define release 20
Version: %{version} Version: %{version}
Release: %{release}%{?dist} Release: %{release}%{?dist}
License: GPL License: GPL
@@ -26,9 +26,21 @@ A module which configures the Network UPS Tools suite for operation with
the SME server software. the SME server software.
%changelog %changelog
* Mon Jul 07 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-20.sme
- Remove errant backticks
- Add div to section to enhance formatting in Net Server mode
* Mon Jul 07 2025 Brian Read <brianr@koozali.org> 11.0.0-19.sme
- Changes from JC (thanks) and also make sure descriptions fit in with Master->Primary and Slave->Secondary [SME: 13069]
Also write descriptive paragraph as no-one else has!
Also also, incorporate newly auditted lex file
* Fri Jun 13 2025 Brian Read <brianr@koozali.org> 11.0.0-18.sme
- Adjust call from Custom to be emtpy hash not hashref [SME: 13042]
* Fri Jun 13 2025 Brian Read <brianr@koozali.org> 11.0.0-17.sme * Fri Jun 13 2025 Brian Read <brianr@koozali.org> 11.0.0-17.sme
- Fix return from function in Nutups-custom [SME: 13042] - Fix return from function in Nutups-custom [SME: 13042]
- Check Seconds left for zero before dividing by 60 - Check Seconds left for zero before dividing by 60 [SME: 13042]
* Fri Jun 13 2025 Brian Read <brianr@koozali.org> 11.0.0-16.sme * Fri Jun 13 2025 Brian Read <brianr@koozali.org> 11.0.0-16.sme
- Change Navigation weighting for SM2 [SME: 12996] - Change Navigation weighting for SM2 [SME: 12996]
@@ -127,9 +139,9 @@ the SME server software.
* Thu Jan 22 2015 stephane de Labrusse <stephdl@de-labrusse.fr> 2.4.0-3.sme * Thu Jan 22 2015 stephane de Labrusse <stephdl@de-labrusse.fr> 2.4.0-3.sme
- Remove obsolete directives {ACL,ACCEPT,REJECT} and switch to LISTEN - Remove obsolete directives {ACL,ACCEPT,REJECT} and switch to LISTEN
- in /etc/ups/upsd.conf in /etc/ups/upsd.conf
- Allow NUT in /etc/hosts.allow and in /etc/services [SME: 8793] - Allow NUT in /etc/hosts.allow and in /etc/services [SME: 8793]
- Code change from Daniel B.<daniel@firewall-services.com> Code change from Daniel B.<daniel@firewall-services.com>
* Thu Jan 31 2013 Shad L. Lords <slords@mail.com> 2.4.0-2.sme * Thu Jan 31 2013 Shad L. Lords <slords@mail.com> 2.4.0-2.sme
- Obsolete el5 packages that used to be required [SME: 7273] - Obsolete el5 packages that used to be required [SME: 7273]