Compare commits
No commits in common. "master" and "11_0-5_el8_sme" have entirely different histories.
master
...
11_0-5_el8
@ -237,7 +237,6 @@ sub get_data_for_panel_CHECKONEDOMAIN {
|
|||||||
# Get control data for table(s)
|
# Get control data for table(s)
|
||||||
# Define a constant hash for field name mapping
|
# Define a constant hash for field name mapping
|
||||||
use constant DomainList_FIELD_MAPPING => (
|
use constant DomainList_FIELD_MAPPING => (
|
||||||
'Table1-TYPE' => 'Type',
|
|
||||||
'Table1-Domain name / HOSTNAME' => 'Domain',
|
'Table1-Domain name / HOSTNAME' => 'Domain',
|
||||||
'Table1-Brief description' => 'Description',
|
'Table1-Brief description' => 'Description',
|
||||||
'Table1-Content' => 'Content',
|
'Table1-Content' => 'Content',
|
||||||
@ -247,7 +246,6 @@ use constant DomainList_FIELD_MAPPING => (
|
|||||||
'Table1-IS_IN_CERT' => 'isincert',
|
'Table1-IS_IN_CERT' => 'isincert',
|
||||||
'Table1-CHECK' => 'Check'
|
'Table1-CHECK' => 'Check'
|
||||||
|
|
||||||
|
|
||||||
#'target_field2' => 'source_field2',
|
#'target_field2' => 'source_field2',
|
||||||
# Add more mappings as needed
|
# Add more mappings as needed
|
||||||
);
|
);
|
||||||
@ -282,7 +280,7 @@ sub actual_DomainList {
|
|||||||
my $dname = $_->key;
|
my $dname = $_->key;
|
||||||
my $isincert = "N";
|
my $isincert = "N";
|
||||||
my $link = $c->create_link("letsencryptd", "CHECKONEDOMAIN", "");
|
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>";
|
#my $checklink = "<a href=''>check</a>";
|
||||||
$isincert = "Y" if (grep(/^$dname$/, @list));
|
$isincert = "Y" if (grep(/^$dname$/, @list));
|
||||||
@ -290,7 +288,6 @@ sub actual_DomainList {
|
|||||||
# domain
|
# domain
|
||||||
push @data,
|
push @data,
|
||||||
{
|
{
|
||||||
Type => "Domain",
|
|
||||||
Domain => $_->key,
|
Domain => $_->key,
|
||||||
$_->props,
|
$_->props,
|
||||||
letsencryptSSLcert => $le,
|
letsencryptSSLcert => $le,
|
||||||
@ -308,8 +305,7 @@ sub actual_DomainList {
|
|||||||
$isincert = "N";
|
$isincert = "N";
|
||||||
$isincert = "Y" if (grep(/^$hname$/, @list));
|
$isincert = "Y" if (grep(/^$hname$/, @list));
|
||||||
push @data, {
|
push @data, {
|
||||||
Type => "Host",
|
Domain => "--> " . $hname,
|
||||||
Domain => $hname,
|
|
||||||
$h->props,
|
$h->props,
|
||||||
Description => $h->prop('ExternalIP') || $h->prop('InternalIP') || "",
|
Description => $h->prop('ExternalIP') || $h->prop('InternalIP') || "",
|
||||||
Content => $h->prop('HostType'),
|
Content => $h->prop('HostType'),
|
||||||
|
@ -90,8 +90,6 @@
|
|||||||
|
|
||||||
<h2 class='subh4'><%=l('lets_List_of_Domains_and_Hosts')%></h2>
|
<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 ">
|
<br /><table class="sme-border TableSort sme-table tabl1 ">
|
||||||
<thead class='tabl1'>
|
<thead class='tabl1'>
|
||||||
<tr table-head-row>
|
<tr table-head-row>
|
||||||
@ -108,7 +106,6 @@
|
|||||||
<tbody class='tabl1'>
|
<tbody class='tabl1'>
|
||||||
% my $control_data = $c->stash('DomainList');
|
% my $control_data = $c->stash('DomainList');
|
||||||
% foreach my $row (@$control_data) {
|
% foreach my $row (@$control_data) {
|
||||||
% my $link = $c->render_to_string(inline=>$row->{'Table1-CHECK'});
|
|
||||||
<tr class='table-row'>
|
<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-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>
|
<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_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-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>
|
<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 class='sme-border table-col table-col-Table1-CHECK'><%=$c->render_to_string(inline=>$row->{'Table1-CHECK'})%></td>
|
||||||
<td><a href= "<%= $link %>" class="btn btn-outline-primary btn-sm" role="button" > <%= $linkbtn %></a></td>
|
|
||||||
% } else {
|
|
||||||
<td> </td>
|
|
||||||
% }
|
|
||||||
</tr>
|
</tr>
|
||||||
%}
|
%}
|
||||||
</tbody>
|
</tbody>
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
%define name smeserver-certificates
|
%define name smeserver-certificates
|
||||||
%define version 11.0
|
%define version 11.0
|
||||||
%define release 7
|
%define release 5
|
||||||
Summary: This is what smeserver-certificates does.
|
Summary: This is what smeserver-certificates does.
|
||||||
Name: %{name}
|
Name: %{name}
|
||||||
Version: %{version}
|
Version: %{version}
|
||||||
@ -25,13 +25,6 @@ AutoReqProv: no
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%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
|
* Wed Jun 11 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0-5.sme
|
||||||
- open esmith using UTF8 [SME: 13036]
|
- open esmith using UTF8 [SME: 13036]
|
||||||
rewrite smartmatches to grep
|
rewrite smartmatches to grep
|
||||||
|
Loading…
x
Reference in New Issue
Block a user