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

Searxng rework #346777

Draft
wants to merge 9 commits into
base: master
Choose a base branch
from
Draft

Conversation

SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented Oct 6, 2024

After discovering that I had missed adding the uwsgi_params to my nginx config I thought we need an option to add a working nginx config automatically.

While I was at it, I also gave the module a spring clean.

Requires #346776

fyi @999eagle

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

Copy link
Contributor

@999eagle 999eagle left a comment

Choose a reason for hiding this comment

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

generally looks really good, the explicit nginx configuration is very nice! just a few suggestions on improving this (and of course excluding the changes from the general nginx/uwsgi rework)

upstreams.searx.servers."unix:${config.services.uwsgi.instance.vassals.searx.socket}" = { };
virtualHosts."${cfg.domain}".locations = {
"/" = {
uwsgiPass = "searx";
Copy link
Contributor

Choose a reason for hiding this comment

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

is there any reason why this needs to be an nginx upstream instead of just configuring uswgiPass = "unix:..."; directly here?

Copy link
Member Author

Choose a reason for hiding this comment

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

Good question!

It was conflicting with my config but through the user of explicit uwsgiPass we could drop this again as I can cleanly overwrite it.

Comment on lines +304 to +306
nginx = lib.mkIf cfg.configureNginx {
extraGroups = [ "searx" ];
};
Copy link
Contributor

Choose a reason for hiding this comment

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

setting systemd.services.nginx.serviceConfig.SupplementaryGroups = ["searx"]; seems like the better option for this

include ${config.services.nginx.package}/conf/uwsgi_params;
'';
};
"/static/".alias = lib.mkDefault "${config.services.searx.package}/share/static/";
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
"/static/".alias = lib.mkDefault "${config.services.searx.package}/share/static/";
"/static/".alias = lib.mkDefault "${cfg.package}/share/static/";

RemainAfterExit = true;
User = "searx";
RuntimeDirectory = "searx";
RuntimeDirectoryMode = "750";
Copy link
Contributor

Choose a reason for hiding this comment

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

we should add RuntimeDirectoryPreserve = "yes"; here to keep the socket dir around over restart/stop-start of searx-init.service.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants