nixos: add implict security.wrappers options

This is to keep the same permissions/setuid/setgid as before the change
in security.wrappers defaults.

rnhmjoj 8f76a6ee 41a49857

Changed files
+22 -3
nixos
modules
programs
security
services
mail
networking
scheduling
x11
desktop-managers
+2
nixos/modules/programs/ccache.nix
···
# "nix-ccache --show-stats" and "nix-ccache --clear"
security.wrappers.nix-ccache = {
group = "nixbld";
setgid = true;
source = pkgs.writeScript "nix-ccache.pl" ''
#!${pkgs.perl}/bin/perl
···
# "nix-ccache --show-stats" and "nix-ccache --clear"
security.wrappers.nix-ccache = {
+
owner = "nobody";
group = "nixbld";
+
setuid = false;
setgid = true;
source = pkgs.writeScript "nix-ccache.pl" ''
#!${pkgs.perl}/bin/perl
+2
nixos/modules/programs/msmtp.nix
···
source = "${pkgs.msmtp}/bin/sendmail";
setuid = false;
setgid = false;
};
environment.etc."msmtprc".text = let
···
source = "${pkgs.msmtp}/bin/sendmail";
setuid = false;
setgid = false;
+
owner = "root";
+
group = "root";
};
environment.etc."msmtprc".text = let
+2
nixos/modules/programs/ssmtp.nix
···
source = "${pkgs.ssmtp}/bin/sendmail";
setuid = false;
setgid = false;
};
};
···
source = "${pkgs.ssmtp}/bin/sendmail";
setuid = false;
setgid = false;
+
owner = "root";
+
group = "root";
};
};
+1
nixos/modules/security/pam.nix
···
unix_chkpwd = {
source = "${pkgs.pam}/sbin/unix_chkpwd.orig";
owner = "root";
setuid = true;
};
};
···
unix_chkpwd = {
source = "${pkgs.pam}/sbin/unix_chkpwd.orig";
owner = "root";
+
group = "nogroup";
setuid = true;
};
};
+4 -1
nixos/modules/services/mail/opensmtpd.nix
···
};
security.wrappers.smtpctl = {
group = "smtpq";
setgid = true;
source = "${cfg.package}/bin/smtpctl";
};
-
services.mail.sendmailSetuidWrapper = mkIf cfg.setSendmail security.wrappers.smtpctl;
systemd.tmpfiles.rules = [
"d /var/spool/smtpd 711 root - - -"
···
};
security.wrappers.smtpctl = {
+
owner = "nobody";
group = "smtpq";
+
setuid = false;
setgid = true;
source = "${cfg.package}/bin/smtpctl";
};
+
services.mail.sendmailSetuidWrapper = mkIf cfg.setSendmail
+
security.wrappers.smtpctl // { program = "sendmail"; };
systemd.tmpfiles.rules = [
"d /var/spool/smtpd 711 root - - -"
+4
nixos/modules/services/mail/postfix.nix
···
services.mail.sendmailSetuidWrapper = mkIf config.services.postfix.setSendmail {
program = "sendmail";
source = "${pkgs.postfix}/bin/sendmail";
group = setgidGroup;
setuid = false;
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";
group = setgidGroup;
setuid = false;
setgid = true;
···
security.wrappers.postdrop = {
program = "postdrop";
source = "${pkgs.postfix}/bin/postdrop";
group = setgidGroup;
setuid = false;
setgid = true;
···
services.mail.sendmailSetuidWrapper = mkIf config.services.postfix.setSendmail {
program = "sendmail";
source = "${pkgs.postfix}/bin/sendmail";
+
owner = "nobody";
group = setgidGroup;
setuid = false;
setgid = true;
···
security.wrappers.mailq = {
program = "mailq";
source = "${pkgs.postfix}/bin/mailq";
+
owner = "nobody";
group = setgidGroup;
setuid = false;
setgid = true;
···
security.wrappers.postqueue = {
program = "postqueue";
source = "${pkgs.postfix}/bin/postqueue";
+
owner = "nobody";
group = setgidGroup;
setuid = false;
setgid = true;
···
security.wrappers.postdrop = {
program = "postdrop";
source = "${pkgs.postfix}/bin/postdrop";
+
owner = "nobody";
group = setgidGroup;
setuid = false;
setgid = true;
+2
nixos/modules/services/networking/x2goserver.nix
···
source = "${pkgs.x2goserver}/lib/x2go/libx2go-server-db-sqlite3-wrapper.pl";
owner = "x2go";
group = "x2go";
setgid = true;
};
security.wrappers.x2goprintWrapper = {
source = "${pkgs.x2goserver}/bin/x2goprint";
owner = "x2go";
group = "x2go";
setgid = true;
};
···
source = "${pkgs.x2goserver}/lib/x2go/libx2go-server-db-sqlite3-wrapper.pl";
owner = "x2go";
group = "x2go";
+
setuid = false;
setgid = true;
};
security.wrappers.x2goprintWrapper = {
source = "${pkgs.x2goserver}/bin/x2goprint";
owner = "x2go";
group = "x2go";
+
setuid = false;
setgid = true;
};
+2
nixos/modules/services/scheduling/fcron.nix
···
owner = "fcron";
group = "fcron";
setgid = true;
};
fcronsighup = {
source = "${pkgs.fcron}/bin/fcronsighup";
group = "fcron";
};
};
···
owner = "fcron";
group = "fcron";
setgid = true;
+
setuid = false;
};
fcronsighup = {
source = "${pkgs.fcron}/bin/fcronsighup";
+
owner = "root";
group = "fcron";
};
};
+3 -2
nixos/modules/services/x11/desktop-managers/cde.nix
···
users.groups.mail = {};
security.wrappers = {
dtmail = {
source = "${pkgs.cdesktopenv}/bin/dtmail";
-
group = "mail";
-
setgid = true;
};
};
···
users.groups.mail = {};
security.wrappers = {
dtmail = {
+
setgid = true;
+
owner = "nobody";
+
group = "mail";
source = "${pkgs.cdesktopenv}/bin/dtmail";
};
};