about summary refs log tree commit diff
path: root/nixos/modules/services/mail/rss2email.nix
diff options
context:
space:
mode:
authorAaron Andersen <aaron@fosslib.net>2019-02-24 08:36:50 -0500
committerAaron Andersen <aaron@fosslib.net>2019-04-13 07:00:57 -0400
commita585d29bfd1e57d82965e3162b7780fd3f60214b (patch)
tree5d8b3a331c6bd417365a4657da8825e56549a024 /nixos/modules/services/mail/rss2email.nix
parent2ebbe3988bbc89401fbeedaa875de68e2f7aaed4 (diff)
nixos/rss2email: replace deprecated usage of PermissionsStartOnly
see https://github.com/NixOS/nixpkgs/issues/53852
Diffstat (limited to 'nixos/modules/services/mail/rss2email.nix')
-rw-r--r--nixos/modules/services/mail/rss2email.nix10
1 files changed, 4 insertions, 6 deletions
diff --git a/nixos/modules/services/mail/rss2email.nix b/nixos/modules/services/mail/rss2email.nix
index 5f3b2877008f8..a123736005aba 100644
--- a/nixos/modules/services/mail/rss2email.nix
+++ b/nixos/modules/services/mail/rss2email.nix
@@ -94,6 +94,10 @@ in {
 
     services.rss2email.config.to = cfg.to;
 
+    systemd.tmpfiles.rules = [
+      "d /var/rss2email 0700 rss2email rss2email - -"
+    ];
+
     systemd.services.rss2email = let
       conf = pkgs.writeText "rss2email.cfg" (lib.generators.toINI {} ({
           DEFAULT = cfg.config;
@@ -105,22 +109,16 @@ in {
     in
     {
       preStart = ''
-        mkdir -p /var/rss2email
-        chmod 700 /var/rss2email
-
         cp ${conf} /var/rss2email/conf.cfg
         if [ ! -f /var/rss2email/db.json ]; then
           echo '{"version":2,"feeds":[]}' > /var/rss2email/db.json
         fi
-
-        chown -R rss2email:rss2email /var/rss2email
       '';
       path = [ pkgs.system-sendmail ];
       serviceConfig = {
         ExecStart =
           "${pkgs.rss2email}/bin/r2e -c /var/rss2email/conf.cfg -d /var/rss2email/db.json run";
         User = "rss2email";
-        PermissionsStartOnly = "true";
       };
     };