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/murmur: support setting custom stateDir, user and group #348534

Merged
merged 2 commits into from
Oct 30, 2024

Conversation

DCsunset
Copy link
Member

This PR supports setting custom state directory, user and group for the Murmur service:

  • The custom state directory is helpful when you want to manage the state in a different place for backup or sync.
  • The user and group options allow the service to run as existing users so that permissions can be managed more easily

The stateDir, user, and group options are common in other modules as well. It should be easy for users to use and bring no breaking changes.

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.

@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 14, 2024
@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 14, 2024
Copy link
Member

@felixsinger felixsinger left a comment

Choose a reason for hiding this comment

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

<policy user="murmur">
            <allow own="net.sourceforge.mumble.murmur"/>
</policy>

Policy user needs to be changed as well.

Copy link
Member

@felixsinger felixsinger left a comment

Choose a reason for hiding this comment

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

environmentFile = mkOption {
        type = types.nullOr types.path;
        default = null;
        example = "/var/lib/murmur/murmurd.env";
        ...
};

Make use of cfg.stateDir in the example.

Looks good otherwise.

nixos/modules/services/networking/murmur.nix Outdated Show resolved Hide resolved
nixos/modules/services/networking/murmur.nix Show resolved Hide resolved
@felixsinger
Copy link
Member

@GrahamcOfBorg test mumble

@felixsinger
Copy link
Member

For some reason apparmor gets triggered because of denied accesses, but I can't see why.

@thoughtpolice Since you are listed as the maintainer of the Mumble tests can you help here?

@tnias
Copy link
Contributor

tnias commented Oct 28, 2024

With the trailing slash there are no more DENIED messages in the nixosTests.mumble's log.

diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix
index ef1dcde16748..3d8a5ca96298 100644
--- a/nixos/modules/services/networking/murmur.nix
+++ b/nixos/modules/services/networking/murmur.nix
@@ -414,7 +414,7 @@ in
         r ${config.environment.etc."lsb-release".source},
         owner rwk ${cfg.stateDir}/murmur.sqlite,
         owner rw ${cfg.stateDir}/murmur.sqlite-journal,
-        owner r ${cfg.stateDir},
+        owner r ${cfg.stateDir}/,
         r /run/murmur/murmurd.pid,
         r /run/murmur/murmurd.ini,
         r ${configFile},

@DCsunset
Copy link
Member Author

Sorry to have overlooked the trailing slash. I've added it in this PR.

@felixsinger
Copy link
Member

@GrahamcOfBorg test mumble

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Oct 29, 2024
@ehmry ehmry merged commit acda739 into NixOS:master Oct 30, 2024
25 checks passed
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.

5 participants