about summary refs log tree commit diff
path: root/ops
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2021-12-14T16·06+0100
committerclbot <clbot@tvl.fyi>2021-12-14T17·30+0000
commit46a2c75a596b292d02d8647dfb44205dd876fd6f (patch)
treee7c35f23fda6f625ebbd349bc105cbef92a1935b /ops
parentb3c4057f4bcb770785ba7147e40aa98e38171d08 (diff)
docs(ops/irccat): link to credentials RFE r/3244
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 <flokli@flokli.de>
Reviewed-by: tazjin <mail@tazj.in>
Reviewed-by: grfn <grfn@gws.fyi>
Diffstat (limited to 'ops')
-rw-r--r--ops/modules/irccat.nix4
1 files changed, 4 insertions, 0 deletions
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"