matrix-synapse: Add module parameter extraConfigFiles #33276
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
joachifm
reviewed
Jan 6, 2018
| ExecStart = "${cfg.package}/bin/homeserver --config-path ${configFile} --keys-directory ${cfg.dataDir}"; | ||
| ExecStart = '' | ||
| ${cfg.package}/bin/homeserver \ | ||
| --config-path ${ concatStringsSep " \\\n --config-path " ([ configFile ] ++ cfg.extraConfigFiles) } \ |
There was a problem hiding this comment.
Hm, can you show me the desired expansion here? Just eyeballing this, it seems off to me. What about
lib.concatMapStringsSep " " (x: "--config-path ${x}") ([ configFile ] ++ cfg.extraConfigFiles)There was a problem hiding this comment.
Yep sure, here is a snipped from a machine which I did produce this way:
ExecStart=/nix/store/f4g8ym6pk6w3g8fb1wk3b4g75p1vfhhl-python2.7-matrix-synapse-0.25.1/bin/homeserver \
--config-path /nix/store/nmnb1zmni95csqfljwidiyz5mwgn3r1c-homeserver.yaml \
--config-path /run/keys/matrix-synapse-secret-config \
--keys-directory /var/lib/matrix-synapse
Still, using the other function is a better approach, it would be more obvious for the reader, I'll update it based on concatMapStringsSep, hope I'll find some time for it today.
This allows to configure additional configuration files for Synapse. This way secrets can be kept in a secure place on the file system without a need to go through the Nix store.
|
Got it updated, example results form quick local test runs. Using no And using |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This allows to configure additional configuration files for Synapse. This way
secrets can be kept in a secure place on the file system without a need to go
through the Nix store.
Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)