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.

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

zoneminder: fix nginx config #65971

Merged
merged 1 commit into from Nov 8, 2019
Merged

zoneminder: fix nginx config #65971

merged 1 commit into from Nov 8, 2019

Conversation

jb55
Copy link
Contributor

@jb55 jb55 commented Aug 4, 2019 •
edited

For some reason it doesn't seem to load things in the cache directory
properly without this slash.

Looks like this regression may have been introduced in:

commit 19851ec
nixos/zoneminder: Fix nginx config check

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 nix-review --run "nix-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @peterhoeg
cc @JohnAZoidberg

@jb55
zoneminder: fix nginx config
8a24d2b 
For some reason it doesn't seem to load things in the cache directory
properly without this slash.

Looks like this regression may have been introduced in:

  commit 19851ec
  nixos/zoneminder: Fix nginx config check

Cc: Daniel Schaefer <git@danielschaefer.me>
Cc: Peter Hoeg <peter@hoeg.com>

Signed-off-by: William Casarin <jb55@jb55.com>
@peterhoeg
Copy link
Member

Looks fine to me. I don't use ZM any longer, so I cannot test it out though. @JohnAZoidberg ?

JohnAZoidberg
JohnAZoidberg approved these changes Nov 7, 2019
View reviewed changes
Copy link
Member

@JohnAZoidberg JohnAZoidberg left a comment

Choose a reason for hiding this comment

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

I don't use it either, so I didn't test it fully after my change.
The slash looks good.

@peterhoeg peterhoeg merged commit d2f0831 into NixOS:master Nov 8, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JohnAZoidberg JohnAZoidberg JohnAZoidberg 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
@jb55 @peterhoeg @JohnAZoidberg