From 6b972097034acf7e759d15b00b05da2fcf493383 Mon Sep 17 00:00:00 2001 From: Jurn Wubben Date: Sun, 20 Jul 2025 13:28:17 +0200 Subject: [PATCH] BreadDcbot; fixed infinite recursion and made secrete available to user --- secrets/default.nix | 7 +++++++ system/server/derekBot.nix | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/secrets/default.nix b/secrets/default.nix index 12e4986..99356d8 100644 --- a/secrets/default.nix +++ b/secrets/default.nix @@ -13,6 +13,13 @@ in { then serviceUser "dcbot" # "dcbot" doesn't exist on e.g laptop. else "root"; }; + bread-dcbot = { + file = ./bread-dcbot.age; + owner = + if config.niksos.server + then serviceUser "bread-dcbot" # "dcbot" doesn't exist on e.g laptop. + else "root"; + }; password.file = ./password.age; matrix-registration = { file = ./matrix-registration.age; diff --git a/system/server/derekBot.nix b/system/server/derekBot.nix index 78f3810..fbd1911 100644 --- a/system/server/derekBot.nix +++ b/system/server/derekBot.nix @@ -15,7 +15,7 @@ + ( if !cfg then "" - else config.systemd.services.bread-dcbot.serviceConfig.StateDirectory + else userGroup ) + "/"; programDir = mainDir + "program"; @@ -23,11 +23,11 @@ path = builtins.concatStringsSep ":" (map (x: "${x}/bin/") [pkgs.coreutils pkgs.typst pkgs.deno]); in { config = lib.mkIf config.niksos.server { - systemd.services.bread-dcbot = { + systemd.services.${userGroup} = { enable = true; after = ["network.target"]; wantedBy = ["default.target"]; - description = "Breadener bot or smt."; + description = userGroup; environment = { "DENO_DIR" = denoDir;