public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/opendkim: replace deprecated usage of PermissionsStartOnly 

see https://github.com/NixOS/nixpkgs/issues/53852
This commit is contained in:
Aaron Andersen 2019-02-24 09:06:38 -05:00
parent 114bd801f4
commit fbe5943237
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/modules/services/mail/opendkim.nix
View File

@ -101,13 +101,16 @@ in {
environment.systemPackages = [ pkgs.opendkim ]; environment.systemPackages = [ pkgs.opendkim ];
systemd.tmpfiles.rules = [
"d '${cfg.keyPath}' - ${cfg.user} ${cfg.group} - -"
];
systemd.services.opendkim = { systemd.services.opendkim = {
description = "OpenDKIM signing and verification daemon"; description = "OpenDKIM signing and verification daemon";
after = [ "network.target" ]; after = [ "network.target" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
preStart = '' preStart = ''
mkdir -p "${cfg.keyPath}"
cd "${cfg.keyPath}" cd "${cfg.keyPath}"
if ! test -f ${cfg.selector}.private; then if ! test -f ${cfg.selector}.private; then
${pkgs.opendkim}/bin/opendkim-genkey -s ${cfg.selector} -d all-domains-generic-key ${pkgs.opendkim}/bin/opendkim-genkey -s ${cfg.selector} -d all-domains-generic-key
@ -116,7 +119,6 @@ in {
cat ${cfg.selector}.txt cat ${cfg.selector}.txt
echo "-------------------------------------------------------------" echo "-------------------------------------------------------------"
fi fi
chown ${cfg.user}:${cfg.group} ${cfg.selector}.private
''; '';
serviceConfig = { serviceConfig = {
@ -124,7 +126,6 @@ in {
User = cfg.user; User = cfg.user;
Group = cfg.group; Group = cfg.group;
RuntimeDirectory = optional (cfg.socket == defaultSock) "opendkim"; RuntimeDirectory = optional (cfg.socket == defaultSock) "opendkim";
PermissionsStartOnly = true;
}; };
}; };