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/postfix: support alternate smtp ports when relaying #30685

Merged
merged 2 commits into from Nov 1, 2017
Merged

nixos/postfix: support alternate smtp ports when relaying #30685

merged 2 commits into from Nov 1, 2017

Conversation

srhb
Copy link
Contributor

@srhb srhb commented Oct 22, 2017 •
edited

Motivation for this change

Adds an option services.postfix.relayPort to support using an alternative smtp port when using a regular relay.

Things done

Tested ability to send via relay with and without relayPort set.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@srhb
Copy link
Contributor Author

srhb commented Oct 22, 2017

I altered this such that 25 is the default value of relayPort, and it is always included explicitly unless the relayHost is empty string (since relayhost = :25 is not valid)

@srhb
Copy link
Contributor Author

srhb commented Oct 22, 2017

Ugh, actually, this changes the logic. Set to WIP while I figure out the consequences...

@srhb srhb changed the title nixos/postfix: support alternate smtp ports when relaying nixos/postfix: WIP support alternate smtp ports when relaying Oct 22, 2017
@srhb srhb changed the title nixos/postfix: WIP support alternate smtp ports when relaying nixos/postfix: support alternate smtp ports when relaying Oct 22, 2017
@srhb
Copy link
Contributor Author

srhb commented Oct 24, 2017

This should be ready for merge now. Should I squash? :)

@fpletz fpletz requested a review from qknight October 25, 2017 08:22
@qknight
Copy link
Member

qknight commented Oct 27, 2017

@srhb looks good but i can't test it at the moment. did you test it?

@srhb
Copy link
Contributor Author

srhb commented Oct 28, 2017

@qknight Yep, every possible outcome.

@qknight
Copy link
Member

qknight commented Oct 31, 2017

@srhb currently has conflicts, if you fix them once more we merge it afterwards. thanks!

@qknight qknight merged commit 2ddcdcc into NixOS:master Nov 1, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@qknight qknight Awaiting requested review from qknight

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@srhb @qknight