brianr/SM2Gen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Edit template for controller - Refine params copy and bring DB opens up to spec with UTF8

Browse Source
This commit is contained in:
Brian Read
2025-10-06 10:57:00 +01:00
parent 29f8de63fd
commit ecb846fc6c
119 changed files with 10059 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
output/Yum/AdminLTE/yuminstall.html.new.ep Normal file
View File

@@ -0,0 +1,84 @@
% layout "AdminLTE", title => "Sme server 2 - yum_install";
% content_for "module" => begin
<div class="card-body">
% if (config->{debug} == 1) {
<pre>
<%= dumper $c->current_route %>
<%= dumper $yum_datas %>
</pre>
% }
<h1><%= $title%></h1>
% if ( $notif ) {
<br>
<div class="text-warn">
<%= $notif %>
</div>
<br>
% }
<form action="/smanager/yumd" method="POST">
<%= l "yum_HEADER_AVAILABLE_SOFTWARE" %>
<br><br>
% if ($c->non_empty("available","group")) {
<%=l "yum_DESC_AVAILABLE_GROUPS" %>
<br><br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<%= l "yum_LABEL_AVAILABLE_GROUPS" %>
</div>
<div class="col-md-3">
% param "SelectedGroups" => $c->get_names2("updates","group") unless param "SelectedGroups";
<%= select_field "SelectedGroups" => $c->get_options2("available", "group"), class => "form-select", size => "10", multiple => "1" %>
</div>
</div>
% }
<br><br>
% if ($c->non_empty("available","packages")) {
<%= l "yum_DESC_AVAILABLE_PACKAGES" %>
<br><br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<%=l "yum_LABEL_AVAILABLE_PACKAGES" %>
</div>
<div class="col-md-3">
% param "SelectedPackages" => $c->get_names2("updates","package") unless param "SelectedPackages";
%= select_field "SelectedPackages" => $c->get_options2("available", "package"), class => "form-select", size => "10", multiple => "1"
</div>
</div>
% }
<!-- $c->print_skip_header() -->
<br>
<%= hidden_field "trt" => "INST" %>
% my $btnSave = $c->l("Install");
<div class="row g-3 align-items-center">
<div class="col-md-2">
<button type="submit" class="btn btn-primary btn-sm"><%= $btnSave %></button>
</div>
</div>
</form>
</div>
% end

484
output/Yum/Yum.new.pm Normal file
View File

@@ -0,0 +1,484 @@
package SrvMngr::Controller::Yum;
#----------------------------------------------------------------------
# heading : System
# description : Software installer
# navigation : 4000 500
#$if_admin->get("/yum")->to("yum#main")->name("yum");
#$if_admin->post("/yum")->to("yum#do_display")->name("yumd1");
#$if_admin->get("/yumd")->to("yum#do_display")->name("yumd");
#$if_admin->post("/yumd")->to("yum#do_update")->name("yumu");
#
# routes : end
#----------------------------------------------------------------------
use strict;
use warnings;
use Mojo::Base "Mojolicious::Controller";
use Locale::gettext;
use SrvMngr::I18N;
use SrvMngr qw(theme_list init_session ip_number_or_blank);
# dnf_* should remain ASCII; yum_repositories do not need to be UTF-8
use esmith::ConfigDB::UTF8;
use esmith::util;
use File::Basename;
our $cdb;
my $dnf_status_file = "/var/cache/dnf/dnf.status";
#use File::stat;
our %dbs;
sub main {
my $c = shift;
$c->app->log->info($c->log_req);
$cdb = esmith::ConfigDB::UTF8->open || die "Couldn"t open config db\";
for (qw(available installed updates)) {
$dbs{$_} = esmith::ConfigDB::UTF8->open_ro(\"dnf_$_\")
or die \"Couldn"t open dnf_$_ DB\n";
}
for (qw(repositories)) {
$dbs{$_} = esmith::ConfigDB::UTF8->open("yum_$_")
or die "Couldn"t open yum_$_ DB\n\";
}
my %yum_datas = ();
my $title = $c->l("yum_FORM_TITLE");
my $dest = "yum";
my $notif = "";
$yum_datas{"trt"} = "STAT";
if ($c->is_dnf_running()) {
$yum_datas{"trt"} = "LOGF";
$dest = "yumlogfile";
} elsif ($cdb->get_prop("dnf", "LogFile")) {
$yum_datas{"trt"} = "PSTU";
$yum_datas{"reconf"} = $cdb->get_value("UnsavedChanges", "yes");
$dest = "yumpostupg";
} else {
# normal other trt
}
$c->stash(title => $title, notif => $notif, yum_datas => \%yum_datas);
return $c->render(template => $dest);
} ## end sub main
sub do_display {
my $c = shift;
my $rt = $c->current_route;
my $trt = ($c->param("trt") || "STAT");
$cdb = esmith::ConfigDB::UTF8->open || die \"Couldn"t open config db";
for (qw(available installed updates)) {
$dbs{$_} = esmith::ConfigDB::UTF8->open_ro("dnf_$_")
or die "Couldn"t open dnf_$_ DB\n\";
}
for (qw(repositories)) {
$dbs{$_} = esmith::ConfigDB::UTF8->open(\"yum_$_\")
or die \"Couldn"t open yum_$_ DB\n";
}
my %yum_datas = ();
my $title = $c->l("yum_FORM_TITLE");
my ($notif, $dest) = "";
$yum_datas{"trt"} = $trt;
# force $trt if current logfile
if ($c->is_dnf_running()) {
$trt = "LOGF";
} elsif ($cdb->get_prop("dnf", "LogFile")) {
$trt = "PSTU";
}
if ($trt eq "UPDT") {
$dest = "yumupdate";
}
if ($trt eq "INST") {
$dest = "yuminstall";
}
if ($trt eq "REMO") {
$dest = "yumremove";
}
if ($trt eq "CONF") {
$dest = "yumconfig";
}
if ($trt eq "LOGF") {
if ($c->is_dnf_running()) {
$dest = "yumlogfile";
}
} ## end if ($trt eq "LOGF")
if ($trt eq "PSTU") {
if ($cdb->get_prop("dnf", "LogFile")) {
$dest = "yumpostupg";
$yum_datas{"reconf"} = $cdb->get_value("UnsavedChanges", "yes");
}
} ## end if ($trt eq "PSTU")
if (!$dest) { $dest = "yum"; }
$c->stash(title => $title, notif => $notif, yum_datas => \%yum_datas);
return $c->render(template => $dest);
} ## end sub do_display
sub do_update {
my $c = shift;
$c->app->log->info($c->log_req);
my $rt = $c->current_route;
my $trt = $c->param("trt");
$cdb = esmith::ConfigDB::UTF8->open || die "Couldn"t open config db\";
for (qw(available installed updates)) {
$dbs{$_} = esmith::ConfigDB::UTF8->open_ro(\"dnf_$_\")
or die \"Couldn"t open dnf_$_ DB\n";
}
for (qw(repositories)) {
$dbs{$_} = esmith::ConfigDB::UTF8->open("yum_$_")
or die "Couldn"t open yum_$_ DB\n\";
}
my %yum_datas = ();
$yum_datas{trt} = $trt;
my $title = $c->l("yum_FORM_TITLE");
my ($dest, $res, $result) = "";
if ($trt eq "UPDT") {
$dest = "yumupdate";
if (!$result) {
$res = $c->do_yum("update");
$result .= $res unless $res eq "OK";
if (!$result) {
$yum_datas{trt} = "SUC";
#$result = $c->l("yum_SUCCESS");
} ## end if (!$result)
} ## end if (!$result)
} ## end if ($trt eq "UPDT")
if ($trt eq "INST") {
$dest = "yuminstall";
if (!$result) {
$res = $c->do_yum("install");
$result .= $res unless $res eq "OK";
if (!$result) {
$yum_datas{trt} = "SUC";
#$result = $c->l("yum_SUCCESS");
} ## end if (!$result)
} ## end if (!$result)
} ## end if ($trt eq "INST")
if ($trt eq "REMO") {
$dest = "yumremove";
if (!$result) {
$res = $c->do_yum("remove");
$result .= $res unless $res eq "OK";
if (!$result) {
$yum_datas{trt} = "SUC";
#$result = $c->l("yum_SUCCESS");
} ## end if (!$result)
} ## end if (!$result)
} ## end if ($trt eq "REMO")
if ($trt eq "CONF") {
$dest = "yumconfig";
if (!$result) {
$res = $c->change_settings();
$result .= $res unless $res eq "OK";
if (!$result) {
$yum_datas{trt} = "SUC";
$result = $c->l("yum_SUCCESS");
}
} ## end if (!$result)
} ## end if ($trt eq "CONF")
if ($trt eq "PSTU") {
my $reconf = $c->param("reconf") || "yes";
$dest = "yumpostupg";
# effective reconfigure and reboot required
if ($reconf eq "yes") {
$res = $c->post_upgrade_reboot();
$result .= $res unless $res eq "OK";
if (!$result) {
$yum_datas{trt} = "SUC";
$result = $c->l("yum_SYSTEM_BEING_RECONFIGURED");
}
} else {
$yum_datas{trt} = "SUC";
$result = $c->l("yum_UPDATE_SUCCESS");
}
} ## end if ($trt eq "PSTU")
if ($trt eq "LOGF") {
$dest = "yumlogfile";
if (!$c->is_dnf_running()) {
$yum_datas{trt} = "SUC";
$result = $c->l("yum_SUCCESS");
}
} ## end if ($trt eq "LOGF")
# do_yum ended (no message) --> forced to LOGFile
if (!$result) {
$dest = "yumlogfile";
$yum_datas{trt} = "LOGF";
}
$c->stash(title => $title, notif => $result, yum_datas => \%yum_datas);
if ($yum_datas{trt} ne "SUC") {
return $c->render(template => $dest);
}
my $message = \""Yum" $trt update DONE\";
$c->app->log->info($message);
$c->flash(success => $result) if $result;
$c->redirect_to(\"/yum\");
} ## end sub do_update
sub get_dnf_status {
#interrogate status file created and maintained by smeserver.py plugin for dnf.
my ($c) = @_;
my $file_name = $dnf_status_file;
my $content = \"resolved\";
if (-e \"$file_name\") {
open my $fh, "<", $file_name or die \"Can"t open file: $!";
$content = <$fh>;
close $fh;
} ## end if (-e "$file_name")
return $content;
} ## end sub get_dnf_status
sub is_dnf_running {
my ($c) = @_;
my $dnf_status = $c->get_dnf_status();
return $dnf_status ne "resolved" && $dnf_status ne "config" && $dnf_status ne "sack";
} ## end sub is_dnf_running
sub is_empty {
my ($c, $yumdb) = @_;
my $groups = $dbs{$yumdb}->get_all_by_prop(type => "group") || "none";
my $packages = $dbs{$yumdb}->get_all_by_prop(type => "package") || "none";
#Show no updates if both = none
return 1 if ($packages eq $groups);
#else return here
return;
} ## end sub is_empty
sub non_empty {
my ($c, $yumdb, $type) = @_;
$type ||= "both";
return 0 unless (exists $dbs{$yumdb});
my $groups = scalar $dbs{$yumdb}->get_all_by_prop(type => "group");
return $groups if ($type eq "group");
my $packages = scalar $dbs{$yumdb}->get_all_by_prop(type => "package");
if ($type eq "package") {
return $c->package_functions_enabled ? $packages : 0;
}
return ($c->package_functions_enabled or $yumdb eq "updates") ? ($groups || $packages) : $groups;
} ## end sub non_empty
sub package_functions_enabled {
my ($c) = @_;
return ($cdb->get_prop("dnf", "PackageFunctions") eq "enabled");
}
sub get_status {
my ($c, $prop, $localise) = @_;
my $status = $cdb->get_prop("dnf", $prop) || "disabled";
return $status unless $localise;
return $c->l($status eq "enabled" ? "ENABLED" : "DISABLED");
} ## end sub get_status
sub get_options {
my ($c, $yumdb, $type) = @_;
my %options;
for ($dbs{$yumdb}->get_all_by_prop(type => $type)) {
$options{ $_->key } = $_->key . " " . $_->prop("Version") . " - " . $_->prop("Repo");
}
return \%options;
} ## end sub get_options
sub get_options2 {
my ($c, $yumdb, $type) = @_;
my @options;
for ($dbs{$yumdb}->get_all_by_prop(type => $type)) {
push @options, [ $_->key . " " . $_->prop("Version") . " - " . $_->prop("Repo") => $_->key ];
}
return \@options;
} ## end sub get_options2
sub get_names {
return [ keys %{ get_options(@_) } ];
}
sub get_names2 {
my ($c, $yumdb, $type) = @_;
my @selected;
for ($dbs{$yumdb}->get_all_by_prop(type => $type)) {
push @selected, $_->key;
}
return \@selected;
# return [ values @{get_options2(@_)} ];
} ## end sub get_names2
sub get_repository_options2 {
my $c = shift;
my @options;
foreach my $repos ($dbs{repositories}->get_all_by_prop(type => "repository")) {
next unless ($repos->prop("Visible") eq "yes"
or $repos->prop("status") eq "enabled");
push @options, [ $repos->prop("Name") => $repos->key ];
} ## end foreach my $repos ($dbs{repositories...})
my @opts = sort { $a->[0] cmp $b->[0] } @options;
return \@opts;
} ## end sub get_repository_options2
sub get_repository_current_options {
my $c = shift;
my @selected;
foreach my $repos ($dbs{repositories}->get_all_by_prop(type => "repository")) {
next unless ($repos->prop("Visible") eq "yes"
or $repos->prop("status") eq "enabled");
push @selected, $repos->key if ($repos->prop("status") eq "enabled");
} ## end foreach my $repos ($dbs{repositories...})
return \@selected;
} ## end sub get_repository_current_options
sub get_avail2 {
my ($c, $yumdb, $type) = @_;
return $c->get_options2("available", "package");
}
sub get_check_freq_opt {
my ($c) = @_;
return [
[ $c->l("DISABLED") => "disabled" ],
[ $c->l("Daily") => "daily" ],
[ $c->l("Weekly") => "weekly" ],
[ $c->l("Monthly") => "monthly" ]
];
} ## end sub get_check_freq_opt
sub print_skip_header {
my ($c) = shift;
return "<INPUT TYPE=\"hidden\" NAME=\"skip_header\" VALUE=\"1\">\n";
}
sub change_settings {
my ($c) = @_;
for my $param (
qw(
PackageFunctions
)
)
{
$cdb->set_prop("dnf", $param, $c->param("yum_$param"));
} ## end for my $param (qw( PackageFunctions...))
my $check4updates = $c->param("yum_check4updates");
my $status = "disabled";
if ($check4updates ne "disabled") { $status = "enabled"; }
$cdb->set_prop("dnf", "check4updates", $check4updates);
my $deltarpm = $c->param("yum_DeltaRpmProcess");
$cdb->set_prop("dnf", "DeltaRpmProcess", $deltarpm);
my $downloadonly = $c->param("yum_DownloadOnly");
if ($downloadonly ne "disabled") { $status = "enabled"; }
$cdb->set_prop("dnf", "DownloadOnly", $downloadonly);
my $AutoInstallUpdates = $c->param("yum_AutoInstallUpdates");
if ($AutoInstallUpdates ne "disabled") { $status = "enabled"; }
$cdb->set_prop("dnf", "AutoInstallUpdates", $AutoInstallUpdates);
$cdb->set_prop("dnf", "status", $status);
my %selected = map { $_ => 1 } @{ $c->every_param("SelectedRepositories") };
foreach my $repos ($dbs{repositories}->get_all_by_prop(type => "repository")) {
$repos->set_prop("status", exists $selected{ $repos->key } ? "enabled" : "disabled");
}
$dbs{repositories}->reload;
unless (system("/sbin/e-smith/signal-event", "dnf-modify") == 0) {
return $c->l("yum_ERROR_UPDATING_CONFIGURATION");
}
return "OK";
} ## end sub change_settings
sub do_yum {
my ($c, $function) = @_;
for (qw(SelectedGroups SelectedPackages)) {
$cdb->set_prop("dnf", $_, join(",", (@{ $c->every_param($_) })));
}
esmith::util::backgroundCommand(0, "/sbin/e-smith/signal-event", "dnf-$function");
for (qw(available installed updates)) {
$dbs{$_}->reload;
}
return "OK";
} ## end sub do_yum
sub get_yum_status_page {
my ($c) = @_;
my $yum_status;
open(YUM_STATUS, "</var/run/yum.status");
$yum_status = <YUM_STATUS>;
close(YUM_STATUS);
return $yum_status;
} ## end sub get_yum_status_page
sub format_yum_log {
my $c = shift;
$cdb->reload;
my $filepage = $cdb->get_prop("dnf", "LogFile");
return "" unless $filepage and (-e "$filepage");
my $out = sprintf "<PRE>";
open(FILE, "$filepage");
while (<FILE>) {
$out .= sprintf("%s", $_);
}
close FILE;
$out .= sprintf "</PRE>";
undef $filepage;
return $out;
} ## end sub format_yum_log
sub post_upgrade_reboot {
my $c = shift;
$cdb->get_prop_and_delete("dnf", "LogFile");
$cdb->reload;
if (fork == 0) {
exec "/sbin/e-smith/signal-event post-upgrade; /sbin/e-smith/signal-event reboot";
die "Exec failed";
}
return "OK";
} ## end sub post_upgrade_reboot
sub show_yum_log {
my $c = shift;
my $out = $c->format_yum_log();
my $yum_log = $cdb->get_prop_and_delete("dnf", "LogFile");
return $out;
} ## end sub show_yum_log
1;

58
output/Yum/default/yuminstall.html.new.ep Normal file
View File

@@ -0,0 +1,58 @@
% layout "default", title => "Sme server 2 - yum_install";
% content_for "module" => begin
<div id="module" class="module yuminstall-panel">
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $yum_datas
</p>
% }
<h1><%= $title%></h1>
% if ( $notif ) {
<br><div class=sme-error>
%= $notif
</div>
%}
<br>
%= form_for "yumd" => (method => "POST") => begin
%=l "yum_HEADER_AVAILABLE_SOFTWARE"
<br><br>
% if ($c->non_empty("available","group")) {
%=l "yum_DESC_AVAILABLE_GROUPS"
<p><span class=label>
%=l "yum_LABEL_AVAILABLE_GROUPS"
</span><span class=data>
% param "SelectedGroups" => $c->get_names2("updates","group") unless param "SelectedGroups";
%= select_field "SelectedGroups" => $c->get_options2("available", "group"), class => "input", multiple => "1"
</span></p>
%}
<br>
% if ($c->non_empty("available","packages")) {
%=l "yum_DESC_AVAILABLE_PACKAGES"
<p><span class=label>
%=l "yum_LABEL_AVAILABLE_PACKAGES"
</span><span class=data>
% param "SelectedPackages" => $c->get_names2("updates","package") unless param "SelectedPackages";
%= select_field "SelectedPackages" => $c->get_options2("available", "package"), class => "input", multiple => "1"
</span></p>
%}
<!-- $c->print_skip_header() -->
%= hidden_field "trt" => "INST"
<br><br>
<!-- <div class="center">-->
%= submit_button $c->l("Install"), class => "action"
<!--</div>-->
% end
</div>
% end

0
output/Yum/yum_en.lex.diff Normal file
View File

77
output/Yum/yum_en.lex.new1 Normal file
View File

@@ -0,0 +1,77 @@
#
# Lex file for Yum generated on 2025-07-17 09:52:30
#
'yum_BUTTON_CONFIGURATION' => 'Change software installer settings',
'yum_BUTTON_INSTALL_AVAILABLE' => 'Install additional software',
'yum_BUTTON_INSTALL_UPDATES' => 'List available updates',
'yum_BUTTON_REMOVE' => 'Remove installed software',
'yum_DESC_AVAILABLE_GROUPS' => 'You can select software groups
to install from the list below.',
'yum_DESC_AVAILABLE_PACKAGES' => 'You can also select individual packages
to install from the list below.',
'yum_DESC_AVAILABLE_UPDATES' => 'The following updates are available for your system.
You should normally install all available updates.
If there are updates you do not wish to install, de-select
them from the list below.',
'yum_DESC_ENABLED_REPOSITORIES' => 'The software installer can install software
from any of enabled repositories. To enable
a repository, select it from the list.
To disable a repository, de-select it from the list.
By default, only stable, tested software is available
for installation.',
'yum_DESC_INSTALLED_GROUPS' => 'You can select software groups
to remove from the list below.',
'yum_DESC_INSTALLED_PACKAGES' => 'You can also select individual packages
you wish to remove from the list below.',
'yum_DESC_UPDATES_AVAILABLE' => 'There are updates available for your system. These updates
should be installed as soon as possible.',
'yum_DESC_UPTODATE' => 'All updates have been installed.',
'yum_DESC_YUM_AUTOINSTALLUPDATES' => 'If enabled this will take precedence over the simple check for updates notification and predownload features. Instead it will install the available updates from enabled repositories. For more information refer to yum and yum-cron manual page.',
'yum_DESC_YUM_DELTARPMPROCESS' => 'A deltarpm contains the difference between an old and a new version of a rpm,
which can save bandwith. The drawback is that update
operations consume considerably more CPU cycles',
'yum_DESC_YUM_DOWNLOADONLY' => 'The rpm updates can be downloaded during the night,
this will ease and give faster the yum update process
(only enabled repositories will be used).',
'yum_DESC_YUM_PACKAGEFUNCTIONS' => 'The software installer can manage groups of
related package or individual packages. By
default, only groups of packages are presented.
If you wish to manage individual packages,
enable this option. This should only be done
by experienced administrators.',
'yum_FORM_TITLE' => 'Software installer',
'yum_HEADER_AVAILABLE_SOFTWARE' => 'The following software is available to be installed
onto your system. You should only install additional
software onto this system if you are aware
of the consequences of doing so.',
'yum_HEADER_INSTALLED_SOFTWARE' => 'The following software is installed
on this system. You should only remove
software from this system if you are aware
of the consequences of doing so.',
'yum_HEADER_POSTUPGRADE_REQUIRED' => ' The system needs to be reconfigured
after adding or removing software,
or applying updates.
<p>
Please click on the Reconfigure button at the bottom of
this page to start the reconfiguration process.
<b>An automatic reboot will be
initiated as part of this reconfiguration process</b>
</p> ',
'yum_INSTALL_UPDATES' => 'Install selected updates',
'yum_LABEL_AVAILABLE_GROUPS' => 'Available groups',
'yum_LABEL_AVAILABLE_PACKAGES' => 'Available packages',
'yum_LABEL_AVAILABLE_UPDATES' => 'Updates available',
'yum_LABEL_ENABLED_REPOSITORIES' => 'Enabled repositories',
'yum_LABEL_INSTALLED_GROUPS' => 'Installed groups',
'yum_LABEL_INSTALLED_PACKAGES' => 'Installed packages',
'yum_LABEL_YUM_AUTOINSTALLUPDATES' => 'Automatically install updates',
'yum_LABEL_YUM_DELTARPMPROCESS' => 'Delta Rpm Update',
'yum_LABEL_YUM_DOWNLOADONLY' => 'Predownload updates',
'yum_LABEL_YUM_PACKAGEFUNCTIONS' => 'Manage individual packages',
'yum_LABEL_YUM_STATUS' => 'Check for updates',
'yum_SUCCESS' => 'The new settings have been saved.',
'yum_SYSTEM_BEING_RECONFIGURED' => 'Your system is being automatically rebooted to
complete the reconfiguraton process.',
'yum_TITLE_UPDATES_AVAILABLE' => 'Updates Available',
'yum_TITLE_UPTODATE' => 'This system is up to date.',
'yum_UPDATE_SUCCESS' => 'The requested changes have been successfully implemented.',