Compare commits

..

No commits in common. "469b87bc69487611dc3b800cdd93375143b3ccf8" and "c61ea4ae673a2d02aa0a533ddbf5453ab5c2d4e4" have entirely different histories.

View file

@ -178,7 +178,7 @@ in
'';
startScript = pkgs.writeShellScript "trictrac-start" (
optionalString (cfg.smtp.passwordFile != null) ''
export SMTP_PASS="$(< "$CREDENTIALS_DIRECTORY/smtp-pass")"
export SMTP_PASS="$(< ${cfg.smtp.passwordFile})"
'' + ''
exec ${pkgs.trictrac}/bin/relay-server
''
@ -210,7 +210,6 @@ in
StateDirectory = "trictrac";
StateDirectoryMode = "0755";
WorkingDirectory = "/var/lib/trictrac";
LoadCredential = mkIf (cfg.smtp.passwordFile != null) "smtp-pass:${cfg.smtp.passwordFile}";
ExecStartPre = "${setupScript}";
ExecStart = "${startScript}";
Restart = "on-failure";