From 46a2c75a596b292d02d8647dfb44205dd876fd6f Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 14 Dec 2021 17:06:19 +0100 Subject: docs(ops/irccat): link to credentials RFE https://cl.tvl.fyi/c/depot/+/4264 did move merging config with secrets into ExecStart=, which is tracked in an RFE upstream: https://github.com/systemd/systemd/issues/19604#issuecomment-989279884 We didn't link to this so far, neither in the commit message, nor in a comment. Let's add a comment, so people know when we can undo this. Change-Id: I7bed370b671093bb876592b4dccd562f1c256cd2 Reviewed-on: https://cl.tvl.fyi/c/depot/+/4326 Tested-by: BuildkiteCI Autosubmit: flokli Reviewed-by: tazjin Reviewed-by: grfn --- ops/modules/irccat.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'ops/modules/irccat.nix') diff --git a/ops/modules/irccat.nix b/ops/modules/irccat.nix index 9b4b96d3addf..deb0b4ecaf34 100644 --- a/ops/modules/irccat.nix +++ b/ops/modules/irccat.nix @@ -11,6 +11,10 @@ let # then recursively merge it with an on-disk secret using jq on # service launch. configJson = pkgs.writeText "irccat.json" (builtins.toJSON cfg.config); + + # Right now, merging configuration file with secrets and running the main + # application needs to happen both in ExecStart=, due to + # https://github.com/systemd/systemd/issues/19604#issuecomment-989279884 mergeAndLaunch = pkgs.writeShellScript "merge-irccat-config" '' if [ ! -f "$CREDENTIALS_DIRECTORY/secrets" ]; then echo "irccat secrets file is missing" -- cgit 1.4.1