From 733ea72e166733abbe4f6ba9aed25f1bfff3d0a5 Mon Sep 17 00:00:00 2001 From: amesgen Date: Thu, 10 Nov 2022 20:06:32 +0100 Subject: [PATCH] nixos/rss2email: remove unnecessary cfg file indirection to fix test (#200108) Previously, the NixOS test often failed as the copied config file is not overwriteable. In actual setups, the restart interval is much bigger, such that systemd-tmpfiles will correct the permissions inbetween. --- nixos/modules/services/mail/rss2email.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/services/mail/rss2email.nix b/nixos/modules/services/mail/rss2email.nix index 7b74db1e711b..54404c5b5f4c 100644 --- a/nixos/modules/services/mail/rss2email.nix +++ b/nixos/modules/services/mail/rss2email.nix @@ -110,7 +110,6 @@ in { in { preStart = '' - cp ${conf} /var/rss2email/conf.cfg if [ ! -f /var/rss2email/db.json ]; then echo '{"version":2,"feeds":[]}' > /var/rss2email/db.json fi @@ -118,7 +117,7 @@ in { path = [ pkgs.system-sendmail ]; serviceConfig = { ExecStart = - "${pkgs.rss2email}/bin/r2e -c /var/rss2email/conf.cfg -d /var/rss2email/db.json run"; + "${pkgs.rss2email}/bin/r2e -c ${conf} -d /var/rss2email/db.json run"; User = "rss2email"; }; };