From 3d2c3e760d95c0b1d4034c1a1b073432755c2d98 Mon Sep 17 00:00:00 2001 From: RGBCube Date: Thu, 11 Jan 2024 18:31:19 +0300 Subject: [PATCH] Maybe fix ACME???????? --- flake.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/flake.nix b/flake.nix index 3b3e7a8..8012f92 100644 --- a/flake.nix +++ b/flake.nix @@ -147,6 +147,11 @@ }; config = mkIf cfg.enable { + security.acme.certs.${cfg.url} = { + domain = "*.${cfg.url}"; + group = "nginx"; + }; + services.nginx = mkIf cfg.configureNginx { enable = true; @@ -156,15 +161,15 @@ recommendedTlsSettings = mkDefault true; virtualHosts.${cfg.url} = { - enableACME = true; - forceSSL = true; + forceSSL = true; + useACMEHost = cfg.url; locations."/".proxyPass = "http://localhost:${toString cfg.port}"; }; virtualHosts."www.${cfg.url}" = { - enableACME = true; - forceSSL = true; + forceSSL = true; + useACMEHost = cfg.url; locations."/".extraConfig = '' return 301 https://${cfg.url}$request_uri; @@ -173,7 +178,7 @@ virtualHosts._ = { forceSSL = true; - useACMEHost = "*.${cfg.url}"; + useACMEHost = cfg.url; locations."/".extraConfig = '' proxy_pass http://localhost:${toString cfg.port}/404; @@ -185,8 +190,6 @@ }; }; - security.acme.certs."*.${cfg.url}" = {}; - systemd.services.site = { description = "RGBCube's Homepage"; requires = [ "network.target" ];