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/grafana: add default value back to settings.server.socket #197987

Merged
merged 1 commit into from
Oct 31, 2022

Conversation

SuperSandro2000
Copy link
Member

Description of changes
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/)
  • 22.11 Release Notes (or backporting 22.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@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 Oct 26, 2022
@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 Oct 26, 2022
@KFearsoff
Copy link
Contributor

The reason I have removed the default value was because Grafana default for server.socket1 is /tmp/grafana.sock`, which I think is not particularly useful, so I felt that by removing the default value outright I give the user a need to choose.

That said, I don't know much about sockets and I don't feel strongly about that default, so LGTM.

@SuperSandro2000
Copy link
Member Author

The default place for sockets in NixOS is /run/$name/$name.sock. Also if you use the socket in services.nginx.upstreams.<name>.servers then nginx will just crash on startup.

@KFearsoff
Copy link
Contributor

Yeah, I also thought about the /run/$name/$name.sock convention when I saw the PR. The change makes sense. I don't have the necessary permissions to do so on Github, but I approve of the change.

@SuperSandro2000
Copy link
Member Author

I think you should be able to leave a approval review but you can't merge it.

@SuperSandro2000 SuperSandro2000 merged commit b99b284 into NixOS:master Oct 31, 2022
@SuperSandro2000 SuperSandro2000 deleted the grafana-socket branch October 31, 2022 00:45
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants