a

2023-01-30 20:12:39 -03:00 · 2023-01-30 20:12:39 -03:00 · fab1c84086
parent 956ef3f681 8b6f976fe8
commit fab1c84086
1 changed files with 4 additions and 0 deletions
--- a/nginx/sites-available/wiki.zzls.xyz.conf
+++ b/nginx/sites-available/wiki.zzls.xyz.conf
@ -33,7 +33,11 @@ server {
    # QUIC
    add_header Alt-Svc 'h3=":443"; ma=86400';

+<<<<<<< HEAD
    #listen 443 http3;
+=======
+    listen 443 http3;
+>>>>>>> 8b6f976fe8e457df02c4ba50a64bafdf969df8dd
    listen 443 http2 ssl; # managed by Certbot
    ssl_certificate /etc/letsencrypt/live/wiki.zzls.xyz/fullchain.pem; # managed by Certbot
    ssl_certificate_key /etc/letsencrypt/live/wiki.zzls.xyz/privkey.pem; # managed by Certbot