diff --git a/flake.lock b/flake.lock index 7ba97cb..3db79dc 100644 --- a/flake.lock +++ b/flake.lock @@ -357,11 +357,11 @@ ] }, "locked": { - "lastModified": 1777678872, - "narHash": "sha256-EPIFsulyon7Z1vLQq5Fk64GR8L7cQsT+IPhcsukVbgk=", + "lastModified": 1777988971, + "narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "5250617bffd85403b14dbf43c3870e7f255d2c16", + "rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff", "type": "github" }, "original": { @@ -480,11 +480,11 @@ ] }, "locked": { - "lastModified": 1777771528, - "narHash": "sha256-YycygK6n7KeW1YCobdFJcORWzkmrvNcp6xT+IovA0d4=", + "lastModified": 1777851538, + "narHash": "sha256-Gp8qwTEYNoy2yvmErVGlvLOQvrtEECCAKbonW7VJef8=", "owner": "nix-community", "repo": "home-manager", - "rev": "0585fbf645640973e3398863bbaf3bd1ddce4a51", + "rev": "cc09c0f9b7eaa95c2d9827338a5eb03d32505ca5", "type": "github" }, "original": { @@ -524,11 +524,11 @@ ] }, "locked": { - "lastModified": 1777913624, - "narHash": "sha256-4MwfrGuqjsnEORQbM3cmkmG/9cWhDV63dTDguDj4FXw=", + "lastModified": 1778248595, + "narHash": "sha256-dhFgEjoeJMYN/7OY6xfxS799YB4IjbbYXTjyGIJyLpc=", "owner": "nix-community", "repo": "home-manager", - "rev": "a89686d115e970e200eb2caa7603f3673050e00c", + "rev": "fdb2ccba9d5e1238d32e0c4a3ec1a277efa80c1d", "type": "github" }, "original": { @@ -547,11 +547,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1777873616, - "narHash": "sha256-W4FRQJ/X6amooqaD6DjLtOiUzUIzyBQOBPAijRMCE44=", + "lastModified": 1778276681, + "narHash": "sha256-8rXO94K3Ic6GnV7Ln2tjoeXFR7dCLsNKlPI7iFuPEfs=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "91f891c781adae47bfa5539d80f8528b82bf31fd", + "rev": "14a8ef979265f7795800842ea178cfef844ede47", "type": "github" }, "original": { @@ -572,11 +572,11 @@ "nur": "nur" }, "locked": { - "lastModified": 1777909626, - "narHash": "sha256-blEbEb6DOUI3oPs30cxuctCw2EKeF5MG2A5GhxMHReI=", + "lastModified": 1778175366, + "narHash": "sha256-R1J6IpR8HnMSlpfpUdkVVuHfBzmAo7NgzJ4GbOqxcL8=", "ref": "refs/heads/master", - "rev": "d0921278e29f0596e3dd4b63a1e5785f0b444444", - "revCount": 17, + "rev": "8e92a874f6519c1cd857db64eaf14ea581ce5714", + "revCount": 21, "type": "git", "url": "ssh://gitea@code.m3ta.dev/m3tam3re/m3ta-home" }, @@ -597,11 +597,11 @@ "openspec": "openspec" }, "locked": { - "lastModified": 1777903274, - "narHash": "sha256-iHAUmHCT+4406yRjvBfJ+SYVvKwGVm4Aq+U/CqINOJI=", + "lastModified": 1778248843, + "narHash": "sha256-YFdcWtlcY9Qz39sTsHAdthuAxu5QBrw6Sxs1ZVhQ7wo=", "ref": "refs/heads/master", - "rev": "98424b0f3de5f37d9b6cfc67bf52cd901abeebf2", - "revCount": 277, + "rev": "5a19f4096d0c0ef2644efb85756642a906e23111", + "revCount": 287, "type": "git", "url": "ssh://gitea@code.m3ta.dev/m3tam3re/nixpkgs" }, @@ -619,11 +619,11 @@ "openspec": "openspec_2" }, "locked": { - "lastModified": 1777903274, - "narHash": "sha256-iHAUmHCT+4406yRjvBfJ+SYVvKwGVm4Aq+U/CqINOJI=", + "lastModified": 1778248843, + "narHash": "sha256-YFdcWtlcY9Qz39sTsHAdthuAxu5QBrw6Sxs1ZVhQ7wo=", "ref": "refs/heads/master", - "rev": "98424b0f3de5f37d9b6cfc67bf52cd901abeebf2", - "revCount": 277, + "rev": "5a19f4096d0c0ef2644efb85756642a906e23111", + "revCount": 287, "type": "git", "url": "https://code.m3ta.dev/m3tam3re/nixpkgs" }, @@ -827,11 +827,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1777902845, - "narHash": "sha256-xsIOaugmxbeQ/0lklO5epCy28yCh9pdU3Ko+alWHE9o=", + "lastModified": 1778248211, + "narHash": "sha256-a7qlraTPRvMOYuRpgKxZGI2/gklyCA0VlZrTBZru+Yk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b8b8208c95fa8ec83bd3b82e0529def22f94ff7e", + "rev": "3156fdf04173195cebf1a1abd03b9ab7388ae6f0", "type": "github" }, "original": { @@ -843,11 +843,11 @@ }, "nixpkgs-master_2": { "locked": { - "lastModified": 1777902845, - "narHash": "sha256-xsIOaugmxbeQ/0lklO5epCy28yCh9pdU3Ko+alWHE9o=", + "lastModified": 1778248211, + "narHash": "sha256-a7qlraTPRvMOYuRpgKxZGI2/gklyCA0VlZrTBZru+Yk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b8b8208c95fa8ec83bd3b82e0529def22f94ff7e", + "rev": "3156fdf04173195cebf1a1abd03b9ab7388ae6f0", "type": "github" }, "original": { @@ -875,11 +875,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1777578337, - "narHash": "sha256-Ad49moKWeXtKBJNy2ebiTQUEgdLyvGmTeykAQ9xM+Z4=", + "lastModified": 1777954456, + "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "15f4ee454b1dce334612fa6843b3e05cf546efab", + "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1", "type": "github" }, "original": { @@ -891,11 +891,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1777826146, - "narHash": "sha256-wQ/iN5Zp5VIa3ebBibijPnLyKhor+xEbDy4d0goa9Zs=", + "lastModified": 1778124196, + "narHash": "sha256-pYEytCNic/czazbV9r3tbQ6BZzqRBg/41x2dIC5ymOo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "73c703c22422b8951895a960959dbbaca7296492", + "rev": "68a8af93ff4297686cb68880845e61e5e2e41d92", "type": "github" }, "original": { @@ -923,11 +923,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1777578337, - "narHash": "sha256-Ad49moKWeXtKBJNy2ebiTQUEgdLyvGmTeykAQ9xM+Z4=", + "lastModified": 1777954456, + "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "15f4ee454b1dce334612fa6843b3e05cf546efab", + "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1", "type": "github" }, "original": { @@ -939,11 +939,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1777578337, - "narHash": "sha256-Ad49moKWeXtKBJNy2ebiTQUEgdLyvGmTeykAQ9xM+Z4=", + "lastModified": 1777954456, + "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "15f4ee454b1dce334612fa6843b3e05cf546efab", + "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1", "type": "github" }, "original": { @@ -955,11 +955,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1777673416, - "narHash": "sha256-5c2POKPOjU40Kh0MirOdScBLG0bu9TAuPYAtPRNZMBs=", + "lastModified": 1778003029, + "narHash": "sha256-q/nkKLDtHIyLjZpKhWk3cSK5IYsFqtMd6UtXF3ddjgA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "26ef669cffa904b6f6832ab57b77892a37c1a671", + "rev": "0c88e1f2bdb93d5999019e99cb0e61e1fe2af4c5", "type": "github" }, "original": { @@ -1007,11 +1007,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1777917094, - "narHash": "sha256-nhBnb6RAZt+ZBzxoK76t/3qGojDab9MQJteOYecYa1c=", + "lastModified": 1778285060, + "narHash": "sha256-kti9S5YVuAKG78KQBsGkTvFiIsOJrjuouogqcd1foyM=", "owner": "nix-community", "repo": "NUR", - "rev": "44ae25141598a7756dbb070c9a2abec090141c58", + "rev": "e27df49d002b1f0d560a4d80ccf2e6cc3bc7a008", "type": "github" }, "original": { @@ -1028,11 +1028,11 @@ ] }, "locked": { - "lastModified": 1777917094, - "narHash": "sha256-nhBnb6RAZt+ZBzxoK76t/3qGojDab9MQJteOYecYa1c=", + "lastModified": 1778285060, + "narHash": "sha256-kti9S5YVuAKG78KQBsGkTvFiIsOJrjuouogqcd1foyM=", "owner": "nix-community", "repo": "NUR", - "rev": "44ae25141598a7756dbb070c9a2abec090141c58", + "rev": "e27df49d002b1f0d560a4d80ccf2e6cc3bc7a008", "type": "github" }, "original": { @@ -1073,11 +1073,11 @@ ] }, "locked": { - "lastModified": 1777872738, - "narHash": "sha256-yiWvZBgVT/NkxxVpFYZ5p76EXm3CvQKZNh98Fw5Uyew=", + "lastModified": 1778120451, + "narHash": "sha256-MUSPD16+hoFBfQWYahtNLN2BIFEAlFFo2KNofrc947g=", "owner": "Fission-AI", "repo": "OpenSpec", - "rev": "435458be5658ec8774657acb197df7e84f0e7783", + "rev": "053d8a59d587f3c027a06ad80503a6b43d4f2a92", "type": "github" }, "original": { @@ -1094,11 +1094,11 @@ ] }, "locked": { - "lastModified": 1777872738, - "narHash": "sha256-yiWvZBgVT/NkxxVpFYZ5p76EXm3CvQKZNh98Fw5Uyew=", + "lastModified": 1778120451, + "narHash": "sha256-MUSPD16+hoFBfQWYahtNLN2BIFEAlFFo2KNofrc947g=", "owner": "Fission-AI", "repo": "OpenSpec", - "rev": "435458be5658ec8774657acb197df7e84f0e7783", + "rev": "053d8a59d587f3c027a06ad80503a6b43d4f2a92", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 86c0074..7c9a10a 100644 --- a/flake.nix +++ b/flake.nix @@ -148,7 +148,6 @@ ./hosts/AZ-CLD-1 agenix.nixosModules.default inputs.disko.nixosModules.disko - inputs.zugferd-service.nixosModules.default ]; }; AZ-PRM-1 = nixpkgs.lib.nixosSystem { @@ -161,6 +160,7 @@ agenix.nixosModules.default inputs.disko.nixosModules.disko inputs.azion-scheduler.nixosModules.default + inputs.zugferd-service.nixosModules.default ]; }; }; diff --git a/hosts/AZ-CLD-1/services/default.nix b/hosts/AZ-CLD-1/services/default.nix index 1e341d4..c248d8b 100644 --- a/hosts/AZ-CLD-1/services/default.nix +++ b/hosts/AZ-CLD-1/services/default.nix @@ -12,7 +12,6 @@ ./postgres.nix ./traefik.nix ./vaultwarden.nix - ./zugferd.nix # ./zammad.nix ]; } diff --git a/hosts/AZ-PRM-1/configuration.nix b/hosts/AZ-PRM-1/configuration.nix index ceebb0c..dc6e963 100644 --- a/hosts/AZ-PRM-1/configuration.nix +++ b/hosts/AZ-PRM-1/configuration.nix @@ -75,5 +75,39 @@ ]; }; + fileSystems."/mnt/DMS-ALT-INBOX" = { + device = "//192.168.152.104/01-E-RECHNUNG-DMS-ALT"; + fsType = "cifs"; + options = [ + "credentials=${config.age.secrets.smb-autoablage.path}" + "domain=az-group.local" + "uid=0" + "gid=0" + "file_mode=0777" + "dir_mode=0777" + "iocharset=utf8" + "nofail" + "x-systemd.automount" + "x-systemd.idle-timeout=60" + ]; + }; + + fileSystems."/mnt/DMS-INBOX" = { + device = "//192.168.152.97/01-E-RECHNUNG-DMS"; + fsType = "cifs"; + options = [ + "credentials=${config.age.secrets.smb-autoablage.path}" + "domain=az-group.local" + "uid=0" + "gid=0" + "file_mode=0777" + "dir_mode=0777" + "iocharset=utf8" + "nofail" + "x-systemd.automount" + "x-systemd.idle-timeout=60" + ]; + }; + system.stateVersion = "25.05"; } diff --git a/hosts/AZ-PRM-1/default.nix b/hosts/AZ-PRM-1/default.nix index c413841..80e6a1c 100644 --- a/hosts/AZ-PRM-1/default.nix +++ b/hosts/AZ-PRM-1/default.nix @@ -5,6 +5,7 @@ ./secrets.nix ./services ]; + extraServices = { podman.enable = true; }; diff --git a/hosts/AZ-PRM-1/services/default.nix b/hosts/AZ-PRM-1/services/default.nix index 437c613..4af02bc 100644 --- a/hosts/AZ-PRM-1/services/default.nix +++ b/hosts/AZ-PRM-1/services/default.nix @@ -10,5 +10,6 @@ ./printing.nix ./traefik.nix ./traefik-routing.nix + ./zugferd.nix ]; } diff --git a/hosts/AZ-PRM-1/services/n8n.nix b/hosts/AZ-PRM-1/services/n8n.nix index a06e284..7d24da5 100644 --- a/hosts/AZ-PRM-1/services/n8n.nix +++ b/hosts/AZ-PRM-1/services/n8n.nix @@ -1,4 +1,8 @@ -{config, ...}: let +{ + config, + lib, + ... +}: let serviceName = "n8n"; servicePort = config.m3ta.ports.get serviceName; in { @@ -7,8 +11,11 @@ in { environment = { 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"; }; }; + systemd.services.n8n.serviceConfig = { EnvironmentFile = ["${config.age.secrets.n8n-env.path}"]; }; diff --git a/hosts/AZ-CLD-1/services/zugferd.nix b/hosts/AZ-PRM-1/services/zugferd.nix similarity index 100% rename from hosts/AZ-CLD-1/services/zugferd.nix rename to hosts/AZ-PRM-1/services/zugferd.nix diff --git a/hosts/common/users/sascha.koenig.nix b/hosts/common/users/sascha.koenig.nix index 669c6aa..127cfec 100644 --- a/hosts/common/users/sascha.koenig.nix +++ b/hosts/common/users/sascha.koenig.nix @@ -62,11 +62,10 @@ nitch.enable = true; television.enable = true; }; - secrets.enable = true; + secrets.enable = false; }; } else { - # m3-helios, m3-hermes, m3-aether — minimal server base = { shell = { fish.enable = true;