Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1be7c44aa738
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a38590d91ce7
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 29, 2020

  1. nixos/murmur: add murmur group, don't run as nogroup 

    fixes #101980
    @pstn
    pstn committed Oct 29, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    eadwu Edmund Wu
    GPG key ID: 8AB0E99F622EC03E
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fc856b8 View commit details

  2. Merge pull request #102015 from pstn/murmur-group 

    nixos/murmur: add murmur group, don't run as nogroup
    @lheckemann
    lheckemann authored Oct 29, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    eadwu Edmund Wu
    GPG key ID: 8AB0E99F622EC03E
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a38590d View commit details
Showing with 6 additions and 1 deletion.
  1. +1 −1 nixos/modules/misc/ids.nix
  2. +5 −0 nixos/modules/services/networking/murmur.nix
2 changes: 1 addition & 1 deletion nixos/modules/misc/ids.nix
View file
Original file line number Diff line number Diff line change
@@ -468,7 +468,7 @@ in
#minecraft = 114; # unused
vault = 115;
#ripped = 116; # unused
#murmur = 117; # unused
murmur = 117;
foundationdb = 118;
newrelic = 119;
starbound = 120;
5 changes: 5 additions & 0 deletions nixos/modules/services/networking/murmur.nix
View file
Original file line number Diff line number Diff line change
@@ -278,6 +278,10 @@ in
home = "/var/lib/murmur";
createHome = true;
uid = config.ids.uids.murmur;
group = "murmur";
};
users.groups.murmur = {
gid = config.ids.gids.murmur;
};

systemd.services.murmur = {
@@ -300,6 +304,7 @@ in
RuntimeDirectory = "murmur";
RuntimeDirectoryMode = "0700";
User = "murmur";
Group = "murmur";
};
};
};