michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 08:40:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Don't update let's encrypt account with domain's email address https://forum.virtualmin.com/t/stop-updating-lets-encrypt-contact-email/111731

Browse Source
This commit is contained in:
Jamie Cameron
2021-08-08 20:50:41 -07:00
parent a87791e479
commit f2953c81f9
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
webmin/letsencrypt-lib.pl
View File

@@ -55,13 +55,13 @@ return &software::missing_install_link(
}
# request_letsencrypt_cert(domain|&domains, webroot, [email], [keysize],
# [request-mode], [use-staging])
# [request-mode], [use-staging], [account-email])
# Attempt to request a cert using a generated key with the Let's Encrypt client
# command, and write it to the given path. Returns a status flag, and either
# an error message or the paths to cert, key and chain files.
sub request_letsencrypt_cert
{
my ($dom, $webroot, $email, $size, $mode, $staging) = @_;
my ($dom, $webroot, $email, $size, $mode, $staging, $account_email) = @_;
my @doms = ref($dom) ? @$dom : ($dom);
$email ||= "root\@$doms[0]";
$mode ||= "web";
@@ -243,9 +243,13 @@ if ($letsencrypt_cmd) {
&set_ownership_permissions(undef, undef, 0600, $chain);
&cleanup_wellknown($wellknown_new, $challenge_new);
# Attempt to update the contact email on file with let's encrypt
&system_logged("$letsencrypt_cmd register --update-registration".
" --email ".quotemeta($email)." >/dev/null 2>&1 </dev/null");
if ($account_email) {
# Attempt to update the contact email on file with let's encrypt
&system_logged(
"$letsencrypt_cmd register --update-registration".
" --email ".quotemeta($account_email).
" >/dev/null 2>&1 </dev/null");
}
return (1, $cert, $key, $chain);
}