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

Fix overwrete logic for files based on modified date. Rationalise perform logic routines

Browse Source
This commit is contained in:
Brian Read 2024-12-01 11:05:35 +00:00
parent ce91fbab45
commit bae566758c
12 changed files with 133 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

206
Targets/Letsencrypt/Letsencrypt-Custom.pm
View File

@ -1,5 +1,5 @@
# #
# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-11-16 10:30:16 # Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 10:58:16
# #
# #
# Routines to be edited by the developer to provide content and validation for parameters # Routines to be edited by the developer to provide content and validation for parameters
@ -53,6 +53,7 @@ our $ddb = esmith::DomainsDB->open() || die("Couldn't open Domains db");
my $prefix_data = shift; #Data hash as parameter my $prefix_data = shift; #Data hash as parameter
# Validation for each field # Validation for each field
my $ret = ""; my $ret = "";
if (! TRUE) #validate $c->param('status') if (! TRUE) #validate $c->param('status')
{$ret .= 'Validation for status failed';} {$ret .= 'Validation for status failed';}
if (! TRUE) #validate $c->param('hookScript') if (! TRUE) #validate $c->param('hookScript')
@ -117,20 +118,16 @@ our $ddb = esmith::DomainsDB->open() || die("Couldn't open Domains db");
sub get_data_for_panel_LIST { sub get_data_for_panel_LIST {
# Return a hash with the fields required which will be loaded into the shared data # Return a hash with the fields required which will be loaded into the shared data
my $c = shift; my $c = shift;
# my ($reply, $err, $server_cert) = Net::SSLeay::sslcat('localhost', 443, '/');
# my $issuer = Net::SSLeay::X509_NAME_oneline(Net::SSLeay::X509_get_issuer_name($server_cert));
# my $before = Net::SSLeay::P_ASN1_TIME_get_isotime(Net::SSLeay::X509_get_notBefore($server_cert));
# my $expiry = Net::SSLeay::P_ASN1_TIME_get_isotime(Net::SSLeay::X509_get_notAfter($server_cert));
my %ret = ( my %ret = (
'Data1'=>'Data for LIST', #Example 'Data1'=>'Data for LIST', #Example
# fields from Inputs in LIST $fields['LIST'] # fields from Inputs in LIST $fields['LIST']
'InternalIP'=>$cdb->get_prop('InternalInterface','IPAddress'), 'InternalIP'=>'InternalIP contents',
'ExternalIP'=>$cdb->get_prop('ExternalInterface','IPAddress'), 'ExternalIP'=>'ExternalIP contents',
'InternetIP'=>$c->get_my_ip(), 'InternetIP'=>'InternetIP contents',
'Issuer'=>'$issuer', 'Issuer'=>'Issuer contents',
'Expiry'=>'$expiry', 'Expiry'=>'Expiry contents',
'NotBefore'=>'$before', 'NotBefore'=>'NotBefore contents',
); );
return %ret; return %ret;
} }
@ -141,14 +138,15 @@ our $ddb = esmith::DomainsDB->open() || die("Couldn't open Domains db");
my %ret = ( my %ret = (
'Data1'=>'Data for PARAMS', #Example 'Data1'=>'Data for PARAMS', #Example
# fields from Inputs in PARAMS $fields['PARAMS'] # fields from Inputs in PARAMS $fields['PARAMS']
'status'=>$cdb->get_prop('letsencrypt', 'status', 'disabled'), 'status'=>'status contents',
'hookScript'=>$cdb->get_prop('letsencrypt', 'hookScript', 'disabled'), 'hookScript'=>'hookScript contents',
'hostOverride'=>$cdb->get_prop('letsencrypt', 'hostOverride', 'disabled'), 'hostOverride'=>'hostOverride contents',
'ACCEPT_TERMS'=>$cdb->get_prop('letsencrypt', 'ACCEPT_TERMS', ''), 'ACCEPT_TERMS'=>'ACCEPT_TERMS contents',
'API'=>$cdb->get_prop('letsencrypt', 'API', '2'), 'API'=>'API contents',
'keysize'=>$cdb->get_prop('letsencrypt', 'keysize', '4096'), 'keysize'=>'keysize contents',
'configure'=>$cdb->get_prop('letsencrypt', 'configure', 'none' ), 'configure'=>'configure contents',
'Email'=>$cdb->get_prop('letsencrypt', 'email') 'Email'=>'Email contents',
); );
return %ret; return %ret;
} }
@ -183,7 +181,7 @@ our $ddb = esmith::DomainsDB->open() || die("Couldn't open Domains db");
my %ret = ( my %ret = (
'Data1'=>'Data for CHECKONEDOMAIN', #Example 'Data1'=>'Data for CHECKONEDOMAIN', #Example
# fields from Inputs in CHECKONEDOMAIN $fields['CHECKONEDOMAIN'] # fields from Inputs in CHECKONEDOMAIN $fields['CHECKONEDOMAIN']
'OneDomainToCheck'=>$c->param("CHECKONEDOMAIN"), 'OneDomainToCheck'=>'OneDomainToCheck contents',
'OneDomainsCheck'=>'OneDomainsCheck contents', 'OneDomainsCheck'=>'OneDomainsCheck contents',
); );
@ -196,87 +194,32 @@ our $ddb = esmith::DomainsDB->open() || die("Couldn't open Domains db");
# 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-Domain name / HOSTNAME' => 'Domain', 'Table1-Domain name / HOSTNAME' => 'Source-for-Table1-Domain name / HOSTNAME',
'Table1-Brief description' => 'Description', 'Table1-Brief description' => 'Source-for-Table1-Brief description',
'Table1-Content' => 'Content', 'Table1-Content' => 'Source-for-Table1-Content',
'Table1-LABEL_NAMESERVERS' => 'Nameservers', 'Table1-LABEL_NAMESERVERS' => 'Source-for-Table1-LABEL_NAMESERVERS',
'Table1-LABEL_POINT' => 'Source-for-Table1-LABEL_POINT', 'Table1-LABEL_POINT' => 'Source-for-Table1-LABEL_POINT',
'Table1-LABEL_LECERT' => 'letsencryptSSLcert', 'Table1-LABEL_LECERT' => 'Source-for-Table1-LABEL_LECERT',
'Table1-IS_IN_CERT' => 'isincert', 'Table1-IS_IN_CERT' => 'Source-for-Table1-IS_IN_CERT',
'Table1-CHECK' => 'Check' 'Table1-CHECK' => 'Source-for-Table1-CHECK'
#'target_field2' => 'source_field2', #'target_field2' => 'source_field2',
# Add more mappings as needed # Add more mappings as needed
); );
use constant TEST_DOMAIN_LIST => (
{ "domain" => "Domain1","fred" => "fred1" , "description"=>"Description1"},
{ "domain" => "Domain2", "fred" => "fred2", "description"=>"Description2" },
{ "domain" => "Domain3", "fred" => "fred3", "description"=>"Description3" },
# Add more test entries as needed
);
sub actual_DomainList { sub actual_DomainList {
my $c = shift; my @ret = ();
# Actual code for extracting DomainList # Actual code for extracting DomainList
my @list = (); return @ret;
# my @rv = Net::SSLeay::X509_get_subjectAltNames($server_cert);
# foreach my $element (@rv) {
# next if $element =~ /^\d+$/; ;
# #print $element . "\n";
# push @list, $element;
# }
my @data = ();
my $check = $c->l('Check Domain');
for ($ddb->domains)
{
my $ns = $_->prop('Nameservers') || 'internet';
my $le = $_->prop('letsencryptSSLcert') || 'disabled';#letsencrypt configure all
my $dname= $_->key;
my $isincert = "N";
my $link = $c->create_link("letsencryptd","CHECKONEDOMAIN","");
my $checklink = "<a href='".$link."&CHECKONEDOMAIN=".$_->key."'>".$check."</a>";
#my $checklink = "<a href=''>check</a>";
$isincert = "Y" if ( $dname ~~ @list);
# domain
push @data,
{ Domain => $_->key,
$_->props,
letsencryptSSLcert => $le,
isincert => $isincert,
Check => $checklink,
Nameservers => $ns,
};
#and hosts
for my $h ($hdb->get_hosts_by_domain($dname))
{
next if $ddb->get($h->key);
next unless ($h->prop('HostType') eq "Self" || $h->prop('HostType') eq "Local");
$le = $h->prop('letsencryptSSLcert') || 'disabled';#letsencrypt configure all
$isincert = "N";
$isincert = "Y" if ( $h->key ~~ @list);
push @data,
{ Domain => "--> ". $h->key,
$h->props,
Description=>$h->prop('ExternalIP')|| $h->prop('InternalIP')||"",
Content => $h->prop('HostType'),
isincert => $isincert,
Check => "", #$checklink
Nameservers => $c->l($ns),
}
}
}
return @data;
} }
sub get_DomainList { sub get_DomainList {
# Return an array of hashes of the contents for each row and column for DomainList # Return an array of hashes of the contents for each row and column for DomainList
my $c = shift; my $c = shift;
my @source_records = $c->actual_DomainList(); #TEST_DOMAIN_LIST #Replace by code or call to produce contents of table; my @source_records = $c->actual_DomainList();
my @transformed_records; my @transformed_records;
my %Field_Mapping = DomainList_FIELD_MAPPING; my %Field_Mapping = DomainList_FIELD_MAPPING;
# Iterate over each record in the source array # Iterate over each record in the source array
for my $source_record (@source_records) { for my $source_record (@$source_records) {
my %transformed_record; my %transformed_record;
# Iterate over each key-value pair in the $Field_Mapping constant # Iterate over each key-value pair in the $Field_Mapping constant
while (my ($target, $source) = each %Field_Mapping) { while (my ($target, $source) = each %Field_Mapping) {
@ -343,19 +286,21 @@ sub get_DomainList {
my $c = shift; my $c = shift;
my $prefix_data = shift; #Data hash as parameter my $prefix_data = shift; #Data hash as parameter
my $ret = ""; my $ret = "";
my $db = $cdb; #maybe one of the others
my $dbkey = 'ChangeThis';
if (! TRUE) #copy or perform with value: InternalIP e.g. $c->setprop(dbentry,dbkey,$c->param('InternalIP') if (! TRUE) #copy or perform with value: InternalIP e.g. $c->setprop($db,$dbkey,$c->param('InternalIP')))
{$ret .= 'Perform failed for InternalIP failed';} {$ret .= 'Perform/save failed for InternalIP';}
if (! TRUE) #copy or perform with value: ExternalIP e.g. $c->setprop(dbentry,dbkey,$c->param('ExternalIP') if (! TRUE) #copy or perform with value: ExternalIP e.g. $c->setprop($db,$dbkey,$c->param('ExternalIP')))
{$ret .= 'Perform failed for ExternalIP failed';} {$ret .= 'Perform/save failed for ExternalIP';}
if (! TRUE) #copy or perform with value: InternetIP e.g. $c->setprop(dbentry,dbkey,$c->param('InternetIP') if (! TRUE) #copy or perform with value: InternetIP e.g. $c->setprop($db,$dbkey,$c->param('InternetIP')))
{$ret .= 'Perform failed for InternetIP failed';} {$ret .= 'Perform/save failed for InternetIP';}
if (! TRUE) #copy or perform with value: Issuer e.g. $c->setprop(dbentry,dbkey,$c->param('Issuer') if (! TRUE) #copy or perform with value: Issuer e.g. $c->setprop($db,$dbkey,$c->param('Issuer')))
{$ret .= 'Perform failed for Issuer failed';} {$ret .= 'Perform/save failed for Issuer';}
if (! TRUE) #copy or perform with value: Expiry e.g. $c->setprop(dbentry,dbkey,$c->param('Expiry') if (! TRUE) #copy or perform with value: Expiry e.g. $c->setprop($db,$dbkey,$c->param('Expiry')))
{$ret .= 'Perform failed for Expiry failed';} {$ret .= 'Perform/save failed for Expiry';}
if (! TRUE) #copy or perform with value: NotBefore e.g. $c->setprop(dbentry,dbkey,$c->param('NotBefore') if (! TRUE) #copy or perform with value: NotBefore e.g. $c->setprop($db,$dbkey,$c->param('NotBefore')))
{$ret .= 'Perform failed for NotBefore failed';} {$ret .= 'Perform/save failed for NotBefore';}
if ($ret eq "") {$ret = 'ok';} if ($ret eq "") {$ret = 'ok';}
return $ret; return $ret;
} }
@ -364,23 +309,25 @@ sub get_DomainList {
my $c = shift; my $c = shift;
my $prefix_data = shift; #Data hash as parameter my $prefix_data = shift; #Data hash as parameter
my $ret = ""; my $ret = "";
my $db = $cdb; #maybe one of the others
my $dbkey = 'ChangeThis';
if (! TRUE) #copy or perform with value: status e.g. $c->setprop(dbentry,dbkey,$c->param('status') if (! TRUE) #copy or perform with value: status e.g. $c->setprop($db,$dbkey,$c->param('status')))
{$ret .= 'Perform failed for status failed';} {$ret .= 'Perform/save failed for status';}
if (! TRUE) #copy or perform with value: hookScript e.g. $c->setprop(dbentry,dbkey,$c->param('hookScript') if (! TRUE) #copy or perform with value: hookScript e.g. $c->setprop($db,$dbkey,$c->param('hookScript')))
{$ret .= 'Perform failed for hookScript failed';} {$ret .= 'Perform/save failed for hookScript';}
if (! TRUE) #copy or perform with value: hostOverride e.g. $c->setprop(dbentry,dbkey,$c->param('hostOverride') if (! TRUE) #copy or perform with value: hostOverride e.g. $c->setprop($db,$dbkey,$c->param('hostOverride')))
{$ret .= 'Perform failed for hostOverride failed';} {$ret .= 'Perform/save failed for hostOverride';}
if (! TRUE) #copy or perform with value: ACCEPT_TERMS e.g. $c->setprop(dbentry,dbkey,$c->param('ACCEPT_TERMS') if (! TRUE) #copy or perform with value: ACCEPT_TERMS e.g. $c->setprop($db,$dbkey,$c->param('ACCEPT_TERMS')))
{$ret .= 'Perform failed for ACCEPT_TERMS failed';} {$ret .= 'Perform/save failed for ACCEPT_TERMS';}
if (! TRUE) #copy or perform with value: API e.g. $c->setprop(dbentry,dbkey,$c->param('API') if (! TRUE) #copy or perform with value: API e.g. $c->setprop($db,$dbkey,$c->param('API')))
{$ret .= 'Perform failed for API failed';} {$ret .= 'Perform/save failed for API';}
if (! TRUE) #copy or perform with value: keysize e.g. $c->setprop(dbentry,dbkey,$c->param('keysize') if (! TRUE) #copy or perform with value: keysize e.g. $c->setprop($db,$dbkey,$c->param('keysize')))
{$ret .= 'Perform failed for keysize failed';} {$ret .= 'Perform/save failed for keysize';}
if (! TRUE) #copy or perform with value: configure e.g. $c->setprop(dbentry,dbkey,$c->param('configure') if (! TRUE) #copy or perform with value: configure e.g. $c->setprop($db,$dbkey,$c->param('configure')))
{$ret .= 'Perform failed for configure failed';} {$ret .= 'Perform/save failed for configure';}
if (! TRUE) #copy or perform with value: Email e.g. $c->setprop(dbentry,dbkey,$c->param('Email') if (! TRUE) #copy or perform with value: Email e.g. $c->setprop($db,$dbkey,$c->param('Email')))
{$ret .= 'Perform failed for Email failed';} {$ret .= 'Perform/save failed for Email';}
if ($ret eq "") {$ret = 'ok';} if ($ret eq "") {$ret = 'ok';}
return $ret; return $ret;
} }
@ -389,9 +336,11 @@ sub get_DomainList {
my $c = shift; my $c = shift;
my $prefix_data = shift; #Data hash as parameter my $prefix_data = shift; #Data hash as parameter
my $ret = ""; my $ret = "";
my $db = $cdb; #maybe one of the others
my $dbkey = 'ChangeThis';
if (! TRUE) #copy or perform with value: AllDomainsCheck e.g. $c->setprop(dbentry,dbkey,$c->param('AllDomainsCheck') if (! TRUE) #copy or perform with value: AllDomainsCheck e.g. $c->setprop($db,$dbkey,$c->param('AllDomainsCheck')))
{$ret .= 'Perform failed for AllDomainsCheck failed';} {$ret .= 'Perform/save failed for AllDomainsCheck';}
if ($ret eq "") {$ret = 'ok';} if ($ret eq "") {$ret = 'ok';}
return $ret; return $ret;
} }
@ -400,9 +349,11 @@ sub get_DomainList {
my $c = shift; my $c = shift;
my $prefix_data = shift; #Data hash as parameter my $prefix_data = shift; #Data hash as parameter
my $ret = ""; my $ret = "";
my $db = $cdb; #maybe one of the others
my $dbkey = 'ChangeThis';
if (! TRUE) #copy or perform with value: EnabledDomainsCheck e.g. $c->setprop(dbentry,dbkey,$c->param('EnabledDomainsCheck') if (! TRUE) #copy or perform with value: EnabledDomainsCheck e.g. $c->setprop($db,$dbkey,$c->param('EnabledDomainsCheck')))
{$ret .= 'Perform failed for EnabledDomainsCheck failed';} {$ret .= 'Perform/save failed for EnabledDomainsCheck';}
if ($ret eq "") {$ret = 'ok';} if ($ret eq "") {$ret = 'ok';}
return $ret; return $ret;
} }
@ -411,11 +362,13 @@ sub get_DomainList {
my $c = shift; my $c = shift;
my $prefix_data = shift; #Data hash as parameter my $prefix_data = shift; #Data hash as parameter
my $ret = ""; my $ret = "";
my $db = $cdb; #maybe one of the others
my $dbkey = 'ChangeThis';
if (! TRUE) #copy or perform with value: OneDomainToCheck e.g. $c->setprop(dbentry,dbkey,$c->param('OneDomainToCheck') if (! TRUE) #copy or perform with value: OneDomainToCheck e.g. $c->setprop($db,$dbkey,$c->param('OneDomainToCheck')))
{$ret .= 'Perform failed for OneDomainToCheck failed';} {$ret .= 'Perform/save failed for OneDomainToCheck';}
if (! TRUE) #copy or perform with value: OneDomainsCheck e.g. $c->setprop(dbentry,dbkey,$c->param('OneDomainsCheck') if (! TRUE) #copy or perform with value: OneDomainsCheck e.g. $c->setprop($db,$dbkey,$c->param('OneDomainsCheck')))
{$ret .= 'Perform failed for OneDomainsCheck failed';} {$ret .= 'Perform/save failed for OneDomainsCheck';}
if ($ret eq "") {$ret = 'ok';} if ($ret eq "") {$ret = 'ok';}
return $ret; return $ret;
} }
@ -427,11 +380,4 @@ sub create_link{
my $link = "$route?trt=$panel&Selected=$index"; my $link = "$route?trt=$panel&Selected=$index";
return $link; return $link;
} }
sub get_my_ip
{
my ($self, $item, $prop, $default) = @_;
my $output = `/usr/sbin/e-smith/getmyip`;
return $output || "IP";
}
1; 1;

2
Targets/Letsencrypt/Letsencrypt.pm
View File

@ -1,6 +1,6 @@
package SrvMngr::Controller::Letsencrypt; package SrvMngr::Controller::Letsencrypt;
# #
# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-11-29 15:59:19 # Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 10:58:16
# #
#---------------------------------------------------------------------- #----------------------------------------------------------------------
# heading : Network # heading : Network

2
Targets/Letsencrypt/_lets_CHECKALLDOMAINS.html.ep
View File

@ -1,5 +1,5 @@
%# %#
%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-11-29 15:59:19 %# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 10:58:16
%# %#
<div id="Letsencrypt-CHECKALLDOMAINS" class="partial Letsencrypt-CHECKALLDOMAINS"> <div id="Letsencrypt-CHECKALLDOMAINS" class="partial Letsencrypt-CHECKALLDOMAINS">
<script> <script>

2
Targets/Letsencrypt/_lets_CHECKALLENABLEDDOMAINS.html.ep
View File

@ -1,5 +1,5 @@
%# %#
%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-11-29 15:59:19 %# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 10:58:16
%# %#
<div id="Letsencrypt-CHECKALLENABLEDDOMAINS" class="partial Letsencrypt-CHECKALLENABLEDDOMAINS"> <div id="Letsencrypt-CHECKALLENABLEDDOMAINS" class="partial Letsencrypt-CHECKALLENABLEDDOMAINS">
<script> <script>

2
Targets/Letsencrypt/_lets_CHECKONEDOMAIN.html.ep
View File

@ -1,5 +1,5 @@
%# %#
%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-11-29 15:59:19 %# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 10:58:16
%# %#
<div id="Letsencrypt-CHECKONEDOMAIN" class="partial Letsencrypt-CHECKONEDOMAIN"> <div id="Letsencrypt-CHECKONEDOMAIN" class="partial Letsencrypt-CHECKONEDOMAIN">
<script> <script>

2
Targets/Letsencrypt/_lets_LIST.html.ep
View File

@ -1,5 +1,5 @@
%# %#
%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-11-29 15:59:19 %# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 10:58:16
%# %#
<div id="Letsencrypt-LIST" class="partial Letsencrypt-LIST"> <div id="Letsencrypt-LIST" class="partial Letsencrypt-LIST">
<script> <script>

2
Targets/Letsencrypt/_lets_PARAMS.html.ep
View File

@ -1,5 +1,5 @@
%# %#
%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-11-29 15:59:19 %# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 10:58:16
%# %#
<div id="Letsencrypt-PARAMS" class="partial Letsencrypt-PARAMS"> <div id="Letsencrypt-PARAMS" class="partial Letsencrypt-PARAMS">
<script> <script>

38
Targets/Letsencrypt/letsencrypt.css
View File

@ -1,5 +1,5 @@
/* /*
Generated by SM2Gen version: SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-11-17 14:48:52 Generated by SM2Gen version: SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 10:58:16
*/ */
.Letsencrypt-panel {} .Letsencrypt-panel {}
.name {} .name {}
@ -54,39 +54,3 @@ tbody .tabl1 {}
.read1 {} .read1 {}
.text2 {} .text2 {}
.back3 {} .back3 {}
.inline-buttons {
display: flex; /* Use flexbox to arrange items horizontally */
gap: 10px; /* Optional: Add space between buttons */
}
.inline-buttons .link {
/* Additional styling can be added here if needed */
}
.inline-buttons .link {
display: inline-block; /* Keep links as inline-block for button shape */
padding: 7px 14px; /* Adjusted padding to approximate 70% of the original */
margin: 0; /* Remove margin */
background-color: #efefef; /* Light gray background color */
color: black; /* Text color */
text-decoration: none; /* Remove underline */
border: 2px solid #bbb; /* Thin, light gray border */
border-radius: 3px; /* Slightly rounded corners */
font-size: 11.2px; /* Adjusted font size to approximate 70% of the original */
text-align: center; /* Center the text */
cursor: pointer; /* Pointer cursor on hover */ }
/* Hover and active effects for better interaction */
.inline-buttons .link:hover {
background-color: #d9d9d9; /* Darker shade on hover */
}
.inline-buttons .link:active {
background-color: #c0c0c0; /* Even darker shade on click */
}
span .label {
padding-top:13em;
}

2
Targets/Letsencrypt/letsencrypt.html.ep
View File

@ -1,5 +1,5 @@
%# %#
%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-11-29 15:59:19 %# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 10:58:16
%# %#
% layout 'default', title => "Sme server 2 - Letsencrypt certificate", share_dir => './'; % layout 'default', title => "Sme server 2 - Letsencrypt certificate", share_dir => './';
%# css specific to this panel: %# css specific to this panel:

86
Targets/Letsencrypt/letsencrypt_en.lex
View File

@ -1,54 +1,54 @@
# #
# Generated by SM2Gen version: SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-11-29 15:59:19 # Generated by SM2Gen version: SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-12-01 10:58:16
# #
'lets_CONFIG_LETSENCRYPT' => 'confirm Letsencrypt', 'lets_API_STATUS' => 'ape Status',
'lets_SERVICE_STATUS' => 'Service Status',
'lets_Expiry' => 'Expiry',
'lets_CONFIG' => 'Config',
'lets_CONFIGUREMODE_STATUS' => 'Configuremode Status',
'lets_Domain_name_/_HOSTNAME' => 'Domain name / HOSTNAME',
'lets_LABEL_POINT' => 'Label Point',
'lets_Brief_description' => 'Brief description',
'lets_Manage_letsencrypt-config_settings:' => 'Manage letsencrypt-config settings',
'lets_Loop_through_checking_the_letsencrypt' => 'Loop through checking the letsencrypt status for a specific domain',
'lets_Check_just_one_domain' => 'Check just one domain',
'lets_List_of_Domains_and_Hosts' => 'List of Domains and Hosts',
'lets_Save' => 'Save',
'lets_Status_Report' => 'Status Report', 'lets_Status_Report' => 'Status Report',
'lets_Check_all_enabled_domains' => 'Check all enabled domains',
'lets_One_domain_check_result' => 'One domain check result', 'lets_One_domain_check_result' => 'One domain check result',
'lets_CHECK' => 'Check', 'lets_Expiry' => 'Expiry',
'lets_PARAMS_panel_action_was_successful' => 'PARAMS panel action was successful',
'lets_IS_IN_CERT' => 'Is In cart',
'lets_External_Interface_IP' => 'External Interface IP', 'lets_External_Interface_IP' => 'External Interface IP',
'lets_APPLY' => 'Apply',
'lets_CHECKALLDOMAINS_panel_action_was_successful' => 'CHECKALLDOMAINS panel action was successful', 'lets_CHECKALLDOMAINS_panel_action_was_successful' => 'CHECKALLDOMAINS panel action was successful',
'lets_CHECK_ALL_ENABLED_DOMAINS' => 'Check All Enabled Domains', 'lets_CHECK_ALL_ENABLED_DOMAINS' => 'Check All Enabled Domains',
'lets_Issuer' => 'Issuer',
'lets_Check_all_domains' => 'Check all domains',
'lets_Current_certificate_details' => 'Current certificate details',
'lets_CHECKALLENABLEDDOMAINS_panel_action_was_successful' => 'CHECKALLENABLEDDOMAINS panel action was successful',
'lets_Internet_IP' => 'Internet IP',
'lets_CHECK_ALL_DOMAINS' => 'Check All Domains',
'lets_HOSTOVERRIDE_STATUS' => 'Hostoverride Status',
'lets_EMAIL' => 'Email', 'lets_EMAIL' => 'Email',
'lets_HOOKSCRIPT_STATUS' => 'Hookscript Status', 'lets_Check_just_one_domain' => 'Check just one domain',
'lets_Check_all_enabled_domains' => 'Check all enabled domains',
'lets_Content' => 'Content',
'lets_Back' => 'Back',
'lets_Domains_name' => 'Domains name',
'lets_Internal_IP' => 'Internal IP',
'lets_For_this_Server' => 'For this Server',
'lets_LIST_panel_action_was_successful' => 'LIST panel action was successful',
'lets_LABEL_LECERT' => 'Label secret',
'lets_CHECKONEDOMAIN_panel_action_was_successful' => 'CHECKONEDOMAIN panel action was successful',
'lets_ACCEPT_TERMS_STATUS' => 'Accept Terms Status',
'lets_Loop_through_checking_the_letsencrypt' => 'Loop through checking the letsencrypt status for each configured domain',
'lets_IS_IN_CERT' => 'Is In cart',
'lets_Not_Before' => 'Not Before', 'lets_Not_Before' => 'Not Before',
'lets_All_domains_check_result' => 'All domains check result', 'lets_APPLY' => 'Apply',
'lets_API_STATUS' => 'ape Status', 'lets_CONFIG_LETSENCRYPT' => 'confirm Letsencrypt',
'lets_Error_Status_Report' => 'Error Status Report', 'lets_Back' => 'Back',
'lets_PARAMS_panel_action_was_successful' => 'PARAMS panel action was successful', 'lets_Content' => 'Content',
'lets_Letsencrypt_certificate' => 'Letsencrypt certificate', 'lets_CHECKALLENABLEDDOMAINS_panel_action_was_successful' => 'CHECKALLENABLEDDOMAINS panel action was successful',
'lets_LABEL_NAMESERVERS' => 'Label timeservers',
'lets_KEYSIZE_STATUS' => 'Keysize Status',
'lets_Loop_through_checking_the_letsencrypt' => 'Loop through checking the letsencrypt status for each configured domain which is enabled', 'lets_Loop_through_checking_the_letsencrypt' => 'Loop through checking the letsencrypt status for each configured domain which is enabled',
'lets_LABEL_NAMESERVERS' => 'Label timeservers',
'lets_Manage_letsencrypt-config_settings:' => 'Manage letsencrypt-config settings',
'lets_Loop_through_checking_the_letsencrypt' => 'Loop through checking the letsencrypt status for each configured domain',
'lets_CONFIG' => 'Config',
'lets_Domains_name' => 'Domains name',
'lets_Save' => 'Save',
'lets_All_domains_check_result' => 'All domains check result',
'lets_Current_certificate_details' => 'Current certificate details',
'lets_CONFIGUREMODE_STATUS' => 'Configuremode Status',
'lets_Internal_IP' => 'Internal IP',
'lets_HOOKSCRIPT_STATUS' => 'Hookscript Status',
'lets_Issuer' => 'Issuer',
'lets_SERVICE_STATUS' => 'Service Status',
'lets_Check_all_domains' => 'Check all domains',
'lets_Letsencrypt_certificate' => 'Letsencrypt certificate',
'lets_Error_Status_Report' => 'Error Status Report',
'lets_CHECKONEDOMAIN_panel_action_was_successful' => 'CHECKONEDOMAIN panel action was successful',
'lets_For_this_Server' => 'For this Server',
'lets_Loop_through_checking_the_letsencrypt' => 'Loop through checking the letsencrypt status for a specific domain',
'lets_CHECK_ALL_DOMAINS' => 'Check All Domains',
'lets_LIST_panel_action_was_successful' => 'LIST panel action was successful',
'lets_Domain_name_/_HOSTNAME' => 'Domain name / HOSTNAME',
'lets_CHECK' => 'Check',
'lets_LABEL_LECERT' => 'Label secret',
'lets_LABEL_POINT' => 'Label Point',
'lets_List_of_Domains_and_Hosts' => 'List of Domains and Hosts',
'lets_KEYSIZE_STATUS' => 'Keysize Status',
'lets_Internet_IP' => 'Internet IP',
'lets_ACCEPT_TERMS_STATUS' => 'Accept Terms Status',
'lets_Enabled_domains_check_result' => 'Enabled domains check result', 'lets_Enabled_domains_check_result' => 'Enabled domains check result',
'lets_HOSTOVERRIDE_STATUS' => 'Hostoverride Status',
'lets_Brief_description' => 'Brief description',

6
Templates/custom.pm.tem
View File

@ -113,9 +113,11 @@ sub get_${tablecontrol[0]} {
my $c = shift; my $c = shift;
my $prefix_data = shift; #Data hash as parameter my $prefix_data = shift; #Data hash as parameter
my $ret = ""; my $ret = "";
my $db = $cdb; #maybe one of the others
my $dbkey = 'ChangeThis';
<tal:block tal:repeat="field fields[panel]"> <tal:block tal:repeat="field fields[panel]">
if (! TRUE) #copy or perform with value: ${field} e.g. $c->setprop(dbentry,dbkey,$c->param('${field}'))) if (! TRUE) #copy or perform with value: ${field} e.g. $c->setprop($db,$dbkey,$c->param('${field}')))
{$ret .= 'Perform failed for ${field} failed';}</tal:block> {$ret .= 'Perform/save failed for ${field}';}</tal:block>
if ($ret eq "") {$ret = 'ok';} if ($ret eq "") {$ret = 'ok';}
return $ret; return $ret;
} }

3
sm2gen.py
View File

@ -393,7 +393,7 @@ def check_file_version(filename,force_Files=False):
# #
if force_Files: if force_Files:
return filename return filename
ThresholdSecs = 3 #allow secs since creation date before treat as changed. ThresholdSecs = 70 #allow secs since creation date before treat as changed.
try: try:
with open(filename, 'r') as file: with open(filename, 'r') as file:
# Read the first three lines # Read the first three lines
@ -419,6 +419,7 @@ def check_file_version(filename,force_Files=False):
# Get the last modified time of the file, ignoring milliseconds # Get the last modified time of the file, ignoring milliseconds
file_modified_time = datetime.fromtimestamp(os.path.getmtime(filename)).replace(microsecond=0) file_modified_time = datetime.fromtimestamp(os.path.getmtime(filename)).replace(microsecond=0)
logger.debug(f"{filename} - created:{timestamp_str} - modified:{file_modified_time.strftime('%Y-%m-%d %H:%M:%S')}")
# Compare the timestamps # Compare the timestamps
if file_modified_time > file_timestamp: if file_modified_time > file_timestamp: