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

* Wed Jun 11 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-15.sme

Browse Source 
- open db flat file using UTF8 [SME: 13035]
This commit is contained in:
Jean-Philippe Pialasse
2025-06-11 13:48:23 -04:00
parent abb67327c6
commit e13529e660
3 changed files with 16 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,22 +7,12 @@
# #
use esmith::util; use esmith::util;
use esmith::util::network; use esmith::util::network;
use esmith::ConfigDB; use esmith::ConfigDB::UTF8;
use esmith::HostsDB;
use esmith::AccountsDB;
use esmith::NetworksDB;
use esmith::DomainsDB;
use constant FALSE => 0; use constant FALSE => 0;
use constant TRUE => 1; use constant TRUE => 1;
our $cdb;
#The most common ones
my $cdb = esmith::ConfigDB->open() || die("Couldn't open config db");
#our $adb = esmith::AccountsDB->open() || die("Couldn't open Accounts db");
#our $ndb = esmith::NetworksDB->open() || die("Couldn't open Network db");
#our $hdb = esmith::HostsDB->open() || die("Couldn't open Hosts db");
#our $ddb = esmith::DomainsDB->open() || die("Couldn't open Domains db");
# Validation routines - parameters for each panel # Validation routines - parameters for each panel
@@ -76,7 +66,7 @@ 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"); $cdb = esmith::ConfigDB::UTF8->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']
@@ -92,7 +82,7 @@ my $cdb = esmith::ConfigDB->open() || die("Couldn't open config db");
sub get_data_for_panel_CONFIG { sub get_data_for_panel_CONFIG {
# 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"); $cdb = esmith::ConfigDB::UTF8->open() || die("Couldn't open config db");
my %ret = ( my %ret = (
'Data1'=>'Data for CONFIG', #Example 'Data1'=>'Data for CONFIG', #Example
'localip'=>$cdb->get_value('LocalIP'), 'localip'=>$cdb->get_value('LocalIP'),
@@ -159,7 +149,7 @@ my $cdb = esmith::ConfigDB->open() || die("Couldn't open config db");
my $c = shift; my $c = shift;
my $prefix_data = shift; #Data hash as parameter my $prefix_data = shift; #Data hash as parameter
my $ret = ""; my $ret = "";
$cdb = esmith::ConfigDB->open() || die("Couldn't open config db"); $cdb = esmith::ConfigDB::UTF8->open() || die("Couldn't open config db");
my $db = $cdb; #maybe one of the others my $db = $cdb; #maybe one of the others
my $dbkey = 'nut'; my $dbkey = 'nut';
my $driverkey = 'nut-driver@ups'; my $driverkey = 'nut-driver@ups';
@@ -246,7 +236,7 @@ sub get_model_options {
sub get_ups_status { sub get_ups_status {
my $c = shift; my $c = shift;
$cdb = esmith::ConfigDB->open() || die("Couldn't open config db"); $cdb = esmith::ConfigDB::UTF8->open() || die("Couldn't open config db");
my $nutmode = $cdb->get_prop('nut', 'Mode') || 'standalone'; my $nutmode = $cdb->get_prop('nut', 'Mode') || 'standalone';
if ($cdb->get_prop('nut', 'status', 'disabled') eq 'disabled'){ if ($cdb->get_prop('nut', 'status', 'disabled') eq 'disabled'){
return $c->l('nut_status_is_disabled') return $c->l('nut_status_is_disabled')

35
root/usr/share/smanager/lib/SrvMngr/Controller/Nutups.pm
View File

@@ -36,11 +36,7 @@ use Data::Dumper;
use esmith::util; use esmith::util;
use esmith::util::network; use esmith::util::network;
use esmith::ConfigDB; use esmith::ConfigDB::UTF8;
use esmith::AccountsDB;
use esmith::NetworksDB;
use esmith::HostsDB;
use esmith::DomainsDB;
@@ -60,14 +56,7 @@ sub main {
my $c = shift; my $c = shift;
$c->app->log->info( $c->log_req ); $c->app->log->info( $c->log_req );
my $cdb = esmith::ConfigDB::UTF8->open() || die("Couldn't open config db");
#The most common ones
my $cdb = esmith::ConfigDB->open() || die("Couldn't open config db");
my $adb = esmith::AccountsDB->open() || die("Couldn't open Accounts db");
my $ndb = esmith::NetworksDB->open() || die("Couldn't open Network db");
my $hdb = esmith::HostsDB->open() || die("Couldn't open Hosts db");
my $ddb = esmith::DomainsDB->open() || die("Couldn't open Domains db");
my %nut_data = (); my %nut_data = ();
my $title = $c->l('nut_NutUPS_configuration'); my $title = $c->l('nut_NutUPS_configuration');
my $modul = ''; my $modul = '';
@@ -111,15 +100,8 @@ sub do_update {
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
my $modul = ''; my $modul = '';
my $cdb = esmith::ConfigDB::UTF8->open() || die("Couldn't open config db");
#The most common ones - you might want to comment out any not used.
my $cdb = esmith::ConfigDB->open() || die("Couldn't open config db");
my $adb = esmith::AccountsDB->open() || die("Couldn't open Accounts db");
my $ndb = esmith::NetworksDB->open() || die("Couldn't open Network db");
my $hdb = esmith::HostsDB->open() || die("Couldn't open Hosts db");
my $ddb = esmith::DomainsDB->open() || die("Couldn't open Domains db");
my %nut_data = (); my %nut_data = ();
my $title = $c->l('nut_NutUPS_configuration'); my $title = $c->l('nut_NutUPS_configuration');
@@ -220,14 +202,7 @@ sub do_display {
my ($c,$trt) = @_; my ($c,$trt) = @_;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
my $cdb = esmith::ConfigDB::UTF8->open() || die("Couldn't open config db");
#The most common ones - you might want to comment out any not used.
my $cdb = esmith::ConfigDB->open() || die("Couldn't open config db");
my $adb = esmith::AccountsDB->open() || die("Couldn't open Accounts db");
my $ndb = esmith::NetworksDB->open() || die("Couldn't open Network db");
my $hdb = esmith::HostsDB->open() || die("Couldn't open Hosts db");
my $ddb = esmith::DomainsDB->open() || die("Couldn't open Domains db");
my %nut_data = (); my %nut_data = ();
my $title = $c->l('nut_NutUPS_configuration'); my $title = $c->l('nut_NutUPS_configuration');
my $modul = ""; my $modul = "";

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 14 %define release 15
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
* Wed Jun 11 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-15.sme
- open db flat file using UTF8 [SME: 13035]
* Mon Jun 02 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-14.sme * Mon Jun 02 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-14.sme
- fix typo preventing netserver enabling [SME: 13021] - fix typo preventing netserver enabling [SME: 13021]