flake.nix

@@ -233,7 +233,6 @@
             irc = "irc.${baseName}";
             metrics = "metrics.${baseName}";
             minecraft = "minecraft.${baseName}";
-            n8n = "n8n.${baseName}";
             prometheus = "prom.${baseName}";
             paperless = "paper.${baseName}";
             secrets = "vault.${baseName}";

hosts/arrow/aws/outputs.tf

@@ -1,3 +0,0 @@
-output "host_ip" {
-  value = aws_instance.instance.public_ip
-}

hosts/arrow/modules.nix

@@ -22,7 +22,6 @@
     cloudflare.enable = true;
     services.openssh.enable = true;
     services.caddy.enable = true;
-    services.n8n.enable = true;
 
     # nix-index seems to eat up too much memory for Vultr
     home-manager.users.${globals.user}.programs.nix-index.enable = inputs.nixpkgs.lib.mkForce false;

modules/common/default.nix

@@ -125,10 +125,6 @@
         type = lib.types.str;
         description = "Hostname for IRC services.";
       };
-      n8n = lib.mkOption {
-        type = lib.types.str;
-        description = "Hostname for n8n automation.";
-      };
       transmission = lib.mkOption {
         type = lib.types.str;
         description = "Hostname for peer2peer downloads (Transmission).";

modules/nixos/services/n8n.nix

@@ -4,11 +4,18 @@
 { config, lib, ... }:
 {
 
-  config = lib.mkIf config.services.n8n.enable {
+  options = {
+    n8nServer = lib.mkOption {
+      type = lib.types.nullOr lib.types.str;
+      description = "Hostname for n8n automation";
+      default = null;
+    };
+  };
 
-    unfreePackages = [ "n8n" ];
+  config = lib.mkIf (config.n8nServer != null) {
 
     services.n8n = {
+      enable = true;
       settings = {
         n8n = {
           listenAddress = "127.0.0.1";
@@ -17,17 +24,13 @@
       };
     };
 
-    # Configure Cloudflare DNS to point to this machine
-    services.cloudflare-dyndns.domains = [ config.hostnames.n8n ];
-
-    # Allow web traffic to Caddy
     caddy.routes = [
       {
-        match = [ { host = [ config.hostnames.n8n ]; } ];
+        match = [ { host = [ config.n8nServer ]; } ];
         handle = [
           {
             handler = "reverse_proxy";
-            upstreams = [ { dial = "localhost:${builtins.toString config.services.n8n.settings.n8n.port}"; } ];
+            upstreams = [ { dial = "localhost:5678"; } ];
           }
         ];
       }