Skip to content
Snippets Groups Projects
Verified Commit 323e01d2 authored by Kristian Klausen's avatar Kristian Klausen :tada:
Browse files

Merge branch 'mirrors-http3' into 'master'

Enable HTTP/3 for the mirrors

See merge request !872
parents 4cd41490 84421e62
No related branches found
No related tags found
1 merge request!872Enable HTTP/3 for the mirrors
Pipeline #108632 passed
...@@ -3,3 +3,5 @@ archweb_db_host: "{{ hostvars['archlinux.org']['wireguard_address'] }}" ...@@ -3,3 +3,5 @@ archweb_db_host: "{{ hostvars['archlinux.org']['wireguard_address'] }}"
# raise tcp window limits to 32MiB # raise tcp window limits to 32MiB
tcp_rmem: "10240 87380 33554432" tcp_rmem: "10240 87380 33554432"
tcp_wmem: "10240 87380 33554432" tcp_wmem: "10240 87380 33554432"
nginx_enable_http3: true
...@@ -24,6 +24,17 @@ domains: ...@@ -24,6 +24,17 @@ domains:
AAAA "ifurlup('https://{{ domain }}{{ geo_options[domain]['health_check_path'] | default('/') }}', AAAA "ifurlup('https://{{ domain }}{{ geo_options[domain]['health_check_path'] | default('/') }}',
{'{{ hosts | map('extract', hostvars, ['ipv6_address']) | join("', '") }}'}, {'{{ hosts | map('extract', hostvars, ['ipv6_address']) | join("', '") }}'},
{selector='pickclosest', useragent='pdns on {{ inventory_hostname }}'})" {selector='pickclosest', useragent='pdns on {{ inventory_hostname }}'})"
- lua:
ttl: 300
content: >
HTTPS "'1 . alpn=h2,h3 ipv4hint=' ..
ifurlup('https://{{ domain }}{{ geo_options[domain]['health_check_path'] | default('/') }}',
{'{{ hosts | map('extract', hostvars, ['ipv4_address']) | join("', '") }}'},
{selector='pickclosest', useragent='pdns on {{ inventory_hostname }}'})[1] ..
' ipv6hint=' ..
ifurlup('https://{{ domain }}{{ geo_options[domain]['health_check_path'] | default('/') }}',
{'{{ hosts | map('extract', hostvars, ['ipv6_address']) | join("', '") }}'},
{selector='pickclosest', useragent='pdns on {{ inventory_hostname }}'})[1]"
_acme-challenge.{{ domain }}: _acme-challenge.{{ domain }}:
- ns: {{ geo_acme_dns_challenge_ns }} - ns: {{ geo_acme_dns_challenge_ns }}
{% endfor %} {% endfor %}
...@@ -97,8 +97,10 @@ blackbox_targets: ...@@ -97,8 +97,10 @@ blackbox_targets:
- lists.archlinux.org:25 - lists.archlinux.org:25
geo_dns_geo.mirror.pkgbuild.com_a: "{{ groups['geo_mirrors'] }}" geo_dns_geo.mirror.pkgbuild.com_a: "{{ groups['geo_mirrors'] }}"
geo_dns_geo.mirror.pkgbuild.com_aaaa: "{{ groups['geo_mirrors'] }}" geo_dns_geo.mirror.pkgbuild.com_aaaa: "{{ groups['geo_mirrors'] }}"
geo_dns_geo.mirror.pkgbuild.com_https: "{{ groups['geo_mirrors'] }}"
geo_dns_riscv.mirror.pkgbuild.com_a: "{{ groups['geo_mirrors'] }}" geo_dns_riscv.mirror.pkgbuild.com_a: "{{ groups['geo_mirrors'] }}"
geo_dns_riscv.mirror.pkgbuild.com_aaaa: "{{ groups['geo_mirrors'] }}" geo_dns_riscv.mirror.pkgbuild.com_aaaa: "{{ groups['geo_mirrors'] }}"
geo_dns_riscv.mirror.pkgbuild.com_https: "{{ groups['geo_mirrors'] }}"
matrix_metrics_endpoints: matrix_metrics_endpoints:
- homeserver - homeserver
- appservice - appservice
......
...@@ -47,4 +47,13 @@ modules: ...@@ -47,4 +47,13 @@ modules:
validate_answer_rrs: validate_answer_rrs:
fail_if_not_matches_regexp: fail_if_not_matches_regexp:
- {{ domain | replace('.', '\.') }}\.\t.*\tIN\tAAAA\t({{ hosts | map('extract', hostvars, ['ipv6_address']) | join('|') }}) - {{ domain | replace('.', '\.') }}\.\t.*\tIN\tAAAA\t({{ hosts | map('extract', hostvars, ['ipv6_address']) | join('|') }})
geo_dns_{{ domain }}_https:
prober: dns
timeout: 5s
dns:
query_name: {{ domain }}
query_type: HTTPS
validate_answer_rrs:
fail_if_not_matches_regexp:
- {{ domain | replace('.', '\.') }}\.\t.*\tIN\tHTTPS\t1 \. alpn="h2,h3" ipv4hint="({{ hosts | map('extract', hostvars, ['ipv4_address']) | join('|') | replace('.', '\.') }})" ipv6hint="({{ hosts | map('extract', hostvars, ['ipv6_address']) | join('|') }})"
{% endfor %} {% endfor %}
...@@ -119,6 +119,7 @@ locals { ...@@ -119,6 +119,7 @@ locals {
server_type = "cx22" server_type = "cx22"
domain = "mirror" domain = "mirror"
zone = hetznerdns_zone.pkgbuild.id zone = hetznerdns_zone.pkgbuild.id
http3 = true
} }
"monitoring.archlinux.org" = { "monitoring.archlinux.org" = {
server_type = "cx32" server_type = "cx32"
...@@ -281,6 +282,7 @@ locals { ...@@ -281,6 +282,7 @@ locals {
rsync = { rsync = {
ipv4_address = "168.119.141.106" ipv4_address = "168.119.141.106"
ipv6_address = "2a01:4f8:251:598::" ipv6_address = "2a01:4f8:251:598::"
http3 = true
} }
runner1 = { runner1 = {
ipv4_address = "138.199.19.15" ipv4_address = "138.199.19.15"
...@@ -355,38 +357,47 @@ locals { ...@@ -355,38 +357,47 @@ locals {
"america.mirror" = { "america.mirror" = {
ipv4_address = "143.244.34.62" ipv4_address = "143.244.34.62"
ipv6_address = "2a02:6ea0:cc0e::2" ipv6_address = "2a02:6ea0:cc0e::2"
http3 = true
} }
"america.archive" = { "america.archive" = {
ipv4_address = "143.244.34.62" ipv4_address = "143.244.34.62"
ipv6_address = "2a02:6ea0:cc0e::2" ipv6_address = "2a02:6ea0:cc0e::2"
http3 = true
} }
"asia.mirror" = { "asia.mirror" = {
ipv4_address = "84.17.57.98" ipv4_address = "84.17.57.98"
ipv6_address = "2a02:6ea0:d605::2" ipv6_address = "2a02:6ea0:d605::2"
http3 = true
} }
"asia.archive" = { "asia.archive" = {
ipv4_address = "84.17.57.98" ipv4_address = "84.17.57.98"
ipv6_address = "2a02:6ea0:d605::2" ipv6_address = "2a02:6ea0:d605::2"
http3 = true
} }
"europe.mirror" = { "europe.mirror" = {
ipv4_address = "89.187.191.12" ipv4_address = "89.187.191.12"
ipv6_address = "2a02:6ea0:c237::2" ipv6_address = "2a02:6ea0:c237::2"
http3 = true
} }
"europe.archive" = { "europe.archive" = {
ipv4_address = "89.187.191.12" ipv4_address = "89.187.191.12"
ipv6_address = "2a02:6ea0:c237::2" ipv6_address = "2a02:6ea0:c237::2"
http3 = true
} }
"london.mirror" = { "london.mirror" = {
ipv4_address = "185.73.44.89" ipv4_address = "185.73.44.89"
ipv6_address = "2001:ba8:0:4030::2" ipv6_address = "2001:ba8:0:4030::2"
http3 = true
} }
"seoul.mirror" = { "seoul.mirror" = {
ipv4_address = "145.40.87.75" ipv4_address = "145.40.87.75"
ipv6_address = "2604:1380:11:2600::1" ipv6_address = "2604:1380:11:2600::1"
http3 = true
} }
"sydney.mirror" = { "sydney.mirror" = {
ipv4_address = "147.75.48.159" ipv4_address = "147.75.48.159"
ipv6_address = "2604:1380:40f1:6a00::1" ipv6_address = "2604:1380:40f1:6a00::1"
http3 = true
} }
repro2 = { repro2 = {
ipv4_address = "212.102.38.209" ipv4_address = "212.102.38.209"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment