diff --git a/pkgs/caddy/package.nix b/pkgs/caddy/package.nix index ee7c154..ed26db1 100644 --- a/pkgs/caddy/package.nix +++ b/pkgs/caddy/package.nix @@ -18,5 +18,5 @@ }).withPlugins { plugins = [ "github.com/caddy-dns/cloudflare@v0.2.1" ]; - hash = "sha256-XwZ0Hkeh2FpQL/fInaSq+/3rCLmQRVvwBM0Y1G1FZNU="; + hash = "sha256-iRzpN9awuEFsc7hqKzOMNiCFFEv833xhd4LM+VFQedI="; } diff --git a/platforms/nixos/modules/nmasur/presets/services/n8n.nix b/platforms/nixos/modules/nmasur/presets/services/n8n.nix index b81b72d..ae07e0c 100644 --- a/platforms/nixos/modules/nmasur/presets/services/n8n.nix +++ b/platforms/nixos/modules/nmasur/presets/services/n8n.nix @@ -2,7 +2,6 @@ # together with triggers. { config, lib, ... }: - let inherit (config.nmasur.settings) hostnames; cfg = config.nmasur.presets.services.n8n; @@ -18,18 +17,13 @@ in services.n8n = { enable = true; - webhookUrl = "https://${hostnames.n8n}"; - settings = { - listen_address = "127.0.0.1"; - port = 5678; - + environment = { + N8N_LISTEN_ADDRESS = "127.0.0.1"; + N8N_PORT = 5678; + N8N_EDITOR_BASE_URL = "https://${hostnames.n8n}"; }; }; - systemd.services.n8n.environment = { - N8N_EDITOR_BASE_URL = config.services.n8n.webhookUrl; - }; - # Configure Cloudflare DNS to point to this machine services.cloudflare-dyndns.domains = [ hostnames.n8n ]; @@ -40,7 +34,9 @@ in handle = [ { handler = "reverse_proxy"; - upstreams = [ { dial = "localhost:${builtins.toString config.services.n8n.settings.port}"; } ]; + upstreams = [ + { dial = "localhost:${builtins.toString config.services.n8n.environment.N8N_PORT}"; } + ]; } ]; } diff --git a/platforms/nixos/modules/nmasur/profiles/communications.nix b/platforms/nixos/modules/nmasur/profiles/communications.nix index d7fc979..5a5c557 100644 --- a/platforms/nixos/modules/nmasur/profiles/communications.nix +++ b/platforms/nixos/modules/nmasur/profiles/communications.nix @@ -30,9 +30,9 @@ in karakeep.enable = lib.mkDefault true; litestream.enable = lib.mkDefault true; mathesar.enable = lib.mkDefault true; - minecraft-server.enable = lib.mkDefault true; + minecraft-server.enable = lib.mkDefault false; n8n.enable = lib.mkDefault true; - nix-autoupgrade.enable = lib.mkDefault false; # On by default for communications + nix-autoupgrade.enable = lib.mkDefault true; # On by default for communications ntfy-sh.enable = lib.mkDefault true; pgweb.enable = lib.mkDefault true; postgresql.enable = lib.mkDefault true;