diff options
| author | Parthiv Seetharaman <pachum99@myrdd.info> | 2022-09-23 18:36:45 +0000 |
|---|---|---|
| committer | Parthiv Seetharaman <pachum99@myrdd.info> | 2022-09-23 18:36:45 +0000 |
| commit | 0b1be3194ae47fa0b2cbfd976955b2b66e0a8838 (patch) | |
| tree | 4fc042baf5a808cecc60755c0a40a515d051561b /examples | |
| parent | 41c1418781dbdfae5d1c15a29b7f1b8f67e5d69f (diff) | |
| parent | 3bc5c2e64eff2cbc67ec94a938616d549c42ce52 (diff) | |
Merge branch 'nh21-main-patch-49792' into 'main'
mautrix.nix: Fix typo in systemd directive (missing "s" in "JoinsNamespaceOf")
See merge request coffeetables/nix-matrix-appservices!11
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/mautrix.nix | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/examples/mautrix.nix b/examples/mautrix.nix index c5f0b34..7705579 100644 --- a/examples/mautrix.nix +++ b/examples/mautrix.nix @@ -3,8 +3,16 @@ { # Mautrix-signal settings services.signald.enable = true; - systemd.services.matrix-as-signal.requires = [ "signald.service" ]; - systemd.services.matrix-as-signal.after = [ "signald.service" ]; + systemd.services.matrix-as-signal = { + requires = [ "signald.service" ]; + after = [ "signald.service" ]; + unitConfig = { + JoinsNamespaceOf = "signald.service"; + }; + path = [ + pkgs.ffmpeg # voice messages need `ffmpeg` + ]; + }; services.matrix-appservices = { addRegistrationFiles = true; @@ -27,7 +35,6 @@ package = pkgs.mautrix-signal; serviceConfig = { StateDirectory = [ "matrix-as-signal" "signald" ]; - JoinNamespaceOf = "signald.service"; SupplementaryGroups = [ "signald" ]; }; settings.signal = { |