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.

Sign up for GitHub

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/nomad: add extraSettingsPaths option to nomad service #109761

Merged
merged 13 commits into from
Jan 23, 2021
Merged

nixos/nomad: add extraSettingsPaths option to nomad service #109761

merged 13 commits into from
Jan 23, 2021

Conversation

cpcloud
Copy link
Contributor

@cpcloud cpcloud commented Jan 18, 2021 •
edited
Loading

Motivation for this change

Add the ability to use multiple configuration files with the nomad service.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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.

@ofborg ofborg bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Jan 18, 2021
@aanderse
Copy link
Member

#108411

roberth
roberth reviewed Jan 19, 2021
View reviewed changes
nixos/modules/services/networking/nomad.nix Outdated Show resolved Hide resolved
nixos/modules/services/networking/nomad.nix Outdated Show resolved Hide resolved
nixos/modules/services/networking/nomad.nix Outdated Show resolved Hide resolved
nixos/modules/services/networking/nomad.nix Outdated Show resolved Hide resolved
roberth
roberth reviewed Jan 23, 2021
View reviewed changes
nixos/tests/nomad.nix Outdated Show resolved Hide resolved
@cpcloud cpcloud mentioned this pull request Jan 23, 2021
Merged
10 tasks
Phillip Cloud and others added 13 commits January 23, 2021 17:16
nixos/nomad: add settingsFiles configuration option to nomad service
ae3e0eb
nixos/nomad: revert small argument passing change
0cf1dbc
@cpcloud @roberth
Apply suggestions from code review
74a9853 
Co-authored-by: Robert Hensing <[email protected]>
nixos/nomad: refer to extraSettingsPaths variable
b1ee24e
nixos/nomad: add simple test
8709da6
nixos/nomad: remove cfg.extraSettingsPaths from restartTriggers
fc102bf
nixos/nomad: remove documentation about restarts
18262fe
nixos/nomad: add documentation calling out the ability to use directo…
f20c0fd 
…ries
nixos/nomad: remove unnecessary open firewall ports
984c07d
nixos/nomad: make variable name accurate
180006b
@cpcloud @roberth
nixos/nomad: use non store path for test
528fb00 
Co-authored-by: Robert Hensing <[email protected]>
nixos/tests: remove unnecessary config argument from nomad test
bdc00d6
nixos/tests: remove data_dir argument from test
0c52d11
@cpcloud
Copy link
Contributor Author

cpcloud commented Jan 23, 2021

@roberth Is this good to merge?

@roberth roberth changed the title nixos/nomad: add settingsFiles configuration option to nomad service nixos/nomad: add extraSettingsFiles option to nomad service Jan 23, 2021
@roberth roberth changed the title nixos/nomad: add extraSettingsFiles option to nomad service nixos/nomad: add extraSettingsPaths option to nomad service Jan 23, 2021
@roberth roberth merged commit f1778cd into NixOS:master Jan 23, 2021
@roberth
Copy link
Member

roberth commented Jan 23, 2021

Thanks you @cpcloud !

@cpcloud cpcloud deleted the nomad-settings-files branch January 23, 2021 22:59
@cpcloud
Copy link
Contributor Author

cpcloud commented Jan 23, 2021

No, thank you for the great review and the merge!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@roberth roberth roberth approved these changes

@aanderse aanderse Awaiting requested review from aanderse

@nh2 nh2 Awaiting requested review from nh2

@lovesegfault lovesegfault Awaiting requested review from lovesegfault

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@cpcloud @aanderse @roberth @lovesegfault