smeserver/smeserver-certificates
6
0
Fork 0
generated from smedev/Template-for-SMEServer-Core-Package
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: smeserver:master
Branches Tags
smeserver:master
smeserver:11_0-7_el8_sme
smeserver:11_0-6_el8_sme
smeserver:11_0-5_el8_sme
smeserver:11_0-4_el8_sme
smeserver:11_0-3_el8_sme
smeserver:11_0-2_el8_sme
smeserver:11_0-1_el8_sme
..
compare: smeserver:11_0-5_el8_sme
Branches Tags
smeserver:master
smeserver:11_0-7_el8_sme
smeserver:11_0-6_el8_sme
smeserver:11_0-5_el8_sme
smeserver:11_0-4_el8_sme
smeserver:11_0-3_el8_sme
smeserver:11_0-2_el8_sme
smeserver:11_0-1_el8_sme

No commits in common. "master" and "11_0-5_el8_sme" have entirely different histories.
master ... 11_0-5_el8

3 changed files with 4 additions and 22 deletions
Show Stats Expand all files Collapse all files

8
root/usr/share/smanager/lib/SrvMngr/Controller/Letsencrypt-Custom.pm
View File

@ -237,7 +237,6 @@ sub get_data_for_panel_CHECKONEDOMAIN {
# Get control data for table(s)
# Define a constant hash for field name mapping
use constant DomainList_FIELD_MAPPING => (
'Table1-TYPE' => 'Type',
'Table1-Domain name / HOSTNAME' => 'Domain',
'Table1-Brief description' => 'Description',
'Table1-Content' => 'Content',
@ -247,7 +246,6 @@ use constant DomainList_FIELD_MAPPING => (
'Table1-IS_IN_CERT' => 'isincert',
'Table1-CHECK' => 'Check'
#'target_field2' => 'source_field2',
# Add more mappings as needed
);
@ -282,7 +280,7 @@ sub actual_DomainList {
my $dname = $_->key;
my $isincert = "N";
my $link = $c->create_link("letsencryptd", "CHECKONEDOMAIN", "");
my $checklink = $link . "&CHECKONEDOMAIN=" . $_->key;
my $checklink = "<a href='" . $link . "&CHECKONEDOMAIN=" . $_->key . "'>" . $check . "</a>";
#my $checklink = "<a href=''>check</a>";
$isincert = "Y" if (grep(/^$dname$/, @list));
@ -290,7 +288,6 @@ sub actual_DomainList {
# domain
push @data,
{
Type => "Domain",
Domain => $_->key,
$_->props,
letsencryptSSLcert => $le,
@ -308,8 +305,7 @@ sub actual_DomainList {
$isincert = "N";
$isincert = "Y" if (grep(/^$hname$/, @list));
push @data, {
Type => "Host",
Domain => $hname,
Domain => "--> " . $hname,
$h->props,
Description => $h->prop('ExternalIP') || $h->prop('InternalIP') || "",
Content => $h->prop('HostType'),

9
root/usr/share/smanager/themes/default/templates/partials/_lets_LIST.html.ep
View File

@ -90,8 +90,6 @@
<h2 class='subh4'><%=l('lets_List_of_Domains_and_Hosts')%></h2>
% my $linkbtn = l 'lets_CHECK';
<br /><table class="sme-border TableSort sme-table tabl1 ">
<thead class='tabl1'>
<tr table-head-row>
@ -108,7 +106,6 @@
<tbody class='tabl1'>
% my $control_data = $c->stash('DomainList');
% foreach my $row (@$control_data) {
% my $link = $c->render_to_string(inline=>$row->{'Table1-CHECK'});
<tr class='table-row'>
<td class='sme-border table-col table-col-Table1-Domain name / HOSTNAME'><%=$c->render_to_string(inline=>$row->{'Table1-Domain name / HOSTNAME'})%></td>
<td class='sme-border table-col table-col-Table1-Brief description'><%=$c->render_to_string(inline=>$row->{'Table1-Brief description'})%></td>
@ -117,11 +114,7 @@
<td class='sme-border table-col table-col-Table1-LABEL_POINT'><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_POINT'})%></td>
<td class='sme-border table-col table-col-Table1-LABEL_LECERT'><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_LECERT'})%></td>
<td class='sme-border table-col table-col-Table1-IS_IN_CERT'><%=$c->render_to_string(inline=>$row->{'Table1-IS_IN_CERT'})%></td>
% if ($link ne "") {
<td><a href= "<%= $link %>" class="btn btn-outline-primary btn-sm" role="button" > <%= $linkbtn %></a></td>
% } else {
<td>&nbsp</td>
% }
<td class='sme-border table-col table-col-Table1-CHECK'><%=$c->render_to_string(inline=>$row->{'Table1-CHECK'})%></td>
</tr>
%}
</tbody>

9
smeserver-certificates.spec
View File

@ -1,6 +1,6 @@
%define name smeserver-certificates
%define version 11.0
%define release 7
%define release 5
Summary: This is what smeserver-certificates does.
Name: %{name}
Version: %{version}
@ -25,13 +25,6 @@ AutoReqProv: no
%changelog
* Fri Jun 27 2025 Brian Read <brianr@koozali.org> 11.0-7.sme
- Bring default theme into line with changes made for AdminLTE theme [SME: 13049]
* Tue Jun 17 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0-6.sme
- Remove formatting from controller file [SME: 13045]
- Add Domain/Host as Types for template checking [SME: 13045]
* Wed Jun 11 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0-5.sme
- open esmith using UTF8 [SME: 13036]
rewrite smartmatches to grep