diff options
Diffstat (limited to 'nixops/modules/task')
-rw-r--r-- | nixops/modules/task/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nixops/modules/task/default.nix b/nixops/modules/task/default.nix index 8454c4b..8370608 100644 --- a/nixops/modules/task/default.nix +++ b/nixops/modules/task/default.nix | |||
@@ -245,12 +245,6 @@ in { | |||
245 | system.activationScripts.taskwarrior-web = { | 245 | system.activationScripts.taskwarrior-web = { |
246 | deps = [ "users" ]; | 246 | deps = [ "users" ]; |
247 | text = '' | 247 | text = '' |
248 | install -m 0755 -o ${user} -g ${group} -d ${socketsDir} | ||
249 | install -m 0750 -o ${user} -g ${group} -d ${varDir} | ||
250 | ${builtins.concatStringsSep "\n" (lib.attrsets.mapAttrsToList | ||
251 | (k: v: "install -m 0750 -o ${user} -g ${group} -d ${varDir}/${k}") | ||
252 | env.taskwarrior-web | ||
253 | )} | ||
254 | if [ ! -f ${server_vardir}/userkeys/taskwarrior-web.cert.pem ]; then | 248 | if [ ! -f ${server_vardir}/userkeys/taskwarrior-web.cert.pem ]; then |
255 | ${taskserver-user-certs}/bin/taskserver-user-certs taskwarrior-web | 249 | ${taskserver-user-certs}/bin/taskserver-user-certs taskwarrior-web |
256 | chown taskd:taskd ${server_vardir}/userkeys/taskwarrior-web.cert.pem ${server_vardir}/userkeys/taskwarrior-web.key.pem | 250 | chown taskd:taskd ${server_vardir}/userkeys/taskwarrior-web.cert.pem ${server_vardir}/userkeys/taskwarrior-web.key.pem |
@@ -315,6 +309,12 @@ in { | |||
315 | TimeoutSec = 60; | 309 | TimeoutSec = 60; |
316 | Type = "simple"; | 310 | Type = "simple"; |
317 | WorkingDirectory = taskwarrior-web; | 311 | WorkingDirectory = taskwarrior-web; |
312 | StateDirectoryMode = 0750; | ||
313 | StateDirectory = assert lib.strings.hasPrefix "/var/lib/" varDir; | ||
314 | (lib.strings.removePrefix "/var/lib/" varDir + "/${name}"); | ||
315 | RuntimeDirectoryPreserve = "yes"; | ||
316 | RuntimeDirectory = assert lib.strings.hasPrefix "/run/" socketsDir; | ||
317 | lib.strings.removePrefix "/run/" socketsDir; | ||
318 | }; | 318 | }; |
319 | 319 | ||
320 | unitConfig.RequiresMountsFor = varDir; | 320 | unitConfig.RequiresMountsFor = varDir; |