krebs,tv: /var/setuid-wrappers -> /run/wrappers/bin
This commit is contained in:
parent
863bb9f912
commit
ed3585bfcf
|
@ -40,7 +40,7 @@ in {
|
||||||
etc."exim.conf".source = pkgs.writeEximConfig "exim.conf" ''
|
etc."exim.conf".source = pkgs.writeEximConfig "exim.conf" ''
|
||||||
exim_user = ${cfg.user.name}
|
exim_user = ${cfg.user.name}
|
||||||
exim_group = ${cfg.group.name}
|
exim_group = ${cfg.group.name}
|
||||||
exim_path = /var/setuid-wrappers/exim
|
exim_path = /run/wrappers/bin/exim
|
||||||
spool_directory = ${cfg.user.home}
|
spool_directory = ${cfg.user.home}
|
||||||
${cfg.config}
|
${cfg.config}
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -58,7 +58,7 @@
|
||||||
};
|
};
|
||||||
sendmail = mkOption {
|
sendmail = mkOption {
|
||||||
type = types.str;
|
type = types.str;
|
||||||
default = "/var/setuid-wrappers/sendmail";
|
default = "/run/wrappers/bin/sendmail";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -178,7 +178,7 @@ let
|
||||||
echo To: ${shell.escape cfg.mailto}
|
echo To: ${shell.escape cfg.mailto}
|
||||||
echo
|
echo
|
||||||
cat changes
|
cat changes
|
||||||
} | /var/setuid-wrappers/sendmail -t
|
} | /run/wrappers/bin/sendmail -t
|
||||||
fi
|
fi
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
|
@ -18,7 +18,7 @@ in {
|
||||||
];
|
];
|
||||||
|
|
||||||
# TODO dedicated group, i.e. with a single user [per-user-setuid]
|
# TODO dedicated group, i.e. with a single user [per-user-setuid]
|
||||||
# TODO krebs.setuid.slock.path vs /var/setuid-wrappers
|
# TODO krebs.setuid.slock.path vs /run/wrappers/bin
|
||||||
krebs.setuid.slock = {
|
krebs.setuid.slock = {
|
||||||
filename = "${pkgs.slock}/bin/slock";
|
filename = "${pkgs.slock}/bin/slock";
|
||||||
group = "wheel";
|
group = "wheel";
|
||||||
|
|
|
@ -132,7 +132,7 @@ spawnRootTerm :: X ()
|
||||||
spawnRootTerm =
|
spawnRootTerm =
|
||||||
forkFile
|
forkFile
|
||||||
urxvtcPath
|
urxvtcPath
|
||||||
["-name", "root-urxvt", "-e", "/var/setuid-wrappers/su", "-"]
|
["-name", "root-urxvt", "-e", "/run/wrappers/bin/su", "-"]
|
||||||
Nothing
|
Nothing
|
||||||
|
|
||||||
spawnTermAt :: String -> X ()
|
spawnTermAt :: String -> X ()
|
||||||
|
@ -143,7 +143,7 @@ spawnTermAt ws = do
|
||||||
|
|
||||||
myKeys :: XConfig Layout -> Map (KeyMask, KeySym) (X ())
|
myKeys :: XConfig Layout -> Map (KeyMask, KeySym) (X ())
|
||||||
myKeys conf = Map.fromList $
|
myKeys conf = Map.fromList $
|
||||||
[ ((_4 , xK_Escape ), forkFile "/var/setuid-wrappers/slock" [] Nothing)
|
[ ((_4 , xK_Escape ), forkFile "/run/wrappers/bin/slock" [] Nothing)
|
||||||
, ((_4S , xK_c ), kill)
|
, ((_4S , xK_c ), kill)
|
||||||
|
|
||||||
, ((_4 , xK_x ), chooseAction spawnTermAt)
|
, ((_4 , xK_x ), chooseAction spawnTermAt)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user