diff options
Diffstat (limited to 'frontends/etc')
| -rw-r--r-- | frontends/etc/acme-client.conf.tpl | 11 | ||||
| -rw-r--r-- | frontends/etc/relayd.conf.tpl | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/frontends/etc/acme-client.conf.tpl b/frontends/etc/acme-client.conf.tpl index 0c9671d..727e7fe 100644 --- a/frontends/etc/acme-client.conf.tpl +++ b/frontends/etc/acme-client.conf.tpl @@ -28,11 +28,12 @@ authority buypass-test { # Skip ipv4/ipv6 subdomains - they're included as SANs in parent cert next if $host =~ /^(ipv4|ipv6)\./; -%> -<% # Check if this host has ipv4/ipv6 subdomains that need to be included as SANs - my @alt_names; - # Don't add www prefix for f3s hosts - they don't have DNS records for www variants - unless (grep { $_ eq $host } @$f3s_hosts) { - push @alt_names, "www.$host"; +<% # Public DNS publishes www for every service. f3s hosts use the primary + # certificate for standby too (unlike other hosts, they do not get a + # separate standby certificate/keypair). + my @alt_names = ("www.$host"); + if (grep { $_ eq $host } @$f3s_hosts) { + push @alt_names, "standby.$host"; } for my $sub_host (@$acme_hosts) { if ($sub_host =~ /^(ipv4|ipv6)\.\Q$host\E$/) { diff --git a/frontends/etc/relayd.conf.tpl b/frontends/etc/relayd.conf.tpl index 8a53ed3..74a90f1 100644 --- a/frontends/etc/relayd.conf.tpl +++ b/frontends/etc/relayd.conf.tpl @@ -71,10 +71,8 @@ http protocol "https" { next if $host =~ /^(ipv4|ipv6)\./; -%> tls keypair <%= $host %> - <% unless (grep { $_ eq $host } @$f3s_hosts) { -%> tls keypair standby.<%= $host %> <% } -%> - <% } -%> tls keypair <%= $hostname.'.'.$domain -%> # Enable WebSocket support |