public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/rss2email: replace deprecated usage of PermissionsStartOnly

Browse Source 
see https://github.com/NixOS/nixpkgs/issues/53852
This commit is contained in:
Aaron Andersen 2019-02-24 08:36:50 -05:00
parent 2ebbe3988b
commit a585d29bfd
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/modules/services/mail/rss2email.nix
View File

@ -94,6 +94,10 @@ in {
services.rss2email.config.to = cfg.to; services.rss2email.config.to = cfg.to;
systemd.tmpfiles.rules = [
"d /var/rss2email 0700 rss2email rss2email - -"
];
systemd.services.rss2email = let systemd.services.rss2email = let
conf = pkgs.writeText "rss2email.cfg" (lib.generators.toINI {} ({ conf = pkgs.writeText "rss2email.cfg" (lib.generators.toINI {} ({
DEFAULT = cfg.config; DEFAULT = cfg.config;
@ -105,22 +109,16 @@ in {
in in
{ {
preStart = '' preStart = ''
mkdir -p /var/rss2email
chmod 700 /var/rss2email
cp ${conf} /var/rss2email/conf.cfg cp ${conf} /var/rss2email/conf.cfg
if [ ! -f /var/rss2email/db.json ]; then if [ ! -f /var/rss2email/db.json ]; then
echo '{"version":2,"feeds":[]}' > /var/rss2email/db.json echo '{"version":2,"feeds":[]}' > /var/rss2email/db.json
fi fi
chown -R rss2email:rss2email /var/rss2email
''; '';
path = [ pkgs.system-sendmail ]; path = [ pkgs.system-sendmail ];
serviceConfig = { serviceConfig = {
ExecStart = ExecStart =
"${pkgs.rss2email}/bin/r2e -c /var/rss2email/conf.cfg -d /var/rss2email/db.json run"; "${pkgs.rss2email}/bin/r2e -c /var/rss2email/conf.cfg -d /var/rss2email/db.json run";
User = "rss2email"; User = "rss2email";
PermissionsStartOnly = "true";
}; };
}; };