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

Jump to bottom

nixos/graylog: use types.lines for extraConfig #64390

Merged
merged 1 commit into from Jul 7, 2019
Merged

nixos/graylog: use types.lines for extraConfig #64390

merged 1 commit into from Jul 7, 2019

Conversation

Ma27
Copy link
Member

@Ma27 Ma27 commented Jul 6, 2019 •
edited

Motivation for this change

The types.lines type makes it possible to define extraConfig in
multiple files and simply concat the contents.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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 nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@Ma27
nixos/graylog: use types.lines for extraConfig
98eccab 
The `types.lines` type makes it possible to define `extraConfig` in
multiple files and simply concat the contents.
@Ma27
Copy link
Member Author

Ma27 commented Jul 6, 2019

cc @fadenb

fadenb
fadenb approved these changes Jul 6, 2019
View reviewed changes
Copy link
Contributor

@fadenb fadenb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks fine.
I assume the chance of this breaking any existing setup is almost zero?

@Ma27
Copy link
Member Author

Ma27 commented Jul 6, 2019

I assume the chance of this breaking any existing setup is almost zero?

I'd say yes. Until now evaluation would fail when having multiple extraConfig declarations at the same priority and hence an undeployable configuration.

@teto teto merged commit beff2f8 into NixOS:master Jul 7, 2019
@Ma27 Ma27 deleted the graylog-multiple-extra-config branch July 7, 2019 12:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fadenb fadenb fadenb approved these changes

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Ma27 @fadenb @teto