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

Various - space in reboot panel, max 15 chars for workgroup name, add action for recofigure, remove call to TAI64 in viewlogfiles, add requires for multi-language locales

Browse Source
This commit is contained in:
Brian Read 2025-01-27 15:16:21 +00:00
parent c2d677594b
commit eee68afa2b
5 changed files with 53 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
createlinks
View File

@ -45,6 +45,7 @@ for my $event ( qw( smeserver-manager-update smanager-refresh bootstrap-console-
event_link('locales2-conf', "$event", '80');
}
event_link('post-upgrade-and-reboot','post-upgrade-and-reboot',80);
event_link('systemd-default', "smeserver-manager-update", '88');
event_link('systemd-reload', "smeserver-manager-update", '89');
templates2events("/etc/rsyslog.conf", "smeserver-manager-update");

3
root/etc/e-smith/events/actions/post-upgrade-and-reboot Executable file
View File

@ -0,0 +1,3 @@
#!/bin/bash
/usr/sbin/e-smith/signal-event post-upgrade
/usr/sbin/e-smith/signal-event reboot

9
root/usr/share/smanager/lib/SrvMngr/Controller/Reboot.pm
View File

@ -56,10 +56,11 @@ sub do_action {
# esmith::util::backgroundCommand( 1, "/sbin/e-smith/signal-event", "post-upgrade",
# "; ", "/sbin/e-smith/signal-event", "reboot" );
system("/sbin/e-smith/signal-event", "post-upgrade") == 0
or die("Error occurred while running post-upgrade.\n");
system("/sbin/e-smith/signal-event", "reboot") == 0
or die("Error occurred while rebooting.\n");
esmith::util::backgroundCommand( 1, "/sbin/e-smith/signal-event", "post-upgrade-and-reboot");
#system("/sbin/e-smith/signal-event", "post-upgrade") == 0
#or die("Error occurred while running post-upgrade.\n");
#system("/sbin/e-smith/signal-event", "reboot") == 0
#or die("Error occurred while rebooting.\n");
} ## end unless ($debug)
} ## end elsif ($function eq 'reconfigure')
$c->stash(title => $title, modul => $result);

11
root/usr/share/smanager/lib/SrvMngr/Controller/Viewlogfiles.pm
View File

@ -17,7 +17,7 @@ use Locale::gettext;
use SrvMngr::I18N;
use SrvMngr qw(theme_list init_session);
use esmith::ConfigDB;
use Time::TAI64;
#use Time::TAI64;
use File::Basename;
use HTML::Entities;
use esmith::FormMagick qw(gen_locale_date_string);
@ -104,10 +104,11 @@ sub do_action {
sub timestamp2local {
$_ = shift;
if (/^(\@[0-9a-f]{24})(.*)/s) {
return Time::TAI64::tai64nlocal($1) . $2;
} elsif (/^([0-9]{10}\.[0-9]{3})(.*)/s) {
return localtime($1) . $2;
#if (/^(\@[0-9a-f]{24})(.*)/s) {
# return Time::TAI64::tai64nlocal($1) . $2;
#} els
if (/^([0-9]{10}\.[0-9]{3})(.*)/s) {
return localtime($1) . $2;
}
return $_;
} ## end sub timestamp2local

41
smeserver-manager.spec
View File

@ -2,7 +2,7 @@ Summary: Sme server navigation module : manager 2
%define name smeserver-manager
Name: %{name}
%define version 11.0.0
%define release 44
%define release 45
Version: %{version}
Release: %{release}%{?dist}
License: GPL
@ -26,19 +26,47 @@ Requires: smeserver-lib >= 1.18.0-26
Requires: smeserver-manager >= 2.4.0-22
Requires: smeserver-apache >= 2.6.0-19
Requires: smeserver-php >= 3.0.0-43
Requires: perl(Mojolicious) >= 7.56
#Requires: smeserver-manager-locale >= 11.0.0
Requires: perl(Mojolicious) >= 8.42
Requires: perl(Mojolicious::Plugin::I18N) >= 1.6
Requires: perl(Mojolicious::Plugin::RenderFile) >= 0.12
Requires: perl(Mojolicious::Plugin::CSRFDefender) >= 0.0.8
Requires: perl(Net::Netmask) >= 1.9
Requires: perl(DBM::Deep) >= 2.0011-1
Requires: perl(Mojo::JWT) >= 0.08-1
#Requires: perl(Time::TAI64) >= 2.11
Requires: mutt >= 1.5.21
Requires: smeserver-manager-jsquery >= 1.0
Requires: smeserver-lib >= 11.0
Requires: smeserver-certificates >= 11.0
#Requires: js-jquery > 2.2.4-3 (optional)
Requires: smeserver-manager-locale-bg
Requires: smeserver-manager-locale-da
Requires: smeserver-manager-locale-de
Requires: smeserver-manager-locale-el
Requires: smeserver-manager-locale-es
Requires: smeserver-manager-locale-et
Requires: smeserver-manager-locale-fr
Requires: smeserver-manager-locale-he
Requires: smeserver-manager-locale-hu
Requires: smeserver-manager-locale-id
Requires: smeserver-manager-locale-it
Requires: smeserver-manager-locale-ja
Requires: smeserver-manager-locale-nb
Requires: smeserver-manager-locale-nl
Requires: smeserver-manager-locale-pl
Requires: smeserver-manager-locale-pt
Requires: smeserver-manager-locale-pt_BR
Requires: smeserver-manager-locale-ro
Requires: smeserver-manager-locale-ru
Requires: smeserver-manager-locale-sl
Requires: smeserver-manager-locale-sv
Requires: smeserver-manager-locale-th
Requires: smeserver-manager-locale-tr
Requires: smeserver-manager-locale-zh_CN
Requires: smeserver-manager-locale-zh_TW
Provides: server-manager
AutoReqProv: no
@ -115,6 +143,13 @@ true
%defattr(-,root,root)
%changelog
* Sat Jan 25 2025 Brian Read <brianr@koozali.org> 11.0.0-45.sme
- Add some space in the reboot/reconf/shutdown panel [SME: ]
- Add check for 15 characters netbios name in workgroup panel [SME: ]
- Add action for post-upgrade-and-reboot for reconfigure panel [SME: 12865]
- Remove call to TAI64 in viewlogfiles as qmail specific format [SME: 12889]
- Add requires to pull in all the locale translation [SME: 12757]
* Fri Jan 24 2025 Brian Read <brianr@koozali.org> 11.0.0-44.sme
- Change to network-online for systemd startup to make sure network is up [SME: 12758]
@ -1328,4 +1363,4 @@ true
* Tue Mar 14 2000 Charlie Brady <charlieb@e-smith.com>
Wed Mar 14 2000 --> Wed Mar 08 2000 or Tue Mar 14 2000 or Wed Mar 15 2000 or ....
- initial release
- initial release