mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-14 06:00:33 +03:00
nixos/taskserver: fix systemd shellcheck warning (#369509)
This commit is contained in:
commit
be53115dd0
2 changed files with 6 additions and 6 deletions
|
@ -498,16 +498,16 @@ in
|
|||
ca.cert = if needToCreateCA then "${cfg.dataDir}/keys/ca.cert" else "${cfg.pki.manual.ca.cert}";
|
||||
};
|
||||
|
||||
systemd.tmpfiles.rules = [
|
||||
"d ${cfg.dataDir} 0770 ${cfg.user} ${cfg.group}"
|
||||
"z ${cfg.dataDir} 0770 ${cfg.user} ${cfg.group}"
|
||||
];
|
||||
|
||||
systemd.services.taskserver-init = {
|
||||
wantedBy = [ "taskserver.service" ];
|
||||
before = [ "taskserver.service" ];
|
||||
description = "Initialize Taskserver Data Directory";
|
||||
|
||||
preStart = ''
|
||||
mkdir -m 0770 -p "${cfg.dataDir}"
|
||||
chown "${cfg.user}:${cfg.group}" "${cfg.dataDir}"
|
||||
'';
|
||||
|
||||
script = ''
|
||||
${taskd} init
|
||||
touch "${cfg.dataDir}/.is_initialized"
|
||||
|
|
|
@ -114,7 +114,7 @@ import ./make-test-python.nix (
|
|||
testScript =
|
||||
{ nodes, ... }:
|
||||
let
|
||||
cfg = nodes.server.config.services.taskserver;
|
||||
cfg = nodes.server.services.taskserver;
|
||||
portStr = toString cfg.listenPort;
|
||||
specialisations = "${nodes.server.system.build.toplevel}/specialisation";
|
||||
newServerSystem = "${specialisations}/manual_config";
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue