From 8c21d60d8cf26d74495c814f12e03d99b38b0e8c Mon Sep 17 00:00:00 2001
From: Antoine Martin <antoine@alarsyo.net>
Date: Fri, 18 Mar 2022 11:25:10 +0100
Subject: [PATCH] services: paperless: redis changes are upstreamed

---
 services/paperless.nix | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/services/paperless.nix b/services/paperless.nix
index 7db2019..431acd3 100644
--- a/services/paperless.nix
+++ b/services/paperless.nix
@@ -58,26 +58,20 @@ in
         PAPERLESS_TIME_ZONE = config.time.timeZone;
 
         PAPERLESS_ADMIN_USER = "alarsyo";
-
-        # FIXME: upstream module should be fixed instead of setting the redis URL myself
-        PAPERLESS_REDIS = "unix://${config.services.redis.servers.paperless.unixSocket}";
       };
     };
 
     systemd.services = {
       paperless-ng-server.serviceConfig = {
         EnvironmentFile = cfg.secretKeyFile;
-        BindReadOnlyPaths = [ config.services.redis.servers.paperless.unixSocket ];
       };
 
       paperless-ng-consumer.serviceConfig = {
         EnvironmentFile = cfg.secretKeyFile;
-        BindReadOnlyPaths = [ config.services.redis.servers.paperless.unixSocket ];
       };
 
       paperless-ng-web.serviceConfig = {
         EnvironmentFile = cfg.secretKeyFile;
-        BindReadOnlyPaths = [ config.services.redis.servers.paperless.unixSocket ];
       };
     };
 
@@ -92,11 +86,9 @@ in
       ];
     };
 
-    services.redis.servers.paperless.enable = true;
-
     systemd.services.paperless-ng-server = {
       # Make sure the DB is available
-      after = [ "postgresql.service" "redis-paperless.service" ];
+      after = [ "postgresql.service" ];
     };
 
     services.nginx.virtualHosts = {
@@ -125,10 +117,6 @@ in
       };
     };
 
-    users.users.${config.services.paperless-ng.user} = {
-      extraGroups = [ config.services.redis.servers.paperless.user ];
-    };
-
     my.services.restic-backup = mkIf cfg.enable {
       paths = [
         config.services.paperless-ng.dataDir