diff --git a/hosts/AZ-CLD-1/secrets.nix b/hosts/AZ-CLD-1/secrets.nix index 37a819e..d7fa332 100644 --- a/hosts/AZ-CLD-1/secrets.nix +++ b/hosts/AZ-CLD-1/secrets.nix @@ -28,6 +28,9 @@ n8n-env = { file = ../../secrets/n8n-env.age; }; + n8n-runner-auth-token = { + file = ../../secrets/n8n-runner-auth-token-cld.age; + }; netbird-auth-secret = { file = ../../secrets/netbird-auth-secret.age; }; diff --git a/hosts/AZ-CLD-1/services/n8n.nix b/hosts/AZ-CLD-1/services/n8n.nix index 1d083df..eca70e6 100644 --- a/hosts/AZ-CLD-1/services/n8n.nix +++ b/hosts/AZ-CLD-1/services/n8n.nix @@ -4,7 +4,13 @@ in { services.${serviceName} = { enable = true; - environment.WEBHOOK_URL = "https://wf.az-gruppe.com"; + environment = { + WEBHOOK_URL = "https://wf.az-gruppe.com"; + N8N_RUNNERS_ENABLED = true; + N8N_NATIVE_PYTHON_RUNNER = true; + N8N_RUNNERS_AUTH_TOKEN_FILE = config.age.secrets.n8n-runner-auth-token.path; + }; + taskRunners.enable = true; }; systemd.services.${serviceName}.serviceConfig = { diff --git a/hosts/AZ-PRM-1/secrets.nix b/hosts/AZ-PRM-1/secrets.nix index a89b4a6..b0429e2 100644 --- a/hosts/AZ-PRM-1/secrets.nix +++ b/hosts/AZ-PRM-1/secrets.nix @@ -16,6 +16,9 @@ n8n-env = { file = ../../secrets/n8n-env-prm.age; }; + n8n-runner-auth-token = { + file = ../../secrets/n8n-runner-auth-token-prm.age; + }; pgadmin-pw = { file = ../../secrets/pgadmin-pw.age; owner = "pgadmin"; diff --git a/hosts/AZ-PRM-1/services/n8n.nix b/hosts/AZ-PRM-1/services/n8n.nix index 7d24da5..b90d93b 100644 --- a/hosts/AZ-PRM-1/services/n8n.nix +++ b/hosts/AZ-PRM-1/services/n8n.nix @@ -1,8 +1,4 @@ -{ - config, - lib, - ... -}: let +{config, ...}: let serviceName = "n8n"; servicePort = config.m3ta.ports.get serviceName; in { @@ -12,8 +8,11 @@ in { WEBHOOK_URL = "https://wf.l.az-gruppe.com"; NODES_EXCLUDE = "[]"; N8N_RESTRICT_FILE_ACCESS_TO = "/mnt/DMS-INBOX;/mnt/DMS-ALT-INBOX"; - N8N_RUNNERS_ENABLED = lib.mkForce "false"; + N8N_RUNNERS_ENABLED = true; + N8N_NATIVE_PYTHON_RUNNER = true; + N8N_RUNNERS_AUTH_TOKEN_FILE = config.age.secrets.n8n-runner-auth-token.path; }; + taskRunners.enable = true; }; systemd.services.n8n.serviceConfig = { diff --git a/secrets.nix b/secrets.nix index 41b3a34..a21236d 100644 --- a/secrets.nix +++ b/secrets.nix @@ -30,6 +30,8 @@ in { "secrets/n8n-env.age".publicKeys = systems ++ users; "secrets/n8n-env-prm.age".publicKeys = systems ++ users; "secrets/n8n-db.age".publicKeys = systems ++ users; + "secrets/n8n-runner-auth-token-cld.age".publicKeys = systems ++ users; + "secrets/n8n-runner-auth-token-prm.age".publicKeys = systems ++ users; "secrets/netbird-auth-secret.age".publicKeys = systems ++ users; "secrets/netbird-db-password.age".publicKeys = systems ++ users; "secrets/netbird-encryption-key.age".publicKeys = systems ++ users; diff --git a/secrets/n8n-runner-auth-token-cld.age b/secrets/n8n-runner-auth-token-cld.age new file mode 100644 index 0000000..1999226 --- /dev/null +++ b/secrets/n8n-runner-auth-token-cld.age @@ -0,0 +1,16 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFpoVnNlZyBvUEY5 +aGxjeTVwRVlnUmx4dWFCQmlHdmhqL2NFOGNtWGV1YjJxdDlVUGlZCkMwUmt3Qzht +UzNmSmpmTmdvRUlFMDZORjdPemRpUVhoMFZGVTZTa1MvemcKLT4gc3NoLWVkMjU1 +MTkgU3JIYXFBIHQ2NTN2TzdSSmlXaGxhMytHc002OXFlYldCbVJLeURxNFlTRDVQ +WmhhVmcKZlF2ZWVTd0kwOWkrdTZFcUl0ODhrTmxoMFBuRWY2THFFblQ0SUpNbXhz +UQotPiBzc2gtZWQyNTUxOSBsR3FWWmcgcGNVNnk5QzBZTlQrampBRkZyMHVYY0da +TFBpRTRyV0RiRXpieUJPQ2JXMApVc1duQjNvODUwcjdiaExTY0FSNWExWXZQMWV5 +Q1Y1ajA5N1MvOUlTWXUwCi0+IHNzaC1lZDI1NTE5IENTTXloZyBGZ1F5SEduT2NV +M21SREI0ZlQ0SEQ4NDVnU1Zia0xNT0VGSjBDNjdnWldvCm5STjdmTy9hYjA4MDFn +N0JMREF6Z0J1L0x2clhReGNLd0VsdE1RbHU4VUkKLT4gSnk3R3BbOD8tZ3JlYXNl +IEduU01fZ3kKZkVpRmZlMnNHY3ptMmt6dHFuWitLVm03dWozclN3Ci0tLSBIdnV3 +RWYvaDRxYm5reXBrZFlXMTU3d1ptMlNjUVVENFFyY3RRMEI5bE0wCoP+Qd7GFnSk +OCaaJ6FtF3Fldm4ijKNDHOf/vpiFsFm2ii70V2sXBgzAwWBwEmu7rbN3YZkq56YA +bJ0ymjN9DPTNa/0L7r3smzl9EF3QBkj5dBNQaenMzbkbLJBXUJcFb9U= +-----END AGE ENCRYPTED FILE----- diff --git a/secrets/n8n-runner-auth-token-prm.age b/secrets/n8n-runner-auth-token-prm.age new file mode 100644 index 0000000..92976d2 --- /dev/null +++ b/secrets/n8n-runner-auth-token-prm.age @@ -0,0 +1,17 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFpoVnNlZyBGOHFq +RmpJN1RIS2RhVDN5YW1SQkRnSytFM1kydWl3L3Vhak1QTWhoQkhjClFsQ2E4OGxy +c2p4clZzZlhXL3RySVRaS2UvRTh2bFVvUzJyTm5zUDJFT2sKLT4gc3NoLWVkMjU1 +MTkgU3JIYXFBIEFxUjBmNjJDdkpMNkxkUmFJQjhpck5md1lqM1UxQnNFSnZrQStm +SW4wVjgKbzVQV1Y1a3d5bWV0ZVBoNGhBRkVjeTBMNzlnQWVRY282ZDBlM3l0djZz +SQotPiBzc2gtZWQyNTUxOSBsR3FWWmcgRDBHWktPY0loWDNud3VTeFl6R3d4d1M3 +elRYK3RJNmRxZDVKcTRncHhFOApCdU9DYVV1Tk9GS1BERUVSNFY0NFZ3M3Uya1Ur +dDFja1hlWlIzQ3FkendRCi0+IHNzaC1lZDI1NTE5IENTTXloZyBJU1I0Mng3dy90 +eFJ1ZDlOby9TVXFPSXExa2JHTnplRmxYWVBCQklGQlJrCko5NlBVQmxSZXpxY3Np +L0xXM2Y2R1hva2REUUQvYkJlandUaFpaY3ErVFUKLT4gLi8xdE9TLWdyZWFzZSBr +RGFTIDZaaj9ALCBOVFEnSSl9IFpdCnlNWmp1V21rY2FFZVd3S3FROGFNSkhQVVgr +aHY4a3ZwK1N4c3pqdDcKLS0tIEx1RnU5WGZ5bGg3R0pUM0pmYXVBYmJJZmI4Z3Bm +ZUxWbS9vVnFKM3loMjAKm9xb4d334Y5HAlHYgfhX95kcx0ZPgpQ2naCjnUQnM3FM +iKKbHbdp8Gce18zq84+M5wh2tczBQVIhba8E+yHAniWm9zTRENDxmGgqz45e9b2I +0dqTbA+ybixmQX0JkPnRgg== +-----END AGE ENCRYPTED FILE-----