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/znc: Fix regressions introduced in #45470 #48756

Merged
merged 2 commits into from Oct 20, 2018
Merged

nixos/znc: Fix regressions introduced in #45470 #48756

merged 2 commits into from Oct 20, 2018

Conversation

infinisil
Copy link
Member

@infinisil infinisil commented Oct 20, 2018 •
edited

These bugs were introduced in #45470

Motivation for this change

hyper_ch reported the extraZncConf one on IRC. I mistakenly moved the extraZncConf lines to the user config section, when it should have stayed in the global section.

Then I noticed the uriPrefix one myself when double checking that I didn't miss anything in the cleanup.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

@infinisil
nixos/znc: Fix confOptions.uriPrefix not being applied
1fa1bcb 
This was overlooked on a rebase of mine on master, when I didn't realize
that in the time of me writing the znc changes this new option got
introduced.
@infinisil infinisil changed the title nixos/znc: Fix confOptions.extraZncConf being applied to wrong section nixos/znc: Fix regressions introduced in #45470 Oct 20, 2018
sjau
sjau approved these changes Oct 20, 2018
View reviewed changes
Copy link

@sjau sjau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now it works again with a ssl cert.

@infinisil
Copy link
Member Author

(@sjau is referring to the SSLCertFile option they put into the extraZncConf option)

I tested the uriPrefix fix myself, behaves like originally intended.

@infinisil infinisil merged commit 2146c6d into NixOS:master Oct 20, 2018
@infinisil infinisil deleted the fix/znc-extraZncConf branch October 20, 2018 19:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sjau sjau sjau approved these changes

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@infinisil @sjau @GrahamcOfBorg