Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

matterbridge module: add configPath option as a workaround, waiting for nix encryption #39455

Merged
merged 1 commit into from May 6, 2018

Conversation

Ekleog
Copy link
Member

@Ekleog Ekleog commented Apr 24, 2018

Motivation for this change

Waiting for NixOS/rfcs/pull/5 , files including secrets should not be set in the nix store, so adding a configPath option as workaround.

I've tested this PR with nixos-rebuild and nix-diff: with the same configuration, absolutely no change happens (apart from the nixos-version hash change). With configPath set, the parameter appears to be properly set.

I think that, as a security fix, this deserves backport to 18.03.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@Ekleog
Copy link
Member Author

Ekleog commented Apr 24, 2018

For easy review, the diff is unexpectedly big due to my removing a useless mkMerge, which reduces indentation and generates a diff. The only real changes in the config section are the removal of the useless mkMerge, and the replacement of mkIf with optional in the users/groups definition.

@joachifm joachifm merged commit e97d8fc into NixOS:master May 6, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants