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

nixos/n8n: correct configuration, webhookUrl type #241783

Merged
merged 2 commits into from
Jul 7, 2023

Conversation

gmemstr
Copy link
Member

@gmemstr gmemstr commented Jul 5, 2023

Description of changes

(okay attempt 3. I'm really sorry for the confusion from the last PR that requested a review from everyone. I can't git at the moment apparently)

I realised in #240189 I made some minor errors in the service definition. The webhook URL configuration option wasn't properly passed through to the systemd configuration, and we can use the better types.str type over types.string.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.11 Release Notes (or backporting 23.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.

I realised in NixOS#240189 I made some minor errors in the service definition.
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Jul 5, 2023
Copy link
Member

@fabianhjr fabianhjr left a comment

Choose a reason for hiding this comment

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

Fixes a warning on nixos-rebuild

LGTM

@fabianhjr fabianhjr added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jul 5, 2023
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Jul 5, 2023
Copy link
Member

@Janik-Haag Janik-Haag left a comment

Choose a reason for hiding this comment

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

Can you add a test that would have caught this to nixos/tests/n8n.nix?

@gmemstr
Copy link
Member Author

gmemstr commented Jul 7, 2023

@Janik-Haag How would you recommend testing for something like this? I've gone through a few of the existing test files but I'm unsure how to test that the environment variable is correctly set in the systemd unit.

@Janik-Haag
Copy link
Member

You can check if the string of cfg.webhookUrl is in the systemd file which gets placed in /etc/systemd/system/

@gmemstr
Copy link
Member Author

gmemstr commented Jul 7, 2023

Gave it my best shot :D Fairly straightforward

Copy link
Member

@Janik-Haag Janik-Haag left a comment

Choose a reason for hiding this comment

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

Noice, thanks for adding the testcase :D

@Janik-Haag Janik-Haag merged commit e46ab54 into NixOS:master Jul 7, 2023
@gmemstr gmemstr deleted the n8n-tweaks branch July 7, 2023 21:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants