diff --git a/dns/dnsconfig.js b/dns/dnsconfig.js index 8a33d84..134458e 100644 --- a/dns/dnsconfig.js +++ b/dns/dnsconfig.js @@ -148,7 +148,7 @@ D("radicle.dev", REG_NONE, DnsProvider(DSP_CLOUDFLARE), A("seed", "65.108.87.205"), AAAA("seed", "2a01:4f9:c011:b666::1"), - HTTPS("seed", 1, ".", "alpn=\"h3\" ipv4hint=65.108.87.205 ipv6hint=2a01:4f9:c011:b666::1"), + HTTPS("seed", 1, ".", "alpn=\"h2,h3\" ipv4hint=65.108.87.205 ipv6hint=2a01:4f9:c011:b666::1"), SSHFP("seed", 4, 2, "ac7db28d3d05c52f3e2d67adca4654ce6766a1e8d7b6fab4c03b25ab435a613d"), SSHFP("seed", 4, 1, "9033b89019264dbad5a744057166a5e1b7af92f7"), @@ -201,7 +201,7 @@ D("radicle.network", REG_NONE, DnsProvider(DSP_CLOUDFLARE), A("iris", "95.217.156.6", TTL("10m")), AAAA("iris", "2a01:4f9:c010:dfaa::1", TTL("10m")), - // HTTPS("iris", 1, ".", "alpn=\"h2\""), + HTTPS("iris", 1, ".", "alpn=\"h2\""), SSHFP("iris", 4, 1, "1ffe43af8f30c34373515fa24f1b9fe69532a9d5"), SSHFP("iris", 4, 2, "715ce29a1ccdd7088b9fb40949ca186e736ff6d711163689560ffe54252c9d43"), CNAME("_acme-challenge.iris", "_acme-challenge.iris-network.radicle.garden."), @@ -214,7 +214,7 @@ D("radicle.network", REG_NONE, DnsProvider(DSP_CLOUDFLARE), A("rosa", "5.161.85.124", TTL("10m")), AAAA("rosa", "2a01:4ff:f0:abd3::1", TTL("10m")), - // HTTPS("rosa", 1, ".", "alpn=\"h2\""), + HTTPS("rosa", 1, ".", "alpn=\"h2\""), SSHFP("rosa", 4, 1, "6ee4b941f49ece1601e238344f088f5a83712b91"), SSHFP("rosa", 4, 2, "e2364a3e0f7728eaa53d40543f15e7c23409fe06e5b08c55d8f63ee00e963b0b"), CNAME("_acme-challenge.rosa", "_acme-challenge.rosa-network.radicle.garden."), diff --git a/flake.nix b/flake.nix index a2eedc6..5ee2d41 100644 --- a/flake.nix +++ b/flake.nix @@ -123,6 +123,7 @@ }; nixpkgs = { overlays = [ + (import ./overlay/nginx.nix) (import ./overlay/radicle-node.nix) ]; config = { diff --git a/os/host/dev/seed/attic.nix b/os/host/dev/seed/attic.nix index bb00f0e..99305f6 100644 --- a/os/host/dev/seed/attic.nix +++ b/os/host/dev/seed/attic.nix @@ -34,7 +34,6 @@ in { nginx.virtualHosts.${domain} = { enableACME = true; forceSSL = true; - http2 = lib.mkForce false; quic = true; serverName = domain; @@ -53,7 +52,6 @@ in { enableACME = true; forceSSL = true; globalRedirect = domain; - http2 = lib.mkForce false; redirectCode = 302; }; }; diff --git a/os/host/dev/seed/bootstrap/default.nix b/os/host/dev/seed/bootstrap/default.nix index 38445c3..ef49c61 100644 --- a/os/host/dev/seed/bootstrap/default.nix +++ b/os/host/dev/seed/bootstrap/default.nix @@ -40,7 +40,6 @@ services.nginx.virtualHosts."bootstrap.radicle.network" = { enableACME = true; forceSSL = true; - http2 = lib.mkForce false; quic = true; serverName = "bootstrap.radicle.network"; root = "/var/www/bootstrap.radicle.network"; diff --git a/os/host/dev/seed/files.nix b/os/host/dev/seed/files.nix index 428cf14..8f767dc 100644 --- a/os/host/dev/seed/files.nix +++ b/os/host/dev/seed/files.nix @@ -6,7 +6,6 @@ in { services.nginx.virtualHosts.${name.xyz} = { globalRedirect = name.dev; - http2 = lib.mkForce false; redirectCode = 302; enableACME = true; forceSSL = true; @@ -17,7 +16,6 @@ in { }; services.nginx.virtualHosts.${name.dev} = { - http2 = lib.mkForce false; root = "/var/www/${name.dev}"; extraConfig = '' add_header 'Access-Control-Allow-Origin' '*'; diff --git a/os/host/dev/seed/grafana.nix b/os/host/dev/seed/grafana.nix index 823899b..0fab0ae 100644 --- a/os/host/dev/seed/grafana.nix +++ b/os/host/dev/seed/grafana.nix @@ -22,7 +22,6 @@ in { nginx.virtualHosts.${domain} = { enableACME = true; forceSSL = true; - http2 = lib.mkForce false; serverName = domain; locations."/" = { proxyPass = "http://127.0.0.1:${builtins.toString port}"; @@ -38,7 +37,6 @@ in { enableACME = true; forceSSL = true; globalRedirect = domain; - http2 = lib.mkForce false; redirectCode = 302; }; }; diff --git a/os/mixin/radicle-stats.nix b/os/mixin/radicle-stats.nix index b66bacc..c1211fa 100644 --- a/os/mixin/radicle-stats.nix +++ b/os/mixin/radicle-stats.nix @@ -36,8 +36,5 @@ in { ]; }; }; - services.nginx.virtualHosts.${config.networking.fqdn} = { - http2 = lib.mkForce false; - locations."/tmp/".alias = "/tmp/radicle/"; - }; + services.nginx.virtualHosts.${config.networking.fqdn}.locations."/tmp/".alias = "/tmp/radicle/"; } diff --git a/os/module/iroh-dns-server.nix b/os/module/iroh-dns-server.nix index 0e81767..cfe3a9b 100644 --- a/os/module/iroh-dns-server.nix +++ b/os/module/iroh-dns-server.nix @@ -140,7 +140,6 @@ in { services.nginx.virtualHosts.${cfg.domain} = { enableACME = true; forceSSL = true; - http2 = lib.mkForce false; quic = true; locations."/".proxyPass = "http://[::1]:${builtins.toString cfg.settings.http.port}"; }; diff --git a/os/module/iroh-relay.nix b/os/module/iroh-relay.nix index d6c8c64..88cf26f 100644 --- a/os/module/iroh-relay.nix +++ b/os/module/iroh-relay.nix @@ -150,7 +150,6 @@ in { virtualHosts.${cfg.domain} = { enableACME = true; forceSSL = true; - http2 = lib.mkForce false; quic = true; locations."/" = { proxyPass = "http://127.0.0.1:3340"; diff --git a/overlay/nginx.nix b/overlay/nginx.nix new file mode 100644 index 0000000..6d5bf2b --- /dev/null +++ b/overlay/nginx.nix @@ -0,0 +1,11 @@ +final: prev: { + nginxStable = prev.nginxStable.overrideAttrs ( + finalAttrs: prevAttrs: { + version = "1.30.7"; + src = final.fetchurl { + url = "https://nginx.org/download/nginx-${finalAttrs.version}.tar.gz"; + hash = "sha256-JWW1yDcFDpWPcPsPc8SOK8pFQq00n9NW9G+wxyYQvG4="; + }; + } + ); +}