systemd.nspawn: add definition #18320
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
|
@groxxda, thanks for your PR! By analyzing the annotation information on this pull request, we identified @edolstra, @bjornfor and @offlinehacker to be potential reviewers |
|
|
||
| }; | ||
|
|
||
| config = mkIf config.systemd.nspawn.enable { |
There was a problem hiding this comment.
Maybe config.systemd.nspawn.enable can be removed and this line replaced by something like mkIf (cfg.instances != {} || cfg.units != {}) like done in other in modules with similar a structure?
There was a problem hiding this comment.
Sounds like a clear improvement without drawbacks so I'll implement it
| description = "Definition of systemd-nspawn configurations."; | ||
| }; | ||
|
|
||
| systemd.nspawn.units = mkOption { |
There was a problem hiding this comment.
Probably it would be better to combine systemd.nspawn.instances and systemd.nspawn.units into a single option, with one attribute per machine. E.g. rather than
systemd.nspawn.instances.webserver = { X };
systemd.nspawn.units.webserver = { Y };
you would have
systemd.nspawn.machines.webserver = { X; Y; };
this adds the option to manage systemd.nspawn files via config.systemd.nspawn. The files are placed in "/etc/systemd/nspawn".
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.
Motivation for this change
systemd-nspawncan be configured via.nspawnfiles. This PR adds a nixos module to manage these files.In the end I want to simplify nixos-containers and make more use of upstream defaults, this is the first step but may be useful on its own.
CC @fpletz
Things done
(nix.useSandbox on NixOS,
or option
build-use-sandboxinnix.confon non-NixOS)
nix-shell -p nox --run "nox-review wip"./result/bin/)this adds the option to manage systemd.nspawn files via
config.systemd.nspawn. The files are placed in "/etc/systemd/nspawn".