Merge branch 'release/v0.2.9'
This commit is contained in:
commit
469b87bc69
1 changed files with 2 additions and 1 deletions
|
|
@ -178,7 +178,7 @@ in
|
||||||
'';
|
'';
|
||||||
startScript = pkgs.writeShellScript "trictrac-start" (
|
startScript = pkgs.writeShellScript "trictrac-start" (
|
||||||
optionalString (cfg.smtp.passwordFile != null) ''
|
optionalString (cfg.smtp.passwordFile != null) ''
|
||||||
export SMTP_PASS="$(< ${cfg.smtp.passwordFile})"
|
export SMTP_PASS="$(< "$CREDENTIALS_DIRECTORY/smtp-pass")"
|
||||||
'' + ''
|
'' + ''
|
||||||
exec ${pkgs.trictrac}/bin/relay-server
|
exec ${pkgs.trictrac}/bin/relay-server
|
||||||
''
|
''
|
||||||
|
|
@ -210,6 +210,7 @@ in
|
||||||
StateDirectory = "trictrac";
|
StateDirectory = "trictrac";
|
||||||
StateDirectoryMode = "0755";
|
StateDirectoryMode = "0755";
|
||||||
WorkingDirectory = "/var/lib/trictrac";
|
WorkingDirectory = "/var/lib/trictrac";
|
||||||
|
LoadCredential = mkIf (cfg.smtp.passwordFile != null) "smtp-pass:${cfg.smtp.passwordFile}";
|
||||||
ExecStartPre = "${setupScript}";
|
ExecStartPre = "${setupScript}";
|
||||||
ExecStart = "${startScript}";
|
ExecStart = "${startScript}";
|
||||||
Restart = "on-failure";
|
Restart = "on-failure";
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue