From b0781dbc85da7bba5a3a9209ca4d3b3900eea7b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Thu, 24 Jan 2019 18:10:20 +0100
Subject: Make redis connections abstract

---
 virtual/modules/databases/default.nix | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'virtual/modules/databases/default.nix')

diff --git a/virtual/modules/databases/default.nix b/virtual/modules/databases/default.nix
index 0912830..430d032 100644
--- a/virtual/modules/databases/default.nix
+++ b/virtual/modules/databases/default.nix
@@ -151,23 +151,18 @@ in {
       }
     ];
 
-    # Diaspora: 15
-    # Nextcloud: 14
-    # Mastodon: 13
-    # Mediagoblin: 12
-    # wallabag: 0 ?
     services.redis = rec {
       enable = config.services.myDatabases.redis.enable;
       bind = "127.0.0.1";
-      unixSocket = "/run/redis/redis.sock";
+      unixSocket = myconfig.env.databases.redis.socket;
       extraConfig = ''
         unixsocketperm 777
         maxclients 1024
         '';
     };
     system.activationScripts.redis = ''
-      mkdir -p /run/redis
-      chown redis /run/redis
+      mkdir -p $(dirname ${myconfig.env.databases.redis.socket})
+      chown redis $(dirname ${myconfig.env.databases.redis.socket})
     '';
   };
 }
-- 
cgit v1.2.3