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/nextcloud: suggest poolConfig option #48094

Merged
merged 2 commits into from Oct 11, 2018
Merged

nixos/nextcloud: suggest poolConfig option #48094

merged 2 commits into from Oct 11, 2018

Conversation

Vskilet
Copy link
Contributor

@Vskilet Vskilet commented Oct 9, 2018

Motivation for this change

I suggest to add options for the poolConfig because on my server, default config is really slow and it's missing pm.max_requests
Do you think it's usefull ?

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.

eqyiel
eqyiel reviewed Oct 9, 2018
View reviewed changes
nixos/modules/services/web-apps/nextcloud.nix Outdated
@@ -114,6 +114,21 @@ in {
'';
};

poolConfig = mkOption {
type = types.str;
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this might be a types.lines?

@eqyiel
Copy link
Contributor

eqyiel commented Oct 9, 2018

Note that you can use services.phpfpm.pools.nextcloud.extraConfig like this: https://github.com/eqyiel/dotfiles/blob/dff548627e65fd06a318de4d38f892768eaec1b0/nix/.config/nixpkgs/nixops/realms/maher.fyi/config/nextcloud.nix#L65-L68

I can see how it might be useful to override the default completely though.

@Vskilet
Copy link
Contributor Author

Vskilet commented Oct 10, 2018

Hi @eqyiel, thanks to review this pull request ! So I follow your guidelines. Is that ok for you ?

@eqyiel
Copy link
Contributor

eqyiel commented Oct 10, 2018 •
edited

@Vskilet It looks reasonable to me but I don't have commit rights to this repo, so you'll have to convince someone else 😅

fpletz
fpletz approved these changes Oct 11, 2018
View reviewed changes
Copy link
Member

@fpletz fpletz left a comment

Choose a reason for hiding this comment

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

Cool, thanks! It's better to make the pm options overrideable like this so that the other options don't have to be repeated in this case.

@fpletz
Copy link
Member

fpletz commented Oct 11, 2018

@GrahamcOfBorg test nextcloud

@GrahamcOfBorg
Copy link

Success on aarch64-linux

Attempted: tests.nextcloud

No partial log is available.

@GrahamcOfBorg
Copy link

Success on x86_64-linux

Attempted: tests.nextcloud

No partial log is available.

@fpletz fpletz merged commit 2dcd512 into NixOS:master Oct 11, 2018
globin pushed a commit to flokli/nixpkgs that referenced this pull request Oct 21, 2018
@Vskilet @globin
nixos/nextcloud: add poolConfig option (NixOS#48094)
06c7170 
(cherry picked from commit 2dcd512)
globin pushed a commit that referenced this pull request Oct 21, 2018
@Vskilet @globin
nixos/nextcloud: add poolConfig option (#48094)
2026505 
(cherry picked from commit 2dcd512)
@Vskilet Vskilet deleted the nextcloud-poolConfig branch May 1, 2020 15:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eqyiel eqyiel eqyiel left review comments

@fpletz fpletz fpletz 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
4 participants
@Vskilet @eqyiel @fpletz @GrahamcOfBorg