Skip to content

Commit

Permalink
Don't copy new cert to webmin/etc after domain creation unless it was…
Browse files Browse the repository at this point in the history
… from Let's Encrypt virtualmin/virtualmin-pro#7
  • Loading branch information
jcameron committed Sep 12, 2021
1 parent b09b621 commit c8b0e02
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions virtual-server-lib-funcs.pl
Original file line number Diff line number Diff line change
Expand Up @@ -7963,9 +7963,9 @@ sub create_virtual_server
# If an SSL cert wasn't generated because SSL wasn't enabled, do one now
my $always_ssl = defined($dom->{'always_ssl'}) ? $dom->{'always_ssl'}
: $config{'always_ssl'};
my $generated;
my $generated = 0;
if (!&domain_has_ssl($dom) && $always_ssl) {
$generated = &generate_default_certificate($dom);
$generated = &generate_default_certificate($dom) ? 1 : 0;
}

# Attempt to request a let's encrypt cert. This has to be done after the
Expand All @@ -7979,13 +7979,13 @@ sub create_virtual_server
my $info = &cert_info($dom);
if ($info->{'self'}) {
&create_initial_letsencrypt_cert($dom, 1);
$generated++;
$generated = 2;
}
}

# Update service certs and DANE DNS records if a new Let's Encrypt cert was
# generated
if ($generated && !$dom->{'no_default_service_certs'}) {
if ($generated == 2 && !$dom->{'no_default_service_certs'}) {
&enable_domain_service_ssl_certs($dom);
&sync_domain_tlsa_records($dom);
}
Expand Down

0 comments on commit c8b0e02

Please sign in to comment.