nixos/rspamd: Remove non-working socket activation #47449
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
Mic92
reviewed
Sep 28, 2018
| SocketMode = mkIf (isUnixSocket each.value.socket) each.value.mode; | ||
| }; | ||
| }; | ||
| }) allMappedSockets)); | ||
| }; | ||
| imports = [ | ||
| (mkRenamedOptionModule [ "services" "rspamd" "bindSocket" ] [ "services" "rspamd" "workers" "normal" "bindSockets" ]) |
There was a problem hiding this comment.
Please also add it as mkRemovedOptionModule here.
griff
force-pushed
the
remove-rspamd-socket-activation
branch
from
c7eaf25
to
1de5c28
Compare
|
@Mic92 it was bit late when I made this so I forgot the Should be fixed now. |
Mic92
added
the
9.needs: port to stable
|
|
The socket activation I added to the rspamd module doesn't actually work and can't be made to work without changes to rspamd. See: NixOS#47421 See: rspamd/rspamd#2035
griff
force-pushed
the
remove-rspamd-socket-activation
branch
from
1de5c28
to
783a58f
Compare
|
@xeji I clearly shouldn't make PRs late at night. The test is now removed. |
|
Great. Let me run the remaining tests locally before merging. |
|
Tests run fine here. |
|
backported to 18.09 in 3108f74 |
samueldr
removed
the
9.needs: port to stable
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
The socket activation I added to the rspamd module doesn't actually work
and can't be made to work without changes to rspamd.
See: #47421
See: rspamd/rspamd#2035
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)