* Fri Jun 13 2025 Brian Read <brianr@koozali.org> 11.0.0-17.sme

- Fix return from function in Nutups-custom [SME: 13042]
- Check Seconds left for zero before dividing by 60

createlinks

@@ -2,23 +2,39 @@
 
 use esmith::Build::CreateLinks  qw(:all);
 
-my @events = qw(bootstrap-console-save console-save post-install post-upgrade smeserver-nutUPS-update);
+my @events = qw(bootstrap-console-save console-save post-install post-upgrade smeserver-nutUPS-update nut-conf);
 
-templates2events("/etc/sysconfig/ups", @events);
-templates2events("/usr/lib/systemd/system/nut-server.service.d/50koozali.conf", @events);
-templates2events("/usr/lib/systemd/system/nut-monitor.service.d/50koozali.conf", @events);
 
-foreach (qw(ups.conf upsd.users upsmon.conf upssched.conf))
+foreach (qw(nut.conf ups.conf upsd.users upsmon.conf upssched.conf))
 {
     templates2events("/etc/ups/$_", @events);
 }
 
-foreach (qw(bootstrap-console-save console-save smeserver-nutUPS-update))
+foreach (qw(bootstrap-console-save console-save smeserver-nutUPS-update nut-conf))
 {
     templates2events("/etc/ups/upsd.conf", $_);
 }
 
-my $event="smeserver-nutUPS-update";
-safe_symlink("try-restart", "root/etc/e-smith/events/$event/services2adjust/nut");
+event_link("nut-config", "post-upgrade" , "04");
+event_link("nut-config-drivers", "post-upgrade", "50");
+
+my $event= "nut-conf";
+event_link("nut-config", $event, "04");
+event_link("nut-config-drivers", $event, "50");
+event_link("systemd-default", $event, "88");
+safe_symlink("try-restart", "root/etc/e-smith/events/$event/services2adjust/nut-driver\@ups");
+safe_symlink("try-restart", "root/etc/e-smith/events/$event/services2adjust/nut-monitor");
+safe_symlink("try-restart", "root/etc/e-smith/events/$event/services2adjust/nut-server");
+safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/masq");
+templates2events("/etc/rc.d/init.d/masq", $event);
+
+
+$event="smeserver-nutUPS-update";
+safe_symlink("try-restart", "root/etc/e-smith/events/$event/services2adjust/nut-driver\@ups");
+safe_symlink("try-restart", "root/etc/e-smith/events/$event/services2adjust/nut-monitor");
+safe_symlink("try-restart", "root/etc/e-smith/events/$event/services2adjust/nut-server");
 templates2events("/etc/systemd/system-preset/49-koozali.preset", $event);
-event_link("systemd-default", $event, "06");
+templates2events("/etc/rsyslog.conf", $event);
+event_link("nut-config", $event, "04");
+event_link("nut-config-drivers", $event, "50");
+event_link("systemd-default", $event, "88");

root/etc/e-smith/db/configuration/defaults/nut-driver@ups/status

@@ -0,0 +1 @@
+disabled

root/etc/e-smith/db/configuration/defaults/nut-driver@ups/type

@@ -0,0 +1 @@
+service

root/etc/e-smith/db/configuration/defaults/nut-monitor/status

@@ -0,0 +1 @@
+disabled

root/etc/e-smith/db/configuration/defaults/nut-monitor/type

@@ -0,0 +1 @@
+service

root/etc/e-smith/db/configuration/defaults/nut-server/status

@@ -0,0 +1 @@
+disabled

root/etc/e-smith/db/configuration/defaults/nut-server/type

@@ -0,0 +1 @@
+service

root/etc/e-smith/db/configuration/defaults/nut/MasterUPS

@@ -0,0 +1 @@
+ups@localhost

root/etc/e-smith/db/configuration/defaults/nut/TCPPort

@@ -0,0 +1 @@
+3493

root/etc/e-smith/db/configuration/defaults/nut/type

@@ -1 +1 @@
-service
+configuration

root/etc/e-smith/db/configuration/migrate/15nutPass

@@ -0,0 +1,22 @@
+{
+    use MIME::Base64 qw(encode_base64);
+
+    my $nutrec = $DB->get('nut') || $DB->new_record('nut', {type => 'service'});
+    # migrate old
+    $nutrec->set_prop('PrimaryPass',$DB->get_prop_and_delete('nut', MasterPass)) if (exists $nut{'MasterPass'}); 
+    $nutrec->set_prop('SecondaryPass',$DB->get_prop_and_delete('nut', SlavePass)) if (exists $nut{'SlavePass'});
+
+    $nutrec->set_prop('PrimaryPass', sprintf("%15.0f", int( (1000000000000000) * rand() ))) if not $nutrec->prop('PrimaryPass');
+    $nutrec->set_prop('SecondaryPass', sprintf("%15.0f", int( (1000000000000000) * rand() ))) if not $nutrec->prop('SecondaryPass');
+    $nutrec->set_prop('AdminPass', sprintf("%15.0f", int( (1000000000000000) * rand() ))) if not $nutrec->prop('AdminPass');
+
+    # if $nut{SlaveUPS} defined we set and the target not existing ClientUPS ; then delete SlaveUPS
+    # set ClientUser as upsslave (was the content before sme11) intended for smooth migration
+    # set ClientPass as $nut{SlavePass}/{SecondaryPass}  
+    if ( $nut{'SlaveUPS'} ) {
+	$nutrec->set_prop('ClientUPS',$DB->get_prop_and_delete('nut','SlaveUPS') ) if not $nut{'ClientUPS'};
+	$nutrec->set_prop('ClientUser','upsslave');
+        $nutrec->set_prop('ClientPass',$nutrec->prop('SecondaryPass'));
+	}
+
+}

root/etc/e-smith/db/configuration/migrate/20nutMigrate

@@ -0,0 +1,22 @@
+{
+  # migrate to SME11
+  # first we get ride of Master=no
+  # if Mode  not set then set it according to Master
+  my $mnut = $DB->get('nut') || $DB->new_record('nut', {type => 'service'});
+  my $nutMaster = $DB->get_prop_and_delete ('nut','Master');
+  unless ( ${'nut'}{'Mode'} ) {
+    $mnut>set_prop('Mode','netserver') if $nutMaster eq "yes";
+  }
+
+  # if nut-driver@ups not existing create it
+  my $driverUPS = $DB->get('nut-driver@ups') || $DB->new_record('nut-driver@ups', {type => 'service'});
+  # then migrate to nut-driver@ups (first UPS) the following properties
+  my $mdl = $DB->get_prop_and_delete ('nut','mdl');
+  $driverUPS->set_prop('mdl',$mdl) unless ${'nut-driver@ups'}{'mdl'};
+  my $mfr = $DB->get_prop_and_delete ('nut','mfr');
+  $driverUPS->set_prop('mfr',$mfr) unless ${'nut-driver@ups'}{'mfr'};
+  my $model = $DB->get_prop_and_delete ('nut','Model');
+  $driverUPS->set_prop('Model',$model) unless ${'nut-driver@ups'}{'Model'};
+  my $Type = $DB->get_prop_and_delete ('nut','Type');
+  $driverUPS->set_prop('Type',$model) unless ${'nut-driver@ups'}{'Type'};
+}

root/etc/e-smith/db/configuration/migrate/nutPass

@@ -1,8 +0,0 @@
-{
-    use MIME::Base64 qw(encode_base64);
-
-    my $nutrec = $DB->get('nut') || $DB->new_record('nut', {type => 'service'});
-    $nutrec->set_prop('MasterPass', sprintf("%15.0f", int( (1000000000000000) * rand() ))) if not $nutrec->prop('MasterPass');
-    $nutrec->set_prop('SlavePass', sprintf("%15.0f", int( (1000000000000000) * rand() ))) if not $nutrec->prop('SlavePass');
-    $nutrec->set_prop('AdminPass', sprintf("%15.0f", int( (1000000000000000) * rand() ))) if not $nutrec->prop('AdminPass');
-}

root/etc/e-smith/events/actions/nut-config

@@ -0,0 +1,52 @@
+#!/bin/bash
+
+# this script is called before template-expand
+# then another script is called to run /usr/libexec/nut-driver-enumerator.sh and start/stop drivers
+# then traditionnal services2adjust
+
+# calling this script to configure unit and drivers
+if [[ $(/sbin/e-smith/config getprop nut status || echo "disabled") == "disabled" ]] ; then
+  # disable server
+  /sbin/e-smith/config setprop nut-server status disabled
+  /sbin/e-smith/config setprop nut access localhost
+  # disable monitor
+  /sbin/e-smith/config setprop nut-monitor status disabled
+  # TODO get_all_by_prop filter nut-driver@ and foreach $UPS disabled
+  #config keys|grep nut-driver
+  for OUTPUT in $(/sbin/e-smith/config keys|grep nut-driver)
+  do
+    /sbin/e-smith/config setprop $OUTPUT status disabled
+  done
+
+  exit 0;
+fi
+# nut is enabled
+
+# we set services depending on Mode
+Mode=$(/sbin/e-smith/config getprop nut Mode || echo "standalone")
+if [[ $Mode == "netserver" ]] ; then
+    /sbin/e-smith/config setprop nut-server status enabled
+    /sbin/e-smith/config setprop nut access private
+elif [[ $Mode == "netclient" ]] ; then
+    /sbin/e-smith/config setprop nut-server status disabled
+    /sbin/e-smith/config setprop nut access localhost
+else
+    /sbin/e-smith/config setprop nut-server status enabled
+    /sbin/e-smith/config setprop nut access localhost
+fi
+# enable nut-monitor
+/sbin/e-smith/config setprop nut-monitor status enabled
+
+# get_all_by_prop filter nut-driver@ and foreach $UPS enable.
+if [[ $Mode == "netclient" ]] ; then
+  for OUTPUT in $(/sbin/e-smith/config keys|grep nut-driver)
+  do
+    /sbin/e-smith/config setprop $OUTPUT status disabled
+  done
+else
+  for OUTPUT in $(/sbin/e-smith/config keys|grep nut-driver)
+  do
+    /sbin/e-smith/config setprop $OUTPUT status enabled
+  done
+fi
+

root/etc/e-smith/events/actions/nut-config-drivers

@@ -0,0 +1,45 @@
+#!/bin/bash
+
+# another script is called before template-expand to set services
+# this script is called to run /usr/libexec/nut-driver-enumerator.sh and start/stop drivers
+# then traditionnal services2adjust
+
+# enumerate / configure drivers
+/usr/libexec/nut-driver-enumerator.sh 2>/dev/null
+
+event=$1
+
+if [[ $i == "post-upgrade" ]] ; then 
+	exit 0
+fi
+
+if [[ $i == "bootstrap-console-save" ]] ; then
+        exit 0
+fi
+
+# if disabled stop them
+if [[ $(/sbin/e-smith/config getprop nut status || echo "disabled") == "disabled" ]] ; then
+	# if disabled stop them 
+	for OUTPUT in $(/sbin/e-smith/config keys|grep nut-driver)
+	 do
+	    /usr/bin/systemctl stop $OUTPUT
+	done
+      	exit 0
+fi
+
+# if netclient stop them
+if [[ $(/sbin/e-smith/config getprop nut Mode || echo "netclient") == "netclient" ]] ; then
+  # if disabled stop them 
+  for OUTPUT in $(/sbin/e-smith/config keys|grep nut-driver)
+   do
+      /usr/bin/systemctl stop $OUTPUT 2>/dev/null
+  done
+        exit 0
+fi
+
+
+# if we are there we want to restart / start them
+for OUTPUT in $(/sbin/e-smith/config keys|grep nut-driver)
+ do
+    /usr/bin/systemctl restart $OUTPUT
+done

root/etc/e-smith/templates/etc/etc/rsyslog.conf/32nut

@@ -0,0 +1,5 @@
+#nut / UPS we only use journalctl
+:programname, isequal, "nut-monitor" stop
+:programname, isequal, "nut-server" stop
+:programname, startswith, "nut-driver" stop
+

root/etc/e-smith/templates/etc/sysconfig/ups/MODEL

@@ -1 +0,0 @@
-MODEL=upsdrvctl

root/etc/e-smith/templates/etc/sysconfig/ups/SERVER

@@ -1 +0,0 @@
-SERVER={ $nut{Master} || 'yes' }

root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/70nutUPS

@@ -1,16 +1,26 @@
 # nut UPS specific subservices
 {
 $nutstatus = $nut{status} || 'disabled';
-$master = $nut{Master} || 'yes';
+$mode = $nut{Mode} || 'standalone';
+my @upses = grep(/^nut-driver\@[a-zA-Z0-9_-]+$/, $DB->keys);
 
 if ($nutstatus eq 'enabled') {
-	$OUT .= "enable	nut-server.service\n" if ($master eq  'yes');
-	$OUT .= "disable nut-server.service\n" unless ($master eq  'yes');
-	$OUT .= "enable	nut-monitor.service\n";
+        $OUT .= "enable nut-server.service\n" if ($mode ne 'netclient');
+        $OUT .= "disable nut-server.service\n" unless ($mode eq 'netclient');
+        $OUT .= "enable nut-monitor.service\n";
+        foreach my $ups ( sort {$a cmp $b} @upses )
+        {
+          $OUT .= "enable $ups.service\n";
+        }
   }
 else
   {
         $OUT .= "disable nut-server.service\n";
         $OUT .= "disable nut-monitor.service\n";
+        foreach my $ups ( sort {$a cmp $b} @upses )
+        {
+          $OUT .= "disable $ups.service\n";
+        }
   }
 }
+

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

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

root/etc/e-smith/templates/etc/ups/nut.conf/20ALLOW_NO_DEVICE

@@ -0,0 +1,10 @@
+
+# Uncomment this to allow starting the `upsd` data server even if `ups.conf`
+# has no device sections configured at the moment. This environment variable
+# overrides the built-in "false" flag in `upsd`, and an optional same-named
+# default flag that can be set in `upsd.conf`. If you want a data server always
+# running, even if it initially has nothing to serve (may be live-reloaded
+# later, when devices become configured), this option is for you.
+#ALLOW_NO_DEVICE=true
+#export ALLOW_NO_DEVICE
+

root/etc/e-smith/templates/etc/ups/nut.conf/30ALLOW_NOT_ALL_LISTENERS

@@ -0,0 +1,11 @@
+
+# Uncomment this to allow starting the `upsd` data server even if not all
+# `LISTEN` directives can be honoured at the moment. This environment variable
+# overrides the built-in "false" flag in `upsd`, and an optional same-named
+# default flag that can be set in `upsd.conf`. If you want a data server always
+# running, even if it would potentially not serve all clients on every uptime,
+# this option is for you (note you would have to restart `upsd` to pick up the
+# `LISTEN`ed IP address if it appears later). Probably `LISTEN *` is better.
+#ALLOW_NOT_ALL_LISTENERS=true
+#export ALLOW_NOT_ALL_LISTENERS
+

root/etc/e-smith/templates/etc/ups/nut.conf/40UPSD_OPTIONS

@@ -0,0 +1,6 @@
+
+# The optional 'UPSD_OPTIONS' allow to set upsd specific command-line options.
+# It is ignored when 'MODE' above indicates that no upsd should be running.
+# It may be redundant in comparison to options which can be set in `upsd.conf`.
+#UPSD_OPTIONS=
+

root/etc/e-smith/templates/etc/ups/nut.conf/50UPSMON_OPTIONS

@@ -0,0 +1,6 @@
+
+# The optional 'UPSMON_OPTIONS' allow to set upsmon specific command-line options.
+# It is ignored when 'MODE' above indicates that no upsmon should be running.
+# It may be redundant in comparison to options which can be set in `upsmon.conf`.
+#UPSMON_OPTIONS=
+

root/etc/e-smith/templates/etc/ups/nut.conf/60POWEROFF_WAIT

@@ -0,0 +1,9 @@
+
+# If the optional 'POWEROFF_WAIT' is configured (to a value that can be handled
+# by `/bin/sleep` on the current system - typically an integer with the number
+# of seconds for a delay, but not always limited to that syntax), and the current
+# system which manages one or more UPS devices would not only command it to shut
+# down, but also try to avoid the "Power race". Caveats emptor, see NUT FAQ and
+# other docs for details.
+#POWEROFF_WAIT=3600
+

root/etc/e-smith/templates/etc/ups/nut.conf/70POWEROFF_QUIET

@@ -0,0 +1,8 @@
+
+# The optional 'POWEROFF_QUIET' setting controls if the NUT shutdown integration
+# scripts or service units would emit messages about their activity (or lack
+# thereof). By default they may be verbose, to aid post-mortem troubleshooting
+# via logs or console captures.
+# Set to `true` to avoid that trove of information, if you consider it noise.
+#POWEROFF_QUIET=true
+

root/etc/e-smith/templates/etc/ups/ups.conf/UPS

@@ -1,16 +1,28 @@
 {
-    my $model = $nut{Model} || "usbhid-ups";
-    my $device = $nut{Device} || "/var/lib/ups/hiddev0";
-    my $type = $nut{Type};
-    my $mfr = $nut{mfr};
-    my $mdl = $nut{mdl};
-    $OUT .= "[UPS]\n";
-    $OUT .= "\tdriver = $model\n";
-    if  ($model eq 'genericups')
-    { 
-      $OUT .= "\tupstype = $type\n" if defined $type;
-      $OUT .= "\tmfr = $mfr\n" if defined $mfr;
-      $OUT .= "\tmodel = $mdl\n" if defined $mdl;
-    }
-    $OUT .= "\tport = $device\n";
+   my $poll = $nut{pollInterval} || '2';
+   if ($poll ne '2') {
+     $OUT .= "pollinterval = $poll\n";
+   }
+
+    my @upses = grep(/^nut-driver\@[a-zA-Z0-9_-]+$/, $DB->keys);
+    foreach my $ups ( sort {$a cmp $b} @upses )
+	{
+		my $status = ${"$ups"}{status} || "disabled";
+		next if $status eq "disabled";
+		my ($name )= $ups =~ /^nut-driver\@(.*)$/ ;
+		my $model = ${"$ups"}{Model} || "usbhid-ups";
+		my $device = ${"$ups"}{Device} || "auto"; #"/var/lib/ups/hiddev0";
+		my $type = ${"$ups"}{Type};
+		my $mfr = ${"$ups"}{mfr};
+		my $mdl = ${"$ups"}{mdl};
+		$OUT .= "[$name]\n";
+		$OUT .= "\tdriver = $model\n";
+		if  ($model eq 'genericups')
+		{ 
+			$OUT .= "\tupstype = $type\n" if defined $type;
+			$OUT .= "\tmfr = $mfr\n" if defined $mfr;
+			$OUT .= "\tmodel = $mdl\n" if defined $mdl;
+		}
+		$OUT .= "\tport = $device\n";
+	}
 }

root/etc/e-smith/templates/etc/ups/upsd.users/monitor

@@ -1,8 +1,18 @@
+       [upsprimary]
+               password  = { $nut{PrimaryPass} }
+               upsmon primary
+
+       [upssecondary]
+               password  = { $nut{SecondaryPass} }
+               upsmon secondary
+{
+# we keep those two for backward compatibility pre SME11
+}
        [upsmaster]
-               password  = { $nut{MasterPass} }
-               upsmon master
+               password  = { $nut{PrimaryPass} }
+               upsmon primary
 
        [upsslave]
-               password  = { $nut{SlavePass} }
-               upsmon slave
+               password  = { $nut{SecondaryPass} }
+               upsmon secondary
 

root/etc/e-smith/templates/etc/ups/upsmon.conf/MONITOR

@@ -1,7 +1,14 @@
 {
-    if ( ($nut{Master} || 'yes') ne 'no' ) {
-	$OUT = "MONITOR UPS\@localhost 1 upsmaster $nut{MasterPass} master";
-    } else {
-	$OUT = "MONITOR $nut{SlaveUPS} 1 upsslave $nut{SlavePass} slave";
-    }
+	if ( ($nut{Mode} || 'standalone') eq 'netclient' ) {
+		$OUT = "MONITOR $nut{ClientUPS} 1  $nut{ClientUser}  $nut{ClientPass} secondary";
+	} else {
+		my @upses = grep(/^nut-driver\@[a-zA-Z0-9_-]+$/, $DB->keys);
+		my $size = scalar(@upses);
+		foreach my $ups ( sort {$a cmp $b} @upses )
+		{
+			my ($upsname) = $ups =~ /^nut-driver\@([a-zA-Z0-9_-]+)$/ ; 
+			$OUT .= "MONITOR $upsname\@localhost 1 upsprimary $nut{PrimaryPass} primary";
+			$OUT .= "\n" if --$size >=1;
+		}
+	}
 }

root/usr/lib/systemd/system/nut-driver.service.d/51koozali.conf

@@ -1,14 +0,0 @@
-#------------------------------------------------------------
-#	       !!DO NOT MODIFY THIS FILE!!
-# 
-# Manual changes will be lost when this file is regenerated.
-#
-# Please read the developer's guide, which is available
-# at http://www.contribs.org/development/
-#
-# Copyright (C) 1999-2006 Mitel Networks Corporation
-#------------------------------------------------------------
-
-[Service]
-ExecStartPre=
-ExecStartPre=-/usr/bin/systemd-tmpfiles --create /usr/lib/tmpfiles.d/nut-run.conf

root/usr/lib/systemd/system/nut-driver@.service.d/51koozali.conf

@@ -0,0 +1,4 @@
+[Service]
+ExecStartPre=/sbin/e-smith/service-status %N
+[Install]
+WantedBy= sme-server.target

root/usr/lib/systemd/system/nut-monitor.service.d/50koozali.conf

@@ -0,0 +1,4 @@
+[Service]
+ExecStartPre=/sbin/e-smith/service-status nut-monitor
+[Install]
+WantedBy=sme-server.target

root/usr/lib/systemd/system/nut-server.service.d/50koozali.conf

@@ -0,0 +1,4 @@
+[Service]
+ExecStartPre=/sbin/e-smith/service-status nut-server
+[Install]
+WantedBy=sme-server.target

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

@@ -0,0 +1,282 @@
+#
+# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-01-20 16:21:33 
+#
+#
+# Routines to be edited by the developer to provide content and validation for parameters
+# and provison of the control data for table(s)
+#
+use esmith::util;
+use esmith::util::network;
+use esmith::ConfigDB::UTF8;
+
+use constant FALSE => 0;
+use constant TRUE  => 1;
+
+our $cdb;
+
+# Validation routines - parameters for each panel
+
+	sub validate_STATUS {
+		my $c = shift;
+		my $prefix_data = shift; #Data hash as parameter
+		# Validation for each field 
+		my $ret = "";
+		
+		if (! TRUE) #validate $c->param('UPSStatus')
+			{$ret .= 'Validation for UPSStatus failed';}	
+		if ($ret eq "") {$ret = 'ok';}
+		return $ret;
+	}
+
+	sub validate_CONFIG {
+		#return "ok";
+		my $c = shift;
+		my $prefix_data = shift; #Data hash as parameter
+		# Validation for each field 
+		my $ret = "";
+		
+		if (! TRUE) #validate $c->param('status')
+			{$ret .= 'Validation for status failed';}	
+		if (! TRUE) #validate $c->param('Nutmode')
+			{$ret .= 'Validation for Nutmode failed';}
+		#do we want the Slave validated ? we should just display read only	
+		if (! TRUE) #validate $c->param('SlaveUPS_Name')
+			{$ret .= 'Validation for SlaveUPS_Name failed';}
+		if (! TRUE) #validate $c->param('ClientUPS_Name')
+			{$ret .= 'Validation for ClientUPS_Name failed';}	
+		if (! TRUE) #validate $c->param('MasterUPS_Name')
+			{$ret .= 'Validation for MasterUPS_Name failed';}	
+		if (! TRUE) #validate $c->param('UPS_Model')
+			{$ret .= 'Validation for UPS_Model failed';}	
+		if (! TRUE) #validate $c->param('UPS_Device')
+			{$ret .= 'Validation for UPS_Device failed';}	
+		if (! TRUE) #validate $c->param('UPS_gen_Type')
+			{$ret .= 'Validation for UPS_gen_Type failed';}	
+		if (! TRUE) #validate $c->param('UPS_gen_Mfr')
+			{$ret .= 'Validation for UPS_gen_Mfr failed';}	
+		if (! TRUE) #validate $c->param('UPS_gen_Model')
+			{$ret .= 'Validation for UPS_gen_Model failed';}	
+		if ($ret eq "") {$ret = 'ok';}
+		return $ret;
+	}
+
+
+# Get singleton data for each panel
+
+	sub get_data_for_panel_STATUS {
+		# Return a hash with the fields required which will be loaded into the shared data 
+		my $c = shift;
+		$cdb = esmith::ConfigDB::UTF8->open()   || die("Couldn't open config db");
+		my %ret = (
+			#'Data1'=>'Data for STATUS', #Example
+			# fields from Inputs in STATUS $fields['STATUS']
+			'UPSStatus'=>$c->get_ups_status(),
+			'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;
+	}
+
+	sub get_data_for_panel_CONFIG {
+		# Return a hash with the fields required which will be loaded into the shared data 
+		my $c = shift;
+		$cdb = esmith::ConfigDB::UTF8->open()   || die("Couldn't open config db");
+		my %ret = (
+			'Data1'=>'Data for CONFIG', #Example
+			'localip'=>$cdb->get_value('LocalIP'),
+			# fields from Inputs in CONFIG $fields['CONFIG']
+			'status'=>$cdb->get_prop('nut', 'status') || 'disabled',
+			'Nutmode'=>$cdb->get_prop('nut', 'Mode') || 'standalone',
+			'ClientUPS_Name'=>$cdb->get_prop('nut', 'ClientUPS'),
+			'ClientUPS_User'=>$cdb->get_prop('nut', 'ClientUser'),
+			'ClientUPS_Pass'=>$cdb->get_prop('nut', 'ClientPass'),
+			'SlaveUPS_Pass'=>$cdb->get_prop('nut', 'SecondaryPass'),
+			'MasterUPS_Name'=>$cdb->get_prop('nut', 'MasterUPS'),
+			# nut-driver@ups entry
+			'UPS_Model'=>$cdb->get_prop('nut-driver@ups', 'Model') || 'usbhid-ups',
+			'UPS_Device'=>$cdb->get_prop('nut-driver@ups', 'Device')|| 'auto',
+			'UPS_gen_Type'=>$cdb->get_prop('nut-driver@ups', 'Type'),
+			'UPS_gen_Mfr'=>$cdb->get_prop('nut-driver@ups', 'mfr'),
+			'UPS_gen_Model'=>$cdb->get_prop('nut-driver@ups', 'mdl'),
+		);
+		return %ret;
+	}
+
+
+
+# Get control data for table(s)
+
+
+
+# Return hash with values from row in which link clicked on table
+
+	sub get_selected_STATUS {
+		my $c = shift;
+		my $selected = shift; #Parameter is name of selected row.
+		my $is_new_record = shift; #Indicates new record required (defaults)
+		my %ret = {};
+		return %ret;
+	}
+
+	sub get_selected_CONFIG {
+		my $c = shift;
+		my $selected = shift; #Parameter is name of selected row.
+		my $is_new_record = shift; #Indicates new record required (defaults)
+		my %ret = {};
+		return %ret;
+	}
+
+
+#after sucessful modify or create or whatever and submit then perfom (if the params validate)
+
+	sub perform_STATUS {
+		my $c = shift;
+		my $prefix_data = shift; #Data hash as parameter
+		my $ret = "";
+		my $db = $cdb; #maybe one of the others
+		my $dbkey = 'ChangeThis';
+		# To make it write to DB as comment, delete this (regex) string in each if statement "TRUE\) \#copy or perform with value: .* e.g."
+		
+		if (! TRUE) #copy or perform with value: UPSStatus e.g. $db->set_prop($dbkey,'UPSStatus',$c->param('UPSStatus')))
+			{$ret .= 'Perform/save failed for UPSStatus';}
+		if ($ret eq "") {$ret = 'ok';}
+		return $ret;
+	}
+
+	sub perform_CONFIG {
+		my $c = shift;
+		my $prefix_data = shift; #Data hash as parameter
+		my $ret = "";
+		$cdb = esmith::ConfigDB::UTF8->open()   || die("Couldn't open config db");
+		my $db = $cdb; #maybe one of the others
+		my $dbkey = 'nut';
+		my $driverkey = 'nut-driver@ups';
+		# To make it write to DB as comment, delete this (regex) string in each if statement "TRUE\) \#copy or perform with value: .* e.g."
+		
+		if (!$db->set_prop($dbkey,'status',$c->param('status')))
+			{$ret .= 'Perform/save failed for status';}
+		if (!$db->set_prop($dbkey,'Mode',$c->param('Nutmode')))
+			{$ret .= 'Perform/save failed for Nutmode';}
+
+		# let only save info regarding the current mode
+		# if client mode
+		if (! $db->set_prop($dbkey,'ClientUPS',$c->param('ClientUPS_Name')))
+			{$ret .= 'Perform/save failed for ClientUPS_Name';}
+		if (! $db->set_prop($dbkey,'MasterUPS',$c->param('MasterUPS_Name')))
+			{$ret .= 'Perform/save failed for MasterUPS_Name';}
+		if (! $db->set_prop($dbkey,'ClientUser',$c->param('ClientUPS_User')))
+			{$ret .= 'Perform/save failed for ClientUPS_USer';}
+		if (! $db->set_prop($dbkey,'ClientPass',$c->param('ClientUPS_Pass')))
+			{$ret .= 'Perform/save failed for ClientUPS_Pass';}
+
+		# if not client mode
+		if (! $db->set_prop($driverkey,'Model',$c->param('UPS_Model')))
+			{$ret .= 'Perform/save failed for UPS_Model';}
+		if (! $db->set_prop($driverkey,'Device',$c->param('UPS_Device')))
+			{$ret .= 'Perform/save failed for UPS_Device';}
+		if (! $db->set_prop($driverkey,'Type',$c->param('UPS_gen_Type')))
+			{$ret .= 'Perform/save failed for UPS_gen_Type';}
+		if (! $db->set_prop($driverkey,'mfr',$c->param('UPS_gen_Mfr')))
+			{$ret .= 'Perform/save failed for UPS_gen_Mfr';}
+		if (! $db->set_prop($driverkey,'mdl',$c->param('UPS_gen_Model')))
+			{$ret .= 'Perform/save failed for UPS_gen_Model';}
+
+#changes from sme10 to sme11
+# slave/master is changed to secondary/primary (upstream) should bite the bullet rather sooner than latter
+# we move most properties from nut to nut-driver@UPS, nut-driver@UPS1  (we only handle nut-driver@UPS in panel)
+# we remove Master property (redundant)
+# we add mode property, we have 3 modes : 
+# standalone uses primary pass  
+# nethserver uses primary pass
+# netclient uses secondary pass
+
+
+#TODO check if still needed  :
+
+		if ($ret eq "") {
+			$ret = 'ok';
+			#And run signal-event to apply templates for config files and start task.
+			my @result = qx{/usr/sbin/e-smith/signal-event smeserver-nutUPS-update};
+			if ($? != 0) {
+				warn "Error executing signal-event: $!";
+				return "Signal-event Error occurred $!";
+			}
+		}
+		return $ret;
+	}
+
+
+sub create_link{
+	# WIP
+	my ($c,$route, $panel, $index) = @_;
+	my $link = "$route?trt=$panel&Selected=$index";
+	return $link;
+}
+
+sub get_model_options {
+
+    # Execute the RPM command and capture the output
+    my @output = qx{rpm -ql nut | grep /usr/sbin};
+
+    # Check for errors
+    if ($? != 0) {
+        warn "Error executing command: $!";
+        return ['Error occurred'];
+    }
+
+    # Remove "/usr/sbin/" from the front of each line
+    s{^/usr/sbin/}{} for @output;
+
+    # Trim whitespace from each element and return the array
+    chomp(@output);  # Remove newline characters from each line
+    return @output;  # Return the array of modified output lines
+}
+
+sub get_ups_status {
+	my $c = shift;
+	$cdb = esmith::ConfigDB::UTF8->open()   || die("Couldn't open config db");
+	my $nutmode = $cdb->get_prop('nut', 'Mode') || 'standalone';
+	if ($cdb->get_prop('nut', 'status', 'disabled') eq 'disabled'){
+		return $c->l('nut_status_is_disabled')
+	} elsif ($nutmode eq 'netclient'){
+    return $c->get_status_from_device($cdb->get_prop('nut','ClientUPS'));
+	} else {
+		# 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");
+	}
+}
+
+sub get_ups_status_as_hash {
+	$c = shift;
+	$string = $c->get_ups_status();
+	my %hash;
+	while ($string =~ /^(.+?):\s*(.+)$/mg) {
+		$hash{$1} = $2;
+	}
+	return \%hash
+}
+
+sub get_status_from_device {
+	my ($c,$device) = @_;
+	my $command = '/usr/bin/upsc';
+
+    # Check if the file exists and is executable
+    return ["$command Not allowed"] unless (-e $command && -x $command) ;
+
+	$result = qx{$command $device};
+	if ($? != 0) {
+		warn "Error executing $command command: $!";
+		return ["$command $device Error occurred $!"];
+	}
+	chomp($result);
+	$result  = $result || 'No results';
+	$result = "Status from $device\n\n".$result;
+	return $result;
+}
+
+
+1;

root/usr/share/smanager/lib/SrvMngr/Controller/Nutups.pm

@@ -0,0 +1,287 @@
+package SrvMngr::Controller::Nutups;
+#
+# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-01-20 16:21:33 
+#
+#----------------------------------------------------------------------
+# heading     : System
+# description : NutUPS configuration
+# navigation  : 4000 900
+#
+# name : nutups,    method : get,   url : /nutups,   ctlact : Nutups#main
+# name : nutupsu,   method : post,  url : /nutupsu,  ctlact : Nutups#do_update
+# name : nutupsd,   method : get,   url : /nutupsd,  ctlact : Nutups#do_display
+#
+# routes : end
+#
+# Documentation: https://wiki.contribs.org/Nutups
+#----------------------------------------------------------------------
+
+#
+# Scheme of things:
+#
+# TBA!!
+
+use strict;
+use warnings;
+use Mojo::Base 'Mojolicious::Controller';
+
+use constant FALSE => 0;
+use constant TRUE  => 1;
+
+use Locale::gettext;
+use SrvMngr::I18N;
+use SrvMngr qw(theme_list init_session);
+
+use Data::Dumper;
+
+use esmith::util;
+use esmith::util::network;
+use esmith::ConfigDB::UTF8;
+
+
+
+require '/usr/share/smanager/lib/SrvMngr/Controller/Nutups-Custom.pm';  #The code that is to be added by the developer
+
+sub main {
+#
+# Initial entry - route is "/<whatever>"
+#
+#set initial panel
+#for initial panel:
+	#Specifiy panel to enter
+	#load up _data hash with DB fields
+	#load up stash with pointer(s) to control fields hash(= get-))
+		#and a pointer to the prefix_data hash
+#render initial panel
+
+    my $c = shift;
+    $c->app->log->info( $c->log_req );
+    my $cdb = esmith::ConfigDB::UTF8->open()   || die("Couldn't open config db");
+    my %nut_data = ();
+    my $title = $c->l('nut_NutUPS_configuration');
+    my $modul = '';
+
+    $nut_data{'trt'} = 'STATUS';
+    
+    #Load any DB entries into the <prefix>_data area so as they are preset in the form
+    # which DB - this only really works if the initial panel is a PARAMS type panel and not a TABLE
+    my $db = $cdb; #pickup local or global db or Default to config
+    
+	
+	$c->do_display($nut_data{'trt'});
+	
+}
+
+# Post request with params - submit from the form 
+sub do_update {
+#
+# Return after submit pushed on panel (this is a post) - route is "/<whatever>u"
+# parameters in the params hash.
+#
+#load up all params into prefix_data hash:
+#By panel (series of if statements - only one executed):
+		#call validate-PANEL() - return ret = ok or error message
+			
+#if validation not ok:
+	#render back to current panel with error message in stash
+#otherwise:
+	#By panel (series of if statements - only one executed):
+		#do whatever is required: call perform-PANEL() - return "ok" or Error Message
+			#call signal-event for any global actions specified (check it exists - error and continue?)
+			#if action smeserver-<whatever>-update exists
+				#signal_event smeserver-<whatever>-update
+			#call signal-event for any specific actions for thids panel (check it exists first - error and continue)
+		#set success in stash
+		#if no "nextpanel" entry:
+			#set firstpanel
+		#else 
+			#set nextpanel
+		#call render
+	
+    my $c = shift;
+    $c->app->log->info($c->log_req);
+    my $modul = '';
+    my $cdb = esmith::ConfigDB::UTF8->open()   || die("Couldn't open config db");
+    my %nut_data = ();
+    my $title = $c->l('nut_NutUPS_configuration');
+
+	# Accessing all POST parameters
+    my %params = $c->req->params->to_hash;
+
+    # Get number of POST parameters
+    my $num_params = keys %params;
+    
+    #Params are available in the hash "params" - copy to the prefix_data hash
+    #while (my ($key, $value) = each %{$c->req->params->to_hash}) {
+    #    $nut_data{$key} = $value;
+    #}
+
+    # the value of trt will tell you which panel has returned    
+    my $trt = $c->param('trt') || 'STATUS'; #hidden control on every form.
+    my $ret = 'ok';
+
+    #Validate the parameters in a custom sub one for each panel (although only one of these will be executed)
+    my $thispanel;
+    
+		if ($trt eq 'STATUS'){
+			#Validate form parameters for panel STATUS
+			$ret = $c->validate_STATUS(\%nut_data);
+			$thispanel = 'STATUS';
+		}
+	
+		if ($trt eq 'CONFIG'){
+			#Validate form parameters for panel CONFIG
+			$ret = $c->validate_CONFIG(\%nut_data);
+			$thispanel = 'CONFIG';
+		}
+	
+	if ($ret ne "ok"){
+		$c->warn($ret);
+		$c->do_display($thispanel);
+	} else {
+		#Do whatever is needed, including writing values to the DB
+		
+		
+			if ($trt eq 'STATUS'){
+				#do whatever is required ...
+				$ret = $c->perform_STATUS(\%nut_data);
+				if ($ret ne "ok") {
+					# return to the panel with error message
+					$c->stash(error => $c->l($ret));
+					$c->stash( 
+						title => $title, 
+						modul => $modul,
+						nut_data  => \%nut_data
+					);
+					$c->render(template => "nutups");	
+				} else {
+					$c->stash( success => $c->l('nut_STATUS_panel_action_was_successful')); #A bit bland - edit it in the lex file
+				}
+			}
+		
+			if ($trt eq 'CONFIG'){
+				#do whatever is required ...
+				$ret = $c->perform_CONFIG(\%nut_data);
+				if ($ret ne "ok") {
+					# return to the panel with error message
+					$c->stash(error => $c->l($ret));
+					$c->stash( 
+						title => $title, 
+						modul => $modul,
+						nut_data  => \%nut_data
+					);
+					$c->render(template => "nutups");	
+				} else {
+					$c->stash( success => $c->l('nut_CONFIG_panel_action_was_successful')); #A bit bland - edit it in the lex file
+				}
+			}
+		
+		# and call any signal-events needed
+		#TBD
+		# Setup shared data and call panel
+		if ('none' eq 'none') {
+			$nut_data{'trt'} = 'STATUS';
+		} else {
+			$nut_data{'trt'} = 'none';
+		}	
+		$c->do_display($nut_data{'trt'});
+	} 
+}
+
+sub do_display {
+#
+# Return after link clicked in table (this is a get) - route is "/<whatever>d"
+# Expects ?trt=PANEL&selected="TableRowName" plus any other required
+#
+# OR it maybe a post from the main panel to add a new record 
+#
+#load up all supplied params into prefix_data hash
+#call get-selected-PANEL() - returns hash of all relevent parameters
+#load up returned hash into prefix_data
+#render - to called panel
+
+    my ($c,$trt) = @_;
+    $c->app->log->info($c->log_req);
+    my $cdb = esmith::ConfigDB::UTF8->open()   || die("Couldn't open config db");
+    my %nut_data = ();
+    my $title = $c->l('nut_NutUPS_configuration');
+    my $modul = "";
+
+	# Accessing all parameters
+    #my %params = $c->req->params->to_hash;
+
+    # Get number of parameters
+    #my $num_params = keys %params;
+    
+    #Tag as Post or Get (ie. create new entry or edit existing one
+    my $is_new_record = ($c->req->method() eq 'POST');
+    
+    #Params are available in the hash "params" - copy to the prefix_data hash
+    #while (my ($key, $value) = each %{$c->req->params->to_hash}) {
+    #    $nut_data{$key} = $value;
+    #}
+
+    # the value of trt will tell you which panel has returned   
+    if (! $trt){ 
+		$trt = $c->param('trt') || 'STATUS'; #Indicates where to go now
+	}
+ 
+    # Now add in the params from the selected row from the table
+		
+    my %selectedrow;
+    
+		if ($trt eq 'STATUS'){
+			#Validate Get selected row (if applicable)  STATUS
+				%selectedrow = $c->get_selected_STATUS($nut_data{'Selected'},$is_new_record);
+		}
+	
+		if ($trt eq 'CONFIG'){
+			#Validate Get selected row (if applicable)  CONFIG
+				%selectedrow = $c->get_selected_CONFIG($nut_data{'Selected'},$is_new_record);
+		}
+	
+ 
+	#Copy in the selected row params to the prefix_data hash to pass to the panel
+	while (my ($key, $value) = each %selectedrow){
+        $nut_data{$key} = $value;
+    }
+	# Where to go now
+	$nut_data{'trt'} = $trt;
+	
+	# Set up other shared data according to the panel to go to
+    
+		if ($trt eq 'STATUS'){
+			# pickup any other contents needed and load them into hash shared with panel
+			my %returned_hash;
+			# subroutine returns a hash directly
+			%returned_hash = $c->get_data_for_panel_STATUS();
+			# Copy each key-value pair from the returned hash to the prefix data hash
+			while (my ($key, $value) = each %returned_hash) {
+				$nut_data{$key} = $value;
+			}
+		}
+	
+		if ($trt eq 'CONFIG'){
+			# pickup any other contents needed and load them into hash shared with panel
+			my %returned_hash;
+			# subroutine returns a hash directly
+			%returned_hash = $c->get_data_for_panel_CONFIG();
+			# Copy each key-value pair from the returned hash to the prefix data hash
+			while (my ($key, $value) = each %returned_hash) {
+				$nut_data{$key} = $value;
+			}
+		}
+	
+	
+	# and table control fields
+     
+	
+	# Data for panel
+	$c->stash( 
+		title 			=> $title, 
+		modul => $modul,
+		nut_data  => \%nut_data
+	);
+	$c->render(template => "nutups");
+}    
+1;

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

@@ -0,0 +1,30 @@
+#
+# 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_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_UPS_Generic_Type' => 'UPS Generic Type',
+'nut_Status_(from_upsc)' => 'Status (from running upsc)',
+'nut_Error_Status_Report' => 'Error Status Report',
+'nut_if_Net_Server' => 'Net Server details',
+'nut_if_genericups' => 'Generic UPS details',
+'nut_if_Net_Client' => 'Net Client details',
+'nut_STATUS_panel_action_was_successful' => 'STATUS panel action was successful',
+'nut_Nut_mode' => 'Nut mode',
+'nut_Status_Report' => 'Status Report',
+'nut_NutUPS_configuration' => 'NutUPS configuration',
+'nut_APPLY' => 'Apply',
+'nut_UPS_Device' => 'UPS Device',
+'nut_UPS_Generic_Manufacturer' => 'UPS Generic Manufacturer',
+'nut_Status_of_the_controlled_UPS' => 'Status of the controlled UPS',
+'nut_Save' => 'Save',
+'nut_status_is_disabled' => 'Nut disabled',

root/usr/share/smanager/themes/default/public/css/nut_ups-status-page.css

@@ -0,0 +1,44 @@
+.ups-status-page {
+    font-family: Arial, sans-serif;
+    line-height: 1.6;
+    color: #333;
+    max-width: 1200px;
+    margin: 0 auto;
+    padding: 20px;
+}
+
+.ups-status-page h1 {
+    color: #2c3e50;
+}
+
+.ups-status-page .grid {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
+    gap: 20px;
+}
+
+.ups-status-page .card {
+    background: #f9f9f9;
+    border-radius: 5px;
+    padding: 20px;
+    box-shadow: 0 2px 5px rgba(0,0,0,0.1);
+}
+
+.ups-status-page h2 {
+    color: #3498db;
+    margin-top: 0;
+}
+
+.ups-status-page table {
+    width: 100%;
+    border-collapse: collapse;
+}
+
+.ups-status-page td {
+    padding: 8px 0;
+    border-bottom: 1px solid #ddd;
+}
+
+.ups-status-page td:first-child {
+    font-weight: bold;
+}

root/usr/share/smanager/themes/default/public/css/nutups.css

@@ -0,0 +1,69 @@
+/*
+Generated by: SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-01-20 16:09:58
+*/
+.Nutups-panel {}
+.name {}
+.rout {}
+.grou1 {}
+.link1 {}
+.endg1 {}
+.subh1 {}
+.para1 {}
+.text1 {}
+.name {}
+.rout {}
+.subh2 {}
+.sele1 {}
+.sele2 {}
+.grou2 {}
+.subh3 {}
+.text3 {}
+.pass4 {}
+.endg2 {}
+.grou3 {}
+.subh4 {}
+.text5 {}
+.pass6 {}
+.endg3 {}
+.text7 {}
+.text8 {}
+.subh5 {}
+.text9 {}
+.text10 {}
+.text11 {}
+.subm12 {}
+.inline-buttons {
+    display: flex; /* Use flexbox to arrange items horizontally */
+    gap: 10px;     /* Optional: Add space between buttons */
+  }
+
+  .inline-buttons .link {
+    /* Additional styling can be added here if needed */
+  }
+  
+  
+  .inline-buttons .link {
+    display: inline-block; /* Keep links as inline-block for button shape */
+    padding: 7px 14px;     /* Adjusted padding to approximate 70% of the original */
+    margin: 0;             /* Remove margin */
+    background-color: #efefef; /* Light gray background color */
+    color: black;          /* Text color */
+    text-decoration: none; /* Remove underline */
+    border: 2px solid #bbb; /* Thin, light gray border */
+    border-radius: 3px;    /* Slightly rounded corners */
+    font-size: 11.2px;     /* Adjusted font size to approximate 70% of the original */
+    text-align: center;    /* Center the text */
+    cursor: pointer;       /* Pointer cursor on hover */  }
+
+  /* Hover and active effects for better interaction */
+  .inline-buttons .link:hover {
+    background-color: #d9d9d9; /* Darker shade on hover */
+  }
+
+  .inline-buttons .link:active {
+    background-color: #c0c0c0; /* Even darker shade on click */
+  }
+  
+  span .label {
+	padding-top:13em;
+  }

root/usr/share/smanager/themes/default/public/js/nutups.js

@@ -0,0 +1,32 @@
+$(document).ready(function() {
+    function toggleUPSClasses() {
+        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
+        $('.secondaryups').toggle(selectedOption === 'netserver' ); // Show/Hide Secondary logins for net server
+        $('.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
+        $('.masterups input').prop('disabled', !(selectedOption === 'netserver' || selectedOption === 'standalone')); 
+        $('.slaveups input').prop('disabled', selectedOption !== 'netclient'); 
+        $('.generics input').prop('disabled', selectedOption === 'netclient');
+    }
+
+    function toggleGenerics() {
+        var upsModelValue = $('#UPS_Model_select').val().toLowerCase(); // Get the current value from UPS_Model
+        var isGenericUps = upsModelValue === 'genericups'; // Check if it's 'genericups'
+
+        // Show/Hide generics section and enable/disable inputs
+        $('.generics').toggle(isGenericUps); 
+        $('.generics input').prop('disabled', !isGenericUps); // Enable/Disable inputs based on the value
+    }
+
+    // Event listener for the selections
+    $('#Nutmode_select').change(toggleUPSClasses);
+    $('#UPS_Model_select').change(toggleGenerics); // Listen for changes in the UPS_Model dropdown
+
+    // Set the initial state based on current selections
+    toggleGenerics();
+    toggleUPSClasses();
+});

root/usr/share/smanager/themes/default/templates/nutups.html.ep

@@ -0,0 +1,60 @@
+%#
+%# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-01-20 16:21:33 
+%#
+% layout 'default', title => "Sme server 2 - NutUPS configuration", share_dir => './';
+%# css specific to this panel:
+% content_for 'module' => begin
+%= stylesheet '/css/nutups.css'
+%= javascript '/js/nutups.js'
+<div id="module" class="module Nutups-panel">
+
+    % if (config->{debug} == 1) {
+	<pre>
+		%= dumper $c->current_route
+		%= dumper $nut_data->{trt}
+	</pre>
+    % }
+    
+    <h1><%=$title%></h1>
+
+    % if ( stash('modul')) {
+	%= $c->render_to_string(inline => stash('modul') );
+    % }
+
+   	%if ($c->stash('first')) {
+	    <br><p>
+		%=$c->render_to_string(inline =>$c->l($c->stash('first')))
+		</p>
+
+	%} elsif ($c->stash('success')) {
+		<div class='success '>
+	       <h2><%=$c->l('nut_Status_Report') %></h2><p>
+			%= $c->l($c->stash('success'));
+			</p>
+		</div>
+		<br />
+
+	%} elsif ($c->stash('error')) { 
+	   <div class='sme-error'>
+	       <h2><%=$c->l('nut_Error_Status_Report') %></h2><p>
+			%= $c->l($c->stash('error'));
+			</p>
+    	</div>
+		<br />
+	%}
+
+	%#Routing to partials according to trt parameter.
+	%#This ought to be cascading if/then/elsif, but is easier to just stack the if/then's rather like a case statement'
+	
+	% if ($nut_data->{trt} eq "STATUS") {
+		%= include 'partials/_nut_STATUS'
+	%}
+	
+	% if ($nut_data->{trt} eq "CONFIG") {
+		%= include 'partials/_nut_CONFIG'
+	%}
+	
+
+
+</div>
+%end

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

@@ -0,0 +1,139 @@
+%#
+%# 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">
+	<script>
+		window.onload = function() {
+		SelectInput(); 
+	};
+	</script>
+	% if (config->{debug} == 1) {
+		<pre>
+			%= dumper $nut_data
+		</pre>
+	% }
+	% my $btn = l('nut_APPLY');
+	%= form_for "nutupsu" => (method => 'POST') => (autocomplete => "off" ) => begin
+		% param 'trt' => $nut_data->{trt} unless param 'trt';
+		%= hidden_field 'trt' => $nut_data->{trt}
+		%# Inputs etc in here.
+
+		<h2 class='subh2'><%=l('nut_Manage_Nutups-config_settings:')%></h2>
+	
+		<p><span class=label>
+			%=l('nut_Nut_status')
+		</span><span class=data>
+			%# my @status_options = [['Disabled' => 'disabled'], ['Enabled' => 'enabled']];
+			%# param 'status' => $nut_data->{status} unless param 'status';
+
+			% my @status_options = selected_field([['Disabled' => 'disabled'], ['Enabled' => 'enabled']], $nut_data->{status});
+			%= select_field 'status' => @status_options, class => 'input', id => 'status_select'
+		<br></span>	</p>
+	
+		<p><span class=label>
+			%=l('nut_Nut_mode')
+		</span><span class=data>
+			% my @Nutmode_options = [['Standalone' => 'standalone'], ['Net Server' => 'netserver'], ['Net Client ' => 'netclient']];
+			% param 'Nutmode' => $nut_data->{Nutmode} unless param 'Nutmode';
+			%= select_field 'Nutmode' => @Nutmode_options, class => 'input', id => 'Nutmode_select'
+		<br></span>	</p>
+	
+		<div class=masterups>
+			<h2 class='subh3'><%=l('nut_if_Net_Server')%></h2>
+		   
+      <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>
+			
+			<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 class=slaveups>
+			<h2 class='subh4'><%=l('nut_if_Net_Client')%></h2>
+			<p><span class=label>
+				%=l('nut_SlaveUPS_UPSNAME@IP')
+			</span><span class=data>
+				% 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'>
+        %=l('nut_ClientUPS_Username')
+      </span><span class=data>
+        % param 'ClientUPS_User' => $nut_data->{ClientUPS_User} unless param 'ClientUPS_User';
+        %=text_field 'ClientUPS_User', class => 'textinput'
+      </span></p>
+
+			<p><span class='label'>
+				%=l('nut_ClientUPS_Password')
+			</span><span class=data>
+				% param 'ClientUPS_Pass' => $nut_data->{ClientUPS_Pass} unless param 'ClientUPS_Pass';
+				%=password_field 'ClientUPS_Pass', class => 'pass4 sme-password', autocomplete => 'off'
+			</span></p>
+		</div>
+	
+		<div class=generics>
+`			<h2 class='subh5'><%=l('nut_if_genericups')%></h2>
+			<p><span class=label>
+				%=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>
+				%=l('nut_UPS_Generic_Manufacturer')
+			</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>

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

@@ -0,0 +1,81 @@
+%#
+%# 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-STATUS" class="partial Nutups-STATUS">
+	<script>
+		window.onload = function() {
+		SelectInput(); 
+	};
+	</script>
+	% if (config->{debug} == 1) {
+		<pre>
+			%= dumper $nut_data
+		</pre>
+	% }
+	% my $btn = l('nut_APPLY');
+	%= form_for "nutupsu" => (method => 'POST') => begin
+		% param 'trt' => $nut_data->{trt} unless param 'trt';
+		%= hidden_field 'trt' => $nut_data->{trt}
+		%# Inputs etc in here.
+
+		<div class=inline-buttons>
+		
+	
+		<a href='nutupsd?trt=CONFIG' class='link link1'>
+			%= l('nut_Configure_NutUPS')
+		</a>
+		%#= link_to l('nut_Configure_NutUPS'), 'nutupsd?trt=CONFIG' , class=>'link link1'
+	
+	
+		</div>
+		
+	
+		<h2 class='subh1'><%=l('nut_Status_of_the_controlled_UPS')%></h2>
+	
+		<p class='paragraph para1'>
+			%=l('nut_Descriptive_paragraph')
+		</p>
+
+<!--
+		<span class=label>
+			%=l('nut_Status_(from_upsc)')
+		</span><span class=data>
+			% param 'UPSStatus' => $nut_data->{UPSStatus} unless param 'UPSStatus';
+			%= text_area 'UPSStatus', cols=>55, rows=>35, Readonly=>'true'
+		</span><br>
+-->
+
+    <span class=label>
+      %=l('nut_Nut_mode')
+    </span><span class=data>
+      %= $nut_data->{Nutmode} 
+    </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'
+	
+		%# Probably finally by a submit.
+	%end    
+</div>

root/usr/share/smanager/themes/default/templates/partials/_nut_UPS_STATUS.html.ep

@@ -0,0 +1,57 @@
+<h1>UPS Status</h1>
+%= stylesheet '/css/nut_ups-status-page.css'
+<div class="ups-status-page">
+	<div class="grid">
+		<div class="card">
+			<h2>Device Information</h2>
+			<table>
+				<tr><td>Manufacturer:</td><td><%= $nut_data->{'ups_data'}->{'device.mfr'} %></td></tr>
+				<tr><td>Model:</td><td><%= $nut_data->{'ups_data'}->{'device.model'} %></td></tr>
+				<tr><td>Serial:</td><td><%= $nut_data->{'ups_data'}->{'device.serial'} %></td></tr>
+				<tr><td>Type:</td><td><%= $nut_data->{'ups_data'}->{'device.type'} %></td></tr>
+			</table>
+		</div>
+		
+		<div class="card">
+			<h2>Battery Status</h2>
+			<table>
+				<tr><td>Charge:</td><td><%= $nut_data->{'ups_data'}->{'battery.charge'} %>%</td></tr>
+				%#<tr><td>Runtime:</td><td><%= sprintf("%.2f", $nut_data->{'ups_data'}->{'battery.runtime'} / 60) %> minutes</td></tr>
+				  <td>Runtime:</td>
+				  <td>
+					<% 
+					  my $runtime = $nut_data->{'ups_data'}->{'battery.runtime'};
+					  my $runtime_minutes = (defined $runtime && $runtime =~ /^\d+(\.\d+)?$/) 
+						? sprintf("%.2f", $runtime / 60) 
+						: 'N/A';
+					%>
+					<%= $runtime_minutes %> minutes
+				  </td>
+				<tr><td>Voltage:</td><td><%= $nut_data->{'ups_data'}->{'battery.voltage'} %>V</td></tr>
+				<tr><td>Type:</td><td><%= $nut_data->{'ups_data'}->{'battery.type'} %></td></tr>
+			</table>
+		</div>
+		
+		<div class="card">
+			<h2>Input Power</h2>
+			<table>
+				<tr><td>Voltage:</td><td><%= $nut_data->{'ups_data'}->{'input.voltage'} %>V</td></tr>
+				<tr><td>Nominal Voltage:</td><td><%= $nut_data->{'ups_data'}->{'input.voltage.nominal'} %>V</td></tr>
+				<tr><td>Sensitivity:</td><td><%= $nut_data->{'ups_data'}->{'input.sensitivity'} %></td></tr>
+				<tr><td>Transfer High:</td><td><%= $nut_data->{'ups_data'}->{'input.transfer.high'} %>V</td></tr>
+				<tr><td>Transfer Low:</td><td><%= $nut_data->{'ups_data'}->{'input.transfer.low'} %>V</td></tr>
+			</table>
+		</div>
+		
+		<div class="card">
+			<h2>UPS Status</h2>
+			<table>
+				<tr><td>Status:</td><td><%= $nut_data->{'ups_data'}->{'ups.status'} %></td></tr>
+				<tr><td>Load:</td><td><%= $nut_data->{'ups_data'}->{'ups.load'} %>%</td></tr>
+				<tr><td>Beeper:</td><td><%= $nut_data->{'ups_data'}->{'ups.beeper.status'} %></td></tr>
+				<tr><td>Firmware:</td><td><%= $nut_data->{'ups_data'}->{'ups.firmware'} %></td></tr>
+				<tr><td>Test Result:</td><td><%= $nut_data->{'ups_data'}->{'ups.test.result'} %></td></tr>
+			</table>
+		</div>
+	</div>
+</div>

smeserver-nutUPS.spec

@@ -4,7 +4,7 @@ Summary: SME server - nut UPS interaction module
 %define name smeserver-nutUPS
 Name: %{name}
 %define version 11.0.0
-%define release 5
+%define release 17
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -12,7 +12,8 @@ Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
-Requires: nut nut-client 
+Requires: nut >= 2.8.2
+Requires: nut-client 
 Obsoletes: neon <= 0.25.5
 Requires: smeserver-lib >= 1.15.1-16
 BuildArchitectures: noarch
@@ -25,6 +26,41 @@ A module which configures the Network UPS Tools suite for operation with
 the SME server software.
 
 %changelog
+* Fri Jun 13 2025 Brian Read <brianr@koozali.org> 11.0.0-17.sme
+- Fix return from function in Nutups-custom [SME: 13042]
+- Check Seconds left for zero before dividing by 60
+
+* Fri Jun 13 2025 Brian Read <brianr@koozali.org> 11.0.0-16.sme
+- Change Navigation weighting for SM2 [SME: 12996]
+
+* 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
+- fix typo preventing netserver enabling [SME: 13021]
+
+* Wed May 28 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-13.sme
+- filter out nut* services from syslog (use journalctl) [SME: 13013]
+
+* 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
+- 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
+- update config for Nut 2.8.2 [SME: 12657]
+
+* Wed Mar 05 2025 Brian Read <brianr@koozali.org> 11.0.0-8.sme
+- typo in lex file [SME: 12949]
+
+* Mon Mar 03 2025 Brian Read <brianr@koozali.org> 11.0.0-7.sme
+- Enhance UPS Status screen [SME: i12949]
+
+* Mon Mar 03 2025 Brian Read <brianr@koozali.org> 11.0.0-6.sme
+- Add in SM2 NutUPS configuration and status panel [SME: 12949]
+
 * Wed Jan 15 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-5.sme
 - remove Requires daemontools [SME: 12566]