nixos/automx2: multi-domain support, service improvements, configurability #370074
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
github-actions
bot
added
6.topic: python
6.topic: nixos
eliasp
force-pushed
the
automx2-improvements
branch
2 times, most recently
from
a016f94 to
d980834
Compare
Comment on lines
+14
to
+27
| check = | ||
| x: | ||
| if !builtins.isAttrs x then | ||
| false | ||
| else if !lib.types.str.check x.type then | ||
| false | ||
| else if x.type != "imap" && x.type != "smtp" then | ||
| false | ||
| else if !lib.types.str.check x.name then | ||
| false | ||
| else if !lib.types.port.check x.port then | ||
| false | ||
| else | ||
| true; |
There was a problem hiding this comment.
Do you refer to the individual checks or the overall approach?
- individual checks: I'll add comments to make them easier to understand
- general approach: my goal was, to properly validate the JSON datastructure that needs to be passed to
/initdbto catch issues at evaluation instead of at runtime with a failing service startup…- Is there a better way than using custom types?
- Is my approach of using type checks wrong?
Comment on lines
+32
to
+53
| check = | ||
| x: | ||
| if !builtins.isAttrs x then | ||
| false | ||
| else if | ||
| !builtins.all (key: builtins.hasAttr key x) [ | ||
| "type" | ||
| "url" | ||
| "port" | ||
| ] | ||
| then | ||
| false | ||
| else if !lib.types.str.check x.type then | ||
| false | ||
| else if x.type != "caldav" && x.type != "carddav" then | ||
| false | ||
| else if !lib.types.str.check x.url then | ||
| false | ||
| else if !lib.types.port.check x.port then | ||
| false | ||
| else | ||
| true; |
Comment on lines
+58
to
+67
| check = | ||
| x: | ||
| if !lib.isList x then | ||
| false | ||
| else if builtins.length x < 1 then | ||
| false | ||
| else if !lib.all (item: imapSmtpServerType.check item || davServerType.check item) x then | ||
| false | ||
| else | ||
| true; |
| @@ -30,6 +32,15 @@ buildPythonPackage rec { | |||
| flask | |||
| flask-migrate | |||
| ldap3 | |||
| pythonPackages.sdnotify | |||
There was a problem hiding this comment.
Suggested change
| pythonPackages.sdnotify | |
| sdnotify |
There was a problem hiding this comment.
The nixos/automx2: deprecate sleep hack, use sdnotify commit can be squashed into the last commit
There was a problem hiding this comment.
I think you referred to the commit which introduced sdnotify support, but since this one targeted the pkg and not the module, this shouldn't be done.
eliasp
force-pushed
the
automx2-improvements
branch
from
8c22197 to
059e077
Compare
eliasp
force-pushed
the
automx2-improvements
branch
from
059e077 to
49f470c
Compare
eliasp
force-pushed
the
automx2-improvements
branch
2 times, most recently
from
04f20f9 to
ee633d2
Compare
The existing approach only allowed to configure a single domain, while the upstream project itself supports multiple ones. By changing the option `domain` from a string to the option `domains` being a list and then configuring the nginx virtualHosts accordingly, multi-domain support works now as expected.
Since `automx2` is stateless in its current form, there's no need for `StateDirectory=` and `WorkingDirectory=`.
This release adds support for `sd_notify()`, which allows the corresponding `services.automx2` module to deprecate a `sleep` workaround. See also: rseichter/automx2#29
Eliminate the `sleep` hack before sending a request to `/initdb` by utilizing systemd's sdnotify which allows a more deterministic and race-free execution of `ExecStartPost=` processes once the service is ready.
eliasp
force-pushed
the
automx2-improvements
branch
from
ee633d2 to
89aa312
Compare
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 PR adds multiple improvements to the
automx2service, such as:settingsas proper validated option instead of a plain JSON stringDynamicUser=and get rid of extra service userSince this is still WIP and only a draft PR so far, pinging @SuperSandro2000 as the original committer of this module for early input.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.