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/gitea: Don't include not needed database options depending on type #60197

Merged
merged 1 commit into from Apr 27, 2019
Merged

nixos/gitea: Don't include not needed database options depending on type #60197

merged 1 commit into from Apr 27, 2019

Conversation

etu
Copy link
Contributor

@etu etu commented Apr 25, 2019

Motivation for this change

This was discovered in #60014

If this works as I expect I think we should backport #60014 to stable together with this fix, to get the security fixes over there at stable.

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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

cc @ajs124 @srhb

@etu etu requested a review from srhb April 25, 2019 06:36
@etu etu requested a review from infinisil as a code owner April 25, 2019 06:36
@etu
Copy link
Contributor Author

etu commented Apr 25, 2019

@GrahamcOfBorg build nixosTests.gitea

@ajs124
Copy link
Member

ajs124 commented Apr 25, 2019

👍 works for me (on 19.03). Thanks for looking into this.

@etu
Copy link
Contributor Author

etu commented Apr 25, 2019

@ajs124 Thanks for discovering this and bringing it up :-)

@srhb
Copy link
Contributor

srhb commented Apr 26, 2019

Hey, sorry I'm late. I still don't understand why this is necessary. As far as I can tell, the path is already (properly) ignored for other databases. How do I reproduce any issue that makes this PR necessary?

@ajs124
Copy link
Member

ajs124 commented Apr 27, 2019

I haven't found a really good reproducer yet, but one (potentially big) difference between the test and my deployment is that I don't explicitly set services.gitea.database.socket. That shouldn't lead to the error I was seeing, though.

And now it looks like I can't reproduce it anymore on my own setup, great.

I'd still say that it's cleaner this way, but it looks like it might not be necessary, after all.

@srhb srhb merged commit 22348f9 into NixOS:master Apr 27, 2019
@etu etu deleted the patch-gitea-generated-config branch April 28, 2019 18:21
@etu etu mentioned this pull request May 1, 2019
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@srhb srhb Awaiting requested review from srhb

@infinisil infinisil Awaiting requested review from infinisil

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
@etu @ajs124 @srhb