Compare commits

..

No commits in common. "5b64a24b812e2718af0365646db2bef728e0c14f" and "4581b41a2bf746d75155999f96201992951bd414" have entirely different histories.

View file

@ -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="$(< "$CREDENTIALS_DIRECTORY/smtp-pass")" export SMTP_PASS="$(< ${cfg.smtp.passwordFile})"
'' + '' '' + ''
exec ${pkgs.trictrac}/bin/relay-server exec ${pkgs.trictrac}/bin/relay-server
'' ''
@ -210,7 +210,6 @@ 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";