github-featured/webmin--webmin
2
0
Fork 0
Code Issues Pull Requests Deployments Models Agent Notes Packages Projects Releases Wiki Activity

Fix output

Browse Source
This commit is contained in:
Ilia Ross
2026-06-27 23:45:31 +02:00
parent fa06c02be5
commit 2579cf54d9
2 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webmin/lang/en
+4 -4
View File
@@ -447,7 +447,7 @@ ssl_letsrenew_days=days
ssl_letsnotrenew=Only renew manually
ssl_staging=Provider server
ssl_staging0=Production
ssl_staging1=Staging (test only)
ssl_staging1=Test endpoint
ssl_acmeopts=Provider settings
ssl_acmeextra=Show advanced settings
ssl_acmedir=Custom ACME directory URL
@@ -1262,13 +1262,13 @@ letsencrypt_doing=Requesting a new certificate for $1, using the website directo
letsencrypt_doingdns=Requesting a new certificate for $1, using DNS validation ..
letsencrypt_doingcertbot=Requesting a new certificate for $1, using the Certbot webserver ..
letsencrypt_failed=.. request failed : $1
letsencrypt_done=.. request succeeded!
letsencrypt_show=The new certificate and private key were written to the following files :
letsencrypt_done=.. done
letsencrypt_show=The new certificate and private key were written to the following files:
letsencrypt_cert=SSL certificate
letsencrypt_key=SSL private key
letsencrypt_chain=Chained CA certificate
letsencrypt_webmin=Configuring Webmin to use new cert and key ..
letsencrypt_wdone=.. done!
letsencrypt_wdone=.. done
letsencrypt_eaccountkey=Failed to generate account key : $1
letsencrypt_etiny=Failed to request certificate : $1
letsencrypt_echain=Failed to download chained certificate : $1
webmin/letsencrypt.cgi
+19 -10
View File
@@ -132,7 +132,7 @@ else {
$mode eq 'certbot' ? 'letsencrypt_doingcertbot' :
'letsencrypt_doing',
"<tt>".&html_escape(join(", ", @doms))."</tt>",
"<tt>".&html_escape($webroot)."</tt>"),"<p>\n";
"<tt>".&html_escape($webroot)."</tt>"),"<br>\n";
my ($ok, $cert, $key, $chain) = &request_letsencrypt_cert(
\@doms, $webroot, undef, $size, $mode, $in{'staging'},
undef, undef, undef, $in{'directory_url'},
@@ -142,7 +142,20 @@ else {
}
else {
# Worked, now copy to Webmin
print $text{'letsencrypt_done'},"<p>\n";
my @grid = ( $text{'letsencrypt_cert'}, $cert,
$text{'letsencrypt_key'}, $key );
push(@grid, $text{'letsencrypt_chain'}, $chain) if ($chain);
my $details = &html_escape($text{'letsencrypt_show'})."<p>\n".
&ui_grid_table(\@grid, 2);
print &ui_details({
'html' => 1,
'title' => &ui_tag('span',
&html_escape($text{'letsencrypt_done'}),
{ 'data-second-print' => undef }),
'content' => $details,
'class' => 'inline inlined',
});
print "<div data-x-br=\"\"></div>\n";
# Save the renewal schedule
&save_renewal_only(\@doms, $webroot, $mode,
@@ -183,15 +196,11 @@ else {
&webmin_log("letsencrypt");
&restart_miniserv(1);
print $text{'letsencrypt_wdone'},"<p>\n";
print &ui_tag('span',
&html_escape($text{'letsencrypt_wdone'}),
{ 'data-second-print' => undef });
print "<br><div data-x-br=\"\"></div>\n";
}
# Tell the user what was done
print $text{'letsencrypt_show'},"<p>\n";
my @grid = ( $text{'letsencrypt_cert'}, $cert,
$text{'letsencrypt_key'}, $key );
push(@grid, $text{'letsencrypt_chain'}, $chain) if ($chain);
print &ui_grid_table(\@grid, 2);
}
&ui_print_footer("", $text{'index_return'});