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: 6ba2f551a0af
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: db3beda6b565
Choose a head ref
  • 3 commits
  • 2 files changed
  • 3 contributors

Commits on Nov 13, 2019

  1. nixos/postfix: add missing setgid wrapper 

    This is basically an alias for a special case of postqueue, which
already has a setgid wrapper.  Would be silly to allow postqueue -p
but not mailq.
    @alyssais
    alyssais committed Nov 13, 2019
    Copy the full SHA
    7813c24 View commit details

Commits on Nov 14, 2019

  1. nixos/libvirtd: fix typo

    @fpletz
    fpletz committed Nov 14, 2019
    Copy the full SHA
    f206184 View commit details

  2. Merge pull request #73348 from alyssais/mailq-setgid 

    nixos/postfix: add missing setgid wrapper
    @peti
    peti authored Nov 14, 2019
    Copy the full SHA
    db3beda View commit details
Showing with 9 additions and 1 deletion.
  1. +8 −0 nixos/modules/services/mail/postfix.nix
  2. +1 −1 nixos/modules/virtualisation/libvirtd.nix
8 changes: 8 additions & 0 deletions nixos/modules/services/mail/postfix.nix
View file
Original file line number Diff line number Diff line change
@@ -631,6 +631,14 @@ in
setgid = true;
};

security.wrappers.mailq = {
program = "mailq";
source = "${pkgs.postfix}/bin/mailq";
group = setgidGroup;
setuid = false;
setgid = true;
};

security.wrappers.postqueue = {
program = "postqueue";
source = "${pkgs.postfix}/bin/postqueue";
2 changes: 1 addition & 1 deletion nixos/modules/virtualisation/libvirtd.nix
View file
Original file line number Diff line number Diff line change
@@ -147,7 +147,7 @@ in {
etc."qemu/bridge.conf".text = lib.concatMapStringsSep "\n" (e:
"allow ${e}") cfg.allowedBridges;
systemPackages = with pkgs; [ libvirt libressl.nc iptables cfg.qemuPackage ];
etc.ethertypes.source = "${iptables}/etc/ethertypes";
etc.ethertypes.source = "${pkgs.iptables}/etc/ethertypes";
};

boot.kernelModules = [ "tun" ];