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

nixos/mesos: replace deprecated usage of PermissionsStartOnly

Browse Source 
see https://github.com/NixOS/nixpkgs/issues/53852
This commit is contained in:
Aaron Andersen 2019-02-24 11:21:20 -05:00
parent 2f50cd06dc
commit 89081eef5d
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/modules/services/misc/mesos-master.nix
View File

@ -95,6 +95,9 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
systemd.tmpfiles.rules = [
"d '${cfg.workDir}' 0700 - - - -"
];
systemd.services.mesos-master = { systemd.services.mesos-master = {
description = "Mesos Master"; description = "Mesos Master";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
@ -114,11 +117,7 @@ in {
${toString cfg.extraCmdLineOptions} ${toString cfg.extraCmdLineOptions}
''; '';
Restart = "on-failure"; Restart = "on-failure";
PermissionsStartOnly = true;
}; };
preStart = ''
mkdir -m 0700 -p ${cfg.workDir}
'';
}; };
}; };

7
nixos/modules/services/misc/mesos-slave.nix
View File

@ -184,6 +184,9 @@ in {
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
systemd.tmpfiles.rules = [
"d '${cfg.workDir}' 0701 - - - -"
];
systemd.services.mesos-slave = { systemd.services.mesos-slave = {
description = "Mesos Slave"; description = "Mesos Slave";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
@ -210,11 +213,7 @@ in {
--executor_environment_variables=${lib.escapeShellArg (builtins.toJSON cfg.executorEnvironmentVariables)} \ --executor_environment_variables=${lib.escapeShellArg (builtins.toJSON cfg.executorEnvironmentVariables)} \
${toString cfg.extraCmdLineOptions} ${toString cfg.extraCmdLineOptions}
''; '';
PermissionsStartOnly = true;
}; };
preStart = ''
mkdir -m 0701 -p ${cfg.workDir}
'';
}; };
}; };