From bae66afecb049451768f848b7d10b32273b1c026 Mon Sep 17 00:00:00 2001
From: Ivan Bushchik <ivabus@ivabus.dev>
Date: Sun, 21 Apr 2024 10:51:14 +0300
Subject: [PATCH] Fix http3

Signed-off-by: Ivan Bushchik <ivabus@ivabus.dev>
---
 machines/rubusidaeus/default.nix   | 26 ++++++++++++++++++++++----
 roles/server/ivabus-dev.nix        |  2 ++
 roles/server/slides-ivabus-dev.nix |  1 +
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/machines/rubusidaeus/default.nix b/machines/rubusidaeus/default.nix
index 87356f4..8290fe5 100644
--- a/machines/rubusidaeus/default.nix
+++ b/machines/rubusidaeus/default.nix
@@ -2,7 +2,7 @@
 
 let
   my = import ../..;
-  ipv6_subnet = "2a05:3580:e41a:d600";
+  ipv6_subnet = "2a03:e2c0:47cb:5555";
   ipv6_prefix = 64;
   ipv4_gateway = "192.168.1.1";
   ipv4_address = "192.168.1.3";
@@ -55,7 +55,7 @@ in {
                         margin-right: auto;
                         background-color: #24273a;
                         color: #cad3f5;
-                        font-family: "JetBrains Mono";
+                        font-family: "JetBrains Mono", monospace;
                       }
                       h1 {
                         font-size: 24pt;
@@ -70,7 +70,7 @@ in {
                       }
                       a {
                         color: #cad3f5;
-                        text-decoration: none; 
+                        text-decoration: none;
                       }
                       li {
                         background-color: #494d64;
@@ -175,6 +175,7 @@ in {
       locations."/".proxyPass = "http://localhost:8090";
       enableACME = true;
       addSSL = true;
+      quic = true;
       http3 = true;
       serverAliases = [ "www.iva.bz" ];
     };
@@ -182,6 +183,7 @@ in {
       locations."/".proxyPass = "http://${secrets.maas-address}:8083";
       enableACME = true;
       addSSL = true;
+      quic = true;
       http3 = true;
       serverAliases = [ "ивабус.рф" ];
     };
@@ -189,18 +191,35 @@ in {
       locations."/".proxyPass = "http://${secrets.maas-address}:4533";
       enableACME = true;
       forceSSL = true;
+      quic = true;
       http3 = true;
     };
     virtualHosts."storage.ivabus.dev" = {
       locations."/".proxyPass = "http://${secrets.maas-address}:80";
       enableACME = true;
       forceSSL = true;
+      quic = true;
+      http3 = true;
+    };
+    virtualHosts."storage.private.ivabus.dev" = {
+      locations."/".proxyPass = "http://${secrets.maas-address}:80";
+      enableACME = true;
+      forceSSL = true;
+      quic = true;
       http3 = true;
     };
     virtualHosts."git.ivabus.dev" = {
       locations."/".proxyPass = "http://${secrets.maas-address}:3000";
       enableACME = true;
       forceSSL = true;
+      quic = true;
+      http3 = true;
+    };
+    virtualHosts."b.iva.bz" = {
+      locations."/".proxyPass = "http://${secrets.maas-address}:8888";
+      enableACME = true;
+      addSSL = true;
+      quic = true;
       http3 = true;
     };
   };
@@ -208,4 +227,3 @@ in {
   hardware.enableRedistributableFirmware = true;
   system.stateVersion = "23.05";
 }
-
diff --git a/roles/server/ivabus-dev.nix b/roles/server/ivabus-dev.nix
index 3101424..a312e33 100644
--- a/roles/server/ivabus-dev.nix
+++ b/roles/server/ivabus-dev.nix
@@ -9,12 +9,14 @@ in {
       virtualHosts."ivabus.dev" = {
         forceSSL = true;
         enableACME = true;
+        quic = true;
         http3 = true;
 
         root = pkgs.callPackage ../../pkgs/ivabus-dev.nix { };
 
         extraConfig = ''
           error_page 404 /404.html;
+          add_header Access-Control-Allow-Origin *;
         '';
         serverAliases = [ "www.ivabus.dev" ];
       };
diff --git a/roles/server/slides-ivabus-dev.nix b/roles/server/slides-ivabus-dev.nix
index 77dbb68..1623700 100644
--- a/roles/server/slides-ivabus-dev.nix
+++ b/roles/server/slides-ivabus-dev.nix
@@ -9,6 +9,7 @@ in {
       virtualHosts."slides.ivabus.dev" = {
         forceSSL = true;
         enableACME = true;
+        quic = true;
         http3 = true;
 
         root = pkgs.callPackage ../../pkgs/slides-ivabus-dev.nix { };