Update Letsencrypt templates

This commit is contained in:
John Crisp 2025-06-18 15:42:51 +02:00
parent 625855f87e
commit 9e05c8df28
5 changed files with 243 additions and 186 deletions

View File

@ -1,47 +1,64 @@
%# %#
%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43 %# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 15:22:43
%# %#
<div> <div>
<!-- reetp this isn't required? -->
<!--
<script> <script>
window.onload = function() { window.onload = function() {
SelectInput(); SelectInput();
}; };
</script> </script>
-->
% if (config->{debug} == 1) { % if (config->{debug} == 1) {
<pre> <pre>
%= dumper $lets_data <%= dumper $lets_data %>
</pre> </pre>
% } % }
% my $btn = l('lets_APPLY'); <!-- <form action="/smanager/letsencryptu" method="POST"> -->
%= form_for "letsencryptu" => (method => 'POST') => begin
% param 'trt' => $lets_data->{trt} unless param 'trt';
%= hidden_field 'trt' => $lets_data->{trt}
%# Inputs etc in here. %# Inputs etc in here.
<h1 class=""><%=l('lets_Check_all_domains')%></h1> <h1><%=l('lets_Check_all_domains')%></h1>
<h2 class=""><%=l('lets_Loop_through_checking_the_letsencrypt')%></h2> <br>
<span class=""> <h2><%=l('lets_Loop_through_checking_the_letsencrypt')%></h2>
%=l('lets_All_domains_check_result')
</span> <br>
<span class="">
% param 'AllDomainsCheck' => $lets_data->{AllDomainsCheck} unless param 'AllDomainsCheck'; <!-- results box-->
%= text_area 'AllDomainsCheck', cols=>40, rows=>10, Readonly=>'true'
</span><br> <div class="row g-3 align-items-center">
<div class="col-md-1">
<span class=""> %=l('lets_All_domains_check_result')
%my $back_text = l('lets_Back'); # Localized text </div>
%my $actionBack = qq{ <div class="col-auto">
% <a href="letsencryptd"> % param 'AllDomainsCheck' => $lets_data->{AllDomainsCheck} unless param 'AllDomainsCheck';
% <input class="" type='submit' value='$back_text'> %= text_area 'AllDomainsCheck', cols=>40, rows=>10, Readonly=>'true'
% </a> </div>
%}; </div>
<%= $c->render_to_string(inline => $actionBack) %>
</span> <br>
%# my $btn = l('lets_APPLY');
%# param 'trt' => $lets_data->{trt} unless param 'trt';
%#= hidden_field 'trt' => $lets_data->{trt}
% my $back_text = l('lets_Back'); # Localized text
<div class="row g-3 align-items-center">
<div class="col-md-2">
<!-- <a href='letsencryptd' class="btn btn-primary btn-sm" role="button"><%= $back_text %></a> -->
<a href='letsencrypt' class="btn btn-primary btn-sm" role="button"><%= $back_text %></a>
</div>
</div>
<!-- </form> -->
%# Probably finally by a submit.
%end
</div> </div>

View File

@ -56,8 +56,8 @@
<div class="row g-3 align-items-center"> <div class="row g-3 align-items-center">
<div class="col-md-2"> <div class="col-md-2">
<a href='letsencryptd' class="btn btn-primary btn-sm" role="button"><%= $back_text %></a> <!-- <a href='letsencryptd' class="btn btn-primary btn-sm" role="button"><%= $back_text %></a> -->
<a href='letsencrypt' class="btn btn-primary btn-sm" role="button"><%= $back_text %></a>
</div> </div>
</div> </div>

View File

@ -3,6 +3,8 @@
%# %#
<div> <div>
<!-- reetp this isn't required? -->
<!-- <!--
<script> <script>
window.onload = function() { window.onload = function() {
@ -11,9 +13,9 @@
</script> </script>
--> -->
% if (config->{debug} == 1) { % if (config->{debug} == 0) {
<pre> <pre>
%= dumper $lets_data <%= dumper $lets_data %>
</pre> </pre>
% } % }
@ -39,8 +41,11 @@
<%= l ('lets_Domains_name') %> <%= l ('lets_Domains_name') %>
</div> </div>
<div class="col-auto"> <div class="col-auto">
% param 'OneDomainToCheck' => $lets_data->{OneDomainToCheck} unless param 'OneDomainToCheck';
%= text_field 'OneDomainToCheck', size => '50', class => "" , pattern=>'.*' , placeholder=>'OneDomainToCheck', Readonly=>'true' <%= $lets_data->{OneDomainToCheck} %>
%# param 'OneDomainToCheck' => $lets_data->{OneDomainToCheck} unless param 'OneDomainToCheck';
%#= text_field 'OneDomainToCheck', size => '50', class => "" , pattern=>'.*' , placeholder=>'OneDomainToCheck', Readonly=>'true'
</div> </div>
</div> </div>
@ -50,12 +55,18 @@
<div class="row g-3 align-items-center"> <div class="row g-3 align-items-center">
<div class="col-md-1"> <div class="col-md-1">
<%= l ('lets_One_domain_check_result') %> <%= l ('lets_One_domain_check_result') %>
</div> </div>
<div class="col-auto"> <div class="col-md-auto">
% param 'OneDomainsCheck' => $lets_data->{OneDomainsCheck} unless param 'OneDomainsCheck'; <%= $lets_data->{OneDomainsCheck} %>
%= text_area 'OneDomainsCheck', cols=>40, rows=>10, Readonly=>'true'
</div> </div>
<div class="col-md-auto">
%# param 'OneDomainsCheck' => $lets_data->{OneDomainsCheck} unless param 'OneDomainsCheck';
%#= text_area 'OneDomainsCheck', cols=>40, rows=>10, Readonly=>'true'
</div>
</div> </div>
<br> <br>
@ -67,8 +78,8 @@
<div class="row g-3 align-items-center"> <div class="row g-3 align-items-center">
<div class="col-md-2"> <div class="col-md-2">
<a href='letsencryptd' class="btn btn-primary btn-sm" role="button"><%= $back_text %></a> <!-- <a href='letsencryptd' class="btn btn-primary btn-sm" role="button"><%= $back_text %></a> -->
<a href='letsencrypt' class="btn btn-primary btn-sm" role="button"><%= $back_text %></a>
</div> </div>
</div> </div>

View File

@ -25,184 +25,212 @@
<!-- <form action="/smanager/letsencryptu" method="POST"> --> <!-- <form action="/smanager/letsencryptu" method="POST"> -->
%# my $btn = l('lets_APPLY'); %# my $btn = l('lets_APPLY');
%# param 'trt' => $lets_data->{trt} unless param 'trt'; %# param 'trt' => $lets_data->{trt} unless param 'trt';
%#= hidden_field 'trt' => $lets_data->{trt} %#= hidden_field 'trt' => $lets_data->{trt}
% my $linkbtn = l ('MODIFY'); % my $modifybtn = l ('MODIFY');
% my $checkbtn = l ('lets_CHECK');
%# Inputs etc in here. <div class="row g-3 align-items-center">
%# reetp Needs some language translations? <div class="col-md-2">
<div class="row g-3 align-items-center"> <%= l('lets_CONFIG') %>
<div class="col-md-1"> </div>
<%= l('lets_CONFIG') %> <div class="col-md-1 text-center">
</div> <a href='letsencryptd?trt=PARAMS' class="btn btn-primary btn-sm" role="button"><%= $modifybtn %></a>
<div class="col-auto"> </div>
<a href='letsencryptd?trt=PARAMS' class="btn btn-outline-primary btn-sm" role="button"><%= $linkbtn %></a> </div>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%= l ('lets_CHECK_ALL_DOMAINS') %>
</div>
<div class="col-md-1 text-center">
<a href='letsencryptd?trt=CHECKALLDOMAINS' class="btn btn-primary btn-sm" role="button"><%= $checkbtn %></a>
</div>
</div>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-2">
<%= l ('lets_CHECK_ALL_ENABLED_DOMAINS') %>
</div>
<div class="col-md-1 text-center">
<a href='letsencryptd?trt=CHECKALLENABLEDDOMAINS' class="btn btn-primary btn-sm" role="button"><%= $checkbtn %></a>
</div> </div>
<br> <div>
%#= link_to l('lets_CONFIG'), 'letsencryptd?trt=PARAMS' , class=> 'link link2' <br>
<div class="row g-3 align-items-center"> <!--
<div class="col-md-1">
<%= l ('lets_CHECK_ALL_DOMAINS') %> <div class="row g-3 align-items-center">
</div> <div class="col-md-1 border text-center">
<div class="col-auto"> <%= l('lets_CONFIG') %>
<a href='letsencryptd?trt=CHECKALLDOMAINS' class="btn btn-outline-primary btn-sm" role="button"><%= $linkbtn %></a>
</div>
</div> </div>
<div class="col-md-2 border text-center">
%#= link_to l('lets_CHECK_ALL_DOMAINS'), 'letsencryptd?trt=CHECKALLDOMAINS' , class=> 'link link3' <%= l ('lets_CHECK_ALL_DOMAINS') %>
<br>
<div class="row g-3 align-items-center">
<div class="col-md-1">
<%= l ('lets_CHECK_ALL_ENABLED_DOMAINS') %>
</div>
<div class="col-auto">
<a href='letsencryptd?trt=CHECKALLENABLEDDOMAINS' class="btn btn-outline-primary btn-sm" role="button"><%= $linkbtn %></a>
</div>
</div> </div>
<div class="col-md-2 border text-center">
<%= l ('lets_CHECK_ALL_ENABLED_DOMAINS') %>
</div>
<div>
%#= link_to l('lets_CHECK_ALL_ENABLED_DOMAINS'), 'letsencryptd?trt=CHECKALLENABLEDDOMAINS' , class=> 'link link4' <div class="row g-3 align-items-center">
<div class="col-md-1 border text-center">
<a href='letsencryptd?trt=PARAMS' class="btn btn-outline-primary btn-sm" role="button"><%#= $linkbtn %></a>
</div>
<div class="col-md-2 border text-center">
<a href='letsencryptd?trt=CHECKALLDOMAINS' class="btn btn-outline-primary btn-sm" role="button"><%#= $linkbtn %></a>
</div>
<div class="col-md-2 border text-center">
<a href='letsencryptd?trt=CHECKALLENABLEDDOMAINS' class="btn btn-outline-primary btn-sm" role="button"><%#= $linkbtn %></a>
</div>
</div>
-->
<!-- </form> --> <!-- </form> -->
<br><br> <br><br>
<h2><%=l('lets_For_this_Server') %></h2> <h2><%=l('lets_For_this_Server') %></h2>
<br> <br>
<div class="row g-3 align-items-center"> <div class="row g-3 align-items-center">
<div class="col-md-1"> <div class="col-md-1">
<%= l ('lets_Internal_IP') %> <label for="inputInternalIP" class="col-form-label"><%= l ('lets_Internal_IP') %></label>
</div> </div>
<div class="col-auto"> <div class="col-auto">
% param 'InternalIP' => $lets_data->{InternalIP} unless param 'InternalIP'; % param 'InternalIP' => $lets_data->{InternalIP} unless param 'InternalIP';
%= text_field 'InternalIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'InternalIP', Readonly=>'true' <input type="text" name="InternalIP" id="inputInternalIP" class="form-control" aria-describedby="Disabled Internal IP" value="<%=$lets_data->{InternalIP}%>" disabled readonly>
</div> %#= text_field 'InternalIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'InternalIP', Readonly=>'true'
</div> </div>
</div>
<br> <br>
<div class="row g-3 align-items-center"> <div class="row g-3 align-items-center">
<div class="col-md-1"> <div class="col-md-1">
<%= l ('lets_External_Interface_IP') %> <label for="inputExternalIP" class="col-form-label"><%= l ('lets_External_Interface_IP') %></label>
</div> </div>
<div class="col-auto"> <div class="col-auto">
% param 'ExternalIP' => $lets_data->{ExternalIP} unless param 'ExternalIP'; % param 'ExternalIP' => $lets_data->{ExternalIP} unless param 'ExternalIP';
%= text_field 'ExternalIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'ExternalIP', Readonly=>'true' <input type="text" name="ExternalIP" id="inputExternalIP" class="form-control" aria-describedby="Disabled External Interface IP" value="<%=$lets_data->{ExternalIP}%>" disabled readonly>
</div> %#= text_field 'ExternalIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'ExternalIP', Readonly=>'true'
</div> </div>
</div>
<br> <br>
<div class="row g-3 align-items-center"> <div class="row g-3 align-items-center">
<div class="col-md-1"> <div class="col-md-1">
<%= l ('lets_Internet_IP') %> <label for="inputInternetIP" class="col-form-label"><%= l ('lets_Internet_IP') %></label>
</div> </div>
<div class="col-auto"> <div class="col-auto">
% param 'InternetIP' => $lets_data->{InternetIP} unless param 'InternetIP'; % param 'InternetIP' => $lets_data->{InternetIP} unless param 'InternetIP';
%= text_field 'InternetIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'InternetIP', Readonly=>'true' <input type="text" name="InternetIP" id="inputInternetIP" class="form-control" aria-describedby="Disabled Internet IP" value="<%=$lets_data->{InternetIP}%>" disabled readonly>
</div> %#= text_field 'InternetIP', size => '50', class => "" , pattern=>'.*' , placeholder=>'InternetIP', Readonly=>'true'
</div> </div>
</div>
<br><br> <br><br>
<h2><%=l('lets_Current_certificate_details') %></h2> <h2><%=l('lets_Current_certificate_details') %></h2>
<br> <br>
<div class="row g-3 align-items-center"> <div class="row g-3 align-items-center">
<div class="col-md-1"> <div class="col-md-1">
<%= l ('lets_Issuer') %> <label for="inputIssuer" class="col-form-label"><%= l ('lets_Issuer') %></label>
</div> </div>
<div class="col-auto"> <div class="col-auto">
% param 'Issuer' => $lets_data->{Issuer} unless param 'Issuer'; % param 'Issuer' => $lets_data->{Issuer} unless param 'Issuer';
%= text_field 'Issuer', size => '50', class => "" , pattern=>'.*' , placeholder=>'Issuer', Readonly=>'true' <input type="text" name="Issuer" id="inputIssuer" class="form-control" aria-describedby="Disabled Issuer" value="<%=$lets_data->{Issuer}%>" disabled readonly>
</div> %#= text_field 'Issuer', size => '50', class => "" , pattern=>'.*' , placeholder=>'Issuer', Readonly=>'true'
</div> </div>
</div>
<br> <br>
<div class="row g-3 align-items-center"> <div class="row g-3 align-items-center">
<div class="col-md-1"> <div class="col-md-1">
<%= l ('lets_Expiry') %> <label for="inputExpiry" class="col-form-label"><%= l ('lets_Expiry') %></label>
</div> </div>
<div class="col-auto"> <div class="col-auto">
% param 'Expiry' => $lets_data->{Expiry} unless param 'Expiry'; % param 'Expiry' => $lets_data->{Expiry} unless param 'Expiry';
%= text_field 'Expiry', size => '50', class => "" , pattern=>'.*' , placeholder=>'Expiry', Readonly=>'true' <input type="text" name="Expiry" id="inputExpiry" class="form-control" aria-describedby="Disabled Issuer" value="<%=$lets_data->{Expiry}%>" disabled readonly>
</div> %#= text_field 'Expiry', size => '50', class => "" , pattern=>'.*' , placeholder=>'Expiry', Readonly=>'true'
</div> </div>
</div>
<br> <br>
<div class="row g-3 align-items-center"> <div class="row g-3 align-items-center">
<div class="col-md-1"> <div class="col-md-1">
<%= l ('lets_Not_Before') %> <label for="inputNotBefore" class="col-form-label"><%= l ('lets_Not_Before') %></label>
</div> </div>
<div class="col-auto"> <div class="col-auto">
% param 'NotBefore' => $lets_data->{NotBefore} unless param 'NotBefore'; % param 'NotBefore' => $lets_data->{NotBefore} unless param 'NotBefore';
%= text_field 'NotBefore', size => '50', class => "" , pattern=>'.*' , placeholder=>'NotBefore', Readonly=>'true' <input type="text" name="NotBefore" id="inputNotBefore" class="form-control" aria-describedby="Disabled Not before" value="<%=$lets_data->{NotBefore}%>" disabled readonly>
</div> %#= text_field 'NotBefore', size => '50', class => "" , pattern=>'.*' , placeholder=>'NotBefore', Readonly=>'true'
</div> </div>
</div>
<br><br> <br><br>
<h2 class=""><%=l('lets_List_of_Domains_and_Hosts') %></h2> <h2 class=""><%=l('lets_List_of_Domains_and_Hosts') %></h2>
<br> <br>
% $linkbtn = l 'lets_CHECK'; <table class="table table-bordered">
<thead>
<table class="table table-bordered"> <tr table-head-row>
<thead> <th><%= l ('lets_Domain_name_/_HOSTNAME') %></th>
<tr table-head-row> <th><%= l ('lets_Brief_description') %></th>
<th><%= l ('lets_Domain_name_/_HOSTNAME') %></th> <th class="text-center"><%= l ('lets_Content') %></th>
<th><%= l ('lets_Brief_description') %></th> <th class="text-center"><%= l ('lets_LABEL_NAMESERVERS') %></th>
<th><%= l ('lets_Content') %></th> <th class="text-center"><%= l ('lets_LABEL_POINT') %></th>
<th><%= l ('lets_LABEL_NAMESERVERS') %></th> <th class="text-center"><%= l ('lets_LABEL_LECERT') %></th>
<th><%= l ('lets_LABEL_POINT') %></th> <th class="text-center"><%= l ('lets_IS_IN_CERT') %></th>
<th><%= l ('lets_LABEL_LECERT') %></th> <th class="text-center"><%= l ('lets_CHECK') %></th>
<th><%= l ('lets_IS_IN_CERT') %></th> </tr>
<th><%= l ('lets_CHECK') %></th> </thead>
</tr> <tbody>
</thead> % my $control_data = $c->stash('DomainList');
<tbody> % foreach my $row (@$control_data) {
% my $control_data = $c->stash('DomainList'); % my $link = $c->render_to_string(inline=>$row->{'Table1-CHECK'});
% foreach my $row (@$control_data) { % my $type = $c->render_to_string(inline=>$row->{'Table1-TYPE'});
% my $link = $c->render_to_string(inline=>$row->{'Table1-CHECK'}); <tr>
% my $type = $c->render_to_string(inline=>$row->{'Table1-TYPE'}); % if ($type eq "Domain\n"){
<tr> <td><%=$c->render_to_string(inline=>$row->{'Table1-Domain name / HOSTNAME'}) %></td>
% if ($type eq "Domain\n"){
<td><%=$c->render_to_string(inline=>$row->{'Table1-Domain name / HOSTNAME'}) %></td>
% }
% if ($type eq "Host\n") {
<td><i class="bi bi-arrow-return-right"> </i><%=$c->render_to_string(inline=>$row->{'Table1-Domain name / HOSTNAME'}) %></td>
% }
<td><%=$c->render_to_string(inline=>$row->{'Table1-Brief description'}) %></td>
<td><%=$c->render_to_string(inline=>$row->{'Table1-Content'}) %></td>
<td><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_NAMESERVERS'}) %></td>
<td><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_POINT'}) %></td>
<td><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_LECERT'}) %></td>
<td><%=$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>
% }
</tr>
% } % }
</tbody> % if ($type eq "Host\n") {
</table> <td><i class="bi bi-arrow-return-right"> </i><%=$c->render_to_string(inline=>$row->{'Table1-Domain name / HOSTNAME'}) %></td>
% }
<td ><%=$c->render_to_string(inline=>$row->{'Table1-Brief description'}) %></td>
<td class="text-center"><%=$c->render_to_string(inline=>$row->{'Table1-Content'}) %></td>
<td class="text-center"><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_NAMESERVERS'}) %></td>
<td class="text-center"><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_POINT'}) %></td>
<td class="text-center"><%=$c->render_to_string(inline=>$row->{'Table1-LABEL_LECERT'}) %></td>
<td class="text-center"><%=$c->render_to_string(inline=>$row->{'Table1-IS_IN_CERT'}) %></td>
% if ($link ne "") {
<td class="text-center"><a href= "<%= $link %>" class="btn btn-primary btn-sm" role="button" > <%= $checkbtn %></a></td>
% } else {
<td>&nbsp</td>
% }
</tr>
% }
</tbody>
</table>
</div> </div>

View File

@ -11,6 +11,7 @@
}; };
</script> </script>
--> -->
% if (config->{debug} == 1) { % if (config->{debug} == 1) {
<pre> <pre>
<%= dumper $lets_data %> <%= dumper $lets_data %>